From 73cc90c60954d6f85ae57e1adf06d3efbbe9a61a Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Thu, 13 Feb 2020 19:02:01 +0800
Subject: [PATCH] add product

---
 app/build.gradle                              | 32 +++++++++++++++----
 app/src/main/AndroidManifest.xml              |  7 ++--
 app/src/nwd/AndroidManifest.xml               | 25 +++++++++++++++
 .../map-amap/src/main/AndroidManifest.xml     |  4 ---
 4 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 app/src/nwd/AndroidManifest.xml

diff --git a/app/build.gradle b/app/build.gradle
index 67294d7307..5e6f40669b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,12 +20,12 @@ android {
         }
 
         multiDexEnabled true
-//        externalNativeBuild {
-//            ndk {
-//                // 设置支持的SO库架构
-//                abiFilters 'armeabi'
-//            }
-//        }
+        externalNativeBuild {
+            ndk {
+                // 设置支持的SO库架构
+                abiFilters 'armeabi-v7a'
+            }
+        }
     }
     signingConfigs {
         release {
@@ -52,6 +52,26 @@ android {
         sourceCompatibility 1.8
         targetCompatibility 1.8
     }
+
+    flavorDimensions "default"
+
+    productFlavors {
+        //诺威达
+        nwd {
+            sourceSets {
+                main {
+                    manifest.srcFile 'src/nwd/AndroidManifest.xml'
+                }
+            }
+        }
+        zhidao {
+            sourceSets {
+                main {
+                    manifest.srcFile 'src/main/AndroidManifest.xml'
+                }
+            }
+        }
+    }
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5740c3ed5a..087e4769a3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,8 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.mogo.launcher">
 
-<!--    android:sharedUserId="android.uid.system"-->
-
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
@@ -16,7 +14,10 @@
         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>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/nwd/AndroidManifest.xml b/app/src/nwd/AndroidManifest.xml
new file mode 100644
index 0000000000..c39db3e4d6
--- /dev/null
+++ b/app/src/nwd/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">
+
+
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <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>
+
+</manifest>
\ No newline at end of file
diff --git a/libraries/map-amap/src/main/AndroidManifest.xml b/libraries/map-amap/src/main/AndroidManifest.xml
index eee3849ff2..170516de73 100644
--- a/libraries/map-amap/src/main/AndroidManifest.xml
+++ b/libraries/map-amap/src/main/AndroidManifest.xml
@@ -2,10 +2,6 @@
     package="com.mogo.map.impl.amap">
 
     <application>
-        <!-- 高德地图 -->
-        <meta-data
-            android:name="com.amap.api.v2.apikey"
-            android:value="a36b9f7b086fa3951bb35338a5a06dd3" />
         <!--定位服务-->
         <service android:name="com.amap.api.location.APSService" />
     </application>