Merge branch 'dev_new_inout' of http://39.97.65.143:81/android/android_fiveworld into dev_new_inout

app/src/main/java/com/mints/fiveworld/manager/wifi/WifiDataManager.kt

@@ -1756,7 +1756,7 @@ object WifiDataManager {
         }
 
         // home页点击
-        if (data.modules.homeClick.isOpen) {
+        if (data.modules.homeClick?.isOpen!!) {
             sp.put(HOME_CLICK_SWITCH, true)
             HOME_CLICK_TIMES = data.modules.homeClick.maxCount
             HomePopManager.getInstance()

app/src/main/java/com/mints/fiveworld/mvp/model/OutAppConfig.java

@@ -123,7 +123,7 @@ public class OutAppConfig implements Serializable {
          * open : true
          */
 
-        private HomeClickDTO homeClick;
+        private HomeClickDTO homeClick=null;
 
         public HomeClickDTO getHomeClick() {
             return homeClick;

app/src/main/java/com/mints/fiveworld/mvp/presenters/TrackPresenter.java

@@ -303,9 +303,9 @@ public class TrackPresenter extends BaseTrackPresenter {
                                                 WifiDataManager.INSTANCE.getNewDay(data.getSetAllToZero());
                                                 WifiDataManager.INSTANCE.resetServerSumCountData(data.getOuterConfigs());
                                                 // 设置本地拉黑标记 由云端控制
+                                                LogUtil.d("mcg_open","setMinsActive  in="+data.getOuterConfigs().isInnerAdOpen()+" out="+data.getOuterConfigs().isOpen());
                                                 AntiAuditManager.Companion.getInstance().resetBlack(data.getOuterConfigs().isInnerAdOpen(), data.getOuterConfigs().isOpen(), Constant.CARRIER_OUT_TEN_TIME);
 
-                                                LogUtil.d("mcg_open","in="+data.getOuterConfigs().isInnerAdOpen()+" out="+data.getOuterConfigs().isOpen());
                                             }
 
                                             // 设置场景上报接口开头
@@ -369,7 +369,7 @@ public class TrackPresenter extends BaseTrackPresenter {
                                         OutAppConfig data = baseResponse.getData();
                                         WifiDataManager.INSTANCE.resetServerSumCountData(data);
 
-                                        LogUtil.d("mcg_open","in="+baseResponse.getData().isInnerAdOpen()+" out="+baseResponse.getData().isOpen());
+                                        LogUtil.d("mcg_open","getOuterAdConfig  in="+baseResponse.getData().isInnerAdOpen()+" out="+baseResponse.getData().isOpen());
 
                                         AntiAuditManager.Companion.getInstance().resetBlack(baseResponse.getData().isInnerAdOpen(), baseResponse.getData().isOpen(), Constant.CARRIER_APP);
                                     }

app/src/main/java/com/mints/fiveworld/ui/activitys/SplashActivity.java

@@ -470,7 +470,7 @@ public class SplashActivity extends BaseActivity implements SplashView {
 
         if (data != null) {
             // 设置本地拉黑标记 由云端控制
-            LogUtil.d("mcg_open","in="+data.getInnerAdOpen()+" out="+data.getOpenAll());
+            LogUtil.d("mcg_open","getAppsCountSuc  in="+data.getInnerAdOpen()+" out="+data.getOpenAll());
 
             AntiAuditManager.Companion.getInstance().resetBlack(data.getInnerAdOpen(), data.getOpenAll(), Constant.CARRIER_SPLASH);