清理资源

app/build.gradle

@@ -251,7 +251,7 @@ dependencies {
     compile files('libs/jpush-android-3.1.2.jar')
 
 }
-def releaseTime() {
+static def releaseTime() {
     return new Date().format("MMddHHmm", TimeZone.getDefault())
 }
 //在apk文件后边生成版本号信息

app/src/main/AndroidManifest.xml

@@ -70,7 +70,8 @@
         android:persistent="true"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:fullBackupContent="@xml/backup_descriptor">
 
         <activity
             android:name=".wxapi.WXEntryActivity"

app/src/main/java/com/googlecode/protobuf/format/AbstractCharBasedFormatter.java

@@ -1,9 +1,9 @@
-/**
- * Copyright 2000-2011 NeuStar, Inc. All rights reserved.
- * NeuStar, the Neustar logo and related names and logos are registered
- * trademarks, service marks or tradenames of NeuStar, Inc. All other
- * product names, company names, marks, logos and symbols may be trademarks
- * of their respective owners.
+/*
+  Copyright 2000-2011 NeuStar, Inc. All rights reserved.
+  NeuStar, the Neustar logo and related names and logos are registered
+  trademarks, service marks or tradenames of NeuStar, Inc. All other
+  product names, company names, marks, logos and symbols may be trademarks
+  of their respective owners.
  */
 
 package com.googlecode.protobuf.format;

app/src/main/java/com/googlecode/protobuf/format/FormatFactory.java

@@ -1,9 +1,9 @@
-/**
- * Copyright 2000-2011 NeuStar, Inc. All rights reserved.
- * NeuStar, the Neustar logo and related names and logos are registered
- * trademarks, service marks or tradenames of NeuStar, Inc. All other
- * product names, company names, marks, logos and symbols may be trademarks
- * of their respective owners.
+/*
+  Copyright 2000-2011 NeuStar, Inc. All rights reserved.
+  NeuStar, the Neustar logo and related names and logos are registered
+  trademarks, service marks or tradenames of NeuStar, Inc. All other
+  product names, company names, marks, logos and symbols may be trademarks
+  of their respective owners.
  */
 
 package com.googlecode.protobuf.format;

app/src/main/java/com/googlecode/protobuf/format/ProtobufFormatter.java

@@ -1,9 +1,9 @@
-/**
- * Copyright 2000-2011 NeuStar, Inc. All rights reserved.
- * NeuStar, the Neustar logo and related names and logos are registered
- * trademarks, service marks or tradenames of NeuStar, Inc. All other
- * product names, company names, marks, logos and symbols may be trademarks
- * of their respective owners.
+/*
+  Copyright 2000-2011 NeuStar, Inc. All rights reserved.
+  NeuStar, the Neustar logo and related names and logos are registered
+  trademarks, service marks or tradenames of NeuStar, Inc. All other
+  product names, company names, marks, logos and symbols may be trademarks
+  of their respective owners.
  */
 
 package com.googlecode.protobuf.format;

app/src/main/java/com/googlecode/protobuf/format/util/TextUtils.java

@@ -1,9 +1,9 @@
-/**
- * Copyright 2000-2011 NeuStar, Inc. All rights reserved.
- * NeuStar, the Neustar logo and related names and logos are registered
- * trademarks, service marks or tradenames of NeuStar, Inc. All other
- * product names, company names, marks, logos and symbols may be trademarks
- * of their respective owners.
+/*
+  Copyright 2000-2011 NeuStar, Inc. All rights reserved.
+  NeuStar, the Neustar logo and related names and logos are registered
+  trademarks, service marks or tradenames of NeuStar, Inc. All other
+  product names, company names, marks, logos and symbols may be trademarks
+  of their respective owners.
  */
 
 package com.googlecode.protobuf.format.util;

app/src/main/java/com/kfzs/duanduan/ActGameDetails.java

@@ -186,8 +186,8 @@ public class ActGameDetails extends BaseCompatActivity {
             }
         });
 
-        /**
-         * 标题显示和隐藏的监听
+        /*
+          标题显示和隐藏的监听
          */
         ((AppBarLayout) findViewById(R.id.appbar_act_game_details)).addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
             @Override
@@ -296,7 +296,7 @@ public class ActGameDetails extends BaseCompatActivity {
      * 分享游戏；
      */
     private void popShare() {
-        String shareUrl = "";
+        String shareUrl;
         if (respGame != null && !TextUtils.isEmpty(respGame.getDownloadUrl())) {
             shareUrl = respGame.getDownloadUrl();
         } else if (respGame != null && !TextUtils.isEmpty(respGame.getBookDownloadUrl())) {
@@ -434,7 +434,7 @@ public class ActGameDetails extends BaseCompatActivity {
      */
     public void loadLoanUserercord(final String sGameId) {
         String url = UrlBll.V2.BORROW_PLAY_LOAN_USERRECORD;
-        HashMap<String, String> m = new HashMap();
+        HashMap<String, String> m = new HashMap<>();
         m.put("gameId", sGameId);
         APIRequestV2 apiRequestV2 = APIRequestInstance.getReqUrlV2(url,
                 url, m, new Response.Listener<BaseMsg>() {

app/src/main/java/com/kfzs/duanduan/ActMain.java

@@ -3,62 +3,36 @@ package com.kfzs.duanduan;
 import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.graphics.BitmapFactory;
 import android.os.Build;
-import android.os.Bundle;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bll.UrlBll;
-import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
-import com.kfzs.duanduan.db.DataSave;
 import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.proto.ApiResponseOuterClass;
-import com.kfzs.duanduan.proto.GameOuterClass;
-import com.kfzs.duanduan.proto.RecommendedGameOuterClass;
 import com.kfzs.duanduan.react.TabsHelper;
-import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.dlg.HelperUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
-import com.kfzs.duanduan.utils.net.APIRequest;
-import com.kfzs.duanduan.utils.net.APIRequestInstance;
-import com.kfzs.duanduan.utils.net.ResponseNetworkTask;
-import com.kfzs.duanduan.view.AppHomepageAdvertisementDialog;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.Container;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.umeng.socialize.UMShareAPI;
-import com.zhy.http.okhttp.OkHttpUtils;
-import com.zhy.http.okhttp.callback.StringCallback;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import okhttp3.Call;
 import rx.functions.Action1;
 
-import static com.kfzs.duanduan.services.DownloadTaskService.STATUS_ING;
-
 
 public class ActMain extends BaseActivity {
     private static final String TAG = "ActMain";

app/src/main/java/com/kfzs/duanduan/BaseCompatActivity.java

@@ -67,7 +67,7 @@ public abstract class BaseCompatActivity extends CompatActivity {
      * @return
      */
     protected <T extends View> T findViewByIdT(int id) {
-        return (T) super.findViewById(id);
+        return super.findViewById(id);
     }
 
 

app/src/main/java/com/kfzs/duanduan/KFZSApp.java

@@ -3,7 +3,6 @@ package com.kfzs.duanduan;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
-import android.os.Build;
 import android.os.Environment;
 import android.support.multidex.MultiDexApplication;
 import android.util.DisplayMetrics;
@@ -11,7 +10,6 @@ import android.util.Log;
 
 import com.arialyy.aria.core.Aria;
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
-import com.kfzs.duanduan.db.DataSave;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -21,9 +19,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 

app/src/main/java/com/kfzs/duanduan/adp/ClassificationAdapter.java

@@ -419,8 +419,8 @@ public class ClassificationAdapter extends BaseAdapter {  private ArrayList<Stri
 //        }
 //    }
 
-    /**
-     * 获取图片的颜色
+    /*
+      获取图片的颜色
      */
    /* private void getImgColor(Bitmap bitmap , final View view){
         Palette.from(bitmap).generate(new Palette.PaletteAsyncListener() {

app/src/main/java/com/kfzs/duanduan/adp/ClassificationGridviewAdapter.java

@@ -74,7 +74,7 @@ public class ClassificationGridviewAdapter extends BaseAdapter {
 
         final GameTypeSpecialOuterClass.GameTypeSpecial gameTypeSpecial = (GameTypeSpecialOuterClass.GameTypeSpecial) getItem(i);
         Log.e("gridveiw--",listGameTS.size() +","+(gameTypeSpecial == null));
-        int type = 0;
+        int type;
         if(gameTypeSpecial == null){
             type = 0;
 //            Bitmap bottomMap1 = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.classification_gengduoyouxo);

app/src/main/java/com/kfzs/duanduan/adp/DownloadMgrAdapter.java

@@ -82,13 +82,12 @@ public class DownloadMgrAdapter extends MDLAdpater<DownLoadInfo> {
         InstallButtonUtils installButtonUtils;
         if (mInstallButtonMgrMap.containsKey(model.getMDownloadUrl())) {
             installButtonUtils = mInstallButtonMgrMap.get(model.getMDownloadUrl());
-            mInstallButtonMgrMap.remove(installButtonUtils);
         } else {
             installButtonUtils = new InstallButtonUtils();
             installButtonUtils.setDownloadUrl(model.getMDownloadUrl());
+            mInstallButtonMgrMap.put(model.getMDownloadUrl(), installButtonUtils);
         }
         installButtonUtils.addBtnInt(targetBtn,position);
-        mInstallButtonMgrMap.put(model.getMDownloadUrl(), installButtonUtils);
         boolean isPkgInstalled = ApkUtils.getInstance().isPkgInstalled(model.getMPackageName());
 
         switch (model.getMStatus()) {

app/src/main/java/com/kfzs/duanduan/adp/ViewPagerFragmentAdapter.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 public class ViewPagerFragmentAdapter extends FragmentPagerAdapter {
 
-    private List<Fragment> mList = new ArrayList<>();
+    private List<Fragment> mList;
     public ViewPagerFragmentAdapter(FragmentManager fm , List<Fragment> list) {
         super(fm);
         this.mList = list;

app/src/main/java/com/kfzs/duanduan/bll/UrlBll.java

@@ -43,8 +43,8 @@ public final class UrlBll {
     //    public static final String REGULAR_URL = "^https?:\\/\\/(([a-zA-Z0-9_-])+(\\.)?)*(:\\d+)?(\\/((\\.)?(\\?)?=?&?[a-zA-Z0-9_-|#|%](\\?)?)*)*$";
     public static final String REGULAR_URL = "^https*:\\/\\/(([a-zA-Z0-9_-])+(\\.)?)*(:\\d+)?(\\/((\\.)?(\\?)?=?&?[a-zA-Z0-9_-|#|%](\\?)?)*)*$";
 
-    /**
-     * ******************** start所有的地址根 ********************
+    /*
+     ******************** start所有的地址根 ********************
      */
 
     /**

app/src/main/java/com/kfzs/duanduan/db/DataSave.java

@@ -3,9 +3,7 @@ package com.kfzs.duanduan.db;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.text.TextUtils;
 
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.data.graph.provider.channel.Channel;
 import com.kfzs.duanduan.datashare.DDProviderHelper;

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

@@ -1,142 +1,142 @@
-package com.kfzs.duanduan.fragment;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.View;
-import android.widget.TextView;
-
-import com.kfzs.duanduan.BaseCompatFragment;
-import com.kfzs.duanduan.bean.KFIntentKeys;
-import com.kfzs.duanduan.bean.UserRecord;
-import com.kfzs.duanduan.bean.YinkerData;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.ActivityManager;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
-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 rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
-
-/**
- * 借着玩界面
- * Created by realicing on 2018/04/02.
- * realicing@sina.com
- */
-public class FgtBorrowPlay extends BaseCompatFragment{
-
-    private TextView fgt_bp_tv;
-    private boolean unbind_phone = true;//没有绑定手机号
-    private UserRecord userRecord;
-    @Override
-    protected void initView(Bundle savedInstanceState) {
-        setContentView(R.layout.fgt_bp);
-        fgt_bp_tv = getViewById(R.id.fgt_bp_tv);
-        fgt_bp_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                boolean has_borrow = is(userRecord.getHave_access_state()) && !is(userRecord.getLoan_state());//已经借钱:借过款但是不允许借款
-                if(unbind_phone) {
-                } else if(userRecord == null){
-                    SpUtils.login(SheepApp.mContext,"");
-                    ActivityManager.getInstance().finishAllActivity();
-                    Jump2View.getInstance().goLoginView(SheepApp.mContext, "");
-                } else if(has_borrow){
-                    repay();
-                } else {
-                    borrow();
-                }
-            }
-        });
-        SheepApp.getInstance().getNetComponent().getApiService().userRecord()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        userRecord = baseMessage.getData(UserRecord.class);
-                        unbind_phone = false;
-                        boolean can_click = is(userRecord.getLoan_state()) || is(userRecord.getHave_access_state());//允许借款或者借过款就可以点击
-                        boolean has_open = is(userRecord.getHave_access_state());//已经开通:借过款就视为已经开通
-                        boolean has_borrow = is(userRecord.getHave_access_state()) && !is(userRecord.getLoan_state());//已经借钱:借过款但是不允许借款
-                        fgt_bp_tv.setText(getBtText(can_click, has_open, has_borrow));
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        unbind_phone = "请绑定手机号".equals(baseMessage.getMsg());
-                    }
-                });
-    }
-    private String getBtText(boolean can_click,boolean has_open,boolean has_borrow) {
-        if(can_click){
-            if(unbind_phone){//没有绑定手机号
-                return "累计充值500立即开通";
-            } else if(!has_open){//没有开通情况
-                return "立即开通";
-            } else if (has_borrow){//已经借款情况
-                return "立即还款";
-            } else {
-                return "立即借款";
-            }
-        } else {
-            return "累计充值500立即开通";
-        }
-    }
-    private boolean is(int state){//Yes=1,No=2
-        return state == 1;
-    }
-    //还钱
-    private void repay(){
-        SheepApp.getInstance().getNetComponent().getApiService().getYinkerRepaymentUrl()
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                gotoUrl(baseMessage);
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                G.showToast(baseMessage.getMsg());
-                            }
-                        });
-    }
-
-    private void gotoUrl(BaseMessage baseMessage) {
-        YinkerData yinkerData = baseMessage.getData(YinkerData.class);
-        if(yinkerData == null || TextUtils.isEmpty(yinkerData.getEntry_page_url())){
-            G.showToast(R.string.service_data_error);
-        } else {
-            Intent intent = new Intent(getActivity(), ActGuideDeblocked.class);
-            intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_URL, yinkerData.getEntry_page_url());
-            intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE, "借着玩");
-            startActivity(intent);
-        }
-    }
-
-    //借钱
-    private void borrow(){
-        SheepApp.getInstance().getNetComponent().getApiService().getYinkerLoanUrl()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        gotoUrl(baseMessage);
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage.getMsg());
-                    }
-                });
-    }
-
-}
+//package com.kfzs.duanduan.fragment;
+//
+//import android.content.Intent;
+//import android.os.Bundle;
+//import android.text.TextUtils;
+//import android.view.View;
+//import android.widget.TextView;
+//
+//import com.kfzs.duanduan.BaseCompatFragment;
+//import com.kfzs.duanduan.bean.KFIntentKeys;
+//import com.kfzs.duanduan.bean.UserRecord;
+//import com.kfzs.duanduan.bean.YinkerData;
+//import com.sheep.gamegroup.model.entity.BaseMessage;
+//import com.sheep.gamegroup.model.util.SheepSubscriber;
+//import com.sheep.gamegroup.util.ActivityManager;
+//import com.sheep.gamegroup.util.Jump2View;
+//import com.sheep.gamegroup.view.activity.ActGuideDeblocked;
+//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 rx.android.schedulers.AndroidSchedulers;
+//import rx.schedulers.Schedulers;
+//
+///**
+// * 借着玩界面
+// * Created by realicing on 2018/04/02.
+// * realicing@sina.com
+// */
+//public class FgtBorrowPlay extends BaseCompatFragment{
+//
+//    private TextView fgt_bp_tv;
+//    private boolean unbind_phone = true;//没有绑定手机号
+//    private UserRecord userRecord;
+//    @Override
+//    protected void initView(Bundle savedInstanceState) {
+//        setContentView(R.layout.fgt_bp);
+//        fgt_bp_tv = getViewById(R.id.fgt_bp_tv);
+//        fgt_bp_tv.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                boolean has_borrow = is(userRecord.getHave_access_state()) && !is(userRecord.getLoan_state());//已经借钱:借过款但是不允许借款
+//                if(unbind_phone) {
+//                } else if(userRecord == null){
+//                    SpUtils.login(SheepApp.mContext,"");
+//                    ActivityManager.getInstance().finishAllActivity();
+//                    Jump2View.getInstance().goLoginView(SheepApp.mContext, "");
+//                } else if(has_borrow){
+//                    repay();
+//                } else {
+//                    borrow();
+//                }
+//            }
+//        });
+//        SheepApp.getInstance().getNetComponent().getApiService().userRecord()
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+//                    @Override
+//                    public void onNext(BaseMessage baseMessage) {
+//                        userRecord = baseMessage.getData(UserRecord.class);
+//                        unbind_phone = false;
+//                        boolean can_click = is(userRecord.getLoan_state()) || is(userRecord.getHave_access_state());//允许借款或者借过款就可以点击
+//                        boolean has_open = is(userRecord.getHave_access_state());//已经开通:借过款就视为已经开通
+//                        boolean has_borrow = is(userRecord.getHave_access_state()) && !is(userRecord.getLoan_state());//已经借钱:借过款但是不允许借款
+//                        fgt_bp_tv.setText(getBtText(can_click, has_open, has_borrow));
+//                    }
+//
+//                    @Override
+//                    public void onError(BaseMessage baseMessage) {
+//                        unbind_phone = "请绑定手机号".equals(baseMessage.getMsg());
+//                    }
+//                });
+//    }
+//    private String getBtText(boolean can_click,boolean has_open,boolean has_borrow) {
+//        if(can_click){
+//            if(unbind_phone){//没有绑定手机号
+//                return "累计充值500立即开通";
+//            } else if(!has_open){//没有开通情况
+//                return "立即开通";
+//            } else if (has_borrow){//已经借款情况
+//                return "立即还款";
+//            } else {
+//                return "立即借款";
+//            }
+//        } else {
+//            return "累计充值500立即开通";
+//        }
+//    }
+//    private boolean is(int state){//Yes=1,No=2
+//        return state == 1;
+//    }
+//    //还钱
+//    private void repay(){
+//        SheepApp.getInstance().getNetComponent().getApiService().getYinkerRepaymentUrl()
+//                        .subscribeOn(Schedulers.io())
+//                        .observeOn(AndroidSchedulers.mainThread())
+//                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+//                            @Override
+//                            public void onNext(BaseMessage baseMessage) {
+//                                gotoUrl(baseMessage);
+//                            }
+//
+//                            @Override
+//                            public void onError(BaseMessage baseMessage) {
+//                                G.showToast(baseMessage.getMsg());
+//                            }
+//                        });
+//    }
+//
+//    private void gotoUrl(BaseMessage baseMessage) {
+//        YinkerData yinkerData = baseMessage.getData(YinkerData.class);
+//        if(yinkerData == null || TextUtils.isEmpty(yinkerData.getEntry_page_url())){
+//            G.showToast(R.string.service_data_error);
+//        } else {
+//            Intent intent = new Intent(getActivity(), ActGuideDeblocked.class);
+//            intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_URL, yinkerData.getEntry_page_url());
+//            intent.putExtra(KFIntentKeys.EXTRA_WEBVIEW_TITLE, "借着玩");
+//            startActivity(intent);
+//        }
+//    }
+//
+//    //借钱
+//    private void borrow(){
+//        SheepApp.getInstance().getNetComponent().getApiService().getYinkerLoanUrl()
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+//                    @Override
+//                    public void onNext(BaseMessage baseMessage) {
+//                        gotoUrl(baseMessage);
+//                    }
+//
+//                    @Override
+//                    public void onError(BaseMessage baseMessage) {
+//                        G.showToast(baseMessage.getMsg());
+//                    }
+//                });
+//    }
+//
+//}

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

@@ -1,7 +1,6 @@
 package com.kfzs.duanduan.fragment;
 
 import android.app.Activity;
-import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;

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

@@ -1,7 +1,6 @@
 package com.kfzs.duanduan.fragment;
 
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.ILog;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 

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

@@ -1,6 +1,5 @@
 package com.kfzs.duanduan.fragment;
 
-import android.content.pm.PackageInfo;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -21,28 +20,17 @@ import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.entity.Version;
-import com.sheep.gamegroup.model.entity.VersionInfo;
-import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.ConnectAddress;
 import com.sheep.gamegroup.util.FastJsonUtils;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.SysAppUtil;
-import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.tencent.bugly.beta.Beta;
-import com.tencent.bugly.beta.UpgradeInfo;
-
-import java.io.File;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

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

@@ -80,14 +80,10 @@ import com.sheep.gamegroup.view.adapter.AdpHomeListListview;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.customview.SheepViewPager;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
-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.sunfusheng.marqueeview.MarqueeView;
-import com.umeng.socialize.ShareAction;
-import com.umeng.socialize.UMShareListener;
-import com.umeng.socialize.bean.SHARE_MEDIA;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -98,7 +94,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 
 import javax.inject.Inject;
 
@@ -411,7 +406,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     @OnClick({R.id.recharge, R.id.user_layout, R.id.withdrawal, R.id.try_play_layout,
             R.id.invitation_layout, R.id.lying_layout, R.id.newbie_task,
-            R.id.card_layout, R.id.icon_layout, R.id.info_layout, R.id.homepage_wxfz,
+            R.id.card_layout, R.id.icon_layout, R.id.info_layout,
             R.id.q_iv, R.id.q_name_tv, R.id.q_dec_tv,
             R.id.lying_iv, R.id.lying_dec_tv, R.id.lying_name_tv})
     public void onViewClicked(View view) {
@@ -462,9 +457,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                             }
                         });
                 break;
-            case R.id.homepage_wxfz://微信辅助任务
-                Jump2View.getInstance().tryGoWxfz(activity,null);
-                break;
             case R.id.icon_layout://
                 if(TestUtil.isTest()) {
                     TestUtil.test(getActivity());

app/src/main/java/com/kfzs/duanduan/oem/AppAddOrdelReceiver.java

@@ -70,8 +70,8 @@ public class AppAddOrdelReceiver extends BroadcastReceiver {
             EventBus.getDefault().post(intent);
         }
 
-        /**
-         * 安装失败
+        /*
+          安装失败
          */
         if(Intent.ACTION_INSTALL_FAILURE.equals(intent.getAction())){
             try {

app/src/main/java/com/kfzs/duanduan/react/FileUtil.java

@@ -39,7 +39,7 @@ public class FileUtil {
             BufferedReader br = new BufferedReader(new InputStreamReader(is));
 
             try {
-                String data = null;
+                String data;
                 while ((data = br.readLine()) != null) {
                     sDest.append(data);
                     sDest.append("\n");
@@ -50,9 +50,7 @@ public class FileUtil {
                 }
             } finally {
                 is.close();
-                is = null;
                 br.close();
-                br = null;
             }
         } catch (Exception ex) {
             if (KFZSApp.DEBUG) {
@@ -86,7 +84,7 @@ public class FileUtil {
             BufferedReader br = new BufferedReader(new InputStreamReader(is));
 
             try {
-                String data = null;
+                String data;
                 while ((data = br.readLine()) != null) {
                     list.add(data);
                 }
@@ -96,9 +94,7 @@ public class FileUtil {
                 }
             } finally {
                 is.close();
-                is = null;
                 br.close();
-                br = null;
             }
         } catch (Exception ex) {
             if (KFZSApp.DEBUG) {

app/src/main/java/com/kfzs/duanduan/react/MainTab.java

@@ -3,8 +3,6 @@ package com.kfzs.duanduan.react;
 import android.support.v4.app.Fragment;
 
 import com.kfzs.duanduan.ActMain;
-import com.kfzs.duanduan.fragment.FgtMainCategory;
-import com.kfzs.duanduan.fragment.FgtMainGame;
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.jiuyan.samllsheep.R;

app/src/main/java/com/kfzs/duanduan/react/upfile/UpFileUtils.java

@@ -5,7 +5,6 @@ import android.graphics.Bitmap;
 
 import com.nanchen.compresshelper.CompressHelper;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.G;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.Callback;
 

app/src/main/java/com/kfzs/duanduan/utils/ApkUtils.java

@@ -11,7 +11,6 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Base64;
-import android.widget.Toast;
 
 import com.kfzs.duanduan.KFZSApp;
 import com.sheep.jiuyan.samllsheep.R;
@@ -20,7 +19,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
-import java.io.File;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
@@ -91,8 +89,8 @@ public class ApkUtils {
 
         PackageUtil.installApk(context, apkPath);
 
-        /**
-         * 设置包名
+        /*
+          设置包名
          */
         SheepApp.getInstance()
                 .setPackgeName(

app/src/main/java/com/kfzs/duanduan/utils/GameStatusScanner.java

@@ -366,12 +366,12 @@ public abstract class GameStatusScanner {
         if (success) {
             if (bPauseTask) {
                 mTarget.setText(R.string.pausing);
-                /*****TODO 这里是暂时的解决方法，不是很完***/
+                /****TODO 这里是暂时的解决方法，不是很完***/
                 DownloadStatus event = new DownloadStatus();
                 event.setDownloadUrl(downloadUrl);
                 event.setStatus(DownloadTaskService.STATUS_PAUSE);
                 EventBus.getDefault().post(event);
-                /*********************************/
+                /********************************/
                 downloadTaskService.pause(downLoadInfo);
             } else {
                 //这里应该改为安装中，而不是安装

app/src/main/java/com/kfzs/duanduan/utils/dlg/FormatAny.java

@@ -89,7 +89,7 @@ public class FormatAny {
         if (TextUtils.isEmpty(money)) {
             return "0";
         }
-        String backStr = "";
+        StringBuilder backStr = new StringBuilder();
         String highNum;
         String lowNum = "";
         //原始money格式化处理后
@@ -106,13 +106,13 @@ public class FormatAny {
         }
         int len = highNum.length();
         for (int i = 0; i < len; i++) {
-            backStr = highNum.charAt(len - i - 1) + backStr;
+            backStr.insert(0, highNum.charAt(len - i - 1));
             if (i % 3 == 2 && i != len - 1) {
-                backStr = "," + backStr;
+                backStr.insert(0, ",");
             }
         }
-        backStr = backStr + lowNum;
-        return backStr.equals("") ? "0" : backStr;
+        backStr.append(lowNum);
+        return backStr.toString().equals("") ? "0" : backStr.toString();
     }
 
 
@@ -124,7 +124,7 @@ public class FormatAny {
      */
     public String getFileSize(long fileS) {// 转换文件大小
         DecimalFormat df = new DecimalFormat("#.00");
-        String fileSizeString = "";
+        String fileSizeString;
         if (fileS < 1024) {
             fileSizeString = df.format((double) fileS) + "B";
         } else if (fileS < 1048576) {

app/src/main/java/com/kfzs/duanduan/utils/sys/ChannelContent.java

@@ -9,9 +9,6 @@ import com.kfzs.duanduan.datashare.DDProviderHelper;
 
 import java.io.IOException;
 import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 

app/src/main/java/com/kfzs/duanduan/view/AppHomepageAdvertisementDialog.java

@@ -84,7 +84,7 @@ public class AppHomepageAdvertisementDialog extends Dialog {
             try {
                 Glide.with(context).load(imagePath)
                         .apply(new RequestOptions()
-                        .error(R.drawable.loading))
+                        .error(R.drawable.loading_01))
                         .into(backgroundImg);
             } catch (Exception e) {
                 e.printStackTrace();

app/src/main/java/com/kfzs/duanduan/view/FilterWindow.java

@@ -192,19 +192,19 @@ public class FilterWindow implements View.OnClickListener {
                 }
 
 
-                String selectedTagIndex = "";
+                StringBuilder selectedTagIndex = new StringBuilder();
                 for(int i = 0 ; i < conditions.size() ; i ++){
                     TagFlowLayout tflContent = contentView.findViewWithTag(FilterWindowAdapter.FLOW_LAYOUT_TAG + i);
                     if (tflContent == null){
                         return ;
                     }
                     Set<Integer> selectedList =  tflContent.getSelectedList();
-                    selectedTagIndex += getGameTypesIndex(i , selectedList);
+                    selectedTagIndex.append(getGameTypesIndex(i, selectedList));
 
                     mCheckedTagsContainer.put(i , selectedList);
                 }
 
-                if ("".equals(selectedTagIndex)){
+                if ("".equals(selectedTagIndex.toString())){
                     return ;
                 }
 
@@ -230,12 +230,12 @@ public class FilterWindow implements View.OnClickListener {
     private String getGameTypesIndex(int category , Set<Integer> selectedList){
         List<GameTypeOuterClass.GameType> types = conditions.get(category).getTags();
 
-        String strTempIndex = "";
+        StringBuilder strTempIndex = new StringBuilder();
         for(Integer index : selectedList){
-            strTempIndex += types.get(index).getId() +",";
+            strTempIndex.append(types.get(index).getId()).append(",");
         }
 
-        return strTempIndex;
+        return strTempIndex.toString();
     }
 
     public static Map<Integer , Set<Integer>> getCheckedTagsContainer(){

app/src/main/java/com/kfzs/duanduan/view/ImageGlarry.java

@@ -216,7 +216,7 @@ public class ImageGlarry {
     }
 
     private class cls_main implements View.OnClickListener {
-        private int position = 0;
+        private int position;
 
         public cls_main(int pos) {
             position = pos;

app/src/main/java/com/kfzs/duanduan/view/ViewPagerPlus.java

@@ -31,8 +31,6 @@ public class ViewPagerPlus extends ViewPager {
 
         switch (ev.getAction()) {
             case MotionEvent.ACTION_DOWN:
-                dealtX = 0;
-                dealtY = 0;
                 // 保证子View能够接收到Action_move事件
                 getParent().requestDisallowInterceptTouchEvent(true);
                 break;

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
-import android.widget.Toast;
 
 import butterknife.ButterKnife;
 

app/src/main/java/com/sheep/gamegroup/di/components/SignCardComponent.java

@@ -2,7 +2,6 @@ package com.sheep.gamegroup.di.components;
 
 import com.sheep.gamegroup.di.modules.SignCardModule;
 import com.sheep.gamegroup.di.scopes.UserScope;
-import com.sheep.gamegroup.view.activity.RechargeQAct;
 import com.sheep.gamegroup.view.activity.SignCardAct;
 
 import dagger.Component;

app/src/main/java/com/sheep/gamegroup/di/components/SignRankingsComponent.java

@@ -1,11 +1,8 @@
 package com.sheep.gamegroup.di.components;
 
 import com.kfzs.duanduan.fragment.FgtSignRankings;
-import com.sheep.gamegroup.di.modules.RechargeQModule;
 import com.sheep.gamegroup.di.modules.SignRankingsModule;
 import com.sheep.gamegroup.di.scopes.UserScope;
-import com.sheep.gamegroup.view.activity.RechargeQAct;
-import com.sheep.gamegroup.view.activity.SignRankingsAct;
 
 import dagger.Component;
 

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -340,8 +340,7 @@ public interface ApiService {
     Observable<BaseMessage> getRechargeQQLog(@Query("page") int page, @Query("per_page") int per_page);
 
 
-
-    /******div***/
+    /*****div***/
 
     /**
      * 获取下发充值类型
@@ -368,7 +367,7 @@ public interface ApiService {
     @POST("app/recharge/recharge_qq_coin")
     Observable<BaseMessage> goRechargeQ(@Body JSONObject parame);
 
-    /******div***/
+    /*****div***/
 
     /**
      * 关于我们
@@ -400,7 +399,7 @@ public interface ApiService {
     Observable<BaseMessage> agreementBack(@Body JSONArray jsonArray);
 
 
-    /*****************div****************/
+    /****************div****************/
 
     /**
      * 获取累计打卡记录

app/src/main/java/com/sheep/gamegroup/model/entity/MoreDataEntity.java

@@ -1,5 +1,5 @@
-/**
- * Copyright 2018 bejson.com
+/*
+  Copyright 2018 bejson.com
  */
 package com.sheep.gamegroup.model.entity;
 

app/src/main/java/com/sheep/gamegroup/model/util/AddPuplicParameIntercept.java

@@ -28,13 +28,10 @@ public class AddPuplicParameIntercept implements Interceptor {
     @Override
     public Response intercept(Chain chain) throws IOException {
         Request oldRequest = chain.request();
-        String url = oldRequest.url().toString();
-        Response response = null;
         //新的请求，添加参数
         Request newRequest = addParam(oldRequest);
 
-        response = chain.proceed(newRequest);
-        return response;
+        return chain.proceed(newRequest);
     }
 
     /**

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -1,24 +1,16 @@
 package com.sheep.gamegroup.model.util;
 
 import android.content.Context;
-import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-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 retrofit2.adapter.rxjava.HttpException;
 import rx.Subscriber;
 
 /**

app/src/main/java/com/sheep/gamegroup/presenter/SignCardContract.java

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.presenter;
 
-import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 
 /**

app/src/main/java/com/sheep/gamegroup/receiver/ExampleUtil.java

@@ -68,7 +68,7 @@ public class ExampleUtil {
                     appKey = null;
                 }
             }
-        } catch (NameNotFoundException e) {
+        } catch (NameNotFoundException ignored) {
 
         }
         return appKey;

app/src/main/java/com/sheep/gamegroup/receiver/SheepJpushReceiver.java

@@ -65,7 +65,7 @@ public class SheepJpushReceiver extends BroadcastReceiver {
             } else {
                 Log.d(TAG, "[SheepJpushReceiver] Unhandled intent - " + intent.getAction());
             }
-        } catch (Exception e){
+        } catch (Exception ignored){
 
         }
 

app/src/main/java/com/sheep/gamegroup/statistics/AppStatistics.java

@@ -6,8 +6,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.ChannelContent;
-import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;

app/src/main/java/com/sheep/gamegroup/util/ActivityManager.java

@@ -35,7 +35,6 @@ public class ActivityManager {
         if(activity != null){
             activity.finish();
             activityStack.remove(activity);
-            activity = null;
         }
     }
     /**

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -22,8 +22,6 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
-import com.kfzs.duanduan.fragment.FgtSmallSheep;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.alipay.PayResult;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -33,24 +31,19 @@ import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
-import com.sheep.gamegroup.view.activity.RechargeAct;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.service.MonitorAppService;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.umeng.socialize.media.UMWeb;
@@ -152,7 +145,6 @@ public class CommonUtil {
                 count = count + 2;
             }
             if(maxLen==count || (item>=128 && maxLen+1==count)){
-                endIndex=i;
             }
         }
 //        if (count <= maxLen) {
@@ -205,41 +197,8 @@ public class CommonUtil {
         }
     }
 
-    /**
-     * 倒计时
-     */
-    public void countDownTimer(final TextView tv, long full_second, SelfCountDownTimer countDownUtil){
-        countDownUtil = new SelfCountDownTimer(full_second * 1000, 1000,(int)full_second) {
-            @Override
-            public void onTimerRest() {
-                tv.setText("");
-            }
-
-            @Override
-            public void onTimerTick(long millisUntilFinished, int counTime) {
-                String textStr = counTime + " s";
-                tv.setText("");
-            }
-
-            @Override
-            public void onTimerFinish() {
-                tv.setText("");
-            }
-        };
-    }
-
-    /**
-     * 任务倒计时
-     * 组装String
-     * 若00:00:00后任务未完成，视为自动放弃，您可重新接受
-     */
-    public String assemblyString(String date){
-        String str = "若<font color='#ff2d4b'><small>" + date + "</small></font>后任务未完成，视为自动放弃，您可重新接受";
-        return str;
-    }
     public String assemblyStrings(String date, String notice){
-        String str = notice + "<font color='#ff2d4b'><small>" + date + "</small></font>";
-        return str;
+        return notice + "<font color='#ff2d4b'><small>" + date + "</small></font>";
     }
     /**
      * 任务传送数据组装
@@ -292,8 +251,8 @@ public class CommonUtil {
                 Drawable mipmap = context.getResources().getDrawable(
                         getResourceId(source)
                 );
-                mipmap.setBounds(0, 0, mipmap.getIntrinsicWidth() / 1,
-                        mipmap.getIntrinsicHeight() / 1);
+                mipmap.setBounds(0, 0, mipmap.getIntrinsicWidth(),
+                        mipmap.getIntrinsicHeight());
                 return mipmap;
             }
         }, null);
@@ -580,7 +539,7 @@ public class CommonUtil {
      * 任务详情、连续任务、子任务组装
      */
     public void bindDataTaskDetailSon(TaskChild taskChild, TextView textView, int i){
-        String state = "";
+        String state;
         switch (taskChild.getStatus()){
             case 1:
             default:
@@ -609,7 +568,7 @@ public class CommonUtil {
     }
     public void bindDataTaskDetailSonStep(TaskDescEntity taskDescEntity, TextView textView, int i){
 
-        String state = "";
+        String state;
         switch (i+1){
             case 1:
             default:
@@ -677,7 +636,6 @@ public class CommonUtil {
         SelfCountDownTimer scTimer = timerHashMap.get(textView);
         if(scTimer != null){
             scTimer.cancel();
-            scTimer = null;
         }
     }
     public void addTimerHashMap(TextView textView, SelfCountDownTimer selfCountDownTimer){
@@ -696,12 +654,9 @@ public class CommonUtil {
                 Map.Entry pairs = (Map.Entry) it.next();
                 SelfCountDownTimer cdt = (SelfCountDownTimer) pairs.getValue();
                 cdt.cancel();
-                cdt = null;
             } catch (Exception ignored) {
             }
         }
-        it = null;
-        s = null;
         timerHashMap.clear();
     }
 
@@ -729,7 +684,7 @@ public class CommonUtil {
                     .setCallback(new UMShareListener())
                     .open();
         }else {
-            SHARE_MEDIA share_media = SHARE_MEDIA.QQ;
+            SHARE_MEDIA share_media;
             if(type.equals("qq")){
                 share_media = SHARE_MEDIA.QQ;
             }else {
@@ -787,10 +742,10 @@ public class CommonUtil {
                     public void run() {
 
                         PayResult payResult = new PayResult(result);
-                        /**
-                         * 同步返回的结果必须放置到服务端进行验证（验证的规则请看https://doc.open.alipay.com/doc2/
-                         * detail.htm?spm=0.0.0.0.xdvAU6&treeId=59&articleId=103665&
-                         * docType=1) 建议商户依赖异步通知
+                        /*
+                          同步返回的结果必须放置到服务端进行验证（验证的规则请看https://doc.open.alipay.com/doc2/
+                          detail.htm?spm=0.0.0.0.xdvAU6&treeId=59&articleId=103665&
+                          docType=1) 建议商户依赖异步通知
                          */
 //						String resultInfo = payResult.getResult();// 同步返回需要验证的信息
 

app/src/main/java/com/sheep/gamegroup/util/DeviceIDUtil.java

@@ -10,7 +10,6 @@ import android.os.Environment;
 import android.support.v4.app.ActivityCompat;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
-import android.util.Base64;
 import android.util.Log;
 
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
@@ -29,10 +28,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 
-import javax.crypto.Cipher;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
 /**
  * Created by realicing on 2018/5/24.
  * realicing@sina.com
@@ -124,7 +119,7 @@ public class DeviceIDUtil {
     }
 
     private static void saveFile(String str) {
-        String filePath = null;
+        String filePath;
         boolean hasSDCard = Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED);
         if (hasSDCard) { // SD卡根目录的hello.text
             filePath = Environment.getExternalStorageDirectory().toString() + File.separator + FILE_PATH + File.separator + getFileName();
@@ -171,7 +166,7 @@ public class DeviceIDUtil {
 
     private static String readSDFile() {
         try {
-            String filePath = null;
+            String filePath;
             boolean hasSDCard = Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED);
             if (hasSDCard) { // SD卡根目录的hello.text
                 filePath = Environment.getExternalStorageDirectory().toString() + File.separator + FILE_PATH + File.separator + getFileName();
@@ -309,7 +304,7 @@ public class DeviceIDUtil {
                 }
                 return mac;
             }
-        } catch (Exception ex) {
+        } catch (Exception ignored) {
         }
         return null;
     }
@@ -387,7 +382,7 @@ public class DeviceIDUtil {
                 savaString(mContext, LOACL_IMEI, imei);
             }
             return imei;
-        } catch (Exception e) {
+        } catch (Exception ignored) {
 
         }
         return null;

app/src/main/java/com/sheep/gamegroup/util/GlideImageLoader.java

@@ -5,6 +5,7 @@ import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
+import com.sheep.jiuyan.samllsheep.R;
 
 /**
  * Created by realicing on 2018/3/26.
@@ -20,4 +21,11 @@ public class GlideImageLoader {
                 .placeholder(id))
                 .into(imageView);
     }
+    public static void displayImage(Activity activity, ImageView imageView, String path){
+        Glide.with(activity)
+                .load(path)
+                .apply(new RequestOptions().centerCrop()
+                .placeholder(R.drawable.loading_01))
+                .into(imageView);
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/ImageGlarryDrawable.java

@@ -273,7 +273,7 @@ public class ImageGlarryDrawable {
     }
 
     private class cls_main implements View.OnClickListener {
-        private int position = 0;
+        private int position;
 
         public cls_main(int pos) {
             position = pos;

app/src/main/java/com/sheep/gamegroup/util/ListUtil.java

@@ -2,7 +2,6 @@ package com.sheep.gamegroup.util;
 
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 

app/src/main/java/com/sheep/gamegroup/util/LocationUtils.java

@@ -11,12 +11,9 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.text.TextUtils;
-import android.widget.Toast;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
-import java.util.HashMap;
-
 /**
  * Created by ljy on 2018/5/11.
  */

app/src/main/java/com/sheep/gamegroup/util/MathUtil.java

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.util;
 
-/**
- * Created by Administrator on 2018/5/24.
+/*
+  Created by Administrator on 2018/5/24.
  */
 
 import java.math.BigDecimal;

app/src/main/java/com/sheep/gamegroup/util/MyDbManager.java

@@ -6,9 +6,7 @@ import android.os.Handler;
 import com.sheep.gamegroup.model.entity.AppRecord;
 import com.sheep.gamegroup.model.entity.LoginUser;
 import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
-import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 

app/src/main/java/com/sheep/gamegroup/util/OkHttpImageDownloader.java

@@ -36,7 +36,7 @@ public class OkHttpImageDownloader {
                 FileOutputStream fos = new FileOutputStream(FileUtil.createFile(pictureName));
                 InputStream in = response.body().byteStream();
                 byte[] buf = new byte[1024];
-                int len = 0;
+                int len;
                 while ((len = in.read(buf))!=-1){
                     fos.write(buf,0,len);
                 }

app/src/main/java/com/sheep/gamegroup/util/SelfCountDownTimer.java

@@ -8,7 +8,7 @@ import android.os.CountDownTimer;
 
 public abstract class SelfCountDownTimer extends CountDownTimer{
     public static final int FULL_SECOND = 60;
-    private int countTime = FULL_SECOND;
+    private int countTime;
     /**
      * @param millisInFuture    The number of millis in the future from the call
      *                          to {@link #start()} until the countdown is done and {@link #onFinish()}

app/src/main/java/com/sheep/gamegroup/util/SysAppUtil.java

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.util;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
@@ -11,7 +10,6 @@ import android.os.Build;
 import android.provider.AlarmClock;
 import android.text.TextUtils;
 import android.text.format.Formatter;
-import android.view.Gravity;
 import android.view.View;
 import android.widget.TextView;
 
@@ -29,7 +27,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
-import com.tencent.bugly.beta.Beta;
 import com.zhy.http.okhttp.OkHttpUtils;
 import com.zhy.http.okhttp.callback.FileCallBack;
 
@@ -332,7 +329,8 @@ public class SysAppUtil {
                         LogUtil.println("baseMessage onNext " + JSON.toJSONString(baseMessage));
                         final Version version = baseMessage.getData(Version.class);
                         if(version == null){
-                            G.showToast(baseMessage);
+                            if(ignoreMd5 == null)
+                                G.showToast(baseMessage);
                             return;
                         }
                         if(ignoreMd5 != null && TextUtils.equals(ignoreMd5, version.getMd5_address()) && !version.isForceUpdate()){
@@ -341,8 +339,8 @@ public class SysAppUtil {
                         }
                         String fileMD5 = SysAppUtil.getConnectAdrressFileMD5();
                         if(TextUtils.isEmpty(fileMD5)){
-//                            G.showToast(R.string.unknown_error);
-                            Beta.checkUpgrade();//检查版本号
+                            if(ignoreMd5 == null)
+                                G.showToast(baseMessage);
                             return;
                         }
                         if(fileMD5.equalsIgnoreCase(version.getMd5_address())){//已经是最新版本
@@ -414,7 +412,8 @@ public class SysAppUtil {
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         LogUtil.println("baseMessage onError " + JSON.toJSONString(baseMessage));
-                        G.showToast(baseMessage);
+                        if(ignoreMd5 == null)
+                            G.showToast(baseMessage);
                     }
                 });
     }

app/src/main/java/com/sheep/gamegroup/util/TimeUtil.java

@@ -75,9 +75,9 @@ public class TimeUtil {
         long minute = (second - hour * 60 * 60) / 60;
         long sec = (second - hour * 60 * 60) - minute * 60;
 
-        String rHour = "";
-        String rMin = "";
-        String rSs = "";
+        String rHour;
+        String rMin;
+        String rSs;
         // 时
         if (hour < 10) {
             rHour = "0" + hour;

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.util;
 
 import android.app.Activity;
-import android.app.Dialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -11,7 +10,6 @@ import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
-import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.text.TextUtils;
@@ -40,7 +38,6 @@ import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
-import com.tencent.bugly.beta.Beta;
 
 import java.io.File;
 import java.io.FileNotFoundException;

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

@@ -7,8 +7,6 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.event.BigEvent;
@@ -19,38 +17,26 @@ import com.sheep.gamegroup.event.ImageHeadChange;
 import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.RealNameAutehrChange;
 import com.sheep.gamegroup.event.UserNameChange;
-import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.AccountAndSecuritContract;
 import com.sheep.gamegroup.presenter.AccountAndSecuritPresenter;
-import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyDbManager;
-import com.sheep.gamegroup.util.UMConfigUtils;
 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 com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-import com.umeng.socialize.UMAuthListener;
-import com.umeng.socialize.UMShareAPI;
-import com.umeng.socialize.bean.SHARE_MEDIA;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
-import org.xutils.ex.DbException;
-
-import java.util.Map;
 
 import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 /**
  * Created by Administrator on 2018/3/16.

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

@@ -3,7 +3,6 @@ package com.sheep.gamegroup.view.activity;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
-import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.fragment.FgtCreditCardProgressQuery;

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

@@ -6,13 +6,11 @@ import android.webkit.WebView;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;
-import butterknife.OnClick;
 
 /**
  * Created by realicing on 2018/5/10.

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

@@ -11,13 +11,11 @@ import android.util.Log;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import com.kfzs.appstore.utils.restful.KFZSNetwork;
 import com.kfzs.duanduan.ActDownloadMgr;
 import com.kfzs.duanduan.ActGameDetails;
-import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.ActSearch;
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.bean.KFIntentKeys;
@@ -146,8 +144,8 @@ public class ActMainGame extends BaseActivity {
         // TODO: add setContentView(...) invocation
         ButterKnife.bind(this);
     }
-    /**
-     *移植过来
+    /*
+     移植过来
      */
     /**
      * 获取首页弹窗Dialog广告

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

@@ -4,7 +4,6 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -22,7 +21,6 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.UserAssets;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;

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

@@ -1,6 +1,5 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.text.method.ScrollingMovementMethod;
 import android.view.View;
 import android.webkit.WebView;
 import android.widget.TextView;
@@ -11,8 +10,6 @@ import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import java.util.Locale;
-
 import butterknife.BindView;
 import butterknife.OnClick;
 

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

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 

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

@@ -3,7 +3,6 @@ package com.sheep.gamegroup.view.activity;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -11,7 +10,6 @@ import android.os.Environment;
 import android.provider.MediaStore;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
@@ -22,8 +20,6 @@ import android.webkit.WebViewClient;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;
-import com.kfzs.duanduan.KFZSApp;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
@@ -45,7 +41,6 @@ import java.io.IOException;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import me.iwf.photopicker.PhotoPicker;
 import okhttp3.Call;
 
 import static com.kfzs.duanduan.bean.KFIntentKeys.EXTRA_WEBVIEW_NO_TITLE;
@@ -167,7 +162,7 @@ public class ActWeb extends BaseCompatActivity {
                 Intent takePictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
                 if (takePictureIntent.resolveActivity(getPackageManager()) != null) {
                     // Create the File where the photo should go
-                    File photoFile = null;
+                    File photoFile;
                     photoFile = createImageFile();
                     takePictureIntent.putExtra("PhotoPath", mCameraPhotoPath);
 
@@ -177,7 +172,6 @@ public class ActWeb extends BaseCompatActivity {
                         takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT,
                                 Uri.fromFile(photoFile));
                     } else {
-                        takePictureIntent = null;
                     }
                 }
 

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

@@ -1,8 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import android.os.Handler;
-import android.os.Message;
 import android.support.v7.widget.AppCompatEditText;
 import android.text.TextUtils;
 import android.util.Log;

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

@@ -24,7 +24,6 @@ import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.kfzs.duanduan.ActDownloadMgr;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
@@ -35,7 +34,6 @@ import com.sheep.gamegroup.di.modules.TaskDialogModule;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.Ext;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskState;
 import com.sheep.gamegroup.model.util.EntityUtils;
@@ -48,18 +46,15 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.TaskStateAdapter;
-import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 
 import org.greenrobot.eventbus.EventBus;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -72,8 +67,6 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
-import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
-
 /**
  * 弹框activity
  * Created by ljy on 2018/3/20.

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

@@ -4,7 +4,6 @@ import android.os.Bundle;
 import android.support.design.widget.TextInputEditText;
 
 import com.alibaba.fastjson.JSONObject;
-import com.googlecode.protobuf.format.util.TextUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;

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

@@ -11,13 +11,10 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import com.alibaba.fastjson.JSONArray;
 import com.kfzs.duanduan.ActDownloadMgr;
 import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
@@ -25,21 +22,16 @@ import com.sheep.gamegroup.view.adapter.AdpTrymakemoneyTabGridview;
 import com.sheep.gamegroup.view.fragment.FgtGameMakeMoney;
 import com.sheep.gamegroup.view.fragment.FgtMyGame;
 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.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 /**
  * 游戏任务

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

@@ -6,13 +6,11 @@ import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSONObject;
-import com.arialyy.aria.core.Aria;
 import com.kfzs.duanduan.react.MainTab;
 import com.sheep.gamegroup.model.entity.JPushMessage;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.Locale;
@@ -42,15 +40,15 @@ public class MiddleAct extends Activity {
     private void doAction(){
         Bundle bundle = getIntent().getExtras();
         if (bundle != null) {
-            /**
-             *  key = app,value = com.sheep.jiuyan.samllsheep
-             *  key = cn.jpush.android.ALERT,value = 带有参数的通知
-             *  key = cn.jpush.android.EXTRA,value = {"id":"976873","name":"zjb"}
-             *  key = cn.jpush.android.NOTIFICATION_ID,value = 185860616
-             *  key = cn.jpush.android.ALERT_TYPE,value = 7
-             *  key = cn.jpush.android.NOTIFICATION_CONTENT_TITLE,value = 小绵羊
-             *  key = cn.jpush.android.MSG_ID,value = 2150932953
-             *  key = sdktype,value = JPUSH
+            /*
+               key = app,value = com.sheep.jiuyan.samllsheep
+               key = cn.jpush.android.ALERT,value = 带有参数的通知
+               key = cn.jpush.android.EXTRA,value = {"id":"976873","name":"zjb"}
+               key = cn.jpush.android.NOTIFICATION_ID,value = 185860616
+               key = cn.jpush.android.ALERT_TYPE,value = 7
+               key = cn.jpush.android.NOTIFICATION_CONTENT_TITLE,value = 小绵羊
+               key = cn.jpush.android.MSG_ID,value = 2150932953
+               key = sdktype,value = JPUSH
              */
             for (String key : bundle.keySet()) {
                 if (BuildConfig.DEBUG)

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

@@ -26,9 +26,9 @@ public class NotificationsUtils {
             String pkg = context.getApplicationContext().getPackageName();
             int uid = appInfo.uid;
 
-            Class appOpsClass = null;
             try {
-                appOpsClass = Class.forName(AppOpsManager.class.getName());
+                Class appOpsClass = Class.forName(AppOpsManager.class.getName());
+
                 Method checkOpNoThrowMethod = appOpsClass.getMethod(CHECK_OP_NO_THROW, Integer.TYPE, Integer.TYPE,
                         String.class);
                 Field opPostNotificationValue = appOpsClass.getDeclaredField(OP_POST_NOTIFICATION);

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

@@ -4,26 +4,12 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.util.Log;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.di.components.DaggerPersonalCenterComponent;
-import com.sheep.gamegroup.di.modules.PersonalCenterModule;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.presenter.PersonalCenterContract;
-import com.sheep.gamegroup.presenter.PersonalCenterPresenter;
-import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import javax.inject.Inject;
-
 /**
  * 个人中心首页
  * Created by ljy on 2018/3/10.

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

@@ -72,8 +72,8 @@ public class RechargeAct extends BaseActivity {
     @Override
     public void initData() {
         addDatas();
-        /**
-         * 支付金额选择
+        /*
+          支付金额选择
          */
         rechargePriceAdapter = new RechargePriceAdapter(RechargeAct.this, mPriceEntityList);
         rechargeprice_greidview.setVerticalSpacing(20);
@@ -98,8 +98,8 @@ public class RechargeAct extends BaseActivity {
         });
 
 
-        /**
-         * 支付方式选择
+        /*
+          支付方式选择
          */
         rechargeAdapter = new RechargeAdapter(RechargeAct.this);
         rechargeGreidview.setVerticalSpacing(40);
@@ -239,10 +239,10 @@ public class RechargeAct extends BaseActivity {
                     public void run() {
 
                         PayResult payResult = new PayResult(result);
-                        /**
-                         * 同步返回的结果必须放置到服务端进行验证（验证的规则请看https://doc.open.alipay.com/doc2/
-                         * detail.htm?spm=0.0.0.0.xdvAU6&treeId=59&articleId=103665&
-                         * docType=1) 建议商户依赖异步通知
+                        /*
+                          同步返回的结果必须放置到服务端进行验证（验证的规则请看https://doc.open.alipay.com/doc2/
+                          detail.htm?spm=0.0.0.0.xdvAU6&treeId=59&articleId=103665&
+                          docType=1) 建议商户依赖异步通知
                          */
 //						String resultInfo = payResult.getResult();// 同步返回需要验证的信息
 

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

@@ -3,7 +3,6 @@ package com.sheep.gamegroup.view.activity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.sdk.app.PayTask;
@@ -73,8 +72,8 @@ public class SignRechargeAct extends BaseActivity {
     public void initData() {
 
         addDatas();
-        /**
-         * 支付金额选择
+        /*
+          支付金额选择
          */
         rechargePriceAdapter = new RechargePriceAdapter(SignRechargeAct.this, mPriceEntityList);
         rechargeprice_greidview.setVerticalSpacing(20);
@@ -98,8 +97,8 @@ public class SignRechargeAct extends BaseActivity {
             }
         });
 
-        /**
-         * 支付方式选择
+        /*
+          支付方式选择
          */
         rechargeAdapter = new RechargeAdapter(SignRechargeAct.this);
         rechargeGreidview.setVerticalSpacing(40);
@@ -210,10 +209,10 @@ public class SignRechargeAct extends BaseActivity {
                     public void run() {
 
                         PayResult payResult = new PayResult(result);
-                        /**
-                         * 同步返回的结果必须放置到服务端进行验证（验证的规则请看https://doc.open.alipay.com/doc2/
-                         * detail.htm?spm=0.0.0.0.xdvAU6&treeId=59&articleId=103665&
-                         * docType=1) 建议商户依赖异步通知
+                        /*
+                          同步返回的结果必须放置到服务端进行验证（验证的规则请看https://doc.open.alipay.com/doc2/
+                          detail.htm?spm=0.0.0.0.xdvAU6&treeId=59&articleId=103665&
+                          docType=1) 建议商户依赖异步通知
                          */
 //						String resultInfo = payResult.getResult();// 同步返回需要验证的信息
 

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

@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -18,7 +17,6 @@ import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
-import android.widget.MediaController;
 import android.widget.TextView;
 import android.widget.VideoView;
 
@@ -35,7 +33,6 @@ import com.sheep.gamegroup.util.SysAppUtil;
 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 java.util.List;
 

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

@@ -5,8 +5,6 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.RequiresApi;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.View;
@@ -20,7 +18,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
@@ -29,14 +26,11 @@ import com.arialyy.aria.core.download.DownloadTask;
 import com.arialyy.aria.core.inf.IEntity;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.kfzs.duanduan.KFZSApp;
-import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.ApkUtils;
-import com.kfzs.duanduan.utils.dlg.SkipUtils;
 import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.di.components.DaggerTaskDetailComponent;
 import com.sheep.gamegroup.di.modules.TaskDetailModule;
@@ -49,7 +43,6 @@ import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.EntityUtils;
@@ -69,11 +62,9 @@ import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdpTaskDetailChildListview;
 import com.sheep.gamegroup.view.adapter.TaskdetailSonListviewAdp;
-import com.sheep.gamegroup.view.adapter.TaskdetailSonRecycleViewAdp;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
@@ -81,7 +72,6 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
@@ -96,8 +86,6 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
-import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
-
 /**
  * 任务详情页面
  * Created by ljy on 2018/4/2.
@@ -544,7 +532,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             break;
                         case DownloadTaskService.STATUS_INIT://开始下载
 
-                            DownloadTarget task = null;
+                            DownloadTarget task;
                             if (TextUtils.isEmpty(taskReleaseEty.getTask().getDownload_link()) || !taskReleaseEty.getTask().getDownload_link().contains("http")) {
                                 G.showToast(R.string.error_download_link);
                                 return;
@@ -591,7 +579,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 case R.id.btn_up_imag:
                     if(type == 101){
                         if(game_id > 0){
-                            ViewUtil.showGamePayAccount((Activity) activity, game_id);
+                            ViewUtil.showGamePayAccount(activity, game_id);
                             return;
                         }
                     }else
@@ -625,7 +613,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             }
         } catch (Exception e) {
             e.printStackTrace();
-            G.showToast(BuildConfig.DEBUG ? e.getMessage() : getString(R.string.loading_data));
+            G.showToast(e.getMessage());
         }
     }
 
@@ -1056,42 +1044,40 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
         //自动审核
         //todo 暂时不要
-        if(false && taskEty.getInspect_type() == 3){
-            taskdetail_user_use_layout.setVisibility(View.VISIBLE);
-
-            start_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-            start_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-            down_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-            down_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-            install_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-            install_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-            if (taskEty != null) {
-                int thisRun = taskEty.getRunTask();
-                if (thisRun == 1) {//接受了任务
-                    start_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
-                    start_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
-                    if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
-                        down_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
-                        down_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
-                        install_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
-                        install_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
-                    } else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(taskEty.getPackage_names()))){
-
-                        down_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
-                        down_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
-                        install_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-                        install_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-                    } else {
-                        down_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-                        down_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-                        install_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-                        install_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-                    }
-                } else {
-                }
-            } else {
-            }
-        }
+//        if(taskEty.getInspect_type() == 3){
+//            taskdetail_user_use_layout.setVisibility(View.VISIBLE);
+//
+//            start_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//            start_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//            down_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//            down_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//            install_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//            install_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//            if (taskEty != null) {
+//                int thisRun = taskEty.getRunTask();
+//                if (thisRun == 1) {//接受了任务
+//                    start_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+//                    start_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+//                    if (PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names())) {
+//                        down_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+//                        down_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+//                        install_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+//                        install_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+//                    } else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(taskEty.getPackage_names()))){
+//
+//                        down_task_btntv.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+//                        down_task_line.setBackground(getResources().getDrawable(R.drawable.selector_button_full_main));
+//                        install_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//                        install_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//                    } else {
+//                        down_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//                        down_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//                        install_task_btntv.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//                        install_task_line.setBackground(getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+//                    }
+//                }
+//            }
+//        }
 
         //截至时间
         if(taskReleaseEty != null && taskReleaseEty.isIs_running() && taskReleaseEty.getDemo_time() > 0){

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

@@ -21,7 +21,6 @@ import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.CreditCard;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.EntityUtils;

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

@@ -11,36 +11,26 @@ import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 
-import com.alibaba.fastjson.JSONArray;
 import com.kfzs.duanduan.ActDownloadMgr;
 import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.adapter.AdpTrymakemoneyTabGridview;
 import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 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.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
 
 /**
  * 试着赚钱页面
@@ -132,8 +122,8 @@ public class TryMakeMoneyact extends BaseActivity {
 
             }
         });
-        /**
-         * v2.6
+        /*
+          v2.6
          */
         indicator.setVisibility(View.GONE);
     }

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpGameTaskOrderList.java

@@ -7,19 +7,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.model.entity.GameTaskOrderEnty;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
-import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
 
@@ -76,7 +68,7 @@ public class AdpGameTaskOrderList extends BaseAdapter {
         if(gameTaskOrderEnty == null){
             return convertView;
         }
-        String payType = "";
+        String payType;
         if(gameTaskOrderEnty.getUser_amount() > 0){
             payType = "绵羊币(" + gameTaskOrderEnty.getUser_amount() +")";
         }else {
@@ -105,33 +97,27 @@ public class AdpGameTaskOrderList extends BaseAdapter {
         switch (gameTaskOrderEnty.getStatus()){
             case 0:
             default:
-                stateStr = "下单";
                 holder.order_type_tv.setText("订单状态："+ "未完成");
                 holder.pay_layout.setVisibility(View.VISIBLE);
                 holder.pay_tyoe_show_tv.setVisibility(View.GONE);
                 break;
             case 1:
-                stateStr = "订单取消";
                 holder.order_type_tv.setText("订单状态："+ "未完成");
                 holder.pay_tyoe_show_tv.setText("放弃支付");
                 break;
             case 2:
-                stateStr = "第三方充值成功";
                 holder.order_type_tv.setText("订单状态："+ "未完成");
                 holder.pay_tyoe_show_tv.setText("充值中");
                 break;
             case 3:
-                stateStr = "游戏充值中";
                 holder.order_type_tv.setText("订单状态："+ "未完成");
                 holder.pay_tyoe_show_tv.setText("充值中");
                 break;
             case 4:
-                stateStr = "游戏充值失败";
                 holder.order_type_tv.setText("订单状态："+ "未完成");
                 holder.pay_tyoe_show_tv.setText("支付失败");
                 break;
             case 5:
-                stateStr = "游戏充值成功";
                 holder.order_type_tv.setText("订单状态："+ "已完成");
                 holder.pay_tyoe_show_tv.setText("支付成功");
                 break;
@@ -170,30 +156,4 @@ public class AdpGameTaskOrderList extends BaseAdapter {
         LinearLayout pay_layout;
         TextView date_tv, price_tv, pay_type_tv,order_type_tv, order_end_time_tv, pay_tyoe_show_tv, pay_tv,pay_cancel_tv;
     }
-    private String returnValue(GameTaskOrderEnty ety){
-        String stateStr = "已接受任务";
-        switch (ety.getStatus()){
-            case 0:
-            default:
-                stateStr = "下单";
-                break;
-            case 1:
-                stateStr = "订单取消";
-                break;
-            case 2:
-                stateStr = "第三方充值成功";
-                break;
-            case 3:
-                stateStr = "游戏充值中";
-                break;
-            case 4:
-                stateStr = "游戏充值失败";
-                break;
-            case 5:
-                stateStr = "游戏充值失败";
-                break;
-
-        }
-        return stateStr;
-    }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpHomeListGrideview.java

@@ -13,7 +13,6 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;

app/src/main/java/com/sheep/gamegroup/view/adapter/ArrayAdapter.java

@@ -34,20 +34,20 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-/**
- * A concrete BaseAdapter that is backed by an array of arbitrary
- * objects.  By default this class expects that the provided resource id references
- * a single TextView.  If you want to use a more complex layout, use the constructors that
- * also takes a field id.  That field id should reference a TextView in the larger layout
- * resource.
- * <p>
- * <p>However the TextView is referenced, it will be filled with the toString() of each object in
- * the array. You can add lists or arrays of custom objects. Override the toString() method
- * of your objects to determine what text will be displayed for the item in the list.
- * <p>
- * <p>To use something other than TextViews for the array display, for instance, ImageViews,
- * or to have some of data besides toString() results fill the views,
- * override {@link #getView(int, View, ViewGroup)} to return the type of view you want.
+/*
+  A concrete BaseAdapter that is backed by an array of arbitrary
+  objects.  By default this class expects that the provided resource id references
+  a single TextView.  If you want to use a more complex layout, use the constructors that
+  also takes a field id.  That field id should reference a TextView in the larger layout
+  resource.
+  <p>
+  <p>However the TextView is referenced, it will be filled with the toString() of each object in
+  the array. You can add lists or arrays of custom objects. Override the toString() method
+  of your objects to determine what text will be displayed for the item in the list.
+  <p>
+  <p>To use something other than TextViews for the array display, for instance, ImageViews,
+  or to have some of data besides toString() results fill the views,
+  override {@link #getView(int, View, ViewGroup)} to return the type of view you want.
  */
 
 /**

app/src/main/java/com/sheep/gamegroup/view/adapter/RechargeAdapter.java

@@ -5,14 +5,11 @@ import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AbsListView;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.model.entity.RechargeEntity;
-import com.sheep.gamegroup.model.entity.RechargeQEntity;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -12,9 +12,6 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
@@ -24,8 +21,6 @@ import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
 
-import org.greenrobot.eventbus.EventBus;
-
 import java.util.List;
 
 import javax.inject.Inject;

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskdetailSonListviewAdp.java

@@ -21,8 +21,6 @@ import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.MyListview;
-import com.sheep.gamegroup.util.SelfCountDownTimer;
-import com.sheep.gamegroup.view.customview.SpaceItemDecoration;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -38,7 +36,7 @@ import me.iwf.photopicker.PhotoPreview;
 public class TaskdetailSonListviewAdp extends BaseAdapter {
     private List<TaskChild> descEntityArrayList;
     private Context context;
-    int with = 300;
+    int with;
 
     public TaskdetailSonListviewAdp(List<TaskChild> descEntityArrayList, Context context) {
         this.descEntityArrayList = descEntityArrayList;
@@ -115,9 +113,9 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
             holder.taskdetail_screenshot_layout.setVisibility(View.GONE);
         }
 
-        /**
-         * 任务详情
-         * 2.6不显示
+        /*
+          任务详情
+          2.6不显示
          */
         holder.item_remaining_time_tv.setVisibility(View.GONE);
 //        if(descEntity.getDemo_time() > 0){
@@ -133,8 +131,8 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
 //            holder.item_remaining_time_tv.setVisibility(View.GONE);
 //        }
 
-        /**
-         *
+        /*
+
          */
         if(descEntity.getDescEntityList() != null && descEntity.getDescEntityList().size() > 0){
             holder.item_detail_listview.setAdapter(new ArrayAdapter<TaskDescEntity>(context, R.layout.textview_layout, descEntity.getDescEntityList()){
@@ -157,8 +155,8 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
             });
         }
 
-        /**
-         * holder.recycler_screenshot_view.setAdapter(new ArrayAdapter<ScreenshotsEntity>(context, R.layout.taskdetail_desc_item_screens, descEntity.getScreenshotsList()){
+        /*
+          holder.recycler_screenshot_view.setAdapter(new ArrayAdapter<ScreenshotsEntity>(context, R.layout.taskdetail_desc_item_screens, descEntity.getScreenshotsList()){
         @Override
         public boolean convert(int position, View convertView, ViewGroup parent, ScreenshotsEntity item) {
         ScreenshotsEntity taskDescEntity = item;
@@ -179,7 +177,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
         return true;
         }
         });
-         * 截图
+          截图
          */
         if(descEntity.getScreenshotsList() != null && descEntity.getScreenshotsList().size() > 0){
             final ArrayList<String> imgListStr = new ArrayList<>();

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskdetailSonRecycleViewAdp.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,14 +20,7 @@ import com.sheep.gamegroup.util.SelfCountDownTimer;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
-import org.w3c.dom.Text;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * 任务详情子模块显示adp
@@ -69,8 +61,8 @@ public class TaskdetailSonRecycleViewAdp extends RecyclerView.Adapter<RecyclerVi
         final ImageView select_tab_iv = viewHolder.itemView.findViewById(R.id.select_tab_iv);
         TextView item_remaining_time_tv = viewHolder.itemView.findViewById(R.id.item_remaining_time_tv);
         final RecyclerView item_detail_listview = viewHolder.itemView.findViewById(R.id.item_detail_listview);
-        /**
-         * 截图
+        /*
+          截图
          */
         LinearLayout taskdetail_screenshot_layout = viewHolder.itemView.findViewById(R.id.taskdetail_screenshot_layout);
         RecyclerView recycler_screenshot_view = viewHolder.itemView.findViewById(R.id.recycler_screenshot_view);
@@ -92,8 +84,8 @@ public class TaskdetailSonRecycleViewAdp extends RecyclerView.Adapter<RecyclerVi
             select_tab_iv.setRotation(0);
             item_detail_listview.setVisibility(View.GONE);
         }
-        /**
-         * 任务详情
+        /*
+          任务详情
          */
         if(descEntity.getDemo_time() > 0){
             CommonUtil.getInstance().getHashMap(item_remaining_time_tv);
@@ -136,8 +128,8 @@ public class TaskdetailSonRecycleViewAdp extends RecyclerView.Adapter<RecyclerVi
                 return descEntity.getDescEntityList()==null?0:descEntity.getDescEntityList().size();
             }
         });
-        /**
-         * 截图
+        /*
+          截图
          */
         recycler_screenshot_view.setHasFixedSize(true);
         recycler_screenshot_view.setLayoutManager(new LinearLayoutManager(context));

app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java

@@ -21,12 +21,10 @@ import com.kfzs.duanduan.adp.AdpCommonRecy;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.ApkUtils;
-import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
-import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
@@ -43,7 +41,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -208,7 +205,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 viewHolder.itemView.findViewById(R.id.item_money).setVisibility(View.GONE);
                 //领取任务
                 final boolean isInstall = PackageUtil.isAppInstalled(SheepApp.mContext, etyList.get(i).getPackage_name());
-                String taskTypeTvValue = "下载游戏";
+                String taskTypeTvValue;
                 if(isInstall){//已经安装
                     taskTypeTvValue = "启动游戏";
 //                    PackageUtil.startApp(SheepApp.mContext, etyList.get(i).getPackage_name());
@@ -308,7 +305,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 if(i == 0){
                     viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
                     viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
-                    String titleStr = "可接取";
+                    String titleStr;
                     int resourceId = R.mipmap.task_hot_icon;
                     if(isBegin == 1){
 
@@ -580,15 +577,14 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 });
                 TestUtil.setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getRelease_task().getTask());
 
-                /**
-                 * 倒计时
+                /*
+                  倒计时
                  */
                 final TextView countdown_tv = viewHolder.itemView.findViewById(R.id.end_of_time_tv);
                 if(etyList.get(i).getEnd_time() > 0){
                     SelfCountDownTimer scTimer = timerHashMap.get(countdown_tv);
                     if(scTimer != null){
                         scTimer.cancel();
-                        scTimer = null;
                     }
 
                     countdown_tv.setVisibility(View.VISIBLE);
@@ -640,12 +636,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 Map.Entry pairs = (Map.Entry) it.next();
                 SelfCountDownTimer cdt = (SelfCountDownTimer) pairs.getValue();
                 cdt.cancel();
-                cdt = null;
             } catch (Exception ignored) {
             }
         }
-        it = null;
-        s = null;
         timerHashMap.clear();
     }
 

app/src/main/java/com/sheep/gamegroup/view/adapter/expandadapter/AdpPayGameDialog.java

@@ -4,17 +4,13 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AbsListView;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.sheep.gamegroup.model.entity.GridViewEntity;
 import com.sheep.gamegroup.model.entity.RechargeEntity;
-import com.sheep.gamegroup.view.adapter.WithdrawalAdapter;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.List;
 

app/src/main/java/com/sheep/gamegroup/view/adapter/expandadapter/BaseViewHolder.java

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.view.adapter.expandadapter;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/sheep/gamegroup/view/adapter/expandadapter/GroupItem.java

@@ -19,7 +19,7 @@ public class GroupItem<T,S> extends BaseItem{
     private List<S> childDatas;
 
     /** 是否展开,  默认展开*/
-    private boolean isExpand = true;
+    private boolean isExpand;
 
 
     /** 返回是否是父节点*/

app/src/main/java/com/sheep/gamegroup/view/adapter/expandadapter/SignRecordAdapter.java

@@ -4,9 +4,7 @@ import android.content.Context;
 import android.graphics.Color;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.style.AbsoluteSizeSpan;
 import android.text.style.ForegroundColorSpan;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/sheep/gamegroup/view/customview/FlikerProgressBar.java

@@ -1,374 +0,0 @@
-package com.sheep.gamegroup.view.customview;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.BitmapShader;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.Shader;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-
-import com.sheep.jiuyan.samllsheep.R;
-
-/**
- * Created by chenliu on 2016/8/26.<br/>
- * 描述：添加圆角支持 on 2016/11/11
- * </br>
- */
-public class FlikerProgressBar extends View implements Runnable{
-    private PorterDuffXfermode xfermode = new PorterDuffXfermode(PorterDuff.Mode.SRC_ATOP);
-
-    private int DEFAULT_HEIGHT_DP = 35;
-
-    private int borderWidth;
-
-    private float maxProgress = 100f;
-
-    private Paint textPaint;
-
-    private Paint bgPaint;
-
-    private Paint pgPaint;
-
-    private String progressText;
-
-    private Rect textRect;
-
-    private RectF bgRectf;
-
-    /**
-     * 左右来回移动的滑块
-     */
-    private Bitmap flikerBitmap;
-
-    /**
-     * 滑块移动最左边位置，作用是控制移动
-     */
-    private float flickerLeft;
-
-    /**
-     * 进度条 bitmap ，包含滑块
-     */
-    private Bitmap pgBitmap;
-
-    private Canvas pgCanvas;
-
-    /**
-     * 当前进度
-     */
-    private float progress;
-
-    private boolean isFinish;
-
-    private boolean isStop;
-
-    /**
-     * 下载中颜色
-     */
-    private int loadingColor;
-
-    /**
-     * 暂停时颜色
-     */
-    private int stopColor;
-
-    /**
-     * 进度文本、边框、进度条颜色
-     */
-    private int progressColor;
-
-    private int textSize;
-
-    private int radius;
-
-    private Thread thread;
-
-    BitmapShader bitmapShader;
-
-    public FlikerProgressBar(Context context) {
-        this(context, null, 0);
-    }
-
-    public FlikerProgressBar(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public FlikerProgressBar(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initAttrs(attrs);
-    }
-
-    private void initAttrs(AttributeSet attrs) {
-        TypedArray ta = getContext().obtainStyledAttributes(attrs, R.styleable.FlikerProgressBar);
-        try {
-            textSize = (int) ta.getDimension(R.styleable.FlikerProgressBar_textSize, 12);
-            loadingColor = ta.getColor(R.styleable.FlikerProgressBar_loadingColor, Color.parseColor("#40c4ff"));
-            stopColor = ta.getColor(R.styleable.FlikerProgressBar_stopColor, Color.parseColor("#ff9800"));
-            radius = (int) ta.getDimension(R.styleable.FlikerProgressBar_radius, 0);
-            borderWidth = (int) ta.getDimension(R.styleable.FlikerProgressBar_borderWidth, 1);
-        } finally {
-            ta.recycle();
-        }
-    }
-
-    private void init() {
-        bgPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
-        bgPaint.setStyle(Paint.Style.STROKE);
-        bgPaint.setStrokeWidth(borderWidth);
-
-        pgPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        pgPaint.setStyle(Paint.Style.FILL);
-
-        textPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        textPaint.setTextSize(textSize);
-
-        textRect = new Rect();
-        bgRectf = new RectF(borderWidth, borderWidth, getMeasuredWidth() - borderWidth, getMeasuredHeight() - borderWidth);
-
-        if(isStop){
-            progressColor = stopColor;
-        } else{
-            progressColor = loadingColor;
-        }
-
-        flikerBitmap = BitmapFactory.decodeResource(getResources(), R.mipmap.flicker);
-        flickerLeft = -flikerBitmap.getWidth();
-
-        initPgBimap();
-    }
-
-    private void initPgBimap() {
-        Log.e("getMeasuredWidth()-----","getMeasuredWidth():"+getMeasuredWidth()+"borderWidth:"+borderWidth);
-        Log.e("getMeasuredHeight()----","getMeasuredHeight():"+getMeasuredHeight()+"borderWidth:"+borderWidth);
-        pgBitmap = Bitmap.createBitmap(getMeasuredWidth() - borderWidth, getMeasuredHeight()==0?getMeasuredWidth():getMeasuredHeight() - borderWidth, Bitmap.Config.ARGB_8888);
-        pgCanvas = new Canvas(pgBitmap);
-        thread = new Thread(this);
-        thread.start();
-    }
-
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        int widthSpecSize = MeasureSpec.getSize(widthMeasureSpec);
-        int heightSpecMode = MeasureSpec.getMode(heightMeasureSpec);
-        int heightSpecSize = MeasureSpec.getSize(heightMeasureSpec);
-        int height = 0;
-        switch (heightSpecMode){
-            case MeasureSpec.AT_MOST:
-                height = dp2px(DEFAULT_HEIGHT_DP);
-                break;
-            case MeasureSpec.EXACTLY:
-            case MeasureSpec.UNSPECIFIED:
-                height = heightSpecSize;
-                break;
-        }
-        setMeasuredDimension(widthSpecSize, height);
-
-        if(pgBitmap == null){
-            init();
-        }
-
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        //背景
-        drawBackGround(canvas);
-
-        //进度
-        drawProgress(canvas);
-
-         //进度text
-        drawProgressText(canvas);
-
-        //变色处理
-        drawColorProgressText(canvas);
-    }
-
-    /**
-     * 边框
-     * @param canvas
-     */
-    private void drawBackGround(Canvas canvas) {
-        bgPaint.setColor(progressColor);
-        //left、top、right、bottom不要贴着控件边，否则border只有一半绘制在控件内,导致圆角处线条显粗
-        canvas.drawRoundRect(bgRectf, radius, radius, bgPaint);
-    }
-
-    /**
-     * 进度
-     */
-    private void drawProgress(Canvas canvas) {
-        pgPaint.setColor(progressColor);
-
-        float right = (progress / maxProgress) * getMeasuredWidth();
-        pgCanvas.save(Canvas.CLIP_SAVE_FLAG);
-        pgCanvas.clipRect(0, 0, right, getMeasuredHeight());
-        pgCanvas.drawColor(progressColor);
-        pgCanvas.restore();
-
-        if(!isStop){
-            pgPaint.setXfermode(xfermode);
-            pgCanvas.drawBitmap(flikerBitmap, flickerLeft, 0, pgPaint);
-            pgPaint.setXfermode(null);
-        }
-
-        //控制显示区域
-        bitmapShader = new BitmapShader(pgBitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
-        pgPaint.setShader(bitmapShader);
-        canvas.drawRoundRect(bgRectf, radius, radius, pgPaint);
-    }
-
-    /**
-     * 进度提示文本
-     * @param canvas
-     */
-    private void drawProgressText(Canvas canvas) {
-        textPaint.setColor(progressColor);
-        progressText = getProgressText();
-        textPaint.getTextBounds(progressText, 0, progressText.length(), textRect);
-        int tWidth = textRect.width();
-        int tHeight = textRect.height();
-        float xCoordinate = (getMeasuredWidth() - tWidth) / 2;
-        float yCoordinate = (getMeasuredHeight() + tHeight) / 2;
-        canvas.drawText(progressText, xCoordinate, yCoordinate, textPaint);
-    }
-
-    /**
-     * 变色处理
-     * @param canvas
-     */
-    private void drawColorProgressText(Canvas canvas) {
-        textPaint.setColor(Color.WHITE);
-        int tWidth = textRect.width();
-        int tHeight = textRect.height();
-        float xCoordinate = (getMeasuredWidth() - tWidth) / 2;
-        float yCoordinate = (getMeasuredHeight() + tHeight) / 2;
-        float progressWidth = (progress / maxProgress) * getMeasuredWidth();
-        if(progressWidth > xCoordinate){
-            canvas.save(Canvas.CLIP_SAVE_FLAG);
-            float right = Math.min(progressWidth, xCoordinate + tWidth * 1.1f);
-            canvas.clipRect(xCoordinate, 0, right, getMeasuredHeight());
-            canvas.drawText(progressText, xCoordinate, yCoordinate, textPaint);
-            canvas.restore();
-        }
-    }
-
-    public void setProgress(float progress){
-        if(!isStop){
-            if(progress < maxProgress){
-                this.progress = progress;
-            } else {
-                this.progress = maxProgress;
-                finishLoad();
-            }
-            invalidate();
-        }
-    }
-
-    public void setStop(boolean stop) {
-        isStop = stop;
-        if(thread == null){
-            thread = new Thread(this);
-        }
-        if(isStop){
-            progressColor = stopColor;
-            thread.interrupt();
-        } else {
-            progressColor = loadingColor;
-            thread.start();
-        }
-        invalidate();
-    }
-
-    public void finishLoad() {
-        isFinish = true;
-        setStop(true);
-    }
-
-    public void toggle(){
-        if(!isFinish){
-            if(isStop){
-                setStop(false);
-            } else {
-                setStop(true);
-            }
-        }
-    }
-
-    @Override
-    public void run() {
-        int width = flikerBitmap.getWidth();
-        try {
-            while (!isStop && !thread.isInterrupted()){
-                flickerLeft += dp2px(5);
-                float progressWidth = (progress / maxProgress) * getMeasuredWidth();
-                if(flickerLeft >= progressWidth){
-                    flickerLeft = -width;
-                }
-                postInvalidate();
-                Thread.sleep(20);
-            }
-        }catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * 重置
-     */
-    public void reset(){
-        setStop(true);
-        progress = 0;
-        isFinish = false;
-        isStop = false;
-        progressColor = loadingColor;
-        progressText = "";
-        flickerLeft = -flikerBitmap.getWidth();
-        initPgBimap();
-    }
-
-    public float getProgress() {
-        return progress;
-    }
-
-    public boolean isStop() {
-        return isStop;
-    }
-
-    public boolean isFinish() {
-        return isFinish;
-    }
-
-    private String getProgressText() {
-        String text= "";
-        if(!isFinish){
-            if(!isStop){
-                text = "下载中" + progress + "%";
-            } else {
-                text = "继续";
-            }
-        } else{
-            text = "下载完成";
-        }
-
-        return text;
-    }
-
-    private int dp2px(int dp){
-        float density = getContext().getResources().getDisplayMetrics().density;
-        return (int) (dp * density);
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/customview/SProgress.java

@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2017. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
- * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
- * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
- * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
- * Vestibulum commodo. Ut rhoncus gravida arcu.
- */
-
-package com.sheep.gamegroup.view.customview;
-
-import android.animation.ValueAnimator;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.LinearGradient;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.graphics.Shader;
-import android.support.annotation.Nullable;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.View;
-import android.view.animation.AccelerateDecelerateInterpolator;
-
-
-import com.sheep.jiuyan.samllsheep.R;
-
-
-
-/**
- * Created by S0005 on 2017/4/19.
- */
-
-public class SProgress extends View {
-    public static final String TAG = "SProgress";
-    private int progressColor = 0xffff3030, progressendcolor = 0xffff6969, backColor = 0xffff8787, textColor = 0xffffffff;
-    private Paint bgpaint;
-    private Paint textPaint;
-    private Paint proPaint;
-    private float textsize = dp2px(9);
-    private float progress = 0;
-
-    private int maxDuring = 1600, minDuring = 500;
-
-    private int width = dp2px(40), height = dp2px(10);
-    private float textbaseline;
-
-    private float minProgress;
-    private RectF rectbg;
-    private RectF rectprogress;
-
-    private Rect padding = new Rect();
-    private Path path;
-
-
-    private int dp2px(float dp) {
-        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getResources().getDisplayMetrics());
-    }
-
-    public SProgress(Context context) {
-        this(context, null);
-    }
-
-    public SProgress(Context context, @Nullable AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SProgress(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        obtainData(attrs);
-        init();
-    }
-
-    private void obtainData(AttributeSet attrs) {
-        TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.SProgress);
-        progressColor = a.getColor(R.styleable.SProgress_progressColor, progressColor);
-        progressendcolor = a.getColor(R.styleable.SProgress_progressendcolor, progressendcolor);
-        backColor = a.getColor(R.styleable.SProgress_backColor, backColor);
-        textColor = a.getColor(R.styleable.SProgress_textColor, textColor);
-        textsize = a.getDimension(R.styleable.SProgress_textsize, textsize);
-        minProgress = a.getFloat(R.styleable.SProgress_minProgress, 0);
-        float startprogress = a.getFloat(R.styleable.SProgress_startprogress, 0);
-        a.recycle();
-        Log.i(TAG, "obtainData: "+startprogress);
-        if(startprogress>0){
-            animatorToProgress(startprogress);
-        }
-    }
-
-    public float getProgress() {
-        return progress;
-    }
-
-    public SProgress setColor(int progressColor, int backColor, int textColor) {
-        setgradialColor(progressColor,progressColor,backColor,textColor);
-        return this;
-    }
-
-    public SProgress setgradialColor(int startprogressColor, int endprogresscolor, int backColor, int textColor) {
-        this.progressColor = startprogressColor;
-        this.progressendcolor = endprogresscolor;
-        this.backColor = backColor;
-        this.textColor = textColor;
-
-        textPaint.setColor(textColor);
-
-        proPaint.setColor(progressColor);
-        LinearGradient linearGradient = new LinearGradient(0, 0, width, height, progressColor, progressendcolor, Shader.TileMode.CLAMP);
-        proPaint.setShader(linearGradient);
-        bgpaint.setColor(backColor);
-        return this;
-    }
-
-    public SProgress setTextSize(float size) {
-        textsize = dp2px(size);
-        return this;
-    }
-
-    public SProgress setminprogress(float minprogress) {
-        this.minProgress = minprogress;
-        return this;
-    }
-
-    public SProgress setProgress(final float progress) {
-        if (progress > 100||progress<0)
-            throw new NumberFormatException("进度0-100");
-        SProgress.this.progress = progress < minProgress ? minProgress : progress;
-        invalidate();
-        return this;
-    }
-
-    public SProgress animatorToProgress(final float progress) {
-
-        Log.i(TAG, "setProgress: " + progress);
-        //最小位置不执行动画
-        if (progress > 100||progress<0)
-            throw new NumberFormatException("进度0-100");
-        post(new Runnable() {
-            @Override
-            public void run() {
-                if (SProgress.this.progress <= minProgress && progress <= minProgress) {
-                    SProgress.this.progress = progress;
-                    invalidate();
-                } else {
-                    startAnimator(progress);
-                }
-            }
-        });
-        return this;
-    }
-
-    private void startAnimator(float pors) {
-        ValueAnimator animator = ValueAnimator.ofFloat((progress < minProgress ? minProgress : progress), pors < minProgress ? minProgress : pors);
-        int i = (int) (pors - progress) * maxDuring / 100;
-        animator.setDuration(i < minDuring ? minDuring : i);
-        animator.setInterpolator(new AccelerateDecelerateInterpolator());
-        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-
-                //结束时显示原值带小数，中间变换显示不带小数
-
-                if (animation.getAnimatedFraction() == 1)
-                    progress = (float) animation.getAnimatedValue();
-                else
-                    progress = (int) ((float) animation.getAnimatedValue());
-                invalidate();
-            }
-        });
-        animator.start();
-    }
-
-    private void init() {
-       setLayerType(LAYER_TYPE_SOFTWARE,null);
-        bgpaint = new Paint();
-        bgpaint.setColor(backColor);
-        bgpaint.setAntiAlias(true);
-
-        proPaint = new Paint();
-        proPaint.setColor(progressColor);
-        LinearGradient linearGradient = new LinearGradient(0, 0, width, height, progressColor, progressendcolor, Shader.TileMode.CLAMP);
-        proPaint.setShader(linearGradient);
-        proPaint.setAntiAlias(true);
-
-        textPaint = new Paint();
-        textPaint.setColor(textColor);
-        textPaint.setAntiAlias(true);
-        textPaint.setTextSize(textsize);
-        textbaseline = getFontstart(textPaint);
-        rectbg = new RectF();
-        rectprogress = new RectF();
-    }
-
-    public float getFontstart(Paint paint) {
-        Paint.FontMetrics fm = paint.getFontMetrics();
-        return (fm.descent + fm.ascent) / 2 - fm.leading;
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-
-        rectbg.set(padding.left, padding.top, (float) width - padding.right, (float) height - padding.bottom);
-        canvas.drawRoundRect(rectbg, (height - padding.top-padding.bottom) / 2, (height - padding.top-padding.bottom) / 2, bgpaint);
-
-
-
-        if(path==null) {
-            path = new Path();
-            path.addRoundRect(rectbg,(height - padding.top-padding.bottom) / 2, (height - padding.top-padding.bottom) / 2,Path.Direction.CW);
-        }
-        int save = canvas.save();
-        canvas.clipPath(path);
-        rectprogress.set(padding.left, padding.top, padding.left + ((width - padding.left-padding.right) * (progress < minProgress ? minProgress : progress) / 100), height - padding.bottom);
-        canvas.drawRoundRect(rectprogress, (float) ((height - padding.top-padding.bottom) / 2), (float) ((height - padding.top-padding.bottom) / 2), proPaint);
-        canvas.restoreToCount(save);
-
-
-        float length = textPaint.measureText(getText(progress));
-
-        canvas.drawText(getText(progress), width / 2 - length / 2, height / 2 - textbaseline, textPaint);
-
-    }
-
-    private String getText(float progress) {
-        String progresstext = String.format(getResources().getString(R.string.sprogress_string), progress);
-        if(progress == 0){
-            progresstext = "开始任务";
-        }else if(progress == 100){
-            progresstext = "开始试玩";
-        }else {
-            progresstext = String.format(getResources().getString(R.string.sprogress_string), progress);
-        }
-        return progresstext.replace(".0", "");
-//        "已领" + progresstext.replace(".0", "") + "%"
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
-        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
-        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
-        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
-        if (widthMode == MeasureSpec.EXACTLY) {
-            width = widthSize;
-        } else {
-            width = Math.min(width, widthSize);
-        }
-
-        if (heightMode == MeasureSpec.EXACTLY) {
-            height = heightSize;
-        } else {
-            height = Math.min(heightSize, height);
-
-        }
-        padding.set(getPaddingLeft(), getPaddingTop(), getPaddingRight(), getPaddingBottom());
-        setMeasuredDimension(width, height);
-        path=null;
-
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/customview/SheepViewPager.java

@@ -33,8 +33,6 @@ public class SheepViewPager extends ViewPager {
 
         switch (ev.getAction()){
             case MotionEvent.ACTION_DOWN:
-                dealtX = 0;
-                dealtY = 0;
                 //保证 view能够得到 Action_move 事件
                 getParent().requestDisallowInterceptTouchEvent(true);
                 break;

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAccountAbnormal.java

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.view.dialog;
 
 import android.app.Activity;
-import android.content.Context;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogPayAccount.java

@@ -14,10 +14,8 @@ import com.alibaba.fastjson.JSON;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.activity.ActMyMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogPayGame.java

@@ -7,16 +7,12 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.EditText;
 import android.widget.LinearLayout;
-import android.widget.ListView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.OrienteeringDetail;
 import com.sheep.gamegroup.model.entity.RechargeEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -26,14 +22,12 @@ import com.sheep.gamegroup.util.MathUtil;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.activity.RechargeAct;
 import com.sheep.gamegroup.view.adapter.expandadapter.AdpPayGameDialog;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtGameMakeMoney.java

@@ -26,7 +26,6 @@ import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.view.activity.GamemakeMoneyAct;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
-import com.sheep.gamegroup.view.dialog.DialogOrienteeringDetails;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMyGame.java

@@ -9,13 +9,11 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.download.DownloadTask;
-import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.ApkUtils;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;
@@ -31,7 +29,6 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
-import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.util.List;
@@ -211,7 +208,7 @@ public class FgtMyGame extends BaseFragment {
             String speed = task.getConvertSpeed();    //转换单位后的下载速度，单位转换需要在配置文件中打开
             System.out.println("Aria "+task.getKey()+",p " + p + ", speed = " + speed);
             String url = task.getKey();
-            TextView tvProgress = recyclerview.findViewWithTag(tryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + url);
+            TextView tvProgress = recyclerview.findViewWithTag(TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + url);
             if (tvProgress == null) {
                 return;
             }
@@ -233,7 +230,7 @@ public class FgtMyGame extends BaseFragment {
         try {
             String url = task.getKey();
 
-            TextView tvProgress = recyclerview.findViewWithTag(tryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + url);
+            TextView tvProgress = recyclerview.findViewWithTag(TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + url);
             if (tvProgress == null) {
                 return;
             }
@@ -247,7 +244,7 @@ public class FgtMyGame extends BaseFragment {
         try {
             String url = task.getKey();
 
-            TextView tvProgress = recyclerview.findViewWithTag(tryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + url);
+            TextView tvProgress = recyclerview.findViewWithTag(TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + url);
             if (tvProgress == null) {
                 return;
             }
@@ -260,7 +257,7 @@ public class FgtMyGame extends BaseFragment {
     @Download.onTaskComplete void taskComplete(DownloadTask task) {
         try {
             String url = task.getKey();
-            TextView tvProgress = recyclerview.findViewWithTag(tryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + url);
+            TextView tvProgress = recyclerview.findViewWithTag(TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST + url);
             if (tvProgress == null) {
                 return;
             }