From 46820d20a5e00886a827d63e19d0fc98fd7b310f Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Sun, 30 Jul 2017 18:59:42 +0800
Subject: [PATCH 01/38] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9PhotoView?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=94=BE=E5=A4=A7=E7=BC=A9=E5=B0=8F=E5=B4=A9?=
 =?UTF-8?q?=E6=BA=83=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/guiying/common/HackyViewPager.java    | 30 +++++++++++++++++++
 .../guiying/common/base/BaseApplication.java  |  8 ++---
 .../com/guiying/girls/girl/GirlActivity.java  |  3 +-
 3 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 lib_common/src/main/java/com/guiying/common/HackyViewPager.java

diff --git a/lib_common/src/main/java/com/guiying/common/HackyViewPager.java b/lib_common/src/main/java/com/guiying/common/HackyViewPager.java
new file mode 100644
index 0000000..f3a1692
--- /dev/null
+++ b/lib_common/src/main/java/com/guiying/common/HackyViewPager.java
@@ -0,0 +1,30 @@
+package com.guiying.common;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/**
+ * <p>解决图片缩放崩溃的问题</p>
+ */
+public class HackyViewPager extends ViewPager {
+
+    public HackyViewPager(Context context) {
+        super(context);
+    }
+
+    public HackyViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        try {
+            return super.onInterceptTouchEvent(ev);
+        } catch (IllegalArgumentException | ArrayIndexOutOfBoundsException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+}
diff --git a/lib_common/src/main/java/com/guiying/common/base/BaseApplication.java b/lib_common/src/main/java/com/guiying/common/base/BaseApplication.java
index 5f4b920..319ee04 100644
--- a/lib_common/src/main/java/com/guiying/common/base/BaseApplication.java
+++ b/lib_common/src/main/java/com/guiying/common/base/BaseApplication.java
@@ -38,12 +38,8 @@ public void onCreate() {
         super.onCreate();
         sInstance = this;
         Utils.init(this);
-        if (Utils.isAppDebug()) {
-            //只有debug模式才会打印日志
-            Logger.init("Petrel").logLevel(LogLevel.FULL);
-        } else {
-            Logger.init("Petrel").logLevel(LogLevel.NONE);
-        }
+
+        Logger.init("pattern").logLevel(LogLevel.FULL);
     }
 
     /**
diff --git a/module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java b/module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java
index a36b1e0..6a000d0 100644
--- a/module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java
+++ b/module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java
@@ -4,6 +4,7 @@
 import android.support.v4.view.ViewPager;
 import android.view.WindowManager;
 
+import com.guiying.common.HackyViewPager;
 import com.guiying.common.base.BaseActivity;
 import com.guiying.girls.Constants;
 import com.guiying.girls.data.bean.Girls;
@@ -27,7 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (getIntent() != null) {
             List<Girls> mData = getIntent().getParcelableArrayListExtra(Constants.INTENT_GIRLS);
             int mCurrentIndex = getIntent().getIntExtra(Constants.INTENT_INDEX, 0);
-            ViewPager viewPager = new ViewPager(this);
+            HackyViewPager viewPager = new HackyViewPager(this);
             setContentView(viewPager);
             GirlAdapter adapter = new GirlAdapter(this, mData);
             viewPager.setAdapter(adapter);

From b82fe1981afd4094f325f5ecc077a9a78f727914 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Tue, 15 Aug 2017 10:23:37 +0800
Subject: [PATCH 02/38] =?UTF-8?q?1=EF=BC=9A=E5=B0=86=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=A8=A1=E5=BC=8F=E6=94=B9=E4=B8=BA=E9=9B=86?=
 =?UTF-8?q?=E6=88=90=E5=BC=80=E5=8F=91=E6=A8=A1=E5=BC=8F=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index cd29d22..d817325 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ localGradlePluginVersion=2.3.3
 
 # ÿ�θ��ġ�isModule����ֵ����Ҫ��� "Sync Project" ��ť
 # isModule�ǡ����ɿ���ģʽ���͡��������ģʽ�����л�����
-isModule=true
+isModule=false

From 335064003cfd199781e91263eedd5e3191c653a1 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Tue, 22 Aug 2017 19:30:10 +0800
Subject: [PATCH 03/38] =?UTF-8?q?1=EF=BC=9A=E4=BD=BF=E7=94=A8=E9=98=BF?=
 =?UTF-8?q?=E9=87=8CARouter=E6=9B=BF=E6=8D=A2ActivityRouter=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                    |  6 +++---
 lib_common/build.gradle                         |  2 +-
 module_main/build.gradle                        | 12 ++++++++----
 .../src/main/java/com/guiying/main/Main.java    | 17 -----------------
 .../java/com/guiying/main/MainActivity.java     | 15 ++++++++++++---
 module_news/build.gradle                        | 14 ++++++++------
 .../src/main/java/com/guiying/news/News.java    | 14 --------------
 .../guiying/news/detail/NewsDetailActivity.java |  2 ++
 .../guiying/news/main/NewsCenterActivity.java   | 11 +++++++++--
 .../com/guiying/news/main/NewsListAdapter.java  |  2 --
 10 files changed, 43 insertions(+), 52 deletions(-)
 delete mode 100644 module_main/src/main/java/com/guiying/main/Main.java
 delete mode 100644 module_news/src/main/java/com/guiying/news/News.java

diff --git a/build.gradle b/build.gradle
index 8eb9b72..3874a63 100644
--- a/build.gradle
+++ b/build.gradle
@@ -52,9 +52,9 @@ ext {
     gsonVersion = "2.8.0"
     photoViewVersion = "2.0.0"
 
-    //需检查升级版本
-    annotationProcessor = "1.1.7"
-    routerVersion = "1.2.2"
+    //检查时间：2017.6.6
+    annotationProcessor = "1.0.3"
+    routerVersion = "1.2.1.1"
     easyRecyclerVersion = "4.4.0"
     cookieVersion = "v1.0.1"
     toastyVersion = "1.1.3"
diff --git a/lib_common/build.gradle b/lib_common/build.gradle
index 304022c..1ec98ca 100644
--- a/lib_common/build.gradle
+++ b/lib_common/build.gradle
@@ -33,5 +33,5 @@ dependencies {
     compile "com.github.GrenderG:Toasty:$rootProject.toastyVersion"
 
     //router
-    compile "com.github.mzule.activityrouter:activityrouter:$rootProject.routerVersion"
+    compile "com.alibaba:arouter-api:$rootProject.routerVersion"
 }
diff --git a/module_main/build.gradle b/module_main/build.gradle
index 61955fc..f41c59f 100644
--- a/module_main/build.gradle
+++ b/module_main/build.gradle
@@ -13,6 +13,13 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
+
+        //ARouter
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [moduleName: project.getName()]
+            }
+        }
     }
 
 
@@ -29,14 +36,11 @@ android {
             }
         }
     }
-    //设置了resourcePrefix值后，所有的资源名必须以指定的字符串做前缀，否则会报错。
-    //但是resourcePrefix这个值只能限定xml里面的资源，并不能限定图片资源，所有图片资源仍然需要手动去修改资源名。
-    //resourcePrefix "girls_"
 
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    annotationProcessor "com.github.mzule.activityrouter:compiler:$rootProject.annotationProcessor"
+    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
     compile project(':lib_common')
 }
diff --git a/module_main/src/main/java/com/guiying/main/Main.java b/module_main/src/main/java/com/guiying/main/Main.java
deleted file mode 100644
index 87e625b..0000000
--- a/module_main/src/main/java/com/guiying/main/Main.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.guiying.main;
-
-import com.github.mzule.activityrouter.annotation.Module;
-
-/**
- * <p>声明主要组件</p>
- * <p>
- * 这个组件是应用默认启动的组件
- *
- * @author 张华洋 2017/4/1 12:39
- * @version V1.2.0
- * @name Main
- */
-
-@Module("main")
-public class Main {
-}
diff --git a/module_main/src/main/java/com/guiying/main/MainActivity.java b/module_main/src/main/java/com/guiying/main/MainActivity.java
index 8ac0a15..dbcb530 100644
--- a/module_main/src/main/java/com/guiying/main/MainActivity.java
+++ b/module_main/src/main/java/com/guiying/main/MainActivity.java
@@ -5,11 +5,18 @@
 import android.view.View;
 import android.widget.Button;
 
-import com.github.mzule.activityrouter.router.Routers;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.guiying.common.base.BaseActivity;
 import com.guiying.common.base.BaseApplication;
 import com.guiying.common.utils.ToastUtils;
 
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2017/7/1 13:13
+ * @version V1.2.0
+ * @name MainActivity
+ */
 public class MainActivity extends BaseActivity implements View.OnClickListener {
 
     private long exitTime = 0;
@@ -29,9 +36,11 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     public void onClick(View view) {
         if (view.getId() == R.id.news_button) {
-            Routers.open(MainActivity.this, "module://news");
+            //跳转到NewsCenterActivity
+            ARouter.getInstance().build("/news/center").navigation();
         } else if (view.getId() == R.id.girls_button) {
-            Routers.open(MainActivity.this, "module://girls");
+            //跳转到GirlsActivity
+            ARouter.getInstance().build("/girls/list").navigation();
         }
     }
 
diff --git a/module_news/build.gradle b/module_news/build.gradle
index 00f6fec..4014b71 100644
--- a/module_news/build.gradle
+++ b/module_news/build.gradle
@@ -13,6 +13,13 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
+
+        //ARouter
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [moduleName: project.getName()]
+            }
+        }
     }
 
     sourceSets {
@@ -29,15 +36,10 @@ android {
         }
     }
 
-    //设置了resourcePrefix值后，所有的资源名必须以指定的字符串做前缀，否则会报错。
-    //但是resourcePrefix这个值只能限定xml里面的资源，并不能限定图片资源，所有图片资源仍然需要手动去修改资源名。
-    //resourcePrefix "girls_"
-
-
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    annotationProcessor "com.github.mzule.activityrouter:compiler:$rootProject.annotationProcessor"
+    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
     compile project(':lib_common')
 }
diff --git a/module_news/src/main/java/com/guiying/news/News.java b/module_news/src/main/java/com/guiying/news/News.java
deleted file mode 100644
index fb73939..0000000
--- a/module_news/src/main/java/com/guiying/news/News.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.guiying.news;
-
-import com.github.mzule.activityrouter.annotation.Module;
-
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/2/15 16:31
- * @version V1.2.0
- * @name news
- */
-@Module("news")
-public class News {
-}
diff --git a/module_news/src/main/java/com/guiying/news/detail/NewsDetailActivity.java b/module_news/src/main/java/com/guiying/news/detail/NewsDetailActivity.java
index 2317f9d..ed3a197 100644
--- a/module_news/src/main/java/com/guiying/news/detail/NewsDetailActivity.java
+++ b/module_news/src/main/java/com/guiying/news/detail/NewsDetailActivity.java
@@ -2,6 +2,7 @@
 
 import android.os.Bundle;
 
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.guiying.common.base.BaseActivity;
 
 /**
@@ -11,6 +12,7 @@
  * @version V1.2.0
  * @name NewsDetailActivity
  */
+@Route(path = "/news/detail")
 public class NewsDetailActivity extends BaseActivity {
 
     @Override
diff --git a/module_news/src/main/java/com/guiying/news/main/NewsCenterActivity.java b/module_news/src/main/java/com/guiying/news/main/NewsCenterActivity.java
index ee24aa6..4bec37c 100644
--- a/module_news/src/main/java/com/guiying/news/main/NewsCenterActivity.java
+++ b/module_news/src/main/java/com/guiying/news/main/NewsCenterActivity.java
@@ -5,7 +5,7 @@
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
 
-import com.github.mzule.activityrouter.annotation.Router;
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.guiying.common.base.BaseActivity;
 import com.guiying.news.R;
 
@@ -15,7 +15,14 @@
 import java.util.List;
 import java.util.Locale;
 
-@Router("news")
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2017/4/20 22:26
+ * @version V1.2.0
+ * @name NewsCenterActivity
+ */
+@Route(path = "/news/center")
 public class NewsCenterActivity extends BaseActivity {
 
     protected Toolbar mToolBar;
diff --git a/module_news/src/main/java/com/guiying/news/main/NewsListAdapter.java b/module_news/src/main/java/com/guiying/news/main/NewsListAdapter.java
index c8e8ce6..d832569 100644
--- a/module_news/src/main/java/com/guiying/news/main/NewsListAdapter.java
+++ b/module_news/src/main/java/com/guiying/news/main/NewsListAdapter.java
@@ -22,8 +22,6 @@
  * @version V1.2.0
  * @name NewsListAdapter
  */
-
-
 public class NewsListAdapter extends RecyclerArrayAdapter<Story> {
 
     public NewsListAdapter(Context context) {

From 6c15fc60372f5b550933b44a93a64ddb8fdf29a3 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Tue, 22 Aug 2017 19:31:22 +0800
Subject: [PATCH 04/38] =?UTF-8?q?1=EF=BC=9A=E6=9B=BF=E6=8D=A2=E9=98=BF?=
 =?UTF-8?q?=E9=87=8CARouter=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80Gr?=
 =?UTF-8?q?adle=E8=84=9A=E6=9C=AC=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E8=B7=B3=E8=BD=AC=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module_app/build.gradle                       |  4 +--
 module_app/src/main/AndroidManifest.xml       | 13 ----------
 .../androidmodulepattern/MyApplication.java   | 26 ++++++++++++-------
 module_girls/build.gradle                     | 14 +++++-----
 .../main/java/com/guiying/girls/Girls.java    | 14 ----------
 .../com/guiying/girls/girl/GirlActivity.java  |  2 ++
 .../com/guiying/girls/main/GirlsActivity.java |  4 +--
 7 files changed, 31 insertions(+), 46 deletions(-)
 delete mode 100644 module_girls/src/main/java/com/guiying/girls/Girls.java

diff --git a/module_app/build.gradle b/module_app/build.gradle
index d3fd2bf..37c526b 100644
--- a/module_app/build.gradle
+++ b/module_app/build.gradle
@@ -22,7 +22,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
-        multiDexEnabled false
+        multiDexEnabled true
         //打包时间
         resValue "string", "build_time", buildTime()
     }
@@ -61,7 +61,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    annotationProcessor "com.github.mzule.activityrouter:compiler:$rootProject.annotationProcessor"
+    compile 'com.android.support:multidex:1.0.1'
     if (isModule.toBoolean()) {
         compile project(':lib_common')
     } else {
diff --git a/module_app/src/main/AndroidManifest.xml b/module_app/src/main/AndroidManifest.xml
index 1fe6dcd..725abcf 100644
--- a/module_app/src/main/AndroidManifest.xml
+++ b/module_app/src/main/AndroidManifest.xml
@@ -10,19 +10,6 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <!--声明整个应用程序的路由协议-->
-        <activity
-            android:name="com.github.mzule.activityrouter.router.RouterActivity"
-            android:theme="@android:style/Theme.NoDisplay">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="@string/global_scheme" /> <!-- 改成自己的scheme -->
-            </intent-filter>
-        </activity>
         <!--发送崩溃日志界面-->
         <activity
             android:name="org.acra.CrashReportDialog"
diff --git a/module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java b/module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java
index 7edaa1c..3415a6c 100644
--- a/module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java
+++ b/module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java
@@ -1,9 +1,11 @@
 package com.guiying.androidmodulepattern;
 
 import android.content.Context;
+import android.support.multidex.MultiDex;
 
-import com.github.mzule.activityrouter.annotation.Modules;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.guiying.common.base.BaseApplication;
+import com.guiying.common.utils.Utils;
 
 import org.acra.ACRA;
 import org.acra.ReportField;
@@ -15,7 +17,7 @@
 import org.acra.sender.ReportSenderException;
 
 /**
- * <p>这里是整个组件化项目管理各个组件的地方，所有需要使用的组件必须在此声明</p>
+ * <p>这里仅需做一些初始化的工作</p>
  *
  * @author 张华洋 2017/2/15 20:14
  * @version V1.2.0
@@ -36,25 +38,31 @@
         resToastText = R.string.crash_toast_text,
         resDialogText = R.string.crash_dialog_text,
         resDialogTitle = R.string.crash_dialog_title)
-@Modules({"main", "girls", "news"})
 public class MyApplication extends BaseApplication {
 
 
     @Override
     public void onCreate() {
         super.onCreate();
+        if (Utils.isAppDebug()) {
+            //开启InstantRun之后，一定要在ARouter.init之前调用openDebug
+            ARouter.openDebug();
+            ARouter.openLog();
+        }
+        ARouter.init(this);
         //崩溃日志记录初始化
         ACRA.init(this);
         ACRA.getErrorReporter().removeAllReportSenders();
         ACRA.getErrorReporter().setReportSender(new CrashReportSender());
     }
 
-//    @Override
-//    protected void attachBaseContext(Context base) {
-//        super.attachBaseContext(base);
-//        // dex突破65535的限制
-//        MultiDex.install(this);
-//    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        // dex突破65535的限制
+        MultiDex.install(this);
+    }
 
 
     /**
diff --git a/module_girls/build.gradle b/module_girls/build.gradle
index fbf8446..4014b71 100644
--- a/module_girls/build.gradle
+++ b/module_girls/build.gradle
@@ -13,8 +13,14 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
-    }
 
+        //ARouter
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [moduleName: project.getName()]
+            }
+        }
+    }
 
     sourceSets {
         main {
@@ -29,15 +35,11 @@ android {
             }
         }
     }
-    //设置了resourcePrefix值后，所有的资源名必须以指定的字符串做前缀，否则会报错。
-    //但是resourcePrefix这个值只能限定xml里面的资源，并不能限定图片资源，所有图片资源仍然需要手动去修改资源名。
-    //resourcePrefix "girls_"
-
 
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    annotationProcessor "com.github.mzule.activityrouter:compiler:$rootProject.annotationProcessor"
+    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
     compile project(':lib_common')
 }
diff --git a/module_girls/src/main/java/com/guiying/girls/Girls.java b/module_girls/src/main/java/com/guiying/girls/Girls.java
deleted file mode 100644
index 3386507..0000000
--- a/module_girls/src/main/java/com/guiying/girls/Girls.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.guiying.girls;
-
-import com.github.mzule.activityrouter.annotation.Module;
-
-/**
- * <p>类说明</p>
- *
- * @author 张华洋 2017/2/15 16:34
- * @version V1.2.0
- * @name Girls
- */
-@Module("girls")
-public class Girls {
-}
diff --git a/module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java b/module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java
index 6a000d0..9551bb6 100644
--- a/module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java
+++ b/module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java
@@ -4,6 +4,7 @@
 import android.support.v4.view.ViewPager;
 import android.view.WindowManager;
 
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.guiying.common.HackyViewPager;
 import com.guiying.common.base.BaseActivity;
 import com.guiying.girls.Constants;
@@ -18,6 +19,7 @@
  * @version V1.1
  * @name GirlActivity
  */
+@Route(path = "/girls/detail")
 public class GirlActivity extends BaseActivity {
 
     @Override
diff --git a/module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java b/module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java
index b0a0851..9ebdf52 100644
--- a/module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java
+++ b/module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java
@@ -2,11 +2,11 @@
 
 import android.os.Bundle;
 
-import com.github.mzule.activityrouter.annotation.Router;
+import com.alibaba.android.arouter.facade.annotation.Route;
 import com.guiying.common.base.BaseActionBarActivity;
 import com.guiying.girls.R;
 
-@Router("girls")
+@Route(path = "/girls/list")
 public class GirlsActivity extends BaseActionBarActivity {
 
     private GirlsView mView;

From 805ae81ea89cdbe163926f3bcff1af7ecc82f622 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Tue, 22 Aug 2017 19:52:04 +0800
Subject: [PATCH 05/38] =?UTF-8?q?1=EF=BC=9A=E6=A0=B9=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=86=85=E5=AE=B9=E6=9B=B4=E6=96=B0=EF=BC=B2=EF=BC=A5?=
 =?UTF-8?q?=EF=BC=A1=EF=BC=A4=EF=BC=AD=EF=BC=A5=E6=96=87=E6=A1=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                |  26 ++++++++++++++++++++------
 screenshots/develper.PNG | Bin 0 -> 6158 bytes
 2 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 screenshots/develper.PNG

diff --git a/README.md b/README.md
index c6c57c2..27bf1e9 100644
--- a/README.md
+++ b/README.md
@@ -9,25 +9,39 @@
 </table>
 
 # AndroidModulePattern
+
 Android项目组件化示例代码
 
-博客：http://blog.csdn.net/guiying712/article/details/55213884
+**Android组件化方案**：http://blog.csdn.net/guiying712/article/details/55213884
+
+Android组件化方案中的路由使用了ActivityRouter，但是因为ActivityRouter对于初学者不太友好，
+总是出现莫名其妙的错误，因此现在的 AndroidModulePattern 已经改为使用 阿里ARouter作为路由。
+
+## 集成开发模式和组件开发模式转换
+
+**1、首先打开Android项目的 gradle.properties 文件，然后将 isModule 改为你需要的开发模式，
+然后点击 "Sync Project" 按钮同步项目；**
+
+**2、![Image](develper.PNG) 在运行之前，请先按照图中选择一个能够运行的组件；**
+
+
+## 组件功能介绍
 
-### app组件功能：
-1. app组件主要用于管理其他组件；
+### app组件功能（空壳工程）：
+1. 配置整个项目的Gradle脚本，例如 混淆、签名等；
 2. app组件中可以初始化全局的库，例如Lib.init(this);
 3. 添加 multiDex 功能
 
-### main组件功能：
+### main组件功能（业务组件）：
 1. 声明应用的launcherActivity----->android.intent.category.LAUNCHER；
 2. 添加SplashActivity;
 3. 添加LoginActivity；
 4. 添加MainActivity；
 
-### girls/news组件功能：
+### girls/news组件功能（业务组件）：
 1. 这两个组件都是业务组件，根据产品的业务逻辑独立成一个组件；
 
-### common组件功能：
+### common组件功能（功能组件）：
 1. common组件是基础库，添加一些公用的类；
 2. 例如：网络请求、图片加载、工具类、base类等等；
 3. 声明APP需要的uses-permission；
diff --git a/screenshots/develper.PNG b/screenshots/develper.PNG
new file mode 100644
index 0000000000000000000000000000000000000000..9d6b8b6155a4e53456538f29b3fdf1cf82754cb4
GIT binary patch
literal 6158
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

literal 0
HcmV?d00001


From fcdf68e21f187282a1aeb19452f027b5bcd1b95e Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Tue, 22 Aug 2017 20:00:36 +0800
Subject: [PATCH 06/38] =?UTF-8?q?1=EF=BC=9A=E6=A0=B9=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=86=85=E5=AE=B9=E6=9B=B4=E6=96=B0README=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=EF=BC=9B=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 27bf1e9..ed413cd 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Android组件化方案中的路由使用了ActivityRouter，但是因为Activity
 **1、首先打开Android项目的 gradle.properties 文件，然后将 isModule 改为你需要的开发模式，
 然后点击 "Sync Project" 按钮同步项目；**
 
-**2、![Image](develper.PNG) 在运行之前，请先按照图中选择一个能够运行的组件；**
+**2、![Image](/screenshots/develper.PNG) 在运行之前，请先按照图中选择一个能够运行的组件；**
 
 
 ## 组件功能介绍

From 42f6be0cca6fade0d1b23861a0bd41151ee1b6f3 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Tue, 26 Sep 2017 22:20:38 +0800
Subject: [PATCH 07/38] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9BaseActivity?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0BaseFragment=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/guiying/common/base/BaseActivity.java | 60 +++++++++++++++++
 .../com/guiying/common/base/BaseFragment.java | 65 +++++++++++++++++++
 .../java/com/guiying/common/utils/Utils.java  | 26 ++++++++
 3 files changed, 151 insertions(+)
 create mode 100644 lib_common/src/main/java/com/guiying/common/base/BaseFragment.java

diff --git a/lib_common/src/main/java/com/guiying/common/base/BaseActivity.java b/lib_common/src/main/java/com/guiying/common/base/BaseActivity.java
index 5e9b3f5..4c763c3 100644
--- a/lib_common/src/main/java/com/guiying/common/base/BaseActivity.java
+++ b/lib_common/src/main/java/com/guiying/common/base/BaseActivity.java
@@ -8,6 +8,7 @@
 import android.view.View;
 
 import com.guiying.common.R;
+import com.guiying.common.utils.Utils;
 
 /**
  * <p>Activity基类 </p>
@@ -66,4 +67,63 @@ public boolean onSupportNavigateUp() {
         return true;
     }
 
+    //添加fragment
+    protected void addFragment(BaseFragment fragment, @IdRes int frameId) {
+        Utils.checkNotNull(fragment);
+        getSupportFragmentManager().beginTransaction()
+                .add(frameId, fragment, fragment.getClass().getSimpleName())
+                .addToBackStack(fragment.getClass().getSimpleName())
+                .commitAllowingStateLoss();
+
+    }
+
+    //替换fragment
+    protected void replaceFragment(BaseFragment fragment, @IdRes int frameId) {
+        Utils.checkNotNull(fragment);
+        getSupportFragmentManager().beginTransaction()
+                .replace(frameId, fragment, fragment.getClass().getSimpleName())
+                .addToBackStack(fragment.getClass().getSimpleName())
+                .commitAllowingStateLoss();
+
+    }
+
+    //隐藏fragment
+    protected void hideFragment(BaseFragment fragment) {
+        Utils.checkNotNull(fragment);
+        getSupportFragmentManager().beginTransaction()
+                .hide(fragment)
+                .commitAllowingStateLoss();
+
+    }
+
+
+    //显示fragment
+    protected void showFragment(BaseFragment fragment) {
+        Utils.checkNotNull(fragment);
+        getSupportFragmentManager().beginTransaction()
+                .show(fragment)
+                .commitAllowingStateLoss();
+
+    }
+
+
+    protected void removeFragment(BaseFragment fragment) {
+        Utils.checkNotNull(fragment);
+        getSupportFragmentManager().beginTransaction()
+                .remove(fragment)
+                .commitAllowingStateLoss();
+
+    }
+
+
+    //移除fragment
+    protected void popFragment() {
+        if (getSupportFragmentManager().getBackStackEntryCount() > 1) {
+            getSupportFragmentManager().popBackStack();
+        } else {
+            finish();
+        }
+    }
+
+
 }
diff --git a/lib_common/src/main/java/com/guiying/common/base/BaseFragment.java b/lib_common/src/main/java/com/guiying/common/base/BaseFragment.java
new file mode 100644
index 0000000..e79c36a
--- /dev/null
+++ b/lib_common/src/main/java/com/guiying/common/base/BaseFragment.java
@@ -0,0 +1,65 @@
+package com.guiying.common.base;
+
+import android.content.Context;
+import android.support.annotation.IdRes;
+import android.support.v4.app.Fragment;
+
+import com.guiying.common.utils.Utils;
+
+public abstract class BaseFragment extends Fragment {
+
+    protected BaseActivity mActivity;
+
+
+    //获取宿主Activity
+    protected BaseActivity getHoldingActivity() {
+        return mActivity;
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        this.mActivity = (BaseActivity) context;
+    }
+
+
+    //添加fragment
+    protected void addFragment(BaseFragment fragment, @IdRes int frameId) {
+        Utils.checkNotNull(fragment);
+        getHoldingActivity().addFragment(fragment, frameId);
+
+    }
+
+    //替换fragment
+    protected void replaceFragment(BaseFragment fragment, @IdRes int frameId) {
+        Utils.checkNotNull(fragment);
+        getHoldingActivity().replaceFragment(fragment, frameId);
+    }
+
+    //隐藏fragment
+    protected void hideFragment(BaseFragment fragment) {
+        Utils.checkNotNull(fragment);
+        getHoldingActivity().hideFragment(fragment);
+    }
+
+
+    //显示fragment
+    protected void showFragment(BaseFragment fragment) {
+        Utils.checkNotNull(fragment);
+        getHoldingActivity().showFragment(fragment);
+    }
+
+
+    protected void removeFragment(BaseFragment fragment) {
+        Utils.checkNotNull(fragment);
+        getHoldingActivity().removeFragment(fragment);
+
+    }
+
+
+    //移除fragment
+    protected void popFragment() {
+        getHoldingActivity().popFragment();
+    }
+
+}
diff --git a/lib_common/src/main/java/com/guiying/common/utils/Utils.java b/lib_common/src/main/java/com/guiying/common/utils/Utils.java
index 6c8b104..ff9ff74 100644
--- a/lib_common/src/main/java/com/guiying/common/utils/Utils.java
+++ b/lib_common/src/main/java/com/guiying/common/utils/Utils.java
@@ -1,5 +1,6 @@
 package com.guiying.common.utils;
 
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
@@ -7,6 +8,9 @@
 import android.content.pm.PackageManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.StringRes;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
 import android.view.View;
 
 /**
@@ -87,4 +91,26 @@ public static boolean isAppDebug() {
         }
     }
 
+
+    /**
+     * The {@code fragment} is added to the container view with id {@code frameId}. The operation is
+     * performed by the {@code fragmentManager}.
+     */
+    public static void addFragmentToActivity(@NonNull FragmentManager fragmentManager,
+                                             @NonNull Fragment fragment, int frameId) {
+        checkNotNull(fragmentManager);
+        checkNotNull(fragment);
+        FragmentTransaction transaction = fragmentManager.beginTransaction();
+        transaction.add(frameId, fragment);
+        transaction.commit();
+    }
+
+
+    public static <T> T checkNotNull(T obj) {
+        if (obj == null) {
+            throw new NullPointerException();
+        }
+        return obj;
+    }
+
 }
\ No newline at end of file

From e9eb9591ea3a233431ab237e2f878afe18f8f7a6 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Wed, 27 Sep 2017 10:31:32 +0800
Subject: [PATCH 08/38] =?UTF-8?q?1=EF=BC=9A=E8=B0=83=E6=95=B4=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84=EF=BC=8C=E5=A2=9E=E5=8A=A0Fragment?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8C=96=E6=96=B9=E6=A1=88=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib_common/src/main/AndroidManifest.xml       |   4 +-
 .../common/base/ApplicationDelegate.java      |  22 ++
 .../common/base/BaseActionBarActivity.java    |   4 +-
 .../common/base/BaseActivity.java             |  10 +-
 .../module/common/base/BaseApplication.java   |  48 +++
 .../common/base/BaseFragment.java             |   4 +-
 .../common/base/BasePresenter.java            |   2 +-
 .../{ => module}/common/base/BaseView.java    |   2 +-
 .../module/common/base/ClassUtils.java        | 276 ++++++++++++++++++
 .../common/base/InfoCallback.java             |   2 +-
 .../common/base/ViewManager.java}             |  80 +++--
 .../common/glide/OkHttpGlideModule.java       |   2 +-
 .../common/glide/OkHttpStreamFetcher.java     |   4 +-
 .../common/glide/OkHttpUrlLoader.java         |   2 +-
 .../{ => module}/common/http/ApiService.java  |   2 +-
 .../common/http/DataParseUtil.java            |   2 +-
 .../{ => module}/common/http/DataType.java    |   2 +-
 .../{ => module}/common/http/HttpClient.java  |  12 +-
 .../{ => module}/common/http/HttpsUtils.java  |   4 +-
 .../common/http/LoggerInterceptor.java        |   2 +-
 .../common/http/OnResultListener.java         |   2 +-
 .../{ => module}/common/utils/CloseUtils.java |   2 +-
 .../common/utils/NetworkUtils.java            |   2 +-
 .../{ => module}/common/utils/ShellUtils.java |   2 +-
 .../common/utils/StringUtils.java             |   2 +-
 .../{ => module}/common/utils/ToastUtils.java |   2 +-
 .../{ => module}/common/utils/Utils.java      |   2 +-
 .../common/widget}/HackyViewPager.java        |   7 +-
 .../common/widget/NoScrollViewPager.java      |  41 +++
 29 files changed, 478 insertions(+), 70 deletions(-)
 create mode 100644 lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java
 rename lib_common/src/main/java/com/guiying/{ => module}/common/base/BaseActionBarActivity.java (95%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/base/BaseActivity.java (93%)
 create mode 100644 lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
 rename lib_common/src/main/java/com/guiying/{ => module}/common/base/BaseFragment.java (94%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/base/BasePresenter.java (58%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/base/BaseView.java (64%)
 create mode 100644 lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
 rename lib_common/src/main/java/com/guiying/{ => module}/common/base/InfoCallback.java (85%)
 rename lib_common/src/main/java/com/guiying/{common/base/BaseApplication.java => module/common/base/ViewManager.java} (58%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/glide/OkHttpGlideModule.java (98%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/glide/OkHttpStreamFetcher.java (95%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/glide/OkHttpUrlLoader.java (98%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/http/ApiService.java (97%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/http/DataParseUtil.java (98%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/http/DataType.java (95%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/http/HttpClient.java (97%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/http/HttpsUtils.java (99%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/http/LoggerInterceptor.java (99%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/http/OnResultListener.java (94%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/utils/CloseUtils.java (96%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/utils/NetworkUtils.java (99%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/utils/ShellUtils.java (99%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/utils/StringUtils.java (99%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/utils/ToastUtils.java (99%)
 rename lib_common/src/main/java/com/guiying/{ => module}/common/utils/Utils.java (98%)
 rename lib_common/src/main/java/com/guiying/{common => module/common/widget}/HackyViewPager.java (80%)
 create mode 100644 lib_common/src/main/java/com/guiying/module/common/widget/NoScrollViewPager.java

diff --git a/lib_common/src/main/AndroidManifest.xml b/lib_common/src/main/AndroidManifest.xml
index 5b1cff1..cca80d3 100644
--- a/lib_common/src/main/AndroidManifest.xml
+++ b/lib_common/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.common">
+    package="com.guiying.module.common">
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -16,7 +16,7 @@
 
     <application>
         <meta-data
-            android:name="com.guiying.common.glide.OkHttpGlideModule"
+            android:name=".glide.OkHttpGlideModule"
             android:value="GlideModule" />
 
     </application>
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java b/lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java
new file mode 100644
index 0000000..1e98f86
--- /dev/null
+++ b/lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java
@@ -0,0 +1,22 @@
+package com.guiying.module.common.base;
+
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2017/9/20 22:23
+ * @version V2.8.3
+ * @name ApplicationDelegate
+ */
+
+
+public interface ApplicationDelegate {
+
+    void onCreate();
+
+    void onTerminate();
+
+    void onLowMemory();
+
+    void onTrimMemory(int level);
+
+}
diff --git a/lib_common/src/main/java/com/guiying/common/base/BaseActionBarActivity.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java
similarity index 95%
rename from lib_common/src/main/java/com/guiying/common/base/BaseActionBarActivity.java
rename to lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java
index a14d93d..ffe9243 100644
--- a/lib_common/src/main/java/com/guiying/common/base/BaseActionBarActivity.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java
@@ -5,13 +5,13 @@
  *  @Description: 本内容仅限于杭州海康威视系统技术公有限司内部使用，禁止转发.
  */
 
-package com.guiying.common.base;
+package com.guiying.module.common.base;
 
 import android.os.Bundle;
 import android.support.annotation.StringRes;
 import android.support.v7.app.ActionBar;
 
-import com.guiying.common.R;
+import com.guiying.module.common.R;
 
 /**
  * BaseActionBarActivity继承于BaseActivity，封装了actionBar的逻辑；
diff --git a/lib_common/src/main/java/com/guiying/common/base/BaseActivity.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java
similarity index 93%
rename from lib_common/src/main/java/com/guiying/common/base/BaseActivity.java
rename to lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java
index 4c763c3..a108bb5 100644
--- a/lib_common/src/main/java/com/guiying/common/base/BaseActivity.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java
@@ -1,4 +1,4 @@
-package com.guiying.common.base;
+package com.guiying.module.common.base;
 
 import android.os.Bundle;
 import android.support.annotation.IdRes;
@@ -7,8 +7,8 @@
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 
-import com.guiying.common.R;
-import com.guiying.common.utils.Utils;
+import com.guiying.module.common.R;
+import com.guiying.module.common.utils.Utils;
 
 /**
  * <p>Activity基类 </p>
@@ -51,14 +51,14 @@ protected void setupToolBar(Toolbar toolbar, boolean hideTitle) {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        BaseApplication.getIns().addActivity(this);
+        ViewManager.getInstance().addActivity(this);
     }
 
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        BaseApplication.getIns().finishActivity(this);
+        ViewManager.getInstance().finishActivity(this);
     }
 
     @Override
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
new file mode 100644
index 0000000..fc5ebbd
--- /dev/null
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
@@ -0,0 +1,48 @@
+package com.guiying.module.common.base;
+
+import android.app.Application;
+
+import com.guiying.module.common.utils.Utils;
+import com.orhanobut.logger.LogLevel;
+import com.orhanobut.logger.Logger;
+
+import java.util.List;
+
+/**
+ * 要想使用BaseApplication，必须在组件中实现自己的Application，并且继承BaseApplication；
+ * 组件中实现的Application必须在debug包中的AndroidManifest.xml中注册，否则无法使用；
+ * 组件的Application需置于java/debug文件夹中，不得放于主代码；
+ * 组件中获取Context的方法必须为:Utils.getContext()，不允许其他写法；
+ * BaseApplication主要用来管理全局Activity;
+ *
+ * @author 2016/12/2 17:02
+ * @version V1.0.0
+ * @name BaseApplication
+ */
+public class BaseApplication extends Application {
+
+    public static final String ROOT_PACKAGE = "com.guiying.module";
+
+    private static BaseApplication sInstance;
+
+    private List<ApplicationDelegate> delegateList;
+
+
+    public static BaseApplication getIns() {
+        return sInstance;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        sInstance = this;
+        Utils.init(this);
+        delegateList = ClassUtils.getObjectsWithInterface(this, ApplicationDelegate.class, ROOT_PACKAGE);
+        for (ApplicationDelegate delegate : delegateList) {
+            delegate.onCreate();
+        }
+        Logger.init("pattern").logLevel(LogLevel.FULL);
+    }
+
+
+}
diff --git a/lib_common/src/main/java/com/guiying/common/base/BaseFragment.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java
similarity index 94%
rename from lib_common/src/main/java/com/guiying/common/base/BaseFragment.java
rename to lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java
index e79c36a..a957ff1 100644
--- a/lib_common/src/main/java/com/guiying/common/base/BaseFragment.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java
@@ -1,10 +1,10 @@
-package com.guiying.common.base;
+package com.guiying.module.common.base;
 
 import android.content.Context;
 import android.support.annotation.IdRes;
 import android.support.v4.app.Fragment;
 
-import com.guiying.common.utils.Utils;
+import com.guiying.module.common.utils.Utils;
 
 public abstract class BaseFragment extends Fragment {
 
diff --git a/lib_common/src/main/java/com/guiying/common/base/BasePresenter.java b/lib_common/src/main/java/com/guiying/module/common/base/BasePresenter.java
similarity index 58%
rename from lib_common/src/main/java/com/guiying/common/base/BasePresenter.java
rename to lib_common/src/main/java/com/guiying/module/common/base/BasePresenter.java
index c05c925..d7468af 100644
--- a/lib_common/src/main/java/com/guiying/common/base/BasePresenter.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BasePresenter.java
@@ -1,4 +1,4 @@
-package com.guiying.common.base;
+package com.guiying.module.common.base;
 
 public interface BasePresenter {
 
diff --git a/lib_common/src/main/java/com/guiying/common/base/BaseView.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseView.java
similarity index 64%
rename from lib_common/src/main/java/com/guiying/common/base/BaseView.java
rename to lib_common/src/main/java/com/guiying/module/common/base/BaseView.java
index debd151..7d557ea 100644
--- a/lib_common/src/main/java/com/guiying/common/base/BaseView.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseView.java
@@ -1,4 +1,4 @@
-package com.guiying.common.base;
+package com.guiying.module.common.base;
 
 public interface BaseView<T> {
 
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java b/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
new file mode 100644
index 0000000..1033887
--- /dev/null
+++ b/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
@@ -0,0 +1,276 @@
+package com.guiying.module.common.base;
+
+// Copy from galaxy sdk ${com.alibaba.android.galaxy.utils.ClassUtils}
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.util.Log;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import dalvik.system.DexFile;
+
+import static com.alibaba.android.arouter.launcher.ARouter.logger;
+import static com.alibaba.android.arouter.utils.Consts.TAG;
+
+/**
+ * Scanner, find out class with any conditions, copy from google source code.
+ *
+ * @author 正纬 <a href="mailto:zhilong.liu@aliyun.com">Contact me.</a>
+ * @version 1.0
+ * @since 16/6/27 下午10:58
+ */
+public class ClassUtils {
+    private static final String EXTRACTED_NAME_EXT = ".classes";
+    private static final String EXTRACTED_SUFFIX = ".zip";
+
+    private static final String SECONDARY_FOLDER_NAME = "code_cache" + File.separator + "secondary-dexes";
+
+    private static final String PREFS_FILE = "multidex.version";
+    private static final String KEY_DEX_NUMBER = "dex.number";
+
+    private static final int VM_WITH_MULTIDEX_VERSION_MAJOR = 2;
+    private static final int VM_WITH_MULTIDEX_VERSION_MINOR = 1;
+
+    private static SharedPreferences getMultiDexPreferences(Context context) {
+        return context.getSharedPreferences(PREFS_FILE, Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB ? Context.MODE_PRIVATE : Context.MODE_PRIVATE | Context.MODE_MULTI_PROCESS);
+    }
+
+
+    public static <T> List<T> getObjectsWithInterface(Context context, Class<T> clazz, String path) {
+        List<T> objectList = new ArrayList<>();
+        try {
+            // These class was generate by arouter-compiler.
+            List<String> classFileNames = getFileNameByPackageName(context, path);
+
+            for (String className : classFileNames) {
+                Class aClass = Class.forName(className);
+                if (clazz.isAssignableFrom(aClass) && !clazz.equals(aClass) && !aClass.isInterface()) {
+                    objectList.add((T) Class.forName(className).getConstructor().newInstance());
+                }
+            }
+
+            if (objectList.size() == 0) {
+                logger.error(TAG, "No files were found, check your configuration please!");
+            }
+        } catch (Exception e) {
+            e.getStackTrace();
+            Log.e("ARouter", "getObjectsWithInterface error, " + e.getMessage());
+        }
+
+        return objectList;
+    }
+
+    public static <T> List<T> getObjectsWithInterface(Context context, Class<T> clazz, List<String> pathList) {
+        List<T> objectList = new ArrayList<>();
+//        try {
+//            // These class was generate by arouter-compiler.
+//            List<String> classFileNames = getFileNameByPackageName(context, path);
+//
+//            for (String className : classFileNames) {
+//                Class aClass = Class.forName(className);
+//                if (clazz.isAssignableFrom(aClass) && !clazz.equals(aClass) && !aClass.isInterface()) {
+//                    objectList.add((T) Class.forName(className).getConstructor().newInstance());
+//                }
+//            }
+//
+//            if (objectList.size() == 0) {
+//                logger.error(TAG, "No files were found, check your configuration please!");
+//            }
+//        } catch (Exception e) {
+//            e.getStackTrace();
+//        }
+
+        return objectList;
+    }
+
+
+    /**
+     * 通过指定包名，扫描包下面包含的所有的ClassName
+     *
+     * @param context     U know
+     * @param packageName 包名
+     * @return 所有class的集合
+     */
+    public static List<String> getFileNameByPackageName(Context context, String packageName) throws PackageManager.NameNotFoundException, IOException {
+        List<String> classNames = new ArrayList<>();
+        for (String path : getSourcePaths(context)) {
+            DexFile dexfile = null;
+
+            try {
+                if (path.endsWith(EXTRACTED_SUFFIX)) {
+                    //NOT use new DexFile(path), because it will throw "permission error in /data/dalvik-cache"
+                    dexfile = DexFile.loadDex(path, path + ".tmp", 0);
+                } else {
+                    dexfile = new DexFile(path);
+                }
+                Enumeration<String> dexEntries = dexfile.entries();
+                while (dexEntries.hasMoreElements()) {
+                    String className = dexEntries.nextElement();
+                    if (className.contains(packageName)) {
+                        classNames.add(className);
+                    }
+                }
+            } catch (Throwable ignore) {
+                Log.e("ARouter", "Scan map file in dex files made error.", ignore);
+            } finally {
+                if (null != dexfile) {
+                    try {
+                        dexfile.close();
+                    } catch (Throwable ignore) {
+                    }
+                }
+            }
+        }
+
+        Log.d("ARouter", "Filter " + classNames.size() + " classes by packageName <" + packageName + ">");
+        return classNames;
+    }
+
+    /**
+     * get all the dex path
+     *
+     * @param context the application context
+     * @return all the dex path
+     * @throws PackageManager.NameNotFoundException
+     * @throws IOException
+     */
+    public static List<String> getSourcePaths(Context context) throws PackageManager.NameNotFoundException, IOException {
+        ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), 0);
+        File sourceApk = new File(applicationInfo.sourceDir);
+
+        List<String> sourcePaths = new ArrayList<>();
+        sourcePaths.add(applicationInfo.sourceDir); //add the default apk path
+
+        //the prefix of extracted file, ie: test.classes
+        String extractedFilePrefix = sourceApk.getName() + EXTRACTED_NAME_EXT;
+
+//        如果VM已经支持了MultiDex，就不要去Secondary Folder加载 Classesx.zip了，那里已经么有了
+//        通过是否存在sp中的multidex.version是不准确的，因为从低版本升级上来的用户，是包含这个sp配置的
+        if (!isVMMultidexCapable()) {
+            //the total dex numbers
+            int totalDexNumber = getMultiDexPreferences(context).getInt(KEY_DEX_NUMBER, 1);
+            File dexDir = new File(applicationInfo.dataDir, SECONDARY_FOLDER_NAME);
+
+            for (int secondaryNumber = 2; secondaryNumber <= totalDexNumber; secondaryNumber++) {
+                //for each dex file, ie: test.classes2.zip, test.classes3.zip...
+                String fileName = extractedFilePrefix + secondaryNumber + EXTRACTED_SUFFIX;
+                File extractedFile = new File(dexDir, fileName);
+                if (extractedFile.isFile()) {
+                    sourcePaths.add(extractedFile.getAbsolutePath());
+                    //we ignore the verify zip part
+                } else {
+                    throw new IOException("Missing extracted secondary dex file '" + extractedFile.getPath() + "'");
+                }
+            }
+        }
+
+        if (ARouter.debuggable()) { // Search instant run support only debuggable
+            sourcePaths.addAll(tryLoadInstantRunDexFile(applicationInfo));
+        }
+        return sourcePaths;
+    }
+
+    /**
+     * Get instant run dex path, used to catch the branch usingApkSplits=false.
+     */
+    private static List<String> tryLoadInstantRunDexFile(ApplicationInfo applicationInfo) {
+        List<String> instantRunSourcePaths = new ArrayList<>();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && null != applicationInfo.splitSourceDirs) {
+            // add the splite apk, normally for InstantRun, and newest version.
+            instantRunSourcePaths.addAll(Arrays.asList(applicationInfo.splitSourceDirs));
+            Log.d("ARouter", "Found InstantRun support");
+        } else {
+            try {
+                // This man is reflection from Google instant run sdk, he will tell me where the dex files go.
+                Class pathsByInstantRun = Class.forName("com.android.tools.fd.runtime.Paths");
+                Method getDexFileDirectory = pathsByInstantRun.getMethod("getDexFileDirectory", String.class);
+                String instantRunDexPath = (String) getDexFileDirectory.invoke(null, applicationInfo.packageName);
+
+                File instantRunFilePath = new File(instantRunDexPath);
+                if (instantRunFilePath.exists() && instantRunFilePath.isDirectory()) {
+                    File[] dexFile = instantRunFilePath.listFiles();
+                    for (File file : dexFile) {
+                        if (null != file && file.exists() && file.isFile() && file.getName().endsWith(".dex")) {
+                            instantRunSourcePaths.add(file.getAbsolutePath());
+                        }
+                    }
+                    Log.d("ARouter", "Found InstantRun support");
+                }
+
+            } catch (Exception e) {
+                Log.e("ARouter", "InstantRun support error, " + e.getMessage());
+            }
+        }
+
+        return instantRunSourcePaths;
+    }
+
+    /**
+     * Identifies if the current VM has a native support for multidex, meaning there is no need for
+     * additional installation by this library.
+     *
+     * @return true if the VM handles multidex
+     */
+    private static boolean isVMMultidexCapable() {
+        boolean isMultidexCapable = false;
+        String vmName = null;
+
+        try {
+            if (isYunOS()) {    // YunOS需要特殊判断
+                vmName = "'YunOS'";
+                isMultidexCapable = Integer.valueOf(System.getProperty("ro.build.version.sdk")) >= 21;
+            } else {    // 非YunOS原生Android
+                vmName = "'Android'";
+                String versionString = System.getProperty("java.vm.version");
+                if (versionString != null) {
+                    Matcher matcher = Pattern.compile("(\\d+)\\.(\\d+)(\\.\\d+)?").matcher(versionString);
+                    if (matcher.matches()) {
+                        try {
+                            int major = Integer.parseInt(matcher.group(1));
+                            int minor = Integer.parseInt(matcher.group(2));
+                            isMultidexCapable = (major > VM_WITH_MULTIDEX_VERSION_MAJOR)
+                                    || ((major == VM_WITH_MULTIDEX_VERSION_MAJOR)
+                                    && (minor >= VM_WITH_MULTIDEX_VERSION_MINOR));
+                        } catch (NumberFormatException ignore) {
+                            // let isMultidexCapable be false
+                        }
+                    }
+                }
+            }
+        } catch (Exception ignore) {
+
+        }
+
+        Log.i("galaxy", "VM with name " + vmName + (isMultidexCapable ? " has multidex support" : " does not have multidex support"));
+        return isMultidexCapable;
+    }
+
+    /**
+     * 判断系统是否为YunOS系统
+     */
+    private static boolean isYunOS() {
+        try {
+            String version = System.getProperty("ro.yunos.version");
+            String vmName = System.getProperty("java.vm.name");
+            return (vmName != null && vmName.toLowerCase().contains("lemur"))
+                    || (version != null && version.trim().length() > 0);
+        } catch (Exception ignore) {
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib_common/src/main/java/com/guiying/common/base/InfoCallback.java b/lib_common/src/main/java/com/guiying/module/common/base/InfoCallback.java
similarity index 85%
rename from lib_common/src/main/java/com/guiying/common/base/InfoCallback.java
rename to lib_common/src/main/java/com/guiying/module/common/base/InfoCallback.java
index 0024e7a..96e6d21 100644
--- a/lib_common/src/main/java/com/guiying/common/base/InfoCallback.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/InfoCallback.java
@@ -1,4 +1,4 @@
-package com.guiying.common.base;
+package com.guiying.module.common.base;
 
 /**
  * <p>数据回调接口</p>
diff --git a/lib_common/src/main/java/com/guiying/common/base/BaseApplication.java b/lib_common/src/main/java/com/guiying/module/common/base/ViewManager.java
similarity index 58%
rename from lib_common/src/main/java/com/guiying/common/base/BaseApplication.java
rename to lib_common/src/main/java/com/guiying/module/common/base/ViewManager.java
index 319ee04..1b421f2 100644
--- a/lib_common/src/main/java/com/guiying/common/base/BaseApplication.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/ViewManager.java
@@ -1,64 +1,80 @@
-package com.guiying.common.base;
+package com.guiying.module.common.base;
 
 import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.Application;
 import android.content.Context;
 import android.util.Log;
 
-import com.guiying.common.utils.Utils;
-import com.orhanobut.logger.LogLevel;
-import com.orhanobut.logger.Logger;
-
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Stack;
 
 /**
- * 要想使用BaseApplication，必须在组件中实现自己的Application，并且继承BaseApplication；
- * 组件中实现的Application必须在debug包中的AndroidManifest.xml中注册，否则无法使用；
- * 组件的Application需置于java/debug文件夹中，不得放于主代码；
- * 组件中获取Context的方法必须为:Utils.getContext()，不允许其他写法；
- * BaseApplication主要用来管理全局Activity;
+ * <p></p>
  *
- * @author 2016/12/2 17:02
- * @version V1.0.0
- * @name BaseApplication
+ * @author 张华洋 2017/9/26 22:26
+ * @version V1.1
+ * @name ViewManager
  */
-public class BaseApplication extends Application {
+public class ViewManager {
+
+    private static Stack<Activity> activityStack;
+    private static List<BaseFragment> fragmentList;
+
+    public static ViewManager getInstance() {
+        return ViewManagerHolder.sInstance;
+    }
 
-    private static BaseApplication sInstance;
+    private static class ViewManagerHolder {
+        private static final ViewManager sInstance = new ViewManager();
+    }
 
-    private Stack<Activity> activityStack;
+    private ViewManager() {
+    }
 
-    public static BaseApplication getIns() {
-        return sInstance;
+    public void addFragment(int index, BaseFragment fragment) {
+        if (fragmentList == null) {
+            fragmentList = new ArrayList<>();
+        }
+        fragmentList.add(index, fragment);
+    }
+
+
+    public BaseFragment getFragment(int index) {
+        if (fragmentList != null) {
+            return fragmentList.get(index);
+        }
+        return null;
     }
 
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        sInstance = this;
-        Utils.init(this);
 
-        Logger.init("pattern").logLevel(LogLevel.FULL);
+    public List<BaseFragment> getAllFragment() {
+        if (fragmentList != null) {
+            return fragmentList;
+        }
+        return null;
     }
 
+
     /**
      * 添加指定Activity到堆栈
      */
     public void addActivity(Activity activity) {
         if (activityStack == null) {
-            activityStack = new Stack<>();
+            activityStack = new Stack<Activity>();
         }
         activityStack.add(activity);
     }
 
+
     /**
      * 获取当前Activity
      */
     public Activity currentActivity() {
-        return activityStack.lastElement();
+        Activity activity = activityStack.lastElement();
+        return activity;
     }
 
+
     /**
      * 结束当前Activity
      */
@@ -67,6 +83,7 @@ public void finishActivity() {
         finishActivity(activity);
     }
 
+
     /**
      * 结束指定的Activity
      */
@@ -78,6 +95,7 @@ public void finishActivity(Activity activity) {
         }
     }
 
+
     /**
      * 结束指定Class的Activity
      */
@@ -90,6 +108,7 @@ public void finishActivity(Class<?> cls) {
         }
     }
 
+
     /**
      * 结束全部的Activity
      */
@@ -102,6 +121,7 @@ public void finishAllActivity() {
         activityStack.clear();
     }
 
+
     /**
      * 退出应用程序
      */
@@ -109,13 +129,11 @@ public void exitApp(Context context) {
         try {
             finishAllActivity();
             //杀死后台进程需要在AndroidManifest中声明android.permission.KILL_BACKGROUND_PROCESSES；
-            ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
+            android.app.ActivityManager activityManager = (android.app.ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
             activityManager.killBackgroundProcesses(context.getPackageName());
             //System.exit(0);
         } catch (Exception e) {
             Log.e("ActivityManager", "app exit" + e.getMessage());
         }
     }
-
-
 }
diff --git a/lib_common/src/main/java/com/guiying/common/glide/OkHttpGlideModule.java b/lib_common/src/main/java/com/guiying/module/common/glide/OkHttpGlideModule.java
similarity index 98%
rename from lib_common/src/main/java/com/guiying/common/glide/OkHttpGlideModule.java
rename to lib_common/src/main/java/com/guiying/module/common/glide/OkHttpGlideModule.java
index ba8969a..1fedd2e 100644
--- a/lib_common/src/main/java/com/guiying/common/glide/OkHttpGlideModule.java
+++ b/lib_common/src/main/java/com/guiying/module/common/glide/OkHttpGlideModule.java
@@ -1,4 +1,4 @@
-package com.guiying.common.glide;
+package com.guiying.module.common.glide;
 
 import android.content.Context;
 
diff --git a/lib_common/src/main/java/com/guiying/common/glide/OkHttpStreamFetcher.java b/lib_common/src/main/java/com/guiying/module/common/glide/OkHttpStreamFetcher.java
similarity index 95%
rename from lib_common/src/main/java/com/guiying/common/glide/OkHttpStreamFetcher.java
rename to lib_common/src/main/java/com/guiying/module/common/glide/OkHttpStreamFetcher.java
index 358afd3..efd1560 100644
--- a/lib_common/src/main/java/com/guiying/common/glide/OkHttpStreamFetcher.java
+++ b/lib_common/src/main/java/com/guiying/module/common/glide/OkHttpStreamFetcher.java
@@ -1,10 +1,10 @@
-package com.guiying.common.glide;
+package com.guiying.module.common.glide;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.data.DataFetcher;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.util.ContentLengthInputStream;
-import com.guiying.common.utils.CloseUtils;
+import com.guiying.module.common.utils.CloseUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/lib_common/src/main/java/com/guiying/common/glide/OkHttpUrlLoader.java b/lib_common/src/main/java/com/guiying/module/common/glide/OkHttpUrlLoader.java
similarity index 98%
rename from lib_common/src/main/java/com/guiying/common/glide/OkHttpUrlLoader.java
rename to lib_common/src/main/java/com/guiying/module/common/glide/OkHttpUrlLoader.java
index 89f166d..c456435 100644
--- a/lib_common/src/main/java/com/guiying/common/glide/OkHttpUrlLoader.java
+++ b/lib_common/src/main/java/com/guiying/module/common/glide/OkHttpUrlLoader.java
@@ -1,4 +1,4 @@
-package com.guiying.common.glide;
+package com.guiying.module.common.glide;
 
 import android.content.Context;
 
diff --git a/lib_common/src/main/java/com/guiying/common/http/ApiService.java b/lib_common/src/main/java/com/guiying/module/common/http/ApiService.java
similarity index 97%
rename from lib_common/src/main/java/com/guiying/common/http/ApiService.java
rename to lib_common/src/main/java/com/guiying/module/common/http/ApiService.java
index fa73d0a..895b72e 100644
--- a/lib_common/src/main/java/com/guiying/common/http/ApiService.java
+++ b/lib_common/src/main/java/com/guiying/module/common/http/ApiService.java
@@ -1,4 +1,4 @@
-package com.guiying.common.http;
+package com.guiying.module.common.http;
 
 import java.util.Map;
 
diff --git a/lib_common/src/main/java/com/guiying/common/http/DataParseUtil.java b/lib_common/src/main/java/com/guiying/module/common/http/DataParseUtil.java
similarity index 98%
rename from lib_common/src/main/java/com/guiying/common/http/DataParseUtil.java
rename to lib_common/src/main/java/com/guiying/module/common/http/DataParseUtil.java
index dafb631..9cbc61b 100644
--- a/lib_common/src/main/java/com/guiying/common/http/DataParseUtil.java
+++ b/lib_common/src/main/java/com/guiying/module/common/http/DataParseUtil.java
@@ -1,4 +1,4 @@
-package com.guiying.common.http;
+package com.guiying.module.common.http;
 
 import android.text.TextUtils;
 
diff --git a/lib_common/src/main/java/com/guiying/common/http/DataType.java b/lib_common/src/main/java/com/guiying/module/common/http/DataType.java
similarity index 95%
rename from lib_common/src/main/java/com/guiying/common/http/DataType.java
rename to lib_common/src/main/java/com/guiying/module/common/http/DataType.java
index 906fde6..7847996 100644
--- a/lib_common/src/main/java/com/guiying/common/http/DataType.java
+++ b/lib_common/src/main/java/com/guiying/module/common/http/DataType.java
@@ -1,4 +1,4 @@
-package com.guiying.common.http;
+package com.guiying.module.common.http;
 
 import android.support.annotation.IntDef;
 
diff --git a/lib_common/src/main/java/com/guiying/common/http/HttpClient.java b/lib_common/src/main/java/com/guiying/module/common/http/HttpClient.java
similarity index 97%
rename from lib_common/src/main/java/com/guiying/common/http/HttpClient.java
rename to lib_common/src/main/java/com/guiying/module/common/http/HttpClient.java
index 8ebbd04..ce38bfa 100644
--- a/lib_common/src/main/java/com/guiying/common/http/HttpClient.java
+++ b/lib_common/src/main/java/com/guiying/module/common/http/HttpClient.java
@@ -1,4 +1,4 @@
-package com.guiying.common.http;
+package com.guiying.module.common.http;
 
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
@@ -7,11 +7,11 @@
 import com.franmontiel.persistentcookiejar.PersistentCookieJar;
 import com.franmontiel.persistentcookiejar.cache.SetCookieCache;
 import com.franmontiel.persistentcookiejar.persistence.SharedPrefsCookiePersistor;
-import com.guiying.common.R;
-import com.guiying.common.utils.NetworkUtils;
-import com.guiying.common.utils.StringUtils;
-import com.guiying.common.utils.ToastUtils;
-import com.guiying.common.utils.Utils;
+import com.guiying.module.common.R;
+import com.guiying.module.common.utils.NetworkUtils;
+import com.guiying.module.common.utils.StringUtils;
+import com.guiying.module.common.utils.ToastUtils;
+import com.guiying.module.common.utils.Utils;
 import com.orhanobut.logger.Logger;
 
 import java.io.IOException;
diff --git a/lib_common/src/main/java/com/guiying/common/http/HttpsUtils.java b/lib_common/src/main/java/com/guiying/module/common/http/HttpsUtils.java
similarity index 99%
rename from lib_common/src/main/java/com/guiying/common/http/HttpsUtils.java
rename to lib_common/src/main/java/com/guiying/module/common/http/HttpsUtils.java
index 9245b8b..314d6ce 100644
--- a/lib_common/src/main/java/com/guiying/common/http/HttpsUtils.java
+++ b/lib_common/src/main/java/com/guiying/module/common/http/HttpsUtils.java
@@ -1,10 +1,10 @@
-package com.guiying.common.http;
+package com.guiying.module.common.http;
 
 import android.content.Context;
 import android.support.annotation.RawRes;
 import android.text.TextUtils;
 
-import com.guiying.common.utils.CloseUtils;
+import com.guiying.module.common.utils.CloseUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/lib_common/src/main/java/com/guiying/common/http/LoggerInterceptor.java b/lib_common/src/main/java/com/guiying/module/common/http/LoggerInterceptor.java
similarity index 99%
rename from lib_common/src/main/java/com/guiying/common/http/LoggerInterceptor.java
rename to lib_common/src/main/java/com/guiying/module/common/http/LoggerInterceptor.java
index 46cbff8..16d0660 100644
--- a/lib_common/src/main/java/com/guiying/common/http/LoggerInterceptor.java
+++ b/lib_common/src/main/java/com/guiying/module/common/http/LoggerInterceptor.java
@@ -1,4 +1,4 @@
-package com.guiying.common.http;
+package com.guiying.module.common.http;
 
 import android.text.TextUtils;
 
diff --git a/lib_common/src/main/java/com/guiying/common/http/OnResultListener.java b/lib_common/src/main/java/com/guiying/module/common/http/OnResultListener.java
similarity index 94%
rename from lib_common/src/main/java/com/guiying/common/http/OnResultListener.java
rename to lib_common/src/main/java/com/guiying/module/common/http/OnResultListener.java
index 6274b58..527f5f0 100644
--- a/lib_common/src/main/java/com/guiying/common/http/OnResultListener.java
+++ b/lib_common/src/main/java/com/guiying/module/common/http/OnResultListener.java
@@ -1,4 +1,4 @@
-package com.guiying.common.http;
+package com.guiying.module.common.http;
 
 /**
  * <p>在Retrofit中接口会导致泛型擦除，所以这里回调使用Class</p>
diff --git a/lib_common/src/main/java/com/guiying/common/utils/CloseUtils.java b/lib_common/src/main/java/com/guiying/module/common/utils/CloseUtils.java
similarity index 96%
rename from lib_common/src/main/java/com/guiying/common/utils/CloseUtils.java
rename to lib_common/src/main/java/com/guiying/module/common/utils/CloseUtils.java
index dae8eca..336cde0 100644
--- a/lib_common/src/main/java/com/guiying/common/utils/CloseUtils.java
+++ b/lib_common/src/main/java/com/guiying/module/common/utils/CloseUtils.java
@@ -1,4 +1,4 @@
-package com.guiying.common.utils;
+package com.guiying.module.common.utils;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/lib_common/src/main/java/com/guiying/common/utils/NetworkUtils.java b/lib_common/src/main/java/com/guiying/module/common/utils/NetworkUtils.java
similarity index 99%
rename from lib_common/src/main/java/com/guiying/common/utils/NetworkUtils.java
rename to lib_common/src/main/java/com/guiying/module/common/utils/NetworkUtils.java
index 06c8800..e788077 100644
--- a/lib_common/src/main/java/com/guiying/common/utils/NetworkUtils.java
+++ b/lib_common/src/main/java/com/guiying/module/common/utils/NetworkUtils.java
@@ -1,4 +1,4 @@
-package com.guiying.common.utils;
+package com.guiying.module.common.utils;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/lib_common/src/main/java/com/guiying/common/utils/ShellUtils.java b/lib_common/src/main/java/com/guiying/module/common/utils/ShellUtils.java
similarity index 99%
rename from lib_common/src/main/java/com/guiying/common/utils/ShellUtils.java
rename to lib_common/src/main/java/com/guiying/module/common/utils/ShellUtils.java
index 138f7d5..ff326cc 100644
--- a/lib_common/src/main/java/com/guiying/common/utils/ShellUtils.java
+++ b/lib_common/src/main/java/com/guiying/module/common/utils/ShellUtils.java
@@ -1,4 +1,4 @@
-package com.guiying.common.utils;
+package com.guiying.module.common.utils;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
diff --git a/lib_common/src/main/java/com/guiying/common/utils/StringUtils.java b/lib_common/src/main/java/com/guiying/module/common/utils/StringUtils.java
similarity index 99%
rename from lib_common/src/main/java/com/guiying/common/utils/StringUtils.java
rename to lib_common/src/main/java/com/guiying/module/common/utils/StringUtils.java
index ccfbd93..e09c3ae 100644
--- a/lib_common/src/main/java/com/guiying/common/utils/StringUtils.java
+++ b/lib_common/src/main/java/com/guiying/module/common/utils/StringUtils.java
@@ -1,4 +1,4 @@
-package com.guiying.common.utils;
+package com.guiying.module.common.utils;
 
 /**
  * 字符串相关工具类
diff --git a/lib_common/src/main/java/com/guiying/common/utils/ToastUtils.java b/lib_common/src/main/java/com/guiying/module/common/utils/ToastUtils.java
similarity index 99%
rename from lib_common/src/main/java/com/guiying/common/utils/ToastUtils.java
rename to lib_common/src/main/java/com/guiying/module/common/utils/ToastUtils.java
index 5b0fe84..1fd0cdb 100644
--- a/lib_common/src/main/java/com/guiying/common/utils/ToastUtils.java
+++ b/lib_common/src/main/java/com/guiying/module/common/utils/ToastUtils.java
@@ -1,4 +1,4 @@
-package com.guiying.common.utils;
+package com.guiying.module.common.utils;
 
 import android.os.Handler;
 import android.os.Looper;
diff --git a/lib_common/src/main/java/com/guiying/common/utils/Utils.java b/lib_common/src/main/java/com/guiying/module/common/utils/Utils.java
similarity index 98%
rename from lib_common/src/main/java/com/guiying/common/utils/Utils.java
rename to lib_common/src/main/java/com/guiying/module/common/utils/Utils.java
index ff9ff74..a06d64d 100644
--- a/lib_common/src/main/java/com/guiying/common/utils/Utils.java
+++ b/lib_common/src/main/java/com/guiying/module/common/utils/Utils.java
@@ -1,4 +1,4 @@
-package com.guiying.common.utils;
+package com.guiying.module.common.utils;
 
 
 import android.app.Activity;
diff --git a/lib_common/src/main/java/com/guiying/common/HackyViewPager.java b/lib_common/src/main/java/com/guiying/module/common/widget/HackyViewPager.java
similarity index 80%
rename from lib_common/src/main/java/com/guiying/common/HackyViewPager.java
rename to lib_common/src/main/java/com/guiying/module/common/widget/HackyViewPager.java
index f3a1692..a9ace60 100644
--- a/lib_common/src/main/java/com/guiying/common/HackyViewPager.java
+++ b/lib_common/src/main/java/com/guiying/module/common/widget/HackyViewPager.java
@@ -1,4 +1,4 @@
-package com.guiying.common;
+package com.guiying.module.common.widget;
 
 import android.content.Context;
 import android.support.v4.view.ViewPager;
@@ -6,7 +6,10 @@
 import android.view.MotionEvent;
 
 /**
- * <p>解决图片缩放崩溃的问题</p>
+ * <p> 解决图片缩放崩溃的问题</p>
+ * @name HackyViewPager
+ * @author 张华洋 2017/9/27 10:10
+ * @version V1.1
  */
 public class HackyViewPager extends ViewPager {
 
diff --git a/lib_common/src/main/java/com/guiying/module/common/widget/NoScrollViewPager.java b/lib_common/src/main/java/com/guiying/module/common/widget/NoScrollViewPager.java
new file mode 100644
index 0000000..be8f2b9
--- /dev/null
+++ b/lib_common/src/main/java/com/guiying/module/common/widget/NoScrollViewPager.java
@@ -0,0 +1,41 @@
+package com.guiying.module.common.widget;
+
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+
+/**
+ * <p>可以禁止滑动翻页的ViewPager </p>
+ *
+ * @author 张华洋 2017/9/27 10:10
+ * @version V1.1
+ * @name NoScrollViewPager
+ */
+public class NoScrollViewPager extends ViewPager {
+
+    private boolean isPagingEnabled = true;
+
+    public NoScrollViewPager(Context context) {
+        super(context);
+    }
+
+    public NoScrollViewPager(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        return this.isPagingEnabled && super.onTouchEvent(event);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        return this.isPagingEnabled && super.onInterceptTouchEvent(event);
+    }
+
+    public void setPagerEnabled(boolean b) {
+        this.isPagingEnabled = b;
+    }
+
+}

From 5caabd1d52e08048c7a0b60cf34893e663f7f0fc Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Wed, 27 Sep 2017 10:32:44 +0800
Subject: [PATCH 09/38] =?UTF-8?q?1=EF=BC=9A=E8=B0=83=E6=95=B4=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84=EF=BC=8C=E5=A2=9E=E5=8A=A0Fragment?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module_app/build.gradle                       |  2 +-
 module_app/src/main/AndroidManifest.xml       |  4 +--
 .../MyApplication.java                        |  6 ++--
 module_girls/src/main/AndroidManifest.xml     |  2 +-
 .../guiying/{ => module}/girls/Constants.java |  2 +-
 .../guiying/module/girls/GirlsFragment.java   | 32 +++++++++++++++++
 .../com/guiying/module/girls/MyDelegate.java  | 34 +++++++++++++++++++
 .../girls/data/GirlsDataSource.java           |  4 +--
 .../{ => module}/girls/data/bean/Girls.java   |  2 +-
 .../girls/data/bean/GirlsParser.java          |  2 +-
 .../data/source/RemoteGirlsDataSource.java    | 14 ++++----
 .../{ => module}/girls/girl/GirlActivity.java | 10 +++---
 .../{ => module}/girls/girl/GirlAdapter.java  |  6 ++--
 .../girls/main/GirlsActivity.java             |  6 ++--
 .../{ => module}/girls/main/GirlsAdapter.java |  6 ++--
 .../girls/main/GirlsContract.java             |  8 ++---
 .../girls/main/GirlsPresenter.java            |  8 ++---
 .../{ => module}/girls/main/GirlsView.java    | 12 +++----
 .../src/main/java/debug/GirlsApplication.java |  6 ++--
 .../src/main/module/AndroidManifest.xml       |  2 +-
 .../src/main/res/layout/activity_girls.xml    |  2 +-
 .../src/main/res/layout/fragment_girls.xml    | 12 +++++++
 22 files changed, 130 insertions(+), 52 deletions(-)
 rename module_app/src/main/java/com/guiying/{androidmodulepattern => module}/MyApplication.java (95%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/Constants.java (88%)
 create mode 100644 module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java
 create mode 100644 module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/data/GirlsDataSource.java (71%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/data/bean/Girls.java (98%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/data/bean/GirlsParser.java (96%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/data/source/RemoteGirlsDataSource.java (72%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/girl/GirlActivity.java (87%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/girl/GirlAdapter.java (93%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/main/GirlsActivity.java (82%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/main/GirlsAdapter.java (93%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/main/GirlsContract.java (76%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/main/GirlsPresenter.java (84%)
 rename module_girls/src/main/java/com/guiying/{ => module}/girls/main/GirlsView.java (94%)
 create mode 100644 module_girls/src/main/res/layout/fragment_girls.xml

diff --git a/module_app/build.gradle b/module_app/build.gradle
index 37c526b..1e084f4 100644
--- a/module_app/build.gradle
+++ b/module_app/build.gradle
@@ -17,7 +17,7 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
-        applicationId "com.guiying.androidmodulepattern"
+        applicationId "com.guiying.module"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
diff --git a/module_app/src/main/AndroidManifest.xml b/module_app/src/main/AndroidManifest.xml
index 725abcf..315d6cb 100644
--- a/module_app/src/main/AndroidManifest.xml
+++ b/module_app/src/main/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.androidmodulepattern">
+    package="com.guiying.module">
 
     <application
-        android:name=".MyApplication"
+        android:name="com.guiying.module.MyApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java b/module_app/src/main/java/com/guiying/module/MyApplication.java
similarity index 95%
rename from module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java
rename to module_app/src/main/java/com/guiying/module/MyApplication.java
index 3415a6c..72e9506 100644
--- a/module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java
+++ b/module_app/src/main/java/com/guiying/module/MyApplication.java
@@ -1,11 +1,11 @@
-package com.guiying.androidmodulepattern;
+package com.guiying.module;
 
 import android.content.Context;
 import android.support.multidex.MultiDex;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.guiying.common.base.BaseApplication;
-import com.guiying.common.utils.Utils;
+import com.guiying.module.common.base.BaseApplication;
+import com.guiying.module.common.utils.Utils;
 
 import org.acra.ACRA;
 import org.acra.ReportField;
diff --git a/module_girls/src/main/AndroidManifest.xml b/module_girls/src/main/AndroidManifest.xml
index 047ff58..48584ac 100644
--- a/module_girls/src/main/AndroidManifest.xml
+++ b/module_girls/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.girls">
+    package="com.guiying.module.girls">
 
     <application android:theme="@style/AppTheme">
         <activity
diff --git a/module_girls/src/main/java/com/guiying/girls/Constants.java b/module_girls/src/main/java/com/guiying/module/girls/Constants.java
similarity index 88%
rename from module_girls/src/main/java/com/guiying/girls/Constants.java
rename to module_girls/src/main/java/com/guiying/module/girls/Constants.java
index e2332a8..419b643 100644
--- a/module_girls/src/main/java/com/guiying/girls/Constants.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/Constants.java
@@ -1,4 +1,4 @@
-package com.guiying.girls;
+package com.guiying.module.girls;
 
 /**
  * 保存项目中用到的常量
diff --git a/module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java b/module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java
new file mode 100644
index 0000000..4be5443
--- /dev/null
+++ b/module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java
@@ -0,0 +1,32 @@
+package com.guiying.module.girls;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.guiying.module.common.base.BaseFragment;
+
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class GirlsFragment extends BaseFragment {
+
+
+    public GirlsFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_girls, container, false);
+    }
+
+
+}
diff --git a/module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java b/module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java
new file mode 100644
index 0000000..5ab446c
--- /dev/null
+++ b/module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java
@@ -0,0 +1,34 @@
+package com.guiying.module.girls;
+
+import com.guiying.module.common.base.ApplicationDelegate;
+import com.guiying.module.common.base.ViewManager;
+
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2017/9/20 22:29
+ * @version V2.8.3
+ * @name MyDelegate
+ */
+public class MyDelegate implements ApplicationDelegate {
+
+    @Override
+    public void onCreate() {
+        ViewManager.getInstance().addFragment(0, new GirlsFragment());
+    }
+
+    @Override
+    public void onTerminate() {
+
+    }
+
+    @Override
+    public void onLowMemory() {
+
+    }
+
+    @Override
+    public void onTrimMemory(int level) {
+
+    }
+}
diff --git a/module_girls/src/main/java/com/guiying/girls/data/GirlsDataSource.java b/module_girls/src/main/java/com/guiying/module/girls/data/GirlsDataSource.java
similarity index 71%
rename from module_girls/src/main/java/com/guiying/girls/data/GirlsDataSource.java
rename to module_girls/src/main/java/com/guiying/module/girls/data/GirlsDataSource.java
index 4e92618..3f2755d 100644
--- a/module_girls/src/main/java/com/guiying/girls/data/GirlsDataSource.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/data/GirlsDataSource.java
@@ -1,6 +1,6 @@
-package com.guiying.girls.data;
+package com.guiying.module.girls.data;
 
-import com.guiying.girls.data.bean.GirlsParser;
+import com.guiying.module.girls.data.bean.GirlsParser;
 
 public interface GirlsDataSource {
 
diff --git a/module_girls/src/main/java/com/guiying/girls/data/bean/Girls.java b/module_girls/src/main/java/com/guiying/module/girls/data/bean/Girls.java
similarity index 98%
rename from module_girls/src/main/java/com/guiying/girls/data/bean/Girls.java
rename to module_girls/src/main/java/com/guiying/module/girls/data/bean/Girls.java
index 162b6b5..26573c9 100644
--- a/module_girls/src/main/java/com/guiying/girls/data/bean/Girls.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/data/bean/Girls.java
@@ -1,4 +1,4 @@
-package com.guiying.girls.data.bean;
+package com.guiying.module.girls.data.bean;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/module_girls/src/main/java/com/guiying/girls/data/bean/GirlsParser.java b/module_girls/src/main/java/com/guiying/module/girls/data/bean/GirlsParser.java
similarity index 96%
rename from module_girls/src/main/java/com/guiying/girls/data/bean/GirlsParser.java
rename to module_girls/src/main/java/com/guiying/module/girls/data/bean/GirlsParser.java
index b18db5c..d9c4d34 100644
--- a/module_girls/src/main/java/com/guiying/girls/data/bean/GirlsParser.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/data/bean/GirlsParser.java
@@ -1,4 +1,4 @@
-package com.guiying.girls.data.bean;
+package com.guiying.module.girls.data.bean;
 
 import java.util.List;
 
diff --git a/module_girls/src/main/java/com/guiying/girls/data/source/RemoteGirlsDataSource.java b/module_girls/src/main/java/com/guiying/module/girls/data/source/RemoteGirlsDataSource.java
similarity index 72%
rename from module_girls/src/main/java/com/guiying/girls/data/source/RemoteGirlsDataSource.java
rename to module_girls/src/main/java/com/guiying/module/girls/data/source/RemoteGirlsDataSource.java
index ae343f3..457f412 100644
--- a/module_girls/src/main/java/com/guiying/girls/data/source/RemoteGirlsDataSource.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/data/source/RemoteGirlsDataSource.java
@@ -1,12 +1,12 @@
-package com.guiying.girls.data.source;
+package com.guiying.module.girls.data.source;
 
 
-import com.guiying.common.http.DataType;
-import com.guiying.common.http.HttpClient;
-import com.guiying.common.http.OnResultListener;
-import com.guiying.girls.Constants;
-import com.guiying.girls.data.GirlsDataSource;
-import com.guiying.girls.data.bean.GirlsParser;
+import com.guiying.module.common.http.DataType;
+import com.guiying.module.common.http.HttpClient;
+import com.guiying.module.common.http.OnResultListener;
+import com.guiying.module.girls.Constants;
+import com.guiying.module.girls.data.GirlsDataSource;
+import com.guiying.module.girls.data.bean.GirlsParser;
 
 
 
diff --git a/module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java b/module_girls/src/main/java/com/guiying/module/girls/girl/GirlActivity.java
similarity index 87%
rename from module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java
rename to module_girls/src/main/java/com/guiying/module/girls/girl/GirlActivity.java
index 9551bb6..bd1dd78 100644
--- a/module_girls/src/main/java/com/guiying/girls/girl/GirlActivity.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/girl/GirlActivity.java
@@ -1,14 +1,14 @@
-package com.guiying.girls.girl;
+package com.guiying.module.girls.girl;
 
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.view.WindowManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.guiying.common.HackyViewPager;
-import com.guiying.common.base.BaseActivity;
-import com.guiying.girls.Constants;
-import com.guiying.girls.data.bean.Girls;
+import com.guiying.module.common.base.BaseActivity;
+import com.guiying.module.common.widget.HackyViewPager;
+import com.guiying.module.girls.Constants;
+import com.guiying.module.girls.data.bean.Girls;
 
 import java.util.List;
 
diff --git a/module_girls/src/main/java/com/guiying/girls/girl/GirlAdapter.java b/module_girls/src/main/java/com/guiying/module/girls/girl/GirlAdapter.java
similarity index 93%
rename from module_girls/src/main/java/com/guiying/girls/girl/GirlAdapter.java
rename to module_girls/src/main/java/com/guiying/module/girls/girl/GirlAdapter.java
index 6c2bb1d..dce7361 100644
--- a/module_girls/src/main/java/com/guiying/girls/girl/GirlAdapter.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/girl/GirlAdapter.java
@@ -1,4 +1,4 @@
-package com.guiying.girls.girl;
+package com.guiying.module.girls.girl;
 
 import android.content.Context;
 import android.support.v4.view.PagerAdapter;
@@ -8,8 +8,8 @@
 
 import com.bumptech.glide.Glide;
 import com.github.chrisbanes.photoview.PhotoView;
-import com.guiying.girls.R;
-import com.guiying.girls.data.bean.Girls;
+import com.guiying.module.girls.R;
+import com.guiying.module.girls.data.bean.Girls;
 
 import java.util.List;
 
diff --git a/module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java b/module_girls/src/main/java/com/guiying/module/girls/main/GirlsActivity.java
similarity index 82%
rename from module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java
rename to module_girls/src/main/java/com/guiying/module/girls/main/GirlsActivity.java
index 9ebdf52..9a64571 100644
--- a/module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/main/GirlsActivity.java
@@ -1,10 +1,10 @@
-package com.guiying.girls.main;
+package com.guiying.module.girls.main;
 
 import android.os.Bundle;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.guiying.common.base.BaseActionBarActivity;
-import com.guiying.girls.R;
+import com.guiying.module.common.base.BaseActionBarActivity;
+import com.guiying.module.girls.R;
 
 @Route(path = "/girls/list")
 public class GirlsActivity extends BaseActionBarActivity {
diff --git a/module_girls/src/main/java/com/guiying/girls/main/GirlsAdapter.java b/module_girls/src/main/java/com/guiying/module/girls/main/GirlsAdapter.java
similarity index 93%
rename from module_girls/src/main/java/com/guiying/girls/main/GirlsAdapter.java
rename to module_girls/src/main/java/com/guiying/module/girls/main/GirlsAdapter.java
index eefbad0..6ee991a 100644
--- a/module_girls/src/main/java/com/guiying/girls/main/GirlsAdapter.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/main/GirlsAdapter.java
@@ -1,4 +1,4 @@
-package com.guiying.girls.main;
+package com.guiying.module.girls.main;
 
 import android.content.Context;
 import android.view.View;
@@ -7,8 +7,8 @@
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.guiying.girls.R;
-import com.guiying.girls.data.bean.Girls;
+import com.guiying.module.girls.R;
+import com.guiying.module.girls.data.bean.Girls;
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
 
diff --git a/module_girls/src/main/java/com/guiying/girls/main/GirlsContract.java b/module_girls/src/main/java/com/guiying/module/girls/main/GirlsContract.java
similarity index 76%
rename from module_girls/src/main/java/com/guiying/girls/main/GirlsContract.java
rename to module_girls/src/main/java/com/guiying/module/girls/main/GirlsContract.java
index d4cd0d5..fd57180 100644
--- a/module_girls/src/main/java/com/guiying/girls/main/GirlsContract.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/main/GirlsContract.java
@@ -1,8 +1,8 @@
-package com.guiying.girls.main;
+package com.guiying.module.girls.main;
 
-import com.guiying.common.base.BasePresenter;
-import com.guiying.common.base.BaseView;
-import com.guiying.girls.data.bean.Girls;
+import com.guiying.module.common.base.BasePresenter;
+import com.guiying.module.common.base.BaseView;
+import com.guiying.module.girls.data.bean.Girls;
 
 import java.util.List;
 
diff --git a/module_girls/src/main/java/com/guiying/girls/main/GirlsPresenter.java b/module_girls/src/main/java/com/guiying/module/girls/main/GirlsPresenter.java
similarity index 84%
rename from module_girls/src/main/java/com/guiying/girls/main/GirlsPresenter.java
rename to module_girls/src/main/java/com/guiying/module/girls/main/GirlsPresenter.java
index 8a3bca0..a94fa8b 100644
--- a/module_girls/src/main/java/com/guiying/girls/main/GirlsPresenter.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/main/GirlsPresenter.java
@@ -1,8 +1,8 @@
-package com.guiying.girls.main;
+package com.guiying.module.girls.main;
 
-import com.guiying.girls.data.GirlsDataSource;
-import com.guiying.girls.data.bean.GirlsParser;
-import com.guiying.girls.data.source.RemoteGirlsDataSource;
+import com.guiying.module.girls.data.GirlsDataSource;
+import com.guiying.module.girls.data.bean.GirlsParser;
+import com.guiying.module.girls.data.source.RemoteGirlsDataSource;
 
 /**
  * <p>类说明</p>
diff --git a/module_girls/src/main/java/com/guiying/girls/main/GirlsView.java b/module_girls/src/main/java/com/guiying/module/girls/main/GirlsView.java
similarity index 94%
rename from module_girls/src/main/java/com/guiying/girls/main/GirlsView.java
rename to module_girls/src/main/java/com/guiying/module/girls/main/GirlsView.java
index 1c23e23..dc83d90 100644
--- a/module_girls/src/main/java/com/guiying/girls/main/GirlsView.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/main/GirlsView.java
@@ -1,4 +1,4 @@
-package com.guiying.girls.main;
+package com.guiying.module.girls.main;
 
 import android.content.Context;
 import android.content.Intent;
@@ -11,11 +11,11 @@
 import android.view.ViewStub;
 import android.widget.FrameLayout;
 
-import com.guiying.common.utils.Utils;
-import com.guiying.girls.Constants;
-import com.guiying.girls.R;
-import com.guiying.girls.data.bean.Girls;
-import com.guiying.girls.girl.GirlActivity;
+import com.guiying.module.common.utils.Utils;
+import com.guiying.module.girls.Constants;
+import com.guiying.module.girls.R;
+import com.guiying.module.girls.data.bean.Girls;
+import com.guiying.module.girls.girl.GirlActivity;
 import com.jude.easyrecyclerview.EasyRecyclerView;
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
diff --git a/module_girls/src/main/java/debug/GirlsApplication.java b/module_girls/src/main/java/debug/GirlsApplication.java
index b93eb55..052a4e6 100644
--- a/module_girls/src/main/java/debug/GirlsApplication.java
+++ b/module_girls/src/main/java/debug/GirlsApplication.java
@@ -1,8 +1,8 @@
 package debug;
 
-import com.guiying.common.base.BaseApplication;
-import com.guiying.common.http.HttpClient;
-import com.guiying.common.http.OnResultListener;
+import com.guiying.module.common.base.BaseApplication;
+import com.guiying.module.common.http.HttpClient;
+import com.guiying.module.common.http.OnResultListener;
 import com.orhanobut.logger.Logger;
 
 /**
diff --git a/module_girls/src/main/module/AndroidManifest.xml b/module_girls/src/main/module/AndroidManifest.xml
index 4ae8556..f283bb9 100644
--- a/module_girls/src/main/module/AndroidManifest.xml
+++ b/module_girls/src/main/module/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.girls">
+    package="com.guiying.module.girls">
 
     <application
         android:name="debug.GirlsApplication"
diff --git a/module_girls/src/main/res/layout/activity_girls.xml b/module_girls/src/main/res/layout/activity_girls.xml
index 07e6aed..5109cf6 100644
--- a/module_girls/src/main/res/layout/activity_girls.xml
+++ b/module_girls/src/main/res/layout/activity_girls.xml
@@ -4,7 +4,7 @@
     android:id="@+id/activity_girls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.guiying.girls.main.GirlsActivity">
+    tools:context=".girls.main.GirlsActivity">
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/module_girls/src/main/res/layout/fragment_girls.xml b/module_girls/src/main/res/layout/fragment_girls.xml
new file mode 100644
index 0000000..58d2d5e
--- /dev/null
+++ b/module_girls/src/main/res/layout/fragment_girls.xml
@@ -0,0 +1,12 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text=" 这里是女孩 " />
+
+</FrameLayout>

From 2c2239498212663d3f9a6a34e6ded41d75dcbadb Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Wed, 27 Sep 2017 10:33:22 +0800
Subject: [PATCH 10/38] =?UTF-8?q?1=EF=BC=9A=E8=B0=83=E6=95=B4=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84=EF=BC=8C=E5=A2=9E=E5=8A=A0Fragment?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8C=96=E7=A4=BA=E4=BE=8B=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module_main/build.gradle                      |  4 ++
 module_main/src/main/AndroidManifest.xml      | 12 +++-
 .../module/main/BottomNavigationActivity.java | 68 +++++++++++++++++++
 .../guiying/module/main/FragmentAdapter.java  | 40 +++++++++++
 .../{ => module}/main/MainActivity.java       | 29 ++++----
 .../src/main/java/debug/MainApplication.java  |  6 +-
 .../src/main/module/AndroidManifest.xml       |  4 +-
 .../res/drawable/ic_dashboard_black_24dp.xml  |  9 +++
 .../main/res/drawable/ic_home_black_24dp.xml  |  9 +++
 .../drawable/ic_notifications_black_24dp.xml  |  9 +++
 .../res/layout/activity_bottom_navigation.xml | 24 +++++++
 .../src/main/res/layout/activity_main.xml     |  9 ++-
 module_main/src/main/res/menu/navigation.xml  | 19 ++++++
 module_main/src/main/res/values/strings.xml   |  4 ++
 14 files changed, 222 insertions(+), 24 deletions(-)
 create mode 100644 module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java
 create mode 100644 module_main/src/main/java/com/guiying/module/main/FragmentAdapter.java
 rename module_main/src/main/java/com/guiying/{ => module}/main/MainActivity.java (63%)
 create mode 100644 module_main/src/main/res/drawable/ic_dashboard_black_24dp.xml
 create mode 100644 module_main/src/main/res/drawable/ic_home_black_24dp.xml
 create mode 100644 module_main/src/main/res/drawable/ic_notifications_black_24dp.xml
 create mode 100644 module_main/src/main/res/layout/activity_bottom_navigation.xml
 create mode 100644 module_main/src/main/res/menu/navigation.xml

diff --git a/module_main/build.gradle b/module_main/build.gradle
index f41c59f..bba5baa 100644
--- a/module_main/build.gradle
+++ b/module_main/build.gradle
@@ -20,6 +20,7 @@ android {
                 arguments = [moduleName: project.getName()]
             }
         }
+        vectorDrawables.useSupportLibrary = true
     }
 
 
@@ -37,10 +38,13 @@ android {
         }
     }
 
+
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
     compile project(':lib_common')
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:support-vector-drawable:25.3.1'
 }
diff --git a/module_main/src/main/AndroidManifest.xml b/module_main/src/main/AndroidManifest.xml
index 4249b68..7601b45 100644
--- a/module_main/src/main/AndroidManifest.xml
+++ b/module_main/src/main/AndroidManifest.xml
@@ -1,14 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.main">
+    package="com.guiying.module.main">
 
     <application android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name="com.guiying.module.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".BottomNavigationActivity"
+            android:label="@string/title_activity_bottom_navigation">
+
+        </activity>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
diff --git a/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java b/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java
new file mode 100644
index 0000000..f0d0a35
--- /dev/null
+++ b/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java
@@ -0,0 +1,68 @@
+package com.guiying.module.main;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.BottomNavigationView;
+import android.view.MenuItem;
+
+import com.guiying.module.common.base.BaseActivity;
+import com.guiying.module.common.base.BaseFragment;
+import com.guiying.module.common.base.ViewManager;
+import com.guiying.module.common.widget.NoScrollViewPager;
+
+import java.util.List;
+
+/**
+ * <p> </p>
+ *
+ * @author 张华洋 2017/9/27 10:23
+ * @version V1.1
+ * @name BottomNavigationActivity
+ */
+public class BottomNavigationActivity extends BaseActivity {
+
+    private NoScrollViewPager mPager;
+    private List<BaseFragment> mFragments;
+    private FragmentAdapter mAdapter;
+
+    private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
+            = new BottomNavigationView.OnNavigationItemSelectedListener() {
+
+        @Override
+        public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+            int i = item.getItemId();
+            if (i == R.id.navigation_home) {
+                mPager.setCurrentItem(0);
+                return true;
+            } else if (i == R.id.navigation_dashboard) {
+                mPager.setCurrentItem(1);
+                return true;
+            } else if (i == R.id.navigation_notifications) {
+                mPager.setCurrentItem(2);
+                return true;
+            }
+            return false;
+        }
+
+    };
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_bottom_navigation);
+        BottomNavigationView navigation = (BottomNavigationView) findViewById(R.id.navigation);
+        navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
+        initViewPager();
+    }
+
+    private void initViewPager() {
+        mFragments = ViewManager.getInstance().getAllFragment();
+        mPager = (NoScrollViewPager) findViewById(R.id.container_pager);
+        mAdapter = new FragmentAdapter(getSupportFragmentManager(), mFragments);
+        mPager.setPagerEnabled(false);
+        mPager.setAdapter(mAdapter);
+    }
+
+
+}
diff --git a/module_main/src/main/java/com/guiying/module/main/FragmentAdapter.java b/module_main/src/main/java/com/guiying/module/main/FragmentAdapter.java
new file mode 100644
index 0000000..dc5b82b
--- /dev/null
+++ b/module_main/src/main/java/com/guiying/module/main/FragmentAdapter.java
@@ -0,0 +1,40 @@
+package com.guiying.module.main;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentStatePagerAdapter;
+
+import com.guiying.module.common.base.BaseFragment;
+
+import java.util.List;
+
+/**
+ * <p>Fragments适配器 </p>
+ *
+ * @author 张华洋 2017/9/27 10:14
+ * @version V1.1
+ * @name ResourcePagerAdapter
+ */
+public class FragmentAdapter extends FragmentStatePagerAdapter {
+    private List<BaseFragment> mFragments;
+
+    public FragmentAdapter(FragmentManager fm, List<BaseFragment> mFragments) {
+        super(fm);
+        this.mFragments = mFragments;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return mFragments.get(position);
+    }
+
+    @Override
+    public int getCount() {
+        return mFragments != null ? mFragments.size() : 0;
+    }
+
+    @Override
+    public int getItemPosition(Object object) {
+        return android.support.v4.view.PagerAdapter.POSITION_NONE;
+    }
+}
diff --git a/module_main/src/main/java/com/guiying/main/MainActivity.java b/module_main/src/main/java/com/guiying/module/main/MainActivity.java
similarity index 63%
rename from module_main/src/main/java/com/guiying/main/MainActivity.java
rename to module_main/src/main/java/com/guiying/module/main/MainActivity.java
index dbcb530..db0fb8b 100644
--- a/module_main/src/main/java/com/guiying/main/MainActivity.java
+++ b/module_main/src/main/java/com/guiying/module/main/MainActivity.java
@@ -1,14 +1,14 @@
-package com.guiying.main;
+package com.guiying.module.main;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
-import android.widget.Button;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.guiying.common.base.BaseActivity;
-import com.guiying.common.base.BaseApplication;
-import com.guiying.common.utils.ToastUtils;
+import com.guiying.module.common.base.BaseActivity;
+import com.guiying.module.common.base.ViewManager;
+import com.guiying.module.common.utils.ToastUtils;
 
 /**
  * <p>类说明</p>
@@ -19,18 +19,15 @@
  */
 public class MainActivity extends BaseActivity implements View.OnClickListener {
 
-    private long exitTime = 0;
-    protected Button newsButton;
-    protected Button girlsButton;
+    private long mExitTime = 0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        newsButton = (Button) findViewById(R.id.news_button);
-        newsButton.setOnClickListener(MainActivity.this);
-        girlsButton = (Button) findViewById(R.id.girls_button);
-        girlsButton.setOnClickListener(MainActivity.this);
+        findViewById(R.id.news_button).setOnClickListener(this);
+        findViewById(R.id.girls_button).setOnClickListener(this);
+        findViewById(R.id.fragment_button).setOnClickListener(this);
     }
 
     @Override
@@ -41,6 +38,8 @@ public void onClick(View view) {
         } else if (view.getId() == R.id.girls_button) {
             //跳转到GirlsActivity
             ARouter.getInstance().build("/girls/list").navigation();
+        } else if (view.getId() == R.id.fragment_button) {
+            startActivity(new Intent(this, BottomNavigationActivity.class));
         }
     }
 
@@ -49,11 +48,11 @@ public void onClick(View view) {
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
             //两秒之内按返回键就会退出
-            if ((System.currentTimeMillis() - exitTime) > 2000) {
+            if ((System.currentTimeMillis() - mExitTime) > 2000) {
                 ToastUtils.showShortToast(getString(R.string.app_exit_hint));
-                exitTime = System.currentTimeMillis();
+                mExitTime = System.currentTimeMillis();
             } else {
-                BaseApplication.getIns().exitApp(this);
+                ViewManager.getInstance().exitApp(this);
             }
             return true;
         }
diff --git a/module_main/src/main/java/debug/MainApplication.java b/module_main/src/main/java/debug/MainApplication.java
index 293f166..24509f5 100644
--- a/module_main/src/main/java/debug/MainApplication.java
+++ b/module_main/src/main/java/debug/MainApplication.java
@@ -1,8 +1,8 @@
 package debug;
 
-import com.guiying.common.base.BaseApplication;
-import com.guiying.common.http.HttpClient;
-import com.guiying.common.http.OnResultListener;
+import com.guiying.module.common.base.BaseApplication;
+import com.guiying.module.common.http.HttpClient;
+import com.guiying.module.common.http.OnResultListener;
 import com.orhanobut.logger.Logger;
 
 /**
diff --git a/module_main/src/main/module/AndroidManifest.xml b/module_main/src/main/module/AndroidManifest.xml
index fc3933a..a5eb0d9 100644
--- a/module_main/src/main/module/AndroidManifest.xml
+++ b/module_main/src/main/module/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.main">
+    package="com.guiying.module">
 
     <application
         android:name="debug.MainApplication"
@@ -9,7 +9,7 @@
         android:label="@string/app_main"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/module_main/src/main/res/drawable/ic_dashboard_black_24dp.xml b/module_main/src/main/res/drawable/ic_dashboard_black_24dp.xml
new file mode 100644
index 0000000..ae6a446
--- /dev/null
+++ b/module_main/src/main/res/drawable/ic_dashboard_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
+</vector>
diff --git a/module_main/src/main/res/drawable/ic_home_black_24dp.xml b/module_main/src/main/res/drawable/ic_home_black_24dp.xml
new file mode 100644
index 0000000..0c36320
--- /dev/null
+++ b/module_main/src/main/res/drawable/ic_home_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
+</vector>
diff --git a/module_main/src/main/res/drawable/ic_notifications_black_24dp.xml b/module_main/src/main/res/drawable/ic_notifications_black_24dp.xml
new file mode 100644
index 0000000..0262382
--- /dev/null
+++ b/module_main/src/main/res/drawable/ic_notifications_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
+</vector>
diff --git a/module_main/src/main/res/layout/activity_bottom_navigation.xml b/module_main/src/main/res/layout/activity_bottom_navigation.xml
new file mode 100644
index 0000000..060e7be
--- /dev/null
+++ b/module_main/src/main/res/layout/activity_bottom_navigation.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    tools:context="com.guiying.module.main.BottomNavigationActivity">
+
+    <com.guiying.module.common.widget.NoScrollViewPager
+        android:id="@+id/container_pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <android.support.design.widget.BottomNavigationView
+        android:id="@+id/navigation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="?android:attr/windowBackground"
+        app:menu="@menu/navigation" />
+
+</LinearLayout>
diff --git a/module_main/src/main/res/layout/activity_main.xml b/module_main/src/main/res/layout/activity_main.xml
index e5e21fe..c4c16f8 100644
--- a/module_main/src/main/res/layout/activity_main.xml
+++ b/module_main/src/main/res/layout/activity_main.xml
@@ -9,7 +9,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.guiying.main.MainActivity">
+    tools:context="com.guiying.module.main.MainActivity">
 
     <Button
         android:id="@+id/news_button"
@@ -22,4 +22,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Girls" />
+
+    <Button
+        android:id="@+id/fragment_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Fragment" />
+
 </LinearLayout>
diff --git a/module_main/src/main/res/menu/navigation.xml b/module_main/src/main/res/menu/navigation.xml
new file mode 100644
index 0000000..f4de4f8
--- /dev/null
+++ b/module_main/src/main/res/menu/navigation.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/navigation_home"
+        android:icon="@drawable/ic_home_black_24dp"
+        android:title="@string/title_home" />
+
+    <item
+        android:id="@+id/navigation_dashboard"
+        android:icon="@drawable/ic_dashboard_black_24dp"
+        android:title="@string/title_dashboard" />
+
+    <item
+        android:id="@+id/navigation_notifications"
+        android:icon="@drawable/ic_notifications_black_24dp"
+        android:title="@string/title_notifications" />
+
+</menu>
diff --git a/module_main/src/main/res/values/strings.xml b/module_main/src/main/res/values/strings.xml
index 01beb45..177710e 100644
--- a/module_main/src/main/res/values/strings.xml
+++ b/module_main/src/main/res/values/strings.xml
@@ -2,5 +2,9 @@
     <string name="app_main">main组件</string>
 
     <string name="app_exit_hint">再按一次退出程序</string>
+    <string name="title_activity_bottom_navigation">BottomNavigationActivity</string>
+    <string name="title_home">Home</string>
+    <string name="title_dashboard">Dashboard</string>
+    <string name="title_notifications">Notifications</string>
 
 </resources>

From fdd6dd38d64f92c0242473ff1db67890f1558c50 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Wed, 27 Sep 2017 10:33:47 +0800
Subject: [PATCH 11/38] =?UTF-8?q?1=EF=BC=9A=E8=B0=83=E6=95=B4=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84=EF=BC=8C=E5=A2=9E=E5=8A=A0Fragment?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8C=96=E7=A4=BA=E4=BE=8B=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module_news/build.gradle                      |  1 +
 module_news/src/main/AndroidManifest.xml      |  2 +-
 .../guiying/{ => module}/news/Constants.java  |  2 +-
 .../com/guiying/module/news/MyDelegate.java   | 36 +++++++++++++++++++
 .../com/guiying/module/news/NewsFragment.java | 32 +++++++++++++++++
 .../news/data/NewsDataSource.java             |  8 ++---
 .../news/data/bean/MessageDetail.java         |  2 +-
 .../{ => module}/news/data/bean/Story.java    |  2 +-
 .../news/data/bean/StoryList.java             |  2 +-
 .../data/source/RemoteNewsDataSource.java     | 18 +++++-----
 .../news/detail/NewsDetailActivity.java       |  4 +--
 .../news/detail/NewsDetailContract.java       |  8 ++---
 .../news/detail/NewsDetailPresenter.java      | 10 +++---
 .../news/detail/NewsDetailView.java           |  6 ++--
 .../news/main/NewsCenterActivity.java         |  6 ++--
 .../news/main/NewsListAdapter.java            |  8 ++---
 .../news/main/NewsListContract.java           |  8 ++---
 .../news/main/NewsListPresenter.java          | 10 +++---
 .../{ => module}/news/main/NewsListView.java  |  6 ++--
 .../news/main/NewsListViewAdapter.java        |  2 +-
 .../src/main/java/debug/LauncherActivity.java |  2 +-
 .../src/main/java/debug/NewsApplication.java  | 12 +++----
 .../src/main/module/AndroidManifest.xml       |  2 +-
 .../src/main/res/layout/fragment_news.xml     | 14 ++++++++
 module_news/src/main/res/values/strings.xml   |  3 ++
 25 files changed, 146 insertions(+), 60 deletions(-)
 rename module_news/src/main/java/com/guiying/{ => module}/news/Constants.java (92%)
 create mode 100644 module_news/src/main/java/com/guiying/module/news/MyDelegate.java
 create mode 100644 module_news/src/main/java/com/guiying/module/news/NewsFragment.java
 rename module_news/src/main/java/com/guiying/{ => module}/news/data/NewsDataSource.java (72%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/data/bean/MessageDetail.java (98%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/data/bean/Story.java (97%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/data/bean/StoryList.java (92%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/data/source/RemoteNewsDataSource.java (80%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/detail/NewsDetailActivity.java (87%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/detail/NewsDetailContract.java (71%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/detail/NewsDetailPresenter.java (78%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/detail/NewsDetailView.java (96%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/main/NewsCenterActivity.java (94%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/main/NewsListAdapter.java (91%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/main/NewsListContract.java (71%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/main/NewsListPresenter.java (78%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/main/NewsListView.java (95%)
 rename module_news/src/main/java/com/guiying/{ => module}/news/main/NewsListViewAdapter.java (98%)
 create mode 100644 module_news/src/main/res/layout/fragment_news.xml

diff --git a/module_news/build.gradle b/module_news/build.gradle
index 4014b71..7c5b438 100644
--- a/module_news/build.gradle
+++ b/module_news/build.gradle
@@ -42,4 +42,5 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
     compile project(':lib_common')
+    compile 'com.android.support:support-v4:25.3.1'
 }
diff --git a/module_news/src/main/AndroidManifest.xml b/module_news/src/main/AndroidManifest.xml
index 6873b60..14b08f4 100644
--- a/module_news/src/main/AndroidManifest.xml
+++ b/module_news/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.news">
+    package="com.guiying.module.news">
 
     <application android:theme="@style/AppTheme">
         <activity
diff --git a/module_news/src/main/java/com/guiying/news/Constants.java b/module_news/src/main/java/com/guiying/module/news/Constants.java
similarity index 92%
rename from module_news/src/main/java/com/guiying/news/Constants.java
rename to module_news/src/main/java/com/guiying/module/news/Constants.java
index 2d3cc6f..000de00 100644
--- a/module_news/src/main/java/com/guiying/news/Constants.java
+++ b/module_news/src/main/java/com/guiying/module/news/Constants.java
@@ -1,4 +1,4 @@
-package com.guiying.news;
+package com.guiying.module.news;
 
 /**
  * 保存项目中用到的常量
diff --git a/module_news/src/main/java/com/guiying/module/news/MyDelegate.java b/module_news/src/main/java/com/guiying/module/news/MyDelegate.java
new file mode 100644
index 0000000..30bbfac
--- /dev/null
+++ b/module_news/src/main/java/com/guiying/module/news/MyDelegate.java
@@ -0,0 +1,36 @@
+package com.guiying.module.news;
+
+import com.guiying.module.common.base.ApplicationDelegate;
+import com.guiying.module.common.base.ViewManager;
+
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2017/9/20 22:29
+ * @version V2.8.3
+ * @name MyDelegate
+ */
+
+
+public class MyDelegate implements ApplicationDelegate {
+
+    @Override
+    public void onCreate() {
+        ViewManager.getInstance().addFragment(0, new NewsFragment());
+    }
+
+    @Override
+    public void onTerminate() {
+
+    }
+
+    @Override
+    public void onLowMemory() {
+
+    }
+
+    @Override
+    public void onTrimMemory(int level) {
+
+    }
+}
diff --git a/module_news/src/main/java/com/guiying/module/news/NewsFragment.java b/module_news/src/main/java/com/guiying/module/news/NewsFragment.java
new file mode 100644
index 0000000..e316af6
--- /dev/null
+++ b/module_news/src/main/java/com/guiying/module/news/NewsFragment.java
@@ -0,0 +1,32 @@
+package com.guiying.module.news;
+
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.guiying.module.common.base.BaseFragment;
+
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class NewsFragment extends BaseFragment {
+
+
+    public NewsFragment() {
+        // Required empty public constructor
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_news, container, false);
+    }
+
+
+}
diff --git a/module_news/src/main/java/com/guiying/news/data/NewsDataSource.java b/module_news/src/main/java/com/guiying/module/news/data/NewsDataSource.java
similarity index 72%
rename from module_news/src/main/java/com/guiying/news/data/NewsDataSource.java
rename to module_news/src/main/java/com/guiying/module/news/data/NewsDataSource.java
index 07d6fbd..8990f08 100644
--- a/module_news/src/main/java/com/guiying/news/data/NewsDataSource.java
+++ b/module_news/src/main/java/com/guiying/module/news/data/NewsDataSource.java
@@ -1,8 +1,8 @@
-package com.guiying.news.data;
+package com.guiying.module.news.data;
 
-import com.guiying.common.base.InfoCallback;
-import com.guiying.news.data.bean.MessageDetail;
-import com.guiying.news.data.bean.StoryList;
+import com.guiying.module.common.base.InfoCallback;
+import com.guiying.module.news.data.bean.MessageDetail;
+import com.guiying.module.news.data.bean.StoryList;
 
 /**
  * <p>类说明</p>
diff --git a/module_news/src/main/java/com/guiying/news/data/bean/MessageDetail.java b/module_news/src/main/java/com/guiying/module/news/data/bean/MessageDetail.java
similarity index 98%
rename from module_news/src/main/java/com/guiying/news/data/bean/MessageDetail.java
rename to module_news/src/main/java/com/guiying/module/news/data/bean/MessageDetail.java
index b853f15..204bb82 100644
--- a/module_news/src/main/java/com/guiying/news/data/bean/MessageDetail.java
+++ b/module_news/src/main/java/com/guiying/module/news/data/bean/MessageDetail.java
@@ -1,4 +1,4 @@
-package com.guiying.news.data.bean;
+package com.guiying.module.news.data.bean;
 
 import java.util.List;
 
diff --git a/module_news/src/main/java/com/guiying/news/data/bean/Story.java b/module_news/src/main/java/com/guiying/module/news/data/bean/Story.java
similarity index 97%
rename from module_news/src/main/java/com/guiying/news/data/bean/Story.java
rename to module_news/src/main/java/com/guiying/module/news/data/bean/Story.java
index 7b7cef2..af488ca 100644
--- a/module_news/src/main/java/com/guiying/news/data/bean/Story.java
+++ b/module_news/src/main/java/com/guiying/module/news/data/bean/Story.java
@@ -1,4 +1,4 @@
-package com.guiying.news.data.bean;
+package com.guiying.module.news.data.bean;
 
 /**
  * 日报新闻实体类
diff --git a/module_news/src/main/java/com/guiying/news/data/bean/StoryList.java b/module_news/src/main/java/com/guiying/module/news/data/bean/StoryList.java
similarity index 92%
rename from module_news/src/main/java/com/guiying/news/data/bean/StoryList.java
rename to module_news/src/main/java/com/guiying/module/news/data/bean/StoryList.java
index 99f3f5e..58ba7e0 100644
--- a/module_news/src/main/java/com/guiying/news/data/bean/StoryList.java
+++ b/module_news/src/main/java/com/guiying/module/news/data/bean/StoryList.java
@@ -1,4 +1,4 @@
-package com.guiying.news.data.bean;
+package com.guiying.module.news.data.bean;
 
 import java.util.List;
 
diff --git a/module_news/src/main/java/com/guiying/news/data/source/RemoteNewsDataSource.java b/module_news/src/main/java/com/guiying/module/news/data/source/RemoteNewsDataSource.java
similarity index 80%
rename from module_news/src/main/java/com/guiying/news/data/source/RemoteNewsDataSource.java
rename to module_news/src/main/java/com/guiying/module/news/data/source/RemoteNewsDataSource.java
index 51075f2..05d4d84 100644
--- a/module_news/src/main/java/com/guiying/news/data/source/RemoteNewsDataSource.java
+++ b/module_news/src/main/java/com/guiying/module/news/data/source/RemoteNewsDataSource.java
@@ -1,13 +1,13 @@
-package com.guiying.news.data.source;
+package com.guiying.module.news.data.source;
 
-import com.guiying.common.base.InfoCallback;
-import com.guiying.common.http.DataType;
-import com.guiying.common.http.HttpClient;
-import com.guiying.common.http.OnResultListener;
-import com.guiying.news.Constants;
-import com.guiying.news.data.NewsDataSource;
-import com.guiying.news.data.bean.MessageDetail;
-import com.guiying.news.data.bean.StoryList;
+import com.guiying.module.common.base.InfoCallback;
+import com.guiying.module.common.http.DataType;
+import com.guiying.module.common.http.HttpClient;
+import com.guiying.module.common.http.OnResultListener;
+import com.guiying.module.news.Constants;
+import com.guiying.module.news.data.NewsDataSource;
+import com.guiying.module.news.data.bean.MessageDetail;
+import com.guiying.module.news.data.bean.StoryList;
 
 /**
  * <p>类说明</p>
diff --git a/module_news/src/main/java/com/guiying/news/detail/NewsDetailActivity.java b/module_news/src/main/java/com/guiying/module/news/detail/NewsDetailActivity.java
similarity index 87%
rename from module_news/src/main/java/com/guiying/news/detail/NewsDetailActivity.java
rename to module_news/src/main/java/com/guiying/module/news/detail/NewsDetailActivity.java
index ed3a197..1539ad9 100644
--- a/module_news/src/main/java/com/guiying/news/detail/NewsDetailActivity.java
+++ b/module_news/src/main/java/com/guiying/module/news/detail/NewsDetailActivity.java
@@ -1,9 +1,9 @@
-package com.guiying.news.detail;
+package com.guiying.module.news.detail;
 
 import android.os.Bundle;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.guiying.common.base.BaseActivity;
+import com.guiying.module.common.base.BaseActivity;
 
 /**
  * <p>类说明</p>
diff --git a/module_news/src/main/java/com/guiying/news/detail/NewsDetailContract.java b/module_news/src/main/java/com/guiying/module/news/detail/NewsDetailContract.java
similarity index 71%
rename from module_news/src/main/java/com/guiying/news/detail/NewsDetailContract.java
rename to module_news/src/main/java/com/guiying/module/news/detail/NewsDetailContract.java
index fb0f422..6a21ef5 100644
--- a/module_news/src/main/java/com/guiying/news/detail/NewsDetailContract.java
+++ b/module_news/src/main/java/com/guiying/module/news/detail/NewsDetailContract.java
@@ -1,8 +1,8 @@
-package com.guiying.news.detail;
+package com.guiying.module.news.detail;
 
-import com.guiying.common.base.BasePresenter;
-import com.guiying.common.base.BaseView;
-import com.guiying.news.data.bean.MessageDetail;
+import com.guiying.module.common.base.BasePresenter;
+import com.guiying.module.common.base.BaseView;
+import com.guiying.module.news.data.bean.MessageDetail;
 
 /**
  * <p>类说明</p>
diff --git a/module_news/src/main/java/com/guiying/news/detail/NewsDetailPresenter.java b/module_news/src/main/java/com/guiying/module/news/detail/NewsDetailPresenter.java
similarity index 78%
rename from module_news/src/main/java/com/guiying/news/detail/NewsDetailPresenter.java
rename to module_news/src/main/java/com/guiying/module/news/detail/NewsDetailPresenter.java
index f2b718c..f517ae7 100644
--- a/module_news/src/main/java/com/guiying/news/detail/NewsDetailPresenter.java
+++ b/module_news/src/main/java/com/guiying/module/news/detail/NewsDetailPresenter.java
@@ -1,9 +1,9 @@
-package com.guiying.news.detail;
+package com.guiying.module.news.detail;
 
-import com.guiying.common.base.InfoCallback;
-import com.guiying.news.data.NewsDataSource;
-import com.guiying.news.data.bean.MessageDetail;
-import com.guiying.news.data.source.RemoteNewsDataSource;
+import com.guiying.module.common.base.InfoCallback;
+import com.guiying.module.news.data.NewsDataSource;
+import com.guiying.module.news.data.bean.MessageDetail;
+import com.guiying.module.news.data.source.RemoteNewsDataSource;
 
 /**
  * <p>类说明</p>
diff --git a/module_news/src/main/java/com/guiying/news/detail/NewsDetailView.java b/module_news/src/main/java/com/guiying/module/news/detail/NewsDetailView.java
similarity index 96%
rename from module_news/src/main/java/com/guiying/news/detail/NewsDetailView.java
rename to module_news/src/main/java/com/guiying/module/news/detail/NewsDetailView.java
index 164f1fb..6be1e58 100644
--- a/module_news/src/main/java/com/guiying/news/detail/NewsDetailView.java
+++ b/module_news/src/main/java/com/guiying/module/news/detail/NewsDetailView.java
@@ -1,4 +1,4 @@
-package com.guiying.news.detail;
+package com.guiying.module.news.detail;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -17,8 +17,8 @@
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.animation.GlideAnimation;
 import com.bumptech.glide.request.target.SimpleTarget;
-import com.guiying.news.R;
-import com.guiying.news.data.bean.MessageDetail;
+import com.guiying.module.news.R;
+import com.guiying.module.news.data.bean.MessageDetail;
 
 /**
  * <p>类说明</p>
diff --git a/module_news/src/main/java/com/guiying/news/main/NewsCenterActivity.java b/module_news/src/main/java/com/guiying/module/news/main/NewsCenterActivity.java
similarity index 94%
rename from module_news/src/main/java/com/guiying/news/main/NewsCenterActivity.java
rename to module_news/src/main/java/com/guiying/module/news/main/NewsCenterActivity.java
index 4bec37c..af806e2 100644
--- a/module_news/src/main/java/com/guiying/news/main/NewsCenterActivity.java
+++ b/module_news/src/main/java/com/guiying/module/news/main/NewsCenterActivity.java
@@ -1,4 +1,4 @@
-package com.guiying.news.main;
+package com.guiying.module.news.main;
 
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
@@ -6,8 +6,8 @@
 import android.support.v7.widget.Toolbar;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.guiying.common.base.BaseActivity;
-import com.guiying.news.R;
+import com.guiying.module.common.base.BaseActivity;
+import com.guiying.module.news.R;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/module_news/src/main/java/com/guiying/news/main/NewsListAdapter.java b/module_news/src/main/java/com/guiying/module/news/main/NewsListAdapter.java
similarity index 91%
rename from module_news/src/main/java/com/guiying/news/main/NewsListAdapter.java
rename to module_news/src/main/java/com/guiying/module/news/main/NewsListAdapter.java
index d832569..76e452f 100644
--- a/module_news/src/main/java/com/guiying/news/main/NewsListAdapter.java
+++ b/module_news/src/main/java/com/guiying/module/news/main/NewsListAdapter.java
@@ -1,4 +1,4 @@
-package com.guiying.news.main;
+package com.guiying.module.news.main;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,9 +9,9 @@
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.guiying.news.R;
-import com.guiying.news.data.bean.Story;
-import com.guiying.news.detail.NewsDetailActivity;
+import com.guiying.module.news.R;
+import com.guiying.module.news.data.bean.Story;
+import com.guiying.module.news.detail.NewsDetailActivity;
 import com.jude.easyrecyclerview.adapter.BaseViewHolder;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
 
diff --git a/module_news/src/main/java/com/guiying/news/main/NewsListContract.java b/module_news/src/main/java/com/guiying/module/news/main/NewsListContract.java
similarity index 71%
rename from module_news/src/main/java/com/guiying/news/main/NewsListContract.java
rename to module_news/src/main/java/com/guiying/module/news/main/NewsListContract.java
index 782c2a7..6a7106d 100644
--- a/module_news/src/main/java/com/guiying/news/main/NewsListContract.java
+++ b/module_news/src/main/java/com/guiying/module/news/main/NewsListContract.java
@@ -1,8 +1,8 @@
-package com.guiying.news.main;
+package com.guiying.module.news.main;
 
-import com.guiying.common.base.BasePresenter;
-import com.guiying.common.base.BaseView;
-import com.guiying.news.data.bean.StoryList;
+import com.guiying.module.common.base.BasePresenter;
+import com.guiying.module.common.base.BaseView;
+import com.guiying.module.news.data.bean.StoryList;
 
 /**
  * <p>类说明</p>
diff --git a/module_news/src/main/java/com/guiying/news/main/NewsListPresenter.java b/module_news/src/main/java/com/guiying/module/news/main/NewsListPresenter.java
similarity index 78%
rename from module_news/src/main/java/com/guiying/news/main/NewsListPresenter.java
rename to module_news/src/main/java/com/guiying/module/news/main/NewsListPresenter.java
index 96b9f20..8ac69db 100644
--- a/module_news/src/main/java/com/guiying/news/main/NewsListPresenter.java
+++ b/module_news/src/main/java/com/guiying/module/news/main/NewsListPresenter.java
@@ -1,9 +1,9 @@
-package com.guiying.news.main;
+package com.guiying.module.news.main;
 
-import com.guiying.common.base.InfoCallback;
-import com.guiying.news.data.NewsDataSource;
-import com.guiying.news.data.bean.StoryList;
-import com.guiying.news.data.source.RemoteNewsDataSource;
+import com.guiying.module.common.base.InfoCallback;
+import com.guiying.module.news.data.NewsDataSource;
+import com.guiying.module.news.data.bean.StoryList;
+import com.guiying.module.news.data.source.RemoteNewsDataSource;
 
 /**
  * <p>类说明</p>
diff --git a/module_news/src/main/java/com/guiying/news/main/NewsListView.java b/module_news/src/main/java/com/guiying/module/news/main/NewsListView.java
similarity index 95%
rename from module_news/src/main/java/com/guiying/news/main/NewsListView.java
rename to module_news/src/main/java/com/guiying/module/news/main/NewsListView.java
index 70ce0d1..254aca0 100644
--- a/module_news/src/main/java/com/guiying/news/main/NewsListView.java
+++ b/module_news/src/main/java/com/guiying/module/news/main/NewsListView.java
@@ -1,4 +1,4 @@
-package com.guiying.news.main;
+package com.guiying.module.news.main;
 
 import android.content.Context;
 import android.support.v4.content.ContextCompat;
@@ -6,8 +6,8 @@
 import android.support.v7.widget.LinearLayoutManager;
 import android.util.AttributeSet;
 
-import com.guiying.news.R;
-import com.guiying.news.data.bean.StoryList;
+import com.guiying.module.news.R;
+import com.guiying.module.news.data.bean.StoryList;
 import com.jude.easyrecyclerview.EasyRecyclerView;
 import com.jude.easyrecyclerview.adapter.RecyclerArrayAdapter;
 import com.jude.easyrecyclerview.decoration.DividerDecoration;
diff --git a/module_news/src/main/java/com/guiying/news/main/NewsListViewAdapter.java b/module_news/src/main/java/com/guiying/module/news/main/NewsListViewAdapter.java
similarity index 98%
rename from module_news/src/main/java/com/guiying/news/main/NewsListViewAdapter.java
rename to module_news/src/main/java/com/guiying/module/news/main/NewsListViewAdapter.java
index dbd36af..4fe1893 100644
--- a/module_news/src/main/java/com/guiying/news/main/NewsListViewAdapter.java
+++ b/module_news/src/main/java/com/guiying/module/news/main/NewsListViewAdapter.java
@@ -1,4 +1,4 @@
-package com.guiying.news.main;
+package com.guiying.module.news.main;
 
 import android.support.v4.view.PagerAdapter;
 import android.view.View;
diff --git a/module_news/src/main/java/debug/LauncherActivity.java b/module_news/src/main/java/debug/LauncherActivity.java
index 02fdca3..373f765 100644
--- a/module_news/src/main/java/debug/LauncherActivity.java
+++ b/module_news/src/main/java/debug/LauncherActivity.java
@@ -4,7 +4,7 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 
-import com.guiying.news.detail.NewsDetailActivity;
+import com.guiying.module.news.detail.NewsDetailActivity;
 
 /**
  * <p>组件开发模式下，用于传递数据的启动Activity，集成模式下无效</p>
diff --git a/module_news/src/main/java/debug/NewsApplication.java b/module_news/src/main/java/debug/NewsApplication.java
index e6af33e..8bcfdcb 100644
--- a/module_news/src/main/java/debug/NewsApplication.java
+++ b/module_news/src/main/java/debug/NewsApplication.java
@@ -1,11 +1,11 @@
 package debug;
 
-import com.guiying.common.base.BaseApplication;
-import com.guiying.common.http.DataType;
-import com.guiying.common.http.HttpClient;
-import com.guiying.common.http.OnResultListener;
-import com.guiying.news.Constants;
-import com.guiying.news.data.bean.StoryList;
+import com.guiying.module.common.base.BaseApplication;
+import com.guiying.module.common.http.DataType;
+import com.guiying.module.common.http.HttpClient;
+import com.guiying.module.common.http.OnResultListener;
+import com.guiying.module.news.Constants;
+import com.guiying.module.news.data.bean.StoryList;
 import com.orhanobut.logger.Logger;
 
 /**
diff --git a/module_news/src/main/module/AndroidManifest.xml b/module_news/src/main/module/AndroidManifest.xml
index 000e4ab..d16a659 100644
--- a/module_news/src/main/module/AndroidManifest.xml
+++ b/module_news/src/main/module/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.news">
+    package="com.guiying.module.news">
 
     <application
         android:name="debug.NewsApplication"
diff --git a/module_news/src/main/res/layout/fragment_news.xml b/module_news/src/main/res/layout/fragment_news.xml
new file mode 100644
index 0000000..b00a5e4
--- /dev/null
+++ b/module_news/src/main/res/layout/fragment_news.xml
@@ -0,0 +1,14 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.guiying.module.news.NewsFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:text="这里是新闻 " />
+
+</FrameLayout>
diff --git a/module_news/src/main/res/values/strings.xml b/module_news/src/main/res/values/strings.xml
index ae57d42..3ac24fd 100644
--- a/module_news/src/main/res/values/strings.xml
+++ b/module_news/src/main/res/values/strings.xml
@@ -3,4 +3,7 @@
 
     <string name="news_activity_title">News</string>
 
+    <!-- TODO: Remove or change this placeholder text -->
+    <string name="hello_blank_fragment">Hello blank fragment</string>
+
 </resources>

From 1483376839bc64a35e2cb36efdfec00e1f49b531 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Wed, 27 Sep 2017 17:04:14 +0800
Subject: [PATCH 12/38] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=9B=BE=E7=89=87=E5=B4=A9=E6=BA=83=E7=9A=84bug?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib_common/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib_common/src/main/AndroidManifest.xml b/lib_common/src/main/AndroidManifest.xml
index cca80d3..8039311 100644
--- a/lib_common/src/main/AndroidManifest.xml
+++ b/lib_common/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
 
     <application>
         <meta-data
-            android:name=".glide.OkHttpGlideModule"
+            android:name="com.guiying.module.common.glide.OkHttpGlideModule"
             android:value="GlideModule" />
 
     </application>

From cf8cb5ca4ccfabdf32cc3e000f3eb9d87657215a Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Sat, 30 Sep 2017 14:17:51 +0800
Subject: [PATCH 13/38] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9ClassUtils?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=B8=8B=E5=AF=BB=E6=89=BE=E7=B1=BB=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/common/base/BaseActivity.java      | 76 ++++++++++-----
 .../module/common/base/BaseApplication.java   | 10 +-
 .../module/common/base/BaseFragment.java      | 53 +++++++---
 .../module/common/base/ClassUtils.java        | 97 +++++++++++--------
 .../module/common/http/HttpClient.java        |  2 +-
 5 files changed, 156 insertions(+), 82 deletions(-)

diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java
index a108bb5..340afa2 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java
@@ -19,26 +19,6 @@
  */
 public abstract class BaseActivity extends AppCompatActivity {
 
-    /**
-     * Setup the toolbar.
-     *
-     * @param toolbar   toolbar
-     * @param hideTitle 是否隐藏Title
-     */
-    protected void setupToolBar(Toolbar toolbar, boolean hideTitle) {
-        setSupportActionBar(toolbar);
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setHomeAsUpIndicator(R.drawable.ic_arrow_back);
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setDisplayShowHomeEnabled(true);
-            if (hideTitle) {
-                //隐藏Title
-                actionBar.setDisplayShowTitleEnabled(false);
-            }
-        }
-    }
-
 
     /**
      * 封装的findViewByID方法
@@ -48,6 +28,7 @@ protected void setupToolBar(Toolbar toolbar, boolean hideTitle) {
         return (T) super.findViewById(id);
     }
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -67,7 +48,34 @@ public boolean onSupportNavigateUp() {
         return true;
     }
 
-    //添加fragment
+
+    /**
+     * Setup the toolbar.
+     *
+     * @param toolbar   toolbar
+     * @param hideTitle 是否隐藏Title
+     */
+    protected void setupToolBar(Toolbar toolbar, boolean hideTitle) {
+        setSupportActionBar(toolbar);
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setHomeAsUpIndicator(R.drawable.ic_arrow_back);
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setDisplayShowHomeEnabled(true);
+            if (hideTitle) {
+                //隐藏Title
+                actionBar.setDisplayShowTitleEnabled(false);
+            }
+        }
+    }
+
+
+    /**
+     * 添加fragment
+     *
+     * @param fragment
+     * @param frameId
+     */
     protected void addFragment(BaseFragment fragment, @IdRes int frameId) {
         Utils.checkNotNull(fragment);
         getSupportFragmentManager().beginTransaction()
@@ -77,7 +85,12 @@ protected void addFragment(BaseFragment fragment, @IdRes int frameId) {
 
     }
 
-    //替换fragment
+
+    /**
+     * 替换fragment
+     * @param fragment
+     * @param frameId
+     */
     protected void replaceFragment(BaseFragment fragment, @IdRes int frameId) {
         Utils.checkNotNull(fragment);
         getSupportFragmentManager().beginTransaction()
@@ -87,7 +100,11 @@ protected void replaceFragment(BaseFragment fragment, @IdRes int frameId) {
 
     }
 
-    //隐藏fragment
+
+    /**
+     * 隐藏fragment
+     * @param fragment
+     */
     protected void hideFragment(BaseFragment fragment) {
         Utils.checkNotNull(fragment);
         getSupportFragmentManager().beginTransaction()
@@ -97,7 +114,10 @@ protected void hideFragment(BaseFragment fragment) {
     }
 
 
-    //显示fragment
+    /**
+     * 显示fragment
+     * @param fragment
+     */
     protected void showFragment(BaseFragment fragment) {
         Utils.checkNotNull(fragment);
         getSupportFragmentManager().beginTransaction()
@@ -107,6 +127,10 @@ protected void showFragment(BaseFragment fragment) {
     }
 
 
+    /**
+     * 移除fragment
+     * @param fragment
+     */
     protected void removeFragment(BaseFragment fragment) {
         Utils.checkNotNull(fragment);
         getSupportFragmentManager().beginTransaction()
@@ -116,7 +140,9 @@ protected void removeFragment(BaseFragment fragment) {
     }
 
 
-    //移除fragment
+    /**
+     * 弹出栈顶部的Fragment
+     */
     protected void popFragment() {
         if (getSupportFragmentManager().getBackStackEntryCount() > 1) {
             getSupportFragmentManager().popBackStack();
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
index fc5ebbd..bd692aa 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
@@ -13,7 +13,6 @@
  * 组件中实现的Application必须在debug包中的AndroidManifest.xml中注册，否则无法使用；
  * 组件的Application需置于java/debug文件夹中，不得放于主代码；
  * 组件中获取Context的方法必须为:Utils.getContext()，不允许其他写法；
- * BaseApplication主要用来管理全局Activity;
  *
  * @author 2016/12/2 17:02
  * @version V1.0.0
@@ -25,7 +24,7 @@ public class BaseApplication extends Application {
 
     private static BaseApplication sInstance;
 
-    private List<ApplicationDelegate> delegateList;
+    private List<ApplicationDelegate> mAppDelegateList;
 
 
     public static BaseApplication getIns() {
@@ -36,12 +35,13 @@ public static BaseApplication getIns() {
     public void onCreate() {
         super.onCreate();
         sInstance = this;
+        Logger.init("pattern").logLevel(LogLevel.FULL);
         Utils.init(this);
-        delegateList = ClassUtils.getObjectsWithInterface(this, ApplicationDelegate.class, ROOT_PACKAGE);
-        for (ApplicationDelegate delegate : delegateList) {
+        mAppDelegateList = ClassUtils.getObjectsWithInterface(this, ApplicationDelegate.class, ROOT_PACKAGE);
+        for (ApplicationDelegate delegate : mAppDelegateList) {
             delegate.onCreate();
         }
-        Logger.init("pattern").logLevel(LogLevel.FULL);
+
     }
 
 
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java
index a957ff1..116ab50 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java
@@ -10,12 +10,6 @@ public abstract class BaseFragment extends Fragment {
 
     protected BaseActivity mActivity;
 
-
-    //获取宿主Activity
-    protected BaseActivity getHoldingActivity() {
-        return mActivity;
-    }
-
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -23,33 +17,68 @@ public void onAttach(Context context) {
     }
 
 
-    //添加fragment
+    /**
+     * 获取宿主Activity
+     *
+     * @return BaseActivity
+     */
+    protected BaseActivity getHoldingActivity() {
+        return mActivity;
+    }
+
+
+    /**
+     * 添加fragment
+     *
+     * @param fragment
+     * @param frameId
+     */
     protected void addFragment(BaseFragment fragment, @IdRes int frameId) {
         Utils.checkNotNull(fragment);
         getHoldingActivity().addFragment(fragment, frameId);
 
     }
 
-    //替换fragment
+
+    /**
+     * 替换fragment
+     *
+     * @param fragment
+     * @param frameId
+     */
     protected void replaceFragment(BaseFragment fragment, @IdRes int frameId) {
         Utils.checkNotNull(fragment);
         getHoldingActivity().replaceFragment(fragment, frameId);
     }
 
-    //隐藏fragment
+
+    /**
+     * 隐藏fragment
+     *
+     * @param fragment
+     */
     protected void hideFragment(BaseFragment fragment) {
         Utils.checkNotNull(fragment);
         getHoldingActivity().hideFragment(fragment);
     }
 
 
-    //显示fragment
+    /**
+     * 显示fragment
+     *
+     * @param fragment
+     */
     protected void showFragment(BaseFragment fragment) {
         Utils.checkNotNull(fragment);
         getHoldingActivity().showFragment(fragment);
     }
 
 
+    /**
+     * 移除Fragment
+     *
+     * @param fragment
+     */
     protected void removeFragment(BaseFragment fragment) {
         Utils.checkNotNull(fragment);
         getHoldingActivity().removeFragment(fragment);
@@ -57,7 +86,9 @@ protected void removeFragment(BaseFragment fragment) {
     }
 
 
-    //移除fragment
+    /**
+     * 弹出栈顶部的Fragment
+     */
     protected void popFragment() {
         getHoldingActivity().popFragment();
     }
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java b/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
index 1033887..d767f26 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
@@ -1,7 +1,5 @@
 package com.guiying.module.common.base;
 
-// Copy from galaxy sdk ${com.alibaba.android.galaxy.utils.ClassUtils}
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
@@ -9,7 +7,7 @@
 import android.os.Build;
 import android.util.Log;
 
-import com.alibaba.android.arouter.launcher.ARouter;
+import com.guiying.module.common.utils.Utils;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,17 +21,13 @@
 
 import dalvik.system.DexFile;
 
-import static com.alibaba.android.arouter.launcher.ARouter.logger;
-import static com.alibaba.android.arouter.utils.Consts.TAG;
-
 /**
+ * Copy from galaxy sdk ${com.alibaba.android.galaxy.utils.ClassUtils}
  * Scanner, find out class with any conditions, copy from google source code.
- *
- * @author 正纬 <a href="mailto:zhilong.liu@aliyun.com">Contact me.</a>
- * @version 1.0
- * @since 16/6/27 下午10:58
  */
 public class ClassUtils {
+    private static final String TAG = "ClassUtils";
+
     private static final String EXTRACTED_NAME_EXT = ".classes";
     private static final String EXTRACTED_SUFFIX = ".zip";
 
@@ -50,10 +44,19 @@ private static SharedPreferences getMultiDexPreferences(Context context) {
     }
 
 
+    /**
+     * 获取单一路径下所有实现了接口的类对象
+     *
+     * @param context U know
+     * @param clazz   接口
+     * @param path    包路径
+     * @param <T>     U know
+     * @return 对象列表
+     */
     public static <T> List<T> getObjectsWithInterface(Context context, Class<T> clazz, String path) {
         List<T> objectList = new ArrayList<>();
         try {
-            // These class was generate by arouter-compiler.
+            //找出所有路径中的类名，主要用于各个组件根包名一致的情况
             List<String> classFileNames = getFileNameByPackageName(context, path);
 
             for (String className : classFileNames) {
@@ -64,35 +67,48 @@ public static <T> List<T> getObjectsWithInterface(Context context, Class<T> claz
             }
 
             if (objectList.size() == 0) {
-                logger.error(TAG, "No files were found, check your configuration please!");
+                Log.e(TAG, "No files were found, check your configuration please!");
             }
         } catch (Exception e) {
             e.getStackTrace();
-            Log.e("ARouter", "getObjectsWithInterface error, " + e.getMessage());
+            Log.e(TAG, "getObjectsWithInterface error, " + e.getMessage());
         }
 
         return objectList;
     }
 
+
+    /**
+     * 获取多路径下所有实现了接口的类对象
+     *
+     * @param context  U know
+     * @param clazz    接口
+     * @param pathList 包路径列表
+     * @param <T>      U know
+     * @return 对象列表
+     */
     public static <T> List<T> getObjectsWithInterface(Context context, Class<T> clazz, List<String> pathList) {
         List<T> objectList = new ArrayList<>();
-//        try {
-//            // These class was generate by arouter-compiler.
-//            List<String> classFileNames = getFileNameByPackageName(context, path);
-//
-//            for (String className : classFileNames) {
-//                Class aClass = Class.forName(className);
-//                if (clazz.isAssignableFrom(aClass) && !clazz.equals(aClass) && !aClass.isInterface()) {
-//                    objectList.add((T) Class.forName(className).getConstructor().newInstance());
-//                }
-//            }
-//
-//            if (objectList.size() == 0) {
-//                logger.error(TAG, "No files were found, check your configuration please!");
-//            }
-//        } catch (Exception e) {
-//            e.getStackTrace();
-//        }
+        try {
+            for (String path : pathList) {
+                //找出所有路径中的类名，主要用于各个组件根包名不一致的情况
+                List<String> classFileNames = getFileNameByPackageName(context, path);
+
+                for (String className : classFileNames) {
+                    Class aClass = Class.forName(className);
+                    if (clazz.isAssignableFrom(aClass) && !clazz.equals(aClass) && !aClass.isInterface()) {
+                        objectList.add((T) Class.forName(className).getConstructor().newInstance());
+                    }
+                }
+            }
+
+            if (objectList.size() == 0) {
+                Log.e(TAG, "No files were found, check your configuration please!");
+            }
+        } catch (Exception e) {
+            e.getStackTrace();
+            Log.e(TAG, "getObjectsWithInterface error, " + e.getMessage());
+        }
 
         return objectList;
     }
@@ -125,7 +141,7 @@ public static List<String> getFileNameByPackageName(Context context, String pack
                     }
                 }
             } catch (Throwable ignore) {
-                Log.e("ARouter", "Scan map file in dex files made error.", ignore);
+                Log.e(TAG, "Scan map file in dex files made error.", ignore);
             } finally {
                 if (null != dexfile) {
                     try {
@@ -136,7 +152,7 @@ public static List<String> getFileNameByPackageName(Context context, String pack
             }
         }
 
-        Log.d("ARouter", "Filter " + classNames.size() + " classes by packageName <" + packageName + ">");
+        Log.d(TAG, "Filter " + classNames.size() + " classes by packageName <" + packageName + ">");
         return classNames;
     }
 
@@ -145,8 +161,8 @@ public static List<String> getFileNameByPackageName(Context context, String pack
      *
      * @param context the application context
      * @return all the dex path
-     * @throws PackageManager.NameNotFoundException
-     * @throws IOException
+     * @throws PackageManager.NameNotFoundException Exception
+     * @throws IOException                          Exception
      */
     public static List<String> getSourcePaths(Context context) throws PackageManager.NameNotFoundException, IOException {
         ApplicationInfo applicationInfo = context.getPackageManager().getApplicationInfo(context.getPackageName(), 0);
@@ -158,8 +174,8 @@ public static List<String> getSourcePaths(Context context) throws PackageManager
         //the prefix of extracted file, ie: test.classes
         String extractedFilePrefix = sourceApk.getName() + EXTRACTED_NAME_EXT;
 
-//        如果VM已经支持了MultiDex，就不要去Secondary Folder加载 Classesx.zip了，那里已经么有了
-//        通过是否存在sp中的multidex.version是不准确的，因为从低版本升级上来的用户，是包含这个sp配置的
+        //如果VM已经支持了MultiDex，就不要去Secondary Folder加载 Classesx.zip了，那里已经么有了
+        //通过是否存在sp中的multidex.version是不准确的，因为从低版本升级上来的用户，是包含这个sp配置的
         if (!isVMMultidexCapable()) {
             //the total dex numbers
             int totalDexNumber = getMultiDexPreferences(context).getInt(KEY_DEX_NUMBER, 1);
@@ -178,7 +194,8 @@ public static List<String> getSourcePaths(Context context) throws PackageManager
             }
         }
 
-        if (ARouter.debuggable()) { // Search instant run support only debuggable
+        if (Utils.isAppDebug()) {
+            // Search instant run support only debuggable
             sourcePaths.addAll(tryLoadInstantRunDexFile(applicationInfo));
         }
         return sourcePaths;
@@ -193,7 +210,7 @@ private static List<String> tryLoadInstantRunDexFile(ApplicationInfo application
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && null != applicationInfo.splitSourceDirs) {
             // add the splite apk, normally for InstantRun, and newest version.
             instantRunSourcePaths.addAll(Arrays.asList(applicationInfo.splitSourceDirs));
-            Log.d("ARouter", "Found InstantRun support");
+            Log.d(TAG, "Found InstantRun support");
         } else {
             try {
                 // This man is reflection from Google instant run sdk, he will tell me where the dex files go.
@@ -209,11 +226,11 @@ private static List<String> tryLoadInstantRunDexFile(ApplicationInfo application
                             instantRunSourcePaths.add(file.getAbsolutePath());
                         }
                     }
-                    Log.d("ARouter", "Found InstantRun support");
+                    Log.d(TAG, "Found InstantRun support");
                 }
 
             } catch (Exception e) {
-                Log.e("ARouter", "InstantRun support error, " + e.getMessage());
+                Log.e(TAG, "InstantRun support error, " + e.getMessage());
             }
         }
 
diff --git a/lib_common/src/main/java/com/guiying/module/common/http/HttpClient.java b/lib_common/src/main/java/com/guiying/module/common/http/HttpClient.java
index ce38bfa..2be900b 100644
--- a/lib_common/src/main/java/com/guiying/module/common/http/HttpClient.java
+++ b/lib_common/src/main/java/com/guiying/module/common/http/HttpClient.java
@@ -141,7 +141,7 @@ public void onResponse(Call<ResponseBody> call, Response<ResponseBody> response)
                     try {
                         String result = response.body().string();
                         parseData(result, builder.clazz, builder.bodyType, onResultListener);
-                    } catch (IOException e) {
+                    } catch (IOException | IllegalStateException e) {
                         e.printStackTrace();
                     }
                 }

From 37ea9ccd5800a6cff34bf8d806b8a7f6e00601c9 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Sat, 30 Sep 2017 14:23:20 +0800
Subject: [PATCH 14/38] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9BaseApplicati?=
 =?UTF-8?q?on=E7=B1=BB=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/common/base/BaseApplication.java   | 22 +++++++++++++++++++
 .../module/main/BottomNavigationActivity.java |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
index bd692aa..b8d634a 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
@@ -41,8 +41,30 @@ public void onCreate() {
         for (ApplicationDelegate delegate : mAppDelegateList) {
             delegate.onCreate();
         }
+    }
 
+    @Override
+    public void onTerminate() {
+        super.onTerminate();
+        for (ApplicationDelegate delegate : mAppDelegateList) {
+            delegate.onTerminate();
+        }
     }
 
 
+    @Override
+    public void onLowMemory() {
+        super.onLowMemory();
+        for (ApplicationDelegate delegate : mAppDelegateList) {
+            delegate.onLowMemory();
+        }
+    }
+
+    @Override
+    public void onTrimMemory(int level) {
+        super.onTrimMemory(level);
+        for (ApplicationDelegate delegate : mAppDelegateList) {
+            delegate.onTrimMemory(level);
+        }
+    }
 }
diff --git a/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java b/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java
index f0d0a35..9af5f0c 100644
--- a/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java
+++ b/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java
@@ -39,7 +39,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                 mPager.setCurrentItem(1);
                 return true;
             } else if (i == R.id.navigation_notifications) {
-                mPager.setCurrentItem(2);
+                mPager.setCurrentItem(0);
                 return true;
             }
             return false;

From 38a63a7b3363bb4dbd1ee4527fda467798198647 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Sat, 30 Sep 2017 14:32:55 +0800
Subject: [PATCH 15/38] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9README?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   5 +-
 .../module/common/glide/ImageUtils.java       | 133 ++++++++++++++++++
 screenshots/Screenshot_4.png                  | Bin 0 -> 11673 bytes
 3 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100644 lib_common/src/main/java/com/guiying/module/common/glide/ImageUtils.java
 create mode 100644 screenshots/Screenshot_4.png

diff --git a/README.md b/README.md
index ed413cd..3f0cc4c 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@
         <td><img src="/screenshots/Screenshot_1.png"></td>
         <td><img src="/screenshots/Screenshot_2.png"></td>
         <td><img src="/screenshots/Screenshot_3.png"></td>
+        <td><img src="/screenshots/Screenshot_4.png"></td>
     </tr>
 </table>
 
@@ -14,8 +15,7 @@ Android项目组件化示例代码
 
 **Android组件化方案**：http://blog.csdn.net/guiying712/article/details/55213884
 
-Android组件化方案中的路由使用了ActivityRouter，但是因为ActivityRouter对于初学者不太友好，
-总是出现莫名其妙的错误，因此现在的 AndroidModulePattern 已经改为使用 阿里ARouter作为路由。
+现在的 AndroidModulePattern 使用 阿里ARouter作为路由，并且已经支持**Fragment组件化**，使用方法请下载Demo查看。
 
 ## 集成开发模式和组件开发模式转换
 
@@ -31,6 +31,7 @@ Android组件化方案中的路由使用了ActivityRouter，但是因为Activity
 1. 配置整个项目的Gradle脚本，例如 混淆、签名等；
 2. app组件中可以初始化全局的库，例如Lib.init(this);
 3. 添加 multiDex 功能
+4. 业务组件管理（组装）；
 
 ### main组件功能（业务组件）：
 1. 声明应用的launcherActivity----->android.intent.category.LAUNCHER；
diff --git a/lib_common/src/main/java/com/guiying/module/common/glide/ImageUtils.java b/lib_common/src/main/java/com/guiying/module/common/glide/ImageUtils.java
new file mode 100644
index 0000000..6bd37ee
--- /dev/null
+++ b/lib_common/src/main/java/com/guiying/module/common/glide/ImageUtils.java
@@ -0,0 +1,133 @@
+package com.guiying.module.common.glide;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.drawable.GlideDrawable;
+import com.bumptech.glide.request.animation.GlideAnimation;
+import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
+import com.bumptech.glide.request.target.SimpleTarget;
+import com.guiying.module.common.utils.Utils;
+
+/**
+ * <p> 图片加载工具类</p>
+ *
+ * @name ImageUtils
+ */
+public class ImageUtils {
+
+    /**
+     * 默认加载
+     */
+    public static void loadImageView(String path, ImageView mImageView) {
+        Glide.with(mImageView.getContext()).load(path).into(mImageView);
+    }
+
+    public static void loadImageWithError(String path, int errorRes, ImageView mImageView) {
+        Glide.with(mImageView.getContext())
+                .load(path)
+                .crossFade()
+                .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                .error(errorRes)
+                .into(mImageView);
+    }
+
+    /**
+     * 设置加载中以及加载失败图片
+     */
+    public static void loadImageWithLoading(String path, ImageView mImageView, int lodingImage, int errorRes) {
+        Glide.with(mImageView.getContext()).load(path).placeholder(lodingImage).
+                error(errorRes).into(mImageView);
+    }
+
+    /**
+     * 设置加载动画
+     * api也提供了几个常用的动画：比如crossFade()
+     */
+    public static void loadImageViewAnim(String path, int anim, ImageView mImageView) {
+        Glide.with(mImageView.getContext()).load(path).animate(anim).into(mImageView);
+    }
+
+
+    /**
+     * 加载为bitmap
+     *
+     * @param path     图片地址
+     * @param listener 回调
+     */
+    public static void loadBitMap(String path, final onLoadBitmap listener) {
+        Glide.with(Utils.getContext()).load(path).asBitmap().into(new SimpleTarget<Bitmap>() {
+
+            @Override
+            public void onResourceReady(Bitmap bitmap, GlideAnimation<? super Bitmap> glideAnimation) {
+                listener.onReady(bitmap);
+            }
+
+            @Override
+            public void onLoadFailed(Exception e, Drawable errorDrawable) {
+                listener.onFailed();
+            }
+        });
+    }
+
+    /**
+     * 显示加载进度
+     *
+     * @param path       图片地址
+     * @param mImageView 图片控件
+     * @param loadView   加载view
+     */
+    public static void loadImageWithProgress(String path, final ImageView mImageView, final View loadView, int errorRes) {
+        Glide.with(mImageView.getContext()).load(path).error(errorRes).into(new GlideDrawableImageViewTarget(mImageView) {
+            @Override
+            public void onResourceReady(GlideDrawable resource, GlideAnimation<? super GlideDrawable> animation) {
+                super.onResourceReady(resource, animation);
+                loadView.setVisibility(View.GONE);
+            }
+
+            @Override
+            public void onLoadFailed(Exception e, Drawable errorDrawable) {
+                super.onLoadFailed(e, errorDrawable);
+                loadView.setVisibility(View.GONE);
+            }
+        });
+    }
+
+    /**
+     * 清除view上的图片
+     *
+     * @param view 视图
+     */
+    public static void clearImageView(View view) {
+        Glide.clear(view);
+    }
+
+    /**
+     * 清理磁盘缓存需要在子线程中执行
+     */
+    public static void GuideClearDiskCache(Context mContext) {
+        Glide.get(mContext).clearDiskCache();
+    }
+
+    /**
+     * 清理内存缓存可以在UI主线程中进行
+     */
+    public static void GuideClearMemory(Context mContext) {
+        Glide.get(mContext).clearMemory();
+    }
+
+    /**
+     * 加载bitmap回调
+     */
+    public interface onLoadBitmap {
+        void onReady(Bitmap resource);
+
+        void onFailed();
+    }
+
+}
\ No newline at end of file
diff --git a/screenshots/Screenshot_4.png b/screenshots/Screenshot_4.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f930e4be5a1468ed0841db7a763286ceee7fe07
GIT binary patch
literal 11673
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
Ja-C-p{{txN&iw!Y

literal 0
HcmV?d00001


From a97a6f47e02823894013c5f5a3fe5e2bbb95dbf8 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Sat, 30 Sep 2017 14:43:35 +0800
Subject: [PATCH 16/38] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9README?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   4 +++-
 .../src/main/res/layout/fragment_girls.xml    |   2 +-
 module_main/src/main/AndroidManifest.xml      |   2 +-
 module_main/src/main/res/values/strings.xml   |   8 ++++----
 .../src/main/res/layout/fragment_news.xml     |   2 +-
 screenshots/Screenshot_4.png                  | Bin 11673 -> 10626 bytes
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 3f0cc4c..bdbc160 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,9 @@ Android项目组件化示例代码
 
 **Android组件化方案**：http://blog.csdn.net/guiying712/article/details/55213884
 
-现在的 AndroidModulePattern 使用 阿里ARouter作为路由，并且已经支持**Fragment组件化**，使用方法请下载Demo查看。
+1、现在的 AndroidModulePattern 使用 阿里ARouter作为路由；
+2、Android组件化方案已经支持 **Fragment组件化**，使用方法请下载Demo查看；
+3、目前Android组件化方案还没有写完，后续会**继续更新**，完善组件化方案。
 
 ## 集成开发模式和组件开发模式转换
 
diff --git a/module_girls/src/main/res/layout/fragment_girls.xml b/module_girls/src/main/res/layout/fragment_girls.xml
index 58d2d5e..9566606 100644
--- a/module_girls/src/main/res/layout/fragment_girls.xml
+++ b/module_girls/src/main/res/layout/fragment_girls.xml
@@ -7,6 +7,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
-        android:text=" 这里是女孩 " />
+        android:text=" 我是来自Girls组件的Fragment " />
 
 </FrameLayout>
diff --git a/module_main/src/main/AndroidManifest.xml b/module_main/src/main/AndroidManifest.xml
index 7601b45..db12695 100644
--- a/module_main/src/main/AndroidManifest.xml
+++ b/module_main/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         </activity>
         <activity
             android:name=".BottomNavigationActivity"
-            android:label="@string/title_activity_bottom_navigation">
+            android:label="@string/title_activity_fragment_module">
 
         </activity>
     </application>
diff --git a/module_main/src/main/res/values/strings.xml b/module_main/src/main/res/values/strings.xml
index 177710e..ca0b880 100644
--- a/module_main/src/main/res/values/strings.xml
+++ b/module_main/src/main/res/values/strings.xml
@@ -2,9 +2,9 @@
     <string name="app_main">main组件</string>
 
     <string name="app_exit_hint">再按一次退出程序</string>
-    <string name="title_activity_bottom_navigation">BottomNavigationActivity</string>
-    <string name="title_home">Home</string>
-    <string name="title_dashboard">Dashboard</string>
-    <string name="title_notifications">Notifications</string>
+    <string name="title_activity_fragment_module">Fragment组件化</string>
+    <string name="title_home">news</string>
+    <string name="title_dashboard">girls</string>
+    <string name="title_notifications">预留</string>
 
 </resources>
diff --git a/module_news/src/main/res/layout/fragment_news.xml b/module_news/src/main/res/layout/fragment_news.xml
index b00a5e4..d0e7792 100644
--- a/module_news/src/main/res/layout/fragment_news.xml
+++ b/module_news/src/main/res/layout/fragment_news.xml
@@ -9,6 +9,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center"
-        android:text="这里是新闻 " />
+        android:text="我是来自news组件的Fragment " />
 
 </FrameLayout>
diff --git a/screenshots/Screenshot_4.png b/screenshots/Screenshot_4.png
index 6f930e4be5a1468ed0841db7a763286ceee7fe07..3c7b130a3619db95f6149a3c695325d22f621768 100644
GIT binary patch
literal 10626
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
Ze_Ar0&^%wmT{p>Nc-Qz2LGMY#e*nuMMJxaS

literal 11673
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
Ja-C-p{{txN&iw!Y


From c4870b64fa781d511ec451f92482268e65e341a3 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Sat, 30 Sep 2017 17:53:42 +0800
Subject: [PATCH 17/38] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9README?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                    |   8 +++++---
 screenshots/Screenshot_1.png | Bin 11474 -> 8950 bytes
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bdbc160..20d96c0 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,12 @@
 Android项目组件化示例代码
 
 **Android组件化方案**：http://blog.csdn.net/guiying712/article/details/55213884
+**Android组件化之终极方案**：http://blog.csdn.net/guiying712/article/details/78057120
+
+1. 现在的 AndroidModulePattern 使用 阿里ARouter作为路由；
+2. Android组件化方案已经支持 **Fragment组件化**，使用方法请下载Demo查看；
+3. 目前Android组件化方案还没有写完，后续会**继续更新**，完善组件化方案。
 
-1、现在的 AndroidModulePattern 使用 阿里ARouter作为路由；
-2、Android组件化方案已经支持 **Fragment组件化**，使用方法请下载Demo查看；
-3、目前Android组件化方案还没有写完，后续会**继续更新**，完善组件化方案。
 
 ## 集成开发模式和组件开发模式转换
 
diff --git a/screenshots/Screenshot_1.png b/screenshots/Screenshot_1.png
index 024993d47f84034fe4e79c2f13ef157f0ee0b7cf..4edf537621af79fb72843975519e5b5e6800f630 100644
GIT binary patch
literal 8950
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
Ht*8G1pCP%t

literal 11474
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
QkR`5Ma=3`H{`>C#03>S}$p8QV


From 7e403d3f96030449773ab36d52c76630ff1fd025 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Tue, 12 Dec 2017 15:00:55 +0800
Subject: [PATCH 18/38] =?UTF-8?q?1=EF=BC=9A=E9=80=82=E9=85=8DAndroid=20Stu?=
 =?UTF-8?q?dio=203.0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  5 ++
 build.gradle                                  | 39 ++-------
 gradle.properties                             |  4 +-
 keystore.properties                           |  4 +
 lib_common/build.gradle                       | 33 ++++----
 .../common/base/ApplicationDelegate.java      |  2 -
 .../module/common/base/BaseApplication.java   |  1 +
 .../module/common/base/ClassUtils.java        |  5 +-
 .../module/common/utils/ScreenLockUtil.java   | 84 +++++++++++++++++++
 module_app/build.gradle                       | 32 ++++---
 module_girls/build.gradle                     |  6 +-
 module_main/build.gradle                      |  8 +-
 module_news/build.gradle                      |  7 +-
 .../com/guiying/module/news/MyDelegate.java   |  4 +-
 versions.gradle                               | 27 ++++++
 15 files changed, 173 insertions(+), 88 deletions(-)
 create mode 100644 keystore.properties
 create mode 100644 lib_common/src/main/java/com/guiying/module/common/utils/ScreenLockUtil.java
 create mode 100644 versions.gradle

diff --git a/README.md b/README.md
index 20d96c0..958f54a 100644
--- a/README.md
+++ b/README.md
@@ -14,12 +14,17 @@
 Android项目组件化示例代码
 
 **Android组件化方案**：http://blog.csdn.net/guiying712/article/details/55213884
+
 **Android组件化之终极方案**：http://blog.csdn.net/guiying712/article/details/78057120
 
 1. 现在的 AndroidModulePattern 使用 阿里ARouter作为路由；
+
 2. Android组件化方案已经支持 **Fragment组件化**，使用方法请下载Demo查看；
+
 3. 目前Android组件化方案还没有写完，后续会**继续更新**，完善组件化方案。
 
+4. 本项目已适配Android Studio 3.0.1版本(Google仓库会带来一定影响)
+
 
 ## 集成开发模式和组件开发模式转换
 
diff --git a/build.gradle b/build.gradle
index 3874a63..3c67d3c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    apply from: '/versions.gradle'
+
     repositories {
+        google()
         jcenter()
-        mavenCentral()
     }
-
     dependencies {
         //classpath "com.android.tools.build:gradle:$localGradlePluginVersion"
         //$localGradlePluginVersion是gradle.properties中的数据
@@ -15,10 +16,9 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
-        mavenCentral()
-        //Add the JitPack repository
-        maven { url "https://jitpack.io" }
+        maven { url 'https://jitpack.io' }
         //支持arr包
         flatDir {
             dirs 'libs'
@@ -30,32 +30,3 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-// Define versions in a single place
-//时间：2017.2.13；每次修改版本号都要添加修改时间
-ext {
-    // Sdk and tools
-    //localBuildToolsVersion是gradle.properties中的数据
-    buildToolsVersion = localBuildToolsVersion
-    compileSdkVersion = 25
-    minSdkVersion = 16
-    targetSdkVersion = 25
-    versionCode = 1
-    versionName = "1.0"
-    javaVersion = JavaVersion.VERSION_1_8
-
-    // App dependencies version
-    supportLibraryVersion = "25.3.1"
-    retrofitVersion = "2.1.0"
-    glideVersion = "3.7.0"
-    loggerVersion = "1.15"
-    eventbusVersion = "3.0.0"
-    gsonVersion = "2.8.0"
-    photoViewVersion = "2.0.0"
-
-    //检查时间：2017.6.6
-    annotationProcessor = "1.0.3"
-    routerVersion = "1.2.1.1"
-    easyRecyclerVersion = "4.4.0"
-    cookieVersion = "v1.0.1"
-    toastyVersion = "1.1.3"
-}
diff --git a/gradle.properties b/gradle.properties
index d817325..9b51cd5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,10 +18,8 @@ org.gradle.jvmargs=-Xmx2048m
 org.gradle.daemon=true
 org.gradle.configureondemand=true
 org.gradle.parallel=true
-# Ϊ�Զ�����������(��Ϊÿ�������ĵ��Ի�����һ��)
-localBuildToolsVersion=25.0.3
 # ���ֵһ������AndroidStudio�汾��һ��
-localGradlePluginVersion=2.3.3
+localGradlePluginVersion=3.0.1
 
 # ÿ�θ��ġ�isModule����ֵ����Ҫ��� "Sync Project" ��ť
 # isModule�ǡ����ɿ���ģʽ���͡��������ģʽ�����л�����
diff --git a/keystore.properties b/keystore.properties
new file mode 100644
index 0000000..dabd93e
--- /dev/null
+++ b/keystore.properties
@@ -0,0 +1,4 @@
+storePassword=guiying712
+keyPassword=guiying712
+keyAlias=guiying712
+storeFile=/mykey.jks
\ No newline at end of file
diff --git a/lib_common/build.gradle b/lib_common/build.gradle
index 1ec98ca..4834e39 100644
--- a/lib_common/build.gradle
+++ b/lib_common/build.gradle
@@ -2,8 +2,6 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
@@ -13,25 +11,26 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    api fileTree(dir: 'libs', include: ['*.jar'])
     //Android Support
-    compile "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
-    compile "com.android.support:design:$rootProject.supportLibraryVersion"
-    compile "com.android.support:percent:$rootProject.supportLibraryVersion"
+    api "com.android.support:support-v4:$rootProject.supportLibraryVersion"
+    api "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
+    api "com.android.support:design:$rootProject.supportLibraryVersion"
+    api "com.android.support:percent:$rootProject.supportLibraryVersion"
     //网络请求相关
-    compile "com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion"
-    compile "com.squareup.retrofit2:retrofit-mock:$rootProject.retrofitVersion"
-    compile "com.github.franmontiel:PersistentCookieJar:$rootProject.cookieVersion"
+    api "com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion"
+    api "com.squareup.retrofit2:retrofit-mock:$rootProject.retrofitVersion"
+    api "com.github.franmontiel:PersistentCookieJar:$rootProject.cookieVersion"
     //稳定的
-    compile "com.github.bumptech.glide:glide:$rootProject.glideVersion"
-    compile "com.orhanobut:logger:$rootProject.loggerVersion"
-    compile "org.greenrobot:eventbus:$rootProject.eventbusVersion"
-    compile "com.google.code.gson:gson:$rootProject.gsonVersion"
-    compile "com.github.chrisbanes:PhotoView:$rootProject.photoViewVersion"
+    api "com.github.bumptech.glide:glide:$rootProject.glideVersion"
+    api "com.orhanobut:logger:$rootProject.loggerVersion"
+    api "org.greenrobot:eventbus:$rootProject.eventbusVersion"
+    api "com.google.code.gson:gson:$rootProject.gsonVersion"
+    api "com.github.chrisbanes:PhotoView:$rootProject.photoViewVersion"
 
-    compile "com.jude:easyrecyclerview:$rootProject.easyRecyclerVersion"
-    compile "com.github.GrenderG:Toasty:$rootProject.toastyVersion"
+    api "com.jude:easyrecyclerview:$rootProject.easyRecyclerVersion"
+    api "com.github.GrenderG:Toasty:$rootProject.toastyVersion"
 
     //router
-    compile "com.alibaba:arouter-api:$rootProject.routerVersion"
+    api "com.alibaba:arouter-api:$rootProject.routerVersion"
 }
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java b/lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java
index 1e98f86..dd671fb 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java
@@ -7,8 +7,6 @@
  * @version V2.8.3
  * @name ApplicationDelegate
  */
-
-
 public interface ApplicationDelegate {
 
     void onCreate();
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
index b8d634a..9b46d73 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
@@ -41,6 +41,7 @@ public void onCreate() {
         for (ApplicationDelegate delegate : mAppDelegateList) {
             delegate.onCreate();
         }
+
     }
 
     @Override
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java b/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
index d767f26..2b6862c 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
@@ -53,7 +53,8 @@ private static SharedPreferences getMultiDexPreferences(Context context) {
      * @param <T>     U know
      * @return 对象列表
      */
-    public static <T> List<T> getObjectsWithInterface(Context context, Class<T> clazz, String path) {
+    public static <T> List<T>
+    getObjectsWithInterface(Context context, Class<T> clazz, String path) {
         List<T> objectList = new ArrayList<>();
         try {
             //找出所有路径中的类名，主要用于各个组件根包名一致的情况
@@ -273,7 +274,7 @@ private static boolean isVMMultidexCapable() {
 
         }
 
-        Log.i("galaxy", "VM with name " + vmName + (isMultidexCapable ? " has multidex support" : " does not have multidex support"));
+        Log.i(TAG, "VM with name " + vmName + (isMultidexCapable ? " has multidex support" : " does not have multidex support"));
         return isMultidexCapable;
     }
 
diff --git a/lib_common/src/main/java/com/guiying/module/common/utils/ScreenLockUtil.java b/lib_common/src/main/java/com/guiying/module/common/utils/ScreenLockUtil.java
new file mode 100644
index 0000000..d85c106
--- /dev/null
+++ b/lib_common/src/main/java/com/guiying/module/common/utils/ScreenLockUtil.java
@@ -0,0 +1,84 @@
+package com.guiying.module.common.utils;
+
+import android.app.Activity;
+import android.app.KeyguardManager;
+import android.app.KeyguardManager.KeyguardLock;
+import android.content.Context;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+import android.util.Log;
+
+import java.util.HashMap;
+
+/**
+ * 用于保持屏幕高亮的工具
+ */
+public class ScreenLockUtil {
+    private static final String TAG = "ScreenLockUtil";
+
+    private ScreenLockUtil() {
+        throw new UnsupportedOperationException("cannot be instantiated");
+    }
+
+    static private HashMap<Activity, WakeLock> mWakeLockArray = new HashMap<>();
+    static private HashMap<Activity, Boolean> mIsUnlockArray = new HashMap<>();
+
+
+    /**
+     * 保持屏幕常亮
+     *
+     * @param activity you know
+     */
+    public static void keepScreenOn(Activity activity) {
+        WakeLock wakeLock = mWakeLockArray.get(activity);
+        if (wakeLock == null) {
+            PowerManager powerManager = (PowerManager) activity.getSystemService(Context.POWER_SERVICE);
+            wakeLock = powerManager.newWakeLock(PowerManager.ACQUIRE_CAUSES_WAKEUP | PowerManager.FULL_WAKE_LOCK,
+                    activity.getClass().getName());
+        }
+
+        if (!wakeLock.isHeld()) {
+            wakeLock.acquire();
+        }
+
+        mWakeLockArray.put(activity, wakeLock);
+
+        cancelLockScreen(activity);
+
+        Log.i(TAG, "开启屏幕常亮");
+    }
+
+
+    /**
+     * 取消屏幕常亮
+     *
+     * @param activity you know
+     */
+    public static void cancelKeepScreen(Activity activity) {
+        WakeLock wakeLock = mWakeLockArray.get(activity);
+        if (wakeLock != null) {
+            if (wakeLock.isHeld()) {
+                wakeLock.release();
+            }
+        }
+
+        Log.i(TAG, "取消屏幕常亮");
+    }
+
+    /**
+     * 取消锁屏限制
+     *
+     * @param activity you know
+     */
+    private static void cancelLockScreen(Activity activity) {
+        Boolean isUnlock = mIsUnlockArray.get(activity);
+        if (isUnlock != null && isUnlock) {
+            return;
+        }
+        KeyguardManager mKeyguardManager = (KeyguardManager) activity.getSystemService(Context.KEYGUARD_SERVICE);
+        KeyguardLock mKeyguardLock = mKeyguardManager.newKeyguardLock(activity.getClass().getName());
+        mKeyguardLock.disableKeyguard();
+
+        mIsUnlockArray.put(activity, true);
+    }
+}
diff --git a/module_app/build.gradle b/module_app/build.gradle
index 1e084f4..e092fcc 100644
--- a/module_app/build.gradle
+++ b/module_app/build.gradle
@@ -1,5 +1,13 @@
 apply plugin: 'com.android.application'
 
+// Create a variable called keystorePropertiesFile, and initialize it to your
+// keystore.properties file, in the rootProject folder.
+def keystorePropertiesFile = rootProject.file("keystore.properties")
+// Initialize a new Properties() object called keystoreProperties.
+def keystoreProperties = new Properties()
+// Load your keystore.properties file into the keystoreProperties object.
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
 static def buildTime() {
     return new Date().format("yyyyMMdd");
 }
@@ -7,15 +15,14 @@ static def buildTime() {
 android {
     signingConfigs {
         release {
-            keyAlias 'guiying712'
-            keyPassword 'guiying712'
-            storeFile file('/mykey.jks')
-            storePassword 'guiying712'
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
         }
     }
 
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
         applicationId "com.guiying.module"
         minSdkVersion rootProject.ext.minSdkVersion
@@ -60,13 +67,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:multidex:1.0.1'
-    if (isModule.toBoolean()) {
-        compile project(':lib_common')
-    } else {
-        compile project(':module_main')
-        compile project(':module_girls')
-        compile project(':module_news')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'com.android.support:multidex:1.0.2'
+    implementation project(':lib_common')
+    if (!isModule.toBoolean()) {
+        implementation project(':module_main')
+        implementation project(':module_girls')
+        implementation project(':module_news')
     }
 }
diff --git a/module_girls/build.gradle b/module_girls/build.gradle
index 4014b71..966fe3e 100644
--- a/module_girls/build.gradle
+++ b/module_girls/build.gradle
@@ -6,8 +6,6 @@ if (isModule.toBoolean()) {
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
@@ -39,7 +37,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
-    compile project(':lib_common')
+    implementation project(':lib_common')
 }
diff --git a/module_main/build.gradle b/module_main/build.gradle
index bba5baa..92534d4 100644
--- a/module_main/build.gradle
+++ b/module_main/build.gradle
@@ -6,8 +6,6 @@ if (isModule.toBoolean()) {
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
@@ -42,9 +40,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
-    compile project(':lib_common')
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:support-vector-drawable:25.3.1'
+    implementation project(':lib_common')
 }
diff --git a/module_news/build.gradle b/module_news/build.gradle
index 7c5b438..966fe3e 100644
--- a/module_news/build.gradle
+++ b/module_news/build.gradle
@@ -6,8 +6,6 @@ if (isModule.toBoolean()) {
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
@@ -39,8 +37,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
-    compile project(':lib_common')
-    compile 'com.android.support:support-v4:25.3.1'
+    implementation project(':lib_common')
 }
diff --git a/module_news/src/main/java/com/guiying/module/news/MyDelegate.java b/module_news/src/main/java/com/guiying/module/news/MyDelegate.java
index 30bbfac..f0aca07 100644
--- a/module_news/src/main/java/com/guiying/module/news/MyDelegate.java
+++ b/module_news/src/main/java/com/guiying/module/news/MyDelegate.java
@@ -2,6 +2,7 @@
 
 import com.guiying.module.common.base.ApplicationDelegate;
 import com.guiying.module.common.base.ViewManager;
+import com.orhanobut.logger.Logger;
 
 /**
  * <p>类说明</p>
@@ -10,12 +11,11 @@
  * @version V2.8.3
  * @name MyDelegate
  */
-
-
 public class MyDelegate implements ApplicationDelegate {
 
     @Override
     public void onCreate() {
+        Logger.init("pattern");
         ViewManager.getInstance().addFragment(0, new NewsFragment());
     }
 
diff --git a/versions.gradle b/versions.gradle
new file mode 100644
index 0000000..b0a4da9
--- /dev/null
+++ b/versions.gradle
@@ -0,0 +1,27 @@
+// Define versions in a single place
+//时间：2017.2.13；每次修改版本号都要添加修改时间
+rootProject.ext {
+    // Sdk and tools
+    compileSdkVersion = 25
+    minSdkVersion = 16
+    targetSdkVersion = 25
+    versionCode = 1
+    versionName = "1.0"
+    javaVersion = JavaVersion.VERSION_1_8
+
+    // App dependencies versions
+    supportLibraryVersion = "25.4.0"
+    retrofitVersion = "2.1.0"
+    glideVersion = "3.8.0"
+    loggerVersion = "1.15"
+    eventbusVersion = "3.0.0"
+    gsonVersion = "2.8.0"
+    photoViewVersion = "2.0.0"
+
+    //检查时间：2017.6.6
+    annotationProcessor = "1.0.3"
+    routerVersion = "1.2.1.1"
+    easyRecyclerVersion = "4.4.0"
+    cookieVersion = "v1.0.1"
+    toastyVersion = "1.1.3"
+}

From 1e677dee104c4c0be710a5dfe3ba084175574850 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Thu, 4 Jan 2018 22:06:04 +0800
Subject: [PATCH 19/38] =?UTF-8?q?1=EF=BC=9A=E9=87=8D=E5=86=99=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A8=A1=E5=9D=97=E7=9A=84Gradle=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle              |  42 ++++++-----
 lib_common/build.gradle   |  90 ++++++++++++++++-------
 module_app/build.gradle   |  18 +++--
 module_girls/build.gradle |  30 ++++++--
 module_main/build.gradle  |  31 +++++---
 module_news/build.gradle  |  30 ++++++--
 versions.gradle           | 151 +++++++++++++++++++++++++++++++-------
 7 files changed, 291 insertions(+), 101 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3c67d3c..40fe932 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,32 +1,38 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    apply from: '/versions.gradle'
-
-    repositories {
-        google()
-        jcenter()
-    }
+    apply from: 'versions.gradle'
+    addRepos(repositories)
     dependencies {
-        //classpath "com.android.tools.build:gradle:$localGradlePluginVersion"
-        //$localGradlePluginVersion是gradle.properties中的数据
-        classpath "com.android.tools.build:gradle:$localGradlePluginVersion"
+        /* classpath deps.android_gradle_plugin*/
+        classpath deps.android_gradle_plugin
+        classpath deps.kotlin.plugin
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
     }
 }
 
 allprojects {
-    repositories {
-        google()
-        jcenter()
-        maven { url 'https://jitpack.io' }
-        //支持arr包
-        flatDir {
-            dirs 'libs'
+    addRepos(repositories)
+    // Android dependency 'com.android.support:design' has different version for the compile (25.3.1) and runtime (25.4.0) classpath.
+    // You should manually set the same version via DependencyResolution
+    subprojects {
+        project.configurations.all {
+            resolutionStrategy.eachDependency { details ->
+                if (details.requested.group == 'com.android.support'
+                        && !details.requested.name.contains('multidex')) {
+                    details.useVersion  "27.0.2"
+                }
+            }
         }
     }
+
+    // 组件缓存更新时间设置（默认每次build都更新）
+    configurations.all {
+        resolutionStrategy.cacheChangingModulesFor 0, 'minutes'
+    }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
-
+}
\ No newline at end of file
diff --git a/lib_common/build.gradle b/lib_common/build.gradle
index 4834e39..87eb2af 100644
--- a/lib_common/build.gradle
+++ b/lib_common/build.gradle
@@ -1,36 +1,76 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion build_versions.target_sdk
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
+        minSdkVersion build_versions.min_sdk
+        targetSdkVersion build_versions.target_sdk
+        versionCode 1
+        versionName "1.0"
     }
+
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    buildTypes {
+        release {
+            buildConfigField "boolean", "LOG_DEBUG", "true"
+            zipAlignEnabled false
+            shrinkResources false
+            minifyEnabled false
+            debuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
 }
 
 dependencies {
-    api fileTree(dir: 'libs', include: ['*.jar'])
-    //Android Support
-    api "com.android.support:support-v4:$rootProject.supportLibraryVersion"
-    api "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
-    api "com.android.support:design:$rootProject.supportLibraryVersion"
-    api "com.android.support:percent:$rootProject.supportLibraryVersion"
-    //网络请求相关
-    api "com.squareup.retrofit2:retrofit:$rootProject.retrofitVersion"
-    api "com.squareup.retrofit2:retrofit-mock:$rootProject.retrofitVersion"
-    api "com.github.franmontiel:PersistentCookieJar:$rootProject.cookieVersion"
-    //稳定的
-    api "com.github.bumptech.glide:glide:$rootProject.glideVersion"
-    api "com.orhanobut:logger:$rootProject.loggerVersion"
-    api "org.greenrobot:eventbus:$rootProject.eventbusVersion"
-    api "com.google.code.gson:gson:$rootProject.gsonVersion"
-    api "com.github.chrisbanes:PhotoView:$rootProject.photoViewVersion"
-
-    api "com.jude:easyrecyclerview:$rootProject.easyRecyclerVersion"
-    api "com.github.GrenderG:Toasty:$rootProject.toastyVersion"
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    // Support libraries
+    api deps.support.app_compat
+    api deps.support.v4
+    api deps.support.v13
+    api deps.support.design
+    api deps.support.cardview
+    api deps.support.percent
+    api deps.support.recyclerview
+    api deps.constraint_layout
+
+    // RxJava and retrofit
+    api deps.rx_android
+    api deps.rxjava2
+    api deps.retrofit.runtime
+    api deps.retrofit.gson
+    api deps.persistent_cookie
+
+    //Dagger
+    api deps.dagger.runtime
+    api deps.dagger.android
+    api deps.dagger.android_support
+
+    // other
+    api deps.kotlin.stdlib
+    api deps.event_bus
+    api deps.gson
+    api deps.permission
+    api deps.utils
+    api deps.glide
+
+    //view
+    api deps.photo_view
+    api deps.easy_recycler
+    api deps.material_dialog
+    api deps.logger
+    api deps.toasty
 
     //router
-    api "com.alibaba:arouter-api:$rootProject.routerVersion"
+    api deps.arouter_api
+
+    //annotationProcessor
+    annotationProcessor deps.dagger.android_support_compiler
+    annotationProcessor deps.dagger.compiler
 }
diff --git a/module_app/build.gradle b/module_app/build.gradle
index e092fcc..2776c5c 100644
--- a/module_app/build.gradle
+++ b/module_app/build.gradle
@@ -22,18 +22,24 @@ android {
         }
     }
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion build_versions.target_sdk
     defaultConfig {
         applicationId "com.guiying.module"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
+        minSdkVersion build_versions.min_sdk
+        targetSdkVersion build_versions.target_sdk
+        versionCode 1
+        versionName "1.0"
         multiDexEnabled true
         //打包时间
         resValue "string", "build_time", buildTime()
     }
 
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     buildTypes {
         release {
             //更改AndroidManifest.xml中预先定义好占位符信息
@@ -68,7 +74,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:multidex:1.0.2'
+    implementation deps.support.multidex
     implementation project(':lib_common')
     if (!isModule.toBoolean()) {
         implementation project(':module_main')
diff --git a/module_girls/build.gradle b/module_girls/build.gradle
index 966fe3e..d0662b8 100644
--- a/module_girls/build.gradle
+++ b/module_girls/build.gradle
@@ -5,21 +5,25 @@ if (isModule.toBoolean()) {
 }
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion build_versions.target_sdk
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
+        minSdkVersion build_versions.min_sdk
+        targetSdkVersion build_versions.target_sdk
+        versionCode 1
+        versionName "1.0"
 
-        //ARouter
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = [moduleName: project.getName()]
+                arguments = [ moduleName : project.getName() ]
             }
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     sourceSets {
         main {
             if (isModule.toBoolean()) {
@@ -34,10 +38,20 @@ android {
         }
     }
 
+    buildTypes {
+        release {
+            buildConfigField "boolean", "LOG_DEBUG", "true"
+            zipAlignEnabled false
+            shrinkResources false
+            minifyEnabled false
+            debuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
+    annotationProcessor deps.arouter_compiler
     implementation project(':lib_common')
 }
diff --git a/module_main/build.gradle b/module_main/build.gradle
index 92534d4..d0662b8 100644
--- a/module_main/build.gradle
+++ b/module_main/build.gradle
@@ -5,22 +5,24 @@ if (isModule.toBoolean()) {
 }
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion build_versions.target_sdk
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
+        minSdkVersion build_versions.min_sdk
+        targetSdkVersion build_versions.target_sdk
+        versionCode 1
+        versionName "1.0"
 
-        //ARouter
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = [moduleName: project.getName()]
+                arguments = [ moduleName : project.getName() ]
             }
         }
-        vectorDrawables.useSupportLibrary = true
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     sourceSets {
         main {
@@ -36,11 +38,20 @@ android {
         }
     }
 
-
+    buildTypes {
+        release {
+            buildConfigField "boolean", "LOG_DEBUG", "true"
+            zipAlignEnabled false
+            shrinkResources false
+            minifyEnabled false
+            debuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
+    annotationProcessor deps.arouter_compiler
     implementation project(':lib_common')
 }
diff --git a/module_news/build.gradle b/module_news/build.gradle
index 966fe3e..d0662b8 100644
--- a/module_news/build.gradle
+++ b/module_news/build.gradle
@@ -5,21 +5,25 @@ if (isModule.toBoolean()) {
 }
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion build_versions.target_sdk
     defaultConfig {
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
+        minSdkVersion build_versions.min_sdk
+        targetSdkVersion build_versions.target_sdk
+        versionCode 1
+        versionName "1.0"
 
-        //ARouter
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = [moduleName: project.getName()]
+                arguments = [ moduleName : project.getName() ]
             }
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     sourceSets {
         main {
             if (isModule.toBoolean()) {
@@ -34,10 +38,20 @@ android {
         }
     }
 
+    buildTypes {
+        release {
+            buildConfigField "boolean", "LOG_DEBUG", "true"
+            zipAlignEnabled false
+            shrinkResources false
+            minifyEnabled false
+            debuggable true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    annotationProcessor "com.alibaba:arouter-compiler:$rootProject.annotationProcessor"
+    annotationProcessor deps.arouter_compiler
     implementation project(':lib_common')
 }
diff --git a/versions.gradle b/versions.gradle
index b0a4da9..3cd6235 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -1,27 +1,126 @@
-// Define versions in a single place
-//时间：2017.2.13；每次修改版本号都要添加修改时间
-rootProject.ext {
-    // Sdk and tools
-    compileSdkVersion = 25
-    minSdkVersion = 16
-    targetSdkVersion = 25
-    versionCode = 1
-    versionName = "1.0"
-    javaVersion = JavaVersion.VERSION_1_8
-
-    // App dependencies versions
-    supportLibraryVersion = "25.4.0"
-    retrofitVersion = "2.1.0"
-    glideVersion = "3.8.0"
-    loggerVersion = "1.15"
-    eventbusVersion = "3.0.0"
-    gsonVersion = "2.8.0"
-    photoViewVersion = "2.0.0"
-
-    //检查时间：2017.6.6
-    annotationProcessor = "1.0.3"
-    routerVersion = "1.2.1.1"
-    easyRecyclerVersion = "4.4.0"
-    cookieVersion = "v1.0.1"
-    toastyVersion = "1.1.3"
+/**
+ * Shared file between builds so that they can all use the same dependencies and
+ * maven repositories.
+ **/
+ext.deps = [:]
+
+def versions = [:]
+versions.android_gradle_plugin = "3.0.1"
+versions.kotlin = "1.1.51"
+versions.support = "27.0.2"
+versions.multidex = "1.0.2"
+versions.constraint_layout = "1.0.2"
+versions.dagger = "2.11"
+versions.glide = "3.8.0"
+versions.rxjava2 = "2.1.7"
+versions.rx_android = "2.0.1"
+versions.retrofit = "2.3.0"
+versions.event_bus = "3.1.1"
+versions.photo_view = "2.0.0"
+versions.persistent_cookie = "v1.0.1"
+versions.gson = "2.8.2"
+versions.qmui = "1.0.4"
+versions.flow_layout = "1.0.3"
+versions.swipe_recycler = "1.1.3"
+versions.easy_recycler = "4.4.2"
+versions.permission = "1.1.2"
+versions.utils = "1.10.0"
+versions.top_snackbar = "1.1.1"
+versions.litepal = "1.6.1"
+versions.toasty = "1.1.3"
+versions.logger = "1.15"
+versions.material_dialog = "0.9.6.0"
+//Arouter
+versions.arouter_compiler = "1.1.4"
+versions.arouter_api = "1.3.1"
+
+
+
+def deps = [:]
+
+def support = [:]
+support.annotations = "com.android.support:support-annotations:$versions.support"
+support.app_compat = "com.android.support:appcompat-v7:$versions.support"
+support.v13 = "com.android.support:support-v13:$versions.support"
+support.percent = "com.android.support:percent:$versions.support"
+support.recyclerview = "com.android.support:recyclerview-v7:$versions.support"
+support.cardview = "com.android.support:cardview-v7:$versions.support"
+support.design = "com.android.support:design:$versions.support"
+support.v4 = "com.android.support:support-v4:$versions.support"
+support.core_utils = "com.android.support:support-core-utils:$versions.support"
+support.multidex = "com.android.support:multidex:$versions.multidex"
+deps.support = support
+
+
+def retrofit = [:]
+retrofit.runtime = "com.squareup.retrofit2:retrofit:$versions.retrofit"
+retrofit.adapter = "com.squareup.retrofit2:adapter-rxjava2:$versions.retrofi"
+retrofit.gson = "com.squareup.retrofit2:converter-gson:$versions.retrofit"
+deps.retrofit = retrofit
+
+
+def dagger = [:]
+dagger.runtime = "com.google.dagger:dagger:$versions.dagger"
+dagger.android = "com.google.dagger:dagger-android:$versions.dagger"
+dagger.android_support = "com.google.dagger:dagger-android-support:$versions.dagger"
+dagger.compiler = "com.google.dagger:dagger-compiler:$versions.dagger"
+dagger.android_support_compiler = "com.google.dagger:dagger-android-processor:$versions.dagger"
+deps.dagger = dagger
+
+
+def kotlin = [:]
+kotlin.stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jre7:$versions.kotlin"
+kotlin.test = "org.jetbrains.kotlin:kotlin-test-junit:$versions.kotlin"
+kotlin.plugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
+deps.kotlin = kotlin
+
+//view
+deps.constraint_layout = "com.android.support.constraint:constraint-layout:$versions.constraint_layout"
+deps.qmui = "com.qmuiteam:qmui:$versions.qmui"
+deps.flow_layout = "com.zhy:flowlayout-lib:$versions.flow_layout"
+deps.swipe_recycler = "com.yanzhenjie:recyclerview-swipe:$versions.swipe_recycler"
+deps.easy_recycler = "com.jude:easyrecyclerview:$versions.easy_recycler"
+deps.photo_view = "com.github.chrisbanes:PhotoView:$versions.photo_view"
+deps.material_dialog = "com.afollestad.material-dialogs:core:$versions.material_dialog"
+
+deps.android_gradle_plugin = "com.android.tools.build:gradle:$versions.android_gradle_plugin"
+deps.rxjava2 = "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
+deps.rx_android = "io.reactivex.rxjava2:rxandroid:$versions.rx_android"
+//other
+deps.glide = "com.github.bumptech.glide:glide:$versions.glide"
+deps.event_bus = "org.greenrobot:eventbus:$versions.event_bus"
+deps.persistent_cookie = "com.github.franmontiel:PersistentCookieJar:$versions.persistent_cookie"
+deps.gson = "com.google.code.gson:gson:$versions.gson"
+deps.permission = "com.yanzhenjie:permission:$versions.permission"
+deps.utils = "com.blankj:utilcode:$versions.utils"
+deps.top_snackbar ="com.androidadvance:topsnackbar:$versions.top_snackbar"
+deps.litepal = "org.litepal.android:core:$versions.litepal"
+deps.toasty =  "com.github.GrenderG:Toasty:$versions.toasty"
+deps.logger = "com.orhanobut:logger:$versions.logger"
+deps.arouter_api = "com.alibaba:arouter-api:$versions.arouter_api"
+deps.arouter_compiler = "com.alibaba:arouter-compiler:$versions.arouter_compiler"
+
+ext.deps = deps
+
+def build_versions = [:]
+build_versions.min_sdk = 16
+build_versions.target_sdk = 27
+build_versions.build_tools = "27.0.2"
+ext.build_versions = build_versions
+
+
+def addRepos(RepositoryHandler handler) {
+    /*公司仓库*/
+    handler.maven {
+        url "http://maven.hikvision.com.cn/nexus/content/groups/System-Android-down/"
+        credentials {
+            username "System-Android"
+            password "HikSysDeveloper123"
+        }
+    }
+
+    handler.google()
+    handler.jcenter()
 }
+
+ext.addRepos = this.&addRepos
\ No newline at end of file

From f08a03744d7afd9834461fb353beca16358beb90 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Thu, 4 Jan 2018 22:30:57 +0800
Subject: [PATCH 20/38] =?UTF-8?q?1=EF=BC=9Akeep=E4=B8=8D=E5=8F=AF=E6=B7=B7?=
 =?UTF-8?q?=E6=B7=86=E7=9A=84=E7=B1=BB=EF=BC=9B=202=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=BB=E5=8A=A8=E5=AF=BB=E6=89=BEView=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=B7=E4=BE=8B=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/base/BaseActionBarActivity.java    |  2 ++
 .../module/common/base/BaseActivity.java      |  2 ++
 .../module/common/base/BaseApplication.java   | 12 ++++----
 .../module/common/base/BaseFragment.java      |  8 ++++++
 .../module/common/base/BasePresenter.java     |  9 ++++++
 .../guiying/module/common/base/BaseView.java  | 10 +++++++
 .../module/common/base/ClassUtils.java        |  2 ++
 ...elegate.java => IApplicationDelegate.java} |  5 +++-
 .../module/common/base/IViewDelegate.java     | 21 ++++++++++++++
 .../module/common/base/InfoCallback.java      |  3 ++
 .../module/common/base/ViewManager.java       |  2 ++
 .../guiying/module/girls/GirlsFragment.java   | 10 +++++++
 .../com/guiying/module/girls/MyDelegate.java  | 10 +++++--
 .../guiying/module/girls/MyViewDelegate.java  | 28 +++++++++++++++++++
 .../module/main/BottomNavigationActivity.java | 22 +++++++++++++--
 .../com/guiying/module/news/MyDelegate.java   | 10 +++++--
 .../guiying/module/news/MyViewDelegate.java   | 28 +++++++++++++++++++
 .../com/guiying/module/news/NewsFragment.java | 11 ++++++++
 18 files changed, 180 insertions(+), 15 deletions(-)
 rename lib_common/src/main/java/com/guiying/module/common/base/{ApplicationDelegate.java => IApplicationDelegate.java} (75%)
 create mode 100644 lib_common/src/main/java/com/guiying/module/common/base/IViewDelegate.java
 create mode 100644 module_girls/src/main/java/com/guiying/module/girls/MyViewDelegate.java
 create mode 100644 module_news/src/main/java/com/guiying/module/news/MyViewDelegate.java

diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java
index ffe9243..c32f18e 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java
@@ -8,6 +8,7 @@
 package com.guiying.module.common.base;
 
 import android.os.Bundle;
+import android.support.annotation.Keep;
 import android.support.annotation.StringRes;
 import android.support.v7.app.ActionBar;
 
@@ -22,6 +23,7 @@
  * @version V1.2.0
  * @name BaseActionBarActivity
  */
+@Keep
 public abstract class BaseActionBarActivity extends BaseActivity {
 
     /*默认的ActionBar*/
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java
index 340afa2..32ffebe 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseActivity.java
@@ -2,6 +2,7 @@
 
 import android.os.Bundle;
 import android.support.annotation.IdRes;
+import android.support.annotation.Keep;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -17,6 +18,7 @@
  * @version V1.0.0
  * @name BaseActivity
  */
+@Keep
 public abstract class BaseActivity extends AppCompatActivity {
 
 
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
index 9b46d73..5c183ee 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseApplication.java
@@ -24,7 +24,7 @@ public class BaseApplication extends Application {
 
     private static BaseApplication sInstance;
 
-    private List<ApplicationDelegate> mAppDelegateList;
+    private List<IApplicationDelegate> mAppDelegateList;
 
 
     public static BaseApplication getIns() {
@@ -37,8 +37,8 @@ public void onCreate() {
         sInstance = this;
         Logger.init("pattern").logLevel(LogLevel.FULL);
         Utils.init(this);
-        mAppDelegateList = ClassUtils.getObjectsWithInterface(this, ApplicationDelegate.class, ROOT_PACKAGE);
-        for (ApplicationDelegate delegate : mAppDelegateList) {
+        mAppDelegateList = ClassUtils.getObjectsWithInterface(this, IApplicationDelegate.class, ROOT_PACKAGE);
+        for (IApplicationDelegate delegate : mAppDelegateList) {
             delegate.onCreate();
         }
 
@@ -47,7 +47,7 @@ public void onCreate() {
     @Override
     public void onTerminate() {
         super.onTerminate();
-        for (ApplicationDelegate delegate : mAppDelegateList) {
+        for (IApplicationDelegate delegate : mAppDelegateList) {
             delegate.onTerminate();
         }
     }
@@ -56,7 +56,7 @@ public void onTerminate() {
     @Override
     public void onLowMemory() {
         super.onLowMemory();
-        for (ApplicationDelegate delegate : mAppDelegateList) {
+        for (IApplicationDelegate delegate : mAppDelegateList) {
             delegate.onLowMemory();
         }
     }
@@ -64,7 +64,7 @@ public void onLowMemory() {
     @Override
     public void onTrimMemory(int level) {
         super.onTrimMemory(level);
-        for (ApplicationDelegate delegate : mAppDelegateList) {
+        for (IApplicationDelegate delegate : mAppDelegateList) {
             delegate.onTrimMemory(level);
         }
     }
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java
index 116ab50..5ec3cb5 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseFragment.java
@@ -2,10 +2,18 @@
 
 import android.content.Context;
 import android.support.annotation.IdRes;
+import android.support.annotation.Keep;
 import android.support.v4.app.Fragment;
 
 import com.guiying.module.common.utils.Utils;
 
+/**
+ * <p>Fragment的基类</p>
+ *
+ * @author 张华洋
+ * @name BaseFragment
+ */
+@Keep
 public abstract class BaseFragment extends Fragment {
 
     protected BaseActivity mActivity;
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BasePresenter.java b/lib_common/src/main/java/com/guiying/module/common/base/BasePresenter.java
index d7468af..be56ad9 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BasePresenter.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BasePresenter.java
@@ -1,5 +1,14 @@
 package com.guiying.module.common.base;
 
+import android.support.annotation.Keep;
+
+/**
+ * <p>Presenter的基类</p>
+ *
+ * @author 张华洋
+ * @name BasePresenter
+ */
+@Keep
 public interface BasePresenter {
 
     void start();
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseView.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseView.java
index 7d557ea..e1b0b21 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseView.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseView.java
@@ -1,5 +1,15 @@
 package com.guiying.module.common.base;
 
+
+import android.support.annotation.Keep;
+
+/**
+ * <p>View接口的基类</p>
+ *
+ * @author 张华洋
+ * @name BaseView
+ */
+@Keep
 public interface BaseView<T> {
 
     void setPresenter(T presenter);
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java b/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
index 2b6862c..7e65de6 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/ClassUtils.java
@@ -5,6 +5,7 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
+import android.support.annotation.Keep;
 import android.util.Log;
 
 import com.guiying.module.common.utils.Utils;
@@ -25,6 +26,7 @@
  * Copy from galaxy sdk ${com.alibaba.android.galaxy.utils.ClassUtils}
  * Scanner, find out class with any conditions, copy from google source code.
  */
+@Keep
 public class ClassUtils {
     private static final String TAG = "ClassUtils";
 
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java b/lib_common/src/main/java/com/guiying/module/common/base/IApplicationDelegate.java
similarity index 75%
rename from lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java
rename to lib_common/src/main/java/com/guiying/module/common/base/IApplicationDelegate.java
index dd671fb..1ea31b6 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/ApplicationDelegate.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/IApplicationDelegate.java
@@ -1,5 +1,7 @@
 package com.guiying.module.common.base;
 
+import android.support.annotation.Keep;
+
 /**
  * <p>类说明</p>
  *
@@ -7,7 +9,8 @@
  * @version V2.8.3
  * @name ApplicationDelegate
  */
-public interface ApplicationDelegate {
+@Keep
+public interface IApplicationDelegate {
 
     void onCreate();
 
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/IViewDelegate.java b/lib_common/src/main/java/com/guiying/module/common/base/IViewDelegate.java
new file mode 100644
index 0000000..3c35b8e
--- /dev/null
+++ b/lib_common/src/main/java/com/guiying/module/common/base/IViewDelegate.java
@@ -0,0 +1,21 @@
+package com.guiying.module.common.base;
+
+
+import android.support.annotation.Keep;
+import android.view.View;
+
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2018/1/4 22:10
+ * @version V2.8.3
+ * @name IFragmentDelegate
+ */
+@Keep
+public interface IViewDelegate {
+
+    BaseFragment getFragment(String name);
+
+    View getView(String name);
+
+}
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/InfoCallback.java b/lib_common/src/main/java/com/guiying/module/common/base/InfoCallback.java
index 96e6d21..8a5cf9b 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/InfoCallback.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/InfoCallback.java
@@ -1,5 +1,7 @@
 package com.guiying.module.common.base;
 
+import android.support.annotation.Keep;
+
 /**
  * <p>数据回调接口</p>
  *
@@ -7,6 +9,7 @@
  * @version V1.2.0
  * @name InfoCallback
  */
+@Keep
 public interface InfoCallback<T> {
 
     void onSuccess(T info);
diff --git a/lib_common/src/main/java/com/guiying/module/common/base/ViewManager.java b/lib_common/src/main/java/com/guiying/module/common/base/ViewManager.java
index 1b421f2..8f221a0 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/ViewManager.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/ViewManager.java
@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.support.annotation.Keep;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -15,6 +16,7 @@
  * @version V1.1
  * @name ViewManager
  */
+@Keep
 public class ViewManager {
 
     private static Stack<Activity> activityStack;
diff --git a/module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java b/module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java
index 4be5443..43accad 100644
--- a/module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/GirlsFragment.java
@@ -15,6 +15,16 @@
  */
 public class GirlsFragment extends BaseFragment {
 
+    /**
+     * Use this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @return A new instance of fragment GirlsFragment.
+     */
+    public static GirlsFragment newInstance() {
+        return new GirlsFragment();
+    }
+
 
     public GirlsFragment() {
         // Required empty public constructor
diff --git a/module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java b/module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java
index 5ab446c..dc0ecf4 100644
--- a/module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java
+++ b/module_girls/src/main/java/com/guiying/module/girls/MyDelegate.java
@@ -1,6 +1,8 @@
 package com.guiying.module.girls;
 
-import com.guiying.module.common.base.ApplicationDelegate;
+import android.support.annotation.Keep;
+
+import com.guiying.module.common.base.IApplicationDelegate;
 import com.guiying.module.common.base.ViewManager;
 
 /**
@@ -10,11 +12,13 @@
  * @version V2.8.3
  * @name MyDelegate
  */
-public class MyDelegate implements ApplicationDelegate {
+@Keep
+public class MyDelegate implements IApplicationDelegate {
 
     @Override
     public void onCreate() {
-        ViewManager.getInstance().addFragment(0, new GirlsFragment());
+        //主动添加
+        ViewManager.getInstance().addFragment(0, GirlsFragment.newInstance());
     }
 
     @Override
diff --git a/module_girls/src/main/java/com/guiying/module/girls/MyViewDelegate.java b/module_girls/src/main/java/com/guiying/module/girls/MyViewDelegate.java
new file mode 100644
index 0000000..3d4294e
--- /dev/null
+++ b/module_girls/src/main/java/com/guiying/module/girls/MyViewDelegate.java
@@ -0,0 +1,28 @@
+package com.guiying.module.girls;
+
+import android.support.annotation.Keep;
+import android.view.View;
+
+import com.guiying.module.common.base.BaseFragment;
+import com.guiying.module.common.base.IViewDelegate;
+
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2018/1/4 22:16
+ * @version V2.8.3
+ * @name MyViewDelegate
+ */
+@Keep
+public class MyViewDelegate implements IViewDelegate {
+
+    @Override
+    public BaseFragment getFragment(String name) {
+        return GirlsFragment.newInstance();
+    }
+
+    @Override
+    public View getView(String name) {
+        return null;
+    }
+}
diff --git a/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java b/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java
index 9af5f0c..51c27cf 100644
--- a/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java
+++ b/module_main/src/main/java/com/guiying/module/main/BottomNavigationActivity.java
@@ -8,6 +8,8 @@
 
 import com.guiying.module.common.base.BaseActivity;
 import com.guiying.module.common.base.BaseFragment;
+import com.guiying.module.common.base.ClassUtils;
+import com.guiying.module.common.base.IViewDelegate;
 import com.guiying.module.common.base.ViewManager;
 import com.guiying.module.common.widget.NoScrollViewPager;
 
@@ -39,7 +41,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
                 mPager.setCurrentItem(1);
                 return true;
             } else if (i == R.id.navigation_notifications) {
-                mPager.setCurrentItem(0);
+                mPager.setCurrentItem(2);
                 return true;
             }
             return false;
@@ -57,7 +59,9 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
     }
 
     private void initViewPager() {
-        mFragments = ViewManager.getInstance().getAllFragment();
+        mFragments = ViewManager.getInstance().getAllFragment();//这几个Fragment是主动添加到ViewManager中的
+        BaseFragment newsFragment = getNewsFragment();//主动寻找
+        mFragments.add(newsFragment);
         mPager = (NoScrollViewPager) findViewById(R.id.container_pager);
         mAdapter = new FragmentAdapter(getSupportFragmentManager(), mFragments);
         mPager.setPagerEnabled(false);
@@ -65,4 +69,18 @@ private void initViewPager() {
     }
 
 
+    /**
+     * 在News模块中寻找实现的Fragment
+     *
+     * @return Fragment
+     */
+    private BaseFragment getNewsFragment() {
+        BaseFragment newsFragment = null;
+        List<IViewDelegate> viewDelegates = ClassUtils.getObjectsWithInterface(this, IViewDelegate.class, "com.guiying.module.news");
+        if (viewDelegates != null && !viewDelegates.isEmpty()) {
+            newsFragment = viewDelegates.get(0).getFragment("");
+        }
+        return newsFragment;
+    }
+
 }
diff --git a/module_news/src/main/java/com/guiying/module/news/MyDelegate.java b/module_news/src/main/java/com/guiying/module/news/MyDelegate.java
index f0aca07..98f55a8 100644
--- a/module_news/src/main/java/com/guiying/module/news/MyDelegate.java
+++ b/module_news/src/main/java/com/guiying/module/news/MyDelegate.java
@@ -1,6 +1,8 @@
 package com.guiying.module.news;
 
-import com.guiying.module.common.base.ApplicationDelegate;
+import android.support.annotation.Keep;
+
+import com.guiying.module.common.base.IApplicationDelegate;
 import com.guiying.module.common.base.ViewManager;
 import com.orhanobut.logger.Logger;
 
@@ -11,12 +13,14 @@
  * @version V2.8.3
  * @name MyDelegate
  */
-public class MyDelegate implements ApplicationDelegate {
+@Keep
+public class MyDelegate implements IApplicationDelegate {
 
     @Override
     public void onCreate() {
         Logger.init("pattern");
-        ViewManager.getInstance().addFragment(0, new NewsFragment());
+        //主动添加
+        ViewManager.getInstance().addFragment(0, NewsFragment.newInstance());
     }
 
     @Override
diff --git a/module_news/src/main/java/com/guiying/module/news/MyViewDelegate.java b/module_news/src/main/java/com/guiying/module/news/MyViewDelegate.java
new file mode 100644
index 0000000..0620bb5
--- /dev/null
+++ b/module_news/src/main/java/com/guiying/module/news/MyViewDelegate.java
@@ -0,0 +1,28 @@
+package com.guiying.module.news;
+
+import android.support.annotation.Keep;
+import android.view.View;
+
+import com.guiying.module.common.base.BaseFragment;
+import com.guiying.module.common.base.IViewDelegate;
+
+/**
+ * <p>类说明</p>
+ *
+ * @author 张华洋 2018/1/4 22:16
+ * @version V2.8.3
+ * @name MyViewDelegate
+ */
+@Keep
+public class MyViewDelegate implements IViewDelegate {
+
+    @Override
+    public BaseFragment getFragment(String name) {
+        return NewsFragment.newInstance();
+    }
+
+    @Override
+    public View getView(String name) {
+        return null;
+    }
+}
diff --git a/module_news/src/main/java/com/guiying/module/news/NewsFragment.java b/module_news/src/main/java/com/guiying/module/news/NewsFragment.java
index e316af6..93c039a 100644
--- a/module_news/src/main/java/com/guiying/module/news/NewsFragment.java
+++ b/module_news/src/main/java/com/guiying/module/news/NewsFragment.java
@@ -15,6 +15,17 @@
  */
 public class NewsFragment extends BaseFragment {
 
+    /**
+     * Use this factory method to create a new instance of
+     * this fragment using the provided parameters.
+     *
+     * @return A new instance of fragment NewsFragment.
+     */
+    public static NewsFragment newInstance() {
+        return new NewsFragment();
+    }
+
+
 
     public NewsFragment() {
         // Required empty public constructor

From 59c2ff678fbfed36911ee7d28e3642d38db4a1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Thu, 4 Jan 2018 22:49:52 +0800
Subject: [PATCH 21/38] Update versions.gradle

---
 versions.gradle | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/versions.gradle b/versions.gradle
index 3cd6235..2564818 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -110,17 +110,8 @@ ext.build_versions = build_versions
 
 
 def addRepos(RepositoryHandler handler) {
-    /*公司仓库*/
-    handler.maven {
-        url "http://maven.hikvision.com.cn/nexus/content/groups/System-Android-down/"
-        credentials {
-            username "System-Android"
-            password "HikSysDeveloper123"
-        }
-    }
-
     handler.google()
     handler.jcenter()
 }
 
-ext.addRepos = this.&addRepos
\ No newline at end of file
+ext.addRepos = this.&addRepos

From 1f728c5c2957c65ad3af8e88129aa2430f79f4c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Thu, 4 Jan 2018 22:52:51 +0800
Subject: [PATCH 22/38] =?UTF-8?q?1=EF=BC=9A=E9=80=82=E9=85=8DAndroid=20Stu?=
 =?UTF-8?q?dio=203.0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1：适配Android Studio 3.0；
---
 versions.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/versions.gradle b/versions.gradle
index 2564818..dd7e50e 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -108,7 +108,6 @@ build_versions.target_sdk = 27
 build_versions.build_tools = "27.0.2"
 ext.build_versions = build_versions
 
-
 def addRepos(RepositoryHandler handler) {
     handler.google()
     handler.jcenter()

From c44483a24506765bc932d6a571e3b6f65cddbb16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Thu, 4 Jan 2018 22:53:37 +0800
Subject: [PATCH 23/38] =?UTF-8?q?1=EF=BC=9A=E9=80=82=E9=85=8DAndroid=20Stu?=
 =?UTF-8?q?dio=203.0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1：适配Android Studio 3.0；
---
 settings.gradle | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index a7e0b34..4e334dd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,6 @@
-include ':module_app',
+include ':lib_common',
+        ':module_app',
         ':module_main',
         ':module_girls',
-        ':module_news',
-        ':lib_common'
+        ':module_news'
+        

From fa31aff424a3393369a39294db110f62ef6f9d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Thu, 4 Jan 2018 22:54:59 +0800
Subject: [PATCH 24/38] =?UTF-8?q?=E6=9B=B4=E6=96=B0git=E7=9A=84ignore?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index eef2d45..63fc54f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,5 +39,6 @@ captures/
 .idea/vcs.xml
 .idea/libraries
 
+
 # Keystore files
 *.jks

From 5f29fd521a780731ba1d3f72f1c4e17520a7b310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Thu, 4 Jan 2018 22:56:12 +0800
Subject: [PATCH 25/38] =?UTF-8?q?1=EF=BC=9A=E9=87=8D=E5=86=99=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=A8=A1=E5=9D=97=E7=9A=84Gradle=E8=84=9A=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1：重写组件模块的Gradle脚本；
---
 versions.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/versions.gradle b/versions.gradle
index dd7e50e..2564818 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -108,6 +108,7 @@ build_versions.target_sdk = 27
 build_versions.build_tools = "27.0.2"
 ext.build_versions = build_versions
 
+
 def addRepos(RepositoryHandler handler) {
     handler.google()
     handler.jcenter()

From 434bb4ff81eaa989c779e1724bb87b43ae199996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Thu, 4 Jan 2018 22:57:47 +0800
Subject: [PATCH 26/38] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 958f54a..47b787d 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Android项目组件化示例代码
 
 ## 集成开发模式和组件开发模式转换
 
-**1、首先打开Android项目的 gradle.properties 文件，然后将 isModule 改为你需要的开发模式，
+**1、首先打开Android项目的 gradle.properties 文件，然后将 isModule 改为你需要的开发模式（true/false），
 然后点击 "Sync Project" 按钮同步项目；**
 
 **2、![Image](/screenshots/develper.PNG) 在运行之前，请先按照图中选择一个能够运行的组件；**
@@ -71,4 +71,4 @@ Android项目组件化示例代码
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
-    limitations under the License.
\ No newline at end of file
+    limitations under the License.

From 1b49c74ed0eaedefc4f8565d3f369823ca382c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Fri, 5 Jan 2018 14:55:59 +0800
Subject: [PATCH 27/38] Update README.md

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 47b787d..438a057 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,7 @@ Android项目组件化示例代码
 
 2. Android组件化方案已经支持 **Fragment组件化**，使用方法请下载Demo查看；
 
-3. 目前Android组件化方案还没有写完，后续会**继续更新**，完善组件化方案。
-
-4. 本项目已适配Android Studio 3.0.1版本(Google仓库会带来一定影响)
+3. 本项目已适配Android Studio 3.0.1版本(Google仓库会带来一定影响)
 
 
 ## 集成开发模式和组件开发模式转换

From 21b409e3484b29bf3fa56e5a02c82049414e9e7f Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Fri, 19 Jan 2018 13:50:12 +0800
Subject: [PATCH 28/38] =?UTF-8?q?1=EF=BC=9AAdd=20the=20JitPack=20repositor?=
 =?UTF-8?q?y=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties |  2 +-
 versions.gradle   | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 9b51cd5..3ee61c6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,4 +23,4 @@ localGradlePluginVersion=3.0.1
 
 # ÿ�θ��ġ�isModule����ֵ����Ҫ��� "Sync Project" ��ť
 # isModule�ǡ����ɿ���ģʽ���͡��������ģʽ�����л�����
-isModule=false
+isModule=true
diff --git a/versions.gradle b/versions.gradle
index 3cd6235..e4663ed 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -110,17 +110,12 @@ ext.build_versions = build_versions
 
 
 def addRepos(RepositoryHandler handler) {
-    /*公司仓库*/
-    handler.maven {
-        url "http://maven.hikvision.com.cn/nexus/content/groups/System-Android-down/"
-        credentials {
-            username "System-Android"
-            password "HikSysDeveloper123"
-        }
-    }
-
     handler.google()
     handler.jcenter()
+    handler.mavenCentral()
+    //Add the JitPack repository
+    handler.maven { url "https://jitpack.io" }
+    handler.maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
 }
 
 ext.addRepos = this.&addRepos
\ No newline at end of file

From 71d04d4e1b850366a9fcef22e4642ee32a214d1a Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Fri, 19 Jan 2018 13:53:21 +0800
Subject: [PATCH 29/38] =?UTF-8?q?1=EF=BC=9AAdd=20the=20JitPack=20repositor?=
 =?UTF-8?q?y=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 3ee61c6..9b51cd5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -23,4 +23,4 @@ localGradlePluginVersion=3.0.1
 
 # ÿ�θ��ġ�isModule����ֵ����Ҫ��� "Sync Project" ��ť
 # isModule�ǡ����ɿ���ģʽ���͡��������ģʽ�����л�����
-isModule=true
+isModule=false

From 9cba1d8c9ebb58e6e85c60486c44a4b1816da11d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Fri, 19 Jan 2018 13:55:19 +0800
Subject: [PATCH 30/38] Add the JitPack repository

---
 versions.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/versions.gradle b/versions.gradle
index 2564818..4a8a289 100644
--- a/versions.gradle
+++ b/versions.gradle
@@ -112,6 +112,10 @@ ext.build_versions = build_versions
 def addRepos(RepositoryHandler handler) {
     handler.google()
     handler.jcenter()
+    handler.mavenCentral()
+    //Add the JitPack repository
+    handler.maven { url "https://jitpack.io" }
+    handler.maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
 }
 
 ext.addRepos = this.&addRepos

From 60147ff3ca0a26eb657b7b1b7b899e30e4ff2312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Fri, 26 Jan 2018 10:31:28 +0800
Subject: [PATCH 31/38] Update BaseActionBarActivity.java

---
 .../guiying/module/common/base/BaseActionBarActivity.java  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java b/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java
index c32f18e..85c8570 100644
--- a/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java
+++ b/lib_common/src/main/java/com/guiying/module/common/base/BaseActionBarActivity.java
@@ -1,10 +1,3 @@
-/*
- *  @ProjectName: ISMS_Petrel_MCU
- *  @Copyright: 2017 HangZhou Hikvision System Technology Co., Ltd. All Right Reserved.
- *  @address: http://www.hikvision.com
- *  @Description: 本内容仅限于杭州海康威视系统技术公有限司内部使用，禁止转发.
- */
-
 package com.guiying.module.common.base;
 
 import android.os.Bundle;

From 310cc39b0c07a90753cc42639767b724a14c84e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Sat, 3 Feb 2018 11:39:49 +0800
Subject: [PATCH 32/38] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 438a057..6510e50 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,8 @@
 
 Android项目组件化示例代码
 
+**声明**：此方案只适用于小团体小项目使用（不涉及跨部门或跨公司）。
+
 **Android组件化方案**：http://blog.csdn.net/guiying712/article/details/55213884
 
 **Android组件化之终极方案**：http://blog.csdn.net/guiying712/article/details/78057120

From fc8e0d117fced81950f5f7779932c8ef7e5163dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Tue, 27 Feb 2018 11:34:22 +0800
Subject: [PATCH 33/38] Update README.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 6510e50..438a057 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,6 @@
 
 Android项目组件化示例代码
 
-**声明**：此方案只适用于小团体小项目使用（不涉及跨部门或跨公司）。
-
 **Android组件化方案**：http://blog.csdn.net/guiying712/article/details/55213884
 
 **Android组件化之终极方案**：http://blog.csdn.net/guiying712/article/details/78057120

From b12215432cf74e9647fddcd27fe1d5e4b893e545 Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Wed, 28 Feb 2018 14:46:16 +0800
Subject: [PATCH 34/38] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=89=93?=
 =?UTF-8?q?=E5=8C=85release=E8=84=9A=E6=9C=AC=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module_girls/build.gradle | 3 +--
 module_main/build.gradle  | 3 +--
 module_news/build.gradle  | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/module_girls/build.gradle b/module_girls/build.gradle
index d0662b8..7695843 100644
--- a/module_girls/build.gradle
+++ b/module_girls/build.gradle
@@ -40,11 +40,10 @@ android {
 
     buildTypes {
         release {
-            buildConfigField "boolean", "LOG_DEBUG", "true"
+            //buildConfigField "boolean", "LOG_DEBUG", "true"
             zipAlignEnabled false
             shrinkResources false
             minifyEnabled false
-            debuggable true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/module_main/build.gradle b/module_main/build.gradle
index d0662b8..7695843 100644
--- a/module_main/build.gradle
+++ b/module_main/build.gradle
@@ -40,11 +40,10 @@ android {
 
     buildTypes {
         release {
-            buildConfigField "boolean", "LOG_DEBUG", "true"
+            //buildConfigField "boolean", "LOG_DEBUG", "true"
             zipAlignEnabled false
             shrinkResources false
             minifyEnabled false
-            debuggable true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/module_news/build.gradle b/module_news/build.gradle
index d0662b8..7695843 100644
--- a/module_news/build.gradle
+++ b/module_news/build.gradle
@@ -40,11 +40,10 @@ android {
 
     buildTypes {
         release {
-            buildConfigField "boolean", "LOG_DEBUG", "true"
+            //buildConfigField "boolean", "LOG_DEBUG", "true"
             zipAlignEnabled false
             shrinkResources false
             minifyEnabled false
-            debuggable true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

From 1219951b677cac9ee81ce13ae22a117d85f25811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Wed, 28 Feb 2018 14:48:17 +0800
Subject: [PATCH 35/38] Update build.gradle

---
 module_news/build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module_news/build.gradle b/module_news/build.gradle
index d0662b8..7695843 100644
--- a/module_news/build.gradle
+++ b/module_news/build.gradle
@@ -40,11 +40,10 @@ android {
 
     buildTypes {
         release {
-            buildConfigField "boolean", "LOG_DEBUG", "true"
+            //buildConfigField "boolean", "LOG_DEBUG", "true"
             zipAlignEnabled false
             shrinkResources false
             minifyEnabled false
-            debuggable true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }

From 88f0c49b78c4940dfe3b05b51c06e546ea09eb5b Mon Sep 17 00:00:00 2001
From: guiying712 <guiying712@163.com>
Date: Thu, 1 Mar 2018 13:44:48 +0800
Subject: [PATCH 36/38] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=89=93?=
 =?UTF-8?q?=E5=8C=85release=E8=84=9A=E6=9C=AC=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module_girls/build.gradle | 3 ---
 module_main/build.gradle  | 3 ---
 module_news/build.gradle  | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/module_girls/build.gradle b/module_girls/build.gradle
index 7695843..a1838bd 100644
--- a/module_girls/build.gradle
+++ b/module_girls/build.gradle
@@ -40,9 +40,6 @@ android {
 
     buildTypes {
         release {
-            //buildConfigField "boolean", "LOG_DEBUG", "true"
-            zipAlignEnabled false
-            shrinkResources false
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
diff --git a/module_main/build.gradle b/module_main/build.gradle
index 7695843..a1838bd 100644
--- a/module_main/build.gradle
+++ b/module_main/build.gradle
@@ -40,9 +40,6 @@ android {
 
     buildTypes {
         release {
-            //buildConfigField "boolean", "LOG_DEBUG", "true"
-            zipAlignEnabled false
-            shrinkResources false
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
diff --git a/module_news/build.gradle b/module_news/build.gradle
index 7695843..a1838bd 100644
--- a/module_news/build.gradle
+++ b/module_news/build.gradle
@@ -40,9 +40,6 @@ android {
 
     buildTypes {
         release {
-            //buildConfigField "boolean", "LOG_DEBUG", "true"
-            zipAlignEnabled false
-            shrinkResources false
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }

From 2f43b6d8f475eb43cb6cf2b122534e18d253a65f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Tue, 6 Mar 2018 16:54:46 +0800
Subject: [PATCH 37/38] Update AndroidManifest.xml

---
 module_main/src/main/module/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module_main/src/main/module/AndroidManifest.xml b/module_main/src/main/module/AndroidManifest.xml
index a5eb0d9..c9d51ec 100644
--- a/module_main/src/main/module/AndroidManifest.xml
+++ b/module_main/src/main/module/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.guiying.module">
+    package="com.guiying.module.main">
 
     <application
         android:name="debug.MainApplication"
@@ -18,4 +18,4 @@
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>

From 494e7deda04ea1a9dc0bad006ca218c635a8957f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= <guiying705@gmail.com>
Date: Mon, 12 Mar 2018 17:15:57 +0800
Subject: [PATCH 38/38] Update AndroidManifest.xml

---
 module_main/src/main/module/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module_main/src/main/module/AndroidManifest.xml b/module_main/src/main/module/AndroidManifest.xml
index c9d51ec..0443b12 100644
--- a/module_main/src/main/module/AndroidManifest.xml
+++ b/module_main/src/main/module/AndroidManifest.xml
@@ -9,7 +9,7 @@
         android:label="@string/app_main"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".main.MainActivity">
+        <activity android:name="com.guiying.module.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />