From 5c00f77abd3ee1bd296f7554238bf67ba2a1e3dc Mon Sep 17 00:00:00 2001 From: mqzhangw Date: Tue, 21 Nov 2017 03:49:16 -0600 Subject: [PATCH 01/52] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 31ea6a7..9cbc250 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,9 @@ combuild { #### 4、混淆 在混淆文件中增加如下配置 ``` +-keep interface * { + ; +} -keep class com.mrzhang.component.componentlib.** {*;} -keep class * implements com.mrzhang.component.componentlib.applicationlike.IApplicationLike {*;} ``` From 8dd3e8bb98a1bdd880d7c0594122818f91580c65 Mon Sep 17 00:00:00 2001 From: mrzhang Date: Thu, 14 Dec 2017 19:45:31 +0800 Subject: [PATCH 02/52] UI router by Uri --- app/build.gradle | 5 + app/src/main/res/layout/activity_main.xml | 69 ++-- componentlib/build.gradle | 4 +- .../componentlib/router/ui/IUIRouter.java | 6 + .../componentlib/router/ui/UIRouter.java | 37 +- componentrelease/readercomponent-release.aar | Bin 18121 -> 0 bytes componentrelease/sharecomponent-release.aar | Bin 17960 -> 0 bytes componentservice/build.gradle | 2 - .../componentservice/share/bean/Author.java | 35 ++ dilib/build.gradle | 29 -- jsonlib/.gitignore | 1 - jsonlib/gradle.properties | 18 - jsonlib/proguard-rules.pro | 25 -- .../json/ExampleInstrumentedTest.java | 26 -- jsonlib/src/main/AndroidManifest.xml | 12 - jsonlib/src/main/res/values/strings.xml | 3 - .../ljsw/component/json/ExampleUnitTest.java | 17 - .../com/mrzhang/reader/ReaderFragment.java | 23 +- .../ljsw/router/compiler/model/GroupInfo.java | 35 -- .../processor/AutowiredProcessor.java | 4 +- .../compiler/processor/RouterProcessor.java | 318 ++++++++---------- .../ljsw/router/compiler/utils/Constants.java | 10 +- .../com/ljsw/router/facade/Constants.java | 1 + .../router/facade/annotation/RouteNode.java | 15 +- .../ljsw/router/facade/annotation/Router.java | 26 -- .../com/ljsw/router/facade/model/Node.java | 11 + {dilib => router-di-lib}/.gitignore | 0 {jsonlib => router-di-lib}/build.gradle | 6 +- {dilib => router-di-lib}/gradle.properties | 0 {dilib => router-di-lib}/proguard-rules.pro | 0 .../component/di/ExampleInstrumentedTest.java | 0 .../src/main/AndroidManifest.xml | 0 .../com/ljsw/component/di/route/ISyringe.java | 0 .../com/ljsw/component/di/utils/UriUtils.java | 135 ++++++++ .../component/service}/AutowiredService.java | 4 +- .../service}/AutowiredServiceImpl.java | 4 +- .../ljsw/component/service}/JsonService.java | 4 +- .../component/service}/JsonServiceImpl.java | 11 +- .../src/main/res/values/strings.xml | 0 .../ljsw/component/di/ExampleUnitTest.java | 0 settings.gradle | 2 +- sharecomponent/build.gradle | 12 +- .../java/com/mrzhang/share/ShareActivity.java | 44 +-- .../mrzhang/share/applike/ShareApplike.java | 8 +- .../share/compouirouter/ShareUiRouter.java | 2 - .../main/res/layout/share_activity_share.xml | 50 ++- 46 files changed, 496 insertions(+), 518 deletions(-) delete mode 100644 componentrelease/readercomponent-release.aar delete mode 100644 componentrelease/sharecomponent-release.aar create mode 100644 componentservice/src/main/java/com/mrzhang/componentservice/share/bean/Author.java delete mode 100644 dilib/build.gradle delete mode 100644 jsonlib/.gitignore delete mode 100644 jsonlib/gradle.properties delete mode 100644 jsonlib/proguard-rules.pro delete mode 100644 jsonlib/src/androidTest/java/com/ljsw/component/json/ExampleInstrumentedTest.java delete mode 100644 jsonlib/src/main/AndroidManifest.xml delete mode 100644 jsonlib/src/main/res/values/strings.xml delete mode 100644 jsonlib/src/test/java/com/ljsw/component/json/ExampleUnitTest.java delete mode 100644 router-anno-compiler/src/main/java/com/ljsw/router/compiler/model/GroupInfo.java delete mode 100644 router-annotation/src/main/java/com/ljsw/router/facade/annotation/Router.java rename {dilib => router-di-lib}/.gitignore (100%) rename {jsonlib => router-di-lib}/build.gradle (94%) rename {dilib => router-di-lib}/gradle.properties (100%) rename {dilib => router-di-lib}/proguard-rules.pro (100%) rename {dilib => router-di-lib}/src/androidTest/java/com/ljsw/component/di/ExampleInstrumentedTest.java (100%) rename {dilib => router-di-lib}/src/main/AndroidManifest.xml (100%) rename {dilib => router-di-lib}/src/main/java/com/ljsw/component/di/route/ISyringe.java (100%) create mode 100644 router-di-lib/src/main/java/com/ljsw/component/di/utils/UriUtils.java rename {dilib/src/main/java/com/ljsw/component/di => router-di-lib/src/main/java/com/ljsw/component/service}/AutowiredService.java (88%) rename {dilib/src/main/java/com/ljsw/component/di/serviceimpl => router-di-lib/src/main/java/com/ljsw/component/service}/AutowiredServiceImpl.java (94%) rename {jsonlib/src/main/java/com/ljsw/component/json => router-di-lib/src/main/java/com/ljsw/component/service}/JsonService.java (90%) rename {jsonlib/src/main/java/com/ljsw/component/json/serviceimpl => router-di-lib/src/main/java/com/ljsw/component/service}/JsonServiceImpl.java (83%) rename {dilib => router-di-lib}/src/main/res/values/strings.xml (100%) rename {dilib => router-di-lib}/src/test/java/com/ljsw/component/di/ExampleUnitTest.java (100%) diff --git a/app/build.gradle b/app/build.gradle index 988b6a9..3f03fd5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,11 @@ android { versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + dataBinding { + enabled = true + } + } buildTypes { release { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index fb57783..19e8032 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,41 +1,46 @@ - + - + android:layout_height="match_parent" + android:orientation="vertical"> -