Prechádzať zdrojové kódy

1:重构组件化项目的目录结构及从新配置了Gradle,稍后会更新组件化博客。

guiying712 8 rokov pred
rodič
commit
aa1fbf9acd
100 zmenil súbory, kde vykonal 113 pridanie a 27 odobranie
  1. 1 1
      gradle.properties
  2. 0 0
      lib_common/.gitignore
  3. 0 0
      lib_common/build.gradle
  4. 0 0
      lib_common/libs/simple-xml-core.jar
  5. 0 0
      lib_common/proguard-rules.pro
  6. 0 0
      lib_common/src/main/AndroidManifest.xml
  7. 0 0
      lib_common/src/main/java/com/guiying/common/base/BaseActionBarActivity.java
  8. 0 0
      lib_common/src/main/java/com/guiying/common/base/BaseActivity.java
  9. 0 0
      lib_common/src/main/java/com/guiying/common/base/BaseApplication.java
  10. 0 0
      lib_common/src/main/java/com/guiying/common/base/BasePresenter.java
  11. 0 0
      lib_common/src/main/java/com/guiying/common/base/BaseView.java
  12. 0 0
      lib_common/src/main/java/com/guiying/common/glide/OkHttpGlideModule.java
  13. 0 0
      lib_common/src/main/java/com/guiying/common/glide/OkHttpStreamFetcher.java
  14. 0 0
      lib_common/src/main/java/com/guiying/common/glide/OkHttpUrlLoader.java
  15. 0 0
      lib_common/src/main/java/com/guiying/common/http/ApiService.java
  16. 0 0
      lib_common/src/main/java/com/guiying/common/http/DataParseUtil.java
  17. 0 0
      lib_common/src/main/java/com/guiying/common/http/DataType.java
  18. 0 0
      lib_common/src/main/java/com/guiying/common/http/HttpClient.java
  19. 0 0
      lib_common/src/main/java/com/guiying/common/http/HttpsUtils.java
  20. 0 0
      lib_common/src/main/java/com/guiying/common/http/InfoCallback.java
  21. 0 0
      lib_common/src/main/java/com/guiying/common/http/LoggerInterceptor.java
  22. 0 0
      lib_common/src/main/java/com/guiying/common/http/OnResultListener.java
  23. 0 0
      lib_common/src/main/java/com/guiying/common/utils/CloseUtils.java
  24. 2 2
      lib_common/src/main/java/com/guiying/common/utils/NetworkUtils.java
  25. 0 0
      lib_common/src/main/java/com/guiying/common/utils/ShellUtils.java
  26. 0 0
      lib_common/src/main/java/com/guiying/common/utils/StringUtils.java
  27. 0 0
      lib_common/src/main/java/com/guiying/common/utils/ToastUtils.java
  28. 0 0
      lib_common/src/main/java/com/guiying/common/utils/Utils.java
  29. 0 0
      lib_common/src/main/res/drawable/shape_loading_bg.xml
  30. 0 0
      lib_common/src/main/res/layout/layout_load_error.xml
  31. 0 0
      lib_common/src/main/res/layout/layout_load_more.xml
  32. 0 0
      lib_common/src/main/res/layout/layout_load_no_more.xml
  33. 0 0
      lib_common/src/main/res/layout/layout_load_progress.xml
  34. 0 0
      lib_common/src/main/res/layout/layout_view_empty.xml
  35. 0 0
      lib_common/src/main/res/layout/progress_dialog.xml
  36. 0 0
      lib_common/src/main/res/layout/toolbar.xml
  37. 0 0
      lib_common/src/main/res/mipmap-xxhdpi/ic_launcher.jpg
  38. 0 0
      lib_common/src/main/res/values-v21/styles.xml
  39. 0 0
      lib_common/src/main/res/values/colors.xml
  40. 0 0
      lib_common/src/main/res/values/dimens.xml
  41. 0 0
      lib_common/src/main/res/values/strings.xml
  42. 0 0
      lib_common/src/main/res/values/styles.xml
  43. 0 0
      module_app/.gitignore
  44. 23 9
      module_app/build.gradle
  45. 0 0
      module_app/proguard-rules.pro
  46. 0 0
      module_app/src/main/AndroidManifest.xml
  47. 0 0
      module_app/src/main/java/com/guiying/androidmodulepattern/App.java
  48. 10 1
      module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java
  49. 0 0
      module_app/src/main/res/values/strings.xml
  50. 0 0
      module_girls/.gitignore
  51. 25 4
      module_girls/build.gradle
  52. 0 0
      module_girls/proguard-rules.pro
  53. 0 0
      module_girls/src/main/AndroidManifest.xml
  54. 0 0
      module_girls/src/main/java/com/guiying/girls/Constants.java
  55. 0 0
      module_girls/src/main/java/com/guiying/girls/Girls.java
  56. 0 0
      module_girls/src/main/java/com/guiying/girls/data/GirlsDataSource.java
  57. 0 0
      module_girls/src/main/java/com/guiying/girls/data/bean/Girls.java
  58. 0 0
      module_girls/src/main/java/com/guiying/girls/data/parser/GirlsParser.java
  59. 0 0
      module_girls/src/main/java/com/guiying/girls/data/source/RemoteGirlsDataSource.java
  60. 0 0
      module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java
  61. 0 0
      module_girls/src/main/java/com/guiying/girls/main/GirlsAdapter.java
  62. 0 0
      module_girls/src/main/java/com/guiying/girls/main/GirlsContract.java
  63. 0 0
      module_girls/src/main/java/com/guiying/girls/main/GirlsPresenter.java
  64. 0 0
      module_girls/src/main/java/com/guiying/girls/main/GirlsView.java
  65. 0 0
      module_girls/src/main/java/debug/GirlsApplication.java
  66. 0 0
      module_girls/src/main/module/AndroidManifest.xml
  67. 0 0
      module_girls/src/main/res/layout/activity_girls.xml
  68. 0 0
      module_girls/src/main/res/layout/item_girl.xml
  69. 0 0
      module_girls/src/main/res/layout/view_girls_content.xml
  70. 0 0
      module_girls/src/main/res/values/colors.xml
  71. 0 0
      module_girls/src/main/res/values/dimens.xml
  72. 0 0
      module_girls/src/main/res/values/strings.xml
  73. 0 0
      module_main/.gitignore
  74. 26 5
      module_main/build.gradle
  75. 0 0
      module_main/proguard-rules.pro
  76. 0 0
      module_main/src/main/AndroidManifest.xml
  77. 0 0
      module_main/src/main/java/com/guiying/main/Main.java
  78. 0 0
      module_main/src/main/java/com/guiying/main/MainActivity.java
  79. 0 0
      module_main/src/main/java/debug/MainApplication.java
  80. 0 0
      module_main/src/main/module/AndroidManifest.xml
  81. 0 0
      module_main/src/main/res/layout/activity_main.xml
  82. 0 0
      module_main/src/main/res/values/dimens.xml
  83. 0 0
      module_main/src/main/res/values/strings.xml
  84. 0 0
      module_news/.gitignore
  85. 26 5
      module_news/build.gradle
  86. 0 0
      module_news/proguard-rules.pro
  87. 0 0
      module_news/src/main/AndroidManifest.xml
  88. 0 0
      module_news/src/main/java/com/guiying/news/Constants.java
  89. 0 0
      module_news/src/main/java/com/guiying/news/News.java
  90. 0 0
      module_news/src/main/java/com/guiying/news/data/NewsDataSource.java
  91. 0 0
      module_news/src/main/java/com/guiying/news/data/bean/MessageDetail.java
  92. 0 0
      module_news/src/main/java/com/guiying/news/data/bean/Story.java
  93. 0 0
      module_news/src/main/java/com/guiying/news/data/bean/StoryList.java
  94. 0 0
      module_news/src/main/java/com/guiying/news/data/source/RemoteNewsDataSource.java
  95. 0 0
      module_news/src/main/java/com/guiying/news/main/NewsCenterActivity.java
  96. 0 0
      module_news/src/main/java/com/guiying/news/main/NewsListAdapter.java
  97. 0 0
      module_news/src/main/java/com/guiying/news/main/NewsListContract.java
  98. 0 0
      module_news/src/main/java/com/guiying/news/main/NewsListPresenter.java
  99. 0 0
      module_news/src/main/java/com/guiying/news/main/NewsListView.java
  100. 0 0
      module_news/src/main/java/com/guiying/news/main/NewsListViewAdapter.java

+ 1 - 1
gradle.properties

@@ -21,7 +21,7 @@ org.gradle.parallel=true
 # 为自动化出包配置(因为每个开发的电脑坏境不一致)
 localBuildToolsVersion=25.0.2
 # 这个值一般跟你的AndroidStudio版本号一致
-localGradlePluginVersion=2.3.1
+localGradlePluginVersion=2.3.2
 
 # 每次更改“isModule”的值后,需要点击 "Sync Project" 按钮
 isModule=false

+ 0 - 0
common/.gitignore → lib_common/.gitignore


+ 0 - 0
common/build.gradle → lib_common/build.gradle


+ 0 - 0
common/libs/simple-xml-core.jar → lib_common/libs/simple-xml-core.jar


+ 0 - 0
app/proguard-rules.pro → lib_common/proguard-rules.pro


+ 0 - 0
common/src/main/AndroidManifest.xml → lib_common/src/main/AndroidManifest.xml


+ 0 - 0
common/src/main/java/com/guiying/common/base/BaseActionBarActivity.java → lib_common/src/main/java/com/guiying/common/base/BaseActionBarActivity.java


+ 0 - 0
common/src/main/java/com/guiying/common/base/BaseActivity.java → lib_common/src/main/java/com/guiying/common/base/BaseActivity.java


+ 0 - 0
common/src/main/java/com/guiying/common/base/BaseApplication.java → lib_common/src/main/java/com/guiying/common/base/BaseApplication.java


+ 0 - 0
common/src/main/java/com/guiying/common/base/BasePresenter.java → lib_common/src/main/java/com/guiying/common/base/BasePresenter.java


+ 0 - 0
common/src/main/java/com/guiying/common/base/BaseView.java → lib_common/src/main/java/com/guiying/common/base/BaseView.java


+ 0 - 0
common/src/main/java/com/guiying/common/glide/OkHttpGlideModule.java → lib_common/src/main/java/com/guiying/common/glide/OkHttpGlideModule.java


+ 0 - 0
common/src/main/java/com/guiying/common/glide/OkHttpStreamFetcher.java → lib_common/src/main/java/com/guiying/common/glide/OkHttpStreamFetcher.java


+ 0 - 0
common/src/main/java/com/guiying/common/glide/OkHttpUrlLoader.java → lib_common/src/main/java/com/guiying/common/glide/OkHttpUrlLoader.java


+ 0 - 0
common/src/main/java/com/guiying/common/http/ApiService.java → lib_common/src/main/java/com/guiying/common/http/ApiService.java


+ 0 - 0
common/src/main/java/com/guiying/common/http/DataParseUtil.java → lib_common/src/main/java/com/guiying/common/http/DataParseUtil.java


+ 0 - 0
common/src/main/java/com/guiying/common/http/DataType.java → lib_common/src/main/java/com/guiying/common/http/DataType.java


+ 0 - 0
common/src/main/java/com/guiying/common/http/HttpClient.java → lib_common/src/main/java/com/guiying/common/http/HttpClient.java


+ 0 - 0
common/src/main/java/com/guiying/common/http/HttpsUtils.java → lib_common/src/main/java/com/guiying/common/http/HttpsUtils.java


+ 0 - 0
common/src/main/java/com/guiying/common/http/InfoCallback.java → lib_common/src/main/java/com/guiying/common/http/InfoCallback.java


+ 0 - 0
common/src/main/java/com/guiying/common/http/LoggerInterceptor.java → lib_common/src/main/java/com/guiying/common/http/LoggerInterceptor.java


+ 0 - 0
common/src/main/java/com/guiying/common/http/OnResultListener.java → lib_common/src/main/java/com/guiying/common/http/OnResultListener.java


+ 0 - 0
common/src/main/java/com/guiying/common/utils/CloseUtils.java → lib_common/src/main/java/com/guiying/common/utils/CloseUtils.java


+ 2 - 2
common/src/main/java/com/guiying/common/utils/NetworkUtils.java → lib_common/src/main/java/com/guiying/common/utils/NetworkUtils.java

@@ -144,7 +144,7 @@ public class NetworkUtils {
      * @return {@code true}: 是<br>{@code false}: 否
      */
     public static boolean getWifiEnabled() {
-        WifiManager wifiManager = (WifiManager) Utils.getContext().getSystemService(Context.WIFI_SERVICE);
+        WifiManager wifiManager = (WifiManager) Utils.getContext().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         return wifiManager.isWifiEnabled();
     }
 
@@ -155,7 +155,7 @@ public class NetworkUtils {
      * @param enabled {@code true}: 打开<br>{@code false}: 关闭
      */
     public static void setWifiEnabled(boolean enabled) {
-        WifiManager wifiManager = (WifiManager) Utils.getContext().getSystemService(Context.WIFI_SERVICE);
+        WifiManager wifiManager = (WifiManager) Utils.getContext().getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         if (enabled) {
             if (!wifiManager.isWifiEnabled()) {
                 wifiManager.setWifiEnabled(true);

+ 0 - 0
common/src/main/java/com/guiying/common/utils/ShellUtils.java → lib_common/src/main/java/com/guiying/common/utils/ShellUtils.java


+ 0 - 0
common/src/main/java/com/guiying/common/utils/StringUtils.java → lib_common/src/main/java/com/guiying/common/utils/StringUtils.java


+ 0 - 0
common/src/main/java/com/guiying/common/utils/ToastUtils.java → lib_common/src/main/java/com/guiying/common/utils/ToastUtils.java


+ 0 - 0
common/src/main/java/com/guiying/common/utils/Utils.java → lib_common/src/main/java/com/guiying/common/utils/Utils.java


+ 0 - 0
common/src/main/res/drawable/shape_loading_bg.xml → lib_common/src/main/res/drawable/shape_loading_bg.xml


+ 0 - 0
common/src/main/res/layout/layout_load_error.xml → lib_common/src/main/res/layout/layout_load_error.xml


+ 0 - 0
common/src/main/res/layout/layout_load_more.xml → lib_common/src/main/res/layout/layout_load_more.xml


+ 0 - 0
common/src/main/res/layout/layout_load_no_more.xml → lib_common/src/main/res/layout/layout_load_no_more.xml


+ 0 - 0
common/src/main/res/layout/layout_load_progress.xml → lib_common/src/main/res/layout/layout_load_progress.xml


+ 0 - 0
common/src/main/res/layout/layout_view_empty.xml → lib_common/src/main/res/layout/layout_view_empty.xml


+ 0 - 0
common/src/main/res/layout/progress_dialog.xml → lib_common/src/main/res/layout/progress_dialog.xml


+ 0 - 0
common/src/main/res/layout/toolbar.xml → lib_common/src/main/res/layout/toolbar.xml


+ 0 - 0
common/src/main/res/mipmap-xxhdpi/ic_launcher.jpg → lib_common/src/main/res/mipmap-xxhdpi/ic_launcher.jpg


+ 0 - 0
common/src/main/res/values-v21/styles.xml → lib_common/src/main/res/values-v21/styles.xml


+ 0 - 0
common/src/main/res/values/colors.xml → lib_common/src/main/res/values/colors.xml


+ 0 - 0
common/src/main/res/values/dimens.xml → lib_common/src/main/res/values/dimens.xml


+ 0 - 0
common/src/main/res/values/strings.xml → lib_common/src/main/res/values/strings.xml


+ 0 - 0
common/src/main/res/values/styles.xml → lib_common/src/main/res/values/styles.xml


+ 0 - 0
app/.gitignore → module_app/.gitignore


+ 23 - 9
app/build.gradle → module_app/build.gradle

@@ -1,11 +1,20 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.neenbedankt.android-apt'
 
-def buildTime() {
+static def buildTime() {
     return new Date().format("yyyyMMdd");
 }
 
 android {
+    signingConfigs {
+        release {
+//            keyAlias ''
+//            keyPassword ''
+//            storeFile file('')
+//            storePassword ''
+        }
+    }
+
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
@@ -14,7 +23,7 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
-        //multiDexEnabled true
+        multiDexEnabled true
         //打包时间
         resValue "string", "build_time", buildTime()
     }
@@ -33,7 +42,7 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             //签名
-            //signingConfig signingConfigs.release
+            signingConfig signingConfigs.release
         }
 
         debug {
@@ -47,17 +56,22 @@ android {
             debuggable true
         }
     }
+
+    //执行lint检查,有任何的错误或者警告提示,都会终止构建,可以将其关掉
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-
-    if (!isModule.toBoolean()) {
-        compile project(':main')
-        compile project(':girls')
-        compile project(':news')
+    if (isModule.toBoolean()) {
+        compile project(':lib_common')
     } else {
-        compile project(':common')
+        compile project(':module_main')
+        compile project(':module_girls')
+        compile project(':module_news')
     }
     //router
     apt "com.github.mzule.activityrouter:compiler:$rootProject.aptCompilerVersion"

+ 0 - 0
common/proguard-rules.pro → module_app/proguard-rules.pro


+ 0 - 0
app/src/main/AndroidManifest.xml → module_app/src/main/AndroidManifest.xml


+ 0 - 0
app/src/main/java/com/guiying/androidmodulepattern/App.java → module_app/src/main/java/com/guiying/androidmodulepattern/App.java


+ 10 - 1
app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java → module_app/src/main/java/com/guiying/androidmodulepattern/MyApplication.java

@@ -1,10 +1,13 @@
 package com.guiying.androidmodulepattern;
 
+import android.content.Context;
+import android.support.multidex.MultiDex;
+
 import com.github.mzule.activityrouter.annotation.Modules;
 import com.guiying.common.base.BaseApplication;
 
 /**
- * <p>应用程序的Application只负责管理组件</p>
+ * <p>这里是整个组件化项目管理各个组件的地方,所有需要使用的组件必须在此声明</p>
  *
  * @author 张华洋 2017/2/15 20:14
  * @version V1.2.0
@@ -19,4 +22,10 @@ public class MyApplication extends BaseApplication {
         super.onCreate();
     }
 
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        // dex突破65535的限制
+        MultiDex.install(this);
+    }
 }

+ 0 - 0
app/src/main/res/values/strings.xml → module_app/src/main/res/values/strings.xml


+ 0 - 0
girls/.gitignore → module_girls/.gitignore


+ 25 - 4
news/build.gradle → module_girls/build.gradle

@@ -19,17 +19,32 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            // 不显示Log
+            buildConfigField "boolean", "LEO_DEBUG", "false"
+            //是否zip对齐
+            zipAlignEnabled true
+            // 缩减resource文件
+            shrinkResources true
+            //Proguard
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            buildConfigField "boolean", "LOG_DEBUG", "true"
+            zipAlignEnabled false
+            shrinkResources false
+            minifyEnabled false
+            debuggable true
+        }
     }
 
     sourceSets {
         main {
             if (isModule.toBoolean()) {
-                manifest.srcFile 'src/main/debug/AndroidManifest.xml'
+                manifest.srcFile 'src/main/module/AndroidManifest.xml'
             } else {
-                manifest.srcFile 'src/main/release/AndroidManifest.xml'
+                manifest.srcFile 'src/main/AndroidManifest.xml'
                 //release模式下排除debug文件夹中的所有Java文件
                 java {
                     exclude 'debug/**'
@@ -40,11 +55,17 @@ android {
     //设置了resourcePrefix值后,所有的资源名必须以指定的字符串做前缀,否则会报错。
     //但是resourcePrefix这个值只能限定xml里面的资源,并不能限定图片资源,所有图片资源仍然需要手动去修改资源名。
     //resourcePrefix "girls_"
+
+    //执行lint检查,有任何的错误或者警告提示,都会终止构建,可以将其关掉
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':common')
+    compile project(':lib_common')
     //router
     apt "com.github.mzule.activityrouter:compiler:$rootProject.aptCompilerVersion"
 }

+ 0 - 0
girls/proguard-rules.pro → module_girls/proguard-rules.pro


+ 0 - 0
girls/src/main/release/AndroidManifest.xml → module_girls/src/main/AndroidManifest.xml


+ 0 - 0
girls/src/main/java/com/guiying/girls/Constants.java → module_girls/src/main/java/com/guiying/girls/Constants.java


+ 0 - 0
girls/src/main/java/com/guiying/girls/Girls.java → module_girls/src/main/java/com/guiying/girls/Girls.java


+ 0 - 0
girls/src/main/java/com/guiying/girls/data/GirlsDataSource.java → module_girls/src/main/java/com/guiying/girls/data/GirlsDataSource.java


+ 0 - 0
girls/src/main/java/com/guiying/girls/data/bean/Girls.java → module_girls/src/main/java/com/guiying/girls/data/bean/Girls.java


+ 0 - 0
girls/src/main/java/com/guiying/girls/data/parser/GirlsParser.java → module_girls/src/main/java/com/guiying/girls/data/parser/GirlsParser.java


+ 0 - 0
girls/src/main/java/com/guiying/girls/data/source/RemoteGirlsDataSource.java → module_girls/src/main/java/com/guiying/girls/data/source/RemoteGirlsDataSource.java


+ 0 - 0
girls/src/main/java/com/guiying/girls/main/GirlsActivity.java → module_girls/src/main/java/com/guiying/girls/main/GirlsActivity.java


+ 0 - 0
girls/src/main/java/com/guiying/girls/main/GirlsAdapter.java → module_girls/src/main/java/com/guiying/girls/main/GirlsAdapter.java


+ 0 - 0
girls/src/main/java/com/guiying/girls/main/GirlsContract.java → module_girls/src/main/java/com/guiying/girls/main/GirlsContract.java


+ 0 - 0
girls/src/main/java/com/guiying/girls/main/GirlsPresenter.java → module_girls/src/main/java/com/guiying/girls/main/GirlsPresenter.java


+ 0 - 0
girls/src/main/java/com/guiying/girls/main/GirlsView.java → module_girls/src/main/java/com/guiying/girls/main/GirlsView.java


+ 0 - 0
girls/src/main/java/debug/GirlsApplication.java → module_girls/src/main/java/debug/GirlsApplication.java


+ 0 - 0
girls/src/main/debug/AndroidManifest.xml → module_girls/src/main/module/AndroidManifest.xml


+ 0 - 0
girls/src/main/res/layout/activity_girls.xml → module_girls/src/main/res/layout/activity_girls.xml


+ 0 - 0
girls/src/main/res/layout/item_girl.xml → module_girls/src/main/res/layout/item_girl.xml


+ 0 - 0
girls/src/main/res/layout/view_girls_content.xml → module_girls/src/main/res/layout/view_girls_content.xml


+ 0 - 0
girls/src/main/res/values/colors.xml → module_girls/src/main/res/values/colors.xml


+ 0 - 0
girls/src/main/res/values/dimens.xml → module_girls/src/main/res/values/dimens.xml


+ 0 - 0
girls/src/main/res/values/strings.xml → module_girls/src/main/res/values/strings.xml


+ 0 - 0
main/.gitignore → module_main/.gitignore


+ 26 - 5
girls/build.gradle → module_main/build.gradle

@@ -19,18 +19,33 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            // 不显示Log
+            buildConfigField "boolean", "LEO_DEBUG", "false"
+            //是否zip对齐
+            zipAlignEnabled true
+            // 缩减resource文件
+            shrinkResources true
+            //Proguard
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            buildConfigField "boolean", "LOG_DEBUG", "true"
+            zipAlignEnabled false
+            shrinkResources false
+            minifyEnabled false
+            debuggable true
+        }
     }
 
     sourceSets {
         main {
             if (isModule.toBoolean()) {
-                manifest.srcFile 'src/main/debug/AndroidManifest.xml'
+                manifest.srcFile 'src/main/module/AndroidManifest.xml'
             } else {
-                manifest.srcFile 'src/main/release/AndroidManifest.xml'
-                //release模式下排除debug文件夹中的所有Java文件
+                manifest.srcFile 'src/main/AndroidManifest.xml'
+                //非Module模式下排除debug文件夹中的所有Java文件
                 java {
                     exclude 'debug/**'
                 }
@@ -40,11 +55,17 @@ android {
     //设置了resourcePrefix值后,所有的资源名必须以指定的字符串做前缀,否则会报错。
     //但是resourcePrefix这个值只能限定xml里面的资源,并不能限定图片资源,所有图片资源仍然需要手动去修改资源名。
     //resourcePrefix "girls_"
+
+    //执行lint检查,有任何的错误或者警告提示,都会终止构建,可以将其关掉
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':common')
+    compile project(':lib_common')
     //router
     apt "com.github.mzule.activityrouter:compiler:$rootProject.aptCompilerVersion"
 }

+ 0 - 0
main/proguard-rules.pro → module_main/proguard-rules.pro


+ 0 - 0
main/src/main/release/AndroidManifest.xml → module_main/src/main/AndroidManifest.xml


+ 0 - 0
main/src/main/java/com/guiying/main/Main.java → module_main/src/main/java/com/guiying/main/Main.java


+ 0 - 0
main/src/main/java/com/guiying/main/MainActivity.java → module_main/src/main/java/com/guiying/main/MainActivity.java


+ 0 - 0
main/src/main/java/debug/MainApplication.java → module_main/src/main/java/debug/MainApplication.java


+ 0 - 0
main/src/main/debug/AndroidManifest.xml → module_main/src/main/module/AndroidManifest.xml


+ 0 - 0
main/src/main/res/layout/activity_main.xml → module_main/src/main/res/layout/activity_main.xml


+ 0 - 0
main/src/main/res/values/dimens.xml → module_main/src/main/res/values/dimens.xml


+ 0 - 0
main/src/main/res/values/strings.xml → module_main/src/main/res/values/strings.xml


+ 0 - 0
news/.gitignore → module_news/.gitignore


+ 26 - 5
main/build.gradle → module_news/build.gradle

@@ -19,18 +19,33 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            // 不显示Log
+            buildConfigField "boolean", "LEO_DEBUG", "false"
+            //是否zip对齐
+            zipAlignEnabled true
+            // 缩减resource文件
+            shrinkResources true
+            //Proguard
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            buildConfigField "boolean", "LOG_DEBUG", "true"
+            zipAlignEnabled false
+            shrinkResources false
+            minifyEnabled false
+            debuggable true
+        }
     }
 
     sourceSets {
         main {
             if (isModule.toBoolean()) {
-                manifest.srcFile 'src/main/debug/AndroidManifest.xml'
+                manifest.srcFile 'src/main/module/AndroidManifest.xml'
             } else {
-                manifest.srcFile 'src/main/release/AndroidManifest.xml'
-                //release模式下排除debug文件夹中的所有Java文件
+                manifest.srcFile 'src/main/AndroidManifest.xml'
+                //非Module模式下排除debug文件夹中的所有Java文件
                 java {
                     exclude 'debug/**'
                 }
@@ -40,11 +55,17 @@ android {
     //设置了resourcePrefix值后,所有的资源名必须以指定的字符串做前缀,否则会报错。
     //但是resourcePrefix这个值只能限定xml里面的资源,并不能限定图片资源,所有图片资源仍然需要手动去修改资源名。
     //resourcePrefix "girls_"
+
+    //执行lint检查,有任何的错误或者警告提示,都会终止构建,可以将其关掉
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(':common')
+    compile project(':lib_common')
     //router
     apt "com.github.mzule.activityrouter:compiler:$rootProject.aptCompilerVersion"
 }

+ 0 - 0
news/proguard-rules.pro → module_news/proguard-rules.pro


+ 0 - 0
news/src/main/release/AndroidManifest.xml → module_news/src/main/AndroidManifest.xml


+ 0 - 0
news/src/main/java/com/guiying/news/Constants.java → module_news/src/main/java/com/guiying/news/Constants.java


+ 0 - 0
news/src/main/java/com/guiying/news/News.java → module_news/src/main/java/com/guiying/news/News.java


+ 0 - 0
news/src/main/java/com/guiying/news/data/NewsDataSource.java → module_news/src/main/java/com/guiying/news/data/NewsDataSource.java


+ 0 - 0
news/src/main/java/com/guiying/news/data/bean/MessageDetail.java → module_news/src/main/java/com/guiying/news/data/bean/MessageDetail.java


+ 0 - 0
news/src/main/java/com/guiying/news/data/bean/Story.java → module_news/src/main/java/com/guiying/news/data/bean/Story.java


+ 0 - 0
news/src/main/java/com/guiying/news/data/bean/StoryList.java → module_news/src/main/java/com/guiying/news/data/bean/StoryList.java


+ 0 - 0
news/src/main/java/com/guiying/news/data/source/RemoteNewsDataSource.java → module_news/src/main/java/com/guiying/news/data/source/RemoteNewsDataSource.java


+ 0 - 0
news/src/main/java/com/guiying/news/main/NewsCenterActivity.java → module_news/src/main/java/com/guiying/news/main/NewsCenterActivity.java


+ 0 - 0
news/src/main/java/com/guiying/news/main/NewsListAdapter.java → module_news/src/main/java/com/guiying/news/main/NewsListAdapter.java


+ 0 - 0
news/src/main/java/com/guiying/news/main/NewsListContract.java → module_news/src/main/java/com/guiying/news/main/NewsListContract.java


+ 0 - 0
news/src/main/java/com/guiying/news/main/NewsListPresenter.java → module_news/src/main/java/com/guiying/news/main/NewsListPresenter.java


+ 0 - 0
news/src/main/java/com/guiying/news/main/NewsListView.java → module_news/src/main/java/com/guiying/news/main/NewsListView.java


+ 0 - 0
news/src/main/java/com/guiying/news/main/NewsListViewAdapter.java → module_news/src/main/java/com/guiying/news/main/NewsListViewAdapter.java


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov