|
|
@@ -273,7 +273,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
}
|
|
|
|
|
|
private void loadData() {
|
|
|
- detail_shrae_friend_layout.setVisibility(View.VISIBLE);
|
|
|
+ if (isDestroyed()) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (detail_shrae_friend_layout != null) {
|
|
|
+ detail_shrae_friend_layout.setVisibility(View.VISIBLE);
|
|
|
+ }
|
|
|
|
|
|
taskEty = taskReleaseEty.getTask();
|
|
|
if (onResumeCount == 0) {
|
|
|
@@ -851,7 +856,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
onClickSecondBtn();
|
|
|
break;
|
|
|
case R.id.detail_share_friend_tv:
|
|
|
- if(taskReleaseEty != null){
|
|
|
+ if (taskReleaseEty != null) {
|
|
|
Jump2View.getInstance().tryShare(activity, "task_desc_url", "task_id", releaseTaskId);
|
|
|
} else {
|
|
|
Jump2View.getInstance().tryShare(activity, "task_desc_url", "task_id", releaseTaskId,
|
|
|
@@ -971,7 +976,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
break;
|
|
|
case COMPLETED://有可能之前已经下载完成,但是数据库里已经没有数据了,这时只需要修改状态
|
|
|
if (task.getFile() != null) {
|
|
|
- if(downloadUtil.checkFinish(downLoadInfo)) {//检查文件是否真的完成
|
|
|
+ if (downloadUtil.checkFinish(downLoadInfo)) {//检查文件是否真的完成
|
|
|
downloadUtil.setDownloadTaskFinish(task.getUrl(), task.getFile().getAbsolutePath());
|
|
|
} else {//重新开始下载
|
|
|
downloadUtil.delete(downLoadInfo);
|
|
|
@@ -1037,9 +1042,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
break;
|
|
|
}
|
|
|
if (commitScreenShotTaskId > 0) {
|
|
|
- if(!TextUtils.isEmpty(taskEty.getUnique_identification())){//需要提交自定义字段
|
|
|
+ if (!TextUtils.isEmpty(taskEty.getUnique_identification())) {//需要提交自定义字段
|
|
|
Jump2View.getInstance().goActInputAndPickerImg(this, taskEty.getUnique_identification());
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
if (DataUtil.IS_USE_ALL_IMAGE) {//可以上传任意图片
|
|
|
showChooseDialog(false, true, DEFAULT_MAX_COUNT);
|
|
|
} else if ((DataUtil.IS_USE_SCREEN_SHOT || DataUtil.IS_LISTEN_SCREEN_SHOT) && taskEty.needShotScreen()) {//小绵羊截图方案与监听方案
|
|
|
@@ -1330,15 +1335,17 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
private int commitScreenShotTaskId;
|
|
|
|
|
|
private String unique_identification;
|
|
|
+
|
|
|
@Override
|
|
|
protected void onSetNetImageUrl(String data) {
|
|
|
setLoaddingText("提交中");
|
|
|
commitScreenShotData(data, unique_identification);
|
|
|
unique_identification = null;
|
|
|
}
|
|
|
+
|
|
|
//提交截图数据
|
|
|
private void commitScreenShotData(String data, String unique_identification) {
|
|
|
- presenter.taskStatus(commitScreenShotTaskId, data+"", "",taskEty.getPackage_names(), String.valueOf(TaskAcceptedEty.STATUS_SUBMIT), SysAppUtil.getUserAgentOrDeviceInfo(), unique_identification);
|
|
|
+ presenter.taskStatus(commitScreenShotTaskId, data + "", "", taskEty.getPackage_names(), String.valueOf(TaskAcceptedEty.STATUS_SUBMIT), SysAppUtil.getUserAgentOrDeviceInfo(), unique_identification);
|
|
|
taskEty.setScreenshots(data);
|
|
|
}
|
|
|
|
|
|
@@ -1370,10 +1377,11 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
|
|
|
isFresh = true;
|
|
|
break;
|
|
|
case RequestCodeConstants.REQUEST_CODE_GE_DATA:
|
|
|
- if(resultCode == RESULT_OK) {
|
|
|
+ if (resultCode == RESULT_OK) {
|
|
|
Object object = DataUtil.getInstance().getData(InputAndUrlList.class.getSimpleName());
|
|
|
- if(TestUtil.isDev()) LogUtil.println("GET_DATA", JSONObject.toJSONString(object));
|
|
|
- if(object instanceof InputAndUrlList) {
|
|
|
+ if (TestUtil.isDev())
|
|
|
+ LogUtil.println("GET_DATA", JSONObject.toJSONString(object));
|
|
|
+ if (object instanceof InputAndUrlList) {
|
|
|
unique_identification = ((InputAndUrlList) object).getInput();
|
|
|
//上传图片
|
|
|
photoCount = DEFAULT_MAX_COUNT;
|