From 1134e79371100994389f392e7c2f9105a678b783 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Fri, 31 Jul 2020 19:52:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E6=97=A5=E5=BF=97=E6=8A=93?=
 =?UTF-8?q?=E5=8F=96sdk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                            | 3 +++
 .idea/misc.xml                                              | 2 +-
 app/build.gradle                                            | 1 +
 app/src/main/java/com/mogo/launcher/MogoApplication.java    | 1 +
 config.gradle                                               | 2 ++
 gradle.properties                                           | 3 +++
 .../src/main/java/com/mogo/service/MogoServicePaths.java    | 6 ++++++
 7 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index db9382e9a6..5ecdf77031 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -41,6 +41,9 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-map" />
             <option value="$PROJECT_DIR$/modules/mogo-module-media" />
             <option value="$PROJECT_DIR$/modules/mogo-module-obu" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-push" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-push-base" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-push-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-search" />
             <option value="$PROJECT_DIR$/modules/mogo-module-service" />
             <option value="$PROJECT_DIR$/modules/mogo-module-share" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index ba41a5d30d..aac18fc73d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -259,6 +259,7 @@ dependencies {
     implementation rootProject.ext.dependencies.moduletanlu, {
         exclude group: 'com.mogo.module', module: 'module-share'
     }
+    implementation rootProject.ext.dependencies.mogologlib
 
     if (Boolean.valueOf(RELEASE)) {
         launcherImplementation rootProject.ext.dependencies.modulemainlauncher
diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java
index a067f4bf8e..d37549c3ee 100644
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -73,6 +73,7 @@ public class MogoApplication extends AbsMogoApplication {
         MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) );
         MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI ) );
         MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) );
+        MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_LOG_LIB, "LogLib"));
 
         if ( !DebugConfig.isLauncher() ) {
             PersistentManager.getInstance().initManager( this );
diff --git a/config.gradle b/config.gradle
index e4e542a469..e5a0c4e313 100644
--- a/config.gradle
+++ b/config.gradle
@@ -172,6 +172,8 @@ targetSdkVersion        : 22,
             // 基础服务实现
             mogobaseservicesdk       : "com.mogo.base:services-sdk:${MOGO_BASE_SERVICES_SDK_VERSION}",
             mogobaseserviceapk       : "com.mogo.base:services-apk:${MOGO_BASE_SERVICES_APK_VERSION}",
+            // loglib
+            mogologlib               : "com.mogo.module:module-loglib:${LOGLIB_VERSION}",
 
             // google
             googlezxing              : "com.google.zxing:core:3.3.3",
diff --git a/gradle.properties b/gradle.properties
index c6d8783b95..2ef5c30918 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -100,6 +100,9 @@ MOGO_MODULE_OBU_VERSION = 1.2.1.10-SNAPSHOT
 MOGO_MODULE_SPLASH_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_SPLASH_NOOP_VERSION = 1.0.0-SNAPSHOT
 
+# loglib
+LOGLIB_VERSION = 1.0.0-SNAPSHOT
+
 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
 applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
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 6f90c84d79..3d0c6ad1fc 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
@@ -226,4 +226,10 @@ public class MogoServicePaths {
      */
     @Deprecated
     public static final String  PATH_AGREEMENT = "/agreement/showFragment";
+
+    /**
+     * 日志上传
+     */
+    @Deprecated
+    public static final String PATH_LOG_LIB = "/loglib/api";
 }