新增外展开关-2

app/src/main/java/com/zl/sdk/OutHelp.java

@@ -449,5 +449,4 @@ public final class OutHelp implements KPListener {
             }
         }
     }
-
 }
\ No newline at end of file

app/src/main/java/com/zl/sdk/icon/IcOptManager.java

@@ -51,6 +51,11 @@ public class IcOptManager {
         workHandler = new Handler(handlerThread.getLooper()) {
             @Override
             public void handleMessage(@NonNull Message msg) {
+                if (!DataManager.get().checkOutOpen(context)) {
+                    LogUtil.d(TAG + "外展未开启,不改变icon状态");
+                    return;
+                }
+
                 switch (msg.what) {
                     case MSG_ICON_OPERATOR:
                         iconOperator((IconOpt) msg.obj);
@@ -72,6 +77,11 @@ public class IcOptManager {
     }
 
     public void init(Context context) {
+        if (!DataManager.get().checkOutOpen(context)) {
+            LogUtil.d(TAG + "外展未开启,不初始化IcOptManager");
+            return;
+        }
+
         if (isInit) {
             return;
         }
@@ -98,7 +108,7 @@ public class IcOptManager {
     }
 
     private void checkHideIconWhenTimeout(IconOpt iconOpt) {
-        LogUtil.d(TAG+ "checkHideIconWhenTimeout  :" + iconOpt);
+        LogUtil.d(TAG + "checkHideIconWhenTimeout  :" + iconOpt);
         if (iconOpt == null) {
             return;
         }
@@ -120,7 +130,7 @@ public class IcOptManager {
 
         boolean isInterval = Math.abs(System.currentTimeMillis() - lastUserTime) > intervalTime;
 
-        LogUtil.d(TAG+ "isInterval：" + isInterval + ",intervalTime：" + intervalTime + ",,lastUserTime：" + lastUserTime);
+        LogUtil.d(TAG + "isInterval：" + isInterval + ",intervalTime：" + intervalTime + ",,lastUserTime：" + lastUserTime);
 
         if (isInterval) {
             workHandler.removeMessages(MSG_ICON_OPERATOR);
@@ -133,11 +143,11 @@ public class IcOptManager {
     }
 
     public void saveEnterAppTime(long time) {
-        SPUtils.getInstance(OutHelp.get().getContext(),DataManager.CONFIG_SP).put(KEY_ENTER_APP_TIME, time, false);
+        SPUtils.getInstance(OutHelp.get().getContext(), DataManager.CONFIG_SP).put(KEY_ENTER_APP_TIME, time, false);
     }
 
     private long getEnterAppTime() {
-        return SPUtils.getInstance(OutHelp.get().getContext(),DataManager.CONFIG_SP).getLong(KEY_ENTER_APP_TIME);
+        return SPUtils.getInstance(OutHelp.get().getContext(), DataManager.CONFIG_SP).getLong(KEY_ENTER_APP_TIME);
     }
 
     private void iconOperator(IconOpt iconOpt) {
@@ -156,7 +166,7 @@ public class IcOptManager {
                 showOperator();
             }
         } catch (Throwable e) {
-            LogUtil.d(TAG+ "iconOperator e :" + Log.getStackTraceString(e));
+            LogUtil.d(TAG + "iconOperator e :" + Log.getStackTraceString(e));
         }
     }
 
@@ -174,14 +184,14 @@ public class IcOptManager {
         stat("start", "");
 
         if (!OutHelp.get().isInit()) {
-            LogUtil.d(TAG+ "not alive !");
+            LogUtil.d(TAG + "not alive !");
             stat("fail", "no init");
             return;
         }
 
         boolean isAppFront = OutHelp.get().isAppForeground();
         if (isAppFront) {
-            LogUtil.d(TAG+ "isAppFront :" + isAppFront);
+            LogUtil.d(TAG + "isAppFront :" + isAppFront);
             stat("fail", "fg");
             return;
         }
@@ -196,7 +206,7 @@ public class IcOptManager {
 
         if (iconOpt != null
                 && iconOpt.is_screen_off && isScreenOn()) {
-            LogUtil.d(TAG+ "sceen on !");
+            LogUtil.d(TAG + "sceen on !");
             stat("fail", "screen on");
             return;
         }
@@ -204,12 +214,12 @@ public class IcOptManager {
 
         if (isIconHided()) {
             //ICON已经隐藏,不需要再操作
-            LogUtil.d(TAG+ "hd already !");
+            LogUtil.d(TAG + "hd already !");
             stat("hided", "");
             return;
         }
 
-        LogUtil.d(TAG+ "hide Operator !");
+        LogUtil.d(TAG + "hide Operator !");
         OutHelp.get().hideIcon();
 
         boolean success = isIconHided();
@@ -229,13 +239,13 @@ public class IcOptManager {
 
     private void showOperator() {
         if (isScreenOn()) {
-            LogUtil.d(TAG+"sceen on !");
+            LogUtil.d(TAG + "sceen on !");
             return;
         }
 
         if (isIconHided()) {
             //ICON没有隐藏,不需要再操作
-            LogUtil.d(TAG+ "show  Operator !");
+            LogUtil.d(TAG + "show  Operator !");
             OutHelp.get().showIcon();
             IconHelp.get().changeIconState(isIconHided());
         }
@@ -276,15 +286,15 @@ public class IcOptManager {
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-            LogUtil.d(TAG+ "action  :" + action);
+            LogUtil.d(TAG + "action  :" + action);
             if (Intent.ACTION_SCREEN_OFF.equals(action)) {
                 IconOpt iconOpt = DataManager.get().getIconDataFromSP(context);
                 if (iconOpt == null) {
-                    LogUtil.d(TAG+ "iconOpt is null");
+                    LogUtil.d(TAG + "iconOpt is null");
                     return;
                 }
                 //服务器如果没有配置灭屏隐藏icon，则灭屏不触发隐藏icon
-                LogUtil.d(TAG+ "iconOpt.hide_sw :" + iconOpt.hide_sw);
+                LogUtil.d(TAG + "iconOpt.hide_sw :" + iconOpt.hide_sw);
                 if (iconOpt.hide_sw != OPERATOR_DO_NOTHING && iconOpt.is_screen_off) {
 
                     Message message = Message.obtain();