Merge remote-tracking branch 'origin/dev' into dev

.idea/gradle.xml

@@ -17,6 +17,7 @@
             <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$/main-extensions" />
@@ -34,6 +35,7 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-guide" />
             <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-search" />
             <option value="$PROJECT_DIR$/modules/mogo-module-service" />
             <option value="$PROJECT_DIR$/modules/mogo-module-share" />

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <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>

app/build.gradle

@@ -53,7 +53,7 @@ android {
         targetCompatibility 1.8
     }
 
-    flavorDimensions "product","basic" , "env"
+    flavorDimensions "product", "basic", "env"
 
     productFlavors {
         //独立app
@@ -76,42 +76,18 @@ android {
             }
             applicationId rootProject.ext.android.zhidadoApplicationId
         }
-        // 诺威达
-//        nwd {
-//            dimension "product"
-//            sourceSets {
-//                main {
-//                    manifest.srcFile 'src/nwd/AndroidManifest.xml'
-//                }
-//            }
-//            applicationId rootProject.ext.android.applicationId
-//        }
-//        d80x {
-//            dimension "product"
-//            sourceSets {
-//                main {
-//                    manifest.srcFile 'src/d80x/AndroidManifest.xml'
-//                }
-//            }
-//            applicationId rootProject.ext.android.zhidadoApplicationId
-//        }
-//        zhidao {
-//            dimension "product"
-//            sourceSets {
-//                main {
-//                    manifest.srcFile 'src/zhidao/AndroidManifest.xml'
-//                }
-//            }
-//            applicationId rootProject.ext.android.applicationId
-//        }
-        // 通用 APP
-        catholic {
-            dimension "product"
-        }
         // f系列-分体机全系列，未细分
         f8xx{
             dimension "product"
         }
+        // e系列
+        e8xx {
+            dimension "product"
+        }
+        // d系列
+        d8xx {
+            dimension "product"
+        }
         qa {
             dimension "env"
             buildConfigField 'int', 'NET_ENV', '2'
@@ -180,7 +156,6 @@ dependencies {
     implementation rootProject.ext.dependencies.carcall
     implementation rootProject.ext.dependencies.guideshowprovider
     implementation rootProject.ext.dependencies.guideshow
-    implementation rootProject.ext.dependencies.modulemedia
 
     implementation rootProject.ext.dependencies.modulepush, {
         exclude group: 'com.mogo.module', module: 'module-common'
@@ -194,9 +169,9 @@ dependencies {
     }
 
     if (Boolean.valueOf(RELEASE)) {
-        launcherApi rootProject.ext.dependencies.modulemainlauncher
-        independentApi rootProject.ext.dependencies.modulemainindependent
-        api rootProject.ext.dependencies.mogocommons
+        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.mogomoduleback
@@ -204,6 +179,7 @@ dependencies {
         implementation rootProject.ext.dependencies.mogomoduleauth
         debugImplementation rootProject.ext.dependencies.gpssimulatordebug
         releaseImplementation rootProject.ext.dependencies.gpssimulatornoop
+        implementation rootProject.ext.dependencies.modulemedia
     } else {
         launcherImplementation project(':main-extensions:mogo-module-main-launcher')
         independentImplementation project(':main-extensions:mogo-module-main-independent')
@@ -213,6 +189,7 @@ dependencies {
         implementation project(':modules:mogo-module-back')
         implementation project(':modules:mogo-module-guide')
         implementation project(':modules:mogo-module-authorize')
+        implementation project(':modules:mogo-module-media')
         debugImplementation project(':modules:mogo-module-gps-simulator-debug')
         releaseImplementation project(':modules:mogo-module-gps-simulator-noop')
     }

app/src/catholic/AndroidManifest.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.mogo.launcher">
-
-    <application
-        android:name=".MogoApplication"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_shell_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme.App"
-        tools:replace="android:label">
-
-        <!-- 高德地图 -->
-<!--        <meta-data-->
-<!--            android:name="com.amap.api.v2.apikey"-->
-<!--            android:value="a36b9f7b086fa3951bb35338a5a06dd3" />-->
-    </application>
-
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-
-</manifest>

app/src/independent/AndroidManifest.xml

@@ -17,11 +17,6 @@
             tools:replace="android:value"
             android:name="com.amap.api.v2.apikey"
             android:value="40e2e7e773c7562b1f2b13699a93992c" />
-        <provider
-            android:name="com.mogo.module.navi.cp.AddressContentProvider"
-            android:authorities="com.zhidao.auto.personal.provider"
-            android:enabled="true"
-            android:exported="true" />
     </application>
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />

app/src/launcher/AndroidManifest.xml

@@ -14,7 +14,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme.App"
         tools:replace="android:label">
-        <provider
+        <provide
             android:name="com.mogo.module.navi.cp.AddressContentProvider"
             android:authorities="com.zhidao.auto.personal.provider"
             android:enabled="true"

app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_shell_name">Launcher2.0</string>
+    <string name="app_shell_name">智慧驾驶</string>
 </resources>

config.gradle

@@ -84,6 +84,7 @@ ext {
             mogocommons              : "com.mogo.commons:mogo-commons:${MOGO_COMMONS_VERSION}",
             mogoutils                : "com.mogo.commons:mogo-utils:${MOGO_UTILS_VERSION}",
             mapamap                  : "com.mogo.map:map-amap:${MAP_AMAP_VERSION}",
+            mapautomap               : "com.mogo.map:map-autonavi:${MAP_AUTONAVI_VERSION}",
             mogomap                  : "com.mogo.map:mogo-map:${MOGO_MAP_VERSION}",
             mogomapapi               : "com.mogo.map:mogo-map-api:${MOGO_MAP_API_VERSION}",
             modulecommon             : "com.mogo.module:module-common:${MOGO_MODULE_COMMON_VERSION}",

foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java

@@ -73,4 +73,17 @@ public class DebugConfig {
     public static void setNetMode( int netMode ) {
         DebugConfig.sNetMode = netMode;
     }
+
+    /**
+     * 是否拉起位置服务
+     */
+    private static boolean sLaunchLocationService = true;
+
+    public static boolean isLaunchLocationService() {
+        return sLaunchLocationService;
+    }
+
+    public static void setLaunchLocationService( boolean launchLocationService ) {
+        DebugConfig.sLaunchLocationService = launchLocationService;
+    }
 }

foudations/mogo-commons/src/main/res/values-ldpi/dimens.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="module_commons_toast_marginLeft">30px</dimen>
-    <dimen name="module_commons_toast_marginRight">30px</dimen>
-    <dimen name="module_commons_toast_marginTop">16px</dimen>
-    <dimen name="module_commons_toast_marginBottom">16px</dimen>
-    <dimen name="module_commons_toast_textSize">22px</dimen>
-    <dimen name="module_commons_toast_minWidth">371px</dimen>
-    <dimen name="module_commons_toast_maxWidth">500px</dimen>
-    <dimen name="module_commons_toast_y_offset">72px</dimen>
-</resources>

foudations/mogo-commons/src/main/res/values/dimens.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_commons_toast_marginLeft">50px</dimen>
-    <dimen name="module_commons_toast_marginRight">50px</dimen>
-    <dimen name="module_commons_toast_marginTop">32px</dimen>
-    <dimen name="module_commons_toast_marginBottom">32px</dimen>
-    <dimen name="module_commons_toast_textSize">40px</dimen>
-    <dimen name="module_commons_toast_minWidth">698px</dimen>
-    <dimen name="module_commons_toast_maxWidth">900px</dimen>
-    <dimen name="module_commons_toast_y_offset">130px</dimen>
-</resources>
-
-
+    <dimen name="module_commons_toast_marginLeft">30px</dimen>
+    <dimen name="module_commons_toast_marginRight">30px</dimen>
+    <dimen name="module_commons_toast_marginTop">16px</dimen>
+    <dimen name="module_commons_toast_marginBottom">16px</dimen>
+    <dimen name="module_commons_toast_textSize">22px</dimen>
+    <dimen name="module_commons_toast_minWidth">371px</dimen>
+    <dimen name="module_commons_toast_maxWidth">500px</dimen>
+    <dimen name="module_commons_toast_y_offset">72px</dimen>
+</resources>

foudations/mogo-utils/src/main/java/com/mogo/utils/AppUtils.java

@@ -3,6 +3,9 @@ package com.mogo.utils;
 import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.text.TextUtils;
 
 import java.util.List;
 
@@ -25,4 +28,22 @@ public class AppUtils {
         }
         return false;
     }
+
+    public static boolean isAppInstalled( Context context, String pkg ) {
+        PackageInfo packageInfo;
+        if ( TextUtils.isEmpty( pkg ) ) {
+            return false;
+        }
+        try {
+            packageInfo = context.getPackageManager().getPackageInfo( pkg, 0 );
+        } catch ( PackageManager.NameNotFoundException e ) {
+            packageInfo = null;
+            e.printStackTrace();
+        }
+        if ( packageInfo == null ) {
+            return false;
+        } else {
+            return true;
+        }
+    }
 }

gradle.properties

@@ -30,6 +30,7 @@ RELEASE=false
 MOGO_COMMONS_VERSION=1.1.0.15
 MOGO_UTILS_VERSION=1.1.0.15
 MAP_AMAP_VERSION=1.1.0.15
+MAP_AUTONAVI_VERSION=1.1.0.15
 MOGO_MAP_VERSION=1.1.0.15
 MOGO_MAP_API_VERSION=1.1.0.15
 MOGO_SERVICE_VERSION=1.1.0.15

libraries/map-autonavi/.gitignore

@@ -0,0 +1 @@
+/build

libraries/map-autonavi/build.gradle

@@ -0,0 +1,45 @@
+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 1.8
+        targetCompatibility 1.8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    if (Boolean.valueOf(RELEASE)) {
+        implementation rootProject.ext.dependencies.mogoutils
+        implementation rootProject.ext.dependencies.mogomapapi
+        implementation rootProject.ext.dependencies.mogocommons
+        implementation rootProject.ext.dependencies.mogomapapi
+        implementation rootProject.ext.dependencies.mapamap
+    } else {
+        implementation project(':foudations:mogo-utils')
+        implementation project(':libraries:mogo-map-api')
+        implementation project(':foudations:mogo-commons')
+        implementation project(':services:mogo-service-api')
+        implementation project(':libraries:map-amap')
+
+    }
+}

libraries/map-autonavi/gradle.properties

@@ -0,0 +1,3 @@
+GROUP=com.mogo.map
+POM_ARTIFACT_ID=map-autonavi
+VERSION_CODE=1