Skip to content

Commit d97f0ba

Browse files
lidong1665lidong1665
committed
增加-dagger2.0库
增加-dagger2.0库
1 parent 82a7438 commit d97f0ba

File tree

10 files changed

+103
-100
lines changed

10 files changed

+103
-100
lines changed

‎Android-Rapid-Development-Of-Library/.idea/gradle.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android-Rapid-Development-Of-Library/.idea/misc.xml

Lines changed: 25 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Android-Rapid-Development-Of-Library/.idea/vcs.xml

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

‎Android-Rapid-Development-Of-Library/android_library/android_library.iml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,29 +65,20 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6869
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6970
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7573
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
7974
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8475
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8677
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8778
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8879
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8980
</content>
90-
<orderEntry type="jdk" jdkName="Maven Android API 23 Platform" jdkType="Android SDK" />
81+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9182
<orderEntry type="sourceFolder" forTests="false" />
9283
<orderEntry type="library" exported="" name="butterknife-7.0.1" level="project" />
9384
<orderEntry type="library" exported="" name="gson-2.6.1" level="project" />

‎Android-Rapid-Development-Of-Library/app/app.iml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
3232
<exclude-output />
3333
<content url="file://$MODULE_DIR$">
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
@@ -65,12 +66,10 @@
6566
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6667
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
6768
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6969
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
70+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
7171
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7473
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.alipay.euler/andfix/0.3.1/jars" />
7574
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.1/jars" />
7675
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.1/jars" />
@@ -83,21 +82,16 @@
8382
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.getui/sdk/2.8.1.0/jars" />
8483
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mani/thindownloadmanager/1.0.0/jars" />
8584
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9085
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
9286
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
9487
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9588
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
9689
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
9791
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
9892
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9993
</content>
100-
<orderEntry type="jdk" jdkName="Maven Android API 23 Platform" jdkType="Android SDK" />
94+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
10195
<orderEntry type="sourceFolder" forTests="false" />
10296
<orderEntry type="library" exported="" name="gson-2.6.1" level="project" />
10397
<orderEntry type="library" exported="" name="okio-1.6.0" level="project" />
@@ -113,6 +107,7 @@
113107
<orderEntry type="library" exported="" name="appcompat-v7-23.2.1" level="project" />
114108
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
115109
<orderEntry type="library" exported="" name="retrofit-2.0.0" level="project" />
110+
<orderEntry type="library" exported="" name="javax.inject-1" level="project" />
116111
<orderEntry type="library" exported="" name="greendao-2.1.0" level="project" />
117112
<orderEntry type="library" exported="" name="rxjava-1.1.1" level="project" />
118113
<orderEntry type="library" exported="" name="eventbus-3.0.0" level="project" />
@@ -124,6 +119,7 @@
124119
<orderEntry type="library" exported="" name="adapter-rxjava-2.0.0" level="project" />
125120
<orderEntry type="library" exported="" name="okhttp-3.2.0" level="project" />
126121
<orderEntry type="library" exported="" name="analytics-5.6.7" level="project" />
122+
<orderEntry type="library" exported="" name="dagger-2.0" level="project" />
127123
<orderEntry type="module" module-name="android_library" exported="" />
128124
<orderEntry type="module" module-name="umeng_library" exported="" />
129125
</component>

‎Android-Rapid-Development-Of-Library/app/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apply plugin: 'com.android.application'
2-
2+
apply plugin: 'com.neenbedankt.android-apt'
33
android {
44
compileSdkVersion 23
55
buildToolsVersion "23.0.2"
@@ -48,4 +48,6 @@ dependencies {
4848
compile 'de.greenrobot:greendao:2.1.0'
4949
compile 'com.mani:thindownloadmanager:1.0.0'
5050
compile 'com.alipay.euler:andfix:0.3.1@aar'
51+
compile 'com.google.dagger:dagger:2.0'
52+
apt 'com.google.dagger:dagger-compiler:2.0'
5153
}

‎Android-Rapid-Development-Of-Library/app/src/main/java/com/lidong/demo/mvp/api/ApiManager.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
import com.lidong.demo.mvp.bean.WeatherData;
55

6+
import javax.inject.Inject;
7+
68
import retrofit2.Retrofit;
79
import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
810
import retrofit2.converter.gson.GsonConverterFactory;
@@ -14,23 +16,25 @@
1416
*/
1517
public class ApiManager {
1618

17-
private static final String ENDPOINT = "http://v.juhe.cn";
18-
19-
private static final Retrofit sRetrofit = new Retrofit .Builder()
20-
.baseUrl(ENDPOINT)
21-
.addConverterFactory(GsonConverterFactory.create())
22-
.addCallAdapterFactory(RxJavaCallAdapterFactory.create()) // 使用RxJava作为回调适配器
23-
.build();
19+
// private static final String ENDPOINT = "http://v.juhe.cn";
20+
//
21+
// private static final Retrofit sRetrofit = new Retrofit .Builder()
22+
// .baseUrl(ENDPOINT)
23+
// .addConverterFactory(GsonConverterFactory.create())
24+
// .addCallAdapterFactory(RxJavaCallAdapterFactory.create()) // 使用RxJava作为回调适配器
25+
// .build();
26+
//
27+
// private static final ApiManagerService apiManager = sRetrofit.create(ApiManagerService.class);
2428

25-
private static final ApiManagerService apiManager = sRetrofit.create(ApiManagerService.class);
29+
@Inject ApiModule apiModule;
2630

2731
/**
2832
* 获取天气数据
2933
* @param city
3034
* @return
3135
*/
3236
public static Observable<WeatherData> getWeatherData(String format, String city) {
33-
return apiManager.getWeatherData(format,city,"ad1d20bebafe0668502c8eea5ddd0333");
37+
return apiModule.provideApiManagerService().getWeatherData().getWeatherData(format,city,"ad1d20bebafe0668502c8eea5ddd0333");
3438
}
3539

3640

‎Android-Rapid-Development-Of-Library/app/src/main/java/com/lidong/demo/mvp/api/ApiModule.java

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package com.lidong.demo.mvp.api;
2+
3+
import javax.inject.Named;
4+
import javax.inject.Singleton;
5+
6+
import dagger.Module;
7+
import dagger.Provides;
8+
import okhttp3.HttpUrl;
9+
import retrofit2.Retrofit;
10+
import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
11+
12+
@Module(
13+
complete = false,
14+
library = true,
15+
injects = {
16+
ApiManagerService.class
17+
}
18+
)
19+
public class ApiModule {
20+
21+
public static final HttpUrl PRODUCTION_API_URL = HttpUrl.parse("http://v.juhe.cn");
22+
23+
@Provides
24+
@Singleton
25+
static HttpUrl provideBaseUrl() {
26+
return PRODUCTION_API_URL;
27+
}
28+
29+
@Provides
30+
@Singleton
31+
Retrofit provideRetrofit() {
32+
return new Retrofit.Builder() //
33+
.baseUrl(provideBaseUrl()) //
34+
.addCallAdapterFactory(RxJavaCallAdapterFactory.create()) //
35+
.build();
36+
}
37+
38+
@Provides
39+
@Singleton ApiManagerService provideApiManagerService(Retrofit retrofit) {
40+
return provideRetrofit().create(ApiManagerService.class);
41+
}
42+
43+
}

‎Android-Rapid-Development-Of-Library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:1.3.0'
9-
9+
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
1212
}

‎Android-Rapid-Development-Of-Library/umeng_library/umeng_library.iml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,29 +65,20 @@
6565
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6666
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6767
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
68+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
6869
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6970
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
7071
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
7272
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7573
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
7974
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
81-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8475
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8576
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8677
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8778
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
8879
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8980
</content>
90-
<orderEntry type="jdk" jdkName="Maven Android API 23 Platform" jdkType="Android SDK" />
81+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9182
<orderEntry type="sourceFolder" forTests="false" />
9283
<orderEntry type="library" exported="" name="umeng-update-v2.6.0.1" level="project" />
9384
<orderEntry type="library" exported="" name="support-v4-23.2.1" level="project" />

0 commit comments

Comments
 (0)