feat: 修改配置

ModuleProject/.idea/gradle.xml

@@ -15,6 +15,7 @@
             <option value="$PROJECT_DIR$/business/app_passport" />
             <option value="$PROJECT_DIR$/business_base" />
             <option value="$PROJECT_DIR$/business_base/app_common" />
+            <option value="$PROJECT_DIR$/business_base/app_module_manager" />
             <option value="$PROJECT_DIR$/business_base/lib_baidu_audiodect" />
             <option value="$PROJECT_DIR$/business_base/lib_baidu_facedect" />
             <option value="$PROJECT_DIR$/business_base/lib_baidu_textdect" />
@@ -22,8 +23,9 @@
             <option value="$PROJECT_DIR$/function/lib_app_common" />
             <option value="$PROJECT_DIR$/function/lib_common_ui" />
             <option value="$PROJECT_DIR$/function/lib_data_drive" />
-            <option value="$PROJECT_DIR$/function/lib_module_common" />
-            <option value="$PROJECT_DIR$/function/lib_network" />
+            <option value="$PROJECT_DIR$/function/lib_router_module" />
+            <option value="$PROJECT_DIR$/function_base" />
+            <option value="$PROJECT_DIR$/function_base/lib_network" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

ModuleProject/app/build.gradle

-if (build_module == build_module_app) {
-    apply plugin: 'com.android.application'
-} else {
-    apply plugin: 'com.android.library'
-}
+apply plugin: 'com.android.application'
 android {
     compileSdkVersion build_config.compile_sdk
     defaultConfig {
-        if (build_module == build_module_app) {
         applicationId build_modele_app_id
-        }
         minSdkVersion build_config.min_sdk
         targetSdkVersion build_config.target_sdk
         versionCode build_config.version_code
@@ -105,8 +99,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    if (build_module == build_module_app) {
     api project(':business_base:app_common')
+    if (isModule) {
         api project(':business:app_login')
         api project(':business:app_passport')
     }

ModuleProject/app/src/main/java/com/hikcreate/ui/testActivity.java

 package com.hikcreate.ui;
 
-import android.content.Intent;
+
 import android.os.Bundle;
-import android.os.Handler;
-import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
-
 import com.hikcreate.data.config.AppProvider;
 import com.hikcreate.library.util.LogCat;
 import com.hikcreate.module_router.router.RouterResponse;
 import com.hikcreate.module_router.tools.ModuleRouterUtil;
 import com.hikcreate.module_router.tools.RouterCallBack;
-import com.message.bean.GeneralMessageBean;
-import com.message.driver.MessageWrap;
-import com.google.gson.Gson;
-import com.hikcreate.login.testLoginActivity;
-import com.hikcreate.passport.TestFragment;
-import com.hikcreate.temp.TestBean;
+
 import com.module.hikcreate.R;
 
 import java.util.HashMap;
@@ -51,15 +43,16 @@ public class testActivity extends AppCompatActivity {
 
 
         findViewById(R.id.mBtnLoginSync).setOnClickListener(v -> {
-            HashMap<String,String> value = new HashMap<>();
-            value.put("name","wangtao");
-            value.put("mobile","150000000000");
+            HashMap<String, String> value = new HashMap<>();
+            value.put("name", "wangtao");
+            value.put("mobile", "150000000000");
             ModuleRouterUtil.routeSyncToUi(getApplicationContext(),
                     AppProvider.USER_INFO_CHANGE_PROVIDER, AppProvider.USER_INFO_CHANGE_ACTION, value, new RouterCallBack() {
                         @Override
                         public void callSuccess(RouterResponse response) {
                             Toast.makeText(testActivity.this, response.get(), Toast.LENGTH_SHORT).show();
                         }
+
                         @Override
                         public void callFail(RouterResponse response) {
                         }
@@ -67,8 +60,5 @@ public class testActivity extends AppCompatActivity {
 
 
         });
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-        transaction.add(R.id.test_passport, new TestFragment());
-        transaction.commit();
     }
 }

ModuleProject/business/app_login/build.gradle

-if (build_module == build_module_login) {
-    apply plugin: 'com.android.application'
-} else {
+if (isModule) {
     apply plugin: 'com.android.library'
+
+} else {
+    apply plugin: 'com.android.application'
 }
 android {
     defaultConfig {
-        if (build_module == build_module_login) {
+        if (!isModule) {
             applicationId build_modele_app_id + "." + project.getName()
         }
         minSdkVersion build_config.min_sdk
@@ -47,7 +48,7 @@ android {
 
     sourceSets {
         main {
-            if (rootProject.build_module == build_module_login) {
+            if (!isModule) {
                 manifest.srcFile 'src/main/module/AndroidManifest.xml'
             } else {
                 manifest.srcFile 'src/main/AndroidManifest.xml'
@@ -81,4 +82,5 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     api project(':business_base:app_common')
+    api project(':function:lib_app_common')
 }

ModuleProject/business/app_passport/build.gradle

-if (build_module == build_module_passport) {
-    apply plugin: 'com.android.application'
-} else {
+if (isModule) {
     apply plugin: 'com.android.library'
+
+} else {
+    apply plugin: 'com.android.application'
 }
 
 android {
     defaultConfig {
-        if (build_module == build_module_passport) {
+        if (!isModule) {
             applicationId build_modele_app_id + "." + project.getName()
         }
         minSdkVersion build_config.min_sdk
@@ -41,7 +42,7 @@ android {
 
     sourceSets {
         main {
-            if (rootProject.build_module == build_module_passport) {
+            if (!isModule) {
                 manifest.srcFile 'src/main/module/AndroidManifest.xml'
             } else {
                 manifest.srcFile 'src/main/AndroidManifest.xml'

ModuleProject/business/app_passport/src/main/AndroidManifest.xml

@@ -3,7 +3,10 @@
     package="com.app.passport">
 
     <application>
-
+        <activity
+            android:name="com.hikcreate.passport.testPassportActivity"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file

ModuleProject/business/app_passport/src/main/java/com/hikcreate/passport/testPassportActivity.java

+package com.hikcreate.passport;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import com.app.passport.R;
+
+/**
+ * 类说明
+ *
+ * @author wangtao55
+ * @date 2019/9/18
+ * @mail wangtao55@hikcreate.com
+ */
+public class testPassportActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.passport_test_activity);
+
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+}

ModuleProject/business/app_passport/src/main/java/com/hikcreate/test/CommonApplication.java

@@ -22,13 +22,13 @@ public class CommonApplication extends Application {
     @Override
     public void onTerminate() {
         super.onTerminate();
-        AppContext.getInstance().logicOnTerminate();
+        AppContext.getInstance().logicOnTerminate(this);
     }
 
     @Override
     public void onLowMemory() {
         super.onLowMemory();
-        AppContext.getInstance().logicOnLowMemory();
+        AppContext.getInstance().logicOnLowMemory(this);
     }
 
 }

ModuleProject/business/app_passport/src/main/module/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.app.login">
+    package="com.app.passport">
 
     <application
         android:roundIcon="@mipmap/ic_launcher"
@@ -12,6 +12,12 @@
         tools:ignore="GoogleAppIndexingWarning"
         tools:replace="android:icon,android:roundIcon,android:theme,android:label,android:allowBackup">
 
+        <activity android:name="com.hikcreate.passport.testPassportActivity">
+            <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

ModuleProject/business/app_passport/src/main/res/layout/passport_test_activity.xml

+<?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:background="@android:color/white"
+    android:layout_height="match_parent">
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="我来自于哪里："
+        android:id="@+id/tv_from" />
+
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="消息内容为"
+        android:layout_marginTop="10dp"
+        android:id="@+id/tv_message_info" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="name:"
+        android:layout_marginTop="10dp"
+        android:id="@+id/tv_value" />
+
+
+</LinearLayout>

ModuleProject/business_base/app_common/build.gradle

@@ -37,6 +37,6 @@ dependencies {
     api project(':function:lib_app_common')
     api project(':function:lib_common_ui')
     api project(':function:lib_data_drive')
-    api project(':function:lib_network')
-    api project(':function:lib_module_common')
+    api project(':function_base:lib_network')
+    api project(':business_base:app_module_manager')
 }

ModuleProject/config/app_module_config.gradle

@@ -3,6 +3,9 @@ def build_module_app = 0x00 //壳app module组件
 def build_module_login = 0x02 //登录组件
 def build_module_passport = 0x06//通行证组件
 
+ext.isModule= false
+
+
 //壳app
 ext.build_module_app = build_module_app
 ext.build_modele_app_id = "com.module.hikcreate"
@@ -19,4 +22,4 @@ ext.build_modele_passport_resourcePrefix = "passport_"
 ext.build_modele_baidu_resourcePrefix = "baidu_"
 
 //当前运行的model
-ext.build_module = build_module_app
+ext.build_module = build_module_passport

ModuleProject/function/lib_app_common/src/main/AndroidManifest.xml

 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hikcreate.library">
 
-    <application android:allowBackup="false"></application>
+    <application>
+
+    </application>
 
 </manifest>

ModuleProject/settings.gradle

 include ':app', ':function:lib_common_ui',
         ':function:lib_data_drive',
+        ':function:lib_router_module',
+        ':function_base:lib_network',
+        ':function:lib_app_common',
+        'business:app_passport',
+        'business:app_login',
+        ':business_base:lib_baidu_audiodect',
+        ':business_base:lib_baidu_facedect',
+        ':business_base:lib_baidu_textdect',
+        ':business_base:app_module_manager',
         ':business_base:app_common',
-        ':function:lib_module_common',
-        ":function:lib_network", ':function:lib_app_common', 'business:app_passport', 'business:app_login', ':business_base:lib_baidu_audiodect',':buildsrc',":business_base:lib_baidu_facedect",":business_base:lib_baidu_textdect"
+        ':buildsrc'