修复已经完成的任务可以上传截图的bug

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

@@ -542,7 +542,7 @@ public class TaskEty implements Serializable, IDownload {
         //先找审核失败的子任务
         TaskChild commitScreenShotTask = getCanCommitChild(TaskEty.STATUS_FAIL);
         if(commitScreenShotTask == null){
-        //再找进行中的子任务
+            //再找进行中的子任务
             commitScreenShotTask = getCanCommitChild(TaskEty.STATUS_RUNNING);
         }
         return commitScreenShotTask == null ? -1 : commitScreenShotTask.getAlready_accepted_task_id();
@@ -581,12 +581,19 @@ public class TaskEty implements Serializable, IDownload {
      * @return
      */
     public boolean canCancelTask() {
-       switch (task_type){
-           case 1000:
-               TaskChild taskChild = ListUtil.getItem(child, 0);
-               return taskChild == null || taskChild.getStatus() == 3;
-           default:
-               return true;
-       }
+        switch (task_type){
+            case 1000:
+                TaskChild taskChild = ListUtil.getItem(child, 0);
+                return taskChild == null || taskChild.getStatus() == 3;
+            default:
+                return true;
+        }
+    }
+    /**
+     * 是否连续任务
+     * @return
+     */
+    public boolean isSuccession() {
+        return task_type == 1000;
     }
 }

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

@@ -180,7 +180,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
         WebViewClient wvc = new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                 webView.loadUrl(url);
+                webView.loadUrl(url);
                 Jump2View.getInstance().goWeb(ActFindInformation.this, url);
                 return true;
             }
@@ -623,7 +623,6 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     protected void onResume() {
         super.onResume();
         taskHelper.onResume();
-        Aria.download(this).unRegister();
         try {
             if (webView != null) {
                 webView.resumeTimers();
@@ -639,6 +638,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     protected void onDestroy() {
         super.onDestroy();
         LogUtil.logI("释放资源");
+        Aria.download(this).unRegister();
         EventBus.getDefault().unregister(this);
         taskHelper.destroy();
         if (webView != null) {

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

@@ -437,11 +437,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         btnUpImag.setVisibility(View.GONE);
                         break;
                     default:
-                        if(taskEty.getTask_type() == 1000)//连续任务
-                            setSuccessionTaskBottomState();
-                        else if(gettaskAcceptedEty.getStatus() == 6) {//试玩任务审核失败可以重新提交
-                            btnUpImag.setText("重新提交");
-                        }
+                        setOtherNormalTaskBtnState();
                         break;
                 }
                 break;
@@ -462,6 +458,32 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     /**
+     * 设置连续任务与试玩任务两个按钮状态（任务未下线且有任务记录且是手动审核任务且已经安装应用）
+     * 注：前提是gettaskAcceptedEty不为空哦
+     */
+    private void setOtherNormalTaskBtnState() {
+        boolean isSuccession = taskEty.isSuccession();
+        if(isSuccession){//连续任务
+            setSuccessionTaskBottomState();
+        } else {
+            switch (gettaskAcceptedEty.getStatus()) {
+                case 1://"已接受任务";
+                case 2:// "正在进行中";
+                    break;
+                case 6://试玩任务审核失败可以重新提交
+                    btnUpImag.setText("重新提交");
+                    break;
+                case 7:// "提交审核";
+                    btnUpImag.setVisibility(View.GONE);
+                    break;
+                case 3://完成任务
+                    btnUpImag.setVisibility(View.GONE);
+                    break;
+            }
+        }
+    }
+
+    /**
      * 设置游戏任务中两个按钮的状态和文字显示（任务未下线且有任务记录）
      * 注：前提是gettaskAcceptedEty不为空哦
      */
@@ -1408,5 +1430,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     protected void onDestroy() {
         super.onDestroy();
         CommonUtil.getInstance().cancelAllTimers(CommonUtil.getInstance().timerHashMap);
+        Aria.download(this).unRegister();
     }
 }