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/DialogUtil.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil.java b/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil.java
index b91e19f..6dd6cbb 100644
--- a/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil.java
+++ b/app/src/main/java/cn/flightfeather/thirdapp/util/DialogUtil.java
@@ -13,6 +13,7 @@
import com.cazaea.sweetalert.SweetAlertDialog;
import cn.flightfeather.thirdapp.R;
+import cn.flightfeather.thirdapp.module.base.BaseDialog;
/**
* Created by feiyu on 2018/8/3.
@@ -21,7 +22,7 @@
public class DialogUtil {
- public static Dialog createLoadingDialog(Context context, String msg) {
+ public static BaseDialog createLoadingDialog(Context context, String msg) {
LayoutInflater inflater = LayoutInflater.from(context);
View v = inflater.inflate(R.layout.layout_loading, null);// 寰楀埌鍔犺浇view
LinearLayout layout = (LinearLayout) v
@@ -29,7 +30,7 @@
// TextView tipTextView = (TextView) v.findViewById(R.id.tipTextView);// 鎻愮ず鏂囧瓧
// tipTextView.setTitle(msg);// 璁剧疆鍔犺浇淇℃伅
- Dialog loadingDialog = new Dialog(context);// 鍒涘缓鑷畾涔夋牱寮廳ialog
+ BaseDialog loadingDialog = new BaseDialog(context);// 鍒涘缓鑷畾涔夋牱寮廳ialog
loadingDialog.setCancelable(false); // 鏄惁鍙互鎸夆�滆繑鍥為敭鈥濇秷澶�
loadingDialog.setCanceledOnTouchOutside(false); // 鐐瑰嚮鍔犺浇妗嗕互澶栫殑鍖哄煙
loadingDialog.setContentView(layout, new LinearLayout.LayoutParams(
@@ -50,8 +51,8 @@
return loadingDialog;
}
- public static Dialog create(Context context, @LayoutRes int id) {
- Dialog dialog = new Dialog(context);
+ public static BaseDialog create(Context context, @LayoutRes int id) {
+ BaseDialog dialog = new BaseDialog(context);
dialog.setContentView(id);
//璁剧疆dialog瀹藉害
Window dialogWindow = dialog.getWindow();
--
Gitblit v1.9.3