From 979d9cff22806f213b420452ab4a68fcbaf021b6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 31 五月 2021 17:43:49 +0800
Subject: [PATCH] 1. 修复多项可能引起空指针崩溃的bug； 2. 新建子任务时默认执行人员从全体人员改为当前用户； 3. 新建子任务时默认执行时间强制固定为总任务对应的时段内，确保子任务执行时间不会超出总任务范围。
---
app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseMapActivity.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseMapActivity.java b/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseMapActivity.java
index b6519b3..913f727 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseMapActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/activity/ScenseMapActivity.java
@@ -48,14 +48,13 @@
import cn.flightfeather.thirdapp.R;
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener;
import cn.flightfeather.thirdapp.adapter.ScenseListAdapter;
-import cn.flightfeather.thirdapp.bean.City;
-import cn.flightfeather.thirdapp.bean.District;
-import cn.flightfeather.thirdapp.bean.Domainitem;
-import cn.flightfeather.thirdapp.bean.Province;
-import cn.flightfeather.thirdapp.bean.Scense;
-import cn.flightfeather.thirdapp.bean.Subtask;
-import cn.flightfeather.thirdapp.bean.Town;
-import cn.flightfeather.thirdapp.module.MainActivity;
+import cn.flightfeather.thirdapp.bean.entity.City;
+import cn.flightfeather.thirdapp.bean.entity.District;
+import cn.flightfeather.thirdapp.bean.entity.Domainitem;
+import cn.flightfeather.thirdapp.bean.entity.Province;
+import cn.flightfeather.thirdapp.bean.entity.Scense;
+import cn.flightfeather.thirdapp.bean.entity.Subtask;
+import cn.flightfeather.thirdapp.bean.entity.Town;
import cn.flightfeather.thirdapp.task.ObtainBoundaryRunnable;
import cn.flightfeather.thirdapp.util.Area;
import cn.flightfeather.thirdapp.util.CommonUtils;
@@ -415,7 +414,7 @@
private void selectScense(Marker marker) {
mSelectedScense = mShownScenseList.get(curPos);
- if (mLastPos != -1) {
+ if (mLastPos != -1 && mLastPos < markerList.size()) {
markerList.get(mLastPos).setIcon(mLastBitmapDesc);
}
mLastBitmapDesc = marker.getIcons().get(0);
@@ -534,15 +533,15 @@
}
break;
case R.id.iBtn_data:
- Intent detailIntent = new Intent(this, TaskDetailActivity.class);
- detailIntent.putExtra(Constant.KEY_INTENT_SUBTASK, mSubTaskList.get(curPos));
- startActivity(detailIntent);
+// Intent detailIntent = new Intent(this, TaskDetailActivity.class);
+// detailIntent.putExtra(Constant.KEY_INTENT_SUBTASK, mSubTaskList.get(curPos));
+// startActivity(detailIntent);
break;
case R.id.iBtn_inspection:
- Intent inspectionIntent = new Intent(this, MainActivity.class);
- inspectionIntent.putExtra(Constant.KEY_INTENT_SUBTASK, mSubTaskList.get(curPos));
- setResult(RESULT_OK, inspectionIntent);
- this.finish();
+// Intent inspectionIntent = new Intent(this, MainActivity.class);
+// inspectionIntent.putExtra(Constant.KEY_INTENT_SUBTASK, mSubTaskList.get(curPos));
+// setResult(RESULT_OK, inspectionIntent);
+// this.finish();
break;
}
}
--
Gitblit v1.9.3