diff --git a/app/build.gradle b/app/build.gradle
index 51c8e306a8..d67aa1334b 100644
--- a/app/build.gradle
+++ b/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"
diff --git a/app/src/d80x/AndroidManifest.xml b/app/src/d80x/AndroidManifest.xml
new file mode 100644
index 0000000000..53ab924776
--- /dev/null
+++ b/app/src/d80x/AndroidManifest.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/config.gradle b/config.gradle
index 6952e1d502..122f4b236a 100644
--- a/config.gradle
+++ b/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 = [
diff --git a/modules/mogo-module-apps/src/main/res/values/strings.xml b/modules/mogo-module-apps/src/main/res/values/strings.xml
index fc518577eb..d0d2711895 100644
--- a/modules/mogo-module-apps/src/main/res/values/strings.xml
+++ b/modules/mogo-module-apps/src/main/res/values/strings.xml
@@ -5,5 +5,6 @@
为了您的安全,导航中不可播放视频
- com.mogo.launcher
+ - com.zhidao.launcher
diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/VolumeManager.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/VolumeManager.java
index 26bbada2d3..c2c38d89de 100644
--- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/manager/VolumeManager.java
+++ b/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;