From 0c639d0000c746a7f6fadf5b488ed5a699c99641 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 12 Aug 2020 15:13:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E7=A6=BB=E5=AF=BC=E8=88=AA=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=82=AC=E6=B5=AE=E6=8C=89=E9=92=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |   1 +
 app/build.gradle                              |   2 +
 .../com/mogo/launcher/MogoApplication.java    |  15 +--
 config.gradle                                 |  27 +++--
 gradle.properties                             |   2 +
 .../com/mogo/module/service/MogoServices.java |  15 ---
 .../service/intent/IntentHandlerFactory.java  |   2 -
 .../layout/module_service_app_entrance.xml    |  16 ---
 .../src/main/res/values-ldpi/dimens.xml       |   8 --
 .../src/main/res/values-mdpi/dimens.xml       |   8 --
 .../res/values-xhdpi-1920x1000/dimens.xml     |   8 --
 .../src/main/res/values-xhdpi/dimens.xml      |   8 --
 .../src/main/res/values/dimens.xml            |   8 --
 modules/mogo-module-widgets/.gitignore        |   1 +
 modules/mogo-module-widgets/README.md         |   3 +
 modules/mogo-module-widgets/build.gradle      |  70 ++++++++++++
 .../mogo-module-widgets/consumer-rules.pro    |   0
 modules/mogo-module-widgets/gradle.properties |   3 +
 .../mogo-module-widgets/proguard-rules.pro    |  21 ++++
 .../src/main/AndroidManifest.xml              |   4 +
 .../widgets}/AutoNaviIntentHandler.java       |  17 +--
 .../mogo/module/widgets/MogoWidgetManger.java | 108 ++++++++++++++++++
 .../module/widgets/MogoWidgetsProvider.java   |  99 ++++++++++++++++
 .../module_widgets_app_entrance_bkg.xml}      |   2 +-
 .../layout/module_widgets_app_entrance.xml    |  16 +++
 .../src/main/res/values-ldpi/dimens.xml       |  11 ++
 .../src/main/res/values-mdpi/dimens.xml       |  11 ++
 .../res/values-xhdpi-1920x1000/dimens.xml     |  11 ++
 .../src/main/res/values-xhdpi/dimens.xml      |  11 ++
 .../src/main/res/values/dimens.xml            |  11 ++
 .../src/main/res/values/strings.xml           |   4 +
 settings.gradle                               |   1 +
 32 files changed, 419 insertions(+), 105 deletions(-)
 delete mode 100644 modules/mogo-module-service/src/main/res/layout/module_service_app_entrance.xml
 create mode 100644 modules/mogo-module-widgets/.gitignore
 create mode 100644 modules/mogo-module-widgets/README.md
 create mode 100644 modules/mogo-module-widgets/build.gradle
 create mode 100644 modules/mogo-module-widgets/consumer-rules.pro
 create mode 100644 modules/mogo-module-widgets/gradle.properties
 create mode 100644 modules/mogo-module-widgets/proguard-rules.pro
 create mode 100644 modules/mogo-module-widgets/src/main/AndroidManifest.xml
 rename modules/{mogo-module-service/src/main/java/com/mogo/module/service/intent => mogo-module-widgets/src/main/java/com/mogo/module/widgets}/AutoNaviIntentHandler.java (85%)
 create mode 100644 modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetManger.java
 create mode 100644 modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetsProvider.java
 rename modules/{mogo-module-service/src/main/res/drawable/module_services_app_entrance_bkg.xml => mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml} (75%)
 create mode 100644 modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
 create mode 100644 modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml
 create mode 100644 modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml
 create mode 100644 modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml
 create mode 100644 modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml
 create mode 100644 modules/mogo-module-widgets/src/main/res/values/dimens.xml
 create mode 100644 modules/mogo-module-widgets/src/main/res/values/strings.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8978cebc20..35c192e3ba 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -52,6 +52,7 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-splash-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-tanlu" />
             <option value="$PROJECT_DIR$/modules/mogo-module-v2x" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-widgets" />
             <option value="$PROJECT_DIR$/services" />
             <option value="$PROJECT_DIR$/services/mogo-service" />
             <option value="$PROJECT_DIR$/services/mogo-service-api" />
diff --git a/app/build.gradle b/app/build.gradle
index daa2a53d52..ac5a0db6ae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -294,6 +294,7 @@ dependencies {
         implementation rootProject.ext.dependencies.moduletanluapi
 
         implementation rootProject.ext.dependencies.mogomonitor
+        implementation rootProject.ext.dependencies.mogomodulewidgets
     } else {
         launcherImplementation project(':main-extensions:mogo-module-main-launcher')
         independentImplementation project(':main-extensions:mogo-module-main-independent')
@@ -310,6 +311,7 @@ dependencies {
         }
         implementation project(':libraries:mogo-tanlu-api')
         implementation project(':modules:mogo-module-monitor')
+        implementation project(':modules:mogo-module-widgets')
     }
 
     apply from: "./functions/baseservices.gradle"
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 34312b7381..99cd7e7447 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -11,7 +11,6 @@ import com.bytedance.boost_multidex.BoostMultiDex;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.network.Utils;
-import com.mogo.commons.storage.SpStorage;
 import com.mogo.module.authorize.authprovider.invoke.AuthorizeConstant;
 import com.mogo.module.carchatting.card.CallChatConstant;
 import com.mogo.module.common.MogoModule;
@@ -22,6 +21,7 @@ import com.mogo.module.push.base.PushUIConstants;
 import com.mogo.module.service.ServiceConst;
 import com.mogo.module.tanlu.constant.TanluConstants;
 import com.mogo.module.v2x.V2XConst;
+import com.mogo.module.widgets.MogoWidgetsProvider;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.passport.IMogoTicketCallback;
@@ -58,14 +58,15 @@ public class MogoApplication extends AbsMogoApplication {
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) );
 
         //运营位卡片，需要默认显示，放在第一个加载
-        if (DebugConfig.isLauncher() ) {
+        if ( DebugConfig.isLauncher() ) {
             MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );
+        } else {
+            MogoModulePaths.addBaseModule( new MogoModule( MogoWidgetsProvider.PATH, MogoWidgetsProvider.NAME ) );
         }
-        if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD){
+        if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD ) {
             MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
         }
-        MogoModulePaths.addModule(new MogoModule(TanluApiConst.MODULE_PATH,
-                TanluApiConst.MODULE_NAME));
+        MogoModulePaths.addModule( new MogoModule( TanluApiConst.MODULE_PATH, TanluApiConst.MODULE_NAME ) );
         MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, TanluConstants.MODEL_NAME ) );
         MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) );
 
@@ -101,13 +102,13 @@ public class MogoApplication extends AbsMogoApplication {
     @Override
     protected void init() {
         super.init();
-        prepareBaseService(2_000L);
+        prepareBaseService( 2_000L );
     }
 
     /**
      * 基础服务：passport、location、socket
      */
-    private void prepareBaseService(long delay) {
+    private void prepareBaseService( long delay ) {
         UiThreadHandler.postDelayed( () -> {
             final IMogoServiceApis apis = ARouter.getInstance().navigation( IMogoServiceApis.class );
             // 第三方平台的sn是服务端生成的，所以必须在返回后才能开启
diff --git a/config.gradle b/config.gradle
index 254bff2d5f..6714fbfaaf 100644
--- a/config.gradle
+++ b/config.gradle
@@ -4,18 +4,18 @@ ext {
     android = [
 //            applicationId       : "com.mogo.launcher",
 //            zhidadoApplicationId: "com.zhidao.launcher",
-launcherApplicationId          : "com.mogo.launcher",
-independentApplicationId       : "com.mogo.launcher.app",
-fLauncherApplicationId         : "com.mogo.launcher.f",
-bydautoIndependentApplicationId: "com.mogo.launcher.app.bydauto",
-fLauncherAmapApiValue          : "aa2c8a0547378ead2f9a37762d9dd179",
-bydautoIndependentApiValue     : "b1e1d527b02a493913c50985827c943a",
-commonLauncherAmapApiValue     : "a36b9f7b086fa3951bb35338a5a06dd3",
-commonIndependentAmapApiValue  : "1c3fbc5f5e183619ffb1e7bc01e6751f",
-compileSdkVersion              : 28,
-buildToolsVersion              : "29.0.2",
-minSdkVersion                  : 19,
-targetSdkVersion               : 22,
+            launcherApplicationId          : "com.mogo.launcher",
+            independentApplicationId       : "com.mogo.launcher.app",
+            fLauncherApplicationId         : "com.mogo.launcher.f",
+            bydautoIndependentApplicationId: "com.mogo.launcher.app.bydauto",
+            fLauncherAmapApiValue          : "aa2c8a0547378ead2f9a37762d9dd179",
+            bydautoIndependentApiValue     : "b1e1d527b02a493913c50985827c943a",
+            commonLauncherAmapApiValue     : "a36b9f7b086fa3951bb35338a5a06dd3",
+            commonIndependentAmapApiValue  : "1c3fbc5f5e183619ffb1e7bc01e6751f",
+            compileSdkVersion              : 28,
+            buildToolsVersion              : "29.0.2",
+            minSdkVersion                  : 19,
+            targetSdkVersion               : 22,
     ]
 
     dependencies = [
@@ -194,5 +194,8 @@ targetSdkVersion               : 22,
             androidxroomruntime      : "androidx.room:room-runtime:2.2.3",
             androidxroomcompiler     : "androidx.room:room-compiler:2.2.3",
             androidxroomktx          : "androidx.room:room-ktx:2.2.3",
+
+            //
+            mogomodulewidgets          : "com.mogo.module:module-widgets:${MOGO_MODULE_WIDGETS_VERSION}",
     ]
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index f3910bfae4..90a79fcceb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -89,6 +89,8 @@ MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块
 MOGO_MODULE_LEFT_PANEL_VERSION = 1.2.1.10-SNAPSHOT
 MOGO_MODULE_LEFT_PANEL_NOOP_VERSION = 1.2.1.10-SNAPSHOT
+# 小控件
+MOGO_MODULE_WIDGETS_VERSION = 1.2.1.10-SNAPSHOT
 
 # Boost分包
 BOOST_MULTIDEX_VERSION=1.0.0
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index 1eb74077a3..9b2a255a28 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -32,7 +32,6 @@ import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.common.map.MapCenterPointStrategy;
 import com.mogo.module.common.map.Scene;
-import com.mogo.module.service.intent.AutoNaviIntentHandler;
 import com.mogo.module.service.intent.IntentHandlerFactory;
 import com.mogo.module.service.marker.MapMarkerManager;
 import com.mogo.module.service.network.RefreshCallback;
@@ -304,11 +303,9 @@ public class MogoServices implements IMogoMapListener,
                     restartAutoRefreshAtTime( 2_000L );
                 }
                 mIsMainPageFirstResume = false;
-                AutoNaviIntentHandler.getInstance().closeEntrance();
             } else {
                 unregisterInternalUnWakeupWords();
                 stopAutoRefreshStrategy();
-                AutoNaviIntentHandler.getInstance().syncAutoNaviForgroundStatus( mContext );
             }
         }
 
@@ -401,8 +398,6 @@ public class MogoServices implements IMogoMapListener,
             initLocationServiceProcess( context );
         }
 
-        AutoNaviIntentHandler.getInstance().syncAutoNaviForgroundStatus( mContext );
-
     }
 
     private void initLocationServiceProcess( Context context ) {
@@ -924,14 +919,4 @@ public class MogoServices implements IMogoMapListener,
             AIAssist.getInstance( mContext ).registerUnWakeupCommand( ServiceConst.CMD_BACK, ServiceConst.CMD_BACK_WORDS, this );
         }
     }
-
-    @Override
-    public void onStartNavi() {
-        AutoNaviIntentHandler.getInstance().preShowEntrance( mContext );
-    }
-
-    @Override
-    public void onStopNavi() {
-        AutoNaviIntentHandler.getInstance().closeEntrance();
-    }
 }
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/IntentHandlerFactory.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/IntentHandlerFactory.java
index c9887ac462..ea84b182e2 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/IntentHandlerFactory.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/IntentHandlerFactory.java
@@ -37,8 +37,6 @@ public class IntentHandlerFactory {
         mHandlers.put( MogoReceiver.ACTIION_ADAS, ADASStatusIntentHandler.getInstance() );
         mHandlers.put( MogoReceiver.ACTION_VOICE_READY, new AIAssistIntentHandler() );
         mHandlers.put( ServiceConst.COMMAND_BACK, WholeVoiceCommandIntentHandler.getInstance() );
-        mHandlers.put( MogoReceiver.ACTION_AUTO_NAVI_RECEIVER, AutoNaviIntentHandler.getInstance() );
-        mHandlers.put( MogoReceiver.ACTION_AUTO_NAVI_SEND, AutoNaviIntentHandler.getInstance() );
     }
 
     private static final class InstanceHolder {
diff --git a/modules/mogo-module-service/src/main/res/layout/module_service_app_entrance.xml b/modules/mogo-module-service/src/main/res/layout/module_service_app_entrance.xml
deleted file mode 100644
index 0c8bb8cadd..0000000000
--- a/modules/mogo-module-service/src/main/res/layout/module_service_app_entrance.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/module_service_app_entrance_root"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/module_services_app_entrance_bkg"
-    android:orientation="vertical">
-
-    <TextView
-        android:layout_width="@dimen/module_service_app_entrance_size"
-        android:layout_height="@dimen/module_service_app_entrance_size"
-        android:gravity="center"
-        android:text="@string/module_service_app_entrance_text"
-        android:textColor="#FFFFFF"
-        android:textSize="@dimen/module_service_app_entrance_textSize" />
-</LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
index 871507f1ab..fd1066746d 100644
--- a/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-ldpi/dimens.xml
@@ -22,12 +22,4 @@
     <dimen name="module_service_content_minWidth">64px</dimen>
     <dimen name="module_service_id_marker_content_paddingRight">6.5px</dimen>
     <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">10px</dimen>
-    <dimen name="module_service_app_entrance_textSize">20px</dimen>
-    <dimen name="module_service_app_entrance_padding">15px</dimen>
-    <dimen name="module_services_app_entrance_corner_size">2px</dimen>
-    <dimen name="module_services_app_entrance_y">112px</dimen>
-    <dimen name="module_services_app_entrance_x">929px</dimen>
-    <dimen name="module_service_app_entrance_paddingTop">10px</dimen>
-    <dimen name="module_service_app_entrance_paddingLeft">15px</dimen>
-    <dimen name="module_service_app_entrance_size">71px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
index 871507f1ab..fd1066746d 100644
--- a/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-mdpi/dimens.xml
@@ -22,12 +22,4 @@
     <dimen name="module_service_content_minWidth">64px</dimen>
     <dimen name="module_service_id_marker_content_paddingRight">6.5px</dimen>
     <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">10px</dimen>
-    <dimen name="module_service_app_entrance_textSize">20px</dimen>
-    <dimen name="module_service_app_entrance_padding">15px</dimen>
-    <dimen name="module_services_app_entrance_corner_size">2px</dimen>
-    <dimen name="module_services_app_entrance_y">112px</dimen>
-    <dimen name="module_services_app_entrance_x">929px</dimen>
-    <dimen name="module_service_app_entrance_paddingTop">10px</dimen>
-    <dimen name="module_service_app_entrance_paddingLeft">15px</dimen>
-    <dimen name="module_service_app_entrance_size">71px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
index 1e58e34c84..341706179d 100644
--- a/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -22,12 +22,4 @@
     <dimen name="module_service_tag_textSize">20px</dimen>
     <dimen name="module_service_content_minWidth">120px</dimen>
     <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
-    <dimen name="module_service_app_entrance_textSize">40px</dimen>
-    <dimen name="module_service_app_entrance_padding">30px</dimen>
-    <dimen name="module_services_app_entrance_corner_size">4px</dimen>
-    <dimen name="module_services_app_entrance_y">48px</dimen>
-    <dimen name="module_services_app_entrance_x">1000px</dimen>
-    <dimen name="module_service_app_entrance_paddingTop">10px</dimen>
-    <dimen name="module_service_app_entrance_paddingLeft">15px</dimen>
-    <dimen name="module_service_app_entrance_size">71px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
index 1e58e34c84..341706179d 100644
--- a/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml
@@ -22,12 +22,4 @@
     <dimen name="module_service_tag_textSize">20px</dimen>
     <dimen name="module_service_content_minWidth">120px</dimen>
     <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
-    <dimen name="module_service_app_entrance_textSize">40px</dimen>
-    <dimen name="module_service_app_entrance_padding">30px</dimen>
-    <dimen name="module_services_app_entrance_corner_size">4px</dimen>
-    <dimen name="module_services_app_entrance_y">48px</dimen>
-    <dimen name="module_services_app_entrance_x">1000px</dimen>
-    <dimen name="module_service_app_entrance_paddingTop">10px</dimen>
-    <dimen name="module_service_app_entrance_paddingLeft">15px</dimen>
-    <dimen name="module_service_app_entrance_size">71px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/res/values/dimens.xml b/modules/mogo-module-service/src/main/res/values/dimens.xml
index 1e58e34c84..341706179d 100644
--- a/modules/mogo-module-service/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-service/src/main/res/values/dimens.xml
@@ -22,12 +22,4 @@
     <dimen name="module_service_tag_textSize">20px</dimen>
     <dimen name="module_service_content_minWidth">120px</dimen>
     <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
-    <dimen name="module_service_app_entrance_textSize">40px</dimen>
-    <dimen name="module_service_app_entrance_padding">30px</dimen>
-    <dimen name="module_services_app_entrance_corner_size">4px</dimen>
-    <dimen name="module_services_app_entrance_y">48px</dimen>
-    <dimen name="module_services_app_entrance_x">1000px</dimen>
-    <dimen name="module_service_app_entrance_paddingTop">10px</dimen>
-    <dimen name="module_service_app_entrance_paddingLeft">15px</dimen>
-    <dimen name="module_service_app_entrance_size">71px</dimen>
 </resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/.gitignore b/modules/mogo-module-widgets/.gitignore
new file mode 100644
index 0000000000..42afabfd2a
--- /dev/null
+++ b/modules/mogo-module-widgets/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/README.md b/modules/mogo-module-widgets/README.md
new file mode 100644
index 0000000000..837a8c3cec
--- /dev/null
+++ b/modules/mogo-module-widgets/README.md
@@ -0,0 +1,3 @@
+# 项目介绍
+
+一些独立于其他业务的悬浮小控件
diff --git a/modules/mogo-module-widgets/build.gradle b/modules/mogo-module-widgets/build.gradle
new file mode 100644
index 0000000000..59e1db7c2e
--- /dev/null
+++ b/modules/mogo-module-widgets/build.gradle
@@ -0,0 +1,70 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.android.library'
+apply plugin: 'com.alibaba.arouter'
+
+android {
+    compileSdkVersion rootProject.ext.android.compileSdkVersion
+    // buildToolsVersion rootProject.ext.android.buildToolsVersion
+    defaultConfig {
+        minSdkVersion rootProject.ext.android.minSdkVersion
+        targetSdkVersion rootProject.ext.android.targetSdkVersion
+        versionCode Integer.valueOf(VERSION_CODE)
+        versionName getValueFromRootProperties("${project.name.replace("-", "_").toUpperCase()}_VERSION")
+
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [AROUTER_MODULE_NAME: project.getName()]
+            }
+        }
+    }
+
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation rootProject.ext.dependencies.androidxappcompat
+    implementation rootProject.ext.dependencies.androidxconstraintlayout
+    implementation rootProject.ext.dependencies.arouter
+    annotationProcessor rootProject.ext.dependencies.aroutercompiler
+    implementation rootProject.ext.dependencies.rxjava
+    implementation rootProject.ext.dependencies.rxandroid
+    implementation rootProject.ext.dependencies.carcallprovider
+
+    if (Boolean.valueOf(RELEASE)) {
+        api rootProject.ext.dependencies.mogomap
+        api rootProject.ext.dependencies.mogomapapi
+        api rootProject.ext.dependencies.mogoutils
+        api rootProject.ext.dependencies.mogocommons
+        api rootProject.ext.dependencies.mogoserviceapi
+        implementation rootProject.ext.dependencies.modulecommon
+        implementation rootProject.ext.dependencies.gpssimulator
+    } else {
+        api project(":libraries:mogo-map")
+        api project(":libraries:mogo-map-api")
+        api project(":foudations:mogo-utils")
+        api project(":foudations:mogo-commons")
+        api project(':services:mogo-service-api')
+        implementation project(':modules:mogo-module-common')
+        implementation project(':modules:mogo-module-gps-simulator')
+    }
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
diff --git a/modules/mogo-module-widgets/consumer-rules.pro b/modules/mogo-module-widgets/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/mogo-module-widgets/gradle.properties b/modules/mogo-module-widgets/gradle.properties
new file mode 100644
index 0000000000..0d62fa48dd
--- /dev/null
+++ b/modules/mogo-module-widgets/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.module
+POM_ARTIFACT_ID=module-widgets
+VERSION_CODE=1
diff --git a/modules/mogo-module-widgets/proguard-rules.pro b/modules/mogo-module-widgets/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/modules/mogo-module-widgets/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/AndroidManifest.xml b/modules/mogo-module-widgets/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..fb0d21444c
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest package="com.mogo.module.widgets">
+
+
+</manifest>
\ No newline at end of file
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AutoNaviIntentHandler.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java
similarity index 85%
rename from modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AutoNaviIntentHandler.java
rename to modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java
index 67be36f424..3773c41930 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/AutoNaviIntentHandler.java
+++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/AutoNaviIntentHandler.java
@@ -1,4 +1,4 @@
-package com.mogo.module.service.intent;
+package com.mogo.module.widgets;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,8 +8,6 @@ import android.view.WindowManager;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.wm.WindowManagerView;
-import com.mogo.module.service.MarkerServiceHandler;
-import com.mogo.module.service.R;
 import com.mogo.utils.LaunchUtils;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.logger.Logger;
@@ -21,7 +19,7 @@ public
  * <p>
  * 描述
  */
-class AutoNaviIntentHandler implements IntentHandler {
+class AutoNaviIntentHandler {
 
     private static final String TAG = "AutoNaviIntentHandler";
 
@@ -47,16 +45,11 @@ class AutoNaviIntentHandler implements IntentHandler {
         sInstance = null;
     }
 
-    @Override
     public void handle( Context context, Intent intent ) {
         int keyType = intent.getIntExtra( "KEY_TYPE", 0 );
         switch ( keyType ) {
             case 10021:
                 closeEntrance();
-                MarkerServiceHandler.getADASController().showADAS();
-                break;
-            case 20009:
-                MarkerServiceHandler.getADASController().closeADAS();
                 break;
             case 10019:
                 int extraState = intent.getIntExtra( "EXTRA_STATE", -1 );
@@ -90,15 +83,15 @@ class AutoNaviIntentHandler implements IntentHandler {
     private void showEntrance( Context context ) {
         if ( mWindowManagerView == null ) {
             mWindowManagerView = new WindowManagerView.Builder( AbsMogoApplication.getApp() )
-                    .contentView( R.layout.module_service_app_entrance )
+                    .contentView( R.layout.module_widgets_app_entrance )
                     .size( WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT )
                     .gravity( Gravity.LEFT | Gravity.TOP )
-                    .position( ResourcesHelper.getDimensionPixelSize( context, R.dimen.module_services_app_entrance_x ), ResourcesHelper.getDimensionPixelSize( AbsMogoApplication.getApp(), R.dimen.module_services_app_entrance_y ) )
+                    .position( ResourcesHelper.getDimensionPixelSize( context, R.dimen.module_widgets_app_entrance_x ), ResourcesHelper.getDimensionPixelSize( AbsMogoApplication.getApp(), R.dimen.module_widgets_app_entrance_y ) )
                     .showInWindowManager();
             mWindowManagerView.attachTouchEvent( view -> {
                 try {
                     if ( DebugConfig.isLauncher() ) {
-                        MarkerServiceHandler.getLauncher().backToLauncher( context );
+                        MogoWidgetManger.getInstance().getApis().getLauncherApi().backToLauncher( context );
                     } else {
                         LaunchUtils.launchByPkg( context, "com.mogo.launcher.app" );
                     }
diff --git a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetManger.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetManger.java
new file mode 100644
index 0000000000..289c0a30ca
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetManger.java
@@ -0,0 +1,108 @@
+package com.mogo.module.widgets;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.mogo.map.navi.IMogoNaviListener2;
+import com.mogo.service.IMogoServiceApis;
+import com.mogo.service.intent.IMogoIntentListener;
+import com.mogo.service.statusmanager.IMogoStatusChangedListener;
+import com.mogo.service.statusmanager.StatusDescriptor;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/8/12
+ *
+ * 描述
+ */
+class MogoWidgetManger implements IMogoNaviListener2, IMogoIntentListener, IMogoStatusChangedListener {
+
+    // 接受其他app发给高德的广播
+    public static final String ACTION_AUTO_NAVI_RECEIVER = "AUTONAVI_STANDARD_BROADCAST_RECV";
+    // 接受高德发过来的广播
+    public static final String ACTION_AUTO_NAVI_SEND = "AUTONAVI_STANDARD_BROADCAST_SEND";
+
+    private static final String TAG = "MogoWidgetManger";
+
+    private static volatile MogoWidgetManger sInstance;
+
+    private MogoWidgetManger() {
+    }
+
+    public static MogoWidgetManger getInstance() {
+        if ( sInstance == null ) {
+            synchronized ( MogoWidgetManger.class ) {
+                if ( sInstance == null ) {
+                    sInstance = new MogoWidgetManger();
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    public synchronized void release() {
+        sInstance = null;
+    }
+
+    private Object readResolve() {
+        // 阻止反序列化，必须实现 Serializable 接口
+        return sInstance;
+    }
+
+    private IMogoServiceApis mApis;
+    private Context mContext;
+
+    public IMogoServiceApis getApis() {
+        return mApis;
+    }
+
+    public void init( Context context ) {
+        mContext = context;
+        mApis = ARouter.getInstance().navigation( IMogoServiceApis.class );
+        initMapStatusListener();
+        initStatusListener();
+        initIntentListener();
+        AutoNaviIntentHandler.getInstance().syncAutoNaviForgroundStatus( mContext );
+    }
+
+    private void initMapStatusListener() {
+        mApis.getRegisterCenterApi().registerMogoNaviListener( TAG, this );
+    }
+
+    private void initIntentListener() {
+        mApis.getIntentManagerApi().registerIntentListener( ACTION_AUTO_NAVI_RECEIVER, this );
+        mApis.getIntentManagerApi().registerIntentListener( ACTION_AUTO_NAVI_SEND, this );
+    }
+
+    private void initStatusListener() {
+        mApis.getStatusManagerApi().registerStatusChangedListener( TAG, StatusDescriptor.MAIN_PAGE_RESUME, this );
+    }
+
+    @Override
+    public void onStopNavi() {
+        AutoNaviIntentHandler.getInstance().closeEntrance();
+    }
+
+    @Override
+    public void onStartNavi() {
+        AutoNaviIntentHandler.getInstance().preShowEntrance( mContext );
+    }
+
+    @Override
+    public void onIntentReceived( String intentStr, Intent intent ) {
+        AutoNaviIntentHandler.getInstance().handle( mContext, intent );
+    }
+
+    @Override
+    public void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) {
+        if ( descriptor == StatusDescriptor.MAIN_PAGE_RESUME ) {
+            if ( isTrue ) {
+                AutoNaviIntentHandler.getInstance().closeEntrance();
+            } else {
+                AutoNaviIntentHandler.getInstance().syncAutoNaviForgroundStatus( mContext );
+            }
+        }
+    }
+}
diff --git a/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetsProvider.java b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetsProvider.java
new file mode 100644
index 0000000000..6cc91544a3
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/java/com/mogo/module/widgets/MogoWidgetsProvider.java
@@ -0,0 +1,99 @@
+package com.mogo.module.widgets;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.mogo.map.listener.IMogoMapListener;
+import com.mogo.map.location.IMogoLocationListener;
+import com.mogo.map.marker.IMogoMarkerClickListener;
+import com.mogo.map.navi.IMogoNaviListener;
+import com.mogo.service.module.IMogoModuleLifecycle;
+import com.mogo.service.module.IMogoModuleProvider;
+import com.mogo.service.module.ModuleType;
+import com.mogo.utils.UiThreadHandler;
+import com.mogo.utils.logger.Logger;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/8/12
+ *
+ * 描述
+ */
+@Route( path = MogoWidgetsProvider.PATH )
+class MogoWidgetsProvider implements IMogoModuleProvider {
+
+    private static final String TAG = "MogoWidgetsProvider";
+
+    public static final String PATH = "/widgets/provider";
+    public static final String NAME = "MogoWidgetProvider";
+
+    @Override
+    public Fragment createFragment( Context context, Bundle data ) {
+        return null;
+    }
+
+    @Override
+    public View createView( Context context ) {
+        return null;
+    }
+
+    @NonNull
+    @Override
+    public String getModuleName() {
+        return null;
+    }
+
+    @Override
+    public IMogoModuleLifecycle getCardLifecycle() {
+        return null;
+    }
+
+    @Override
+    public IMogoMapListener getMapListener() {
+        return null;
+    }
+
+    @Override
+    public int getType() {
+        return ModuleType.TYPE_SERVICE;
+    }
+
+    @Override
+    public IMogoNaviListener getNaviListener() {
+        return null;
+    }
+
+    @Override
+    public IMogoLocationListener getLocationListener() {
+        return null;
+    }
+
+    @Override
+    public IMogoMarkerClickListener getMarkerClickListener() {
+        return null;
+    }
+
+    @Override
+    public String getAppPackage() {
+        return null;
+    }
+
+    @Override
+    public String getAppName() {
+        return null;
+    }
+
+    @Override
+    public void init( Context context ) {
+        Logger.d( TAG, "init." );
+        UiThreadHandler.postDelayed( () -> {
+            MogoWidgetManger.getInstance().init( context );
+        }, 5500 );
+    }
+}
diff --git a/modules/mogo-module-service/src/main/res/drawable/module_services_app_entrance_bkg.xml b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml
similarity index 75%
rename from modules/mogo-module-service/src/main/res/drawable/module_services_app_entrance_bkg.xml
rename to modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml
index 31b2c574f5..b46cff52de 100644
--- a/modules/mogo-module-service/src/main/res/drawable/module_services_app_entrance_bkg.xml
+++ b/modules/mogo-module-widgets/src/main/res/drawable/module_widgets_app_entrance_bkg.xml
@@ -3,7 +3,7 @@
     <item>
         <shape>
             <gradient android:angle="180" android:endColor="#5CC1FF" android:startColor="#256BFF" />
-            <corners android:radius="@dimen/module_services_app_entrance_corner_size" />
+            <corners android:radius="@dimen/module_widgets_app_entrance_corner_size" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
new file mode 100644
index 0000000000..cacbb2a8e2
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/layout/module_widgets_app_entrance.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/module_widgets_app_entrance_root"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/module_widgets_app_entrance_bkg"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="@dimen/module_widgets_app_entrance_size"
+        android:layout_height="@dimen/module_widgets_app_entrance_size"
+        android:gravity="center"
+        android:text="@string/module_widgets_app_entrance_text"
+        android:textColor="#FFFFFF"
+        android:textSize="@dimen/module_widgets_app_entrance_textSize" />
+</LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml
new file mode 100644
index 0000000000..3aa8cdc5a8
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values-ldpi/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_widgets_app_entrance_textSize">20px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">15px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">2px</dimen>
+    <dimen name="module_widgets_app_entrance_y">112px</dimen>
+    <dimen name="module_widgets_app_entrance_x">929px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingTop">10px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingLeft">15px</dimen>
+    <dimen name="module_widgets_app_entrance_size">71px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml
new file mode 100644
index 0000000000..3aa8cdc5a8
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values-mdpi/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_widgets_app_entrance_textSize">20px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">15px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">2px</dimen>
+    <dimen name="module_widgets_app_entrance_y">112px</dimen>
+    <dimen name="module_widgets_app_entrance_x">929px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingTop">10px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingLeft">15px</dimen>
+    <dimen name="module_widgets_app_entrance_size">71px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml
new file mode 100644
index 0000000000..e4fc6151e3
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values-xhdpi-1920x1000/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_widgets_app_entrance_textSize">40px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">30px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">4px</dimen>
+    <dimen name="module_widgets_app_entrance_y">48px</dimen>
+    <dimen name="module_widgets_app_entrance_x">1000px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingTop">10px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingLeft">15px</dimen>
+    <dimen name="module_widgets_app_entrance_size">71px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml
new file mode 100644
index 0000000000..e4fc6151e3
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values-xhdpi/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_widgets_app_entrance_textSize">40px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">30px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">4px</dimen>
+    <dimen name="module_widgets_app_entrance_y">48px</dimen>
+    <dimen name="module_widgets_app_entrance_x">1000px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingTop">10px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingLeft">15px</dimen>
+    <dimen name="module_widgets_app_entrance_size">71px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values/dimens.xml b/modules/mogo-module-widgets/src/main/res/values/dimens.xml
new file mode 100644
index 0000000000..e4fc6151e3
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_widgets_app_entrance_textSize">40px</dimen>
+    <dimen name="module_widgets_app_entrance_padding">30px</dimen>
+    <dimen name="module_widgets_app_entrance_corner_size">4px</dimen>
+    <dimen name="module_widgets_app_entrance_y">48px</dimen>
+    <dimen name="module_widgets_app_entrance_x">1000px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingTop">10px</dimen>
+    <dimen name="module_widgets_app_entrance_paddingLeft">15px</dimen>
+    <dimen name="module_widgets_app_entrance_size">71px</dimen>
+</resources>
\ No newline at end of file
diff --git a/modules/mogo-module-widgets/src/main/res/values/strings.xml b/modules/mogo-module-widgets/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..717eefe1fe
--- /dev/null
+++ b/modules/mogo-module-widgets/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<resources>
+    <string name="app_name">mogo-module-service</string>
+    <string name="module_widgets_app_entrance_text">辅助\n驾驶</string>
+</resources>
diff --git a/settings.gradle b/settings.gradle
index a84145fbe0..de58f441e0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
+include ':modules:mogo-module-widgets'
 include ':modules:mogo-module-monitor'
 include ':libraries:mogo-tanlu-api'
 include ':foudations:mogo-base-services-apk'