1.module单独编译运行

2.module-main迁移至app，并移除module-main

Author: 1170762202@qq.com

.idea/gradle.xml

@@ -4,6 +4,10 @@
 [源码地址](https://github.com/1170762202/WanAndroid)
 喜欢的话，记得给个star哦!
 
+### [1.1.1版本更新](https://github.com/1170762202/WanAndroid/releases)
+* module单独编译运行
+* module-main迁移至app，并移除module-main
+
 #### [历史版本](https://github.com/1170762202/WanAndroid/releases)
 
 #### 首页有彩蛋哦，等你发现！！！
@@ -51,7 +55,6 @@
       ||--library-common//通用库（全局Context获取等）
       ||--library-widget// 控件封装
   ||--modules// 功能模块
-    ||--module-main// 主页模块
     ||--module-home// 首页模块
     ||--module-login// 登录模块
     ||--module-project// 项目模块
@@ -62,6 +65,11 @@
 ||-- README.md
  ```
 
+#### module单独编译运行说明
+gradle.properties 文件下有个"集成开发模式" 和 "组件开发模式"的切换开关 true表示组件独立运行，false表示一个library
+````java
+isRunModule=true
+````
 
 
 

README.md

@@ -1,5 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'android-aspectjx'
+apply plugin: 'com.jakewharton.butterknife'
+
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
 def keystoreProperties = new Properties()
@@ -53,33 +55,26 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     // AndroidJUnitRunner and JUnit Rules
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test:rules:1.1.1'
-
-
-    annotationProcessor rootProject.ext.dependencies.butterknifeCompiler
-
-    /*materialedittex*/
-    implementation 'com.rengwuxian.materialedittext:library:2.1.4'
-
-
-
-    implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
-    implementation 'com.github.ozodrukh:CircularReveal:1.0.5@aar'
-
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
 
 
     implementation project(':library-base')
     implementation project(':library-widget')
     implementation project(':library-common')
     implementation project(':library-aop')
-    implementation project(':module-main')
-    implementation project(':module-home')
-    implementation project(':module-project')
-    implementation project(':module-square')
-    implementation project(':module-public')
-    implementation project(':module-mine')
-    implementation project(':module-web')
-    implementation project(':module-login')
+    if (!isRunModule.toBoolean()) {
+        implementation project(':module-home')
+        implementation project(':module-project')
+        implementation project(':module-square')
+        implementation project(':module-public')
+        implementation project(':module-mine')
+        implementation project(':module-web')
+        implementation project(':module-login')
+    }
+
+
+    annotationProcessor rootProject.ext.dependencies.butterknifeCompiler
+    annotationProcessor rootProject.ext.dependencies.arouterCompiler
 
 }

app/build.gradle

@@ -13,7 +13,7 @@
         android:hardwareAccelerated="true"
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/logo"
         android:supportsRtl="true"
         android:theme="@style/AppWelcome"
         android:usesCleartextTraffic="true"
@@ -36,6 +36,16 @@
             android:value="true" />
 
 
+
+        <activity android:name=".activity.MainActivity"/>
+        <activity android:name=".activity.SplashAc"
+            android:theme="@style/AppTheme.Splash">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>

app/src/main/AndroidManifest.xml

@@ -1,4 +1,4 @@
-package com.zlx.module_main.activity;
+package com.zlx.sharelive.activity;
 
 import android.content.Intent;
 import android.graphics.Typeface;
@@ -9,13 +9,12 @@
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.zlx.module_main.R;
-import com.zlx.module_main.R2;
-import com.zlx.module_main.adapter.VpAdapterMain;
-import com.zlx.module_main.impl.TabPagerListener;
 import com.zlx.module_base.base_ac.BaseAc;
 import com.zlx.module_base.constant.RouterActivityPath;
 import com.zlx.module_base.constant.RouterFragmentPath;
+import com.zlx.sharelive.R;
+import com.zlx.sharelive.adapter.VpAdapterMain;
+import com.zlx.sharelive.impl.TabPagerListener;
 import com.zlx.widget.bubblenavigation.BubbleNavigationConstraintView;
 import com.zlx.widget.bubblenavigation.listener.BubbleNavigationChangeListener;
 import com.zlx.widget.viewpager.NoScrollViewPager;
@@ -27,9 +26,9 @@
 public class MainActivity extends BaseAc implements BubbleNavigationChangeListener, TabPagerListener {
 
 
-    @BindView(R2.id.viewPager)
+    @BindView(R.id.viewPager)
     NoScrollViewPager viewPager;
-    @BindView(R2.id.bottom_navigation_view_linear)
+    @BindView(R.id.bottom_navigation_view_linear)
     BubbleNavigationConstraintView bubbleNavigationLinearView;
 
 

module-main/src/main/java/com/zlx/module_main/activity/MainActivity.java renamed to app/src/main/java/com/zlx/sharelive/activity/MainActivity.java

@@ -1,15 +1,14 @@
-package com.zlx.module_login.activity;
+package com.zlx.sharelive.activity;
 
-import com.zlx.module_base.database.MMkvHelper;
+import com.zlx.module_base.base_ac.BaseAc;
 import com.zlx.module_base.base_api.res_data.ProjectListRes;
 import com.zlx.module_base.base_api.util.ApiUtil;
-import com.zlx.module_base.base_ac.BaseAc;
 import com.zlx.module_base.base_util.RouterUtil;
-import com.zlx.module_login.R;
-import com.zlx.module_login.R2;
+import com.zlx.module_base.database.MMkvHelper;
 import com.zlx.module_network.api1.livedata.BaseObserver;
 import com.zlx.module_network.api1.livedata.BaseObserverCallBack;
 import com.zlx.module_network.bean.ApiResponse;
+import com.zlx.sharelive.R;
 
 import java.util.List;
 
@@ -23,7 +22,7 @@
  */
 public class SplashAc extends BaseAc {
 
-    @BindView(R2.id.particleview)
+    @BindView(R.id.particleview)
     ParticleView particleview;
 
     @Override

module-login/src/main/java/com/zlx/module_login/activity/SplashAc.java renamed to app/src/main/java/com/zlx/sharelive/activity/SplashAc.java

@@ -1,10 +1,10 @@
-package com.zlx.module_main.adapter;
+package com.zlx.sharelive.adapter;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 
-import com.zlx.module_main.impl.TabPagerListener;
+import com.zlx.sharelive.impl.TabPagerListener;
 
 /**
  * @date: 2019\3\5 0005

module-main/src/main/java/com/zlx/module_main/adapter/VpAdapterMain.java renamed to app/src/main/java/com/zlx/sharelive/adapter/VpAdapterMain.java

@@ -1,4 +1,4 @@
-package com.zlx.module_main.impl;
+package com.zlx.sharelive.impl;
 
 import androidx.fragment.app.Fragment;
 

module-main/src/main/java/com/zlx/module_main/impl/TabPagerListener.java renamed to app/src/main/java/com/zlx/sharelive/impl/TabPagerListener.java

@@ -1,4 +1,4 @@
-package com.zlx.module_main.intercept;
+package com.zlx.sharelive.intercept;
 
 import android.content.Context;
 import android.util.Log;

module-main/src/main/java/com/zlx/module_main/intercept/LoginInterceptor.java renamed to app/src/main/java/com/zlx/sharelive/intercept/LoginInterceptor.java

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#36C1BC</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#36C1BC</color>
+
 
 </resources>

module-main/src/main/res/layout/ac_main.xml renamed to app/src/main/res/layout/ac_main.xml

@@ -5,8 +5,8 @@ ext {
             compileSdkVersion: 28,
             minSdkVersion    : 21,
             targetSdkVersion : 28,
-            versionCode      : 4,
-            versionName      : "1.0",
+            versionCode      : 1,
+            versionName      : "1.1",
     ]
 
 

module-login/src/main/res/layout/ac_splash.xml renamed to app/src/main/res/layout/ac_splash.xml

@@ -17,5 +17,5 @@ android.enableJetifier=true
 android.injected.testOnly = false
 
 
-# isMainModule 是 "集成开发模式" 和 "组件开发模式"的切换开关 true表示组件独立运行，false表示一个library
-isMainModule=false
+#  "集成开发模式" 和 "组件开发模式"的切换开关 true表示组件独立运行，false表示一个library
+isRunModule=true

module-main/src/main/res/mipmap-xhdpi/ic_more.png renamed to app/src/main/res/mipmap-xhdpi/ic_more.png

@@ -97,6 +97,7 @@ dependencies {
     api  'com.scwang.smart:refresh-header-two-level:2.0.1'   //二级刷新头
 
     api "com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.4"
+    api 'me.wangyuwei:ParticleView:1.0.4'
 
     api project(':library-db')
     api project(':library-network')

module-main/src/main/res/mipmap-xhdpi/ic_more_90.png renamed to app/src/main/res/mipmap-xhdpi/ic_more_90.png

@@ -41,6 +41,9 @@ public class UserInfo implements Parcelable {
     private String rank;
     private String userId, reason, desc, date;
 
+    public UserInfo() {
+    }
+
     protected UserInfo(Parcel in) {
         email = in.readString();
         icon = in.readString();

module-main/src/main/res/mipmap-xhdpi/ic_more_menu.png renamed to app/src/main/res/mipmap-xhdpi/ic_more_menu.png

@@ -14,7 +14,7 @@
     <item>
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/logo" />
+            android:src="@mipmap/logo1" />
     </item>
 
 </layer-list>

module-main/src/main/res/mipmap-xhdpi/ic_tab1.png renamed to app/src/main/res/mipmap-xhdpi/ic_tab1.png

@@ -48,7 +48,6 @@
             android:background="?attr/selectableItemBackgroundBorderless"
             android:paddingStart="10dp"
             android:paddingEnd="10dp"
-            android:src="@mipmap/ic_more_menu"
             android:visibility="gone"
             tools:visibility="visible" />
     </LinearLayout>

module-main/src/main/res/mipmap-xhdpi/ic_tab2.png renamed to app/src/main/res/mipmap-xhdpi/ic_tab2.png

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="colorPrimary">#36C1BC</color>
+    <color name="colorPrimaryDark">#00574B</color>
+    <color name="colorAccent">#36C1BC</color>
+
     <color name="black">#000000</color>
     <color name="main">#ffffff</color>
     <color name="dividerColor">#E6E3E3</color>

module-main/src/main/res/mipmap-xhdpi/ic_tab3.png renamed to app/src/main/res/mipmap-xhdpi/ic_tab3.png

@@ -25,4 +25,7 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:background">@color/main</item>
     </style>
+    <style name="AppTheme.Splash">
+        <item name="android:windowBackground">@drawable/splash_bg</item>
+    </style>
 </resources>

module-main/src/main/res/mipmap-xhdpi/ic_tab4.png renamed to app/src/main/res/mipmap-xhdpi/ic_tab4.png

@@ -9,6 +9,8 @@
 import androidx.annotation.IntDef;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -58,6 +60,7 @@ public class HiveLayoutManager  extends RecyclerView.LayoutManager {
      * @see #VERTICAL
      * @see #HORIZONTAL
      */
+    @Retention(RetentionPolicy.SOURCE)
     @IntDef({HORIZONTAL, VERTICAL})
     @interface Orientation {
     }

module-main/src/main/res/mipmap-xhdpi/ic_tab5.png renamed to app/src/main/res/mipmap-xhdpi/ic_tab5.png

@@ -1,13 +1,18 @@
-apply plugin: 'com.android.library'
+if (isRunModule.toBoolean()) {
+    apply plugin: 'com.android.application'
+} else {
+    apply plugin: 'com.android.library'
+}
+
 apply plugin: 'com.jakewharton.butterknife'
 
 android {
     compileSdkVersion rootProject.ext.android.compileSdkVersion
 
 
     defaultConfig {
-        if (isMainModule.toBoolean()) {
-            applicationId "com.zlx.home"
+        if (isRunModule.toBoolean()) {
+            applicationId "com.zlx.module_home"
         }
         minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
@@ -28,6 +33,19 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    sourceSets {
+
+        main {
+            // 1.单独调试与集成调试时使用不同的 AndroidManifest.xml 文件
+            // 我们还可以根据不同工程配置不同的 Java 源代码、不同的 resource 资源文件等的
+            if (isRunModule.toBoolean()) {
+
+                manifest.srcFile 'src/main/manifest/AndroidManifest.xml'
+            } else {
+                manifest.srcFile 'src/main/AndroidManifest.xml'
+            }
+        }
+    }
 }
 
 dependencies {
@@ -41,4 +59,8 @@ dependencies {
     annotationProcessor rootProject.ext.dependencies.butterknifeCompiler
     annotationProcessor rootProject.ext.dependencies.arouterCompiler
 
+    if (isRunModule.toBoolean()) {
+        implementation project(':module-web')
+    }
+
 }

app/src/main/res/values/colors.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.zlx.module_home">
 
-    /
+
     <application>
         <activity android:name=".activity.SearchAc" />
         <activity android:name=".activity.SearchResultAc" />

config.gradle

@@ -0,0 +1,18 @@
+package com.zlx.module_home;
+
+import com.zlx.module_base.BaseApplication;
+import com.zlx.module_base.config.ModuleLifecycleConfig;
+
+/**
+ * Created by zlx on 2020/9/30 12:32
+ * Email: 1170762202@qq.com
+ * Description:
+ */
+public class HomeApp extends BaseApplication {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        ModuleLifecycleConfig.getInstance().initModuleAhead(this);
+    }
+}