From 07d2b6d8e10522647131b1319871b89dbf7f9a18 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Wed, 3 Jun 2020 14:13:31 +0800
Subject: [PATCH] opt

---
 .idea/misc.xml                       |  2 +-
 app/build.gradle                     | 48 +++++++---------------------
 app/src/catholic/AndroidManifest.xml | 24 --------------
 app/src/main/res/values/strings.xml  |  2 +-
 gradle.properties                    |  2 +-
 5 files changed, 15 insertions(+), 63 deletions(-)
 delete mode 100644 app/src/catholic/AndroidManifest.xml

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 707ee6e613..2dc54c489f 100644
--- a/.idea/misc.xml
+++ b/.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>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index fb46431630..bde27f3f10 100644
--- a/app/build.gradle
+++ b/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'
@@ -194,9 +170,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
diff --git a/app/src/catholic/AndroidManifest.xml b/app/src/catholic/AndroidManifest.xml
deleted file mode 100644
index ccd3059601..0000000000
--- a/app/src/catholic/AndroidManifest.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 021fff2fc9..f474f88ac7 100644
--- 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">Launcher2.0</string>
+    <string name="app_shell_name">智慧驾驶</string>
 </resources>
diff --git a/gradle.properties b/gradle.properties
index 0a5fda4ef5..e284c2874a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,7 +24,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
 USERNAME=xintai
 PASSWORD=xintai2018
 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本
-RELEASE=true
+RELEASE=false
 # 模块版本
 ## 工程内模块
 MOGO_COMMONS_VERSION=1.1.0.15