任务列表bug修改

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

@@ -254,7 +254,7 @@ public class FgtAskgetmoney extends BaseCompatFragment {
                 if(TextUtils.isEmpty(my_invitation_tv.getText().toString()))
                     return;
                 QR_COPY.onEvent();
-                StringUtils.CopyText(my_invitation_tv.getText().toString());
+                StringUtils.CopyText(userEntity.getInvitation_code()+"");
                 G.showToast("复制邀请码成功");
                 break;
             case R.id.ask_invite_tv:

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

@@ -119,7 +119,7 @@ public class TaskListItemAdp extends BaseAdapter {
     }
 
     /**
-     * 1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核
+     * 1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核8任务已下线9连续任务
      * @return
      */
     private String returnValue(TaskAcceptedEty ety){
@@ -164,6 +164,7 @@ public class TaskListItemAdp extends BaseAdapter {
                 textView.setText("审核中");
                 break;
             case 3://完成
+            case 9:
                 textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
                 textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
                 textView.setText("已完成");

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

@@ -168,7 +168,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
         tryMakeMoneyAdp.addType(type);
         tryMakeMoneyAdp.addShowType(show_type);
-        tryMakeMoneyAdp.setIs_succession(is_succession);
+        tryMakeMoneyAdp.setIs_succession(TextUtils.isEmpty(show_type)?is_succession:3);
         tryMakeMoneyAdp.addPresenter(presenter);
         for (int i = 0; i < LIST_COUNT; i++) {
             tryMakeMoneyAdp.add(NULL);
@@ -231,7 +231,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             if(isGameTask) {
                 cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.run_game_task, TaskAcceptedEty.class);
             } else {
-                cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.new_run_task(is_succession, 0), TaskAcceptedEty.class);
+                cacheTaskAcceptedEtyList = DataUtil.getInstance().getCacheList(ApiKey.new_run_task(TextUtils.isEmpty(show_type)?is_succession:3, 0), TaskAcceptedEty.class);
             }
             if (ListUtil.isEmpty(cacheTaskAcceptedEtyList)) {
                 acceptedEtyList.clear();
@@ -257,8 +257,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private void initAcceptedTaskList() {
         if(isGameTask){
             presenter.runGameTask();
-        } else {
-            presenter.returnTask(is_succession, 0);
+        } else if(!TextUtils.isEmpty(show_type)){
+
+        }
+        else {
+            presenter.returnTask(TextUtils.isEmpty(show_type)?is_succession:3, 0);
         }
     }
 
@@ -323,7 +326,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
     @Override
     public void returnTaskTaskUpdataView(Object object) {
-        boolean isNewData = DataUtil.getInstance().isNewData(isGameTask ? ApiKey.run_game_task : ApiKey.new_run_task(is_succession, 0));
+        boolean isNewData = DataUtil.getInstance().isNewData(isGameTask ? ApiKey.run_game_task : ApiKey.new_run_task(TextUtils.isEmpty(show_type)?is_succession:3, 0));
         if(isNewData) {
             if (object instanceof BaseMessage) {
                 List<TaskAcceptedEty> taskAcceptedEty = ((BaseMessage) object).getDataList(TaskAcceptedEty.class);
@@ -352,7 +355,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      */
     @Override
     public void releaseTaskTaskUpdataView(Object object) {
-        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.release_task(type, task_type, is_succession));
+        boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.release_task(type, task_type, TextUtils.isEmpty(show_type)?is_succession:3));
         if(isNewData && object instanceof BaseMessage) {
             List<TaskReleaseEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskReleaseEty.class);
             switch (type) {
@@ -419,14 +422,15 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      */
     private void getFromAcacheFirst(int type){
         if(TextUtils.isEmpty(show_type)){
-            getFromACache(++type);
+            this.type = ++type;
+            getFromACache(this.type);
         }
     }
     private void getFromACache(int type){
         if(type > 1){
             return;
         }
-        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task(type, task_type, is_succession), TaskReleaseEty.class);
+        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task(type, task_type, TextUtils.isEmpty(show_type)?is_succession:3), TaskReleaseEty.class);
         switch (type){
             case 0:
                 if(cacheTaskReleaseEtyList == null) {
@@ -456,7 +460,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      */
     private void getFromNetWorkFirst(int type){
         if(TextUtils.isEmpty(show_type)){
-            getFromNetWork(++type);
+            this.type = ++type;
+            getFromNetWork(this.type);
         }
     }
     private void getFromNetWork(int type){
@@ -474,7 +479,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                                 0,
                                 type,
                                 task_type,
-                                is_succession));
+                                TextUtils.isEmpty(show_type)?is_succession:3));
         presenter.releaseTask(parameEty);
     }