|
@@ -56,6 +56,7 @@ import butterknife.BindView;
|
|
|
import butterknife.OnClick;
|
|
import butterknife.OnClick;
|
|
|
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
import io.reactivex.android.schedulers.AndroidSchedulers;
|
|
|
import io.reactivex.schedulers.Schedulers;
|
|
import io.reactivex.schedulers.Schedulers;
|
|
|
|
|
+import rx.functions.Action1;
|
|
|
|
|
|
|
|
public class VideoTaskActivity extends BaseActivity {
|
|
public class VideoTaskActivity extends BaseActivity {
|
|
|
|
|
|
|
@@ -93,7 +94,7 @@ public class VideoTaskActivity extends BaseActivity {
|
|
|
"提示",
|
|
"提示",
|
|
|
"你确定要放弃奖励吗?",
|
|
"你确定要放弃奖励吗?",
|
|
|
"放弃", "继续观看",
|
|
"放弃", "继续观看",
|
|
|
- d -> super.onBackPressed(),
|
|
|
|
|
|
|
+ d -> giveUpTask(),
|
|
|
d -> LogUtil.logI("continue watch video")).show();
|
|
d -> LogUtil.logI("continue watch video")).show();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -153,7 +154,7 @@ public class VideoTaskActivity extends BaseActivity {
|
|
|
videoPlayerView.getBackButton().setVisibility(View.GONE);
|
|
videoPlayerView.getBackButton().setVisibility(View.GONE);
|
|
|
videoPlayerView.getFullscreenButton().setVisibility(View.GONE);
|
|
videoPlayerView.getFullscreenButton().setVisibility(View.GONE);
|
|
|
videoPlayerView.getBottomProgressBar().setVisibility(View.GONE);
|
|
videoPlayerView.getBottomProgressBar().setVisibility(View.GONE);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
mask_view.setOnTouchListener((v, event) -> {
|
|
mask_view.setOnTouchListener((v, event) -> {
|
|
|
if (event.getAction() == MotionEvent.ACTION_UP && currentVideoAd != null) {
|
|
if (event.getAction() == MotionEvent.ACTION_UP && currentVideoAd != null) {
|
|
|
currentVideoAd.clickX = (int) event.getRawX();
|
|
currentVideoAd.clickX = (int) event.getRawX();
|
|
@@ -206,7 +207,7 @@ public class VideoTaskActivity extends BaseActivity {
|
|
|
"提示",
|
|
"提示",
|
|
|
"你需要观看" + releaseTask.getTask().getVideo_num() + "个视频, 即可获得" + releaseTask.getBonusText() + "元",
|
|
"你需要观看" + releaseTask.getTask().getVideo_num() + "个视频, 即可获得" + releaseTask.getBonusText() + "元",
|
|
|
"放弃", "继续观看",
|
|
"放弃", "继续观看",
|
|
|
- d -> finish(),
|
|
|
|
|
|
|
+ d -> giveUpTask(),
|
|
|
d -> loadAd()).show();
|
|
d -> loadAd()).show();
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -227,7 +228,7 @@ public class VideoTaskActivity extends BaseActivity {
|
|
|
"不好",
|
|
"不好",
|
|
|
"没获取到视频小片,需要再次获取吗?",
|
|
"没获取到视频小片,需要再次获取吗?",
|
|
|
"放弃", "重试",
|
|
"放弃", "重试",
|
|
|
- d -> finish(),
|
|
|
|
|
|
|
+ d -> giveUpTask(),
|
|
|
d -> loadAd()).show();
|
|
d -> loadAd()).show();
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -306,7 +307,7 @@ public class VideoTaskActivity extends BaseActivity {
|
|
|
"提示",
|
|
"提示",
|
|
|
"你需要观看" + (releaseTask.getTask().getVideo_num() - watchCount) + "个视频, 即可获得" + releaseTask.getBonusText() + "元",
|
|
"你需要观看" + (releaseTask.getTask().getVideo_num() - watchCount) + "个视频, 即可获得" + releaseTask.getBonusText() + "元",
|
|
|
"放弃", "继续观看",
|
|
"放弃", "继续观看",
|
|
|
- d -> finish(),
|
|
|
|
|
|
|
+ d -> giveUpTask(),
|
|
|
d -> loadAd()).show();
|
|
d -> loadAd()).show();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -386,12 +387,33 @@ public class VideoTaskActivity extends BaseActivity {
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private void giveUpTask() {
|
|
|
|
|
+ if(acceptedTask!=null) {
|
|
|
|
|
+ SheepApp.getInstance()
|
|
|
|
|
+ .getNetComponent()
|
|
|
|
|
+ .getApiService()
|
|
|
|
|
+ .giveUpTask(acceptedTask.getId())
|
|
|
|
|
+ .subscribeOn(Schedulers.io())
|
|
|
|
|
+ .observeOn(AndroidSchedulers.mainThread())
|
|
|
|
|
+ .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public void onError(BaseMessage baseMessage) {
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public void onNext(BaseMessage baseMessage) {
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
|
|
+ finish();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private void resubmitAutoCheck() {
|
|
private void resubmitAutoCheck() {
|
|
|
ViewUtil.showConfirmDialog(VideoTaskActivity.this,
|
|
ViewUtil.showConfirmDialog(VideoTaskActivity.this,
|
|
|
"提示",
|
|
"提示",
|
|
|
"提交任务失败,需要重新提交吗?",
|
|
"提交任务失败,需要重新提交吗?",
|
|
|
"放弃", "重试",
|
|
"放弃", "重试",
|
|
|
- d -> finish(),
|
|
|
|
|
|
|
+ d -> giveUpTask(),
|
|
|
d -> commitAutoTask()).show();
|
|
d -> commitAutoTask()).show();
|
|
|
}
|
|
}
|
|
|
|
|
|