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/module/inspection/MenuNewGitActivity.kt | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt
index 09b094f..13b2905 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt
@@ -16,7 +16,7 @@
import cn.flightfeather.thirdapp.adapter.GitListAdapter
import cn.flightfeather.thirdapp.adapter.GitTypeListAdapter
import cn.flightfeather.thirdapp.adapter.RecyclerItemClickListener
-import cn.flightfeather.thirdapp.bean.*
+import cn.flightfeather.thirdapp.bean.entity.*
import cn.flightfeather.thirdapp.common.database.DbFactory
import cn.flightfeather.thirdapp.common.net.RetrofitFactory
import cn.flightfeather.thirdapp.httpservice.InspectionService
@@ -26,7 +26,10 @@
import cn.flightfeather.thirdapp.util.UUIDGenerator
import cn.flightfeather.thirdapp.util.file.FileUtil
import com.ping.greendao.gen.GittypeDao
-import kotlinx.android.synthetic.main.dialog_camera.*
+import kotlinx.android.synthetic.main.dialog_camera.fab_problem_list_close
+import kotlinx.android.synthetic.main.dialog_camera.iv_new_photo
+import kotlinx.android.synthetic.main.dialog_camera.tv_title
+import kotlinx.android.synthetic.main.dialog_camera_2.*
import okhttp3.ResponseBody
import retrofit2.Call
import retrofit2.Callback
@@ -42,7 +45,7 @@
override fun getImageViews(): MutableList<ImageView> = mutableListOf()
- override fun getLayoutId(): Int = R.layout.dialog_camera
+ override fun getLayoutId(): Int = R.layout.dialog_camera_2
lateinit var viewModel: MenuNewGitViewModel
@@ -88,7 +91,7 @@
intent.putExtra("gitlistVo", viewModel.gitList.value?.get(position))
intent.putExtra("subTask", subTask)
intent.putExtra("inspectionGuid", inspection?.guid)
- intent.putExtra("scenseAddress", "${scene?.cityname ?: ""} + ${scene?.districtname?:""} + ${scene?.townname?:""} + ${scene?.location?:""}")
+ intent.putExtra("scenseAddress", "${scene?.cityname ?: ""}${scene?.districtname?:""}${scene?.townname?:""}${scene?.location?:""}")
startActivity(intent)
}
@@ -227,7 +230,8 @@
override fun onResponse(call: Call<ResponseBody>, response: Response<ResponseBody>) {
if (response.body() != null) {
Toast.makeText(application, "鎻愪氦鎴愬姛", Toast.LENGTH_SHORT).show()
- for (oldfile in pathTempList) {
+ for (l in pathTempList) {
+ val oldfile = l.first
val fileName = gitSelected.name + " " + UUIDGenerator.generateUUID(4) + ".jpg"
val mediafile = Mediafile()
mediafile.guid = UUIDGenerator.generate16ShortUUID()
--
Gitblit v1.9.3