repackage

app/build.gradle

@@ -56,7 +56,7 @@ android {
     flavorDimensions "product", "env"
 
     productFlavors {
-        //诺威达
+        // 诺威达
         nwd {
             dimension "product"
             sourceSets {
@@ -64,6 +64,16 @@ android {
                     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"
@@ -72,6 +82,7 @@ android {
                     manifest.srcFile 'src/main/AndroidManifest.xml'
                 }
             }
+            applicationId rootProject.ext.android.applicationId
         }
         qa {
             dimension "env"

app/src/d80x/AndroidManifest.xml

@@ -0,0 +1,25 @@
+<?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"
+    android:sharedUserId="android.uid.system">
+
+    <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
+            tools:replace="android:value"
+            android:name="com.amap.api.v2.apikey"
+            android:value="40e2e7e773c7562b1f2b13699a93992c" />
+    </application>
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+</manifest>

config.gradle

@@ -1,12 +1,13 @@
 ext {
     android = [
-            applicationId    : "com.mogo.launcher",
-            compileSdkVersion: 28,
-            buildToolsVersion: "29.0.2",
-            minSdkVersion    : 19,
-            targetSdkVersion : 22,
-            versionCode      : 4,
-            versionName      : "1.0.3",
+            applicationId       : "com.mogo.launcher",
+            zhidadoApplicationId: "com.zhidao.launcher",
+            compileSdkVersion   : 28,
+            buildToolsVersion   : "29.0.2",
+            minSdkVersion       : 19,
+            targetSdkVersion    : 22,
+            versionCode         : 4,
+            versionName         : "1.0.3",
     ]
 
     dependencies = [

modules/mogo-module-apps/src/main/res/values/strings.xml

@@ -5,5 +5,6 @@
     <string name="module_apps_str_guide_warning">为了您的安全，导航中不可播放视频</string>
     <string-array name="module_apps_array_filter_packages">
         <item>com.mogo.launcher</item>
+        <item>com.zhidao.launcher</item>
     </string-array>
 </resources>

modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/VolumeManager.java

@@ -172,7 +172,7 @@ public class VolumeManager {
     }
 
     /*
-    判断是否future渠道
+    判断是否future渠道（F系列）
      */
     private boolean isFuture() {
 
@@ -181,7 +181,8 @@ public class VolumeManager {
             Class<?> buildConfig = Class.forName("com.mogo.launcher.BuildConfig");
             Field flavor = buildConfig.getDeclaredField("FLAVOR");
             //String descriptor= Modifier.toString(flavor.getModifiers());
-            return TextUtils.equals((CharSequence) flavor.get(null),"zhidao");
+            String val = (String) flavor.get(null);
+            return val.toLowerCase().contains( "zhidao" );
 
         } catch (ClassNotFoundException e) {
             e.printStackTrace();
@@ -189,6 +190,8 @@ public class VolumeManager {
             e.printStackTrace();
         } catch (IllegalAccessException e) {
             e.printStackTrace();
+        } catch (Exception e){
+            e.printStackTrace();
         }
 
         return false;