|
@@ -45,6 +45,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
|
|
|
import com.sheep.gamegroup.presenter.TaskDetailContract;
|
|
import com.sheep.gamegroup.presenter.TaskDetailContract;
|
|
|
import com.sheep.gamegroup.presenter.TaskDetailPresenter;
|
|
import com.sheep.gamegroup.presenter.TaskDetailPresenter;
|
|
|
import com.sheep.gamegroup.usage.AppUsageManager;
|
|
import com.sheep.gamegroup.usage.AppUsageManager;
|
|
|
|
|
+import com.sheep.gamegroup.util.ApiJSONUtil;
|
|
|
import com.sheep.gamegroup.util.CommonUtil;
|
|
import com.sheep.gamegroup.util.CommonUtil;
|
|
|
import com.sheep.gamegroup.util.DataUtil;
|
|
import com.sheep.gamegroup.util.DataUtil;
|
|
|
import com.sheep.gamegroup.util.DeviceUtil;
|
|
import com.sheep.gamegroup.util.DeviceUtil;
|
|
@@ -628,8 +629,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
private void setOtherTaskBtnState() {
|
|
private void setOtherTaskBtnState() {
|
|
|
switch (taskEty.getInspect_type()) {// 1自动审核 2手动审核 3,应用自动审核
|
|
switch (taskEty.getInspect_type()) {// 1自动审核 2手动审核 3,应用自动审核
|
|
|
case INSPECT_TYPE_SDK:
|
|
case INSPECT_TYPE_SDK:
|
|
|
- btnUpImag.setText("无需截图");//第二按钮不可点击且显示状态(sdk自动审核暂不支持)
|
|
|
|
|
- btnUpImag.setEnabled(false);
|
|
|
|
|
|
|
+ btnUpImag.setText("确认完成");//第二按钮不可点击且显示状态(sdk自动审核直接领取奖励)
|
|
|
break;
|
|
break;
|
|
|
case INSPECT_TYPE_PERSION:
|
|
case INSPECT_TYPE_PERSION:
|
|
|
switch (type) {
|
|
switch (type) {
|
|
@@ -924,11 +924,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
* 点击第二按钮
|
|
* 点击第二按钮
|
|
|
*/
|
|
*/
|
|
|
private void onClickSecondBtn() {
|
|
private void onClickSecondBtn() {
|
|
|
- if (gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3 && taskEty.isGameTask()) {
|
|
|
|
|
|
|
+ if (gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3 && taskEty.isGameTask()) {//已经完成的游戏任务
|
|
|
if (taskEty.getThird_task_id() != null) {
|
|
if (taskEty.getThird_task_id() != null) {
|
|
|
ViewUtil.showGamePayAccount(activity, taskEty.getThird_task_id(), taskReleaseEty.getName());
|
|
ViewUtil.showGamePayAccount(activity, taskEty.getThird_task_id(), taskReleaseEty.getName());
|
|
|
}
|
|
}
|
|
|
- } else if (taskEty.isGameTask()) {
|
|
|
|
|
|
|
+ } else if (taskEty.isGameTask()) {//游戏任务
|
|
|
if (taskEty.isGameReservationCantDownload()) {
|
|
if (taskEty.isGameReservationCantDownload()) {
|
|
|
CommonUtil.getInstance().reservationGameTask(taskReleaseEty, new Action1<Integer>() {
|
|
CommonUtil.getInstance().reservationGameTask(taskReleaseEty, new Action1<Integer>() {
|
|
|
@Override
|
|
@Override
|
|
@@ -940,6 +940,13 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
} else {
|
|
} else {
|
|
|
accepteReceiveAward();
|
|
accepteReceiveAward();
|
|
|
}
|
|
}
|
|
|
|
|
+ } else if (taskEty.isSdkAutoCommitTask()) {//sdk自动审核任务
|
|
|
|
|
+ try {
|
|
|
|
|
+ commitAutoTask(new JSONObject());
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ G.showToast(e.getMessage());
|
|
|
|
|
+ }
|
|
|
} else if (taskEty.isAppAutoCommitTask()) {//应用自动审核任务
|
|
} else if (taskEty.isAppAutoCommitTask()) {//应用自动审核任务
|
|
|
try {
|
|
try {
|
|
|
checkAndCommitTask();
|
|
checkAndCommitTask();
|
|
@@ -1099,9 +1106,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
G.showToast(R.string.error_package_link);
|
|
G.showToast(R.string.error_package_link);
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- String gps = LocationUtils.getInstance().getLongitudeLatitude();
|
|
|
|
|
JSONObject object = new JSONObject();
|
|
JSONObject object = new JSONObject();
|
|
|
- object.put("gps", gps);
|
|
|
|
|
if (AutoCheckService.IS_USE_THIS_SERVICE) {
|
|
if (AutoCheckService.IS_USE_THIS_SERVICE) {
|
|
|
ProcessRecord processRecord = DDProviderHelper.getInstance().getProcessRecord(taskEty.getPackage_names());
|
|
ProcessRecord processRecord = DDProviderHelper.getInstance().getProcessRecord(taskEty.getPackage_names());
|
|
|
object.put("task_time", processRecord.getRunTime());
|
|
object.put("task_time", processRecord.getRunTime());
|
|
@@ -1134,41 +1139,48 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- object.put("release_task_id", taskReleaseEty.getId());
|
|
|
|
|
- object.put("create_time", System.currentTimeMillis() / 1000L);//这里添加时间戳,防止用户抓包后重复使用
|
|
|
|
|
addCanCommitTaskChildId(object, taskEty);
|
|
addCanCommitTaskChildId(object, taskEty);
|
|
|
- SheepApp.getInstance().getNetComponent().getApiService().commitAutoTask(object)
|
|
|
|
|
- .subscribeOn(Schedulers.io())
|
|
|
|
|
- .observeOn(AndroidSchedulers.mainThread())
|
|
|
|
|
- .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
|
|
|
|
|
- @Override
|
|
|
|
|
- public void onNext(BaseMessage baseMessage) {
|
|
|
|
|
- CommonUtil.getInstance().updateAutoCheck(null);
|
|
|
|
|
- //这里领取了奖励,要刷新用户信息
|
|
|
|
|
- CommonUtil.getInstance().updateUserInfo(null);
|
|
|
|
|
- String amount = taskReleaseEty.getBonusText();
|
|
|
|
|
- try {
|
|
|
|
|
- Map h = JSON.parseObject(baseMessage.getData() + "");
|
|
|
|
|
-
|
|
|
|
|
- amount = h.get("amount") + "";
|
|
|
|
|
- } catch (Exception e) {
|
|
|
|
|
- e.printStackTrace();
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- G.showToast(String.format(Locale.CHINA, "恭喜你,奖励已完成,获得奖励%s元", TextUtils.isEmpty(amount) ? taskReleaseEty.getBonusText() : amount));
|
|
|
|
|
- finish();
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- @Override
|
|
|
|
|
- public void onError(BaseMessage baseMessage) {
|
|
|
|
|
- G.showToast(baseMessage);
|
|
|
|
|
- }
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ commitAutoTask(object);
|
|
|
} else {
|
|
} else {
|
|
|
G.showToast(R.string.unknown_error);
|
|
G.showToast(R.string.unknown_error);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ //提交自动审核任务
|
|
|
|
|
+ private void commitAutoTask(JSONObject object) {
|
|
|
|
|
+ String gps = LocationUtils.getInstance().getLongitudeLatitude();
|
|
|
|
|
+ object.put("gps", gps);
|
|
|
|
|
+ object.put("release_task_id", taskReleaseEty.getId());
|
|
|
|
|
+ object.put("create_time", System.currentTimeMillis() / 1000L);//这里添加时间戳,防止用户抓包后重复使用
|
|
|
|
|
+ SheepApp.getInstance().getNetComponent().getApiService().commitAutoTask(object)
|
|
|
|
|
+ .subscribeOn(Schedulers.io())
|
|
|
|
|
+ .observeOn(AndroidSchedulers.mainThread())
|
|
|
|
|
+ .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public void onNext(BaseMessage baseMessage) {
|
|
|
|
|
+ CommonUtil.getInstance().updateAutoCheck(null);
|
|
|
|
|
+ //这里领取了奖励,要刷新用户信息
|
|
|
|
|
+ CommonUtil.getInstance().updateUserInfo(null);
|
|
|
|
|
+ String amount = taskReleaseEty.getBonusText();
|
|
|
|
|
+ try {
|
|
|
|
|
+ Map h = JSON.parseObject(baseMessage.getData() + "");
|
|
|
|
|
+
|
|
|
|
|
+ amount = h.get("amount") + "";
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ e.printStackTrace();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ G.showToast(String.format(Locale.CHINA, "恭喜你,奖励已完成,获得奖励%s元", TextUtils.isEmpty(amount) ? taskReleaseEty.getBonusText() : amount));
|
|
|
|
|
+ finish();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public void onError(BaseMessage baseMessage) {
|
|
|
|
|
+ G.showToast(baseMessage);
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 连续任务在自动审核任务领取任务时添加子任务id参数
|
|
* 连续任务在自动审核任务领取任务时添加子任务id参数
|
|
|
*
|
|
*
|