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)
+                }
             }
         }
     }