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/util/DialogUtil2.kt | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil2.kt b/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil2.kt
index fb3bc41..a866f6c 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil2.kt
+++ b/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil2.kt
@@ -13,6 +13,7 @@
import android.widget.TextView
import cn.flightfeather.thirdapp.R
import cn.flightfeather.thirdapp.module.base.BaseActivity
+import cn.flightfeather.thirdapp.view.PopupWindowWithMask
/**
* @author riku
@@ -56,7 +57,7 @@
) {
val view = LayoutInflater.from(activity).inflate(R.layout.dialog_bottom_sheet, null)
activity?.let {
- PopupWindow(it).apply popupWindow@{
+ PopupWindowWithMask(it).apply popupWindow@{
isFocusable = true
isOutsideTouchable = true
contentView = view
@@ -80,17 +81,8 @@
width = ViewGroup.LayoutParams.MATCH_PARENT
animationStyle = R.style.PopWin_bottom_anim_style
background.alpha = 0
- setOnDismissListener {
- val wl = activity.window.attributes
- wl.alpha = 1f
- activity.window.attributes = wl
- }
}.run {
- val wl = activity.window.attributes
- wl.alpha = 0.9f
- activity.window.attributes = wl
showAtLocation(anchorView, Gravity.BOTTOM, 0, 0)
-
}
}
}
--
Gitblit v1.9.3