合并1

BaseModule/src/main/java/com/xscm/moduleutil/base/CommonAppContext.java

@@ -159,10 +159,8 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
         adjustFontScale(getResources().getConfiguration());
         CrashHandler.init(this);
 
-        if (currentEnvironment.getShelf()==1){
-            if (SpUtil.getShelf()!=1) {
-                SpUtil.setShelf(1);
-            }
+        if (SpUtil.getShelf()!=0) {
+            SpUtil.setShelf(1);
         }
     }
 
@@ -437,8 +435,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
             if (SpUtil.isAgreePolicy()) {
                 checkInEmulator();
 //                UtilConfig.checkInEmulator();
-                AgoraManager.getInstance(this);
-                AgoraManager.init(currentEnvironment.getSwSdkAppId());
+                AgoraManager.getInstance();
                 MessageListenerSingleton.getInstance();
                 CrashReport.initCrashReport(this, "b45883f58f", true);/*bugly初始化*/
 //                // 启动 MQTT 服务
@@ -763,7 +760,7 @@ public class CommonAppContext extends MultiDexApplication  implements Applicatio
 //        piaoPingManager.unsubscribe();
         FileUtils.deleteAllInDir(getCacheDir());
         FileUtils.deleteAllInDir(getExternalCacheDir());
-        AgoraManager.getInstance(getApplicationContext()).destroy();
+        AgoraManager.getInstance().destroy();
         // 每次启动应用时重置状态
         SpUtil.setBooleanValue("youth_model_shown", false);