From 7e403d3f96030449773ab36d52c76630ff1fd025 Mon Sep 17 00:00:00 2001 From: guiying712 Date: Tue, 12 Dec 2017 15:00:55 +0800 Subject: [PATCH 01/21] =?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 U know * @return 对象列表 */ - public static List getObjectsWithInterface(Context context, Class clazz, String path) { + public static List + getObjectsWithInterface(Context context, Class clazz, String path) { List 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 mWakeLockArray = new HashMap<>(); + static private HashMap 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; /** *

类说明

@@ -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 Date: Thu, 4 Jan 2018 22:06:04 +0800 Subject: [PATCH 02/21] =?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 Date: Thu, 4 Jan 2018 22:30:57 +0800 Subject: [PATCH 03/21] =?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 mAppDelegateList; + private List 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; +/** + *

Fragment的基类

+ * + * @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; + +/** + *

Presenter的基类

+ * + * @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; + +/** + *

View接口的基类

+ * + * @author 张华洋 + * @name BaseView + */ +@Keep public interface BaseView { 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; + /** *

类说明

* @@ -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; + +/** + *

类说明

+ * + * @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; + /** *

数据回调接口

* @@ -7,6 +9,7 @@ * @version V1.2.0 * @name InfoCallback */ +@Keep public interface InfoCallback { 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 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; + +/** + *

类说明

+ * + * @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 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; + +/** + *

类说明

+ * + * @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?= Date: Thu, 4 Jan 2018 22:49:52 +0800 Subject: [PATCH 04/21] 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?= Date: Thu, 4 Jan 2018 22:52:51 +0800 Subject: [PATCH 05/21] =?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?= Date: Thu, 4 Jan 2018 22:53:37 +0800 Subject: [PATCH 06/21] =?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?= Date: Thu, 4 Jan 2018 22:54:59 +0800 Subject: [PATCH 07/21] =?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?= Date: Thu, 4 Jan 2018 22:56:12 +0800 Subject: [PATCH 08/21] =?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?= Date: Thu, 4 Jan 2018 22:57:47 +0800 Subject: [PATCH 09/21] 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?= Date: Fri, 5 Jan 2018 14:55:59 +0800 Subject: [PATCH 10/21] 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 Date: Fri, 19 Jan 2018 13:50:12 +0800 Subject: [PATCH 11/21] =?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 Date: Fri, 19 Jan 2018 13:53:21 +0800 Subject: [PATCH 12/21] =?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?= Date: Fri, 19 Jan 2018 13:55:19 +0800 Subject: [PATCH 13/21] 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?= Date: Fri, 26 Jan 2018 10:31:28 +0800 Subject: [PATCH 14/21] 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?= Date: Sat, 3 Feb 2018 11:39:49 +0800 Subject: [PATCH 15/21] 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?= Date: Tue, 27 Feb 2018 11:34:22 +0800 Subject: [PATCH 16/21] 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 Date: Wed, 28 Feb 2018 14:46:16 +0800 Subject: [PATCH 17/21] =?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?= Date: Wed, 28 Feb 2018 14:48:17 +0800 Subject: [PATCH 18/21] 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 Date: Thu, 1 Mar 2018 13:44:48 +0800 Subject: [PATCH 19/21] =?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?= Date: Tue, 6 Mar 2018 16:54:46 +0800 Subject: [PATCH 20/21] 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 @@ + package="com.guiying.module.main"> - \ No newline at end of file + From 494e7deda04ea1a9dc0bad006ca218c635a8957f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=8D=8E=E6=B4=8B?= Date: Mon, 12 Mar 2018 17:15:57 +0800 Subject: [PATCH 21/21] 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"> - +