From dded7fe1d51cb3da855d02201ca150c9b7fd0495 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 15 九月 2020 10:41:52 +0800
Subject: [PATCH] 修复一键分享功能中，整改建议 没有显示的问题
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/MenuNewGitActivity.kt | 11 ++++++-----
1 files changed, 6 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 eceb65a..882a34c 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
@@ -154,11 +154,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 +227,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