发现模块缓存相关修改；小米游戏数据bean文件位置修改以修复混淆后无法显示数据的问题

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

@@ -40,6 +40,7 @@ public class FgtFind extends BaseCompatFragment {
         setContentView(R.layout.fgt_find);
         activity = getActivity();
         ButterKnife.bind(this, mContentView);
+        initView();
         initData();
     }
 
@@ -49,44 +50,9 @@ public class FgtFind extends BaseCompatFragment {
     ViewPager pager;
 
     private GiftpackListAdapter mAdapter;
-    private void initData(){
-        SheepApp.getInstance().getNetComponent().getApiService().getFindTagList()
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        List<FindTag> newList = baseMessage.getDatas(FindTag.class);
-                        loadList(newList);
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        //无数据时尝试获取缓存数据
-                        List<FindTag> newList = DataUtil.getInstance().getCacheList(ApiKey.articles_tags, FindTag.class);
-                        if(loadList(newList))
-                            G.showToast(baseMessage);
-                    }
-                    //没有添加数据返回true
-                    private boolean loadList(List<FindTag> newList){
-                        if(!ListUtil.isEmpty(newList)){
-                            list.clear();
-                            ListUtil.addAll(list, newList);
-                            loadData();
-                            return false;
-                        }
-                        return true;
-                    }
-                });
-    }
-
-    private List<FindTag> list = ListUtil.emptyList();
-    private void loadData() {
+    private void initView() {
         mAdapter = new GiftpackListAdapter(getFragmentManager(), getContext());
         mAdapter.add(FgtFindChild.newInstance(0), "全部");
-        for (FindTag findLabel : list) {
-            mAdapter.add(FgtFindChild.newInstance(findLabel.getId()), findLabel.getName());
-        }
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
         pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@@ -106,9 +72,59 @@ public class FgtFind extends BaseCompatFragment {
 
             }
         });
-        pager.setCurrentItem(position);
+        CommonUtil.getInstance().reflex(indicator, activity);
+    }
+    private void initData() {
+        //尝试获取缓存数据
+        List<FindTag> newList = DataUtil.getInstance().getCacheList(ApiKey.articles_tags, FindTag.class);
+        loadList(newList);
+        initNetData();
+    }
+    private int onResumeCount = 0;
+    @Override
+    public void onResume() {
+        super.onResume();
+        if(list.isEmpty() && onResumeCount != 0)//非第一次时，并且没有数据时调用该接口
+            initNetData();
+        onResumeCount++;
+    }
 
+    private void initNetData(){
+        SheepApp.getInstance().getNetComponent().getApiService().getFindTagList()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if(list.isEmpty()) {//无数据时加载网络获取的新数据，否则不加载新数据
+                            List<FindTag> newList = baseMessage.getDatas(FindTag.class);
+                            loadList(newList);
+                        }
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                            G.showToast(baseMessage);
+                    }
+                });
+    }
+    //没有添加数据返回true
+    private void loadList(List<FindTag> newList){
+        if(!ListUtil.isEmpty(newList)){
+            list.clear();
+            ListUtil.addAll(list, newList);
+            loadMore();
+        }
+    }
+
+    private List<FindTag> list = ListUtil.emptyList();
+    private void loadMore(){
+        for (FindTag findLabel : list) {
+            mAdapter.add(FgtFindChild.newInstance(findLabel.getId()), findLabel.getName());
+        }
+        mAdapter.notifyDataSetChanged();
         CommonUtil.getInstance().reflex(indicator, activity);
+        pager.setCurrentItem(position);
     }
     private int position = 0;//默认选中第一个
 

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

@@ -273,10 +273,8 @@ public class FgtFindChild extends BaseCompatFragment {
     public void initData(){
         //先尝试获取缓存数据
         List<FindItem> newList = DataUtil.getInstance().getCacheList(ApiKey.articles(type), FindItem.class);
-        if(loadList(newList))
-            refreshData();
-        else
-            notifyDataSetChanged();
+        loadList(newList);
+        refreshData();
     }
 
     public void refreshData(){
@@ -299,8 +297,11 @@ public class FgtFindChild extends BaseCompatFragment {
                         .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
-                                List<FindItem> newList = baseMessage.getDatas(FindItem.class);
-                                loadList(newList);
+                                boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.articles(type));
+                                if(isNewData) {
+                                    List<FindItem> newList = baseMessage.getDatas(FindItem.class);
+                                    loadList(newList);
+                                }
                             }
 
                             @Override
@@ -309,17 +310,14 @@ public class FgtFindChild extends BaseCompatFragment {
                             }
                         });
     }
-    //没有添加数据返回true
-    private boolean loadList(List<FindItem> newList){
+    private void loadList(List<FindItem> newList){
         if(!ListUtil.isEmpty(newList)){
             list.clear();
             ListUtil.addAll(list, newList);
             if(!list.isEmpty())
                 list.add(null);//底部部分----我是有底线的
             notifyDataSetChanged();
-            return false;
         }
-        return true;
     }
 
     private void notifyDataSetChanged(){

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

@@ -315,12 +315,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //用户信息
         userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null){//在onResume中可以更新最新信息
+        if(userEntity != null){
             loadUserInfo();
         }
         //任务
         List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task, TaskReleaseEty.class);
-        if (cacheTaskReleaseEtyList != null) {//在onResume中可以更新最新数据
+        if (cacheTaskReleaseEtyList != null) {
             releaseEtyLists.addAll(cacheTaskReleaseEtyList);
             mHanderl.sendEmptyMessage(1);
         }
@@ -382,6 +382,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             adpHomeListListview.notifyDataSetChanged();
             home_list_gridview_listview.setVisibility(homeListEntitysListview.isEmpty() ? View.GONE : View.VISIBLE);
         }
+        refreshData();
     }
 
     /**
@@ -643,7 +644,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void successhomeList(BaseMessage baseMessage) {
         checkAndInitView();
-        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.slideshow);
+        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.home_list);
         if(isNewData){
             List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
             if (ListUtil.isEmpty(homeListEntityList)) {

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

@@ -1,4 +1,4 @@
-package com.sheep.gamegroup.view.activity;
+package com.sheep.gamegroup.model.entity;
 
 import android.text.TextUtils;
 

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

@@ -31,17 +31,14 @@ import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.mdad.sdk.mdsdk.AdManager;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.alipay.PayResult;
-import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FindApp;
 import com.sheep.gamegroup.model.entity.GameAccountEntity;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
-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;
@@ -50,10 +47,9 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 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.usage.AppUsageManager;
 import com.sheep.gamegroup.view.activity.GameTaskOrderListAct;
-import com.sheep.gamegroup.view.activity.XiaomiGameEntity;
+import com.sheep.gamegroup.model.entity.XiaomiGameEntity;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -67,7 +63,6 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.umeng.socialize.media.UMWeb;
 
-import org.afinal.simplecache.ACache;
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
 
@@ -79,7 +74,6 @@ import java.security.MessageDigest;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;

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

@@ -3,39 +3,27 @@ package com.sheep.gamegroup.util;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.api.BaseMessageConverter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
-import com.sheep.gamegroup.model.util.AutoTaskListUtil;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.afinal.simplecache.ACache;
 import org.afinal.simplecache.ApiKey;
-import org.greenrobot.eventbus.EventBus;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import rx.android.schedulers.AndroidSchedulers;
-import rx.functions.Action1;
-import rx.schedulers.Schedulers;
-
 /**
  * Created by realicing on 2018/7/27.
  * realicing@sina.com
  */
 public class DataUtil {
     private static DataUtil instance = new DataUtil();
-
+    private ACache aCache;
     private DataUtil() {
+        aCache = ACache.get(SheepApp.getInstance());
         userEntity = getCacheResult(ApiKey.get_info, UserEntity.class);//先从缓存中初始化用户信息
         String id = SpUtils.getToken(SheepApp.mContext);
         String uid = TextUtils.isEmpty(id) ? "" : id.split("@")[0];
@@ -158,7 +146,6 @@ public class DataUtil {
 
     //-----------------------------------------缓存数据部分-----------------------------------------------------开始
     public <T> T getCacheResult(String key, Class<T> classT) {
-        ACache aCache = ACache.get(SheepApp.getInstance());
         String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key);
         if (!TextUtils.isEmpty(cacheData)) {
             if (BuildConfig.XXTEA_ENCRYPT) {
@@ -175,7 +162,6 @@ public class DataUtil {
      * @param saveTime 单位秒
      */
     public void resetCacheTime(String key, int saveTime) {
-        ACache aCache = ACache.get(SheepApp.getInstance());
         String realKey = SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key;
         String cacheData = aCache.getAsString(realKey);
         if (!TextUtils.isEmpty(cacheData)) {
@@ -193,7 +179,6 @@ public class DataUtil {
      * @return
      */
     public <T> List<T> getCacheList(String key, Class<T> classT) {
-        ACache aCache = ACache.get(SheepApp.getInstance());
         String cacheData = aCache.getAsString(SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key);
         if (cacheData == null) {
             return null;
@@ -214,13 +199,11 @@ public class DataUtil {
      * @return
      */
     public void clearCache(String key) {
-        ACache aCache = ACache.get(SheepApp.getInstance());
         aCache.remove(key);
     }
 
     public boolean isNewData(String key) {
-        ACache aCache = ACache.get(SheepApp.getInstance());
-        return TextUtils.equals(aCache.getAsString(key), "yes");
+        return !TextUtils.equals(aCache.getAsString(ApiKey.oldEqualsNew(key)), "yes");//新老数据不同，说明是新数据
     }
 
     //-----------------------------------------缓存数据部分-----------------------------------------------------结束

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

@@ -201,29 +201,14 @@ public class ActFindGame extends BaseActivity {
 
     @Override
     public void initData() {
-        FindApp findApp = null;
+        FindApp findApp = DataUtil.getInstance().getCacheResult(ApiKey.applications(id), FindApp.class);
         if(findApp != null){
             loadApp(findApp);
-        } else {
-            showProgress();
-            SheepApp.getInstance().getNetComponent().getApiService().getAppDetail(id)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new SheepSubscriber<BaseMessage>(this) {
-                        @Override
-                        public void onNext(BaseMessage baseMessage) {
-                            FindApp findApp = baseMessage.getData(FindApp.class);
-                            loadApp(findApp);
-                            hideProgress();
-                        }
-
-                        @Override
-                        public void onError(BaseMessage baseMessage) {
-                            G.showToast(baseMessage);
-                            resetData();
-                            hideProgress();
-                        }
-                    });
+        }
+        initFindAppFromNet();
+        if(isShowAppScore) {
+            initAppScoreNum();
+            initMyAppScore();
         }
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
         if(userEntity == null) {
@@ -242,13 +227,34 @@ public class ActFindGame extends BaseActivity {
         }
     }
 
+    private void initFindAppFromNet() {
+        showProgress();
+        SheepApp.getInstance().getNetComponent().getApiService().getAppDetail(id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(this) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.applications(id));
+                        if(isNewData) {
+                            FindApp findApp = baseMessage.getData(FindApp.class);
+                            loadApp(findApp);
+                        }
+                        hideProgress();
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                        resetData();
+                        hideProgress();
+                    }
+                });
+    }
+
     private void loadApp(FindApp findApp) {
         if (findApp != null) {
             loadData(findApp);
-            if(isShowAppScore) {
-                initAppScoreNum();
-                initMyAppScore();
-            }
         } else {
             resetData();
         }
@@ -256,28 +262,27 @@ public class ActFindGame extends BaseActivity {
 
     private void initAppScoreNum() {
         List<FindAppScore> findAppScoreList = DataUtil.getInstance().getCacheList(ApiKey.score_num(id), FindAppScore.class);
-        if (findAppScoreList == null) {
-            SheepApp.getInstance().getNetComponent().getApiService().getAppScoreNum(id)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                        @Override
-                        public void onNext(BaseMessage baseMessage) {
-                            List<FindAppScore> findAppScoreList = baseMessage.getDataList(FindAppScore.class);
-                            if (ListUtil.isEmpty(findAppScoreList))
-                                resetAppScoreNum();
-                            else
-                                loadAppScoreNum(findAppScoreList);
-                        }
-
-                        @Override
-                        public void onError(BaseMessage baseMessage) {
-                            G.showToast(baseMessage);
-                        }
-                    });
-        } else if(!findAppScoreList.isEmpty()) {
+        if(!findAppScoreList.isEmpty()) {
             loadAppScoreNum(findAppScoreList);
         }
+        SheepApp.getInstance().getNetComponent().getApiService().getAppScoreNum(id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        List<FindAppScore> findAppScoreList = baseMessage.getDataList(FindAppScore.class);
+                        if (ListUtil.isEmpty(findAppScoreList))
+                            resetAppScoreNum();
+                        else
+                            loadAppScoreNum(findAppScoreList);
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                    }
+                });
     }
     private void initMyAppScore() {
         MyFindAppCore myFindAppCore = DataUtil.getInstance().getCacheResult(ApiKey.my_score(id), MyFindAppCore.class);

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

@@ -215,30 +215,32 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
             }
         });
         FindItem data = DataUtil.getInstance().getCacheResult(ApiKey.articlesItem(id), FindItem.class);
-        if(data == null){
-            SheepApp.getInstance().getNetComponent().getApiService().getFindDetail(id)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                        @Override
-                        public void onNext(BaseMessage baseMessage) {
+        if(data != null){
+            loadFindItem(data);
+        }
+        SheepApp.getInstance().getNetComponent().getApiService().getFindDetail(id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.articlesItem(id));
+                        if(isNewData) {
                             FindItem data = baseMessage.getData(FindItem.class);
                             loadFindItem(data);
                         }
+                    }
 
-                        @Override
-                        public void onError(BaseMessage baseMessage) {
-                            taskHelper.clear();
-                            notifyDataSetChanged();
-                        }
-                    });
-        } else {
-            loadFindItem(data);
-        }
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        taskHelper.clear();
+                        notifyDataSetChanged();
+                    }
+                });
     }
 
     private void loadFindItem(FindItem data) {
-        if(data != null && !TextUtils.equals(JSON.toJSONString(findItem), JSON.toJSONString(data))){
+        if(data != null){
             taskHelper.clear();
             findItem = data;
             list.clear();
@@ -258,29 +260,32 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
     private FindApp findApp;
     private void initFindApp(int application_id) {
-
         FindApp cacheResult = DataUtil.getInstance().getCacheResult(ApiKey.applications(id), FindApp.class);
         if(cacheResult != null){
             findApp = cacheResult;
             notifyDataSetChanged();
-        } else {
-            SheepApp.getInstance().getNetComponent().getApiService().getAppDetail(application_id)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                        @Override
-                        public void onNext(BaseMessage baseMessage) {
+        }
+        SheepApp.getInstance().getNetComponent().getApiService().getAppDetail(application_id)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.applications(id));
+                        if(isNewData) {
                             findApp = baseMessage.getData(FindApp.class);
                             notifyDataSetChanged();
-                        }
-
-                        @Override
-                        public void onError(BaseMessage baseMessage) {
-                            G.showToast(baseMessage);
+                        } else {
                             refresh.setRefreshing(false);
                         }
-                    });
-        }
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                        refresh.setRefreshing(false);
+                    }
+                });
     }
 
     private FindItem findItem;

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

@@ -1,9 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
 import android.support.v7.widget.AppCompatAutoCompleteTextView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -20,18 +17,13 @@ import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.arialyy.aria.core.download.DownloadTask;
 import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.RecyleObj;
-import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.SearchGameRecord;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
+import com.sheep.gamegroup.model.entity.XiaomiGameEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
@@ -42,20 +34,16 @@ import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.gamegroup.view.adapter.ArrayAdapter;
-import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 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.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.OnClick;

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

@@ -1,67 +1,39 @@
 package com.sheep.gamegroup.view.activity;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
-import com.alibaba.fastjson.JSONObject;
 import com.arialyy.aria.core.Aria;
-import com.arialyy.aria.core.download.DownloadTask;
-import com.kfzs.android.view.tag.FlowLayout;
-import com.kfzs.android.view.tag.TagAdapter;
-import com.kfzs.android.view.tag.TagFlowLayout;
 import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
-import com.mdad.sdk.mdsdk.AdManager;
-import com.mdad.sdk.mdsdk.GetAdListListener;
-import com.mdad.sdk.mdsdk.common.AdData;
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.model.entity.AdDataSon;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.FindApp;
-import com.sheep.gamegroup.model.entity.FindItem;
-import com.sheep.gamegroup.model.entity.FindTag;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.model.entity.XiaomiGameEntity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceIDUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.SheepSwipeRefreshLayout;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.ViewHolder;
-import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
-import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 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.TitleBarUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.io.File;
 import java.util.List;
-import java.util.Locale;
 
 import butterknife.BindView;
-import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;
 
@@ -252,7 +224,7 @@ public class ActXiaomiGame extends BaseActivity {
 
                                 if (page == 1)
                                     list.clear();
-                                CommonUtil.getInstance().updateEmptyView(empty_view, ListUtil.addAll(list, newList) == 0?true:false);
+                                CommonUtil.getInstance().updateEmptyView(empty_view, ListUtil.addAll(list, newList) == 0);
                                 view_list.getAdapter().notifyDataSetChanged();
                             }
                         } catch (Exception e) {

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

@@ -1,13 +0,0 @@
-package com.sheep.gamegroup.view.activity;
-
-import android.app.Activity;
-
-/**
- * Created by Administrator on 2018/3/27.
- */
-
-public class SingTask extends Activity {
-
-
-
-}