From 17eb1d06e104bc1cd93498fe3a3eaecf14c9d734 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 12 十一月 2020 13:57:35 +0800
Subject: [PATCH] 1. 修复现场整改时，问题状态是‘问题审核通过’而不是“整改未审核”的问题； 2. 修改任意拍照界面的多图片展示方式为Glide，减少内存溢出的可能性； 3. 新增图片类型枚举类，罗列原有的图片类型，并新增“铭牌”和“监测设备”； 4. 修复导航功能可能导致空指针的问题； 5. 任意拍界面新增按分类拍摄功能； 6. 修复现场整改界面打开崩溃问题；
---
app/src/main/java/cn/flightfeather/thirdapp/module/inspection/ShareProblemActivity.kt | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/ShareProblemActivity.kt b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/ShareProblemActivity.kt
index 6db796b..f904911 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/ShareProblemActivity.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/module/inspection/ShareProblemActivity.kt
@@ -34,7 +34,7 @@
problemVoList?.forEach {vo ->
val mediaFileList = mutableListOf<Pair<Boolean, String>>()
vo.mediafileList.forEach {
- mediaFileList.add(Pair(it.ischanged, CommonApplication.getInstance().ROOTURL_REALEASE_IMAGE + it.extension1 + it.guid + ".jpg"))
+ mediaFileList.add(Pair(it.ischanged, CommonApplication.getInstance().ROOT_URL_RELEASE_IMAGE + it.extension1 + it.guid + ".jpg"))
}
infoList.add(ShareProblemPreViewActivity.Problem(
@@ -50,6 +50,9 @@
intent.putExtra(ShareProblemPreViewActivity.ARG_MERGE_INFO, infoList)
startActivity(intent)
}
+ btn_fail.setOnClickListener {
+ onBackPressed()
+ }
}
override fun getTab(): TabLayout = tab
@@ -59,7 +62,7 @@
override fun getTitles(): List<String> {
val list = mutableListOf<String>()
for (i in problemVoList?.indices ?: 0..0) {
- list.add("闂$i")
+ list.add("闂${i+1}")
}
return list
}
--
Gitblit v1.9.3