From adddde3db3b386b6fdc99716077d9bcca62019c3 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Fri, 18 Sep 2020 16:13:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E4=BE=9D=E8=B5=96=E6=82=AC?=
 =?UTF-8?q?=E6=B5=AE=E6=8E=A7=E4=BB=B6=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                         | 3 +--
 app/functions/widgets.gradle                             | 9 +++++++++
 app/src/main/java/com/mogo/launcher/MogoApplication.java | 3 +--
 .../src/main/java/com/mogo/service/MogoServicePaths.java | 5 +++++
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 app/functions/widgets.gradle

diff --git a/app/build.gradle b/app/build.gradle
index 33615bd328..fe41377686 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -340,7 +340,6 @@ dependencies {
         }
         implementation rootProject.ext.dependencies.moduletanluapi
         implementation rootProject.ext.dependencies.mogomonitor
-        implementation rootProject.ext.dependencies.mogomodulewidgets
         implementation rootProject.ext.dependencies.mogomoduleback
         implementation rootProject.ext.dependencies.guideshow
     } else {
@@ -357,7 +356,6 @@ dependencies {
         }
         implementation project(':libraries:mogo-tanlu-api')
         implementation project(':modules:mogo-module-monitor')
-        implementation project(':modules:mogo-module-widgets')
         implementation project(':modules:mogo-module-back')
         implementation project(':modules:mogo-module-guide')
     }
@@ -369,6 +367,7 @@ dependencies {
     apply from: "./functions/leftpanel.gradle"
     apply from: "./functions/skin.gradle"
     apply from: "./functions/crashreport.gradle"
+    apply from: "./functions/widgets.gradle"
 }
 
 android.applicationVariants.all { variant ->
diff --git a/app/functions/widgets.gradle b/app/functions/widgets.gradle
new file mode 100644
index 0000000000..cc816fc4c2
--- /dev/null
+++ b/app/functions/widgets.gradle
@@ -0,0 +1,9 @@
+// 悬浮控件：独立 app 和 launcher
+
+project.dependencies {
+    if (Boolean.valueOf(RELEASE)) {
+        independentImplementation rootProject.ext.dependencies.mogomodulewidgets
+    } else {
+        independentImplementation project(':modules:mogo-module-widgets')
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 656fef5fb5..f7ff196ea7 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -22,7 +22,6 @@ 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;
@@ -75,7 +74,7 @@ public class MogoApplication extends AbsMogoApplication {
             MogoModulePaths.addModule( new MogoModule( BackToLauncherConst.MODULE_PATH, BackToLauncherConst.MODULE_NAME ) );
             MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );
         } else {
-            MogoModulePaths.addBaseModule( new MogoModule( MogoWidgetsProvider.PATH, MogoWidgetsProvider.NAME ) );
+            MogoModulePaths.addBaseModule( new MogoModule( MogoServicePaths.PATH_WIDGETS, MogoServicePaths.PATH_WIDGETS ) );
         }
         if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD ) {
             MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
index eb5523443f..71b5fae096 100644
--- a/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
+++ b/services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
@@ -250,4 +250,9 @@ public class MogoServicePaths {
      */
     @Deprecated
     public static final String PATH_TANLU_UI_API = "/tanlu/ui";
+
+    /**
+     * 悬浮小控件
+     */
+    public static final String PATH_WIDGETS = "/widgets/provider";
 }