Skip to content

Commit 2976aeb

Browse files
authored
Merge pull request #19 from leobert-lan/feature/anno
Feature/anno
2 parents 5688ea0 + 9639fa2 commit 2976aeb

File tree

60 files changed

+1589
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1589
-42
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ demo解读请参考文章[Android彻底组件化demo发布](http://www.jianshu.c
66
### 实现功能:
77
- 组件可以单独调试
88
- 组件之间通过接口+实现的方式进行数据传输
9-
- 使用schme和host路由的方式进行activity之间的跳转
9+
- 使用scheme和host路由的方式进行activity之间的跳转
1010
- 任意组件可以充当host,集成其他组件进行集成调试
1111
- 可以动态对已集成的组件进行加载和卸载
1212
- 杜绝组件之前相互耦合,代码完全隔离,彻底解耦

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ android {
2626

2727
dependencies {
2828
compile project(':componentservice')
29+
// annotationProcessor project(':router-anno-compiler')
2930
}
3031

3132
combuild {

app/gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ org.gradle.jvmargs=-Xmx1536m
1212
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1313
# org.gradle.parallel=true
1414
isRunAlone=true
15-
debugComponent=readercomponent,com.mrzhang.share:sharecomponent
15+
debugComponent=readercomponent,sharecomponent
16+
#debugComponent=readercomponent,com.mrzhang.share:sharecomponent
1617
compileComponent=readercomponent,sharecomponent
1718

1819

app/src/main/java/com/mrzhang/component/MainActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ protected void onCreate(Bundle savedInstanceState) {
3030
showFragment();
3131
}
3232

33+
3334
private void showFragment() {
3435
if (fragment != null) {
3536
ft = getSupportFragmentManager().beginTransaction();

app/src/main/java/com/mrzhang/component/application/AppApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public void onCreate() {
1515
//如果isRegisterCompoAuto为false,则需要通过反射加载组件
1616
// Router.registerComponent("com.mrzhang.reader.applike.ReaderAppLike");
1717
// Router.registerComponent("com.mrzhang.share.applike.ShareApplike");
18-
1918
}
2019

2120

basicres/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,8 @@ android {
2525

2626
dependencies {
2727
compile project(':basiclib')
28+
testCompile 'junit:junit:4.12'
29+
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
30+
exclude group: 'com.android.support', module: 'support-annotations'
31+
})
2832
}

build-gradle/src/main/groovy/com.dd.buildgradle/ComCodeTransform.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public class ComCodeTransform extends Transform {
9292

9393

9494
private void getRealApplicationName(Collection<TransformInput> inputs) {
95-
applicationName = project.extensions.combuild.applicatonName
95+
applicationName = project.extensions.combuild.applicationName
9696
if (applicationName == null || applicationName.isEmpty()) {
9797
throw new RuntimeException("you should set applicationName in combuild")
9898
}

build-gradle/src/main/groovy/com.dd.buildgradle/exten/ComExtension.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ public class ComExtension {
99
boolean isRegisterCompoAuto = false;
1010

1111
/**
12-
* 当前组件的applicatonName,用于字节码插入。
12+
* 当前组件的applicationName,用于字节码插入。
1313
* 当isRegisterCompoAuto==true的时候是必须的
1414
*/
15-
String applicatonName
15+
String applicationName
1616

1717

1818
}

componentlib/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ android {
2727
dependencies {
2828
compile fileTree(dir: 'libs', include: ['*.jar'])
2929
compile 'com.android.support:appcompat-v7:26.+'
30+
31+
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
32+
exclude group: 'com.android.support', module: 'support-annotations'
33+
})
34+
testCompile 'junit:junit:4.12'
3035
}
3136

3237

componentlib/src/main/java/com/mrzhang/component/componentlib/router/Router.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import java.util.HashMap;
99

1010
/**
11+
* Center router, works for component-dynamic-load/remove and services add/remove/get
1112
* Created by mrzhang on 2017/6/15.
1213
*/
13-
1414
public class Router {
1515

1616
private HashMap<String, Object> services = new HashMap<>();
@@ -33,6 +33,7 @@ public static Router getInstance() {
3333
return instance;
3434
}
3535

36+
3637
public synchronized void addService(String serviceName, Object serviceImpl) {
3738
if (serviceName == null || serviceImpl == null) {
3839
return;

0 commit comments

Comments
 (0)