From e3a8821f4405652e3d537b6b547e82dfe17e5be1 Mon Sep 17 00:00:00 2001
From: wangtao55 <wangtao55@hikcreate.com>
Date: Wed, 18 Sep 2019 11:53:22 +0800
Subject: [PATCH] feat:结束实验开始调整

---
 ModuleProject/.idea/codeStyles/Project.xml                                                         |  25 -------------------------
 ModuleProject/.idea/gradle.xml                                                                     |   8 --------
 ModuleProject/app/build.gradle                                                                     |  23 +++++++++--------------
 ModuleProject/app/src/main/AndroidManifest.xml                                                     |  11 -----------
 ModuleProject/app/src/main/java/com/main/module/ui/AppDemoActivity.kt                              |  30 ------------------------------
 ModuleProject/app_common/build.gradle                                                              |  66 +++++-------------------------------------------------------------
 ModuleProject/app_credit/.gitignore                                                                |   1 -
 ModuleProject/app_credit/build.gradle                                                              |  86 --------------------------------------------------------------------------------------
 ModuleProject/app_credit/proguard-rules.pro                                                        |  21 ---------------------
 ModuleProject/app_credit/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java      |  26 --------------------------
 ModuleProject/app_credit/src/main/AndroidManifest.xml                                              |  20 --------------------
 ModuleProject/app_credit/src/main/java/com/ui/CreditDemoActivity.kt                                |  22 ----------------------
 ModuleProject/app_credit/src/main/module/AndroidManifest.xml                                       |  29 -----------------------------
 ModuleProject/app_credit/src/main/res/layout/credit_test.xml                                       |  20 --------------------
 ModuleProject/app_credit/src/main/res/values/strings.xml                                           |   3 ---
 ModuleProject/app_credit/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java                     |  17 -----------------
 ModuleProject/app_home/.gitignore                                                                  |   1 -
 ModuleProject/app_home/build.gradle                                                                |  30 ------------------------------
 ModuleProject/app_home/proguard-rules.pro                                                          |  21 ---------------------
 ModuleProject/app_home/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java        |  26 --------------------------
 ModuleProject/app_home/src/main/AndroidManifest.xml                                                |   2 --
 ModuleProject/app_home/src/main/res/values/strings.xml                                             |   3 ---
 ModuleProject/app_home/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java                       |  17 -----------------
 ModuleProject/app_login/build.gradle                                                               |  22 ++++++++++++----------
 ModuleProject/app_mine/.gitignore                                                                  |   1 -
 ModuleProject/app_mine/build.gradle                                                                |  30 ------------------------------
 ModuleProject/app_mine/proguard-rules.pro                                                          |  21 ---------------------
 ModuleProject/app_mine/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java        |  26 --------------------------
 ModuleProject/app_mine/src/main/AndroidManifest.xml                                                |   2 --
 ModuleProject/app_mine/src/main/res/values/strings.xml                                             |   3 ---
 ModuleProject/app_mine/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java                       |  17 -----------------
 ModuleProject/app_module_config.gradle                                                             |  25 +++++++++++++++++++++++++
 ModuleProject/app_passport/build.gradle                                                            |  20 +++++++++-----------
 ModuleProject/app_plan_trip/.gitignore                                                             |   1 -
 ModuleProject/app_plan_trip/build.gradle                                                           |  30 ------------------------------
 ModuleProject/app_plan_trip/proguard-rules.pro                                                     |  21 ---------------------
 ModuleProject/app_plan_trip/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java   |  26 --------------------------
 ModuleProject/app_plan_trip/src/main/AndroidManifest.xml                                           |   2 --
 ModuleProject/app_plan_trip/src/main/res/values/strings.xml                                        |   3 ---
 ModuleProject/app_plan_trip/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java                  |  17 -----------------
 ModuleProject/build.gradle                                                                         |  15 +++------------
 ModuleProject/change_config.gradle                                                                 |  25 -------------------------
 ModuleProject/config.gradle                                                                        |  95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ModuleProject/lib_common_util/.gitignore                                                           |   1 -
 ModuleProject/lib_common_util/build.gradle                                                         |  31 -------------------------------
 ModuleProject/lib_common_util/proguard-rules.pro                                                   |  21 ---------------------
 ModuleProject/lib_common_util/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java |  26 --------------------------
 ModuleProject/lib_common_util/src/main/AndroidManifest.xml                                         |   2 --
 ModuleProject/lib_common_util/src/main/res/values/strings.xml                                      |   3 ---
 ModuleProject/lib_common_util/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java                |  17 -----------------
 ModuleProject/lib_core/.gitignore                                                                  |   1 -
 ModuleProject/lib_core/build.gradle                                                                |  31 -------------------------------
 ModuleProject/lib_core/proguard-rules.pro                                                          |  21 ---------------------
 ModuleProject/lib_core/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java        |  26 --------------------------
 ModuleProject/lib_core/src/main/AndroidManifest.xml                                                |   2 --
 ModuleProject/lib_core/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java                       |  17 -----------------
 ModuleProject/lib_network/build.gradle                                                             |  12 +++++-------
 ModuleProject/lib_ui/.gitignore                                                                    |   1 -
 ModuleProject/lib_ui/build.gradle                                                                  |  33 ---------------------------------
 ModuleProject/lib_ui/proguard-rules.pro                                                            |  21 ---------------------
 ModuleProject/lib_ui/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java          |  26 --------------------------
 ModuleProject/lib_ui/src/main/AndroidManifest.xml                                                  |   3 ---
 ModuleProject/lib_ui/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java                         |  17 -----------------
 ModuleProject/settings.gradle                                                                      |   2 +-
 ModuleProject/system_config.gradle                                                                 | 163 -------------------------------------------------------------------------------------------------------------------------------------------------------------------
 65 files changed, 164 insertions(+), 1223 deletions(-)
 delete mode 100644 ModuleProject/app/src/main/java/com/main/module/ui/AppDemoActivity.kt
 delete mode 100644 ModuleProject/app_credit/.gitignore
 delete mode 100644 ModuleProject/app_credit/build.gradle
 delete mode 100644 ModuleProject/app_credit/proguard-rules.pro
 delete mode 100644 ModuleProject/app_credit/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
 delete mode 100644 ModuleProject/app_credit/src/main/AndroidManifest.xml
 delete mode 100644 ModuleProject/app_credit/src/main/java/com/ui/CreditDemoActivity.kt
 delete mode 100644 ModuleProject/app_credit/src/main/module/AndroidManifest.xml
 delete mode 100644 ModuleProject/app_credit/src/main/res/layout/credit_test.xml
 delete mode 100644 ModuleProject/app_credit/src/main/res/values/strings.xml
 delete mode 100644 ModuleProject/app_credit/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
 delete mode 100644 ModuleProject/app_home/.gitignore
 delete mode 100644 ModuleProject/app_home/build.gradle
 delete mode 100644 ModuleProject/app_home/proguard-rules.pro
 delete mode 100644 ModuleProject/app_home/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
 delete mode 100644 ModuleProject/app_home/src/main/AndroidManifest.xml
 delete mode 100644 ModuleProject/app_home/src/main/res/values/strings.xml
 delete mode 100644 ModuleProject/app_home/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
 delete mode 100644 ModuleProject/app_mine/.gitignore
 delete mode 100644 ModuleProject/app_mine/build.gradle
 delete mode 100644 ModuleProject/app_mine/proguard-rules.pro
 delete mode 100644 ModuleProject/app_mine/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
 delete mode 100644 ModuleProject/app_mine/src/main/AndroidManifest.xml
 delete mode 100644 ModuleProject/app_mine/src/main/res/values/strings.xml
 delete mode 100644 ModuleProject/app_mine/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
 create mode 100644 ModuleProject/app_module_config.gradle
 delete mode 100644 ModuleProject/app_plan_trip/.gitignore
 delete mode 100644 ModuleProject/app_plan_trip/build.gradle
 delete mode 100644 ModuleProject/app_plan_trip/proguard-rules.pro
 delete mode 100644 ModuleProject/app_plan_trip/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
 delete mode 100644 ModuleProject/app_plan_trip/src/main/AndroidManifest.xml
 delete mode 100644 ModuleProject/app_plan_trip/src/main/res/values/strings.xml
 delete mode 100644 ModuleProject/app_plan_trip/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
 delete mode 100644 ModuleProject/change_config.gradle
 create mode 100644 ModuleProject/config.gradle
 delete mode 100644 ModuleProject/lib_common_util/.gitignore
 delete mode 100644 ModuleProject/lib_common_util/build.gradle
 delete mode 100644 ModuleProject/lib_common_util/proguard-rules.pro
 delete mode 100644 ModuleProject/lib_common_util/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
 delete mode 100644 ModuleProject/lib_common_util/src/main/AndroidManifest.xml
 delete mode 100644 ModuleProject/lib_common_util/src/main/res/values/strings.xml
 delete mode 100644 ModuleProject/lib_common_util/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
 delete mode 100644 ModuleProject/lib_core/.gitignore
 delete mode 100644 ModuleProject/lib_core/build.gradle
 delete mode 100644 ModuleProject/lib_core/proguard-rules.pro
 delete mode 100644 ModuleProject/lib_core/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
 delete mode 100644 ModuleProject/lib_core/src/main/AndroidManifest.xml
 delete mode 100644 ModuleProject/lib_core/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
 delete mode 100644 ModuleProject/lib_ui/.gitignore
 delete mode 100644 ModuleProject/lib_ui/build.gradle
 delete mode 100644 ModuleProject/lib_ui/proguard-rules.pro
 delete mode 100644 ModuleProject/lib_ui/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
 delete mode 100644 ModuleProject/lib_ui/src/main/AndroidManifest.xml
 delete mode 100644 ModuleProject/lib_ui/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
 delete mode 100644 ModuleProject/system_config.gradle

diff --git a/ModuleProject/.idea/codeStyles/Project.xml b/ModuleProject/.idea/codeStyles/Project.xml
index 22cc210..7cf5f5c 100644
--- a/ModuleProject/.idea/codeStyles/Project.xml
+++ b/ModuleProject/.idea/codeStyles/Project.xml
@@ -64,31 +64,6 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
     <XML>
       <option name="XML_KEEP_LINE_BREAKS" value="false" />
       <option name="XML_ALIGN_ATTRIBUTES" value="false" />
diff --git a/ModuleProject/.idea/gradle.xml b/ModuleProject/.idea/gradle.xml
index 7a9b0f4..9ab224d 100644
--- a/ModuleProject/.idea/gradle.xml
+++ b/ModuleProject/.idea/gradle.xml
@@ -9,17 +9,9 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/app_common" />
-            <option value="$PROJECT_DIR$/app_credit" />
-            <option value="$PROJECT_DIR$/app_home" />
             <option value="$PROJECT_DIR$/app_login" />
-            <option value="$PROJECT_DIR$/app_mine" />
             <option value="$PROJECT_DIR$/app_passport" />
-            <option value="$PROJECT_DIR$/app_plan_trip" />
-            <option value="$PROJECT_DIR$/lib_common_util" />
-            <option value="$PROJECT_DIR$/lib_core" />
             <option value="$PROJECT_DIR$/lib_network" />
-            <option value="$PROJECT_DIR$/lib_ui" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/ModuleProject/app/build.gradle b/ModuleProject/app/build.gradle
index 02f0791..afa1e94 100644
--- a/ModuleProject/app/build.gradle
+++ b/ModuleProject/app/build.gradle
@@ -4,20 +4,16 @@ if (build_module == build_module_app) {
 } else {
     apply plugin: 'com.android.library'
 }
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
 android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
+    compileSdkVersion rootProject.compileSdkVersion
     defaultConfig {
         if (build_module == build_module_app) {
-            applicationId app_id
+            applicationId rootProject.app_id
         }
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+        versionCode rootProject.versionCode
+        versionName rootProject.versionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -99,10 +95,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api project(':app_common')
-    if (build_module == build_module_app) {
-        api project(':app_credit')
-    }
+//    if (build_module == build_module_app) {
+//        api project(':app_credit')
+//    }
 
 }
 
diff --git a/ModuleProject/app/src/main/AndroidManifest.xml b/ModuleProject/app/src/main/AndroidManifest.xml
index 1eadf75..5ad73b0 100644
--- a/ModuleProject/app/src/main/AndroidManifest.xml
+++ b/ModuleProject/app/src/main/AndroidManifest.xml
@@ -14,17 +14,6 @@
         tools:replace="android:icon,android:roundIcon,android:theme,android:name,android:label,android:allowBackup">
 
 
-    <activity android:name="com.main.module.ui.AppDemoActivity"
-            android:launchMode="singleTask">
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-        </activity>
-
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/ModuleProject/app/src/main/java/com/main/module/ui/AppDemoActivity.kt b/ModuleProject/app/src/main/java/com/main/module/ui/AppDemoActivity.kt
deleted file mode 100644
index 4afa69c..0000000
--- a/ModuleProject/app/src/main/java/com/main/module/ui/AppDemoActivity.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.main.module.ui
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.alibaba.android.arouter.launcher.ARouter
-import com.basic.base.BasicActivity
-import com.basic.router.RouterConstants
-import com.module.hikcreate.R
-
-/**
- * author : taowang
- * date :2019/9/11
- * description:
- **/
-
-@Route(path = RouterConstants.AppMain.MAIN_TEST)
-open class AppDemoActivity : BasicActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.app_test)
-        findViewById<View>(R.id.mBtnLogin).setOnClickListener {
-            Toast.makeText(applicationContext,"test",Toast.LENGTH_LONG).show()
-            ARouter.getInstance().build(RouterConstants.Credit.CREDIT_TEST).navigation()
-        }
-    }
-}
\ No newline at end of file
diff --git a/ModuleProject/app_common/build.gradle b/ModuleProject/app_common/build.gradle
index 9b4a24f..0de6d14 100644
--- a/ModuleProject/app_common/build.gradle
+++ b/ModuleProject/app_common/build.gradle
@@ -1,20 +1,15 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
 android {
     resourcePrefix 'app_'
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
+    compileSdkVersion rootProject.compileSdkVersion
     defaultConfig {
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+        versionCode rootProject.versionCode
+        versionName rootProject.versionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
-
     buildTypes {
 
         debugg {
@@ -32,55 +27,4 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation deps.app_compat
-    testImplementation deps.junit
-    androidTestImplementation deps.runner
-    androidTestImplementation deps.espresso
-    implementation deps.kotlin
-    api project(":lib_ui")
-    api project(":lib_core")
-    api project(":lib_network")
-    api project(":lib_ui")
-    api project(":lib_common_util")
-
-    api deps.annotations
-    api deps.constraint
-    api deps.dagger
-    api deps.dagger_android_support
-    api deps.arch_lifecycle_runtime
-    api deps.arch_lifecycle_extensions
-    api deps.arch_lifecycle_java8
-    api deps.room_runtime
-    api deps.room_rxjava2
-    api deps.paging
-    api deps.rxjava2
-    api deps.rxandroid
-    api deps.retrofit2
-    api deps.retrofit2_converter_gson
-    api deps.retrofit2_adpater_rxjava2
-    api deps.rxlifecycle
-    api deps.rxlifecycle_android
-    api deps.rxlifecycle_components
-    api deps.rxbinding
-    api deps.stetho
-    api deps.stetho_okhttp3
-    api deps.arouter_api
-    api deps.gson
-    api deps.auto_parcel
-    api deps.logger
-    api deps.okhttp3_logging
-    api deps.SmartRefreshLayout
-    api deps.butterknife
-    api deps.matisse
-    api deps.glide
-    api deps.eventbus
-    api deps.walle
-
-    api deps.reactivenetwork_rx2
-    api deps.greendao
-    api deps.encipher
-    api deps.fresco
-    api deps.rxbinding_recyclerview
-    api deps.fastjson
-    api deps.fastjson_android
 }
diff --git a/ModuleProject/app_credit/.gitignore b/ModuleProject/app_credit/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/ModuleProject/app_credit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ModuleProject/app_credit/build.gradle b/ModuleProject/app_credit/build.gradle
deleted file mode 100644
index b8e9233..0000000
--- a/ModuleProject/app_credit/build.gradle
+++ /dev/null
@@ -1,86 +0,0 @@
-
-if (build_module == build_module_credit) {
-    apply plugin: 'com.android.application'
-} else {
-    apply plugin: 'com.android.library'
-}
-
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
-android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
-    defaultConfig {
-        if (build_module == build_module_credit) {
-            applicationId "com.app.credit"
-        }
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-    sourceSets {
-        main {
-            jniLibs.srcDirs = ['libs']
-        }
-    }
-
-
-
-
-    buildTypes {
-        debug {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    sourceSets {
-        main {
-            if (build_module == build_module_credit) {
-                manifest.srcFile 'src/main/module/AndroidManifest.xml'
-            } else {
-                manifest.srcFile 'src/main/AndroidManifest.xml'
-                java {
-                    exclude 'com/duiafudao/app_login/application/**'
-                }
-            }
-        }
-    }
-
-    compileOptions {
-        encoding = 'utf-8'
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    dexOptions {
-        javaMaxHeapSize "4g"
-        preDexLibraries = false
-        jumboMode = true
-    }
-
-    dataBinding {
-        enabled = true
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-}
-
-
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    api project(':app_common')
-}
-
diff --git a/ModuleProject/app_credit/proguard-rules.pro b/ModuleProject/app_credit/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/ModuleProject/app_credit/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/ModuleProject/app_credit/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java b/ModuleProject/app_credit/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
deleted file mode 100644
index c9a0040..0000000
--- a/ModuleProject/app_credit/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package flutter.com.lib_ui;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("flutter.com.lib_ui.test", appContext.getPackageName());
-    }
-}
diff --git a/ModuleProject/app_credit/src/main/AndroidManifest.xml b/ModuleProject/app_credit/src/main/AndroidManifest.xml
deleted file mode 100644
index b8fce7e..0000000
--- a/ModuleProject/app_credit/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.app.credit">
-
-<application
-android:name="com.basic.base.BasicApplication"
-android:roundIcon="@mipmap/ic_launcher"
-android:allowBackup="true"
-android:theme="@style/Theme.AppCompat.NoActionBar"
-android:icon="@mipmap/ic_launcher"
-android:label="@string/app_name"
-tools:ignore="GoogleAppIndexingWarning,HardcodedDebugMode"
-tools:replace="android:icon,android:roundIcon,android:theme,android:name,android:label,android:allowBackup">
-
-
-<activity android:name="com.ui.CreditDemoActivity"/>
-
-</application>
-
-</manifest>
\ No newline at end of file
diff --git a/ModuleProject/app_credit/src/main/java/com/ui/CreditDemoActivity.kt b/ModuleProject/app_credit/src/main/java/com/ui/CreditDemoActivity.kt
deleted file mode 100644
index 39a51a2..0000000
--- a/ModuleProject/app_credit/src/main/java/com/ui/CreditDemoActivity.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.ui
-
-import android.os.Bundle
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.app.credit.R
-import com.basic.base.BasicActivity
-import com.basic.router.RouterConstants
-
-/**
- * author : taowang
- * date :2019/9/11
- * description:
- **/
-
-@Route(path = RouterConstants.Credit.CREDIT_TEST)
-open class CreditDemoActivity : BasicActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.credit_test)
-    }
-}
\ No newline at end of file
diff --git a/ModuleProject/app_credit/src/main/module/AndroidManifest.xml b/ModuleProject/app_credit/src/main/module/AndroidManifest.xml
deleted file mode 100644
index 60842ad..0000000
--- a/ModuleProject/app_credit/src/main/module/AndroidManifest.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.app.credit">
-
-    <application
-        android:name="com.basic.base.BasicApplication"
-        android:roundIcon="@mipmap/ic_launcher"
-        android:allowBackup="true"
-        android:theme="@style/Theme.AppCompat.NoActionBar"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        tools:ignore="GoogleAppIndexingWarning,HardcodedDebugMode"
-        tools:replace="android:icon,android:roundIcon,android:theme,android:name,android:label,android:allowBackup">
-
-
-        <activity android:name="com.ui.CreditDemoActivity"
-            android:launchMode="singleTask">
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-        </activity>
-
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/ModuleProject/app_credit/src/main/res/layout/credit_test.xml b/ModuleProject/app_credit/src/main/res/layout/credit_test.xml
deleted file mode 100644
index 28c0175..0000000
--- a/ModuleProject/app_credit/src/main/res/layout/credit_test.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:padding="20dp"
-    android:orientation="vertical"
-    android:layout_height="match_parent">
-
-
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:text="我是信用模块"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:id="@+id/mBtnLogin"
-        />
-
-
-</LinearLayout>
diff --git a/ModuleProject/app_credit/src/main/res/values/strings.xml b/ModuleProject/app_credit/src/main/res/values/strings.xml
deleted file mode 100644
index a46b6a7..0000000
--- a/ModuleProject/app_credit/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">信用模块</string>
-</resources>
diff --git a/ModuleProject/app_credit/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java b/ModuleProject/app_credit/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
deleted file mode 100644
index ff08bd1..0000000
--- a/ModuleProject/app_credit/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package flutter.com.lib_ui;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/ModuleProject/app_home/.gitignore b/ModuleProject/app_home/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/ModuleProject/app_home/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ModuleProject/app_home/build.gradle b/ModuleProject/app_home/build.gradle
deleted file mode 100644
index e93bcff..0000000
--- a/ModuleProject/app_home/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
-    defaultConfig {
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation deps.app_compat
-    testImplementation deps.junit
-    androidTestImplementation deps.runner
-    androidTestImplementation deps.espresso
-}
diff --git a/ModuleProject/app_home/proguard-rules.pro b/ModuleProject/app_home/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/ModuleProject/app_home/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/ModuleProject/app_home/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java b/ModuleProject/app_home/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
deleted file mode 100644
index c9a0040..0000000
--- a/ModuleProject/app_home/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package flutter.com.lib_ui;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("flutter.com.lib_ui.test", appContext.getPackageName());
-    }
-}
diff --git a/ModuleProject/app_home/src/main/AndroidManifest.xml b/ModuleProject/app_home/src/main/AndroidManifest.xml
deleted file mode 100644
index eb6f8af..0000000
--- a/ModuleProject/app_home/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.app.home" />
diff --git a/ModuleProject/app_home/src/main/res/values/strings.xml b/ModuleProject/app_home/src/main/res/values/strings.xml
deleted file mode 100644
index 11f44e5..0000000
--- a/ModuleProject/app_home/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">lib_core</string>
-</resources>
diff --git a/ModuleProject/app_home/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java b/ModuleProject/app_home/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
deleted file mode 100644
index ff08bd1..0000000
--- a/ModuleProject/app_home/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package flutter.com.lib_ui;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/ModuleProject/app_login/build.gradle b/ModuleProject/app_login/build.gradle
index e93bcff..b91a485 100644
--- a/ModuleProject/app_login/build.gradle
+++ b/ModuleProject/app_login/build.gradle
@@ -1,15 +1,17 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
     defaultConfig {
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
+        if (build_module == build_module_credit) {
+            applicationId "com.app.login"
+        }
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+        versionCode rootProject.versionCode
+        versionName rootProject.versionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    compileSdkVersion rootProject.compileSdkVersion
 
 
     buildTypes {
@@ -23,8 +25,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation deps.app_compat
-    testImplementation deps.junit
-    androidTestImplementation deps.runner
-    androidTestImplementation deps.espresso
+//    implementation deps.app_compat
+//    testImplementation deps.junit
+//    androidTestImplementation deps.runner
+//    androidTestImplementation deps.espresso
 }
diff --git a/ModuleProject/app_mine/.gitignore b/ModuleProject/app_mine/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/ModuleProject/app_mine/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ModuleProject/app_mine/build.gradle b/ModuleProject/app_mine/build.gradle
deleted file mode 100644
index e93bcff..0000000
--- a/ModuleProject/app_mine/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
-    defaultConfig {
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation deps.app_compat
-    testImplementation deps.junit
-    androidTestImplementation deps.runner
-    androidTestImplementation deps.espresso
-}
diff --git a/ModuleProject/app_mine/proguard-rules.pro b/ModuleProject/app_mine/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/ModuleProject/app_mine/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/ModuleProject/app_mine/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java b/ModuleProject/app_mine/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
deleted file mode 100644
index c9a0040..0000000
--- a/ModuleProject/app_mine/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package flutter.com.lib_ui;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("flutter.com.lib_ui.test", appContext.getPackageName());
-    }
-}
diff --git a/ModuleProject/app_mine/src/main/AndroidManifest.xml b/ModuleProject/app_mine/src/main/AndroidManifest.xml
deleted file mode 100644
index 10e0294..0000000
--- a/ModuleProject/app_mine/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.app.mine" />
diff --git a/ModuleProject/app_mine/src/main/res/values/strings.xml b/ModuleProject/app_mine/src/main/res/values/strings.xml
deleted file mode 100644
index 11f44e5..0000000
--- a/ModuleProject/app_mine/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">lib_core</string>
-</resources>
diff --git a/ModuleProject/app_mine/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java b/ModuleProject/app_mine/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
deleted file mode 100644
index ff08bd1..0000000
--- a/ModuleProject/app_mine/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package flutter.com.lib_ui;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/ModuleProject/app_module_config.gradle b/ModuleProject/app_module_config.gradle
new file mode 100644
index 0000000..71b23e5
--- /dev/null
+++ b/ModuleProject/app_module_config.gradle
@@ -0,0 +1,25 @@
+
+def build_module_app = 0x00 //壳app module组件
+def build_module_welcome = 0x01 // 欢迎组件
+def build_module_login = 0x02 //登录组件
+def build_module_mine = 0x03 //我的模块组件
+def build_module_home = 0x04 //主页面组件
+def build_module_credit = 0x05//信用模块组件
+def build_module_passport = 0x06//通行证组件
+def build_module_plan_trip = 0x07//预约出行组件
+
+
+ext.build_module_app = build_module_app
+ext.build_module_welcome = build_module_welcome
+ext.build_module_login = build_module_login
+ext.build_module_mine = build_module_mine
+ext.build_module_home = build_module_home
+ext.build_module_credit = build_module_credit
+ext.build_module_passport = build_module_passport
+ext.build_module_plan_trip = build_module_plan_trip
+
+
+ext.app_id = "com.module.hikcreate"
+
+//当前运行的model
+ext.build_module = build_module_app
diff --git a/ModuleProject/app_passport/build.gradle b/ModuleProject/app_passport/build.gradle
index e93bcff..2ecf176 100644
--- a/ModuleProject/app_passport/build.gradle
+++ b/ModuleProject/app_passport/build.gradle
@@ -1,17 +1,15 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
+    compileSdkVersion rootProject.compileSdkVersion
     defaultConfig {
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+        versionCode rootProject.versionCode
+        versionName rootProject.versionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
-
     buildTypes {
         release {
             minifyEnabled false
@@ -23,8 +21,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation deps.app_compat
-    testImplementation deps.junit
-    androidTestImplementation deps.runner
-    androidTestImplementation deps.espresso
+//    implementation deps.app_compat
+//    testImplementation deps.junit
+//    androidTestImplementation deps.runner
+//    androidTestImplementation deps.espresso
 }
diff --git a/ModuleProject/app_plan_trip/.gitignore b/ModuleProject/app_plan_trip/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/ModuleProject/app_plan_trip/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ModuleProject/app_plan_trip/build.gradle b/ModuleProject/app_plan_trip/build.gradle
deleted file mode 100644
index e93bcff..0000000
--- a/ModuleProject/app_plan_trip/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
-    defaultConfig {
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation deps.app_compat
-    testImplementation deps.junit
-    androidTestImplementation deps.runner
-    androidTestImplementation deps.espresso
-}
diff --git a/ModuleProject/app_plan_trip/proguard-rules.pro b/ModuleProject/app_plan_trip/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/ModuleProject/app_plan_trip/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/ModuleProject/app_plan_trip/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java b/ModuleProject/app_plan_trip/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
deleted file mode 100644
index c9a0040..0000000
--- a/ModuleProject/app_plan_trip/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package flutter.com.lib_ui;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("flutter.com.lib_ui.test", appContext.getPackageName());
-    }
-}
diff --git a/ModuleProject/app_plan_trip/src/main/AndroidManifest.xml b/ModuleProject/app_plan_trip/src/main/AndroidManifest.xml
deleted file mode 100644
index 244c3c7..0000000
--- a/ModuleProject/app_plan_trip/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.app.plantrip" />
diff --git a/ModuleProject/app_plan_trip/src/main/res/values/strings.xml b/ModuleProject/app_plan_trip/src/main/res/values/strings.xml
deleted file mode 100644
index 11f44e5..0000000
--- a/ModuleProject/app_plan_trip/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">lib_core</string>
-</resources>
diff --git a/ModuleProject/app_plan_trip/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java b/ModuleProject/app_plan_trip/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
deleted file mode 100644
index ff08bd1..0000000
--- a/ModuleProject/app_plan_trip/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package flutter.com.lib_ui;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/ModuleProject/build.gradle b/ModuleProject/build.gradle
index eec5c31..e6f24ea 100644
--- a/ModuleProject/build.gradle
+++ b/ModuleProject/build.gradle
@@ -1,16 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    apply from: 'system_config.gradle'
+    apply from: 'app_module_config.gradle'
+    apply from: 'config.gradle'
     repositories {
         google()
         jcenter()
-        
     }
     dependencies {
-        classpath build_config.classpath_gradle
-        classpath build_config.classpath_kotlin
-        classpath build_config.classpath_kotlin_extension
+        classpath "com.android.tools.build:gradle:3.1.2"
     }
 
 }
@@ -25,10 +23,3 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-
-task test {
-    println "====$build_config.classpath_gradle ===="
-    println "====$build_config.classpath_kotlin ===="
-    println "====$build_config.classpath_kotlin_extensions ===="
-}
diff --git a/ModuleProject/change_config.gradle b/ModuleProject/change_config.gradle
deleted file mode 100644
index 71b23e5..0000000
--- a/ModuleProject/change_config.gradle
+++ /dev/null
@@ -1,25 +0,0 @@
-
-def build_module_app = 0x00 //壳app module组件
-def build_module_welcome = 0x01 // 欢迎组件
-def build_module_login = 0x02 //登录组件
-def build_module_mine = 0x03 //我的模块组件
-def build_module_home = 0x04 //主页面组件
-def build_module_credit = 0x05//信用模块组件
-def build_module_passport = 0x06//通行证组件
-def build_module_plan_trip = 0x07//预约出行组件
-
-
-ext.build_module_app = build_module_app
-ext.build_module_welcome = build_module_welcome
-ext.build_module_login = build_module_login
-ext.build_module_mine = build_module_mine
-ext.build_module_home = build_module_home
-ext.build_module_credit = build_module_credit
-ext.build_module_passport = build_module_passport
-ext.build_module_plan_trip = build_module_plan_trip
-
-
-ext.app_id = "com.module.hikcreate"
-
-//当前运行的model
-ext.build_module = build_module_app
diff --git a/ModuleProject/config.gradle b/ModuleProject/config.gradle
new file mode 100644
index 0000000..b7f1ef1
--- /dev/null
+++ b/ModuleProject/config.gradle
@@ -0,0 +1,95 @@
+
+
+// Define versions in a single place
+ext {
+    // app version
+    versionCode = 162
+    versionName = "1.6.2"
+
+    // Sdk and tools
+    // tool version
+    minSdkVersion = 19
+    targetSdkVersion = 28
+    compileSdkVersion = 28
+
+    // Support library
+    supportLibraryVersion = '28.0.0'
+    multidexVersion = "1.0.3"
+    guavaVersion = '22.0-android'
+    constraintLayout = "1.1.3"
+
+    // butterknife
+    butterknife = '8.8.1'
+
+    // SmartRefreshLayout
+    smartRefreshLayout = '1.1.0-alpha-19'
+
+    // alicloud push
+    alicloudPush = '3.1.4'
+
+    // BackgroundLibrary
+    backgroundLibrary = '1.5.1'
+
+    // qrcode
+    zxing = "3.3.3"
+
+    // NumberPickerView
+    numberPickerView = '1.1.1'
+
+    // ARouter
+    aRouterApi = '1.4.1'
+    aRouterCompiler = '1.2.2'
+
+    // rx
+    retrofit2Version = '2.3.0'
+    rxandroidVersion = '2.0.1'
+    loggingInterceptor = '3.12.+'
+
+    // json tool -- to do
+    fastJsonVersion = '1.2.6'
+    googleGsonVersion = '2.7'
+
+    // permission need to use compileSdkVersion 27 or higher. -- to do
+    easyPermissions = '1.2.0'
+
+    // Architecture Components dependencies
+    roomVersion = "1.1.1"
+    archLifecycleVersion = "1.1.1"
+
+    // image
+    gliderVersion = "4.9.0"
+
+    // jsbridge
+    jsbridge = '1.0.4'
+
+    //LabelsView
+    labelsView='1.4.7'
+
+    //svg
+    androidsvg = '1.3'
+
+    //rating bar
+    materialratingbar = '1.3.2'
+
+    //bannerView
+    bannerView = '1.4.8'
+
+    // test -- to do
+    junitVersion = '4.12'
+    mockitoVersion = '1.10.19'
+    powerMockito = '1.6.2'
+    hamcrestVersion = '1.3'
+    runnerVersion = '1.0.2'
+    rulesVersion = '1.0.1'
+    espressoVersion = '3.0.2'
+
+    // u meng
+    umengAnalytics = '8.0.0'
+    umengCommon = '2.0.0'
+    //bugly tinker
+    multidex = '1.0.2'
+    tinkerVersion = '1.9.9'
+    bugly_crashreport ='1.3.8'
+    bugly_native_crashreport ='latest.release'
+    meituanWalle = '1.1.3'
+}
diff --git a/ModuleProject/lib_common_util/.gitignore b/ModuleProject/lib_common_util/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/ModuleProject/lib_common_util/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ModuleProject/lib_common_util/build.gradle b/ModuleProject/lib_common_util/build.gradle
deleted file mode 100644
index d562f35..0000000
--- a/ModuleProject/lib_common_util/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
-    defaultConfig {
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-
-    buildTypes {
-        debugg {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-}
diff --git a/ModuleProject/lib_common_util/proguard-rules.pro b/ModuleProject/lib_common_util/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/ModuleProject/lib_common_util/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/ModuleProject/lib_common_util/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java b/ModuleProject/lib_common_util/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
deleted file mode 100644
index c9a0040..0000000
--- a/ModuleProject/lib_common_util/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package flutter.com.lib_ui;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("flutter.com.lib_ui.test", appContext.getPackageName());
-    }
-}
diff --git a/ModuleProject/lib_common_util/src/main/AndroidManifest.xml b/ModuleProject/lib_common_util/src/main/AndroidManifest.xml
deleted file mode 100644
index bc23ea3..0000000
--- a/ModuleProject/lib_common_util/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.app.common.util" />
diff --git a/ModuleProject/lib_common_util/src/main/res/values/strings.xml b/ModuleProject/lib_common_util/src/main/res/values/strings.xml
deleted file mode 100644
index 11f44e5..0000000
--- a/ModuleProject/lib_common_util/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">lib_core</string>
-</resources>
diff --git a/ModuleProject/lib_common_util/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java b/ModuleProject/lib_common_util/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
deleted file mode 100644
index ff08bd1..0000000
--- a/ModuleProject/lib_common_util/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package flutter.com.lib_ui;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/ModuleProject/lib_core/.gitignore b/ModuleProject/lib_core/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/ModuleProject/lib_core/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ModuleProject/lib_core/build.gradle b/ModuleProject/lib_core/build.gradle
deleted file mode 100644
index d562f35..0000000
--- a/ModuleProject/lib_core/build.gradle
+++ /dev/null
@@ -1,31 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
-    defaultConfig {
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-
-    buildTypes {
-        debugg {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-}
diff --git a/ModuleProject/lib_core/proguard-rules.pro b/ModuleProject/lib_core/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/ModuleProject/lib_core/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/ModuleProject/lib_core/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java b/ModuleProject/lib_core/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
deleted file mode 100644
index c9a0040..0000000
--- a/ModuleProject/lib_core/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package flutter.com.lib_ui;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("flutter.com.lib_ui.test", appContext.getPackageName());
-    }
-}
diff --git a/ModuleProject/lib_core/src/main/AndroidManifest.xml b/ModuleProject/lib_core/src/main/AndroidManifest.xml
deleted file mode 100644
index be8b4bb..0000000
--- a/ModuleProject/lib_core/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.app.core" />
diff --git a/ModuleProject/lib_core/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java b/ModuleProject/lib_core/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
deleted file mode 100644
index ff08bd1..0000000
--- a/ModuleProject/lib_core/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package flutter.com.lib_ui;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/ModuleProject/lib_network/build.gradle b/ModuleProject/lib_network/build.gradle
index d562f35..b6efdb0 100644
--- a/ModuleProject/lib_network/build.gradle
+++ b/ModuleProject/lib_network/build.gradle
@@ -1,17 +1,15 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
+    compileSdkVersion rootProject.compileSdkVersion
     defaultConfig {
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
+        versionCode rootProject.versionCode
+        versionName rootProject.versionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
-
     buildTypes {
         debugg {
             minifyEnabled false
diff --git a/ModuleProject/lib_ui/.gitignore b/ModuleProject/lib_ui/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/ModuleProject/lib_ui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/ModuleProject/lib_ui/build.gradle b/ModuleProject/lib_ui/build.gradle
deleted file mode 100644
index 9644cb7..0000000
--- a/ModuleProject/lib_ui/build.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion build_config.compile_sdk
-    buildToolsVersion build_config.build_tool
-    defaultConfig {
-        minSdkVersion build_config.min_sdk
-        targetSdkVersion build_config.target_sdk
-        versionCode build_config.version_code
-        versionName build_config.version_name
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-
-
-    buildTypes {
-
-        debugg {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-
-
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-}
-
-dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-}
diff --git a/ModuleProject/lib_ui/proguard-rules.pro b/ModuleProject/lib_ui/proguard-rules.pro
deleted file mode 100644
index f1b4245..0000000
--- a/ModuleProject/lib_ui/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
diff --git a/ModuleProject/lib_ui/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java b/ModuleProject/lib_ui/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
deleted file mode 100644
index c9a0040..0000000
--- a/ModuleProject/lib_ui/src/androidTest/java/flutter/com/lib_ui/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package flutter.com.lib_ui;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("flutter.com.lib_ui.test", appContext.getPackageName());
-    }
-}
diff --git a/ModuleProject/lib_ui/src/main/AndroidManifest.xml b/ModuleProject/lib_ui/src/main/AndroidManifest.xml
deleted file mode 100644
index 3ae7ccb..0000000
--- a/ModuleProject/lib_ui/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.app.ui" />
-
diff --git a/ModuleProject/lib_ui/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java b/ModuleProject/lib_ui/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
deleted file mode 100644
index ff08bd1..0000000
--- a/ModuleProject/lib_ui/src/test/java/flutter/com/lib_ui/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package flutter.com.lib_ui;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/ModuleProject/settings.gradle b/ModuleProject/settings.gradle
index fe3543d..250fc3a 100644
--- a/ModuleProject/settings.gradle
+++ b/ModuleProject/settings.gradle
@@ -1 +1 @@
-include ':app',":lib_common_util",":lib_network", ':app_mine', ':lib_ui', ':lib_core', ':app_common', ':app_passport', ':app_login', ':app_plan_trip', ':app_home', ':app_credit'
+include ':app',":lib_network", ':app_passport', ':app_login'
diff --git a/ModuleProject/system_config.gradle b/ModuleProject/system_config.gradle
deleted file mode 100644
index 207cb32..0000000
--- a/ModuleProject/system_config.gradle
+++ /dev/null
@@ -1,163 +0,0 @@
-apply from: 'change_config.gradle'
-//build_config 配置
-def build_config = [:]
-//android
-build_config.classpath_gradle = "com.android.tools.build:gradle:3.1.2"
-build_config.min_sdk = 19
-build_config.compile_sdk = 26
-build_config.build_tool = "27.0.3"
-build_config.target_sdk = 26
-build_config.version_code = 7
-build_config.version_name = "1.2.0"
-build_config.classpath_kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.41"
-build_config.classpath_kotlin_extension = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.41"
-ext.build_config = build_config
-
-//引用的包版本
-def versions = [:]
-
-//google
-versions.support                            = "27.1.1"
-versions.multidex                           = "1.0.2"
-versions.constraint                         = "1.1.2"
-versions.kotlin                             = "1.2.41"
-versions.dagger                             = "2.16"
-versions.arch                               = "1.1.1"
-versions.lifecycle                          = "1.1.1"
-versions.room                               = "1.1.1"
-versions.paging                             = "1.0.1"
-versions.gson                               = "2.8.5"
-
-//test
-versions.junit                              = "4.12"
-versions.runner                             = "1.0.2"
-versions.espresso                           = "3.0.2"
-
-//kotlin
-versions.kotlin                           = "1.3.0"
-
-
-//third
-versions.tingyun                            = "2.10.2"
-versions.tinker                             = "1.9.6"
-versions.walle                              = "1.1.6"
-versions.jpush                              = "3.1.5"
-versions.jcore                              = "1.2.3"
-versions.bugly_crashreport                  = "1.3.5"
-versions.bugly_nativecrashreport            = "latest.release"
-versions.rxjava2                            = "2.1.16"
-versions.rxandroid                          = "2.0.2"
-versions.retrofit2                          = "2.4.0"
-versions.rxpermissions                      = "0.10.2"
-versions.rxlifecycle                        = "2.2.1"
-versions.rxbinding                          = "2.1.1"
-versions.stetho                             = "1.5.0"
-versions.arouter_api                        = "1.4.0"
-versions.arouter_compiler                   = "1.2.0"
-versions.auto_parcel                        = "0.3.1"
-versions.logger                             = "2.2.0"
-versions.okhttp3_logging                    = "3.8.1"
-versions.butterknife                        = "8.8.1"
-versions.magicIndicator                     = "1.5.0"
-versions.glide                              = "4.7.1"
-versions.matisse                            = "0.5.2-beta2"
-versions.SmartRefreshLayout                 = "1.1.0-alpha-14"
-versions.eventbus                           = "3.1.1"
-versions.barlibrary                         = "2.3.0"
-
-versions.reactivenetwork_rx2                = "0.12.1"
-versions.greendao                           = "3.2.2"
-versions.encipher                           = "3.5.6"
-versions.fresco                             = "1.8.1"
-versions.rxbinding_recyclerview             = "2.0.0"
-versions.fastjson                           = "1.2.7"
-versions.fastjson_android                   = "1.1.60.android"
-
-ext.versions = versions
-
-//deps依赖库
-ext.deps = [:]
-def deps = [:]
-//google
-deps.multidex                           = "com.android.support:multidex:$versions.multidex"
-deps.v4                                 = "com.android.support:support-v4:$versions.support"
-deps.app_compat                         = "com.android.support:appcompat-v7:$versions.support"
-deps.annotations                        = "com.android.support:support-annotations:$versions.support"
-deps.recyclerview                       = "com.android.support:recyclerview-v7:$versions.support"
-deps.design                             = "com.android.support:design:$versions.support"
-deps.constraint                         = "com.android.support.constraint:constraint-layout:$versions.constraint"
-deps.cardview                           = "com.android.support:cardview-v7:$versions.support"
-deps.kotlin                             = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
-deps.dagger                             = "com.google.dagger:dagger:$versions.dagger"
-deps.dagger_android_support             = "com.google.dagger:dagger-android-support:$versions.dagger"
-deps.arch_lifecycle_runtime             = "android.arch.lifecycle:runtime:$versions.lifecycle"
-deps.arch_lifecycle_extensions          = "android.arch.lifecycle:extensions:$versions.lifecycle"
-deps.arch_lifecycle_java8               = "android.arch.lifecycle:common-java8:$versions.lifecycle"
-deps.room_runtime                       = "android.arch.persistence.room:runtime:$versions.room"
-deps.room_rxjava2                       = "android.arch.persistence.room:rxjava2:$versions.room"
-deps.room_testing                       = "android.arch.persistence.room:testing:$versions.room"
-deps.paging                             = "android.arch.paging:runtime:$versions.paging"
-deps.gson                               = "com.google.code.gson:gson:$versions.gson"
-deps.kotlin                               = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
-
-//test
-deps.junit                              = "junit:junit:$versions.junit"
-deps.arch_testing                       = "android.arch.core:core-testing:$versions.arch"
-deps.runner                             = "com.android.support.test:runner:$versions.runner"
-deps.espresso                           = "com.android.support.test.espresso:espresso-core:$versions.espresso"
-//utils
-deps.utilcode                           = "com.blankj:utilcode:$versions.utilcode"
-deps.stickyDecoration                   = "com.gavin.com.library:stickyDecoration:$versions.stickyDecoration"
-
-
-
-//third
-deps.tingyun                            = "com.networkbench.newlens.agent.android:nbs.newlens.agent:$versions.tingyun"
-deps.tinker                             = "com.tencent.tinker:tinker-android-lib:$versions.tinker"
-deps.walle                              = "com.meituan.android.walle:library:$versions.walle"
-deps.jpush                              = "cn.jiguang.sdk:jpush:$versions.jpush"
-deps.jcore                              = "cn.jiguang.sdk:jcore:$versions.jcore"
-deps.bugly_crashreport                  = "com.tencent.bugly:crashreport_upgrade:$versions.bugly_crashreport"
-deps.bugly_nativecrashreport            = "com.tencent.bugly:nativecrashreport:$versions.bugly_nativecrashreport"
-deps.rxjava2                            = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
-deps.rxandroid                          = "io.reactivex.rxjava2:rxandroid:$versions.rxandroid"
-deps.retrofit2                          = "com.squareup.retrofit2:retrofit:$versions.retrofit2"
-deps.retrofit2_converter_gson           = "com.squareup.retrofit2:converter-gson:$versions.retrofit2"
-deps.retrofit2_adpater_rxjava2          = "com.squareup.retrofit2:adapter-rxjava2:$versions.retrofit2"
-
-deps.rxlifecycle                        = "com.trello.rxlifecycle2:rxlifecycle:$versions.rxlifecycle"
-deps.rxlifecycle_android                = "com.trello.rxlifecycle2:rxlifecycle-android:$versions.rxlifecycle"
-deps.rxlifecycle_components             = "com.trello.rxlifecycle2:rxlifecycle-components:$versions.rxlifecycle"
-deps.rxbinding                          = "com.jakewharton.rxbinding2:rxbinding:$versions.rxbinding"
-deps.stetho                             = "com.facebook.stetho:stetho:$versions.stetho"
-deps.stetho_okhttp3                     = "com.facebook.stetho:stetho-okhttp3:$versions.stetho"
-deps.arouter_api                        = "com.alibaba:arouter-api:$versions.arouter_api"
-deps.auto_parcel                        = "com.github.frankiesardo:auto-parcel:$versions.auto_parcel"
-deps.logger                             = "com.orhanobut:logger:$versions.logger"
-deps.okhttp3_logging                    = "com.squareup.okhttp3:logging-interceptor:$versions.okhttp3_logging"
-deps.butterknife                        = "com.jakewharton:butterknife:$versions.butterknife"
-deps.matisse                            = "com.zhihu.android:matisse:$versions.matisse"
-deps.SmartRefreshLayout                 = "com.scwang.smartrefresh:SmartRefreshLayout:$versions.SmartRefreshLayout"
-deps.glide                              = "com.github.bumptech.glide:glide:$versions.glide"
-deps.eventbus                           = "org.greenrobot:eventbus:$versions.eventbus"
-deps.reactivenetwork_rx2                = "com.github.pwittchen:reactivenetwork-rx2:$versions.reactivenetwork_rx2"
-deps.greendao                           = "org.greenrobot:greendao:$versions.greendao"
-deps.encipher                           = "net.zetetic:android-database-sqlcipher:$versions.encipher"
-deps.fresco                             = "com.facebook.fresco:fresco:$versions.fresco"
-deps.rxbinding_recyclerview             = "com.jakewharton.rxbinding2:rxbinding-recyclerview-v7:$versions.rxbinding_recyclerview"
-deps.fastjson                           = "com.alibaba:fastjson:$versions.fastjson"
-deps.fastjson_android                   = "com.alibaba:fastjson:$versions.fastjson_android"
-deps.barlibrary                         = "com.gyf.barlibrary:barlibrary:$versions.barlibrary"
-deps.baidu_wtj                          = "com.baidu.mobstat:mtj-sdk:$versions.baidu_wtj"
-
-//compiler
-deps.arch_lifecycle_compiler            = "android.arch.lifecycle:compiler:$versions.lifecycle"
-deps.room_compiler                      = "android.arch.persistence.room:compiler:$versions.room"
-deps.dagger_compiler                    = "com.google.dagger:dagger-compiler:$versions.dagger"
-deps.arouter_compiler                   = "com.alibaba:arouter-compiler:$versions.arouter_compiler"
-deps.auto_parcel_processor              = "com.github.frankiesardo:auto-parcel-processor:$versions.auto_parcel"
-deps.butterknife_compiler               = "com.jakewharton:butterknife-compiler:$versions.butterknife"
-deps.glide_compiler                     = "com.github.bumptech.glide:compiler:$versions.glide"
-
-ext.deps = deps
-
--
libgit2 0.26.0