顺义分支和dev分支合并

2020-08-19 14:54:15 +08:00
parent 6263daf31a 7727011de1
commit 806d95a93b
1564 changed files with 61672 additions and 2947 deletions
--- a/.idea/dictionaries/admin.xml
+++ b/.idea/dictionaries/admin.xml
@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="admin" />
+</component>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -14,14 +14,17 @@
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
            <option value="$PROJECT_DIR$/foudations" />
+            <option value="$PROJECT_DIR$/foudations/mogo-base-services-apk" />
+            <option value="$PROJECT_DIR$/foudations/mogo-base-services-sdk" />
            <option value="$PROJECT_DIR$/foudations/mogo-commons" />
-            <option value="$PROJECT_DIR$/foudations/mogo-connection" />
            <option value="$PROJECT_DIR$/foudations/mogo-utils" />
            <option value="$PROJECT_DIR$/libraries" />
            <option value="$PROJECT_DIR$/libraries/map-amap" />
            <option value="$PROJECT_DIR$/libraries/map-autonavi" />
            <option value="$PROJECT_DIR$/libraries/mogo-map" />
            <option value="$PROJECT_DIR$/libraries/mogo-map-api" />
+            <option value="$PROJECT_DIR$/libraries/mogo-tanlu-api" />
+            <option value="$PROJECT_DIR$/libraries/tanlulib" />
            <option value="$PROJECT_DIR$/main-extensions" />
            <option value="$PROJECT_DIR$/main-extensions/mogo-module-main-independent" />
            <option value="$PROJECT_DIR$/main-extensions/mogo-module-main-launcher" />
@@ -34,14 +37,24 @@
            <option value="$PROJECT_DIR$/modules/mogo-module-gps-simulator" />
            <option value="$PROJECT_DIR$/modules/mogo-module-gps-simulator-debug" />
            <option value="$PROJECT_DIR$/modules/mogo-module-gps-simulator-noop" />
-            <option value="$PROJECT_DIR$/modules/mogo-module-guide" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-left-panel" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-left-panel-noop" />
            <option value="$PROJECT_DIR$/modules/mogo-module-main" />
            <option value="$PROJECT_DIR$/modules/mogo-module-map" />
            <option value="$PROJECT_DIR$/modules/mogo-module-media" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-monitor" />
            <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" />
+            <option value="$PROJECT_DIR$/modules/mogo-module-splash" />
+            <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" />
--- 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="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
 </project>
--- a/app/README.md
+++ b/app/README.md
@@ -0,0 +1,35 @@
+# APP 壳
+
+## 加载模块
+
+## 初始化部分服务
+
+## 定义 flavor
+
+### basic 维度
+
+产品形态：区别 applicationId，定义服务加载
+
+1. independent：独立app，作为普通 app 运行在系统
+2. launcher：作为 launcher 运行在系统
+
+### product 维度
+
+产品线，各个产品线引入不同服务，实现不同服务内容
+
+1. f8xx: 分体机 - launcher
+2. e8xx: E系列m4(2+32) - launcher
+3. em4: E系列m4(2+32) - launcher
+4. em3: E系列m3(2+32) - independent
+5. em1: E系列m1(1+16) - independent
+6. d8xx: D系列(2+32) - independent
+7. d82x: D系列(1+16) - independent
+8. byd: 比亚迪应用市场 - independent
+
+### env 维度
+
+1. online: 线上环境
+2. qa: 测试环境
+3. demo: 演示环境（大部分时候都是测试环境）
+
+## 区分 flavor 功能引入
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,11 +2,9 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.alibaba.arouter'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-import java.text.SimpleDateFormat

 android {
    compileSdkVersion rootProject.ext.android.compileSdkVersion
-    // buildToolsVersion rootProject.ext.android.buildToolsVersion
    defaultConfig {
        minSdkVersion rootProject.ext.android.minSdkVersion
        targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -25,7 +23,7 @@ android {
        externalNativeBuild {
            ndk {
                // 设置支持的SO库架构
-                abiFilters 'armeabi-v7a','x86'
+                abiFilters "armeabi-v7a"
            }
        }
    }
@@ -39,11 +37,14 @@ android {
    }
    buildTypes {
        debug {
-            signingConfig signingConfigs.release
            debuggable = true
+            minifyEnabled false
+            signingConfig signingConfigs.release
        }
        release {
            minifyEnabled false
+            zipAlignEnabled false
+            shrinkResources false
            signingConfig signingConfigs.release
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
@@ -66,53 +67,146 @@ android {
        e8xx {
            manifest.srcFile 'src/e8xx/AndroidManifest.xml'
        }
+        em4 {
+            manifest.srcFile 'src/em4/AndroidManifest.xml'
+        }
+        f8xxLauncherOnlineRelease {
+            manifest.srcFile 'src/f8xxLauncherOnlineRelease/AndroidManifest.xml'
+        }
    }

    flavorDimensions "product", "basic", "env"

    productFlavors {
        //独立app
-        independent{
+        independent {
            dimension "basic"
-            applicationId rootProject.ext.android.independentApplicationId
            // 是否启动位置服务
            buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'false'
-            // 是否使用自定义导航
-            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
            // 是否作为 launcher 运行
            buildConfigField 'boolean', 'IS_LAUNCHER', 'false'
+            buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
        }
        // launcher app
-        launcher{
+        launcher {
            dimension "basic"
-            applicationId rootProject.ext.android.launcherApplicationId
            // 是否启动位置服务
            buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'true'
-            // 是否使用自定义导航
-            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true'
            // 是否作为 launcher 运行
            buildConfigField 'boolean', 'IS_LAUNCHER', 'true'
+            buildConfigField 'String', 'SOCKET_APP_ID', '\"com.mogo.launcher\"'
        }
        // f系列-分体机全系列，未细分
-        f8xx{
+        f8xx {
+            applicationId rootProject.ext.android.fLauncherApplicationId
            dimension "product"
            // 使用思必驰语音
-            buildConfigField 'int', 'AIType','2'
+            buildConfigField 'int', 'AIType', '2'
            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
        }
-        // e系列
+        // e系列，采用Launcher方案
        e8xx {
+            applicationId rootProject.ext.android.launcherApplicationId
            dimension "product"
            // 使用思必驰语音
-            buildConfigField 'int', 'AIType','2'
-            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
+            buildConfigField 'int', 'AIType', '2'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonLauncherAmapApiValue]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+        }
+        // 同上
+        em4 {
+            applicationId rootProject.ext.android.launcherApplicationId
+            dimension "product"
+            // 使用思必驰语音
+            buildConfigField 'int', 'AIType', '2'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonLauncherAmapApiValue]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+        }
+        // e系列-2+32，对标D系列2+32，采用独立app的形式
+        em3 {
+            applicationId rootProject.ext.android.independentApplicationId
+            dimension "product"
+            // 使用思必驰语音
+            buildConfigField 'int', 'AIType', '2'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+        }
+        // e系列-1+16，对标D系列1+16，采用独立app形式
+        em1 {
+            applicationId rootProject.ext.android.independentApplicationId
+            dimension "product"
+            // 使用思必驰语音
+            buildConfigField 'int', 'AIType', '2'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
        }
        // d系列
        d8xx {
+            applicationId rootProject.ext.android.independentApplicationId
            dimension "product"
            // 使用同行者语音
-            buildConfigField 'int', 'AIType','1'
-            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true'
+            buildConfigField 'int', 'AIType', '1'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+        }
+        // d系列 1+16 版本
+        d82x {
+            applicationId rootProject.ext.android.independentApplicationId
+            dimension "product"
+            // 使用同行者语音
+            buildConfigField 'int', 'AIType', '1'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '0'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.commonIndependentAmapApiValue]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+        }
+        // 比亚迪
+        bydauto {
+            applicationId rootProject.ext.android.bydautoIndependentApplicationId
+            dimension "product"
+            // 不使用语音
+            buildConfigField 'int', 'AIType', '0'
+            buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false'
+            // 车机类型，主要用于区分自研车机还是别人家的车机，其他车机，比亚迪定为1
+            buildConfigField 'int', 'CAR_MACHINE_TYPE', '1'
+            buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true'
+            manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.bydautoIndependentApiValue]
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true'
        }
        qa {
            dimension "env"
@@ -127,42 +221,10 @@ android {
            buildConfigField 'int', 'NET_ENV', '4'
        }
    }
-}

-def generateVersionCode() {
-    String vn = rootProject.ext.android.versionName
-    String[] versions = vn.split("\\.")
-    if (versions.length == 3) {
-        int num1 = Integer.valueOf(versions[0])
-        int num2 = Integer.valueOf(versions[1])
-        int num3 = Integer.valueOf(versions[2])
-        if (num1 < 1 || num1 > 99){
-            throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])")
-        }
-        if (num2 < 0 || num2 > 99){
-            throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])")
-        }
-        if (num3 < 0 || num3 > 99){
-            throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])")
-        }
-        StringBuilder builder = new StringBuilder()
-        builder.append(num1)
-        if( num2 > 9 ){
-            builder.append(num2)
-        } else {
-            builder.append("0").append(num2)
-        }
-        if( num3 > 9 ){
-            builder.append(num3)
-        } else {
-            builder.append("0").append(num3)
-        }
-        println("last versionCode ${builder}")
-        return Integer.valueOf(builder.toString())
-    } else {
-        throw new GradleException("版本号必须定义为 x.y.z，x[1,99], y[0, 99], z[0, 99])")
+    packagingOptions {
+        exclude 'META-INF/io.netty.versions.properties'
    }
-
 }

 repositories {
@@ -185,54 +247,56 @@ dependencies {

    implementation rootProject.ext.dependencies.carcallprovider
    implementation rootProject.ext.dependencies.carcall
-    implementation rootProject.ext.dependencies.guideshowprovider
-    implementation rootProject.ext.dependencies.guideshow

-    implementation rootProject.ext.dependencies.moduleV2x
-    implementation rootProject.ext.dependencies.moduletanlu, {
-        exclude group: 'com.mogo.module', module: 'module-share'
-    }
+    implementation rootProject.ext.dependencies.mogologlib

    implementation rootProject.ext.dependencies.modulepushbase
    launcherImplementation rootProject.ext.dependencies.modulepush
    independentImplementation rootProject.ext.dependencies.modulepushnoop

    if (Boolean.valueOf(RELEASE)) {
-        launcherImplementation rootProject.ext.dependencies.modulemainlauncher
-        independentImplementation rootProject.ext.dependencies.modulemainindependent
        implementation rootProject.ext.dependencies.mogocommons
        implementation rootProject.ext.dependencies.modulecommon
        implementation rootProject.ext.dependencies.modulesearch
        implementation rootProject.ext.dependencies.mogomoduleguide
        implementation rootProject.ext.dependencies.mogomoduleauth
-        debugImplementation rootProject.ext.dependencies.gpssimulatordebug
-        releaseImplementation rootProject.ext.dependencies.gpssimulatornoop
        implementation rootProject.ext.dependencies.modulemedia
        implementation rootProject.ext.dependencies.moduleservice
        implementation rootProject.ext.dependencies.moduleobu
+        implementation rootProject.ext.dependencies.modulesplash
+        implementation rootProject.ext.dependencies.moduleV2x
+        implementation rootProject.ext.dependencies.moduletanlu, {
+            exclude group: 'com.mogo.module', module: 'module-share'
+        }
+        implementation rootProject.ext.dependencies.moduletanluapi
+        implementation rootProject.ext.dependencies.mogomonitor
+        implementation rootProject.ext.dependencies.mogomodulewidgets
+        implementation rootProject.ext.dependencies.mogomoduleback
    } else {
-        launcherImplementation project(':main-extensions:mogo-module-main-launcher')
-//        launcherImplementation project(':modules:mogo-module-main')
-        independentImplementation project(':main-extensions:mogo-module-main-independent')
        implementation project(':foudations:mogo-commons')
        implementation project(':modules:mogo-module-common')
        implementation project(':modules:mogo-module-search')
-        implementation project(':modules:mogo-module-guide')
        implementation project(':modules:mogo-module-authorize')
-        debugImplementation project(':modules:mogo-module-gps-simulator-debug')
-        releaseImplementation project(':modules:mogo-module-gps-simulator-noop')
        implementation project(':modules:mogo-module-media')
        implementation project(':modules:mogo-module-service')
        implementation project(':modules:mogo-module-obu')
+        implementation project(':modules:mogo-module-splash')
+        implementation project(':modules:mogo-module-v2x')
+        implementation project(':modules:mogo-module-tanlu'), {
+            exclude group: 'com.mogo.module', module: 'module-share'
+        }
+        implementation project(':libraries:mogo-tanlu-api')
+        implementation project(':modules:mogo-module-monitor')
+        implementation project(':modules:mogo-module-widgets')
+        implementation project(':modules:mogo-module-back')
    }
-}

-//android.applicationVariants.all { variant ->
-//    variant.outputs.all { //这里修改apk文件名
-//        outputFileName = "Launcher2.0_V${android.defaultConfig.versionName}_${getCurrentDate()}_${variant.name}_${getGitCommit()}.apk"
-//        println outputFileName
-//    }
-//}
+    apply from: "./functions/perform.gradle"
+    apply from: "./functions/baseservices.gradle"
+    apply from: "./functions/socketpush.gradle"
+    apply from: "./functions/gpssimulator.gradle"
+    apply from: "./functions/leftpanel.gradle"
+}

 android.applicationVariants.all { variant ->
    def buildTime = new Date().format("yyyyMMdd", TimeZone.getTimeZone("GMT+08:00"))
@@ -249,41 +313,4 @@ android.applicationVariants.all { variant ->
    }
 }

-
-def getMonthAndDay() {
-
-    SimpleDateFormat sdf = new SimpleDateFormat("MMddHH")
-    return sdf.format(new Date())
-}
-
-def getCurrentDate() {
-    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss")
-    return sdf.format(new Date())
-}
-
-def getGitCommit() {
-    def gitDir = new File("${new File("${rootDir}")}/.git")
-    if (!gitDir.isDirectory()) {
-        return 'non_git_build'
-    }
-
-    def cmd = 'git log --pretty=format:%h -1'
-    def gitCommit = cmd.execute().text.trim()
-
-    print gitCommit
-
-    def cmd2 = 'git status -s'
-    def gitStatus = cmd2.execute().text.trim()
-
-    println '---------'
-
-    print gitStatus
-    if (gitStatus != null && !gitStatus.isEmpty()) {
-        return 'local-build'
-    }
-
-    assert !gitCommit.isEmpty()
-    gitCommit
-}
-
-//apply plugin: 'arouterhook'
+apply from: "./regroup.gradle"
--- a/app/functions/README.md
+++ b/app/functions/README.md
@@ -0,0 +1 @@
+# 不同渠道，依赖的实现不一样，需要各个渠道都去依赖各自需要的实现，渠道太多导致build.gradle 文件臃肿，可以通过分gradle文件方式减少臃肿
--- a/app/functions/baseservices.gradle
+++ b/app/functions/baseservices.gradle
@@ -0,0 +1,26 @@
+// 基础服务：仅比亚迪渠道用sdk方式实现，其他都基于apk基础服务
+
+project.dependencies {
+    if (Boolean.valueOf(RELEASE)) {
+        bydautoImplementation rootProject.ext.dependencies.mogobaseservicesdk
+
+        d82xImplementation rootProject.ext.dependencies.mogobaseserviceapk
+        em1Implementation rootProject.ext.dependencies.mogobaseserviceapk
+        d8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk
+        em4Implementation rootProject.ext.dependencies.mogobaseserviceapk
+        e8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk
+        e8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk
+        f8xxImplementation rootProject.ext.dependencies.mogobaseserviceapk
+        em3Implementation rootProject.ext.dependencies.mogobaseserviceapk
+    } else {
+        bydautoImplementation project(':foudations:mogo-base-services-sdk')
+
+        d82xImplementation project(':foudations:mogo-base-services-apk')
+        em1Implementation project(':foudations:mogo-base-services-apk')
+        d8xxImplementation project(':foudations:mogo-base-services-apk')
+        em4Implementation project(':foudations:mogo-base-services-apk')
+        e8xxImplementation project(':foudations:mogo-base-services-apk')
+        f8xxImplementation project(':foudations:mogo-base-services-apk')
+        em3Implementation project(':foudations:mogo-base-services-apk')
+    }
+}
--- a/app/functions/gpssimulator.gradle
+++ b/app/functions/gpssimulator.gradle
@@ -0,0 +1,11 @@
+// 基于后台轨迹模拟的gps模拟服务
+
+project.dependencies {
+    if (Boolean.valueOf(RELEASE)) {
+        debugImplementation rootProject.ext.dependencies.gpssimulatordebug
+        releaseImplementation rootProject.ext.dependencies.gpssimulatornoop
+    } else {
+        debugImplementation project(':modules:mogo-module-gps-simulator-debug')
+        releaseImplementation project(':modules:mogo-module-gps-simulator-noop')
+    }
+}
--- a/app/functions/leftpanel.gradle
+++ b/app/functions/leftpanel.gradle
@@ -0,0 +1,26 @@
+// 辅助驾驶占位模块，目前部分车机不上辅助驾驶功能，使用该模块能力代替
+
+project.dependencies {
+    if (Boolean.valueOf(RELEASE)) {
+        d82xImplementation rootProject.ext.dependencies.moduleleftpanel
+        em1Implementation rootProject.ext.dependencies.moduleleftpanel
+        bydautoImplementation rootProject.ext.dependencies.moduleleftpanel
+
+        d8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
+        em4Implementation rootProject.ext.dependencies.moduleleftpanelnoop
+        e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
+        e8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
+        f8xxImplementation rootProject.ext.dependencies.moduleleftpanelnoop
+        em3Implementation rootProject.ext.dependencies.moduleleftpanelnoop
+    } else {
+        d82xImplementation project(':modules:mogo-module-left-panel')
+        em1Implementation project(':modules:mogo-module-left-panel')
+        bydautoImplementation project(':modules:mogo-module-left-panel')
+        
+        d8xxImplementation project(':modules:mogo-module-left-panel-noop')
+        em4Implementation project(':modules:mogo-module-left-panel-noop')
+        e8xxImplementation project(':modules:mogo-module-left-panel-noop')
+        f8xxImplementation project(':modules:mogo-module-left-panel-noop')
+        em3Implementation project(':modules:mogo-module-left-panel-noop')
+    }
+}
--- a/app/functions/perform.gradle
+++ b/app/functions/perform.gradle
@@ -0,0 +1,11 @@
+// 表现：独立 app 和 launcher
+
+project.dependencies {
+    if (Boolean.valueOf(RELEASE)) {
+        launcherImplementation rootProject.ext.dependencies.modulemainlauncher
+        independentImplementation rootProject.ext.dependencies.modulemainindependent
+    } else {
+        launcherImplementation project(':main-extensions:mogo-module-main-launcher')
+        independentImplementation project(':main-extensions:mogo-module-main-independent')
+    }
+}
--- a/app/functions/socketpush.gradle
+++ b/app/functions/socketpush.gradle
@@ -0,0 +1,13 @@
+// 基于socket长链的push推送
+
+project.dependencies {
+    if (Boolean.valueOf(RELEASE)) {
+        implementation rootProject.ext.dependencies.modulepushbase
+        launcherImplementation rootProject.ext.dependencies.modulepush
+        independentImplementation rootProject.ext.dependencies.modulepushnoop
+    } else {
+        implementation project(":modules:mogo-module-push-base")
+        launcherImplementation project(":modules:mogo-module-push")
+        independentImplementation project(":modules:mogo-module-push-noop")
+    }
+}
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -19,3 +19,355 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+
+#
+#-------------------------------------------基本不用动区域----------------------------------------------
+#
+#
+# -----------------------------基本 -----------------------------
+
+# 指定代码的压缩级别 0 - 7(指定代码进行迭代优化的次数，在Android里面默认是5，这条指令也只有在可以优化时起作用。)
+-optimizationpasses 5
+# 混淆时不会产生形形色色的类名(混淆时不使用大小写混合类名)
+-dontusemixedcaseclassnames
+# 指定不去忽略非公共的库类(不跳过library中的非public的类)
+-dontskipnonpubliclibraryclasses
+# 指定不去忽略包可见的库类的成员
+-dontskipnonpubliclibraryclassmembers
+#不进行优化，建议使用此选项，
+-dontoptimize
+ # 不进行预校验,Android不需要,可加快混淆速度。
+-dontpreverify
+
+# 屏蔽警告,暂不开启。用于抛出异常
+#-ignorewarnings
+# 指定混淆是采用的算法，后面的参数是一个过滤器
+# 这个过滤器是谷歌推荐的算法，一般不做更改
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+# 保护代码中的Annotation不被混淆
+-keepattributes *Annotation*,InnerClasses,Signature,EnclosingMethod
+# 避免混淆泛型, 这在JSON实体映射时非常重要
+-keepattributes Signature
+# 抛出异常时保留代码行号
+-keepattributes SourceFile,LineNumberTable
+ #优化时允许访问并修改有修饰符的类和类的成员，这可以提高优化步骤的结果。
+# 比如，当内联一个公共的getter方法时，这也可能需要外地公共访问。
+# 虽然java二进制规范不需要这个，要不然有的虚拟机处理这些代码会有问题。当有优化和使用-repackageclasses时才适用。
+#指示语：不能用这个指令处理库中的代码，因为有的类和类成员没有设计成public ,而在api中可能变成public
+-allowaccessmodification
+ # 混淆时记录日志(打印混淆的详细信息)
+ # 这句话能够使我们的项目混淆后产生映射文件
+ # 包含有类名->混淆后类名的映射关系
+-verbose
+
+
+#
+# ----------------------------- 默认保留 -----------------------------
+#
+#----------------------------------------------------
+# 保持哪些类不被混淆
+#继承activity,application,service,broadcastReceiver,contentprovider....不进行混淆
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Fragment
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class * extends android.view.View
+
+-keep public class androidx.*{*;}
+-keep public class * extends androidx.*{*;}
+-keep interface androidx.* {*;}
+-dontwarn androidx.**
+
+-dontwarn android.support.design.**
+-keep public class android.support.design.R$* { *; }
+-keep class com.google.android.material.* {*;}
+
+-keepclasseswithmembernames class * {
+    native <methods>;
+}
+
+#这个主要是在layout 中写的onclick方法android:onclick="onClick"，不进行混淆
+#表示不混淆Activity中参数是View的方法
+-keepclassmembers class * extends android.app.Activity{
+    public void *(android.view.View);
+}
+#表示不混淆枚举中的values()和valueOf()方法
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+#表示不混淆任何一个View中的setXxx()和getXxx()方法，
+#因为属性动画需要有相应的setter和getter的方法实现，混淆了就无法工作了。
+-keep public class * extends android.view.View{
+    *** get*();
+    void set*(***);
+    public <init>(android.content.Context);
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+-keepclasseswithmembers class * {
+    public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
+}
+
+#表示不混淆Parcelable
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable *;
+}
+
+# 这指定了继承Serizalizable的类的如下成员不被移除混淆
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+# 保留R下面的资源
+-keep class **.R$* {
+ *;
+}
+
+#不混淆资源类下static的
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+# 对于带有回调函数的onXXEvent、**On*Listener的，不能被混淆
+-keepclassmembers class * {
+    void *(**On*Event);
+    void *(**On*Listener);
+}
+
+#（可选）避免Log打印输出
+-assumenosideeffects class android.util.Log {
+   public static *** v(...);
+   public static *** d(...);
+   public static *** i(...);
+   public static *** w(...);
+}
+
+#kotlin
+-keep class kotlin.* { *; }
+-keepclassmembernames class kotlinx.*{
+    volatile <fields>;
+}
+-keep class kotlin.Metadata { *; }
+-dontwarn kotlin.*
+-dontwarn kotlin.**
+-keepclassmembers class **$WhenMappings {
+    <fields>;
+}
+-keepclassmembers class kotlin.Metadata {
+    public <methods>;
+}
+-assumenosideeffects class kotlin.jvm.internal.Intrinsics {
+    static void checkParameterIsNotNull(java.lang.Object, java.lang.String);
+}
+-keepclassmembers class kotlin.Metadata { *; }
+-keep @kotlin.Metadata class *
+-keepclasseswithmembers @kotlin.Metadata class * { *; }
+
+-dontwarn android.telephony.TelephonyManager.**
+-keep class android.telephony.TelephonyManager.**{*;}
+
+#----------------------------------------第三方库----------------------------------------------
+#-----高德地图-----
+
+#内置语音 V5.6.0之后
+-keep class com.alibaba.idst.nls.**{*;}
+-keep class com.google.**{*;}
+-keep class com.nlspeech.nlscodec.** {*;}
+-keep public class com.alibaba.mit.alitts.*{*;}
+-keep class com.alibaba.mit.alitts.** {*;}
+-dontwarn com.alibaba.mit.alitts.ICallback
+
+#3D 地图 V5.0.0之后：
+-keep class com.amap.api.maps.**{*;}
+-keep class com.autonavi.**{*;}
+-keep class com.amap.api.trace.**{*;}
+#定位
+-keep class com.loc.** {*;}
+-keep class com.amap.api.location.**{*;}
+-keep class com.amap.api.fence.**{*;}
+-keep class com.autonavi.aps.amapapi.model.**{*;}
+#搜索
+-keep class com.amap.api.services.**{*;}
+#导航
+-keep class com.amap.api.navi.**{*;}
+
+
+#-----Gson-----
+-dontwarn sun.misc.**
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { <fields>; }
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+#-----ARouter-----
+-keep public class com.alibaba.android.arouter.routes.**{*;}
+-keep public class com.alibaba.android.arouter.facade.**{*;}
+-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
+# If you use the byType method to obtain Service, add the following rules to protect the interface:
+-keep interface * implements com.alibaba.android.arouter.facade.template.IProvider
+# If single-type injection is used, that is, no interface is defined to implement IProvider, the following rules need to be added to protect the implementation
+# -keep class * implements com.alibaba.android.arouter.facade.template.IProvider
+
+#-----Glide-----
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule {
+    <init>(...);
+}
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+  *** rewind();
+}
+
+#如果你的 target API 低于 Android API 27，请添加：
+-dontwarn com.bumptech.glide.load.resource.bitmap.VideoDecoder
+
+#-----Fresco-----
+-keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip
+-keep,allowobfuscation @interface com.facebook.soloader.DoNotOptimize
+-keep @com.facebook.common.internal.DoNotStrip class *
+-keepclassmembers class * {
+    @com.facebook.common.internal.DoNotStrip *;
+}
+-keep @com.facebook.soloader.DoNotOptimize class *
+-keepclassmembers class * {
+    @com.facebook.soloader.DoNotOptimize *;
+}
+-keepclassmembers class * {
+    native <methods>;
+}
+
+-keep public class com.facebook.soloader.SoLoader {
+    public static void init(android.content.Context, int);
+}
+
+-dontwarn okio.**
+-dontwarn com.squareup.okhttp.**
+-dontwarn okhttp3.**
+-dontwarn javax.annotation.**
+-dontwarn com.android.volley.toolbox.**
+-dontwarn com.facebook.infer.**
+
+#-----Okio-----
+# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+-dontwarn com.squareup.**
+-dontwarn okio.**
+
+#-----OkHttp-----
+# JSR 305 annotations are for embedding nullability information.
+-dontwarn javax.annotation.**
+# A resource is loaded with a relative path so the package of this class must be preserved.
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
+-dontwarn org.codehaus.mojo.animal_sniffer.*
+# OkHttp platform used only on JVM and when Conscrypt dependency is available.
+-dontwarn okhttp3.internal.platform.ConscryptPlatform
+
+#-----Retrofit-----
+# Retrofit does reflection on method and parameter annotations.
+-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+# Retain service method parameters when optimizing.
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
+    @retrofit2.http.* <methods>;
+}
+# Ignore annotation used for build tooling.
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+# Ignore JSR 305 annotations for embedding nullability information.
+-dontwarn javax.annotation.**
+# Guarded by a NoClassDefFoundError try/catch and only used when on the classpath.
+-dontwarn kotlin.Unit
+# Top-level functions that can only be used by Kotlin.
+-dontwarn retrofit2.KotlinExtensions
+-dontwarn retrofit2.KotlinExtensions$*
+# With R8 full mode, it sees no subtypes of Retrofit interfaces since they are created with a Proxy
+# and replaces all potential values with null. Explicitly keeping the interfaces prevents this.
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+
+#-----ProtoBuf-----
+-keep class com.google.protobuf.** {*;}
+
+#-----GSYVideoPlayer-----
+-keep class com.shuyu.gsyvideoplayer.video.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.video.**
+-keep class com.shuyu.gsyvideoplayer.video.base.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.video.base.**
+-keep class com.shuyu.gsyvideoplayer.utils.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.utils.**
+-keep class tv.danmaku.ijk.** { *; }
+-dontwarn tv.danmaku.ijk.**
+
+#-----EventBus-----
+-keepattributes *Annotation*
+-keepclassmembers class * {
+    @org.greenrobot.eventbus.Subscribe <methods>;
+}
+-keep enum org.greenrobot.eventbus.ThreadMode { *; }
+# And if you use AsyncExecutor:
+-keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent {
+    <init>(java.lang.Throwable);
+}
+
+#-----Netty-----
+-keepattributes Signature,InnerClasses
+-keep class io.netty.** {*;}
+-keep class org.apache.** {*;}
+-keep class org.apache.logging.**{*;}
+-keepclasseswithmembers class io.netty.** {*;}
+-keepclasseswithmembers class org.apache.logging.**{*;}
+-keep class org.apache.http.**{*;}
+-dontwarn io.netty.**
+-dontwarn sun.**
+
+#-----ZhiDaoService-----
+-keep class com.zhidao.auto.platform.**{*;}
+-keep class com.zhidao.auto.carcorder.**{*;}
+-keep class com.zhidaohulian.**{*;}
+-keep class com.zhidao.boot.**{*;}
+-keep class com.elegant.**{*;}
+-keep class com.zhidao.socketsdk.**{*;}
+-keep class com.zhidao.socket.**{*;}
+-keep class com.zhidao.ptech.**{*;}
+-keep class com.zhidao.autopilotcore.**{*;}
+-keep class com.zhidao.autopilot.support.**{*;}
+-keep class com.zhidao.voice.library.**{*;}
+-keep class com.zhidao.voicesdk.**{*;}
+-keep class com.zhidao.smartv2x.**{*;}
+-keep class com.zhidao.accountsdk.**{*;}
+-keep class com.zhidao.account.**{*;}
+-keep class com.zhidao.locupload.**{*;}
+-keep class com.zhidao.tcloginsdk.**{*;}
+-keep class com.zhidao.utils.**{*;}
+-keep class com.hw.videoprocessor.**{*;}
+-dontwarn com.elegant.network.**
+
+-keep class com.bytedance.boost_multidex.**{*;}
+
+
+
+
--- a/app/regroup.gradle
+++ b/app/regroup.gradle
@@ -0,0 +1,45 @@
+// 将 install 和 assemble 任务按功能分组
+
+afterEvaluate {
+
+    def independent = ["em3", "em1", "d8xx", "d82x", "bydauto"]
+    def launcher = ["f8xx", "em4"]
+
+    it.getTasks().iterator().forEachRemaining {
+        def task = it
+        def taskName = task.name
+        if (taskName.startsWith("assemble")
+                && taskName.contains("Independent")
+                && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) {
+            independent.forEach {
+                if( taskName.toLowerCase().contains(it) ){
+                    task.group = "assembleIndependent"
+                }
+            }
+        } else if (taskName.startsWith("assemble")
+                && taskName.contains("Launcher")
+                && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) {
+            launcher.forEach {
+                if( taskName.toLowerCase().contains(it) ){
+                    task.group = "assembleLauncher"
+                }
+            }
+        } else if (taskName.startsWith("install")
+                && taskName.contains("Independent")
+                && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) {
+            independent.forEach {
+                if( taskName.toLowerCase().contains(it) ){
+                    task.group = "installIndependent"
+                }
+            }
+        } else if (taskName.startsWith("install")
+                && taskName.contains("Launcher")
+                && (taskName.endsWith("Debug") || taskName.endsWith("Release"))) {
+            launcher.forEach {
+                if( taskName.toLowerCase().contains(it) ){
+                    task.group = "installLauncher"
+                }
+            }
+        }
+    }
+}
--- a/app/src/em4/AndroidManifest.xml
+++ b/app/src/em4/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:sharedUserId="android.uid.system"
+    package="com.mogo.launcher">
+</manifest>
--- a/app/src/f8xxLauncherOnlineRelease/AndroidManifest.xml
+++ b/app/src/f8xxLauncherOnlineRelease/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:sharedUserId="android.uid.system"
+    package="com.mogo.launcher">
+</manifest>
--- a/app/src/independent/AndroidManifest.xml
+++ b/app/src/independent/AndroidManifest.xml
@@ -12,10 +12,10 @@
        android:theme="@style/AppTheme.App"
        tools:replace="android:label">
        <!-- 高德地图 -->
-        <meta-data
-            tools:replace="android:value"
-            android:name="com.amap.api.v2.apikey"
-            android:value="1c3fbc5f5e183619ffb1e7bc01e6751f" />
+<!--        <meta-data-->
+<!--            tools:replace="android:value"-->
+<!--            android:name="com.amap.api.v2.apikey"-->
+<!--            android:value="1c3fbc5f5e183619ffb1e7bc01e6751f" />-->
    </application>

    <uses-permission android:name="android.permission.WAKE_LOCK" />
--- a/app/src/launcher/AndroidManifest.xml
+++ b/app/src/launcher/AndroidManifest.xml
@@ -18,10 +18,10 @@
 <!--            android:authorities="com.zhidao.auto.personal.provider"-->
 <!--            android:enabled="true"-->
 <!--            android:exported="true" />-->
-        <meta-data
-            android:name="com.amap.api.v2.apikey"
-            android:value="a36b9f7b086fa3951bb35338a5a06dd3"
-            tools:replace="android:value" />
+<!--        <meta-data-->
+<!--            android:name="com.amap.api.v2.apikey"-->
+<!--            android:value="a36b9f7b086fa3951bb35338a5a06dd3"-->
+<!--            tools:replace="android:value" />-->
        <!-- 高德地图 -->
    </application>

--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,9 @@
        android:supportsRtl="true"
        android:theme="@style/AppTheme.App"
        tools:replace="android:label">
+        <meta-data
+            android:name="com.amap.api.v2.apikey"
+            android:value="${AMAP_API_VALUE}" />
        <!--保活用-->
        <service
            android:name="com.zhidao.boot.persistent.lib.PersistentAliveService"
--- a/app/src/main/java/com/mogo/launcher/MogoApplication.java
+++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java
@@ -2,6 +2,7 @@ package com.mogo.launcher;

 import android.content.Context;
 import android.content.Intent;
+import android.text.TextUtils;
 import android.util.Log;

 import com.alibaba.android.arouter.launcher.ARouter;
@@ -9,7 +10,9 @@ import com.auto.zhidao.logsdk.CrashSystem;
 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.module.authorize.authprovider.invoke.AuthorizeConstant;
+import com.mogo.module.back.BackToLauncherConst;
 import com.mogo.module.carchatting.card.CallChatConstant;
 import com.mogo.module.common.MogoModule;
 import com.mogo.module.common.MogoModulePaths;
@@ -20,11 +23,16 @@ import com.mogo.module.service.ServiceConst;
 import com.mogo.module.tanlu.constant.TanluConstants;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.utils.ObuConfig;
+import com.mogo.module.widgets.MogoWidgetsProvider;
+import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.MogoServicePaths;
-import com.mogo.service.connection.IMogoSocketManager;
+import com.mogo.service.passport.IMogoTicketCallback;
+import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.LogLevel;
 import com.mogo.utils.logger.Logger;
 import com.zhidao.boot.persistent.lib.PersistentManager;
+import com.zhidao.mogo.module.left.panel.LeftPanelConst;
+import com.zhidao.mogo.tanlu.api.TanluApiConst;

 /**
 * @author congtaowang
@@ -42,64 +50,116 @@ public class MogoApplication extends AbsMogoApplication {
        super.onCreate();
        // Crash 日志收集
        final long start = System.currentTimeMillis();
-        CrashSystem crashSystem = CrashSystem.getInstance(this);
+        CrashSystem crashSystem = CrashSystem.getInstance( this );
        crashSystem.init();
        //设置debug模式，日志不上传
-        crashSystem.setDebug(BuildConfig.DEBUG);
-        Logger.init(BuildConfig.DEBUG ? LogLevel.DEBUG : LogLevel.OFF);
+        crashSystem.setDebug( BuildConfig.DEBUG );
+        Logger.init( BuildConfig.DEBUG ? LogLevel.DEBUG : LogLevel.OFF );

 //        MogoModulePaths.addModule(new MogoModule(PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME));
-        MogoModulePaths.addModule(new MogoModule(AuthorizeConstant.PATH_AGREEMENT_FRAGMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME));
+        MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_AGREEMENT, AuthorizeConstant.PATH_AGREEMENT_MODULE_NAME ) );

-        //运营位卡片，需要默认显示，放在第一个加载
-//        MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME));
-        if (DebugConfig.isLauncher()) {
-            MogoModulePaths.addModule(new MogoModule(MediaConstants.TAG, MediaConstants.MODULE_TYPE));
+        if ( DebugConfig.isLauncher() ) {
+            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 ) );
        }
+        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( TanluConstants.TAG, TanluConstants.MODEL_NAME ) );
+        MogoModulePaths.addModule( new MogoModule( MogoServicePaths.PATH_SHARE, "ShareControl" ) );

-        MogoModulePaths.addModule(new MogoModule(CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME));
-        MogoModulePaths.addModule(new MogoModule(TanluConstants.TAG, TanluConstants.MODEL_NAME));
-        MogoModulePaths.addModule(new MogoModule(MogoServicePaths.PATH_SHARE, "ShareControl"));
+        MogoModulePaths.addModule( new MogoModule( LeftPanelConst.PATH_NAME, LeftPanelConst.MODULE_NAME ) );

        MogoModulePaths.addBaseModule( new MogoModule( ServiceConst.PATH_REFRESH_STRATEGY, ServiceConst.PATH_REFRESH_STRATEGY ) );
-        MogoModulePaths.addBaseModule(new MogoModule(MogoServicePaths.PATH_OBU,"moduleObu"));
-        MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.PATH_V2X_UI ) );
-        MogoModulePaths.addModule(new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME));
+        MogoModulePaths.addBaseModule( new MogoModule( V2XConst.PATH_V2X_UI, V2XConst.MODULE_NAME ) );
+        MogoModulePaths.addBaseModule(new MogoModule( MogoServicePaths.PATH_STRATEGY_SHARE,"StrategyShare"));
+        MogoModulePaths.addModule( new MogoModule( V2XConst.PATH_EVENT_PANEL, V2XConst.MODULE_NAME_EVENT_PANEL ) );
+        MogoModulePaths.addModule( new MogoModule( PushUIConstants.PATH, PushUIConstants.NAME ) );

-        if (!DebugConfig.isLauncher()) {
-            PersistentManager.getInstance().initManager(this);
-            Intent intent = new Intent(this, MogoMainService.class);
-            startService(intent);
+        if ( !DebugConfig.isLauncher() ) {
+            PersistentManager.getInstance().initManager( this );
+            Intent intent = new Intent( this, MogoMainService.class );
+            startService( intent );
        }
-        Log.i("timer", "cost " + (System.currentTimeMillis() - start) + "ms");
+        Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" );
    }

-    private void initDebugConfig(){
-        DebugConfig.setNetMode(BuildConfig.NET_ENV);
-        DebugConfig.setDebug(BuildConfig.DEBUG);
-        DebugConfig.setAIType(BuildConfig.AIType);
-        DebugConfig.setLaunchLocationService(BuildConfig.LAUNCH_LOCATION_SERVICE);
-        DebugConfig.setUseCustomNavi(BuildConfig.USE_CUSTOM_NAVI);
-        DebugConfig.setLauncher(BuildConfig.IS_LAUNCHER);
+    private void initDebugConfig() {
+        DebugConfig.setNetMode( BuildConfig.NET_ENV );
+        DebugConfig.setDebug( BuildConfig.DEBUG );
+        DebugConfig.setAIType( BuildConfig.AIType );
+        DebugConfig.setLaunchLocationService( BuildConfig.LAUNCH_LOCATION_SERVICE );
+        DebugConfig.setUseCustomNavi( BuildConfig.USE_CUSTOM_NAVI );
+        DebugConfig.setLauncher( BuildConfig.IS_LAUNCHER );
        DebugConfig.setActiveAIAssistFlag( BuildConfig.AI_ASSIST_ACTIVE_STAUTS );
        DebugConfig.setUseMockObuData(false);
        ObuConfig.useObuLocation = false;
+        DebugConfig.setCarMachineType( BuildConfig.CAR_MACHINE_TYPE );
+        DebugConfig.setProductFlavor( BuildConfig.FLAVOR_product );
+        DebugConfig.setSocketAppId( BuildConfig.SOCKET_APP_ID );
+        DebugConfig.setRoadEventAnimated( BuildConfig.ROAD_EVENT_ANIMATED );
    }

    @Override
    protected void init() {
        super.init();
-        IMogoSocketManager mMogoSocketManager = ARouter.getInstance().navigation(IMogoSocketManager.class);
-        if (mMogoSocketManager != null) {
-            mMogoSocketManager.init(getApplicationContext(), "com.mogo.launcher");
-        } else {
-            Logger.e(TAG, "init socket server error.");
-        }
+        prepareBaseService( 2_000L );
+    }
+
+    /**
+     * 基础服务：passport、location、socket
+     */
+    private void prepareBaseService( long delay ) {
+        UiThreadHandler.postDelayed( () -> {
+            final IMogoServiceApis apis = ARouter.getInstance().navigation( IMogoServiceApis.class );
+            // 第三方平台的sn是服务端生成的，所以必须在返回后才能开启
+            if ( TextUtils.isEmpty( Utils.getSn() ) ) {
+                preparePassportEnvironment( apis, () -> {
+                    prepareSocketAndLocationServices( apis );
+                } );
+            } else {
+                preparePassportEnvironment( apis, null );
+                prepareSocketAndLocationServices( apis );
+            }
+        }, delay );
+    }
+
+    private void preparePassportEnvironment( IMogoServiceApis apis, Runnable after ) {
+        apis.getPassportManagerApi().requestTicket( new IMogoTicketCallback() {
+            @Override
+            public void onTicketGot( String ticket ) {
+                Logger.d( TAG, "ticket = %s", ticket );
+            }
+
+            @Override
+            public void onError( int code, String msg ) {
+                Logger.w( TAG, "code = %s, msg = %s", code, msg );
+            }
+
+            @Override
+            public void onLoginSuccess( String token, String sn ) {
+                if ( after != null ) {
+                    after.run();
+                }
+            }
+        } );
+    }
+
+    private void prepareSocketAndLocationServices( IMogoServiceApis apis ) {
+        apis.getSocketManagerApi( getApplicationContext() ).init( getApplicationContext(), DebugConfig.getSocketAppId() );
+        apis.getLocationInfoApi().start();
+        apis.getMapServiceApi().getSingletonLocationClient( getApplicationContext() ).addLocationListener( location -> {
+            apis.getLocationInfoApi().provideLocation( location );
+        } );
    }

    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-        BoostMultiDex.install(base);
+    protected void attachBaseContext( Context base ) {
+        super.attachBaseContext( base );
+        BoostMultiDex.install( base );
    }
 }
--- a/app/src/main/res/values-xhdpi-1920x1000/strings.xml
+++ b/app/src/main/res/values-xhdpi-1920x1000/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_shell_name">蘑菇知途</string>
+</resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_shell_name">Launcher</string>
+    <string name="app_shell_name">蘑菇出行</string>
 </resources>
--- a/build.gradle
+++ b/build.gradle
@@ -22,7 +22,6 @@ buildscript {
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "com.alibaba:arouter-register:1.0.2"
        classpath 'com.hujiang.aspectjx:gradle-android-plugin-aspectjx:2.0.4'
-//        classpath "com.mogo.module.pluginhook:module-pluginhook:${HOOKPLUGIN_VERSION}"
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
    }
--- a/config.gradle
+++ b/config.gradle
@@ -4,12 +4,18 @@ ext {
    android = [
 //            applicationId       : "com.mogo.launcher",
 //            zhidadoApplicationId: "com.zhidao.launcher",
-            launcherApplicationId   : "com.mogo.launcher",
-            independentApplicationId: "com.mogo.launcher.app",
-            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 = [
@@ -21,6 +27,9 @@ ext {
            androidxviewpager2       : "androidx.viewpager2:viewpager2:1.0.0",
            androidxrecyclerview     : "androidx.recyclerview:recyclerview:1.1.0",
            androidxcardview         : "androidx.cardview:cardview:1.0.0",
+            localbroadcastmanager    : "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0",
+            // flexbox
+            flexbox                  : 'com.google.android:flexbox:2.0.1',
            // 测试
            junit                    : "junit:junit:4.12",
            androidxjunit            : "androidx.test.ext:junit:1.1.0",
@@ -73,17 +82,13 @@ ext {
            // rxjava2 with room
            roomRxjava               : "android.arch.persistence.room:rxjava2:1.1.1",

-
-            // leakcanary
-            leakcanary               : 'com.squareup.leakcanary:leakcanary-android:1.5.4',
-            leakcanarynoop           : 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4',
-
            // material
-            material                 : 'com.google.android.material:material:1.0.0',
+            material                 : 'com.google.android.material:material:1.1.0',


            // modules
            moduletanlu              : "com.mogo.module:module-tanlu:${MOGO_MODULE_TANLU_VERSION}",
+            moduletanluapi           : "com.mogo.module:module-tanlu-api:${MOGO_TANLU_API_VERSION}",
            moduleshare              : "com.mogo.module:module-share:${MOGO_MODULE_SHARE_VERSION}",
            mogocommons              : "com.mogo.commons:mogo-commons:${MOGO_COMMONS_VERSION}",
            mogoutils                : "com.mogo.commons:mogo-utils:${MOGO_UTILS_VERSION}",
@@ -104,8 +109,8 @@ ext {
            moduleextensions         : "com.mogo.module:module-extensions:${MOGO_MODULE_EXTENSIONS_VERSION}",
            carcall                  : "com.mogo.module.carchatting:module-carchatting:${CARCHATTING_VERSION}",
            carcallprovider          : "com.mogo.module.carchatting:module-carchatting-provider:${CARCHATTINGPROVIDER_VERSION}",
-            guideshow                : "com.mogo.module.guideshow:module-guideshow:${MOGO_MODULE_GUIDESHOW_VERSION}",
-            guideshowprovider        : "com.mogo.module.guideshow:module-guideshow-provider:${MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION}",
+//            guideshow                : "com.mogo.module.guideshow:module-guideshow:${MOGO_MODULE_GUIDESHOW_VERSION}",
+//            guideshowprovider        : "com.mogo.module.guideshow:module-guideshow-provider:${MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION}",
            // 在线车辆
            moduleonlinecar          : "com.mogo.module:module-onlinecar:${MOGO_MODULE_ONLINECAR_VERSION}",
            // V2X
@@ -123,7 +128,7 @@ ext {
            mogomoduleauth           : "com.mogo.module:module-authorize:${MOGO_MODULE_AUTHORIZE_VERSION}",
            mogomoduleguide          : "com.mogo.module:module-guide:${MOGO_MODULE_GUIDE_VERSION}",
            // 长链
-            socketsdk                : 'com.zhidao.socketsdk:socketsdk:2.1.1',
+            socketsdk                : 'com.zhidao.socketsdk:socketsdk:2.1.4',
            socketsdkconnsvrprotoco  : 'com.zhidao.ptech:connsvr-protoco:0.1.23',
            socketsdkprotobufjava    : 'com.google.protobuf:protobuf-java:3.5.1',
            // OBU
@@ -133,7 +138,7 @@ ext {
            jetbrainsannotationsjava5: "org.jetbrains:annotations-java5:15.0",

            // 统一登录
-            accountsdk               : "com.zhidao.accountservice:account-sdk:1.0.8",
+            accountsdk               : "com.zhidao.accountservice:account-sdk:1.0.11",
            // crash
            crashSdk                 : "com.zhidaoauto.crash.log:library:1.0.5",
            kotlinstdlibjdk7         : "org.jetbrains.kotlin:kotlin-stdlib-jdk7",
@@ -143,6 +148,7 @@ ext {
            videoarm64               : "com.shuyu:gsyVideoPlayer-arm64:7.1.2",
            videojava                : "com.shuyu:gsyVideoPlayer-java:7.1.2",
            eventbus                 : "org.greenrobot:eventbus:3.1.1",
+            videoprocessor           : "com.zhidao.video:video-processor:1.0.2.1",

            coroutinescore           : "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1",
            coroutinesandroid        : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1",
@@ -161,6 +167,35 @@ ext {
            tanluupload              : "com.mogo.module:module-tanlu-upload:${TANLULIB_VERSION}",

            // obu sdk
-            obusdk                   : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3"
+            obusdk                   : "com.zhidao.enterprise.smartv2x:smartv2x:1.0.0.3",
+            //事件面板
+            moduleventpanel          : "com.mogo.module:module-event-panel:${MOGO_MODULE_EVENT_PANEL_VERSION}",
+            // 事件面板空实现
+            moduleventpanelnoop      : "com.mogo.module:module-event-panel-noop:${MOGO_MODULE_EVENT_PANEL_VERSION}",
+            // 左侧面板
+            moduleleftpanel          : "com.mogo.module:module-left-panel:${MOGO_MODULE_LEFT_PANEL_VERSION}",
+            // 左侧面板空实现
+            moduleleftpanelnoop      : "com.mogo.module:module-left-panel-noop:${MOGO_MODULE_LEFT_PANEL_VERSION}",
+            // 闪屏页
+            modulesplash             : "com.mogo.module:module-splash:${MOGO_MODULE_SPLASH_VERSION}",
+            // 基础服务实现
+            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}",
+            // monitor
+            mogomonitor              : "com.mogo.module:module-monitor:${MOGO_MODULE_MONITOR_VERSION}",
+
+            // google
+            googlezxing              : "com.google.zxing:core:3.3.3",
+            litezxing                : "com.google.zxing:litezxing:1.0.29.8",
+
+            // android - room
+            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}",
    ]
 }
--- a/foudations/mogo-base-services-apk/.gitignore
+++ b/foudations/mogo-base-services-apk/.gitignore
@@ -0,0 +1 @@
+/build
--- a/foudations/mogo-base-services-apk/README.md
+++ b/foudations/mogo-base-services-apk/README.md
@@ -0,0 +1,7 @@
+## 基实现功能
+
+基础服务apk实现对应功能：位置上报、长连接、passport
+
+位置上报：com.zhidao.locationinfo
+长链：com.zhidao.socketservice
+passport：
--- a/foudations/mogo-base-services-apk/build.gradle
+++ b/foudations/mogo-base-services-apk/build.gradle
@@ -0,0 +1,51 @@
+apply plugin: 'com.android.library'
+
+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"
+    }
+
+    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.arouter
+
+    api rootProject.ext.dependencies.socketsdk
+    api rootProject.ext.dependencies.socketsdkconnsvrprotoco
+    api rootProject.ext.dependencies.socketsdkprotobufjava
+    implementation rootProject.ext.dependencies.accountsdk
+
+    if (Boolean.valueOf(RELEASE)) {
+        implementation rootProject.ext.dependencies.mogoutils
+        implementation rootProject.ext.dependencies.mogocommons
+        implementation rootProject.ext.dependencies.mogoserviceapi
+    } else {
+        implementation project(":foudations:mogo-utils")
+        implementation project(":foudations:mogo-commons")
+        implementation project(":services:mogo-service-api")
+    }
+
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
--- a/foudations/mogo-base-services-apk/consumer-rules.pro
+++ b/foudations/mogo-base-services-apk/consumer-rules.pro
--- a/foudations/mogo-base-services-apk/gradle.properties
+++ b/foudations/mogo-base-services-apk/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.base
+POM_ARTIFACT_ID=services-apk
+VERSION_CODE=1
--- a/foudations/mogo-base-services-apk/proguard-rules.pro
+++ b/foudations/mogo-base-services-apk/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
--- a/foudations/mogo-base-services-apk/src/main/AndroidManifest.xml
+++ b/foudations/mogo-base-services-apk/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.mogo.base.services.apk">
+
+    /
+</manifest>
--- a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
+++ b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
@@ -0,0 +1,63 @@
+package com.mogo.base.services.locationinfo;
+
+import android.content.Context;
+
+import androidx.annotation.Keep;
+
+import com.mogo.map.location.MogoLocation;
+import com.mogo.service.locationinfo.IMogoLocationInfoService;
+import com.mogo.utils.logger.Logger;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/7/16
+ *
+ * 位置服务
+ */
+@Keep
+class MogoLocationInfoServices implements IMogoLocationInfoService {
+
+    private static final String TAG = "MogoLocationInfoServices-apk";
+
+    private static volatile MogoLocationInfoServices sInstance;
+
+    private MogoLocationInfoServices() {
+    }
+
+    @Keep
+    public static MogoLocationInfoServices getInstance() {
+        if ( sInstance == null ) {
+            synchronized ( MogoLocationInfoServices.class ) {
+                if ( sInstance == null ) {
+                    sInstance = new MogoLocationInfoServices();
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    public synchronized void release() {
+        sInstance = null;
+    }
+
+    @Override
+    public void provideLocation( MogoLocation location ) {
+        Logger.d( TAG, "apk - provideLocation" );
+    }
+
+    @Override
+    public void start() {
+        Logger.d( TAG, "apk - start" );
+    }
+
+    @Override
+    public void stop() {
+        Logger.d( TAG, "apk - stop" );
+    }
+
+    @Override
+    public void init( Context context ) {
+        Logger.d( TAG, "apk - init" );
+    }
+}
--- a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/passport/PassportManager.java
+++ b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/passport/PassportManager.java
@@ -0,0 +1,103 @@
+package com.mogo.base.services.passport;
+
+import android.content.Context;
+
+import androidx.annotation.Keep;
+
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.commons.storage.SpStorage;
+import com.mogo.service.passport.IMogoPassportManager;
+import com.mogo.service.passport.IMogoTicketCallback;
+import com.mogo.utils.logger.Logger;
+import com.zhidao.account.sdk.AccountClientManager;
+import com.zhidao.account.sdk.Environment;
+import com.zhidao.account.sdk.callback.TicketInfoCallback;
+import com.zhidao.account.sdk.network.NetEnvironManager;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/7/16
+ *
+ * 描述
+ */
+@Keep
+class PassportManager implements IMogoPassportManager {
+
+    private static final String TAG = "PassportManager-apk";
+
+    private static volatile PassportManager sInstance;
+
+    private PassportManager() {
+    }
+
+    @Keep
+    public static PassportManager getInstance() {
+        if ( sInstance == null ) {
+            synchronized ( PassportManager.class ) {
+                if ( sInstance == null ) {
+                    sInstance = new PassportManager();
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    public synchronized void release() {
+        sInstance = null;
+    }
+
+    @Override
+    public void requestTicket( final IMogoTicketCallback callback ) {
+        getTicket( new TicketInfoCallback() {
+            @Override
+            public void onSuccess( String ticket ) {
+                Logger.d( TAG, "success" );
+                SpStorage.setTicket( ticket );
+                if ( callback != null ) {
+                    callback.onTicketGot( ticket );
+                }
+            }
+
+            @Override
+            public void onFailure( int code, String msg ) {
+                Logger.d( TAG, "fail" );
+                if ( callback != null ) {
+                    callback.onError( code, msg );
+                }
+            }
+        } );
+    }
+
+    private static void getTicket( TicketInfoCallback callback ) {
+        if ( DebugConfig.isLauncher() ) {
+            AccountClientManager.getTicket( callback );
+        } else {
+            AccountClientManager.getAppTicket( callback );
+        }
+    }
+
+    @Override
+    public void init( Context context ) {
+        AccountClientManager.init( context.getApplicationContext(), getNetEnvironment(), NetEnvironManager.OS_2C, "os2.0-launcher" );
+    }
+
+    private Environment getNetEnvironment() {
+        int mode = DebugConfig.getNetMode();
+        if ( mode == DebugConfig.NET_MODE_DEMO ) {
+            // 演示环境用 qa 的
+            mode = DebugConfig.NET_MODE_QA;
+        }
+        switch ( mode ) {
+            case DebugConfig.NET_MODE_DEV:
+                return Environment.dev;
+            case DebugConfig.NET_MODE_DEMO:
+            case DebugConfig.NET_MODE_QA:
+                return Environment.qa;
+            case DebugConfig.NET_MODE_RELEASE:
+            default:
+                return Environment.release;
+
+        }
+    }
+}
--- a/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/socket/SocketManager.java
+++ b/foudations/mogo-base-services-apk/src/main/java/com/mogo/base/services/socket/SocketManager.java
@@ -1,11 +1,11 @@
-package com.mogo.connection.socket;
+package com.mogo.base.services.socket;

 import android.content.Context;

+import androidx.annotation.Keep;
+
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.mogo.map.listener.IMogoMapListener;
-import com.mogo.service.connection.IMessageResponse;
 import com.mogo.service.connection.IMogoMsgAckListener;
 import com.mogo.service.connection.IMogoOnMessageListener;
 import com.mogo.service.connection.IMogoSocketManager;
@@ -31,10 +31,10 @@ import java.util.concurrent.ConcurrentHashMap;
 * <p>
 * 长链实现：基于 netty
 */
-
+@Keep
 public class SocketManager implements IMogoSocketManager, OnSocketReceiveCallback, OnSocketAckCallback {

-    private static final String TAG = "SocketManager";
+    private static final String TAG = "SocketManager-apk";

    public static final int MSG_PRODUCT_LINE = MogoCommon.Product.mogoBussiness_VALUE;
    private static final int MSG_HEADER_TYPE = MogoConnsvr.MsgType.mogoMsgTypeDispatchSvrNoRspReq_VALUE;
@@ -47,6 +47,7 @@ public class SocketManager implements IMogoSocketManager, OnSocketReceiveCallbac
        mSocketConnManager.addSocketAckCallback( this );
    }

+    @Keep
    public static SocketManager getInstance( Context context ) {
        if ( sInstance == null ) {
            synchronized ( SocketManager.class ) {
@@ -86,6 +87,10 @@ public class SocketManager implements IMogoSocketManager, OnSocketReceiveCallbac
    }

    @Override
+    public void onMessageReceived( byte[] content ) {
+        onMessageReceived( content, 0);
+    }
+
    public void onMessageReceived( byte[] content, long msgId ) {
        try {
            MogoConnsvr.Payload payload = MogoConnsvr.Payload.parseFrom( content );
--- a/foudations/mogo-base-services-sdk/.gitignore
+++ b/foudations/mogo-base-services-sdk/.gitignore
@@ -0,0 +1 @@
+/build
--- a/foudations/mogo-base-services-sdk/README.md
+++ b/foudations/mogo-base-services-sdk/README.md
@@ -0,0 +1,3 @@
+## sdk实现功能
+
+脱离基础服务apk实现对应功能：位置上报、长连接、passport
--- a/foudations/mogo-base-services-sdk/build.gradle
+++ b/foudations/mogo-base-services-sdk/build.gradle
@@ -0,0 +1,53 @@
+apply plugin: 'com.android.library'
+
+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"
+    }
+
+    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.arouter
+    // 上报位置
+    implementation 'com.zhidao.locupload:loc-upload-sdk:1.1.3'
+    // 长链
+    implementation 'com.zhidao.socket:built-in-socket:1.0.15'
+    // passport
+    implementation 'com.zhidao.tcloginsdk:tclogin:1.1.3'
+
+    annotationProcessor 'com.elegant.spi:compiler:1.0.3'
+
+
+    if (Boolean.valueOf(RELEASE)) {
+        implementation rootProject.ext.dependencies.mogoutils
+        implementation rootProject.ext.dependencies.mogocommons
+        implementation rootProject.ext.dependencies.mogoserviceapi
+    } else {
+        implementation project(":foudations:mogo-utils")
+        implementation project(":foudations:mogo-commons")
+        implementation project(":services:mogo-service-api")
+    }
+}
+
+apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString()
--- a/foudations/mogo-base-services-sdk/consumer-rules.pro
+++ b/foudations/mogo-base-services-sdk/consumer-rules.pro
@@ -0,0 +1,2 @@
+#-----MogoBaseServiceSdk-----
+-keep class com.mogo.base.services.locationinfo.MogoLocationSource.*{*;}
--- a/foudations/mogo-base-services-sdk/gradle.properties
+++ b/foudations/mogo-base-services-sdk/gradle.properties
@@ -0,0 +1,3 @@
+GROUP=com.mogo.base
+POM_ARTIFACT_ID=services-sdk
+VERSION_CODE=1
--- a/foudations/mogo-base-services-sdk/proguard-rules.pro
+++ b/foudations/mogo-base-services-sdk/proguard-rules.pro
@@ -0,0 +1,24 @@
+# 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
+
+#-----MogoBaseServiceSdk-----
+-keep class com.mogo.base.services.locationinfo.MogoLocationSource.*{*;}
--- a/foudations/mogo-base-services-sdk/src/androidTest/java/com/mogo/base/services/ExampleInstrumentedTest.java
+++ b/foudations/mogo-base-services-sdk/src/androidTest/java/com/mogo/base/services/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.mogo.base.services;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith( AndroidJUnit4.class )
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals( "com.mogo.base.services.test", appContext.getPackageName() );
+    }
+}
--- a/foudations/mogo-base-services-sdk/src/main/AndroidManifest.xml
+++ b/foudations/mogo-base-services-sdk/src/main/AndroidManifest.xml
@@ -1,2 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.connection" />
+    package="com.mogo.base.services">
+
+    /
+</manifest>
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/BaseServicesConstants.java
@@ -0,0 +1,16 @@
+package com.mogo.base.services;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/7/23
+ *
+ * 描述
+ */
+interface BaseServicesConstants {
+
+    /**
+     * 建立长链的通道ID
+     */
+    String SOCKET_CHANNEL_ID = "dataCrawler";
+}
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationInfoServices.java
@@ -0,0 +1,80 @@
+package com.mogo.base.services.locationinfo;
+
+import android.content.Context;
+
+import androidx.annotation.Keep;
+
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.map.location.MogoLocation;
+import com.mogo.service.locationinfo.IMogoLocationInfoService;
+import com.mogo.utils.logger.Logger;
+import com.zhidao.locupload.LocEnvironment;
+import com.zhidao.locupload.LocUploadConfig;
+import com.zhidao.locupload.LocUploadManager;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/7/16
+ *
+ * 位置服务
+ */
+@Keep
+class MogoLocationInfoServices implements IMogoLocationInfoService {
+
+    private static final String TAG = "MogoLocationInfoServices-sdk";
+
+    private static volatile MogoLocationInfoServices sInstance;
+    private MogoLocation mLocation;
+
+    private MogoLocationInfoServices() {
+    }
+
+    @Keep
+    public static MogoLocationInfoServices getInstance() {
+        if ( sInstance == null ) {
+            synchronized ( MogoLocationInfoServices.class ) {
+                if ( sInstance == null ) {
+                    sInstance = new MogoLocationInfoServices();
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    public synchronized void release() {
+        sInstance = null;
+    }
+
+    @Override
+    public void provideLocation( MogoLocation location ) {
+        mLocation = location;
+        Logger.d( TAG, "sdk - provideLocation" );
+    }
+
+    public MogoLocation getLocation() {
+        return mLocation;
+    }
+
+    @Override
+    public void start() {
+        LocUploadManager.getInstance().startUpload();
+        Logger.d( TAG, "sdk - start" );
+    }
+
+    @Override
+    public void stop() {
+        LocUploadManager.getInstance().stopUpload();
+        Logger.d( TAG, "sdk - stop" );
+    }
+
+    @Override
+    public void init( Context context ) {
+        LocUploadConfig.instance().
+                setAppId( DebugConfig.getSocketAppId() ).
+                setContext( context.getApplicationContext() ).
+                setLoggable( DebugConfig.isDebug() ).
+                setLocInterval( 2000L );
+        Logger.d( TAG, "sdk - init" );
+    }
+}
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationSource.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/locationinfo/MogoLocationSource.java
@@ -0,0 +1,133 @@
+package com.mogo.base.services.locationinfo;
+
+import com.elegant.spi.annotations.Service;
+import com.zhidao.locupload.location.LocationServiceProvider;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/7/16
+ *
+ * 描述
+ */
+@Service( value = LocationServiceProvider.class )
+class MogoLocationSource extends LocationServiceProvider {
+
+    @Override
+    public float getBearing() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getBearing();
+        }
+        return 0;
+    }
+
+    @Override
+    public float getAccuracy() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getAccuracy();
+        }
+        return 0;
+    }
+
+    @Override
+    public String getProvider() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getProvider();
+        }
+        return null;
+    }
+
+    @Override
+    public float getSpeed() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getSpeed();
+        }
+        return 0;
+    }
+
+    @Override
+    public double getAltitude() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getAltitude();
+        }
+        return 0;
+    }
+
+    @Override
+    public String getAdCode() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getAdCode();
+        }
+        return null;
+    }
+
+    @Override
+    public int getLocType() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getLocType();
+        }
+        return 0;
+    }
+
+    @Override
+    public double getLatitude() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getLatitude();
+        }
+        return 0;
+    }
+
+    @Override
+    public double getLongitude() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getLongitude();
+        }
+        return 0;
+    }
+
+    @Override
+    public long getTime() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getTime();
+        }
+        return 0;
+    }
+
+    @Override
+    public String getCityCode() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getCityCode();
+        }
+        return null;
+    }
+
+    @Override
+    public String getCityName() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getCityName();
+        }
+        return null;
+    }
+
+    @Override
+    public int getGpsAccuracyStatus() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getGpsAccuracyStatus();
+        }
+        return 0;
+    }
+
+    @Override
+    public int getSatellites() {
+        if ( MogoLocationInfoServices.getInstance().getLocation() != null ) {
+            return MogoLocationInfoServices.getInstance().getLocation().getSatellite();
+        }
+        return 0;
+    }
+
+    @Override
+    public int getCarStatus() {
+        // 常开状态
+        return 1;
+    }
+}
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/passport/PassportManager.java
@@ -0,0 +1,118 @@
+package com.mogo.base.services.passport;
+
+import android.content.Context;
+
+import androidx.annotation.Keep;
+
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.commons.storage.SpStorage;
+import com.mogo.service.passport.IMogoPassportManager;
+import com.mogo.service.passport.IMogoTicketCallback;
+import com.mogo.utils.logger.Logger;
+import com.zhidao.accountsdk.manager.CarPadClientManagerImpl;
+import com.zhidao.accountsdk.manager.TicketInfoCallback;
+import com.zhidao.tcloginsdk.LoginManager;
+import com.zhidao.tcloginsdk.model.TokenData;
+import com.zhidao.tcloginsdk.network.LoginCallback;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/7/16
+ *
+ * 描述
+ */
+@Keep
+class PassportManager implements IMogoPassportManager {
+
+    private static final String TAG = "PassportManager-sdk";
+    private Context mContext;
+
+    private static volatile PassportManager sInstance;
+
+    private PassportManager() {
+    }
+
+    @Keep
+    public static PassportManager getInstance() {
+        if ( sInstance == null ) {
+            synchronized ( PassportManager.class ) {
+                if ( sInstance == null ) {
+                    sInstance = new PassportManager();
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    public synchronized void release() {
+        sInstance = null;
+    }
+
+    @Override
+    public void requestTicket( final IMogoTicketCallback callback ) {
+        LoginManager.getInstance( mContext ).login( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE, DebugConfig.getProductFlavor(), new LoginCallback() {
+            @Override
+            public void onSuccess( TokenData.TokenResult result ) {
+                if ( callback != null ) {
+                    callback.onLoginSuccess( result.token, result.sn );
+                }
+                getTicket( new TicketInfoCallback() {
+                    @Override
+                    public void onSuccess( String ticket ) {
+                        Logger.d( TAG, "success" );
+                        SpStorage.setTicket( ticket );
+                        if ( callback != null ) {
+                            callback.onTicketGot( ticket );
+                        }
+                    }
+
+                    @Override
+                    public void onFailure( int code ) {
+                        Logger.d( TAG, "fail" );
+                        if ( callback != null ) {
+                            callback.onError( code, "getTicket error." );
+                        }
+                    }
+                } );
+            }
+
+            @Override
+            public void onFailure( int code, String msg ) {
+                if ( callback != null ) {
+                    callback.onError( code, "login: " + msg );
+                }
+            }
+        } );
+
+    }
+
+    private void getTicket( TicketInfoCallback callback ) {
+        CarPadClientManagerImpl.getInstance( mContext ).getTicket( "os2.0-launcher", new TicketInfoCallback() {
+            @Override
+            public void onSuccess( String ticket ) {
+                if ( callback != null ) {
+                    callback.onSuccess( ticket );
+                }
+            }
+
+            @Override
+            public void onFailure( int code ) {
+                if ( callback != null ) {
+                    callback.onFailure( code );
+                }
+            }
+        } );
+    }
+
+    @Override
+    public void init( Context context ) {
+        mContext = context;
+        int mode = DebugConfig.getNetMode();
+        if ( mode == DebugConfig.NET_MODE_DEMO ) {
+            // 演示环境用 qa 的
+            mode = DebugConfig.NET_MODE_QA;
+        }
+        LoginManager.getInstance( context ).setNetEnviron( mode );
+    }
+}
--- a/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java
+++ b/foudations/mogo-base-services-sdk/src/main/java/com/mogo/base/services/socket/SocketManager.java
@@ -0,0 +1,231 @@
+package com.mogo.base.services.socket;
+
+import android.content.Context;
+
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.mogo.base.services.BaseServicesConstants;
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.commons.network.Utils;
+import com.mogo.service.connection.IMogoMsgAckListener;
+import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.service.connection.IMogoSocketManager;
+import com.mogo.service.connection.MsgBody;
+import com.mogo.utils.logger.Logger;
+import com.mogo.utils.network.utils.GsonUtil;
+import com.zhidao.locupload.Platform;
+import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
+import com.zhidao.socket.Callback;
+import com.zhidao.socket.CallbackManager;
+import com.zhidao.socket.Environment;
+import com.zhidao.socket.SocketConfig;
+import com.zhidao.socket.SocketMessageDispatcher;
+import com.zhidao.socket.utils.RequestUtil;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/7/16
+ *
+ * 长链
+ */
+@Keep
+class SocketManager implements IMogoSocketManager, Callback {
+
+    private static final String TAG = "SocketManager-sdk";
+
+    private static volatile SocketManager sInstance;
+    private String mAppId;
+
+    public SocketManager( Context context ) {
+        CallbackManager.getInstance().register( this );
+    }
+
+    @Keep
+    public static SocketManager getInstance( Context context ) {
+        if ( sInstance == null ) {
+            synchronized ( SocketManager.class ) {
+                if ( sInstance == null ) {
+                    sInstance = new SocketManager( context );
+                }
+            }
+        }
+        return sInstance;
+    }
+
+    /**
+     * 管理消息分发
+     * <p>
+     * key - msgType
+     */
+    private Map< Integer, List< IMogoOnMessageListener > > mListeners = new ConcurrentHashMap<>();
+
+    /**
+     * 管理消息回执
+     * <p>
+     * key - msgId
+     */
+    private Map< Long, IMogoMsgAckListener > mAckListeners = new ConcurrentHashMap<>();
+
+
+    public static final int MAX_CAP = 64; //保证充足的容量应对非常延时的推送
+    private ArrayList< Long > mReceivedMsgId = new ArrayList<>( MAX_CAP );
+    private int mCurrentIndex = 0;
+
+    @Override
+    public void init( Context context, String appId ) {
+        mAppId = appId;
+        SocketConfig.instance()
+                .setAppContext( context.getApplicationContext() )
+                .setEnvironment( getEnvironment() )
+                .setClient( Platform.getClient( Platform.car ) )
+                .setChannelId( BaseServicesConstants.SOCKET_CHANNEL_ID )
+                .setOpenAnalytics( true )
+                .setSn( Utils.getSn() )
+                .setDebug( DebugConfig.isDebug() );
+        SocketMessageDispatcher.getInstance().start( context );
+    }
+
+    private Environment getEnvironment() {
+        switch ( DebugConfig.getNetMode() ) {
+            case 1:
+                return Environment.dev;
+            case 2:
+            case 4:
+                return Environment.qa;
+            case 3:
+            default:
+                return Environment.release;
+        }
+    }
+
+    @Override
+    public void update( @NonNull CallbackManager manager, @NonNull byte[] content, String appId, long msgId ) {
+        try {
+            MogoConnsvr.Payload payload = MogoConnsvr.Payload.parseFrom( content );
+            int msgType = payload.getMsgType();
+            Logger.d( TAG, "received msg type = %d", msgType );
+            List< IMogoOnMessageListener > listeners = mListeners.get( msgType );
+            if ( listeners != null && !listeners.isEmpty() ) {
+                Iterator< IMogoOnMessageListener > iterator = listeners.iterator();
+                if ( msgId != 0 ) { //兼容老版本
+                    if ( mReceivedMsgId.contains( msgId ) ) { // 避免消息重发
+                        return;
+                    }
+                    cacheLastReceivedMsgId( msgId );
+                }
+                Object object = null;
+                while ( iterator.hasNext() ) {
+                    IMogoOnMessageListener listener = iterator.next();
+                    if ( object == null ) {
+                        object = GsonUtil.objectFromJson( payload.getPayload().toStringUtf8(), listener.target() );
+                    }
+                    if ( listener != null ) {
+                        Logger.d( TAG, "received msgId = %s, content = %s", msgId, payload.getPayload().toStringUtf8() );
+                        listener.onMsgReceived( object );
+                    }
+                }
+            }
+        } catch ( InvalidProtocolBufferException e ) {
+            Logger.e( TAG, e, "parse msg error." );
+        }
+    }
+
+    @Override
+    public void onAck( @NonNull CallbackManager manager, @NonNull byte[] headerBytes, byte[] content ) {
+        try {
+            MogoConnsvr.Header header = MogoConnsvr.Header.parseFrom( headerBytes );
+            int msgType = header.getMsgType();
+            String appId = header.getAppId();
+            int productLine = header.getProductLine();
+            long msgId = header.getMsgId();
+            IMogoMsgAckListener listener = mAckListeners.remove( msgId );
+            if ( listener != null ) {
+                listener.onAck( msgId );
+            }
+            Logger.d( TAG, "send message success: msgType = %d, appId = %s, productLine = %d", msgType, appId, productLine );
+        } catch ( InvalidProtocolBufferException e ) {
+            e.printStackTrace();
+        }
+    }
+
+    private void cacheLastReceivedMsgId( long msgId ) {
+        if ( msgId == 0 ) {
+            return;
+        }
+        synchronized ( this ) {
+            mReceivedMsgId.add( mCurrentIndex % MAX_CAP, msgId );
+            mCurrentIndex++;
+        }
+    }
+
+    @Override
+    public void registerOnMessageListener( int msgType, IMogoOnMessageListener listener ) {
+        if ( mListeners.containsKey( msgType ) ) {
+            Logger.w( TAG, "msgType %d is exist.", msgType );
+        }
+        if ( !mListeners.containsKey( msgType ) ) {
+            mListeners.put( msgType, new ArrayList< IMogoOnMessageListener >() );
+        }
+        mListeners.get( msgType ).add( listener );
+    }
+
+    @Override
+    public void unregisterOnMessageListener( int msgType ) {
+        mListeners.remove( msgType );
+    }
+
+    @Override
+    public void unregisterOnMessageListener( int msgType, IMogoOnMessageListener listener ) {
+        if ( listener == null ) {
+            return;
+        }
+        if ( !mListeners.containsKey( msgType ) ) {
+            return;
+        }
+        List< IMogoOnMessageListener > listeners = mListeners.get( msgType );
+        if ( listeners != null && listeners.contains( listener ) ) {
+            listeners.remove( listener );
+        }
+    }
+
+    @Override
+    public void sendMsg( MsgBody body, IMogoMsgAckListener listener ) {
+        Logger.d( TAG, "sendMsg." );
+        final byte[] pb = convertToPBBytes( body.getMsgType(), objectToBytes( body.getContent() ) );
+        RequestUtil.sendPayloadData( mAppId, 2, pb, 1, true, System.currentTimeMillis() );
+    }
+
+    public byte[] objectToBytes( Object obj ) {
+        String jsonStr = GsonUtil.jsonFromObject( obj );
+        return jsonStr.getBytes();
+    }
+
+    private byte[] convertToPBBytes( int msgType, byte[] payloadBytes ) {
+        MogoConnsvr.Payload payloadData = MogoConnsvr.Payload.newBuilder()
+                .setMsgType( msgType )
+                .setPayload( ByteString.copyFrom( payloadBytes ) ).build();
+        return payloadData.toByteArray();
+    }
+
+    public synchronized void release() {
+        mListeners.clear();
+        mListeners = null;
+        sInstance = null;
+    }
+
+
+    @Override
+    public void init( Context context ) {
+    }
+
+}
--- a/foudations/mogo-base-services-sdk/src/test/java/com/mogo/base/services/ExampleUnitTest.java
+++ b/foudations/mogo-base-services-sdk/src/test/java/com/mogo/base/services/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.mogo.base.services;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals( 4, 2 + 2 );
+    }
+}
--- a/foudations/mogo-commons/consumer-rules.pro
+++ b/foudations/mogo-commons/consumer-rules.pro
@@ -0,0 +1,6 @@
+#-----Foundation-Commons-----
+-keep class com.mogo.commons.data.BaseData.*{*;}
+-keep class com.mogo.commons.voice.VoiceIntentTrack
+-keep class com.mogo.commons.voice.VoiceTrack
+-keep class com.mogo.commons.voice.VoicePreemptType
+-keep interface * implements com.mogo.commons.mvp.IView
--- a/foudations/mogo-commons/proguard-rules.pro
+++ b/foudations/mogo-commons/proguard-rules.pro
@@ -19,3 +19,10 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#-----Foundation-Commons-----
+-keep class com.mogo.commons.data.BaseData.*{*;}
+-keep class com.mogo.commons.voice.VoiceIntentTrack
+-keep class com.mogo.commons.voice.VoiceTrack
+-keep class com.mogo.commons.voice.VoicePreemptType
+-keep interface * implements com.mogo.commons.mvp.IView
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
@@ -1,9 +1,7 @@
 package com.mogo.commons;

 import android.app.Application;
-import android.content.Context;
 import android.text.TextUtils;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
@@ -20,11 +18,7 @@ import com.mogo.commons.network.X509TrustManagerImpl;
 import com.mogo.commons.storage.SpStorage;
 import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.TipToast;
-import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.NetConfig;
-import com.zhidao.account.sdk.AccountClientManager;
-import com.zhidao.account.sdk.callback.TicketInfoCallback;
-import com.zhidao.account.sdk.network.NetEnvironManager;

 import java.io.IOException;
 import java.security.SecureRandom;
@@ -98,7 +92,6 @@ public class AbsMogoApplication extends Application {
    private void asyncInit() {
        ThreadPoolService.execute( () -> {
            initNetConfig();
-            initAccountSdk();
            // 初始化toast
            // 初始化埋点
            Analytics.getInstance().start( sApp );
@@ -109,36 +102,12 @@ public class AbsMogoApplication extends Application {
            AnalyticsConfig.getInstance( sApp ).shouldLog( DebugConfig.isDebug() );
            Devices.init( getApp() );
            Devices.checkBindState();
+            asyncInitImpl();
        } );
    }

-    private static void initAccountSdk() {
-        int mode = DebugConfig.getNetMode();
-        if ( mode == DebugConfig.NET_MODE_DEMO ) {
-            // 演示环境用 qa 的
-            mode = DebugConfig.NET_MODE_QA;
-        }
-        AccountClientManager.init( sApp, mode, NetEnvironManager.OS_2C, "os2.0-launcher" );
-        getTicket( new TicketInfoCallback() {
-            @Override
-            public void onSuccess( String ticket ) {
-                SpStorage.setTicket( ticket );
-                Logger.w( TAG, "request ticket success" );
-            }
+    protected void asyncInitImpl(){

-            @Override
-            public void onFailure( int code, String msg ) {
-                Logger.w( TAG, "request ticket error code = %d, msg = %s", code, msg );
-            }
-        } );
-    }
-
-    private static void getTicket( TicketInfoCallback callback ) {
-        if ( DebugConfig.isLauncher() ) {
-            AccountClientManager.getTicket( callback );
-        } else {
-            AccountClientManager.getAppTicket( callback );
-        }
    }

    private static void initNetConfig() {
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
@@ -7,6 +7,8 @@ import com.mogo.utils.logger.Logger;
 * @since 2019-12-23
 * <p>
 * 各个模块递调试信息控制接口
+ * <p>
+ * 注：该类已经不再是简单的调试配置，已经涉及到功能逻辑了 囧
 */
 public class DebugConfig {

@@ -53,6 +55,11 @@ public class DebugConfig {

    private static int sNetMode = NET_MODE_RELEASE;

+    /**
+     * 不使用语音助手
+     */
+    public static final int AI_TYPE_NOOP = 0;
+
    /**
     * 语音使用同行者
     */
@@ -64,6 +71,18 @@ public class DebugConfig {

    private static int sAIType = AI_TYPE_TXZ;

+    /**
+     * 自研车机
+     */
+    public static final int CAR_MACHINE_TYPE_SELF_INNOVATE = 0;
+
+    /**
+     * 比亚迪的车机
+     */
+    public static final int CAR_MACHINE_TYPE_BYD = 1;
+
+    private static int sCarMachineType = CAR_MACHINE_TYPE_SELF_INNOVATE;
+
    /**
     * 获取网络环境类型
     *
@@ -115,20 +134,39 @@ public class DebugConfig {

    /**
     * 设置使用哪个语音助手
-     * @param aiType {@link #AI_TYPE_TXZ}   {@link #AI_TYPE_SPEECH}
+     *
+     * @param aiType {@link #AI_TYPE_NOOP} {@link #AI_TYPE_TXZ}   {@link #AI_TYPE_SPEECH}
     */
-    public static void setAIType(int aiType){
-        Logger.d("DebugConfig", "setAiType: " + aiType);
+    public static void setAIType( int aiType ) {
+        Logger.d( "DebugConfig", "setAiType: " + aiType );
        sAIType = aiType;
    }

    /**
-     * 使用哪个语音助手  {@link #AI_TYPE_TXZ}   {@link #AI_TYPE_SPEECH}
+     * 使用哪个语音助手 {@link #AI_TYPE_NOOP}  {@link #AI_TYPE_TXZ}   {@link #AI_TYPE_SPEECH}
     */
-    public static int getAIType(){
+    public static int getAIType() {
        return sAIType;
    }

+    /**
+     * 设置当前车机类型
+     *
+     * @param type {@link #CAR_MACHINE_TYPE_SELF_INNOVATE} {@link #CAR_MACHINE_TYPE_BYD}
+     */
+    public static void setCarMachineType( int type ) {
+        sCarMachineType = type;
+    }
+
+    /**
+     * 获取当前车机类型
+     *
+     * @return {@link #CAR_MACHINE_TYPE_SELF_INNOVATE} {@link #CAR_MACHINE_TYPE_BYD}
+     */
+    public static int getCarMachineType() {
+        return sCarMachineType;
+    }
+
    /**
     * 是否作为launcher运行
     */
@@ -152,20 +190,10 @@ public class DebugConfig {
        DebugConfig.sRequestOnlineCarData = sRequestOnlineCarData;
    }

-    private static boolean useMockObuData;
-
-    public static void setUseMockObuData(boolean use) {
-        useMockObuData = use;
-    }
-
-    public static boolean isUseMockObuData() {
-        return useMockObuData;
-    }
-
    /**
     * 是否支持临时激活小智
     */
-    private static boolean sActiveAIAssistFlag = true;
+    private static boolean sActiveAIAssistFlag = false;

    public static boolean isActiveAIAssistFlag() {
        return sActiveAIAssistFlag;
@@ -174,4 +202,52 @@ public class DebugConfig {
    public static void setActiveAIAssistFlag( boolean sActiveAIAssistFlag ) {
        DebugConfig.sActiveAIAssistFlag = sActiveAIAssistFlag;
    }
+
+    private static boolean useMockObuData;
+
+    public static void setUseMockObuData( boolean use ) {
+        useMockObuData = use;
+    }
+
+    public static boolean isUseMockObuData() {
+        return useMockObuData;
+    }
+
+    private static String sProductFlavor;
+
+    public static String getProductFlavor() {
+        return sProductFlavor;
+    }
+
+    /**
+     * 产品线
+     *
+     * @param sProductFlavor
+     */
+    public static void setProductFlavor( String sProductFlavor ) {
+        DebugConfig.sProductFlavor = sProductFlavor;
+    }
+
+    private static String sSocketAppId;
+
+    public static void setSocketAppId( String sSocketAppId ) {
+        DebugConfig.sSocketAppId = sSocketAppId;
+    }
+
+    public static String getSocketAppId() {
+        return sSocketAppId;
+    }
+
+    /**
+     * 道路事件动画
+     */
+    private static boolean sRoadEventAnimated = false;
+
+    public static boolean isRoadEventAnimated() {
+        return sRoadEventAnimated;
+    }
+
+    public static void setRoadEventAnimated( boolean sRoadEventAnimated ) {
+        DebugConfig.sRoadEventAnimated = sRoadEventAnimated;
+    }
 }
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -4,9 +4,14 @@ import android.content.Context;
 import android.os.Bundle;

 import android.view.MotionEvent;
+import android.view.Window;
+import android.view.WindowManager;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.utils.SoftKeyBoardJobber;

 /**
@@ -23,6 +28,10 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
    @Override
    protected void onCreate( @Nullable Bundle savedInstanceState ) {
        super.onCreate( savedInstanceState );
+        if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD) {
+            requestWindowFeature(Window.FEATURE_NO_TITLE);
+            getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        }
        setContentView( getLayoutId() );
        initViews();
        mPresenter = createPresenter();
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpFragment.java
@@ -37,8 +37,9 @@ public abstract class MvpFragment<V extends IView, P extends Presenter<V>> exten
            mRootView = inflater.inflate( getLayoutId(), container, false );
        } else {
            ViewGroup viewGroup = ( ViewGroup ) mRootView.getParent();
-            if ( viewGroup != null )
+            if ( viewGroup != null ) {
                viewGroup.removeView( mRootView );
+            }
        }
        mRootView = inflater.inflate(getLayoutId(), container, false);
        return mRootView;
@@ -82,6 +83,10 @@ public abstract class MvpFragment<V extends IView, P extends Presenter<V>> exten
    @NonNull
    protected abstract P createPresenter();

+    public P getPresenter() {
+        return mPresenter;
+    }
+
    @Nullable
    protected <T extends View> T findViewById(int id) {
        if (mRootView == null) {
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ParamsUtil.java
@@ -30,7 +30,7 @@ public class ParamsUtil {
    public static Map< String, Object > getDynamicParams() {
        Map< String, Object > params = new ArrayMap();

-        final Map<String,Object> location = LocationHelper.getInstance().getLocationProperties();
+        final Map< String, Object > location = LocationHelper.getInstance().getLocationProperties();
        if ( location != null ) {
            params.putAll( location );
        }
@@ -61,6 +61,7 @@ public class ParamsUtil {
        STATIC_PARAMS.put( ServerParam.DEVICE_ID, DeviceIdUtils.getDeviceId( AbsMogoApplication.getApp() ) );
        STATIC_PARAMS.put( ServerParam.IMEI, CommonUtils.getIMEI( AbsMogoApplication.getApp() ) );
        STATIC_PARAMS.put( ServerParam.IMSI, CommonUtils.getIMSI( AbsMogoApplication.getApp() ) );
+        STATIC_PARAMS.put( ServerParam.FOTA_VERSION, Utils.getFotaVersion() );
        STATIC_PARAMS.put( ServerParam.END_POINT, ServerParam.END_POINT_CAR );
    }

@@ -71,7 +72,8 @@ public class ParamsUtil {
    public static Map< String, Object > getAnalyticsCustomParams() {
        Map< String, Object > map = new ArrayMap<>();
        map.put( "debug", DebugConfig.isDebug() ? 1 : 0 );
-        map.put( "systemversion", Utils.getFotaVersion() );
+        String fota = Utils.getFotaVersion();
+        map.put( "systemversion", TextUtils.isEmpty( fota ) ? DebugConfig.getProductFlavor() : fota );
        map.put( "sn", Utils.getSn() );
        return map;
    }
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ServerParam.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/ServerParam.java
@@ -34,6 +34,8 @@ class ServerParam {
    public static final String SN = "sn";
    public static final String CHANNEL = "channel";

+    public static final String FOTA_VERSION = "fotaVersion";
+
    public static final String USER_ID = "userId";
    public static final String FILE = "file";
    public static final String END_POINT = "endPoint";
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/SubscribeImpl.java
@@ -3,7 +3,6 @@ package com.mogo.commons.network;
 import com.mogo.commons.data.BaseData;
 import com.mogo.utils.logger.Logger;
 import com.mogo.utils.network.RequestOptions;
-import com.mogo.utils.network.utils.GsonUtil;
 import com.mogo.utils.network.utils.Util;

 import io.reactivex.Observer;
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/network/Utils.java
@@ -2,11 +2,17 @@ package com.mogo.commons.network;

 import android.Manifest;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.telephony.CellLocation;
 import android.telephony.TelephonyManager;
 import android.telephony.cdma.CdmaCellLocation;
 import android.telephony.gsm.GsmCellLocation;
+import android.text.TextUtils;
+
+import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.debug.DebugConfig;
+import com.mogo.utils.storage.SharedPrefsMgr;

 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -55,10 +61,15 @@ public class Utils {

    public static final String GET = "get";
    public static final String GSM_SERIAL = "gsm.serial";
+    public static final String BYD_SERIAL = "ro.serialno";
    public static final String FOTA_VERSION = "ro.fota.version";
    public static final String PROPERTIES = "android.os.SystemProperties";

    public static String getSn() {
+
+        if ( DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE ) {
+            return SharedPrefsMgr.getInstance( AbsMogoApplication.getApp() ).getString( "allocated_sn" );
+        }
        return getSystemProperties( GSM_SERIAL );
    }

--- a/foudations/mogo-connection/gradle.properties
+++ b/foudations/mogo-connection/gradle.properties
@@ -1,3 +0,0 @@
-GROUP=com.mogo.connection
-POM_ARTIFACT_ID=mogo-connection
-VERSION_CODE=1
--- a/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/MsgBody.java
+++ b/foudations/mogo-connection/src/main/java/com/mogo/connection/socket/MsgBody.java
@@ -1,76 +0,0 @@
-package com.mogo.connection.socket;
-
-import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon;
-import com.zhidao.ptech.connsvr.protocol.MogoConnsvr;
-
-/**
- * @author congtaowang
- * @since 2019-12-31
- * <p>
- * 描述
- */
-public class MsgBody {
-
-    private int mMsgType;
-
-    /**
-     * 服务端分发，业务线
-     */
-    private int mProductLine = MogoCommon.Product.mogoBussiness_VALUE;
-
-    /**
-     *
-     */
-    private int mHeaderType = MogoConnsvr.MsgType.mogoMsgTypeDispatchSvrNoRspReq_VALUE;
-
-    /**
-     * 是否回执
-     */
-    private boolean mAck = false;
-
-    /**
-     * 消息ID
-     */
-    private final long mMsgId = System.currentTimeMillis();
-
-    private Object mContent;
-
-    public MsgBody msgType( int msgType ) {
-        this.mMsgType = msgType;
-        return this;
-    }
-
-    public MsgBody ack( boolean ack ) {
-        this.mAck = ack;
-        return this;
-    }
-
-    public MsgBody content( Object content ) {
-        this.mContent = content;
-        return this;
-    }
-
-    public int getMsgType() {
-        return mMsgType;
-    }
-
-    public int getProductLine() {
-        return mProductLine;
-    }
-
-    public int getHeaderType() {
-        return mHeaderType;
-    }
-
-    public boolean ismAck() {
-        return mAck;
-    }
-
-    public long getMsgId() {
-        return mMsgId;
-    }
-
-    public Object getContent() {
-        return mContent;
-    }
-}
--- a/foudations/mogo-connection/src/main/res/values/strings.xml
+++ b/foudations/mogo-connection/src/main/res/values/strings.xml
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">mogo-connection</string>
-</resources>
--- a/foudations/mogo-utils/build.gradle
+++ b/foudations/mogo-utils/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'com.android.library'
-
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 android {
    compileSdkVersion rootProject.ext.android.compileSdkVersion
    // buildToolsVersion rootProject.ext.android.buildToolsVersion
@@ -30,6 +31,7 @@ android {
 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    api rootProject.ext.dependencies.glide
+    implementation rootProject.ext.dependencies.kotlinstdlibjdk7
    implementation rootProject.ext.dependencies.glideanno
    implementation rootProject.ext.dependencies.glideokhttp3
    implementation rootProject.ext.dependencies.supportannos
--- a/foudations/mogo-utils/consumer-rules.pro
+++ b/foudations/mogo-utils/consumer-rules.pro
@@ -0,0 +1,5 @@
+#-----MogoUtils-----
+-keep class com.mogo.utils.network.CallerType
+-keep class com.mogo.utils.network.CallerRestrictTo
+-keep class com.mogo.utils.glide.GlideRoundedCornersTransform.CornerType
+-keep class com.mogo.utils.logger.LogLevel
--- a/foudations/mogo-utils/proguard-rules.pro
+++ b/foudations/mogo-utils/proguard-rules.pro
@@ -19,3 +19,9 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#-----MogoUtils-----
+-keep class com.mogo.utils.network.CallerType
+-keep class com.mogo.utils.network.CallerRestrictTo
+-keep class com.mogo.utils.glide.GlideRoundedCornersTransform.CornerType
+-keep class com.mogo.utils.logger.LogLevel
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java
@@ -57,4 +57,34 @@ public class AppUtils {
            return null;
        }
    }
+
+    public static boolean isAppForeground( Context context ) {
+        if ( context != null ) {
+            ActivityManager activityManager = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE );
+            List< ActivityManager.RunningAppProcessInfo > processes = activityManager.getRunningAppProcesses();
+            for ( ActivityManager.RunningAppProcessInfo processInfo : processes ) {
+                if ( processInfo.processName.equals( context.getPackageName() ) ) {
+                    if ( processInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND ) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    public static boolean isAppForeground( Context context, String pkg ) {
+        if ( context != null ) {
+            ActivityManager activityManager = ( ActivityManager ) context.getSystemService( Context.ACTIVITY_SERVICE );
+            List< ActivityManager.RunningAppProcessInfo > processes = activityManager.getRunningAppProcesses();
+            for ( ActivityManager.RunningAppProcessInfo processInfo : processes ) {
+                if ( processInfo.processName.equals( pkg ) ) {
+                    if ( processInfo.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND ) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/DateTimeUtils.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/DateTimeUtils.java
@@ -443,8 +443,8 @@ public class DateTimeUtils {
     * @param timestamp 时间戳
     * @return
     */
-    public static String getTimeText( long timestamp) {
-        SimpleDateFormat format = new SimpleDateFormat(yyyy_Nian_MM_Yue_dd_Ri, Locale.US);
+    public static String getTimeText( long timestamp, String dateFormat) {
+        SimpleDateFormat format = new SimpleDateFormat(dateFormat, Locale.US);
        String strStart = format.format(new Date(timestamp));
        return strStart;
    }
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/ThreadPoolService.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/ThreadPoolService.java
@@ -7,7 +7,7 @@ import java.util.concurrent.ThreadFactory;
 public class ThreadPoolService {

    private static final ExecutorService SERVICE = Executors.newFixedThreadPool( 3, new ThreadFactoryImpl() );
-
+    private static final ExecutorService SINGLE_THREAD_SERVICE = Executors.newSingleThreadExecutor(new SingleThreadFactoryImpl());
    private static class ThreadFactoryImpl implements ThreadFactory {

        private static int mCounter = 1;
@@ -18,10 +18,26 @@ public class ThreadPoolService {
        }
    }

+    /**
+     * 单线程队列执行的ThreadFactory实现，应该只会new一个Thread
+     */
+    private static class SingleThreadFactoryImpl implements ThreadFactory{
+        private static int counter = 1;
+
+        @Override
+        public Thread newThread(Runnable r) {
+            return new Thread(r, "SingleThread - " + counter++);
+        }
+    }
+
    private ThreadPoolService() {
    }

    public static void execute( Runnable task ) {
        SERVICE.execute( task );
    }
+
+    public static void singleExecute(Runnable task) {
+        SINGLE_THREAD_SERVICE.execute(task);
+    }
 }
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLBaseDao.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLBaseDao.java
@@ -0,0 +1,488 @@
+package com.mogo.utils.sqlite;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import com.mogo.utils.logger.Logger;
+import com.mogo.utils.sqlite.annotation.DbField;
+import com.mogo.utils.sqlite.annotation.DbTable;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 数据库操作
+ *
+ * @param <T>
+ * @author donghongyu
+ */
+public class SQLBaseDao<T> implements SQLIDao<T> {
+    private String TAG = "SQLBaseDao";
+
+    //数据库操作的引用
+    private SQLiteDatabase sqLiteDatabase;
+    //要操作的数据实体的引用
+    private Class<T> entityClass;
+    //要操作的数据表名称
+    private String tableName;
+    //记录数据表是否存在
+    private boolean isInit = false;
+
+    //因为反射会消耗时间，这里使用缓存，进行性能优化
+    //缓存空间（key-字段名,标注的自定义注解 value-成员变量）
+    private HashMap<String, Field> cacheField;
+
+    @Override
+    public boolean init(@NotNull SQLiteDatabase sqLiteDatabase, @NotNull Class<T> entityClass) {
+        this.sqLiteDatabase = sqLiteDatabase;
+        this.entityClass = entityClass;
+        //自动建表（只创建一次）
+        if (!isInit) {
+            //获取表名
+            tableName = entityClass.getAnnotation(DbTable.class).tableName();
+
+            //如果数据库没有建立连接跳出操作防止异常信息
+            if (!sqLiteDatabase.isOpen()) {
+                return false;
+            }
+
+            //执行Sql进行自动建表
+            String createTableSql = getCreateTableSql();
+            Logger.d(TAG, "执行SQL：" + createTableSql);
+            sqLiteDatabase.execSQL(createTableSql);
+
+            //初始化缓存空间
+            cacheField = new HashMap();
+            initCacheField();
+
+            //标记已经创建过数据表
+            isInit = true;
+        }
+
+        return isInit;
+    }
+
+    /**
+     * 插入数据
+     *
+     * @param entity 要插入数据的数据对象爱你那个
+     * @return 插入结果ID，如果发生错误则为-1
+     */
+    @Override
+    public long insert(T entity) {
+        //1、准备好ContentValues中的数据
+        //2、设置插入的内容
+        ContentValues values = getContentValuesForInsert(entity);
+        //3、执行插入
+        long result;
+        if (sqLiteDatabase != null && sqLiteDatabase.isOpen()) {
+            result = sqLiteDatabase.insert(tableName, null, values);
+        } else {
+            result = -1;
+        }
+        return result;
+    }
+
+    /**
+     * 删除数据
+     *
+     * @param where 要删除的对象，对象的字段如果赋值，则代表查询条件
+     * @return 受影响行数
+     */
+    @Override
+    public int delete(T where) {
+        // 拼接查询条件
+        Condition condition = new Condition(getContentValuesForQuery(where));
+        int result;
+        if (sqLiteDatabase != null && sqLiteDatabase.isOpen()) {
+            //受影响行数
+            result = sqLiteDatabase.delete(
+                    tableName,
+                    condition.getWhereCause(),
+                    condition.getWhereArgs()
+            );
+        } else {
+            result = -1;
+        }
+        return result;
+    }
+
+    /**
+     * 更新数据
+     *
+     * @param where     要更新的对象，对象的字段如果赋值，则代表查询条件
+     * @param newEntity 新的数据内容
+     * @return 受影响行数
+     */
+    @Override
+    public int update(T where, T newEntity) {
+        Condition condition = new Condition(getContentValuesForQuery(where));
+        int result;
+        if (sqLiteDatabase != null && sqLiteDatabase.isOpen()) {
+            //受影响行数
+            result = sqLiteDatabase.update(
+                    tableName,
+                    getContentValuesForInsert(newEntity),
+                    condition.getWhereCause(),
+                    condition.getWhereArgs()
+            );
+        } else {
+            result = -1;
+        }
+        return result;
+    }
+
+    /**
+     * 查询数据
+     *
+     * @param where 查询条件对象,同时也用来初始化对象使用
+     */
+    @NotNull
+    @Override
+    public List<T> query(T where) {
+        return query(where, null, null, null);
+    }
+
+
+    /**
+     * 查询数据
+     *
+     * @param where 查询条件对象,同时也用来初始化对象使用
+     */
+    @NotNull
+    @Override
+    public List<T> query(T where, String orderBy) {
+        return query(where, orderBy, null, null);
+    }
+
+    /**
+     * @param where       根据条件 [where] 进行数据查询，如果[where]==只初始化不赋值 则代表查询所有数据
+     * @param orderBy     排序字段
+     * @param isOrderDESC 是否倒序 true-倒序，false-正序
+     * @return 结果集合
+     */
+    @Override
+    public List<T> query(T where, String orderBy, boolean isOrderDESC) {
+        if (isOrderDESC) {
+            orderBy = orderBy + " DESC";
+        }
+        return query(where, orderBy, null, null);
+    }
+
+    /**
+     * 查询数据
+     *
+     * @param where      查询条件对象
+     * @param orderBy    排序规则
+     * @param startIndex 开始的位置
+     * @param limit      限制查询得到的数据个数
+     */
+    public ArrayList<T> query(T where, String orderBy, Integer startIndex, Integer limit) {
+        //拼接分页语句
+        String limitString = null;
+        if (startIndex != null && limit != null) {
+            limitString = startIndex + "," + limit;
+        }
+        Condition condition = new Condition(getContentValuesForQuery(where));
+        Cursor cursor = null;
+        //定义查询结果
+        ArrayList<T> result = new ArrayList<>();
+        if (sqLiteDatabase != null && sqLiteDatabase.isOpen()) {
+            try {
+                //查询数据库
+                cursor = sqLiteDatabase.query(
+                        tableName,
+                        null,
+                        condition.getWhereCause(),
+                        condition.getWhereArgs(),
+                        null,
+                        null,
+                        orderBy,
+                        limitString
+                );
+                //将查到结果添加到返回集合中
+                result.addAll(getQueryResult(cursor, where));
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                if (cursor != null) {
+                    cursor.close();
+                }
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 获取查询db结果
+     */
+    private ArrayList<T> getQueryResult(Cursor cursor, T where) {
+        //定义查询结果
+        ArrayList<T> result = new ArrayList<>();
+        //Cursor从头读到尾
+        //游标从头读到尾
+        cursor.moveToFirst();
+        try {
+            if (where != null) {
+                //移动游标获取下一行数据
+                while (!cursor.isAfterLast()) {
+                    //通过反射构建一个查询结果对象
+                    T item = (T) where.getClass().newInstance();
+                    Set<Map.Entry<String, Field>> fieldIterator = cacheField.entrySet();
+                    for (Map.Entry<String, Field> stringFieldEntry : fieldIterator) {
+                        //获取数据库字段名称
+                        String columnName = stringFieldEntry.getKey();
+                        //数据库字段名对应的数据对象的成员变量
+                        Field field = stringFieldEntry.getValue();
+                        //获取指定列名对应的索引
+                        int columnIndex = cursor.getColumnIndex(columnName);
+                        //获取成员变量数据类型
+                        Class fieldType = field.getType();
+                        if (columnIndex != -1) {
+                            if (fieldType == (String.class)) {
+                                field.set(item, cursor.getString(columnIndex));
+                            } else if (fieldType == (Integer.class)) {
+                                field.set(item, cursor.getInt(columnIndex));
+                            } else if (fieldType == (Long.class)) {
+                                field.set(item, cursor.getLong(columnIndex));
+                            } else if (fieldType == (Double.class)) {
+                                field.set(item, cursor.getDouble(columnIndex));
+                            } else if (fieldType == (Boolean.class)) {
+                                int value = cursor.getInt(columnIndex);
+                                if (value == 0) {
+                                    field.set(item, false);
+                                } else {
+                                    field.set(item, true);
+                                }
+                            } else if (fieldType == (byte[].class)) {
+                                field.set(item, cursor.getBlob(columnIndex));
+                            } else {
+                                //未知类型
+                                throw new UnsupportedOperationException("未定义的数据类型：fieldName= " + columnName + " fieldType= " + fieldType);
+                            }
+                        }
+                    }
+                    //添加到结果集
+                    result.add(item);
+                    //移动到下一个位置
+                    cursor.moveToNext();
+                }
+            }
+        } catch (IllegalAccessException | InstantiationException e) {
+            e.printStackTrace();
+        }
+        cursor.close();
+        return result;
+    }
+
+    /**
+     * 初始化字段缓存
+     */
+    private void initCacheField() {
+        //1.取到所有的列名（查询一个空表获取表结构，不影响性能）
+        if (sqLiteDatabase != null && sqLiteDatabase.isOpen()) {
+            String sqlQuery = "select * from " + tableName + " limit 1,0";
+            Cursor cursor = sqLiteDatabase.rawQuery(sqlQuery, null);
+            //获取所有的列名
+            String[] columnNames = cursor.getColumnNames();
+            //关闭资源
+            cursor.close();
+            //2.取所有成员名
+            Field[] columnFields = entityClass.getDeclaredFields();
+            //3.通过两层循环，进行对应关系建立
+            for (String columnName : columnNames) {
+                for (Field columnField : columnFields) {
+                    if (columnName.equals(columnField.getAnnotation(DbField.class).fieldName())) {
+                        columnField.setAccessible(true);
+                        cacheField.put(columnName, columnField);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 拼装创建数据表的SQL语句
+     */
+    private String getCreateTableSql() {
+        //create table if not exists tb_name(_id integer,name varchar2(20))
+        StringBuffer sqlCreateTable = new StringBuffer();
+        sqlCreateTable.append("create table if not exists ");
+        sqlCreateTable.append(tableName + " (");
+        //反射获取所有的数据对象内的成员变量
+        Field[] fields = entityClass.getDeclaredFields();
+
+        for (int index = 0; index < fields.length; index++) {
+            //字段名称
+            String columnName = fields[index].getAnnotation(DbField.class).fieldName();
+            //获取成员变量数据类型
+            Class fieldType = fields[index].getType();
+
+            if (fieldType == (String.class)) {
+                sqlCreateTable.append(columnName).append(" TEXT,");
+            } else if (fieldType == (Integer.class)) {
+                sqlCreateTable.append(columnName).append(" INTEGER,");
+            } else if (fieldType == (Long.class)) {
+                sqlCreateTable.append(columnName).append(" BIGINT,");
+            } else if (fieldType == (Double.class)) {
+                sqlCreateTable.append(columnName).append(" DOUBLE,");
+            } else if (fieldType == (Boolean.class)) {
+                sqlCreateTable.append(columnName).append(" INTEGER,");
+            } else if (fieldType == (byte[].class)) {
+                sqlCreateTable.append(columnName).append(" BLOB,");
+            } else {
+                //未知类型
+                throw new UnsupportedOperationException("未定义的数据类型：fieldName= " + columnName + " fieldType= " + fieldType);
+            }
+
+            if (index == fields.length - 1) {
+                if (sqlCreateTable.toString().endsWith(",")) {
+                    sqlCreateTable.deleteCharAt(sqlCreateTable.length() - 1);
+                }
+            }
+        }
+        sqlCreateTable.append(")");
+        return sqlCreateTable.toString();
+    }
+
+    /**
+     * 获取插入使用的ContentValues
+     */
+    private ContentValues getContentValuesForInsert(T entity) {
+        ContentValues contentValues = new ContentValues();
+        Set<Map.Entry<String, Field>> fieldIterator = cacheField.entrySet();
+        for (Map.Entry<String, Field> stringFieldEntry : fieldIterator) {
+            try {
+                //获取变量的值
+                Object valueObject = stringFieldEntry.getValue().get(entity);
+                //获取列名
+                String columnName = stringFieldEntry.getKey();
+                //获取成员变量数据类型
+                Class fieldType = stringFieldEntry.getValue().getType();
+
+                if (fieldType == (String.class)) {
+                    contentValues.put(columnName, (String) valueObject);
+                } else if (fieldType == (Integer.class)) {
+                    contentValues.put(columnName, (Integer) valueObject);
+                } else if (fieldType == (Long.class)) {
+                    contentValues.put(columnName, (Long) valueObject);
+                } else if (fieldType == (Double.class)) {
+                    contentValues.put(columnName, (Double) valueObject);
+                } else if (fieldType == (Boolean.class)) {
+                    if (((boolean) valueObject)) {
+                        contentValues.put(columnName, 1);
+                    } else {
+                        contentValues.put(columnName, 0);
+                    }
+                } else if (fieldType == (byte[].class)) {
+                    contentValues.put(columnName, (byte[]) valueObject);
+                } else {
+                    //未知类型
+                    throw new UnsupportedOperationException("未定义的数据类型：fieldName= " + columnName + " fieldType= " + fieldType);
+                }
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
+        Logger.d(TAG, "contentValues:" + contentValues);
+        return contentValues;
+    }
+
+    /**
+     * 获取查询使用的 条件值对象
+     */
+    private ContentValues getContentValuesForQuery(T entity) {
+        ContentValues contentValues = new ContentValues();
+        try {
+            if (entity != null) {
+                Set<Map.Entry<String, Field>> fieldIterator = cacheField.entrySet();
+                for (Map.Entry<String, Field> stringFieldEntry : fieldIterator) {
+                    if (stringFieldEntry.getValue().get(entity) != null) {
+                        // 针对Boolean类型进行处理
+                        if (stringFieldEntry.getValue().get(entity) instanceof Boolean) {
+                            if ((boolean) stringFieldEntry.getValue().get(entity)) {
+                                contentValues.put(stringFieldEntry.getKey(), "1");
+                            } else {
+                                contentValues.put(stringFieldEntry.getKey(), "0");
+                            }
+                        }
+                        // 其它数据类型处理
+                        else {
+                            contentValues.put(stringFieldEntry.getKey(),
+                                    stringFieldEntry.getValue().get(entity).toString());
+                        }
+                    }
+                }
+            }
+        } catch (IllegalAccessError | IllegalAccessException e) {
+            e.printStackTrace();
+        }
+
+        return contentValues;
+    }
+
+    /**
+     * 条件拼接对象
+     */
+    static class Condition {
+        /**
+         * 条件key拼接
+         * _id=?&&name=?
+         */
+        private String whereCause;
+
+        /**
+         * 条件值，与 whereCause 顺序一致
+         */
+        private String[] whereArgs;
+
+        //根据传入的contentValues转换成查询条件
+        public Condition(ContentValues whereContent) {
+            //记录后面填充到查询语句“？”上的数据参数
+            ArrayList<String> argList = new ArrayList<>();
+            //拼接查询语句
+            StringBuilder whereCaseSb = new StringBuilder();
+
+            /*
+             * 是为了链接下面的查询条件条件，也或者是替换没有查询条件的语句。
+             * 比如：要把检索条件作为一个参数传递给SQL，
+             * 那么，当这个检索语句不存在的话就可以给它赋值为1=1.
+             * 这样就避免了SQL出错，也就可以把加条件的SQL和不加条件的SQL合二为一。
+             */
+            whereCaseSb.append(" 1=1 ");
+
+            Set<String> keys = whereContent.keySet();
+
+            //因为使用了“1=1”，所以即便是这里没有任何数据拼接，也是可以正常
+            for (String key : keys) {
+                Object valueObject = whereContent.get(key);
+                if (valueObject != null) {
+                    String value = (String) valueObject;
+                    //拼接查询条件语句
+                    //1:1 and _id=? and name=?
+                    whereCaseSb.append(" and  " + key + " =?");
+                    //记录？对应的value
+                    argList.add(value);
+                }
+            }
+            //集合转成数组
+            this.whereArgs = argList.toArray(new String[argList.size()]);
+            this.whereCause = whereCaseSb.toString();
+        }
+
+        public String getWhereCause() {
+            return this.whereCause;
+        }
+
+        public String[] getWhereArgs() {
+            return this.whereArgs;
+        }
+    }
+}
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLDaoFactory.kt
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLDaoFactory.kt
@@ -0,0 +1,76 @@
+package com.mogo.utils.sqlite
+
+import android.content.Context
+import android.database.sqlite.SQLiteDatabase
+import com.mogo.utils.sqlite.annotation.DbDatabase
+import com.mogo.utils.sqlite.proxy.BaseDaoProxyLog
+
+
+/**
+ * <p>数据库处理工厂</p>
+ * Created by donghongyu on 2019/9/6.
+ */
+open class SQLDaoFactory {
+
+    //默认数据库名称
+    private var dbName = "MoGoSQLite.db"
+
+    companion object {
+        //单利工厂
+        private var sqlDaoFactory: SQLDaoFactory? = null
+
+        //数据库存储路径
+        private lateinit var sqLiteDatabasePath: String
+
+        //数据库操作类
+        private var sqLiteDatabase: SQLiteDatabase? = null
+
+        fun getInstance(): SQLDaoFactory {
+            if (sqlDaoFactory == null) {
+                synchronized(SQLDaoFactory::class.java) {
+                    if (sqlDaoFactory == null) {
+                        sqlDaoFactory = SQLDaoFactory()
+                    }
+                }
+            }
+            return sqlDaoFactory!!
+        }
+    }
+
+    //获取数据库操作对象
+    fun <T : Any> getBaseDao(context: Context, entityClass: Class<T>): SQLIDao<T>? {
+        var baseDao: SQLIDao<T>? = null
+
+        try {
+            //获取数据库名称，如果没有设置则使用默认名称
+            val dbDatabase = entityClass.getAnnotation(DbDatabase::class.java)
+            if (dbDatabase != null) {
+                dbName = dbDatabase.dbName
+            }
+            //openOrCreateDatabase 如果不存在则先创建再打开数据库，如果存在则直接打开。
+            sqLiteDatabasePath =
+                    "${context.getDir("database", Context.MODE_APPEND).path}/$dbName"
+            sqLiteDatabase = SQLiteDatabase.openOrCreateDatabase(sqLiteDatabasePath, null)
+
+            // 这里为了演示，添加了日志工具的叠加使用，根据需要可以自己修改
+            // baseDao = BaseDaoProxyShow().bind(BaseDaoProxyLog().bind(BaseDao<T>())) as IBaseDao<T>
+            // baseDao = BaseDaoProxyLog().bind(SQLBaseDao<T>()) as IBaseDao<T>
+            // baseDao = BaseDao<T>()
+            baseDao = BaseDaoProxyLog().bind(SQLBaseDao<T>()) as SQLIDao<T>
+
+            baseDao.init(sqLiteDatabase!!, entityClass)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
+        return baseDao
+    }
+
+    /**
+     * 关闭数据库
+     */
+    fun closeDatabase() {
+        sqLiteDatabase?.close()
+    }
+
+}
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLIDao.java
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/SQLIDao.java
@@ -0,0 +1,53 @@
+package com.mogo.utils.sqlite;
+
+import android.database.sqlite.SQLiteDatabase;
+
+import java.util.List;
+
+/**
+ * 数据库操作接口
+ *
+ * @author donghongyu
+ */
+public interface SQLIDao<T> {
+    /**
+     * 初始化数据库连接
+     */
+    boolean init(SQLiteDatabase sqLiteDatabase, Class<T> entityClass);
+
+    /**
+     * 将 [entity] 进行数据插入
+     */
+    long insert(T entity);
+
+    /**
+     * 根据条件 [where] 进行数据删除，如果[where]==只初始化不赋值 则代表删除所有数据
+     */
+    int delete(T where);
+
+    /**
+     * 根据条件 [where] 进行数据更新，如果[where]==只初始化不赋值 则代表删除所有数据
+     */
+    int update(T where, T newEntity);
+
+    /**
+     * @param where 根据条件 [where] 进行数据查询，如果[where]==只初始化不赋值 则代表查询所有数据
+     * @return 结果集合
+     */
+    List<T> query(T where);
+
+    /**
+     * @param where   根据条件 [where] 进行数据查询，如果[where]==只初始化不赋值 则代表查询所有数据
+     * @param orderBy 排序字段
+     * @return 结果集合
+     */
+    List<T> query(T where, String orderBy);
+
+    /**
+     * @param where       根据条件 [where] 进行数据查询，如果[where]==只初始化不赋值 则代表查询所有数据
+     * @param orderBy     排序字段
+     * @param isOrderDESC 是否倒序
+     * @return 结果集合
+     */
+    List<T> query(T where, String orderBy, boolean isOrderDESC);
+}
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbDatabase.kt
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbDatabase.kt
@@ -0,0 +1,15 @@
+package com.mogo.utils.sqlite.annotation
+
+
+/**
+ * <p>添加在要操作的数据对象名上面，用来设置数据库名称</p>
+ *
+ *  /**
+ *  * @DbDatabase("AppSQLite.db")
+ *  * class UserEntity {}
+ *  */
+ * Created by donghongyu on 2019/9/6.
+ */
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS)
+annotation class DbDatabase(val dbName: String)
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbField.kt
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbField.kt
@@ -0,0 +1,21 @@
+package com.mogo.utils.sqlite.annotation
+
+
+/**
+ * <p>添加在要处理的数据对象的字段之上，用来设置数据表的字段名称</p>
+ * /**
+ * *@DbTable("tb_user")
+ * *class UserEntity {
+ * *    @DbField("_id")
+ * *    var id: Int = 0
+ * *    @DbField("name")
+ * *    var name: String? = null
+ * *    @DbField("password")
+ * *    var password: String? = null
+ * *}
+ * */
+ * Created by donghongyu on 2019/9/6.
+ */
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.FIELD)
+annotation class DbField(val fieldName: String)
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbTable.kt
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/annotation/DbTable.kt
@@ -0,0 +1,15 @@
+package com.mogo.utils.sqlite.annotation
+
+
+/**
+ * <p>添加在要操作的数据对象名上面，用来设置数据表名称</p>
+ *
+ *  /**
+ *  * @DbTable("tb_user")
+ *  * class UserEntity {}
+ *  */
+ * Created by donghongyu on 2019/9/6.
+ */
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS)
+annotation class DbTable(val tableName: String)
--- a/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/proxy/BaseDaoProxyLog.kt
+++ b/foudations/mogo-utils/src/main/java/com/mogo/utils/sqlite/proxy/BaseDaoProxyLog.kt
@@ -0,0 +1,51 @@
+package com.mogo.utils.sqlite.proxy
+
+import com.mogo.utils.logger.Logger
+import com.mogo.utils.network.utils.GsonUtil
+import java.lang.reflect.InvocationHandler
+import java.lang.reflect.Method
+import java.lang.reflect.Proxy
+
+/**
+ * 使用java实现动态代理数据库操作类加入日志功能
+ * Created by donghongyu on 2019/9/6.
+ */
+
+class BaseDaoProxyLog : InvocationHandler {
+
+    private var target: Any? = null
+
+    /**
+     * 绑定委托对象并返回一个【代理占位】
+     *
+     * @param target 真实对象
+     * @return 代理对象【占位】
+     */
+    fun bind(target: Any): Any {
+        this.target = target
+        //取得代理对象
+        return Proxy.newProxyInstance(
+                target.javaClass.classLoader,
+                target.javaClass.interfaces, this
+        )
+    }
+
+    /**
+     * 同过代理对象调用方法首先进入这个方法.
+     *
+     * @param proxy  --代理对象
+     * @param method -- 方法,被调用方法.
+     * @param args   -- 方法的参数
+     */
+    @Throws(Throwable::class)
+    override fun invoke(proxy: Any, method: Method, args: Array<Any>): Any? {
+        var result: Any? = null
+        //反射方法前调用
+        Logger.i("SQL数据库管理", "当前执行>>${method.name}>>")
+        //反射执行方法  相当于调用target.sayHelllo;
+        result = method.invoke(target, *args)
+        //反射方法后调用.
+        Logger.i("SQL数据库管理", "执行结果>>$result")
+        return result
+    }
+}
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+#org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx4096m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -17,6 +18,7 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
+org.gradle.parallel=true

 ## maven 配置
 RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
@@ -27,70 +29,85 @@ PASSWORD=xintai2018
 RELEASE=false
 # 模块版本
 ## 工程内模块
-MOGO_COMMONS_VERSION=1.2.1.12-shunyi
-MOGO_UTILS_VERSION=1.2.1.12-shunyi
-MAP_AMAP_VERSION=1.2.1.12-shunyi
-MAP_AUTONAVI_VERSION=1.2.1.12-shunyi
-MOGO_MAP_VERSION=1.2.1.12-shunyi
-MOGO_MAP_API_VERSION=1.2.1.12-shunyi
-MOGO_SERVICE_VERSION=1.2.1.12-shunyi
-MOGO_SERVICE_API_VERSION=1.2.1.13-shunyi
-MOGO_CONNECTION_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_APPS_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_NAVI_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_SHARE_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_COMMON_VERSION=1.2.1.13-shunyi
-MOGO_MODULE_MAIN_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_MAP_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_SERVICE_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_SEARCH_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_BACK_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_GUIDE_VERSION=1.2.1.12-shunyi
-MOGO_MODULE_MEDIA_VERSION=1.2.1.12-shunyi
-
-MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.12-shunyi
-MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.12-shunyi
-
-MOGO_MODULE_OBU_VERSION = 1.2.1.17-shunyi
-
+MOGO_COMMONS_VERSION=1.2.1.22
+MOGO_UTILS_VERSION=1.2.1.22
+MAP_AMAP_VERSION=1.2.1.22
+MAP_AUTONAVI_VERSION=1.2.1.22
+MOGO_MAP_VERSION=1.2.1.22
+MOGO_MAP_API_VERSION=1.2.1.22
+MOGO_SERVICE_VERSION=1.2.1.22
+MOGO_SERVICE_API_VERSION=1.2.1.22
+MOGO_CONNECTION_VERSION=1.2.1.22
+MOGO_MODULE_APPS_VERSION=1.2.1.22
+MOGO_MODULE_NAVI_VERSION=1.2.1.22
+MOGO_MODULE_SHARE_VERSION=1.2.1.22
+MOGO_MODULE_COMMON_VERSION=1.2.1.22
+MOGO_MODULE_MAIN_VERSION=1.2.1.22
+MOGO_MODULE_MAP_VERSION=1.2.1.22
+MOGO_MODULE_SERVICE_VERSION=1.2.1.22
+MOGO_MODULE_EXTENSIONS_VERSION=1.2.1.22
+MOGO_MODULE_SEARCH_VERSION=1.2.1.22
+MOGO_MODULE_BACK_VERSION=1.2.1.22
+MOGO_MODULE_GPS_SIMULATOR_VERSION=1.2.1.22
+MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.2.1.22
+MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.2.1.22
+MOGO_MODULE_AUTHORIZE_VERSION=1.2.1.22
+MOGO_MODULE_GUIDE_VERSION=1.2.1.22
+MOGO_MODULE_MEDIA_VERSION=1.2.1.22
+MOGO_MODULE_MAIN_LAUNCHER_VERSION = 1.2.1.22
+MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.22
+MOGO_MODULE_V2X_VERSION=1.2.1.22
+# 基础服务实现：passport、socket、location
+MOGO_BASE_SERVICES_APK_VERSION = 1.2.1.22
+MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22

 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=1.2.1.9-shunyi
+MOGO_MODULE_TANLU_VERSION=1.3.1.24
 # 车聊聊
-CARCHATTING_VERSION=1.4.5
+CARCHATTING_VERSION=1.5.1
 # 车聊聊接口
-CARCHATTINGPROVIDER_VERSION=1.2.0
+CARCHATTINGPROVIDER_VERSION=1.3.4
 # 视频引导
 MOGO_MODULE_GUIDESHOW_VERSION=1.0.2-SNAPSHOT
 # 视频引导接口
+
 MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
 # 在线车辆F
 MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
-# v2x
-MOGO_MODULE_V2X_VERSION=1.1.70-shunyi
 # 推送
-MOGO_MODULE_PUSH_VERSION=1.1.5.7-shunyi
+MOGO_MODULE_PUSH_VERSION=1.1.6.2
 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5
-MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.5
+MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.6
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 探路上报和分享模块
-TANLULIB_VERSION=1.2.1.9-shunyi
+TANLULIB_VERSION=1.3.1.24
+MOGO_TANLU_API_VERSION = 1.0.0-SNAPSHOT

-# Boost分包
-BOOST_MULTIDEX_VERSION=1.0.0
-# hook ARouter分包实现
-HOOKPLUGIN_VERSION=1.0.0
+MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
+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


-## 产品库必备配置
+# obu
+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.4
+# monitor
+MOGO_MODULE_MONITOR_VERSION = 1.0.0-SNAPSHOT
+
+## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级
 applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
-versionCode=80006
-versionName=8.0.6
+versionCode=80007
+versionName=8.0.7
--- a/libraries/map-amap/consumer-rules.pro
+++ b/libraries/map-amap/consumer-rules.pro
@@ -0,0 +1,5 @@
+#-----library-MapAMap-----
+-keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;}
+-keep class com.mogo.map.impl.amap.marker.CombineMovingPointOverlay.Status
+-keep class com.mogo.map.impl.amap.navi.PathPlanningErrorCodeConstants
+-keep class com.mogo.map.impl.amap.utils.MapStyleUtils.ColorEnum
--- a/libraries/map-amap/proguard-rules.pro
+++ b/libraries/map-amap/proguard-rules.pro
@@ -19,3 +19,9 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#-----library-MapAMap-----
+-keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;}
+-keep class com.mogo.map.impl.amap.marker.CombineMovingPointOverlay.Status
+-keep class com.mogo.map.impl.amap.navi.PathPlanningErrorCodeConstants
+-keep class com.mogo.map.impl.amap.utils.MapStyleUtils.ColorEnum
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java
@@ -127,8 +127,8 @@ public class AMapNaviViewWrapper implements IMogoMapView,
            options.setTrafficLayerEnabled( false );
            // 设置导航界面是否显示路线全览按钮。
            options.setRouteListButtonShow( false );
-            // 设置导航状态下屏幕是否一直开启。
-            options.setScreenAlwaysBright( true );
+            // 设置屏幕是否常亮，默认开启
+            options.setScreenAlwaysBright( false );
            // 设置交通播报是否打开（只适用于驾车导航，需要联网）。
            options.setTrafficInfoUpdateEnabled( true );
            // 设置摄像头播报是否打开（只适用于驾车导航）。
@@ -321,6 +321,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
    @Override
    public void onNaviMapMode( int mode ) {
        Logger.i( TAG, "mode=" + mode );
+        MogoMapListenerHandler.getInstance().onMapModeChanged( mode == 0 ? EnumMapUI.CarUp_2D : EnumMapUI.NorthUP_2D );
    }

    @Override
@@ -521,6 +522,9 @@ public class AMapNaviViewWrapper implements IMogoMapView,
        }
        if ( checkAMapView() ) {
            MyLocationStyle style = mMapView.getMap().getMyLocationStyle();
+            if ( style == null ) {
+                style = new MyLocationStyle();
+            }
            style.showMyLocation( visible );
            if ( visible ) {
                // 强制刷新一遍车标
@@ -540,6 +544,9 @@ public class AMapNaviViewWrapper implements IMogoMapView,
        }
        if ( checkAMapView() ) {
            MyLocationStyle style = mMapView.getMap().getMyLocationStyle();
+            if ( style == null ) {
+                style = new MyLocationStyle();
+            }
            style.showMyLocation( true );
            style.myLocationIcon( BitmapDescriptorFactory.fromView( view ) );
            mMapView.getMap().setMyLocationStyle( style );
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/location/ALocationClient.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/location/ALocationClient.java
@@ -26,6 +26,7 @@ import java.util.Set;
 public class ALocationClient implements IMogoLocationClient {

    private static final String TAG = "LocationClient";
+    private final Context mContext;

    private Set< IMogoLocationListener > sListeners = new HashSet<>( 10 );
    private MogoLocation mLastLocation;
@@ -34,12 +35,7 @@ public class ALocationClient implements IMogoLocationClient {
    private boolean mIsDestroyed = false;

    public ALocationClient( Context context ) {
-        mClient = new AMapLocationClient( context );
-        mClient.setLocationListener( mListener );
-        mLastLocation = ObjectUtils.fromAMap( mClient.getLastKnownLocation() );
-        if ( mLastLocation == null ) {
-            mLastLocation = new MogoLocation();
-        }
+        mContext = context;
    }

    private AMapLocationClient mClient;
@@ -51,11 +47,12 @@ public class ALocationClient implements IMogoLocationClient {

    @Override
    public void start( long interval ) {
-        if ( mIsDestroyed ) {
-            destroyWarming();
-            return;
+        if ( mClient == null ) {
+            mClient = new AMapLocationClient( mContext );
+            mClient.setLocationListener( mListener );
+            mLastLocation = ObjectUtils.fromAMap( mClient.getLastKnownLocation() );
        }
-        if ( mClient != null ) {
+        if ( !mClient.isStarted() ) {
            AMapLocationClientOption option = new AMapLocationClientOption();
            option.setLocationMode( AMapLocationClientOption.AMapLocationMode.Hight_Accuracy );
            option.setNeedAddress( true );
@@ -109,6 +106,9 @@ public class ALocationClient implements IMogoLocationClient {
            destroyWarming();
            return null;
        }
+        if ( mLastLocation == null ) {
+            mLastLocation = new MogoLocation();
+        }
        return mLastLocation;
    }

@@ -140,7 +140,7 @@ public class ALocationClient implements IMogoLocationClient {
                    aMapLocation.getLongitude() == 0.0D ) {
                return;
            }
-            Trace.beginSection("timer.onLocationChanged");
+            Trace.beginSection( "timer.onLocationChanged" );
            mLastLocation = ObjectUtils.fromAMap( aMapLocation );
            synchronized ( sListeners ) {
                Iterator< IMogoLocationListener > listenerIterator = sListeners.iterator();
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java
@@ -10,7 +10,9 @@ import com.amap.api.maps.model.BitmapDescriptorFactory;
 import com.amap.api.maps.model.LatLng;
 import com.amap.api.maps.model.Marker;
 import com.amap.api.maps.model.MarkerOptions;
+import com.amap.api.maps.model.animation.AlphaAnimation;
 import com.amap.api.maps.model.animation.Animation;
+import com.amap.api.maps.model.animation.AnimationSet;
 import com.amap.api.maps.model.animation.ScaleAnimation;
 import com.amap.api.maps.model.animation.TranslateAnimation;
 import com.amap.api.maps.utils.overlay.MovingPointOverlay;
@@ -382,6 +384,47 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer {
        mMarker.startAnimation();
    }

+    @Override
+    public void startScaleAnimationWithAlpha( float fromX, float toX, float fromY, float toY, float fromAlpha, float toAlpha, int duration, Interpolator interpolator, OnMarkerAnimationListener listener ) {
+        if ( isDestroyed() ) {
+            return;
+        }
+
+        ScaleAnimation animationScale = new ScaleAnimation( fromX, toX, fromY, toY );
+        animationScale.setFillMode( Animation.FILL_MODE_FORWARDS );
+
+        AlphaAnimation alphaAnimation = new AlphaAnimation( fromAlpha, toAlpha );
+        alphaAnimation.setFillMode( Animation.FILL_MODE_FORWARDS );
+
+        AnimationSet animationSet = new AnimationSet( true );
+        animationSet.setDuration( duration );
+        animationSet.setInterpolator( interpolator);
+        animationSet.setAnimationListener( new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart() {
+                if ( isDestroyed() ) {
+                    return;
+                }
+                if ( listener != null ) {
+                    listener.onAnimStart();
+                }
+            }
+
+            @Override
+            public void onAnimationEnd() {
+                if ( isDestroyed() ) {
+                    return;
+                }
+                if ( listener != null ) {
+                    listener.onAnimEnd();
+                }
+            }
+        } );
+
+        mMarker.setAnimation( animationSet );
+        mMarker.startAnimation();
+    }
+
    @Override
    public void startJumpAnimation( float high, long duration, Interpolator interpolator, OnMarkerAnimationListener listener ) {
        if ( isDestroyed() || high <= 0.0f || interpolator == null || duration < 0 ) {
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AMapNaviListenerAdapter.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AMapNaviListenerAdapter.java
@@ -66,7 +66,7 @@ public abstract class AMapNaviListenerAdapter implements AMapNaviListener {
    public void onGetNavigationText( String s ) {
        mLastSpeakWord = s;
        Logger.d( TAG, s );
-        TTSSpeaker.getInstance().speakTTS( s );
+//        TTSSpeaker.getInstance().speakTTS( s );
    }

    @Override
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java
@@ -11,6 +11,7 @@ import com.amap.api.navi.enums.AimLessMode;
 import com.amap.api.navi.enums.NaviType;
 import com.amap.api.navi.model.NaviLatLng;
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.impl.amap.AMapWrapper;
@@ -78,7 +79,7 @@ public class NaviClient implements IMogoNavi {
        mContext = context;
        mAMapNavi = AMapNavi.getInstance( context );
        mAMapNavi.setEmulatorNaviSpeed( 120 );
-        mAMapNavi.setUseInnerVoice( false, true );
+        mAMapNavi.setUseInnerVoice( DebugConfig.isUseCustomNavi(), true );
        mAMapNaviListener = new NaviListenerAdapter( context, mAMapNavi, this );
        mAimlessModeListener = new AimlessModeListenerAdapter() {
        };
--- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/GeocodeSearchClient.java
+++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/search/GeocodeSearchClient.java
@@ -4,9 +4,11 @@ import android.content.Context;

 import com.amap.api.services.core.AMapException;
 import com.amap.api.services.geocoder.GeocodeAddress;
+import com.amap.api.services.geocoder.GeocodeQuery;
 import com.amap.api.services.geocoder.GeocodeResult;
 import com.amap.api.services.geocoder.GeocodeSearch;
 import com.amap.api.services.geocoder.RegeocodeAddress;
+import com.amap.api.services.geocoder.RegeocodeQuery;
 import com.amap.api.services.geocoder.RegeocodeResult;
 import com.mogo.map.exception.MogoMapException;
 import com.mogo.map.impl.amap.utils.ObjectUtils;
@@ -16,6 +18,7 @@ import com.mogo.map.search.geo.MogoGeocodeAddress;
 import com.mogo.map.search.geo.MogoRegeocodeAddress;
 import com.mogo.map.search.geo.query.MogoGeocodeQuery;
 import com.mogo.map.search.geo.query.MogoRegeocodeQuery;
+import com.mogo.utils.logger.Logger;

 import java.util.ArrayList;
 import java.util.List;
@@ -28,6 +31,8 @@ import java.util.List;
 */
 public class GeocodeSearchClient implements IMogoGeoSearch, GeocodeSearch.OnGeocodeSearchListener {

+    private static final String TAG = "GeocodeSearchClient";
+    
    private GeocodeSearch mClient;
    private IMogoGeoSearchListener mListener;

@@ -74,14 +79,32 @@ public class GeocodeSearchClient implements IMogoGeoSearch, GeocodeSearch.OnGeoc
    @Override
    public void getFromLocationAsyn( MogoRegeocodeQuery query ) {
        if ( mClient != null ) {
-            mClient.getFromLocationAsyn( ObjectUtils.fromMogo( query ) );
+            if ( query == null ) {
+                Logger.e( TAG, "query parameter is null." );
+                return;
+            }
+            RegeocodeQuery origin = ObjectUtils.fromMogo( query );
+            if ( origin == null || !query.check() ) {
+                Logger.e( TAG, "query parameter is null or no point parameter." );
+                return;
+            }
+            mClient.getFromLocationAsyn( origin );
        }
    }

    @Override
    public void getFromLocationNameAsyn( MogoGeocodeQuery query ) {
        if ( mClient != null ) {
-            mClient.getFromLocationNameAsyn( ObjectUtils.fromMogo( query ) );
+            if ( query == null ) {
+                Logger.e( TAG, "query parameter is null." );
+                return;
+            }
+            GeocodeQuery origin = ObjectUtils.fromMogo( query );
+            if ( origin == null || !query.check() ) {
+                Logger.e( TAG, "query parameter is null or locationName is empty." );
+                return;
+            }
+            mClient.getFromLocationNameAsyn( origin );
        }
    }

--- a/libraries/map-amap/src/main/res/drawable-ldpi/map_api_ic_current_location2.png
+++ b/libraries/map-amap/src/main/res/drawable-ldpi/map_api_ic_current_location2.png
--- a/libraries/map-amap/src/main/res/drawable-mdpi/map_api_ic_current_location2.png
+++ b/libraries/map-amap/src/main/res/drawable-mdpi/map_api_ic_current_location2.png
--- a/libraries/map-amap/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2.png
+++ b/libraries/map-amap/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2.png
--- a/libraries/map-amap/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png
+++ b/libraries/map-amap/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png
--- a/libraries/mogo-map-api/consumer-rules.pro
+++ b/libraries/mogo-map-api/consumer-rules.pro
@@ -0,0 +1,2 @@
+#-----library-MapApi----
+-keep class com.mogo.map.**{*;}
--- a/libraries/mogo-map-api/proguard-rules.pro
+++ b/libraries/mogo-map-api/proguard-rules.pro
@@ -19,3 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#-----library-MapApi----
+-keep class com.mogo.map.**{*;}
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java
@@ -267,9 +267,33 @@ public interface IMogoMarker {
                              Interpolator interpolator,
                              OnMarkerAnimationListener listener );

+    /**
+     * 缩放动画
+     *
+     * @param fromX
+     * @param toX
+     * @param fromY
+     * @param toY
+     * @param fromAlpha
+     * @param toAlpha
+     * @param duration
+     * @param interpolator
+     * @param listener
+     */
+    void startScaleAnimationWithAlpha( float fromX,
+                              float toX,
+                              float fromY,
+                              float toY,
+                              float fromAlpha,
+                              float toAlpha,
+                              int duration,
+                              Interpolator interpolator,
+                              OnMarkerAnimationListener listener );
+

    /**
     * 弹跳动画
+     *
     * @param high
     * @param duration
     * @param interpolator
@@ -278,7 +302,7 @@ public interface IMogoMarker {
    void startJumpAnimation( float high,
                             long duration,
                             Interpolator interpolator,
-                             OnMarkerAnimationListener listener);
+                             OnMarkerAnimationListener listener );

    /**
     * 是否是否可点击
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarkerClickListener.java
@@ -12,7 +12,7 @@ public interface IMogoMarkerClickListener {
     * 事件是否继续往下传递
     *
     * @param marker
-     * @return true - 时间已经处理完毕不继续往下传，否则继续往下传
+     * @return true - 事件已经处理完毕不继续往下传，否则继续往下传
     */
    boolean onMarkerClicked( IMogoMarker marker );
 }
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/query/MogoGeocodeQuery.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/query/MogoGeocodeQuery.java
@@ -2,6 +2,7 @@ package com.mogo.map.search.geo.query;

 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;

 /**
 * @author congtaowang
@@ -29,6 +30,12 @@ public class MogoGeocodeQuery implements Parcelable {
        this.city = city;
    }

+    public boolean check(){
+        if ( TextUtils.isEmpty( locationName ) ) {
+            return false;
+        }
+        return true;
+    }

    @Override
    public int describeContents() {
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/query/MogoRegeocodeQuery.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/search/geo/query/MogoRegeocodeQuery.java
@@ -50,6 +50,18 @@ public class MogoRegeocodeQuery implements Parcelable {
        this.poiType = poiType;
    }

+    public boolean check() {
+        if ( point == null ) {
+            return false;
+        }
+        if ( point.lat < 1 && point.lon < 1 ) {
+            return false;
+        }
+        if ( radius < 0 ) {
+            return false;
+        }
+        return true;
+    }

    @Override
    public int describeContents() {
--- a/libraries/mogo-map-api/src/main/res/drawable-ldpi/map_api_ic_current_location2.png
+++ b/libraries/mogo-map-api/src/main/res/drawable-ldpi/map_api_ic_current_location2.png
--- a/libraries/mogo-map-api/src/main/res/drawable-mdpi/map_api_ic_current_location2.png
+++ b/libraries/mogo-map-api/src/main/res/drawable-mdpi/map_api_ic_current_location2.png
--- a/libraries/mogo-map-api/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2.png
+++ b/libraries/mogo-map-api/src/main/res/drawable-xhdpi-1920x1000/map_api_ic_current_location2.png
--- a/libraries/mogo-map-api/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png
+++ b/libraries/mogo-map-api/src/main/res/drawable-xhdpi/map_api_ic_current_location2.png
--- a/libraries/mogo-map/consumer-rules.pro
+++ b/libraries/mogo-map/consumer-rules.pro
@@ -0,0 +1,4 @@
+#-----MogoMap-----
+-keep class com.mogo.map.MogoNavi{
+   private <init>();
+}
--- a/libraries/mogo-map/proguard-rules.pro
+++ b/libraries/mogo-map/proguard-rules.pro
@@ -19,3 +19,8 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#-----MogoMap-----
+-keep class com.mogo.map.MogoNavi{
+   private <init>();
+}
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoNavi.java
@@ -6,6 +6,7 @@ import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.location.Location;

+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.map.impl.amap.navi.NaviClient;
 import com.mogo.map.impl.automap.navi.AutoNaviClient;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
@@ -30,7 +31,9 @@ public class MogoNavi implements IMogoNavi {
    private static volatile MogoNavi sInstance;

    private MogoNavi( Context context ) {
-        if ( AppUtils.isAppInstalled( context, "com.autonavi.amapauto" ) ) {
+        if ( DebugConfig.isUseCustomNavi() ) {
+            mDelegate = NaviClient.getInstance( context );
+        } else if ( AppUtils.isAppInstalled( context, "com.autonavi.amapauto" ) ) {
            mDelegate = AutoNaviClient.getInstance( context );
        } else {
            mDelegate = NaviClient.getInstance( context );
--- a/libraries/mogo-tanlu-api/.gitignore
+++ b/libraries/mogo-tanlu-api/.gitignore
@@ -0,0 +1 @@
+/build
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`# 不同渠道，依赖的实现不一样，需要各个渠道都去依赖各自需要的实现，渠道太多导致build.gradle 文件臃肿，可以通过分gradle文件方式减少臃肿`