Просмотр исходного кода

review
h5任务不同状态下用户相应操作不同;
截屏权限判断

zengjiebin лет назад: 7
Родитель
Сommit
d72868f20b

+ 30 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -596,4 +596,34 @@ public class TaskEty implements Serializable, IDownload {
     public boolean isSuccession() {
         return task_type == 1000;
     }
+
+    /**
+     * 小绵羊截屏方案下该任务是否需要小绵羊来截屏
+     * @return
+     */
+    public boolean needShotScreen() {
+        if(inspect_type != 2){//非手动审核任务不需要上传截图
+            return false;
+        }
+        if(TextUtils.isEmpty(package_names)){//无包名情况下也不能截屏
+            return false;
+        }
+        if(TextUtils.isEmpty(download_link)){//无下载连接的任务也无需截屏
+            return false;
+        }
+        switch (task_type){//1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务, 1002 1003游戏任务 1002平台游戏,1003 腾讯游戏,1004 小米游戏
+            case 2:
+            case 4:
+            case 1001:
+            case 1002:
+            case 1003:
+            case 1004:
+                return false;
+            case 1:
+            case 3:
+            case 1000:
+            default:
+                return true;
+        }
+    }
 }

+ 35 - 14
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -225,16 +225,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         detail_task_listview.setAdapter(adpTaskDetailChildListview);
         adpTaskDetailChildListview.notifyDataSetChanged();
         bottom_btn_layout.setVisibility(View.GONE);
-        if (DataUtil.IS_USE_SCREEN_SHOT) {
-            //如果要使用小绵羊截图方案,则在进入任务详情界面启动FloatShotScreenService,并获取截屏权限,并把intent data传递给FloatShotScreenService
-            Jump2View.getInstance().startShotScreenFloat(SheepApp.getInstance(), null);
-            DataUtil.getInstance().requestCapturePermission(activity, new Action1<Integer>() {
-                @Override
-                public void call(Integer integer) {
-//                    if(BuildConfig.DEBUG) G.showToast("初始化截屏数据成功");
-                }
-            });
-        }
         ViewUtil.setDefaultText(nameTv);
         ViewUtil.setDefaultText(priceTv);
         ViewUtil.setDefaultText(dateTv);
@@ -253,10 +243,22 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
     }
 
-    private void initWigget() {
+    private void loadData() {
         detail_shrae_friend_layout.setVisibility(View.VISIBLE);
 
         taskEty = taskReleaseEty.getTask();
+        if(onResumeCount == 0){
+            if (DataUtil.IS_USE_SCREEN_SHOT && taskEty.needShotScreen()) {
+                //如果要使用小绵羊截图方案,则在进入任务详情界面启动FloatShotScreenService,并获取截屏权限,并把intent data传递给FloatShotScreenService
+                Jump2View.getInstance().startShotScreenFloat(SheepApp.getInstance(), null);
+                DataUtil.getInstance().requestCapturePermission(activity, new Action1<Integer>() {
+                    @Override
+                    public void call(Integer integer) {
+//                    if(BuildConfig.DEBUG) G.showToast("初始化截屏数据成功");
+                    }
+                });
+            }
+        }
         nameTv.setText(taskReleaseEty.getName() + "");
         priceTv.setText("+" + taskReleaseEty.getBonusText() + "元");
         if (!taskReleaseEty.getDeadline().equals("永久")) {
@@ -360,6 +362,25 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     case 4://h5业务
                         type = TASK_TYPE_H5;
                         btnTaskItem.setText(CommonUtil.START_TASK);
+                        switch (gettaskAcceptedEty.getStatus()) {
+                            case 1://"已接受任务";
+                            case 2:// "正在进行中";
+                                btnTaskItem.setVisibility(View.GONE);
+                                break;
+                            case 6://任务审核失败可以重新提交
+                                btnUpImag.setText("重新提交");
+                                break;
+                            case 7:// "提交审核";
+                                btnUpImag.setText("正在审核");
+                                btnUpImag.setEnabled(false);
+                                btnTaskItem.setVisibility(View.GONE);
+                                break;
+                            case 3://完成任务
+                                btnUpImag.setText("已完成");
+                                btnUpImag.setEnabled(false);
+                                btnTaskItem.setVisibility(View.GONE);
+                                break;
+                        }
                         break;
                     case 2:
                     case 1001://信用卡与畅思任务不考虑
@@ -999,7 +1020,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         hideProgress();
         empty_view.setVisibility(View.GONE);
         taskReleaseEty = baseMessage.getData(TaskReleaseEty.class);
-        initWigget();
+        loadData();
     }
 
     @Override
@@ -1418,7 +1439,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 } else {
                     hideProgress();
                     empty_view.setVisibility(View.GONE);
-                    initWigget();
+                    loadData();
                 }
             }
         });
@@ -1429,7 +1450,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         hideProgress();
         if (taskReleaseEty != null) {
             empty_view.setVisibility(View.GONE);
-            initWigget();
+            loadData();
         }
         presenter.taskDesc(releaseTaskId);
     }