首页使用缓存机制获取任务数据

app/src/main/java/com/kfzs/duanduan/event/EventTypes.java

@@ -26,7 +26,6 @@ public enum EventTypes {
 
     TASK_AGAIN_UPLOAD_FILE,//任务审核上传图片 通知
     TASK_AGAIN_UPLOAD_FILE_DATA,//任务审核上传图片 通知
-    REFRESH_DATA_PHONE,//刷新手机
     REFRESH_DATA_SIGN,//签到对话框
 
     GUIDE_NEXT,//引导页面下一步操作

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

@@ -182,10 +182,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     loadUserInfo();
                     break;
                 case 1:
+                    position = 0;
+                    List<TaskAcceptedEty> allTaskAcceptedTaskList = DataUtil.getInstance().getAllTaskAcceptedTaskList();
+                    if(!ListUtil.isEmpty(allTaskAcceptedTaskList)){
+                        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList), position);
+                        position++;
+                    }
+                    checkOtherList(allTaskAcceptedTaskList);
                     tryMakeMoneyAdp.setIs_succession(3);
-                    if (releaseEtyLists != null && releaseEtyLists.size() > 0) {
-
-                        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position > 2 ? 1 : position);
+                    if(!ListUtil.isEmpty(releaseEtyLists)) {
+                        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position);
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
                     checkAndInitView();
@@ -194,6 +200,21 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         }
     };
+    //检查发布任务中有没有正在运行的任务，有就去掉
+    private void checkOtherList(final List<TaskAcceptedEty> taskAcceptedEtyList){
+        if(!ListUtil.isEmpty(taskAcceptedEtyList) && !ListUtil.isEmpty(releaseEtyLists)){
+            ListUtil.removeItem(releaseEtyLists, new ListUtil.CallBack<TaskReleaseEty, Boolean>() {
+                @Override
+                public Boolean call(TaskReleaseEty taskReleaseEty) {
+                    for (TaskAcceptedEty taskAcceptedEty : taskAcceptedEtyList) {
+                        if(taskAcceptedEty != null && taskAcceptedEty.getRelease_task() != null && taskAcceptedEty.getRelease_task().equals(taskReleaseEty))
+                            return true;
+                    }
+                    return false;
+                }
+            });
+        }
+    }
 
     @Override
     protected void initView(Bundle savedInstanceState) {
@@ -335,34 +356,22 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         } else {
             invite(cacheMoreDataEtyList);
         }
-        //正在运行的任务
-        position = 0;
+        //任务
         releaseEtyLists.clear();
         tryMakeMoneyAdp.clear();
         tryMakeMoneyAdp.addType(1);
         for (int i = 0; i < 2; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
-        List<TaskAcceptedEty> cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.new_run_task(3), TaskAcceptedEty.class);
-        if (ListUtil.isEmpty(cacheTaskAcceptedEtyList)) {//onResume中从网络获取
-
-        } else {
-            AutoTaskListUtil.getInstance().loadList(cacheTaskAcceptedEtyList);
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, cacheTaskAcceptedEtyList), position);
-            tryMakeMoneyAdp.addPresenter(tryMakeMoneyPresenter);
-            position++;
-        }
         List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task, TaskReleaseEty.class);
-        if (ListUtil.isEmpty(cacheTaskReleaseEtyList)) {//onResume中从网络获取
-
+        if (cacheTaskReleaseEtyList == null) {
+            initOtherTaskList();
         } else {
+            releaseEtyLists.clear();
             releaseEtyLists.addAll(cacheTaskReleaseEtyList);
+            mHanderl.sendEmptyMessage(1);
         }
 
-        tryMakeMoneyAdp.setIs_succession(3);
-        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position);
-        tryMakeMoneyAdp.notifyDataSetChanged();
-
         //公告
         List<BulletinEnty> cacheBulletinEtyList = DataUtil.getInstance().getCacheList(ApiKey.bulletin, BulletinEnty.class);
         if(ListUtil.isEmpty(cacheBulletinEtyList)){
@@ -448,7 +457,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             pagePresenter.getAwardDetail();
         }
 
-        recyclerInitData();//任务
+        DataUtil.getInstance().reInitAcceptedTaskList();
+        initOtherTaskList();//任务
         pagePresenter.bulletin(null);//公告
         pagePresenter.slideshow(null);//轮播
         pagePresenter.homeList();//首页list
@@ -478,17 +488,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_gv.setAdapter(adpHomeListGrideview);
     }
 
-    private void recyclerInitData() {
-
-
-        position = 0;
-        releaseEtyLists.clear();
-        tryMakeMoneyAdp.clear();
-        tryMakeMoneyAdp.addType(1);
-        for (int i = 0; i < 2; i++) {
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
-        }
-
+    private void initOtherTaskList() {
         RequestParameEty parameEty = new RequestParameEty();
         parameEty.setHashMap(
                 CommonUtil.getInstance()
@@ -498,9 +498,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                                 1,
                                 0,
                                 0,
-                                -1 + "",
+                                 "-1",
                                 3));
-
         tryMakeMoneyPresenter.releaseTask(parameEty);
     }
 
@@ -544,7 +543,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         DataUtil.getInstance().setUserEntity(userEntity);
         mHanderl.sendEmptyMessage(0);
-        Jump2View.getInstance().tryShowNewbieTask(activity, userEntity, newbie_task);
     }
 
     @Override
@@ -566,7 +564,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @Override
     public void giveUpTaskSuccesView(Object o) {
         G.showToast("取消任务成功");
-        recyclerInitData();
+        DataUtil.getInstance().reInitAcceptedTaskList();
 
     }
 
@@ -577,24 +575,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     @Override
     public void returnTaskTaskUpdataView(Object o) {
-
-
-        try {
-            position = 0;
-            BaseMessage baseMessage = (BaseMessage) o;
-            List<TaskAcceptedEty> taskAcceptedEty = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-            AutoTaskListUtil.getInstance().loadList(taskAcceptedEty);
-            if (taskAcceptedEty != null && taskAcceptedEty.size() > 0) {
-                tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty), position);
-                tryMakeMoneyAdp.addPresenter(tryMakeMoneyPresenter);
-                position++;
-            }
-
-//            mhandler.sendEmptyMessage(0);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        mHanderl.sendEmptyMessage(1);
+        BaseMessage baseMessage = (BaseMessage) o;
+        List<TaskAcceptedEty> taskAcceptedEtyList = baseMessage.getDataList(TaskAcceptedEty.class);
+        AutoTaskListUtil.getInstance().loadList(taskAcceptedEtyList);
+        DataUtil.getInstance().reloadAcceptedTaskList(taskAcceptedEtyList);
+        loadAllAcceptedTaskList(taskAcceptedEtyList);
+    }
+    //加载所有的正在进行的任务列表
+    private void loadAllAcceptedTaskList(List<TaskAcceptedEty> taskAcceptedEtyList){
+        if(!ListUtil.isEmpty(taskAcceptedEtyList))
+            mHanderl.sendEmptyMessage(1);
     }
 
     @Override
@@ -618,31 +608,19 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     @Override
-    public void releaseTaskTaskUpdataView(Object o) {
-
-        position = 0;
-        try {
-            BaseMessage baseMessage = (BaseMessage) o;
-            List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
+    public void releaseTaskTaskUpdataView(Object object) {
+        if(object instanceof BaseMessage) {
+            List<TaskReleaseEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskReleaseEty.class);
             if (releaseEtyList != null) {
                 releaseEtyLists.clear();
                 releaseEtyLists.addAll(releaseEtyList);
+                mHanderl.sendEmptyMessage(1);
             }
-
-        } catch (Exception e) {
-            e.printStackTrace();
         }
-        //请求正在运行中的任务
-        CommonUtil.getInstance()
-                .getRunTask(tryMakeMoneyPresenter,
-                        3);
     }
 
     @Override
     public void failReleaseTask2View(Object o) {
-        CommonUtil.getInstance()
-                .getRunTask(tryMakeMoneyPresenter,
-                        3);
     }
 
     @Override
@@ -792,7 +770,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             userEntity = result;
             loadUserInfo();
         }
-        recyclerInitData();
+        Jump2View.getInstance().tryShowNewbieTask(activity, userEntity, newbie_task);
+        DataUtil.getInstance().initACacheAcceptedTaskList();
     }
 
     @Override
@@ -842,7 +821,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void onEventMainThread(BigEvent event) {
         switch (event.getEventTypes()) {
             case ONFRESH_FGT_FAMLLSHEEP:
-                refreshData();
+                //加载正在进行的任务
+                List<TaskAcceptedEty> allTaskAcceptedTaskList = DataUtil.getInstance().getAllTaskAcceptedTaskList();
+                loadAllAcceptedTaskList(allTaskAcceptedTaskList);
                 break;
         }
     }
@@ -964,7 +945,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     private void clickBanner(int position) {
-        SlideshowEty clickedGameObj = ListUtil.getIndex(slideshowEtyLists, position);
+        SlideshowEty clickedGameObj = ListUtil.getItem(slideshowEtyLists, position);
         if (clickedGameObj == null) {
             return;
         }

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

@@ -130,6 +130,7 @@ public class TaskAcceptedEty implements Serializable{
 
     @Override
     public boolean equals(Object obj) {
-        return obj instanceof TaskAcceptedEty && ((TaskAcceptedEty) obj).id == id;
+        return obj instanceof TaskAcceptedEty &&
+                (((TaskAcceptedEty) obj).id == id || ( release_task != null && release_task.equals(((TaskAcceptedEty) obj).getRelease_task())));
     }
 }

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

@@ -244,6 +244,11 @@ public class TaskReleaseEty implements Serializable{
     }
 
 
+    @Override
+    public boolean equals(Object obj) {
+        return obj instanceof TaskReleaseEty && ((TaskReleaseEty) obj).getId() == id;
+    }
+
     /**
      * 任务是否下线
      * @return

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

@@ -11,7 +11,7 @@ public interface TryMakeMoneyContract {
     interface Presenter{
         void getData(Object o);
         void acceptedTask(RequestParameEty o);//获取已接受的任务
-        void returnTask(RequestParameEty o);//获取我正在运行的任务
+        void returnTask(int is_succession);//获取我正在运行的任务
         void releaseTask(RequestParameEty o);//获取正在运行的任务
 
         void giveUpTask(int id);//放弃任务接口

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

@@ -53,10 +53,9 @@ public class TryMakeMoneyPresenter implements TryMakeMoneyContract.Presenter {
     }
 
     @Override
-    public void returnTask(RequestParameEty o) {
+    public void returnTask(int is_succession) {
 
-        HashMap<String, String> hashMap = o.getHashMap();
-        apiService.returnTask(Integer.valueOf(hashMap.get("is_succession")))
+        apiService.returnTask(is_succession)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {

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

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.statistics;
 
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -44,7 +45,7 @@ public class AppStatistics {
     synchronized public void sendDataToServer(int type,int subType,String subString){
         ApiService apiService =SheepApp.getInstance().getNetComponent().getApiService();
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("uid",DataUtil.getInstance().getUserId());
+        jsonObject.put("uid", NumberFormatUtils.parseInteger(DataUtil.getInstance().getUserId()));
         jsonObject.put("type",type);
         jsonObject.put("subtype",subType);
         jsonObject.put("substring",subString);

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

@@ -520,26 +520,6 @@ public class CommonUtil {
     }
 
     /**
-     * 获取正在进行中的任务
-     */
-    public void getRunTask(TryMakeMoneyPresenter presenter,
-                           int is_succession){
-
-        RequestParameEty parameEty = new RequestParameEty();
-        parameEty.setHashMap(
-                CommonUtil.getInstance()
-                        .setHashMap(1,
-                                100,
-                                SheepApp.getInstance().getConnectAddress().getPlatForm(),
-                                1,
-                                0,
-                                0,
-                                -1+"",
-                                is_succession));
-        presenter.returnTask(parameEty);
-    }
-
-    /**
      * 设置 drawLeft drawRight
      */
     public void setDraw2View(Context context, TextView view, int res, int color){

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

@@ -3,19 +3,28 @@ 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.UserEntity;
+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.schedulers.Schedulers;
+
 /**
  * Created by realicing on 2018/7/27.
  * realicing@sina.com
@@ -160,7 +169,7 @@ public class DataUtil {
     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 (!TextUtils.isEmpty(cacheData)) {
+        if (cacheData != null) {
             if (BuildConfig.XXTEA_ENCRYPT) {
                 cacheData = BaseMessageConverter.decrypt(cacheData);
             }
@@ -197,4 +206,116 @@ public class DataUtil {
         aCache.remove(key);
     }
     //-----------------------------------------缓存数据部分-----------------------------------------------------结束
+    //-----------------------------------------进行任务部分-----------------------------------------------------开始
+
+    private List<TaskAcceptedEty> tryPlayTaskList = ListUtil.emptyList();//其它视为 试玩任务
+    private List<TaskAcceptedEty> sequentialTaskList = ListUtil.emptyList();//连续任务
+    private List<TaskAcceptedEty> gameTaskList = ListUtil.emptyList();//游戏任务
+    private List<TaskAcceptedEty> allTaskAcceptedTaskList = ListUtil.emptyList();
+
+    //获取缓存数据
+    public void initACacheAcceptedTaskList(){
+        List<TaskAcceptedEty> cacheTaskAcceptedEtyList = getCacheList(ApiKey.new_run_task(3), TaskAcceptedEty.class);
+        if (cacheTaskAcceptedEtyList == null) {//无缓存
+            reInitAcceptedTaskList();
+        } else {//有缓存
+            if(ListUtil.isEmpty(cacheTaskAcceptedEtyList)){//无任务
+                clearAcceptedTaskList();
+            } else {//有任务
+                reloadAcceptedTaskList(cacheTaskAcceptedEtyList);
+            }
+            EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
+        }
+    }
+    //刷新数据
+    public void reInitAcceptedTaskList(){
+        SheepApp.getInstance().getNetComponent().getApiService().returnTask(3)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                DataUtil.getInstance().setSaveTime(ApiKey.new_run_task(3));
+                                reloadAcceptedTaskList(baseMessage.getDataList(TaskAcceptedEty.class));
+                                EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                clearAcceptedTaskList();
+                            }
+                        });
+    }
+
+    public void reloadAcceptedTaskList(List<TaskAcceptedEty> acceptedTaskList) {
+        clearAcceptedTaskList();
+        for (TaskAcceptedEty taskAcceptedEty : acceptedTaskList) {
+            addAcceptedTask(taskAcceptedEty);
+        }
+    }
+    public List<TaskAcceptedEty> getAllTaskAcceptedTaskList(){
+        checkTaskList(allTaskAcceptedTaskList);
+        return allTaskAcceptedTaskList;
+    }
+    private void clearAcceptedTaskList() {
+        tryPlayTaskList.clear();
+        sequentialTaskList.clear();
+        gameTaskList.clear();
+        allTaskAcceptedTaskList.clear();
+    }
+
+    public void addAcceptedTask(TaskAcceptedEty taskAcceptedEty) {
+        if(taskAcceptedEty != null && taskAcceptedEty.getRelease_task() != null && taskAcceptedEty.getRelease_task().getTask() != null){
+            switch (taskAcceptedEty.getRelease_task().getTask().getTask_type()){
+                case 1000://连续任务
+                    ListUtil.addAll(sequentialTaskList, taskAcceptedEty);
+                    break;
+                case 1002:
+                case 1003:
+                case 1004://游戏任务
+                    ListUtil.addAll(gameTaskList, taskAcceptedEty);
+                    break;
+                default://其它视为 试玩任务
+                    ListUtil.addAll(tryPlayTaskList, taskAcceptedEty);
+                    break;
+            }
+            ListUtil.addAll(allTaskAcceptedTaskList, taskAcceptedEty);
+        }
+    }
+    //清除并重置正在进行的任务的时间
+    private void checkTaskList(List<TaskAcceptedEty> taskList) {
+        final long saveTime = getSaveTime(ApiKey.new_run_task(3));
+        if(saveTime > 0) {
+            ListUtil.removeItem(taskList, new ListUtil.CallBack<TaskAcceptedEty, Boolean>() {
+                @Override
+                public Boolean call(TaskAcceptedEty taskAcceptedEty) {
+                    long newEndTime = taskAcceptedEty.getEnd_time() - (System.currentTimeMillis() - saveTime) / 1000;
+                    if (newEndTime < 1) {//时间到了，删除该任务
+                        return true;
+                    }
+                    taskAcceptedEty.setEnd_time(newEndTime);//重置时间
+                    return false;
+                }
+            });
+        } else {
+            setSaveTime(ApiKey.new_run_task(3));
+        }
+    }
+    public List<TaskAcceptedEty> getTryPlayTaskList() {
+        checkTaskList(tryPlayTaskList);
+        return tryPlayTaskList;
+    }
+
+
+    public List<TaskAcceptedEty> getSequentialTaskList() {
+        checkTaskList(sequentialTaskList);
+        return sequentialTaskList;
+    }
+
+    public List<TaskAcceptedEty> getGameTaskList() {
+        checkTaskList(gameTaskList);
+        return gameTaskList;
+    }
+
+    //-----------------------------------------进行任务部分-----------------------------------------------------结束
 }

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

@@ -980,7 +980,7 @@ public class Jump2View {
                                 action1.call(null);
                         } else {
 //                            DialogAgreement.showDialog(activity, agreementList, action1);
-                            Agreement item = ListUtil.getIndex(agreementList, 0);
+                            Agreement item = ListUtil.getItem(agreementList, 0);
                             if(item != null)
                                 goLoadH5(activity, item.getName(), item.getContent());
                         }

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

@@ -1,8 +1,6 @@
 package com.sheep.gamegroup.util;
 
 
-import com.sheep.gamegroup.model.entity.FindTag;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -20,7 +18,7 @@ public class ListUtil {
         return list == null || list.isEmpty();
     }
 
-    public static <T> T getIndex(List<T> list, int index) {
+    public static <T> T getItem(List<T> list, int index) {
         return hasIndex(list, index) ? list.get(index) : null;
     }
     public static <T> T getLast(List<T> list) {

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

@@ -415,15 +415,6 @@ public class SysAppUtil {
                 e.printStackTrace();
             }
         }
-        Version buglyVersion;
-        if((buglyVersion = checkBuglyUpdate()) != null){
-            ACache.get(SheepApp.getInstance()).put("version_url", buglyVersion.getAddress());
-            if(action1 != null)
-                action1.call(0);
-            Beta.checkUpgrade();
-//            loadVersion(activity, ignoreMd5, action1, buglyVersion);
-            return;
-        }
         SheepApp.getInstance().getNetComponent().getApiService().getNewVersion(SheepApp.getInstance().getConnectAddress().getVersionType())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -438,7 +429,7 @@ public class SysAppUtil {
                     public void onError(BaseMessage baseMessage) {
                         ACache.get(SheepApp.getInstance()).put("version_url", "");
                         if(ignoreMd5 == null)
-                            G.showToast("当前版本为最新版本，无需更新");
+                            Beta.checkUpgrade();
                         if(action1 != null)
                             action1.call(0);
                     }

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

@@ -207,7 +207,7 @@ public class TestUtil {
 
                                 @Override
                                 public void onClick(DialogInterface dialogInterface, int which) {
-                                    Object object = ListUtil.getIndex(list, which);
+                                    Object object = ListUtil.getItem(list, which);
                                     if(object instanceof LoginUser){
                                         SpUtils.saveToken(SheepApp.getInstance(), ((LoginUser) object).getToken());
                                         ActivityManager.getInstance().finishAllActivity();

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

@@ -1,13 +1,9 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import android.content.Context;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
@@ -22,14 +18,12 @@ import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 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.afinal.simplecache.ACache;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Locale;
 
@@ -159,7 +153,7 @@ public class ActMiDong extends BaseActivity {
     public void onEventMainThread(BigEvent event){
         switch (event.getEventTypes()){
             case REFRESH_MING_DONG:
-                FgtMiDong item = ListUtil.getIndex(fgtMiDongList, curPosition);
+                FgtMiDong item = ListUtil.getItem(fgtMiDongList, curPosition);
                 if(item != null){
                     item.refreshData();
                 }

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

@@ -6,7 +6,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.kfzs.android.view.tag.FlowLayout;
 import com.kfzs.android.view.tag.TagAdapter;
@@ -115,7 +114,7 @@ public class ActUserLabelList extends BaseActivity {
                     tagList.setOnTagClickListener(new TagFlowLayout.OnTagClickListener() {
                         @Override
                         public boolean onTagClick(View view, int position, FlowLayout parent) {
-                            UserLabel userLabel = ListUtil.getIndex(userLabelList.getLabels(), position);
+                            UserLabel userLabel = ListUtil.getItem(userLabelList.getLabels(), position);
                             if(userLabel != null) {
                                 userLabel.setChecked(!userLabel.isChecked());
                                 return true;

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

@@ -130,8 +130,7 @@ public class BindOrChangeWeixinAct extends BaseActivity implements BindOrChangeW
             }
         }
         finish();
-        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
-        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.REFRESH_DATA_PHONE));
+        CommonUtil.getInstance().updateUserInfo(null);
     }
 
     @Override

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

@@ -373,7 +373,6 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
                 DataUtil.getInstance().setUserMobile(mobile);
                 G.showToast(o);
                 CommonUtil.getInstance().updateUserInfo(null);
-                EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.REFRESH_DATA_PHONE));
                 finish();
             }
             if(o == null){

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

@@ -67,7 +67,7 @@ public class TaskDetailAddQQAct extends AbsChooseImageActivity {
     @BindView(R.id.detail_shrae_friend_layout)
     LinearLayout detail_shrae_friend_layout;
     @BindView(R.id.item_layout)
-    RelativeLayout item_layout;
+    View item_layout;
     private Activity activity;
 
     private NewbieTask newbieTask;

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

@@ -10,8 +10,6 @@ import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.kfzs.duanduan.event.BigEvent;
-import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.kfzs.duanduan.utils.dlg.FormatAny;
 import com.sheep.gamegroup.absBase.BaseActivity;
@@ -35,8 +33,6 @@ 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;
@@ -45,7 +41,6 @@ import javax.inject.Inject;
 
 import butterknife.BindView;
 import butterknife.OnClick;
-import rx.functions.Action1;
 
 /**
  * 提现
@@ -69,7 +64,6 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     private List<WithdrawalList> wlLists = new ArrayList<>();
 
     private WithdrawalAdapter adapter;
-    private ArrayList<Object> listData = new ArrayList<>();
     private int select;
     private String amount;
     private String balanceAmount = "0";//余额
@@ -83,7 +77,6 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     @Override
     public void initView() {
         activity = this;
-        EventBus.getDefault().register(this);
         TitleBarUtils
                 .getInstance()
                 .setTitle(activity, "提现")
@@ -124,21 +117,23 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
     @Override
     public void initData() {
+    }
 
-        try {
-            if (userEntity == null)
-                userEntity = DataUtil.getInstance().getUserEntity();
-            if(userEntity != null){
-                ViewUtil.setText(weixin_name_tv, userEntity.getWx_nickname());
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mInitData();
+    }
 
+    public void mInitData() {
+        if (userEntity == null)
+            userEntity = DataUtil.getInstance().getUserEntity();
+        if(userEntity != null){
+            ViewUtil.setText(weixin_name_tv, userEntity.getWx_nickname());
+        }
         setBalanceAmount();
     }
 
-
     @OnClick({R.id.withdrawal_sure})
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -178,7 +173,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     @Override
     public void updateView(Object o) {
         hideProgress();
-        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
+        CommonUtil.getInstance().updateUserInfo(null);
         Jump2View.getInstance().goWithdrawalResultview(activity, NumberFormatUtils.parseFloat(amount));
     }
 
@@ -227,43 +222,11 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
 
                     wlLists.add(withdrawalList);
                 }
-
             }
-
             adapter.notifyDataSetChanged();
         }catch (Exception e){
             e.printStackTrace();
         }
     }
 
-    @Subscribe
-    public void onEventMainThread(BigEvent event){
-        switch (event.getEventTypes()){
-            case REFRESH_DATA_PHONE:
-                refreshData();
-                break;
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        EventBus.getDefault().unregister(this);
-    }
-    //Todo 刷新用户信息,可以写一个公用的
-    /**
-     * 刷新用户信息
-     */
-    private void refreshData(){
-        showProgress(false);
-        CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
-            @Override
-            public void call(UserEntity result) {
-                hideProgress();
-                if(result != null)
-                    userEntity = result;
-            }
-        });
-    }
-
 }

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

@@ -3,10 +3,8 @@ package com.sheep.gamegroup.view.adapter;
 import android.app.Activity;
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.constraint.ConstraintLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
-import android.text.Html;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,7 +14,6 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder;
 import com.kfzs.duanduan.adp.AdpCommonRecy;
@@ -188,7 +185,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
             @Override
             public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, final int i) {
-                final OrienteeringDetail item = ListUtil.getIndex(etyList, i);
+                final OrienteeringDetail item = ListUtil.getItem(etyList, i);
                 if(item == null){
                     return;
                 }
@@ -385,7 +382,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
             @Override
             public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, final int i) {
-                final GameAgencyRechargePlatformEntity item = ListUtil.getIndex(etyList, i);
+                final GameAgencyRechargePlatformEntity item = ListUtil.getItem(etyList, i);
                 if(item == null){
                     return;
                 }
@@ -458,7 +455,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
             @Override
             public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, final int i) {
-                final TaskReleaseEty taskReleaseEty = ListUtil.getIndex(etyList, i);
+                final TaskReleaseEty taskReleaseEty = ListUtil.getItem(etyList, i);
                 final TaskEty taskEty;
                 if (taskReleaseEty == null || (taskEty = taskReleaseEty.getTask()) == null) {
                     return;
@@ -566,7 +563,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
             @Override
             public void onBindViewHolder(final RecyclerView.ViewHolder viewHolder, final int i) {
-                final TaskReleaseEty taskReleaseEty = ListUtil.getIndex(etyList, i);
+                final TaskReleaseEty taskReleaseEty = ListUtil.getItem(etyList, i);
                 final TaskEty taskEty;
                 if (taskReleaseEty == null || (taskEty = taskReleaseEty.getTask()) == null) {
                     return;
@@ -742,7 +739,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 final TaskAcceptedEty taskAcceptedEty;
                 final TaskReleaseEty taskReleaseEty;
                 final TaskEty taskEty;
-                if((taskAcceptedEty = ListUtil.getIndex(etyList, i)) == null
+                if((taskAcceptedEty = ListUtil.getItem(etyList, i)) == null
                         || (taskReleaseEty = taskAcceptedEty.getRelease_task()) == null
                         || (taskEty = taskReleaseEty.getTask()) == null){
                     return;
@@ -819,7 +816,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        TaskAcceptedEty item = ListUtil.getIndex(etyList, i);
+                        TaskAcceptedEty item = ListUtil.getItem(etyList, i);
                         if(item == null){
                             return;
                         }

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

@@ -415,7 +415,7 @@ public class DialogAddAccount {
     }
 
     private void selectAccount(int position) {
-        GameAccountEntity item = ListUtil.getIndex(gameAccountListEntity, position);
+        GameAccountEntity item = ListUtil.getItem(gameAccountListEntity, position);
         if(item == null)
             return;
         ViewUtil.setText(game_account_et, item.getTask_name());
@@ -447,7 +447,7 @@ public class DialogAddAccount {
     }
 
     private void selectPlatform(int position) {
-        GridViewEntity item = ListUtil.getIndex(gamePlatorEntity, position);
+        GridViewEntity item = ListUtil.getItem(gamePlatorEntity, position);
         if(item == null)
             return;
         ViewUtil.setText(game_account_plator_spinner_tv, item.getName());
@@ -466,7 +466,7 @@ public class DialogAddAccount {
     }
 
     private void selectGame(int position) {
-        GameAccountEntity item = ListUtil.getIndex(gameAccountEntity, position);
+        GameAccountEntity item = ListUtil.getItem(gameAccountEntity, position);
         if(item == null)
             return;
         ViewUtil.setText(game_account_game_list_tv_spinner, item.getTask_name());

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

@@ -206,7 +206,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         if(isFirstCache){
             List<TaskAcceptedEty> cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.new_run_task(is_succession), TaskAcceptedEty.class);
             if (ListUtil.isEmpty(cacheTaskAcceptedEtyList)) {//本地无数据，从网络获取
-                CommonUtil.getInstance().getRunTask(presenter,is_succession);
+                presenter.returnTask(is_succession);
             } else {
                 //重新设置正在运行的任务的缓存时间
                 long saveTime = DataUtil.getInstance().getSaveTime(TaskAcceptedEty.class.getSimpleName());
@@ -227,7 +227,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                 getNetWork(type);
             }
         } else {
-            CommonUtil.getInstance().getRunTask(presenter,is_succession);
+            presenter.returnTask(is_succession);
         }
     }
 

app/src/main/java/com/sheep/jiuyan/samllsheep/service/MonitorAppService.java

@@ -1,186 +0,0 @@
-package com.sheep.jiuyan.samllsheep.service;
-
-import android.accessibilityservice.AccessibilityService;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.view.accessibility.AccessibilityEvent;
-
-import com.sheep.gamegroup.model.entity.AppRecord;
-import com.sheep.gamegroup.model.util.AutoTaskListUtil;
-import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.MyDbManager;
-import com.sheep.gamegroup.util.SysAppUtil;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Created by realicing on 2018/5/4.
- * realicing@sina.com
- */
-public class MonitorAppService extends AccessibilityService {
-    @Override
-    public void onAccessibilityEvent(AccessibilityEvent accessibilityEvent) {
-        // 此方法是在主线程中回调过来的，所以消息是阻塞执行的
-        // 获取包名
-        CharSequence packageName = accessibilityEvent.getPackageName();
-        CharSequence className = accessibilityEvent.getClassName();
-        int eventType = accessibilityEvent.getEventType();
-        List<CharSequence> textList = accessibilityEvent.getText();
-        LogUtil.println("MonitorAppService", "onAccessibilityEvent", eventType,"pkgName:", packageName, "className:", className, "source:", ListUtil.getIndex(textList, 0));
-        if(AutoTaskListUtil.getInstance().isEmpty()) {//当前没有应用自动审核任务时不操作数据库
-//            kfDisableSelf();
-            return;
-        }
-        if(packageName == null){
-            return;
-        }
-        switch (eventType) {
-            case AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED:
-
-                long curTime = System.currentTimeMillis();
-                AppRecord appRecord = new AppRecord();
-                appRecord.setType_id(eventType);
-                if(className != null)
-                    appRecord.setClassName(className.toString());
-                appRecord.setPackageName(packageName.toString());
-                if(ListUtil.getIndex(textList, 0) != null)
-                    appRecord.setTag(textList.get(0).toString());
-
-                AppRecord lastAppRecord = AutoTaskListUtil.getInstance().getLastAppRecord();
-                long lastTime = AutoTaskListUtil.getInstance().getLastTime();
-                if(lastAppRecord != null && lastTime != 0)
-                    lastAppRecord.setTime(lastAppRecord.getTime() + curTime - lastTime);
-                if(lastAppRecord != null && AutoTaskListUtil.getInstance().hasTask(lastAppRecord)) {
-                    MyDbManager.getInstance().saveOrUpdate(lastAppRecord);
-                    LogUtil.println("MonitorAppService", "MyDbManager", "saveOrUpdate", "lastAppRecord", lastAppRecord.getPackageName(), lastAppRecord.getTime());
-                }
-
-                AutoTaskListUtil.getInstance().setLastTime(curTime);
-                AutoTaskListUtil.getInstance().setLastAppRecord(appRecord);
-                break;
-//            case AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED:
-//                System.out.println("MonitorAppService TYPE_WINDOW_CONTENT_CHANGED: " + " packageName: " + packageName + " source: " + ListUtil.getIndex(textList, 0));
-//                break;
-//            case AccessibilityEvent.TYPE_VIEW_CLICKED:
-//                System.out.println("MonitorAppService TYPE_VIEW_CLICKED: " + " pkgName: " + packageName + " className: " + className  + " source: " + ListUtil.getIndex(textList, 0));
-//                break;
-        }
-    }
-
-    private void kfDisableSelf() {
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            disableSelf();
-        } else {
-            stopSelf();
-        }
-    }
-
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        AutoTaskListUtil.getInstance().clearAlertDialog();
-        return super.onStartCommand(intent, flags, START_STICKY);
-    }
-
-    @Override
-    public void onInterrupt() {
-//        Jump2View.getInstance().startAccessibility(getApplicationContext());
-        AutoTaskListUtil.getInstance().clearAlertDialog();
-        LogUtil.println("MonitorAppService onInterrupt");
-    }
-
-    @Override
-    public boolean onUnbind(Intent intent) {
-//        Jump2View.getInstance().startAccessibility(getApplicationContext());
-        AutoTaskListUtil.getInstance().clearAlertDialog();
-        LogUtil.println("MonitorAppService onUnbind");
-        return super.onUnbind(intent);
-    }
-
-    public static void tryCloseAccessibility(Activity activity) {
-        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (!Settings.System.canWrite(SheepApp.getInstance())) {
-                Intent intent = new Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS, Uri.parse("package:" + SheepApp.getInstance().getPackageName()));
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                activity.startActivityForResult(intent, -1);
-            } else {
-//                有了权限，你要做什么呢？具体的动作
-                try {
-                    closeAccessibility();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        } else {
-            try {
-                closeAccessibility();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
-    public static void closeService() {
-        //这里是包名+辅助功能类名
-        String cmd1 = String.format(Locale.CHINA, "settings put secure %s %s", Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, getId2());
-
-        String cmd2 = String.format(Locale.CHINA, "settings put secure %s 1", Settings.Secure.ACCESSIBILITY_ENABLED);
-        SysAppUtil.execShell(cmd1);
-        SysAppUtil.execShell(cmd2);
-    }
-
-
-    public static void closeAccessibility() {
-        String service = SheepApp.getInstance().getPackageName() + "/" + MonitorAppService.class.getCanonicalName();
-        // 这个key保存已经辅助服务的组件名列表，以“:”隔开，要关闭自己的组件，只要从这个key的值中移除该字符串
-        Settings.Secure.putString(SheepApp.getInstance().getApplicationContext().getContentResolver(), Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, service);//com.sheep.jiuyan.samllsheep/com.sheep.jiuyan.samllsheep.service.MonitorAppService
-        // 这个key控制辅助服务的开关
-        Settings.Secure.putInt(SheepApp.getInstance().getApplicationContext().getContentResolver(), Settings.Secure.ACCESSIBILITY_ENABLED, 0);
-    }
-    private static String getId(){
-        String pacakgeName = SheepApp.getInstance().getPackageName();
-        return pacakgeName+"/"+MonitorAppService.class.getCanonicalName().replace(pacakgeName, "");
-    }
-    private static String getId2(){
-        String pacakgeName = SheepApp.getInstance().getPackageName();
-        return pacakgeName+"/"+MonitorAppService.class.getCanonicalName();
-    }
-    private static boolean isThisService(String id){
-        return getId2().equalsIgnoreCase(id) || getId().equalsIgnoreCase(id);
-    }
-
-    public static boolean isAccessibilitySettingsOn(Context mContext) {
-        int accessibilityEnabled = 0;
-        // com.z.buildingaccessibilityservices/android.accessibilityservice.AccessibilityService
-        try {
-            accessibilityEnabled = Settings.Secure.getInt(mContext.getApplicationContext().getContentResolver(),
-                    android.provider.Settings.Secure.ACCESSIBILITY_ENABLED);
-        } catch (Settings.SettingNotFoundException ignored) {
-        }
-        TextUtils.SimpleStringSplitter mStringColonSplitter = new TextUtils.SimpleStringSplitter(':');
-
-        if (accessibilityEnabled == 1) {
-            String settingValue = Settings.Secure.getString(mContext.getApplicationContext().getContentResolver(),
-                    Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-            LogUtil.println("MonitorAppService","isAccessibilitySettingsOn", "getString",settingValue);
-            //com.sheep.jiuyan.samllsheep/com.sheep.jiuyan.samllsheep.service.MonitorAppService
-            if (settingValue != null) {
-                mStringColonSplitter.setString(settingValue);
-                while (mStringColonSplitter.hasNext()) {
-                    String accessibilityService = mStringColonSplitter.next();
-
-                    if (isThisService(accessibilityService)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-}