一些 优化

.gitignore

@@ -1,10 +0,0 @@
-*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-/.idea

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

@@ -519,11 +519,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         try {
             position = 0;
             BaseMessage baseMessage = (BaseMessage) o;
-            TaskAcceptedEty taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty), position);
-            tryMakeMoneyAdp.addPresenter(tryMakeMoneyPresenter);
-            tryMakeMoneyAdp.setTaskAcceptedEty(taskAcceptedEty);
-            position++;
+            List<TaskAcceptedEty> taskAcceptedEty = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
+            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();

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

@@ -14,13 +14,22 @@ public class TaskAcceptedEty implements Serializable{
     private int release_task_id;// 0,
     private String remarks;// "string",
     private String screenshots;// "string",
-    private int status =1;// 0,--------1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线
+    private int status =1;// 0,--------1,已接受任务 2,正在进行中,3完成任务,4放弃任务,5任务失败,6审核失败,7提交审核,8任务已下线,9至少完成了一个任务了
     private String uid;// 0,
     private String update_time;// 0
 
     private long end_time;
 
     private TaskReleaseEty release_task;
+    private int child_task_id;//0 1开始子任务  2完成第二个子任务
+
+    public int getChild_task_id() {
+        return child_task_id;
+    }
+
+    public void setChild_task_id(int child_task_id) {
+        this.child_task_id = child_task_id;
+    }
 
     public long getEnd_time() {
         return end_time;

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

@@ -215,7 +215,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         try{
             switch (type){
                 case 0://领取任务
-                    if(task_accepted_entity == null){//没有正在进行的任务
+                    if(taskEty.getAcceptedTaskId() < 1){//没有正在进行的任务
                         acceptedTask();
                     } else {//先取消正在进行的任务
 
@@ -483,15 +483,15 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if(requestCode == 0 && resultCode == RESULT_OK){
-            SheepApp.getInstance().getNetComponent().getApiService().giveUpTask(task_accepted_entity.getId())
+            SheepApp.getInstance().getNetComponent().getApiService().giveUpTask(taskEty.getAcceptedTaskId())
                     .subscribeOn(Schedulers.io())
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe(new SheepSubscriber<BaseMessage>(activity) {
                         @Override
                         public void onNext(BaseMessage baseMessage) {
 
-                            //暂停下载
-                            CommonUtil.getInstance().stopDownloadTask(activity, task_accepted_entity.getRelease_task().getTask().getDownload_link());
+                            //暂停下载---这么改就不能暂停了
+//                            CommonUtil.getInstance().stopDownloadTask(activity, task_accepted_entity.getRelease_task().getTask().getDownload_link());
                             if(BuildConfig.DEBUG)
                                 System.out.println("baseMessage onNext "+ JSON.toJSONString(baseMessage));
                             acceptedTask();

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

@@ -19,6 +19,7 @@ import com.kfzs.duanduan.adp.AdpCommonRecy;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
+import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
@@ -40,6 +41,8 @@ import java.util.Set;
 
 import javax.inject.Inject;
 
+import static com.sheep.gamegroup.model.entity.RecyleType.RUN_TASK;
+
 /**
  * Created by ljy on 2018/3/20.
  */
@@ -51,6 +54,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     TryMakeMoneyPresenter presenter;
     private Context context;
     private int type = 0;//0:推荐 1:热门 2:预约
+    private int is_succession;//0:一般任务 1:连续任务
 
     public TryMakeMoneyAdp(Context context) {
         super(context);
@@ -80,9 +84,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 bindReleaseTask(holder, (List<TaskReleaseEty>) recyleObj.getDataObj());
                 break;
             case RUN_TASK:
-                List<TaskAcceptedEty> etyList = new ArrayList<>();
-                etyList.add((TaskAcceptedEty) recyleObj.getDataObj());
-                bindRunTask(holder, etyList);
+//                List<TaskAcceptedEty> etyList = new ArrayList<>();
+//                etyList.add((TaskAcceptedEty) recyleObj.getDataObj());
+                bindRunTask(holder, (List<TaskAcceptedEty>) recyleObj.getDataObj());
                 break;
         }
 
@@ -104,7 +108,12 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     public void addType(int type){
         this.type = type;
     }
-
+    /**
+     * 传入is_succession
+     */
+    public void setIs_succession(int is_succession){
+        this.is_succession = is_succession;
+    }
     /**
      * 传入正在运行的任务
      * @param taskAcceptedEty
@@ -141,6 +150,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
             @Override
             public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, final int i) {
+                if(etyList.get(i) == null || etyList.get(i).getTask() == null){
+                    return;
+                }
                     viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
                     TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
                 if(i == 0){
@@ -178,9 +190,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 }else {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
                 }
-                if(etyList.get(i) == null || etyList.get(i).getTask() == null){
-                    return;
-                }
                 switch (type){
                     case 2://即将开始
                         detail_task_tv.setText("即将开始");
@@ -232,6 +241,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         taskEty.setRunTask(0);
                         taskEty.setRelease_task_id(etyList.get(i).getId());
                         taskEty.setName(etyList.get(i).getName());
+                        taskEty.setAcceptedTaskId(etyList.get(i).getAccepted_task_id());
                         Jump2View.getInstance().goDialogActivityView(context, taskEty, taskAcceptedEty);
                     }
                 });
@@ -250,7 +260,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         taskEty.setBonus(etyList.get(i).getBonus());
                         taskEty.setRelease_task_id(etyList.get(i).getId());
                         taskEty.setName(etyList.get(i).getName());
-//                        Jump2View.getInstance().goTaskDetailView(context, taskEty, taskAcceptedEty);
                         Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getId());
                     }
                 });
@@ -293,18 +302,24 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
             @Override
             public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, final int i) {
-                    viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
-                viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
-                viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
-                ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("进行中");
-
-                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
-
                 if(etyList.get(i) == null
                         || etyList.get(i).getRelease_task() == null
                         || etyList.get(i).getRelease_task().getTask() == null){
                     return;
                 }
+                    viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
+                if(i == 0){
+
+                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
+                    ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("进行中");
+                }else{
+                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
+                    viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
+                }
+                viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
+
+                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
+
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_anem_tv)).setText(etyList.get(i).getRelease_task().getName()+"");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getRelease_task().getLast_num()+"份");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getRelease_task().getBonus() +"元");
@@ -313,6 +328,17 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                 ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText("取消任务");
 
+                if(is_succession == 1
+                        &&  (etyList.get(i).getChild_task_id() > 1
+                                || (etyList.get(i).getChild_task_id() == 1 && etyList.get(i).getStatus() == 9))
+                        ){
+                    viewHolder.itemView.findViewById(R.id.detail_task_tv).setVisibility(View.GONE);
+                }else {
+
+                    viewHolder.itemView.findViewById(R.id.detail_task_tv).setVisibility(View.VISIBLE);
+                }
+
+
                 TextView task_type_tv = viewHolder.itemView.findViewById(R.id.task_type_tv);
 
                 //设置标签颜色task_type_tv
@@ -334,12 +360,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         //暂停下载
                         CommonUtil.getInstance().stopDownloadTask(mContext, etyList.get(i).getRelease_task().getTask().getDownload_link());
 
-//                        TaskEty taskEty = etyList.get(i).getRelease_task().getTask();
-//                        taskEty.setRunTask(1);
-//                        taskEty.setRelease_task_id(etyList.get(i).getRelease_task().getId());
-//                        taskEty.setName(etyList.get(i).getRelease_task().getName());
-//                        taskEty.setAcceptedTaskId(etyList.get(i).getId());
-//                        Jump2View.getInstance().goDialogActivityView(context, taskEty, taskAcceptedEty);
                     }
                 });
                 Glide.with(context)
@@ -356,7 +376,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         taskEty.setRelease_task_id(etyList.get(i).getRelease_task().getId());
                         taskEty.setAcceptedTaskId(etyList.get(i).getId());
                         taskEty.setName(etyList.get(i).getRelease_task().getName());
-//                        Jump2View.getInstance().goTaskDetailView(context, taskEty, taskAcceptedEty);
                         Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getRelease_task().getId());
                         UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
                     }
@@ -439,7 +458,14 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     public boolean isEmpty() {
         switch (type){
             case 0://推荐任务
-                return taskAcceptedEty == null;
+
+                if(getmListDatas().get(0) != null
+                        && getmListDatas().get(0).getRecyleType() == RUN_TASK
+                        && ((List<TaskAcceptedEty>)getmListDatas().get(0).getDataObj()).size() > 0){
+                    return false;
+                }else {
+                    return true;
+                }
             case 2://即将开始
                 return true;
         }

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

@@ -67,6 +67,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
     private int type = 0;
     private GridViewEntity gridViewEntity;//选中的
+    private int is_succession;//0:一般任务 1:连续任务
 
     private void notifyDataSetChanged(){
         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists),position);
@@ -120,13 +121,10 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 //        initListener();
 //    }
     public void initView() {
+        is_succession = ((TryMakeMoneyact)getActivity()).getIsSuccession();//0:一般任务 1:连续任务
         EventBus.getDefault().register(this);
         activity = getActivity();
 //        ButterKnife.bind(this, mContentView);
-        TitleBarUtils
-                .getInstance()
-                .setTitle(activity, "试玩赚钱")
-                .setTitleFinish(activity);
         DaggerFgtTryMakeMoneyComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .tryMakeMoneyModule(new TryMakeMoneyModule(FgtTryMakeMoney.this))
@@ -183,6 +181,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         tryMakeMoneyAdp.setTaskAcceptedEty(null);
+        tryMakeMoneyAdp.setIs_succession(is_succession);
         gridViewEntity = ((TryMakeMoneyact)getActivity()).getTabValue();
         RequestParameEty parameEty = new RequestParameEty();
         parameEty.setHashMap(
@@ -257,12 +256,12 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         try{
             position = 0;
             BaseMessage baseMessage = (BaseMessage) o;
-            TaskAcceptedEty taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),position);
-            tryMakeMoneyAdp.addPresenter(presenter);
-            tryMakeMoneyAdp.setTaskAcceptedEty(taskAcceptedEty);
-            position ++;
-//            mhandler.sendEmptyMessage(0);
+            List<TaskAcceptedEty> taskAcceptedEty = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
+            if(taskAcceptedEty != null && taskAcceptedEty.size()>0){
+                tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, taskAcceptedEty),position);
+                tryMakeMoneyAdp.addPresenter(presenter);
+                position ++;
+            }
         }catch (Exception e){
             e.printStackTrace();
         }