From 29c6cb0031e3d1aac2e326b3a83fa78bcd380890 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 21 十二月 2020 10:57:07 +0800
Subject: [PATCH] 1. 修改巡查界面刚进入快速点击巡查功能按钮导致崩溃问题； 2. 修复技防措施的地址记录信息有加号的问题
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 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 eceb65a..915986e 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
@@ -27,6 +27,10 @@
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 +46,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 +92,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)
}
@@ -154,11 +158,11 @@
et_problemDes.visibility = View.GONE
ll_change_suggestion.visibility = View.GONE
//鍔犺浇棰勭疆鏁版嵁
- val gittypeList = DbFactory.getInstance().gittypeDao.queryBuilder()
+ val gittypeList = DbFactory.getInstance().gittypeDao.queryBuilder()
.where(
- GittypeDao.Properties.Tasktype.eq(subTask?.type) ,
- GittypeDao.Properties.Scensetype.eq(scene?.type),
- GittypeDao.Properties.Districtname.eq(subTask?.districtname)
+ GittypeDao.Properties.Tasktype.eq(subTask?.type ?: ""),
+ GittypeDao.Properties.Scensetype.eq(scene?.type ?: ""),
+ GittypeDao.Properties.Districtname.eq(subTask?.districtname ?: "")
).orderAsc(GittypeDao.Properties.Typeid).list()
if (gittypeList.size == 0) {
val gittype1 = Gittype()
@@ -227,7 +231,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