Merge branch 'feature/androdx_from_platform' into feature/platform

Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/colorpick/ScreenRecorderService.java

@@ -45,7 +45,7 @@ public class ScreenRecorderService extends Service {
             if (ColorPickManager.getInstance().getColorPickerDokitView() != null) {
                 ColorPickManager.getInstance().getColorPickerDokitView().onScreenServiceReady();
             }
-        } catch (SecurityException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return super.onStartCommand(intent, flags, startId);

Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/SystemDokitViewManager.java

@@ -183,8 +183,22 @@ class SystemDokitViewManager implements DokitViewManagerInterface {
             //重置倒计时
             ((CountDownDokitView) countDownDokitView).resetTime();
         }
+
+        //判断是否存在主入口icon
+        Map<String, AbsDokitView> dokitViews = getDokitViews(activity);
+        if (dokitViews == null || dokitViews.get(MainIconDokitView.class.getSimpleName()) == null) {
+            if (DokitConstant.AWAYS_SHOW_MAIN_ICON && !(activity instanceof UniversalActivity)) {
+                //添加main icon
+                DokitIntent intent = new DokitIntent(MainIconDokitView.class);
+                intent.mode = DokitIntent.MODE_SINGLE_INSTANCE;
+                DokitViewManager.getInstance().attach(intent);
+                DokitConstant.MAIN_ICON_HAS_SHOW = true;
+            }
+        }
+
     }
 
+
     @Override
     public void onActivityPause(Activity activity) {
         Map<String, AbsDokitView> dokitViews = getDokitViews(activity);