|
@@ -638,7 +638,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
btnUpImag.setVisibility(View.GONE);
|
|
btnUpImag.setVisibility(View.GONE);
|
|
|
break;
|
|
break;
|
|
|
default:
|
|
default:
|
|
|
- if(taskReleaseEty != null && taskReleaseEty.isAppointTask()){
|
|
|
|
|
|
|
+ if(taskReleaseEty != null && taskReleaseEty.isAppointTask() && gettaskAcceptedEty.isFinish()){
|
|
|
ViewUtil.setTextId(btnUpImag, R.string.to_exchange);
|
|
ViewUtil.setTextId(btnUpImag, R.string.to_exchange);
|
|
|
} else {
|
|
} else {
|
|
|
btnUpImag.setText("确认完成");//第二按钮不可点击且显示状态(sdk自动审核直接领取奖励)
|
|
btnUpImag.setText("确认完成");//第二按钮不可点击且显示状态(sdk自动审核直接领取奖励)
|
|
@@ -945,16 +945,15 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
}
|
|
}
|
|
|
} else if (taskEty.isGameTask()) {//游戏任务
|
|
} else if (taskEty.isGameTask()) {//游戏任务
|
|
|
if (taskEty.isGameReservationCantDownload()) {
|
|
if (taskEty.isGameReservationCantDownload()) {
|
|
|
- CommonUtil.getInstance().reservationGameTask(taskReleaseEty, new Action1<Integer>() {
|
|
|
|
|
- @Override
|
|
|
|
|
- public void call(Integer integer) {
|
|
|
|
|
- isFresh = true;
|
|
|
|
|
- freshData();
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ CommonUtil.getInstance().reservationGameTask(taskReleaseEty, integer -> {
|
|
|
|
|
+ isFresh = true;
|
|
|
|
|
+ freshData();
|
|
|
});
|
|
});
|
|
|
} else {
|
|
} else {
|
|
|
accepteReceiveAward();
|
|
accepteReceiveAward();
|
|
|
}
|
|
}
|
|
|
|
|
+ } else if(taskReleaseEty != null && taskReleaseEty.isAppointTask() && gettaskAcceptedEty.isFinish()) {//定向任务已经完成时,可以去兑换
|
|
|
|
|
+ Jump2View.getInstance().goAppointTaskList();
|
|
|
} else if (taskEty.isSdkAutoCommitTask()) {//sdk自动审核任务
|
|
} else if (taskEty.isSdkAutoCommitTask()) {//sdk自动审核任务
|
|
|
try {
|
|
try {
|
|
|
commitAutoTask(new JSONObject());
|
|
commitAutoTask(new JSONObject());
|
|
@@ -969,8 +968,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
|
G.showToast(e.getMessage());
|
|
G.showToast(e.getMessage());
|
|
|
}
|
|
}
|
|
|
- } else if(taskReleaseEty != null && taskReleaseEty.isAppointTask()) {//定向任务已经完成时,可以去兑换
|
|
|
|
|
- Jump2View.getInstance().goAppointTaskList();
|
|
|
|
|
} else {//截图任务
|
|
} else {//截图任务
|
|
|
commitScreenShot();
|
|
commitScreenShot();
|
|
|
}
|
|
}
|