From bb0fd6a7c69f439e4896b71cacc7fa33a1ff25d7 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 27 八月 2020 09:21:09 +0800
Subject: [PATCH] 1. 新增BaseDialog,解决关闭dialog时，activity已经关闭导致崩溃问题 2. 修复技防措施界面MenuNewGitActivity在本地查询技防措施时出现null字段导致崩溃问题 3.修复NewSubTaskViewModel根据场景类型刷新展示列表时，由于网络访问耗时操作，导致之前选择的场景类型下标索引越界导致崩溃问题 4.修复MainActivity中fragment切换时可能崩溃问题
---
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