Merge remote-tracking branch 'origin/qa_1.1.5_2' into qa_1.1.5_2

modules/mogo-module-guide/src/main/java/com/mogo/module/guide/MogoGuideProvider.kt

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.mogo.commons.debug.DebugConfig
 import com.mogo.map.listener.IMogoMapListener
 import com.mogo.map.location.IMogoLocationListener
 import com.mogo.map.marker.IMogoMarkerClickListener
@@ -56,11 +57,12 @@ class MogoGuideProvider : IMogoModuleProvider {
     }
 
     override fun init(context: Context?) {
-        if (isDeviceOfD()) {
-            GuideBizManager.init()
-        } else {
-            Logger.d("MogoGuideProvider", "device type is not D")
-        }
+        Logger.d("MogoGuideProvider", "init====")
+//        if (DebugConfig.isLoadGuideModule()) {
+        GuideBizManager.init()
+//        } else {
+//            Logger.d("MogoGuideProvider", "device type is not D")
+//        }
 
     }
 

modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareControl.java

@@ -49,6 +49,7 @@ import com.mogo.utils.storage.SharedPrefsMgr;
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -483,6 +484,7 @@ public class ShareControl implements IMogoShareManager, IMogoIntentListener,
                             config = GsonUtil.jsonFromObject(btnList);
                             Logger.d(TAG, "获取分享框成功：" + config);
                         } else {
+                            config = GsonUtil.jsonFromObject(new ArrayList<FixableButton>());
                             Logger.d(TAG, "获取分享框成功，但是data没有内容");
                         }
                     } else {