From 53b8ea402dacb38fe9758aec812e8e55daaf6ac5 Mon Sep 17 00:00:00 2001
From: yileizhao <yileizhao@zhidaoauto.com>
Date: Mon, 13 Jan 2020 18:05:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0push=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  5 +++++
 .../com/mogo/launcher/MogoApplication.java    | 22 ++++++++++---------
 config.gradle                                 |  3 +++
 gradle.properties                             |  2 ++
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d12ced771a..de2af7923d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,6 +67,11 @@ dependencies {
     implementation rootProject.ext.dependencies.carcallprovider
     implementation rootProject.ext.dependencies.carcall
     implementation rootProject.ext.dependencies.modulemedia
+
+    implementation rootProject.ext.dependencies.modulepush,{
+        exclude group:'com.mogo.module',module:'module-common'
+    }
+
     implementation rootProject.ext.dependencies.moduleonlinecar
 
     if (Boolean.valueOf(RELEASE)) {
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index 4560907154..b56ca52c47 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -12,6 +12,7 @@ import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
 import com.mogo.module.media.MediaConstants;
 import com.mogo.module.onlinecar.OnLineCarConstants;
+import com.mogo.module.push.PushUIConstants;
 import com.mogo.module.tanlu.constant.TanluConstants;
 import com.mogo.service.MogoServicePaths;
 import com.mogo.service.connection.IMogoSocketManager;
@@ -29,23 +30,24 @@ public class MogoApplication extends AbsMogoApplication {
         super.onCreate();
 //        MogoModulePaths.addModule( new MogoModule( DemoConstants.TAG, "CARD_DEMO" ) );
 //        MogoModulePaths.addModule( new MogoModule( Demo2Constants.TAG, "CARD_DEMO2" ) );
-        DebugConfig.setNetMode( DebugConfig.NET_MODE_QA );
-        MogoModulePaths.addModule( new MogoModule( OnLineCarConstants.TAG, OnLineCarConstants.MODULE_NAME ) );
-        MogoModulePaths.addModule( new MogoModule( TanluConstants.TAG, "CARD_TYPE_ROAD_CONDITION" ) );
-        MogoModulePaths.addModule( new MogoModule( CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME ) );
-        MogoModulePaths.addModule( new MogoModule( MediaConstants.TAG, MediaConstants.MODULE_TYPE ) );
+        DebugConfig.setNetMode(DebugConfig.NET_MODE_QA);
+        MogoModulePaths.addModule(new MogoModule(OnLineCarConstants.TAG, OnLineCarConstants.MODULE_NAME));
+        MogoModulePaths.addModule(new MogoModule(TanluConstants.TAG, "CARD_TYPE_ROAD_CONDITION"));
+        MogoModulePaths.addModule(new MogoModule(CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME));
+        MogoModulePaths.addModule(new MogoModule(MediaConstants.TAG, MediaConstants.MODULE_TYPE));
+        MogoModulePaths.addModule(new MogoModule(PushUIConstants.TAG, PushUIConstants.TAG));
     }
 
     @Override
     protected void init() {
         super.init();
-        IMogoSocketManager mMogoSocketManager = ( IMogoSocketManager ) ARouter.getInstance().build( MogoServicePaths.PATH_SOCKET_MANAGER ).navigation();
-        mMogoSocketManager.init( getApplicationContext(), BuildConfig.APPLICATION_ID );
+        IMogoSocketManager mMogoSocketManager = (IMogoSocketManager) ARouter.getInstance().build(MogoServicePaths.PATH_SOCKET_MANAGER).navigation();
+        mMogoSocketManager.init(getApplicationContext(), BuildConfig.APPLICATION_ID);
     }
 
     @Override
-    protected void attachBaseContext( Context base ) {
-        super.attachBaseContext( base );
-        MultiDex.install( base );
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(base);
     }
 }
diff --git a/config.gradle b/config.gradle
index 46b9fc53fc..c4c2ab4f8c 100644
--- a/config.gradle
+++ b/config.gradle
@@ -112,5 +112,8 @@ ext {
 
             // 统一登录
             accountsdk               : "com.zhidao.accountservice:account-sdk:1.0.4",
+
+            modulepush              : "com.mogo.module:module-push:${MOGO_MODULE_PUSH_VERSION}",
+
     ]
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index c2bc11e8c9..0fc019f84b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -49,4 +49,6 @@ CARCHATTING_VERSION=1.0.0-SNAPSHOT
 CARCHATTINGPROVIDER_VERSION=1.0.0-SNAPSHOT
 MOGO_MODULE_ONLINECAR_VERSION=1.0.0-SNAPSHOT
 MOGO_MODULE_MEDIA_VERSION=1.0.0-SNAPSHOT
+MOGO_MODULE_PUSH_VERSION=1.0.0-SNAPSHOT
+