|
@@ -805,7 +805,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
|
|
|
|
|
object.put("task_time", runTime / 1000);
|
|
object.put("task_time", runTime / 1000);
|
|
|
object.put("release_task_id", taskReleaseEty.getId());
|
|
object.put("release_task_id", taskReleaseEty.getId());
|
|
|
- addTaskChildId(object, taskEty);
|
|
|
|
|
|
|
+ addCanCommitTaskChildId(object, taskEty);
|
|
|
SheepApp.getInstance().getNetComponent().getApiService().commitAutoTask(object)
|
|
SheepApp.getInstance().getNetComponent().getApiService().commitAutoTask(object)
|
|
|
.subscribeOn(Schedulers.io())
|
|
.subscribeOn(Schedulers.io())
|
|
|
.observeOn(AndroidSchedulers.mainThread())
|
|
.observeOn(AndroidSchedulers.mainThread())
|
|
@@ -837,19 +837,29 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- * 添加子任务id参数
|
|
|
|
|
|
|
+ * 连续任务在自动审核任务领取任务时添加子任务id参数
|
|
|
*
|
|
*
|
|
|
* @param object
|
|
* @param object
|
|
|
* @param taskEty
|
|
* @param taskEty
|
|
|
*/
|
|
*/
|
|
|
- private void addTaskChildId(JSONObject object, TaskEty taskEty) {
|
|
|
|
|
|
|
+ private void addCanAcceptedTaskChildId(JSONObject object, TaskEty taskEty) {
|
|
|
switch (taskEty.getTask_type()) {
|
|
switch (taskEty.getTask_type()) {
|
|
|
case 1000://连续任务
|
|
case 1000://连续任务
|
|
|
int task_child_id = taskEty.getCanAcceptedChildId();
|
|
int task_child_id = taskEty.getCanAcceptedChildId();
|
|
|
- if (task_child_id < 1) {
|
|
|
|
|
- G.showToast("暂无可以领取的任务");
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ object.put("task_child_id", task_child_id);
|
|
|
|
|
+ break;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 连续任务在自动审核任务领取奖励时添加子任务id参数
|
|
|
|
|
+ *
|
|
|
|
|
+ * @param object
|
|
|
|
|
+ * @param taskEty
|
|
|
|
|
+ */
|
|
|
|
|
+ private void addCanCommitTaskChildId(JSONObject object, TaskEty taskEty) {
|
|
|
|
|
+ switch (taskEty.getTask_type()) {
|
|
|
|
|
+ case 1000://连续任务
|
|
|
|
|
+ int task_child_id = taskEty.getCanCommitChildRelease_task_id(TaskEty.STATUS_RUNNING);
|
|
|
object.put("task_child_id", task_child_id);
|
|
object.put("task_child_id", task_child_id);
|
|
|
break;
|
|
break;
|
|
|
}
|
|
}
|
|
@@ -1039,7 +1049,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
JSONObject object = new JSONObject();
|
|
JSONObject object = new JSONObject();
|
|
|
object.put("device_id", DeviceUtil.getDeviceId(activity));
|
|
object.put("device_id", DeviceUtil.getDeviceId(activity));
|
|
|
object.put("release_task_id", taskReleaseEty.getId());
|
|
object.put("release_task_id", taskReleaseEty.getId());
|
|
|
- addTaskChildId(object, taskEty);
|
|
|
|
|
|
|
+ addCanAcceptedTaskChildId(object, taskEty);
|
|
|
SheepApp.getInstance()
|
|
SheepApp.getInstance()
|
|
|
.getNetComponent()
|
|
.getNetComponent()
|
|
|
.getApiService()
|
|
.getApiService()
|