From 0e870a0d919a28a45084a7df5f662afbfd7e086d Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 15 十二月 2020 14:44:28 +0800
Subject: [PATCH] DownloadAndSetImageTask和SetImageTask两个类由于在子线程执行，会经常出现activity关闭后继续执行导致报错崩溃问题，修复此bug
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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..adc2d2a 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
@@ -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