Skip to content

Commit d1ad8ab

Browse files
committed
[anno] [change jsonComponent to jsonlib. Currently still use Router to fetch JsonService]
1 parent d9b2200 commit d1ad8ab

File tree

18 files changed

+20
-79
lines changed

18 files changed

+20
-79
lines changed

app/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ android {
2727
dependencies {
2828
compile project(':componentservice')
2929

30+
compile project(':jsonlib')
31+
3032
// annotationProcessor project(':router-anno-compiler')
3133
}
3234

app/gradle.properties

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +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,sharecomponent,jsoncomponent,dicomponent
16-
#debugComponent=readercomponent,com.mrzhang.share:sharecomponent,jsoncomponent,dicomponent
17-
18-
compileComponent=readercomponent,sharecomponent,jsoncomponent,dicomponent
15+
debugComponent=readercomponent,sharecomponent
16+
#debugComponent=readercomponent,com.mrzhang.share:sharecomponent
17+
compileComponent=readercomponent,sharecomponent
1918

2019

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
import android.app.Application;
44

5+
import com.ljsw.component.json.serviceimpl.JsonServiceImpl;
6+
import com.mrzhang.component.componentlib.router.Router;
7+
import com.mrzhang.componentservice.json.JsonService;
8+
59
/**
610
* Created by mrzhang on 2017/6/15.
711
*/
@@ -16,6 +20,8 @@ public void onCreate() {
1620
// Router.registerComponent("com.mrzhang.reader.applike.ReaderAppLike");
1721
// Router.registerComponent("com.mrzhang.share.applike.ShareApplike");
1822

23+
// register jsonService
24+
Router.getInstance().addService(JsonService.class.getSimpleName(), new JsonServiceImpl());
1925
}
2026

2127

componentservice/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ android {
2424
dependencies {
2525
compile project(':componentlib')
2626
compile project(':basicres')
27-
compile fileTree(dir: 'libs', include: ['*.jar'])
28-
27+
compile fileTree(include: ['*.jar'], dir: 'libs')
2928
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
3029
exclude group: 'com.android.support', module: 'support-annotations'
3130
})

jsoncomponent/src/main/java/com/ljsw/component/json/applike/JsonAppLike.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

jsoncomponent/src/main/runalone/AndroidManifest.xml

Lines changed: 0 additions & 13 deletions
This file was deleted.

jsoncomponent/src/main/runalone/java/com/ljsw/component/json/runalone/application/JsonApplication.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

jsoncomponent/src/main/runalone/res/values/strings.xml

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
1-
apply plugin: 'com.dd.comgradle'
1+
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.2"
4+
compileSdkVersion 26
5+
buildToolsVersion "26.0.0"
6+
67
defaultConfig {
78
minSdkVersion 15
8-
targetSdkVersion 14
9+
targetSdkVersion 26
910
versionCode 1
1011
versionName "1.0"
12+
1113
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
12-
}
1314

15+
}
1416
buildTypes {
1517
release {
1618
minifyEnabled false
1719
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1820
}
19-
debug {
20-
minifyEnabled false
21-
}
2221
}
23-
resourcePrefix "json_"
2422
}
2523

2624
dependencies {
@@ -31,9 +29,4 @@ dependencies {
3129
exclude group: 'com.android.support', module: 'support-annotations'
3230
})
3331
testCompile 'junit:junit:4.12'
34-
}
35-
36-
combuild {
37-
applicatonName = 'com.ljsw.component.json.runalone.application.JsonApplication'
38-
isRegisterCompoAuto = true
3932
}

0 commit comments

Comments
 (0)