试玩任务列表与连续任务列表优化

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

@@ -34,21 +34,23 @@ import rx.schedulers.Schedulers;
 public class DataUtil {
     private static DataUtil instance = new DataUtil();
 
-    private DataUtil(){
+    private DataUtil() {
         userEntity = getCacheResult(ApiKey.get_info, UserEntity.class);//先从缓存中初始化用户信息
         String id = SpUtils.getToken(SheepApp.mContext);
         String uid = TextUtils.isEmpty(id) ? "" : id.split("@")[0];
-        if(userEntity != null && !TextUtils.equals(userEntity.getId(), uid)){//当前用户id与缓存的用户信息不符时，清除缓存
+        if (userEntity != null && !TextUtils.equals(userEntity.getId(), uid)) {//当前用户id与缓存的用户信息不符时，清除缓存
             clearData();
         }
 
     }
-    public static DataUtil getInstance(){
-        if(instance == null){
+
+    public static DataUtil getInstance() {
+        if (instance == null) {
             instance = new DataUtil();
         }
         return instance;
     }
+
     /**
      * 清除数据
      */
@@ -74,73 +76,83 @@ public class DataUtil {
 
     /**
      * 获取当前用户的邀请码
+     *
      * @return
      */
     public String getInvitationCode() {
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null && userEntity.getInvitation_code() != null)
+        if (userEntity != null && userEntity.getInvitation_code() != null)
             return userEntity.getInvitation_code();
         return "";
     }
 
     /**
      * 获取当前用户的id
+     *
      * @return
      */
     public String getUserId() {
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null && userEntity.getId() != null)
+        if (userEntity != null && userEntity.getId() != null)
             return userEntity.getId();
         return "";
     }
 
     /**
      * 获取当前用户的邀请人的邀请码
+     *
      * @return
      */
     public String getUserParentCode() {
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null && userEntity.getParent_code() != null)
+        if (userEntity != null && userEntity.getParent_code() != null)
             return userEntity.getParent_code();
         return "";
     }
 
     /**
      * 获取当前用户的手机号
+     *
      * @return
      */
     public String getUserMobile() {
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null && userEntity.getMobile() != null)
+        if (userEntity != null && userEntity.getMobile() != null)
             return userEntity.getMobile();
         return "";
     }
+
     public void setUserMobile(String mobile) {
-        if(userEntity != null)
+        if (userEntity != null)
             userEntity.setMobile(mobile);
     }
+
     /**
      * 获取当前用户的微信id
+     *
      * @return
      */
     public String getUserWxOpenId() {
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null && userEntity.getWx_openid() != null)
+        if (userEntity != null && userEntity.getWx_openid() != null)
             return userEntity.getWx_openid();
         return "";
     }
+
     /**
      * 获取当前用户的微信昵称
+     *
      * @return
      */
     public String getUserWxNicknName() {
         UserEntity userEntity = DataUtil.getInstance().getUserEntity();
-        if(userEntity != null && userEntity.getWx_nickname() != null)
+        if (userEntity != null && userEntity.getWx_nickname() != null)
             return userEntity.getWx_nickname();
         return "";
     }
+
     public void setUserWxNickName(String wx_nickname) {
-        if(userEntity != null)
+        if (userEntity != null)
             userEntity.setWx_nickname(wx_nickname);
 
     }
@@ -159,6 +171,7 @@ public class DataUtil {
         }
         return null;
     }
+
     public void resetCacheTime(String key, int saveTime) {
         ACache aCache = ACache.get(SheepApp.getInstance());
         String realKey = SheepApp.getInstance().getConnectAddress().getAppUrl() + "v1/" + key;
@@ -182,6 +195,7 @@ public class DataUtil {
 
     /**
      * 设置key的saveTime缓存时间为当前时间
+     *
      * @param key
      */
     public void setSaveTime(String key) {
@@ -191,6 +205,7 @@ public class DataUtil {
 
     /**
      * 获取缓存的key的saveTime时间
+     *
      * @param key
      * @return
      */
@@ -198,25 +213,30 @@ public class DataUtil {
         ACache aCache = ACache.get(SheepApp.getInstance());
         return NumberFormatUtils.parseLong(aCache.getAsString(key + "saveTime"));
     }
+
     /**
      * 设置taskAcceptedEty的saveTime缓存时间为time
+     *
      * @param taskAcceptedEty
      */
     public void saveTaskAcceptedSaveTime(TaskAcceptedEty taskAcceptedEty) {
         ACache aCache = ACache.get(SheepApp.getInstance());
-        aCache.put(TaskAcceptedEty.class.getSimpleName()+taskAcceptedEty.getId() + "saveTime", String.valueOf(taskAcceptedEty.getEnd_time()));
+        aCache.put(TaskAcceptedEty.class.getSimpleName() + taskAcceptedEty.getId() + "saveTime", String.valueOf(taskAcceptedEty.getEnd_time()));
     }
+
     /**
      * 获取taskAcceptedEty的saveTime缓存时间为
+     *
      * @param taskAcceptedEty
      */
     public long getTaskAcceptedSaveTime(TaskAcceptedEty taskAcceptedEty) {
         ACache aCache = ACache.get(SheepApp.getInstance());
-        return NumberFormatUtils.parseLong(aCache.getAsString(TaskAcceptedEty.class.getSimpleName()+taskAcceptedEty.getId() + "saveTime"));
+        return NumberFormatUtils.parseLong(aCache.getAsString(TaskAcceptedEty.class.getSimpleName() + taskAcceptedEty.getId() + "saveTime"));
     }
 
     /**
      * 获取缓存数据的时间
+     *
      * @param key
      * @return
      */
@@ -233,12 +253,12 @@ public class DataUtil {
     private List<TaskAcceptedEty> allTaskAcceptedTaskList = ListUtil.emptyList();
 
     //获取缓存数据
-    public void initACacheAcceptedTaskList(){
+    public void initACacheAcceptedTaskList() {
         List<TaskAcceptedEty> cacheTaskAcceptedEtyList = getCacheList(ApiKey.new_run_task(3), TaskAcceptedEty.class);
         if (cacheTaskAcceptedEtyList == null) {//无缓存
             reInitAcceptedTaskList();
         } else {//有缓存
-            if(ListUtil.isEmpty(cacheTaskAcceptedEtyList)){//无任务
+            if (ListUtil.isEmpty(cacheTaskAcceptedEtyList)) {//无任务
                 clearAcceptedTaskList();
             } else {//有任务
                 reloadAcceptedTaskList(cacheTaskAcceptedEtyList);
@@ -246,32 +266,34 @@ public class DataUtil {
             EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
         }
     }
+
     //刷新数据
-    public void reInitAcceptedTaskList(){
+    public void reInitAcceptedTaskList() {
         reInitAcceptedTaskList(null);
     }
+
     //刷新数据
-    public void reInitAcceptedTaskList(final Action1<BaseMessage> action1){
+    public void reInitAcceptedTaskList(final Action1<BaseMessage> action1) {
         SheepApp.getInstance().getNetComponent().getApiService().returnTask(3)
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                            @Override
-                            public void onNext(BaseMessage baseMessage) {
-                                reloadAcceptedTaskListAndSaveTime(baseMessage.getDataList(TaskAcceptedEty.class));
-                                AutoTaskListUtil.getInstance().loadList(baseMessage.getDataList(TaskAcceptedEty.class));
-                                EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
-                                if(action1 != null)
-                                    action1.call(baseMessage);
-                            }
-
-                            @Override
-                            public void onError(BaseMessage baseMessage) {
-                                clearAcceptedTaskList();
-                                if(action1 != null)
-                                    action1.call(null);
-                            }
-                        });
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        reloadAcceptedTaskListAndSaveTime(baseMessage.getDataList(TaskAcceptedEty.class));
+                        AutoTaskListUtil.getInstance().loadList(baseMessage.getDataList(TaskAcceptedEty.class));
+                        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_FGT_FAMLLSHEEP));
+                        if (action1 != null)
+                            action1.call(baseMessage);
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        clearAcceptedTaskList();
+                        if (action1 != null)
+                            action1.call(null);
+                    }
+                });
     }
 
     public void reloadAcceptedTaskListAndSaveTime(List<TaskAcceptedEty> acceptedTaskList) {
@@ -282,16 +304,19 @@ public class DataUtil {
             addAcceptedTask(taskAcceptedEty);
         }
     }
+
     public void reloadAcceptedTaskList(List<TaskAcceptedEty> acceptedTaskList) {
         clearAcceptedTaskList();
         for (TaskAcceptedEty taskAcceptedEty : acceptedTaskList) {
             addAcceptedTask(taskAcceptedEty);
         }
     }
-    public List<TaskAcceptedEty> getAllTaskAcceptedTaskList(){
+
+    public List<TaskAcceptedEty> getAllTaskAcceptedTaskList() {
         checkTaskList(allTaskAcceptedTaskList);
         return allTaskAcceptedTaskList;
     }
+
     private void clearAcceptedTaskList() {
         tryPlayTaskList.clear();
         sequentialTaskList.clear();
@@ -300,8 +325,8 @@ public class DataUtil {
     }
 
     public void addAcceptedTask(TaskAcceptedEty taskAcceptedEty) {
-        if(taskAcceptedEty != null && taskAcceptedEty.getRelease_task() != null && taskAcceptedEty.getRelease_task().getTask() != null){
-            switch (taskAcceptedEty.getRelease_task().getTask().getTask_type()){
+        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;
@@ -317,10 +342,11 @@ public class DataUtil {
             ListUtil.addAll(allTaskAcceptedTaskList, taskAcceptedEty);
         }
     }
+
     //清除并重置正在进行的任务的时间
     private void checkTaskList(List<TaskAcceptedEty> taskList) {
         final long saveTime = getSaveTime(ApiKey.new_run_task(3));
-        if(saveTime > 0) {
+        if (saveTime > 0) {
             ListUtil.removeItem(taskList, new ListUtil.CallBack<TaskAcceptedEty, Boolean>() {
                 @Override
                 public Boolean call(TaskAcceptedEty taskAcceptedEty) {
@@ -337,6 +363,7 @@ public class DataUtil {
             setSaveTime(ApiKey.new_run_task(3));
         }
     }
+
     public List<TaskAcceptedEty> getTryPlayTaskList() {
         checkTaskList(tryPlayTaskList);
         return tryPlayTaskList;
@@ -354,15 +381,31 @@ public class DataUtil {
     }
 
     /**
+     * 通过is_succession来获取对应的正在进行的任务列表
+     * @param is_succession
+     * @return
+     */
+    public List<TaskAcceptedEty> getTaskAcceptedTaskList(int is_succession) {
+        switch (is_succession) {
+            case 1://连续任务
+                return getSequentialTaskList();
+            case 0:
+            default:
+                return getTryPlayTaskList();
+        }
+    }
+
+    /**
      * 根据releaseTaskId来获取对应的正在进行的任务
+     *
      * @param releaseTaskId
      * @return
      */
     public TaskAcceptedEty getTaskAcceptedTaskByReleaseTaskId(int releaseTaskId) {
         List<TaskAcceptedEty> allTaskAcceptedTaskList = getAllTaskAcceptedTaskList();
-        if(allTaskAcceptedTaskList != null){
+        if (allTaskAcceptedTaskList != null) {
             for (TaskAcceptedEty taskAcceptedEty : allTaskAcceptedTaskList) {
-                if(taskAcceptedEty != null && taskAcceptedEty.getRelease_task() != null && taskAcceptedEty.getRelease_task().getId() == releaseTaskId)
+                if (taskAcceptedEty != null && taskAcceptedEty.getRelease_task() != null && taskAcceptedEty.getRelease_task().getId() == releaseTaskId)
                     return taskAcceptedEty;
             }
         }
@@ -370,13 +413,13 @@ public class DataUtil {
     }
 
     public TaskAcceptedEty removeAcceptedTask(final int acceptedId) {
-        List<TaskAcceptedEty>  removeList= ListUtil.removeItem(allTaskAcceptedTaskList, new ListUtil.CallBack<TaskAcceptedEty, Boolean>() {
+        List<TaskAcceptedEty> removeList = ListUtil.removeItem(allTaskAcceptedTaskList, new ListUtil.CallBack<TaskAcceptedEty, Boolean>() {
             @Override
             public Boolean call(TaskAcceptedEty taskAcceptedEty) {
                 return taskAcceptedEty == null || taskAcceptedEty.getId() == acceptedId;
             }
         });
-        if(ListUtil.isEmpty(removeList)){
+        if (ListUtil.isEmpty(removeList)) {
             return null;
         }
         clearCache(ApiKey.new_run_task(3));

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

@@ -62,7 +62,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     TryMakeMoneyPresenter presenter;
     private TryMakeMoneyact activity;
     private TryMakeMoneyAdp tryMakeMoneyAdp;
-    private int position = 0;
     private List<TaskAcceptedEty> acceptedEtyList = new ArrayList<>();
     private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
     private List<TaskReleaseEty> releaseEtyListsBegin = new ArrayList<>();
@@ -77,13 +76,15 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     }
     private void notifyDataSetChanged(){
         checkAndInitView();
+        int position = 0;
+        if(!ListUtil.isEmpty(acceptedEtyList))
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, acceptedEtyList), position++);
+        if(!ListUtil.isEmpty(releaseEtyLists))
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position++);
+        if(!ListUtil.isEmpty(releaseEtyListsBegin))
+            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin), position);
         tryMakeMoneyAdp.refreshAdapter();
-        if(tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty()){
-
-            empty_view.setVisibility(View.VISIBLE);
-        }else {
-            empty_view.setVisibility(View.GONE);
-        }
+        CommonUtil.getInstance().updateEmptyView(empty_view, tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty());
         refresh.setRefreshing(false);
     }
     public static FgtTryMakeMoney newInstance(int type){
@@ -143,9 +144,12 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                 .inject(FgtTryMakeMoney.this);
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
-        for (int i = 0; i < 3; i++) {
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
-        }
+        tryMakeMoneyAdp.addType(type);
+        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
+        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
+        tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
+        tryMakeMoneyAdp.setIs_succession(is_succession);
+        tryMakeMoneyAdp.addPresenter(presenter);
         recyclerview.setAdapter(tryMakeMoneyAdp);
 
         initListener();
@@ -193,39 +197,15 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     }
     public void mInitData() {
         empty_view.setVisibility(View.GONE);
-        position = 0;
         type = 0;
-        releaseEtyLists.clear();
-        tryMakeMoneyAdp.clear();
-        tryMakeMoneyAdp.addType(type);
-        for (int i = 0; i < 3; i++) {
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
-        }
-        tryMakeMoneyAdp.setIs_succession(is_succession);
 
         if(isFirstCache){
-            List<TaskAcceptedEty> cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.new_run_task(is_succession), TaskAcceptedEty.class);
-            if (ListUtil.isEmpty(cacheTaskAcceptedEtyList)) {//本地无数据，从网络获取
-                presenter.returnTask(is_succession);
+            List<TaskAcceptedEty> cacheTaskAcceptedEtyList = DataUtil.getInstance().getTaskAcceptedTaskList(is_succession);
+            if (ListUtil.isEmpty(cacheTaskAcceptedEtyList)) {
             } else {
-                //重新设置正在运行的任务的缓存时间
-                long saveTime = DataUtil.getInstance().getSaveTime(TaskAcceptedEty.class.getSimpleName());
-                if(saveTime > 0)
-                    for (TaskAcceptedEty acceptedEty : cacheTaskAcceptedEtyList) {
-                        long newEndTime = acceptedEty.getEnd_time() - (System.currentTimeMillis() - saveTime) / 1000;
-                        if(newEndTime < 1){//有一个正在运行的任务的时间过期时，会刷新数据，不使用缓存
-                            mInitData();
-                            return;
-                        }
-                        acceptedEty.setEnd_time(newEndTime);//重置时间
-                    }
                 acceptedEtyList = cacheTaskAcceptedEtyList;
-                tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, cacheTaskAcceptedEtyList),0);
-                tryMakeMoneyAdp.addPresenter(presenter);
-                position ++;
-
-                getNetWork(type);
             }
+            getNetWork(type);
         } else {
             presenter.returnTask(is_succession);
         }
@@ -290,29 +270,13 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     }
 
     @Override
-    public void returnTaskTaskUpdataView(Object o) {
-
-        try{
-            BaseMessage baseMessage = (BaseMessage) o;
-            List<TaskAcceptedEty> taskAcceptedEty = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-            if(taskAcceptedEty != null && taskAcceptedEty.size()>0){
-                //重新设置正在运行的任务的缓存时间
-                long minRunTime = 3600;//最多保存一个小时
-                DataUtil.getInstance().setSaveTime(TaskAcceptedEty.class.getSimpleName());
-                for (TaskAcceptedEty acceptedEty : taskAcceptedEty) {
-                    minRunTime = Math.min(minRunTime, acceptedEty.getEnd_time());
-                }
-                DataUtil.getInstance().resetCacheTime(ApiKey.new_run_task(is_succession), (int) minRunTime);
-
+    public void returnTaskTaskUpdataView(Object object) {
+        if(object instanceof BaseMessage) {
+            List<TaskAcceptedEty> taskAcceptedEty = ((BaseMessage) object).getDataList(TaskAcceptedEty.class);
+            if(!ListUtil.isEmpty(taskAcceptedEty)) {
                 acceptedEtyList = taskAcceptedEty;
-                tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),0);
-                tryMakeMoneyAdp.addPresenter(presenter);
-                position ++;
             }
-        }catch (Exception e){
-            e.printStackTrace();
         }
-        isFirstCache = false;//有新的正在运行的任务时，强制更新
         getNetWork(type);
 //        notifyDataSetChanged();
     }
@@ -339,38 +303,23 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
     /**
      *  获取已经发布任务
-     * @param o
+     * @param object
      */
     @Override
-    public void releaseTaskTaskUpdataView(Object o) {
-        try{
-            if(type == 0){
-                type = 1;
-
-
-                BaseMessage baseMessage = (BaseMessage) o;
-                List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
-                if(releaseEtyList != null){
-                    releaseEtyLists.addAll(releaseEtyList);
-                    tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
-                    position++;
-                }
-
-                getNetWork(type);
-            }else if(type == 1){
-                BaseMessage baseMessage = (BaseMessage) o;
-                List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
-                if(releaseEtyList != null){
-                    releaseEtyListsBegin.clear();
-                    releaseEtyListsBegin.addAll(releaseEtyList);
-                    tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin),position);
-                    position++;
-                }
+    public void releaseTaskTaskUpdataView(Object object) {
+        if(object instanceof BaseMessage) {
+            List<TaskReleaseEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskReleaseEty.class);
+            switch (type){
+                case 0:
+                    releaseEtyLists = releaseEtyList;
+                    break;
+                case 1:
+                    releaseEtyListsBegin = releaseEtyList;
+                    break;
             }
-
-        }catch (Exception e){
-            e.printStackTrace();
         }
+        type++;
+        getNetWork(type);
         notifyDataSetChanged();
 
     }
@@ -395,44 +344,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         }
     }
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-    }
-    /**
-     * 滚动到顶部
-     */
-    private boolean move;
-    private String string = "0";
-    private void goTop(){
-        final LinearLayoutManager manager = (LinearLayoutManager) recyclerview.getLayoutManager();
-        int fir = manager.findFirstVisibleItemPosition();
-        int end = manager.findLastVisibleItemPosition();
-        final int p = Integer.parseInt(string);
-        if (p <= fir) {
-            recyclerview.scrollToPosition(p);
-        } else if (p <= end) {
-            int top = recyclerview.getChildAt(p - fir).getTop();
-            recyclerview.scrollBy(0, top);
-        } else {
-            recyclerview.scrollToPosition(p);    //先让当前view滚动到列表内
-            move = true;
-        }
-        recyclerview.addOnScrollListener(new RecyclerView.OnScrollListener()
-        {
-            @Override
-            public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
-                super.onScrolled(recyclerView, dx, dy);
-                if (move) {
-                    move = false;
-                    int n = p - manager.findFirstVisibleItemPosition();
-                    if (n >= 0 && n < recyclerView.getChildCount()) {
-                        recyclerView.scrollBy(0, recyclerView.getChildAt(n).getTop()); //滚动到顶部
-                    }
-                }
-            }
-        });
-    }
 
     @Override
     public void onStop() {
@@ -475,24 +386,18 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         if(isFirstCache){
             List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task(type, is_succession), TaskReleaseEty.class);
 
-            if(ListUtil.isEmpty(cacheTaskReleaseEtyList)) {//可以领取的任务
-                isFirstCache = false;
+            if(cacheTaskReleaseEtyList == null) {
+                isFirstCache = false;//没有缓存
                 getNetWork(type);
             } else{
-//                //删除缓存中已经存在的任务
-//                List<TaskReleaseEty> removeList = ListUtil.emptyList();
-//                for (TaskAcceptedEty taskAcceptedEty : acceptedEtyList) {
-//                    for (TaskReleaseEty taskReleaseEty : cacheTaskReleaseEtyList) {
-//                        if(taskAcceptedEty.getRelease_task_id() == taskReleaseEty.getId()){
-//                            removeList.add(taskReleaseEty);
-//                        }
-//                    }
-//                }
-//                cacheTaskReleaseEtyList.removeAll(removeList);
-                releaseEtyLists.addAll(cacheTaskReleaseEtyList);
-                tryMakeMoneyAdp.add(RecyleObj.make(type == 0 ? RecyleType.RELEASE_TASK : RecyleType.BEGIN_TASK, releaseEtyLists), position);
-                position++;
-
+                switch (type){
+                    case 0:
+                        releaseEtyLists = cacheTaskReleaseEtyList;
+                        break;
+                    case 1:
+                        releaseEtyListsBegin = cacheTaskReleaseEtyList;
+                        break;
+                }
                 type++;
                 getNetWork(type);
             }