删除加载图形图片的第三方框架，并使用gide直接形成圆形图片，兼容性更好；修复试玩赚钱中加载发布任务时可以报json错误导致数据没有清除的bug

app/build.gradle

@@ -152,7 +152,7 @@ dependencies {
     debugCompile('com.readystatesoftware.chuck:library:1.1.0') {
         exclude group: 'com.android.support', module: 'design'
     }
-    compile 'de.hdodenhof:circleimageview:2.2.0'
+//    compile 'de.hdodenhof:circleimageview:2.2.0'
     releaseCompile('com.readystatesoftware.chuck:library-no-op:1.1.0') {
         exclude group: 'com.android.support', module: 'design'
     }

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -27,7 +27,6 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.react.SharedPreferences;
 import com.layoutscroll.layoutscrollcontrols.view.EasyLayoutScroll;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
@@ -55,7 +54,6 @@ import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -74,7 +72,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
-import de.hdodenhof.circleimageview.CircleImageView;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
@@ -93,7 +90,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     @BindView(R.id.icon_img_iv)
-    CircleImageView iconImgIv;
+    ImageView iconImgIv;
     @BindView(R.id.name_tv)
     TextView nameTv;
     @BindView(R.id.sheep_num_tv)
@@ -161,7 +158,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         sheepNumTv.setText("绵羊号：" + userEntity.getInvitation_code());
         Glide.with(getActivity())
                 .load(userEntity.getAvatar())
-                .apply(new RequestOptions().placeholder(R.drawable.icon))
+                .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
                 .into(iconImgIv);
 
     }

app/src/main/java/com/sheep/gamegroup/view/activity/AccountAndSecurityAct.java

@@ -139,7 +139,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
         mEntity=user;
         Glide.with(AccountAndSecurityAct.this)
                 .load(mEntity.getAvatar())
-                .apply(new RequestOptions().placeholder(R.drawable.icon))
+                .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
                 .into(ivHead);
     }
 
@@ -273,7 +273,7 @@ public class AccountAndSecurityAct extends BaseActivity implements AccountAndSec
 
                 Glide.with(AccountAndSecurityAct.this)
                         .load(mEntity.getAvatar())
-                        .apply(new RequestOptions().placeholder(R.drawable.icon))
+                        .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon))
                         .into(ivHead);
                 if (TextUtils.isEmpty(entity.getWx_nickname())) {
                     tvWx.setText("未绑定");

app/src/main/java/com/sheep/gamegroup/view/activity/HomePageAct.java

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
@@ -26,14 +25,11 @@ import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import javax.inject.Inject;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
-import de.hdodenhof.circleimageview.CircleImageView;
 
 /**
  * Created by ljy on 2018/3/19.
@@ -41,7 +37,7 @@ import de.hdodenhof.circleimageview.CircleImageView;
 
 public class HomePageAct extends BaseActivity implements HomePageContract.View{
     @BindView(R.id.icon_img_iv)
-    CircleImageView iconImgIv;
+    ImageView iconImgIv;
     @BindView(R.id.name_tv)
     TextView nameTv;
     @BindView(R.id.sheep_num_tv)

app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java

@@ -221,10 +221,10 @@ public class TryMakeMoneyact extends BaseActivity implements TryMakeMoneyContrac
      */
     @Override
     public void releaseTaskTaskUpdataView(Object o) {
+        releaseEtyLists.clear();
         try{
             BaseMessage baseMessage = (BaseMessage) o;
             List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
-            releaseEtyLists.clear();
             if(releaseEtyList != null){
                 releaseEtyLists.addAll(releaseEtyList);
             }

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -1,30 +1,19 @@
 package com.sheep.jiuyan.samllsheep.page;
 
-import android.Manifest;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.SystemClock;
-import android.provider.Settings;
-import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.TextInputEditText;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.TextUtils;
-import android.util.Log;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Animation;
 import android.view.animation.RotateAnimation;
-import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.RadioButton;
@@ -35,9 +24,6 @@ import android.widget.Toast;
 import com.app.hubert.library.NewbieGuide;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.mylhyl.acp.Acp;
-import com.mylhyl.acp.AcpListener;
-import com.mylhyl.acp.AcpOptions;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
@@ -45,7 +31,6 @@ import com.sheep.jiuyan.samllsheep.download.DownloadManager;
 import com.sheep.jiuyan.samllsheep.event.MainTab;
 import com.sheep.jiuyan.samllsheep.event.NewUserDialog;
 import com.sheep.jiuyan.samllsheep.floatwindow.FloatService;
-import com.sheep.jiuyan.samllsheep.floatwindow.FloatWindow;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
@@ -54,24 +39,18 @@ import com.sheep.jiuyan.samllsheep.page.entry.User;
 import com.sheep.jiuyan.samllsheep.page.fragment.FgtMainPageOffline;
 import com.sheep.jiuyan.samllsheep.page.fragment.FgtMainPageTask;
 import com.sheep.jiuyan.samllsheep.page.view.RappTabLayout;
-import com.sheep.jiuyan.samllsheep.service.TopService;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.OpenService;
 import com.sheep.jiuyan.samllsheep.utils.PremissUtils;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.StringUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 
-import de.hdodenhof.circleimageview.CircleImageView;
 
 import static android.support.v4.view.ViewPager.SCROLL_STATE_IDLE;
 
@@ -292,9 +271,9 @@ if (BuildConfig.DEBUG)
                 .setText(G.mUser.getNickName());
         Glide.with(this)
                 .load(G.mUser.getIcon())
-                .apply(new RequestOptions().placeholder(R.drawable.icon)
+                .apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon)
                 .dontAnimate())
-                .into((CircleImageView) findViewById(R.id.img_user));
+                .into((ImageView) findViewById(R.id.img_user));
 
         if (G.mUser.getReceived_red_packet() == 1) {
             mImgBag.clearAnimation();

app/src/main/java/com/sheep/jiuyan/samllsheep/page/UserCenterActivity.java

@@ -1,26 +1,19 @@
 package com.sheep.jiuyan.samllsheep.page;
 
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.text.ClipboardManager;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseActivity;
-import com.sheep.jiuyan.samllsheep.event.NewUserDialog;
 import com.sheep.jiuyan.samllsheep.net.NetManager;
 import com.sheep.jiuyan.samllsheep.net.SheepCallback;
 import com.sheep.jiuyan.samllsheep.net.Url;
@@ -30,14 +23,9 @@ import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.StringUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-
 import java.io.IOException;
 import java.util.HashMap;
 
-import de.hdodenhof.circleimageview.CircleImageView;
 
 
 /**
@@ -53,7 +41,7 @@ import de.hdodenhof.circleimageview.CircleImageView;
  */
 
 public class UserCenterActivity extends BaseActivity implements View.OnClickListener {
-    private CircleImageView mImgIcon;
+    private ImageView mImgIcon;
     private TextView mTvNick;
     private TextView mTvMoney;
     private TextView mTvCode;
@@ -108,7 +96,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
                         mTvNick.setText(user.getNickName());
                         mTvMoney.setText(StringUtils.strToMoney(user.getBalance()));
                         mTvCode.setText("我的邀请码  " + user.getInvitationCode());
-                        Glide.with(getApplicationContext()).load(user.getIcon()).apply(new RequestOptions().placeholder(R.drawable.icon).dontAnimate()).into(mImgIcon);
+                        Glide.with(getApplicationContext()).load(user.getIcon()).apply(new RequestOptions().circleCrop().placeholder(R.drawable.icon).dontAnimate()).into(mImgIcon);
                         if(TextUtils.isEmpty(user.getMobile())){
                             //做弹框
                             showBindPhoneDialog();
@@ -160,7 +148,7 @@ public class UserCenterActivity extends BaseActivity implements View.OnClickList
 
     @Override
     public void initView() {
-        mImgIcon = (CircleImageView) findViewById(R.id.img_icon);
+        mImgIcon = (ImageView) findViewById(R.id.img_icon);
         mTvNick = (TextView) findViewById(R.id.tv_nick);
         mTvMoney = (TextView) findViewById(R.id.tv_money);
         mTvCode = (TextView) findViewById(R.id.tv_invitation_code);

app/src/main/res/layout/homepage_act_layout.xml

@@ -29,7 +29,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
-                    <de.hdodenhof.circleimageview.CircleImageView
+                    <ImageView
                         android:id="@+id/icon_img_iv"
                         android:layout_width="@dimen/view_size_45"
                         android:layout_height="@dimen/view_size_45"

app/src/main/res/layout/item_pop_change_user.xml

@@ -7,7 +7,7 @@
     android:paddingBottom="@dimen/content_padding"
     android:paddingTop="@dimen/content_padding">
 
-    <de.hdodenhof.circleimageview.CircleImageView
+    <ImageView
         android:visibility="gone"
         android:id="@+id/img_item_pop_change_user_logo"
         android:layout_width="40dp"

app/src/main/res/layout/main_activity.xml

@@ -61,7 +61,7 @@
                             android:paddingTop="@dimen/content_padding_small"
                             app:layout_constraintTop_toBottomOf="@id/txt_main_activity_money">
 
-                            <de.hdodenhof.circleimageview.CircleImageView
+                            <ImageView
                                 android:id="@+id/img_user"
                                 android:layout_width="20dp"
                                 android:layout_height="20dp"

app/src/main/res/layout/task_head.xml

@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/background_light_gray"
-    android:orientation="vertical">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="120dp"
-        android:background="@color/theme_light">
-
-
-        <RelativeLayout
-            android:layout_width="50dp"
-            android:layout_height="30dp"
-            android:layout_centerVertical="true"
-            android:background="@drawable/texe_background_round_theme_left">
-
-            <de.hdodenhof.circleimageview.CircleImageView
-                android:id="@+id/img_user"
-                android:layout_width="25dp"
-                android:layout_height="25dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="2.5dp" />
-        </RelativeLayout>
-
-        <TextView
-            android:id="@+id/tv_withdraw"
-            android:layout_width="50dp"
-            android:layout_height="30dp"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:background="@drawable/texe_background_round_theme_right"
-            android:gravity="center_vertical"
-            android:paddingLeft="15dp"
-            android:text="提现"
-            android:textColor="@color/white"
-            android:textSize="14sp" />
-
-        <ImageView
-            android:id="@+id/img_down"
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_alignParentRight="true"
-            android:layout_marginTop="5dp"
-            android:padding="5dp"
-            android:src="@drawable/down_load"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="10dp"
-            android:text="我的奖金"
-            android:textColor="@color/white" />
-
-        <TextView
-            android:id="@+id/money"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:layout_below="@id/title"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="10dp"
-            android:background="@drawable/texe_background_round_white"
-            android:gravity="center"
-            android:paddingLeft="15dp"
-            android:paddingRight="15dp"
-            android:textColor="@color/sheep_red"
-            android:textSize="25dp" />
-
-        <LinearLayout
-            android:layout_width="200dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="10dp"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-
-            <TextView
-                android:id="@+id/today"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_margin="5dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:text="今日收入"
-                android:textColor="@color/white"
-                android:textSize="12sp" />
-        </LinearLayout>
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/ll_new_task"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone"
-
-        >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:paddingLeft="5dp"
-            android:text="新手专享"
-            android:textColor="@color/black_light" />
-
-        <RelativeLayout
-            android:id="@+id/ll_progress"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/backgroud">
-
-            <TextView
-                android:id="@+id/tv_new_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:paddingLeft="10dp"
-                android:text="微信任务"
-                android:textColor="@color/black_dark" />
-
-            <TextView
-                android:id="@+id/tv_new_bouns"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_marginRight="10dp"
-                android:layout_marginTop="10dp"
-                android:text="5.00"
-                android:textColor="@color/sheep_red"
-                android:textSize="22sp" />
-
-            <TextView
-                android:id="@+id/tv_text1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBottom="@id/tv_new_bouns"
-                android:layout_marginBottom="3dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="3dp"
-                android:layout_toLeftOf="@id/tv_new_bouns"
-                android:text="+"
-                android:textColor="@color/black_light"
-                android:textSize="12sp" />
-
-            <TextView
-                android:id="@+id/tv_new_money"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_toLeftOf="@id/tv_text1"
-                android:text="5.00"
-                android:textColor="@color/sheep_red"
-                android:textSize="22sp" />
-
-            <TextView
-                android:id="@+id/tv_new_desc"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tv_new_title"
-                android:layout_marginTop="5dp"
-                android:layout_toLeftOf="@id/tv_new_money"
-                android:paddingLeft="10dp"
-                android:text="提交闲置微信号，每日获取租金"
-                android:textColor="@color/black_light"
-                android:textSize="12dp" />
-
-            <ProgressBar
-                android:id="@+id/pb_commit"
-                style="?android:attr/progressBarStyleHorizontal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_margin="5dp" />
-        </RelativeLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/ll_doing"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:text="进行中"
-            android:textColor="@color/black_light" />
-
-        <include layout="@layout/task_item" />
-    </LinearLayout>
-
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="5dp"
-        android:paddingRight="5dp"
-        android:paddingTop="5dp"
-        android:text="发布中"
-        android:textColor="@color/black_light" />
-
-
-</LinearLayout>

app/src/main/res/layout/usercenter_activity.xml

@@ -14,7 +14,7 @@
         android:background="@color/colorPrimary"
         >
 
-        <de.hdodenhof.circleimageview.CircleImageView
+        <ImageView
             android:id="@+id/img_icon"
             android:layout_width="60dp"
             android:layout_height="60dp"

app/src/main/res/layout/x_account_security_layout.xml

@@ -17,7 +17,7 @@
         android:id="@+id/rl_top"
         >
 
-        <de.hdodenhof.circleimageview.CircleImageView
+        <ImageView
             android:id="@+id/iv_head"
             android:layout_width="45dp"
             android:layout_height="45dp"