go video task bug fixed

app/src/main/java/com/sheep/gamegroup/helper/TaskHelper.java

@@ -314,7 +314,7 @@ public class TaskHelper {
                             taskEty.setRelease_task_id(taskReleaseEty.getId());
                             taskEty.setName(taskReleaseEty.getName());
                             taskEty.setAcceptedTaskId(taskReleaseEty.getAccepted_task_id());
-                            goTaskDetail(taskEty);
+                            Jump2View.getInstance().goEntity(taskEty);
 //                            Jump2View.getInstance().goDialogActivityView(activity, taskEty);
                             FIND_TASK.onEvent("release_task_id", release_task_id, "action", view.getContext().getString(R.string.get_task));
                         }
@@ -324,25 +324,13 @@ public class TaskHelper {
                     @Override
                     public void onClick(View view) {
                         reloadDataType = 1;//回来后将刷新界面数据 taskAcceptedEty
-                        goTaskDetail(taskEty);
+                        Jump2View.getInstance().goEntity(taskEty);
                     }
                 });
                 break;
         }
     }
 
-    private void goTaskDetail(TaskEty taskEty) {
-        if (taskEty.getTask_type() == TaskEty.TASK_TYPE_WELFARE) {
-            String url = Config.getUrlByPath(Config.PATH_WELFARE_DETAIL, "id", taskReleaseEty.getId());
-            Jump2View.getInstance().goWeb(activity, url, activity.getString(R.string.app_name));
-        } else if (taskEty.getTask_type() == TaskEty.TASK_TYPE_REWARD) {
-            String url = Config.getUrlByPath(Config.PATH_MONEY_REWARD_DETAIL, "id", taskReleaseEty.getId());
-            Jump2View.getInstance().goWeb(activity, url, activity.getString(R.string.app_name));
-        } else {
-            Jump2View.getInstance().goTaskDetailView(activity, release_task_id);
-        }
-    }
-
     //刷新界面
     public void refreshTask() {
         clear();

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

@@ -786,6 +786,7 @@ public class TaskEty implements Serializable, IDownload {
     public static final int TASK_TYPE_XIAN_JIN = 1008;//现金任务
     public static final int TASK_TYPE_WELFARE = 1019;//道具福利任务
     public static final int TASK_TYPE_REWARD = 1020;//赏金任务
+    public static final int TASK_TYPE_VIDEO_AD = 1021;//视频广告任务
     public static final int TASK_TYPE_GAME_OTHER = 1099;
     //open_mode 连续任务类型
     public static final int OPEN_MODE_TYPE_APP = 1;

app/src/main/java/com/sheep/gamegroup/module/task/VideoTaskActivity.java

@@ -182,6 +182,8 @@ public class VideoTaskActivity extends BaseActivity {
         CommonUtil.getInstance().getTaskDesc(releaseTaskId, rt -> {
             if (rt == null) {
                 G.showToast("没有该任务");
+                finish();
+                return;
             }
             releaseTask = rt;
             if (releaseTask.getAccepted_task_id() > 0) {

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

@@ -213,6 +213,10 @@ import me.iwf.photopicker.PhotoPreview;
 import okhttp3.Call;
 import rx.functions.Action1;
 
+import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_CREDIT_CARD;
+import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_REWARD;
+import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_VIDEO_AD;
+import static com.sheep.gamegroup.model.entity.TaskEty.TASK_TYPE_WELFARE;
 import static com.sheep.gamegroup.module.game.activity.ActGameGroupOrGameDetail.AUTO_DOWNLOAD;
 import static com.sheep.gamegroup.module.game.activity.ActGameGroupOrGameDetail.KEY_HAS_WELFARE;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.ASK_MAKE_MONEY_INVITATION;
@@ -1906,23 +1910,29 @@ public class Jump2View {
      */
     public void goEntity(Release_task item) {
         if (item != null) {
-            switch (item.getTask().getTask_type()) {
-                case 1019:
+            goEntity(item.getTask());
+        }
+    }
+
+    public void goEntity(TaskEty item) {
+        if (item != null) {
+            switch (item.getTask_type()) {
+                case TASK_TYPE_WELFARE:
                     goWeb(SheepApp.getInstance().getCurrentActivity(), new WebParams(Config.getUrlByPath(Config.PATH_WELFARE_DETAIL
-                            , "id", item.getId(), "device_id", DeviceUtil.getDeviceId(SheepApp.getInstance()), "app_version", String.valueOf(BuildConfig.VERSION_CODE))).setTitle(item.getName()));
+                            , "id", item.getRelease_task_id(), "device_id", DeviceUtil.getDeviceId(SheepApp.getInstance()), "app_version", String.valueOf(BuildConfig.VERSION_CODE))).setTitle(item.getName()));
                     break;
-                case 1020:
+                case TASK_TYPE_REWARD:
                     goWeb(SheepApp.getInstance().getCurrentActivity(), new WebParams(Config.getUrlByPath(Config.PATH_MONEY_REWARD_DETAIL
-                            , "id", item.getId(), "device_id", DeviceUtil.getDeviceId(SheepApp.getInstance()), "app_version", String.valueOf(BuildConfig.VERSION_CODE))).setTitle(item.getName()));
+                            , "id", item.getRelease_task_id(), "device_id", DeviceUtil.getDeviceId(SheepApp.getInstance()), "app_version", String.valueOf(BuildConfig.VERSION_CODE))).setTitle(item.getName()));
                     break;
-                case 1021:
-                    goVideoTaskView(SheepApp.getInstance().getCurrentActivity(), item.getId());
+                case TASK_TYPE_VIDEO_AD:
+                    goVideoTaskView(SheepApp.getInstance().getCurrentActivity(), item.getRelease_task_id());
                     break;
-                case 2:
-                    goCreditCardTaskDetail(SheepApp.getInstance().getCurrentActivity(), item.getId());
+                case TASK_TYPE_CREDIT_CARD:
+                    goCreditCardTaskDetail(SheepApp.getInstance().getCurrentActivity(), item.getRelease_task_id());
                     break;
                 default:
-                    goTaskDetailView(SheepApp.getInstance().getCurrentActivity(), item.getId());
+                    goTaskDetailView(SheepApp.getInstance().getCurrentActivity(), item.getRelease_task_id());
                     break;
             }
         }