From 1791b8e2e32139fa895052d00a4b73b6727fb490 Mon Sep 17 00:00:00 2001 From: tongchenfei Date: Wed, 16 Sep 2020 14:59:24 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E6=A1=86=E5=92=8C=E4=B8=8B=E6=8B=89=E6=A1=86=E7=9A=84=E9=81=AE?= =?UTF-8?q?=E6=8C=A1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/common/dialog/BaseFloatDialog.java | 2 +- .../java/com/mogo/module/share/manager/GridBtnManager.kt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java index 58eb4cab55..b39f1dfb0c 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java @@ -27,7 +27,7 @@ public class BaseFloatDialog extends Dialog { } private void addFlag() { - getWindow().setType(WindowManager.LayoutParams.FIRST_SYSTEM_WINDOW + 10); + getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT); getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN | WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION | WindowManager.LayoutParams.FLAG_LOCAL_FOCUS_MODE); diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt index 275a0e1b1a..7dd041a33e 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/manager/GridBtnManager.kt @@ -70,8 +70,10 @@ class GridBtnManager(val context: Context, private val container: GridLayout, pr generateShareButton(FixableButton(poiType = IMogoTanluProvider.TYPE_DENSE_FOG, title = "浓雾")) } else { val btnList = GsonUtil.arrayFromJson(config, FixableButton::class.java) - btnList.forEach { btn -> - generateShareButton(btn) + if(btnList!=null&&btnList.isNotEmpty()) { + btnList.forEach { btn -> + generateShareButton(btn) + } } } }