Skip to content

Commit 1a62bf9

Browse files
author
陈绍龙
committed
单独独立出框架层Library
1 parent cba9aef commit 1a62bf9

40 files changed

+236
-82
lines changed

‎.idea/gradle.xml‎

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

‎.idea/modules.xml‎

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

‎app/build.gradle‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,34 +52,42 @@ dependencies {
5252
implementation externalAndroidConstraintLayout
5353
implementation externalMultidex
5454

55-
/**----Retrofit、Rxjava2、dagger2 等框架所必须 start ---**/
56-
//retrofit、okhttp
57-
implementation externalRetrofit
58-
implementation externalRetrofitConverterGson
59-
implementation externalRetrofitRxjava2
60-
implementation externalOkhttp3
55+
// /**----Retrofit、Rxjava2、dagger2 等框架所必须 start ---**/
56+
// //retrofit、okhttp
57+
// implementation externalRetrofit
58+
// implementation externalRetrofitConverterGson
59+
// implementation externalRetrofitRxjava2
60+
// implementation externalOkhttp3
61+
//
62+
// //butterknife
63+
// implementation externalButterknife
64+
// annotationProcessor(externalButterknifeCompiler) {
65+
// exclude module: 'support-annotations'
66+
// }
67+
//
68+
// //rxjava2
69+
// implementation externalRxjava2
70+
// implementation externalRxandroid2
71+
// implementation externalRxlifecycle2
72+
// implementation externalRxlifecycle2Android
73+
// implementation externalRxlifecycle2Components
74+
//
75+
// //dagger2
76+
// implementation externalDagger2
77+
// implementation externalDagger2Android
78+
// implementation externalDagger2AndroidSupport
79+
// annotationProcessor externalDagger2Compiler
80+
// annotationProcessor externalDagger2AndroidProcessor
81+
// /**----Retrofit、Rxjava2、dagger2 等框架所必须 end---**/
82+
6183

62-
//butterknife
63-
implementation externalButterknife
6484
annotationProcessor(externalButterknifeCompiler) {
6585
exclude module: 'support-annotations'
6686
}
67-
68-
//rxjava2
69-
implementation externalRxjava2
70-
implementation externalRxandroid2
71-
implementation externalRxlifecycle2
72-
implementation externalRxlifecycle2Android
73-
implementation externalRxlifecycle2Components
74-
75-
//dagger2
76-
implementation externalDagger2
77-
implementation externalDagger2Android
78-
implementation externalDagger2AndroidSupport
7987
annotationProcessor externalDagger2Compiler
8088
annotationProcessor externalDagger2AndroidProcessor
81-
/**----Retrofit、Rxjava2、dagger2 等框架所必须 end---**/
8289

90+
implementation project(':solo')
8391

8492
testImplementation 'junit:junit:4.12'
8593
androidTestImplementation 'com.android.support.test:runner:1.0.2'

‎app/src/main/java/com/mydagger/demo/application/App.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import android.support.multidex.MultiDexApplication;
44
import android.util.Log;
55

6-
import com.mydagger.demo.aframe.di.component.DaggerAppComponent;
6+
import com.solomvp.frame.di.component.DaggerAppComponent;
77
import com.mydagger.demo.base.GlobalHttpHandlerImpl;
8-
import com.mydagger.demo.aframe.di.component.AppComponent;
9-
import com.mydagger.demo.aframe.di.module.GlobalConfigModule;
8+
import com.solomvp.frame.di.component.AppComponent;
9+
import com.solomvp.frame.di.module.GlobalConfigModule;
1010

1111

1212
/**

‎app/src/main/java/com/mydagger/demo/base/BaseActivity.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import android.support.v7.app.AppCompatActivity;
66
import android.view.InflateException;
77

8+
import com.solomvp.frame.mvp.IPresenter;
9+
810
import javax.inject.Inject;
911

1012
import butterknife.ButterKnife;

‎app/src/main/java/com/mydagger/demo/base/GlobalHttpHandlerImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import com.google.gson.Gson;
1010
import com.google.gson.GsonBuilder;
1111
import com.google.gson.stream.JsonReader;
12-
import com.mydagger.demo.aframe.http.GlobalHttpHandler;
13-
import com.mydagger.demo.aframe.http.log.RequestInterceptor;
12+
import com.solomvp.frame.http.GlobalHttpHandler;
13+
import com.solomvp.frame.http.log.RequestInterceptor;
1414

1515
import okhttp3.Interceptor;
1616
import okhttp3.Request;

‎app/src/main/java/com/mydagger/demo/di/component/UserComponent.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.mydagger.demo.di.component;
22

3-
import com.mydagger.demo.aframe.di.component.AppComponent;
3+
import com.solomvp.frame.di.component.AppComponent;
44
import com.mydagger.demo.di.module.UserModule;
5-
import com.mydagger.demo.aframe.di.scope.ActivityScope;
5+
import com.solomvp.frame.di.scope.ActivityScope;
66
import com.mydagger.demo.feature.user.contract.UserContract;
77
import com.mydagger.demo.feature.user.ui.activity.LoginActivity;
88

‎app/src/main/java/com/mydagger/demo/feature/user/contract/UserContract.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.mydagger.demo.feature.user.contract;
22

3-
import com.mydagger.demo.base.IModel;
4-
import com.mydagger.demo.base.IView;
3+
import com.solomvp.frame.mvp.IModel;
4+
import com.solomvp.frame.mvp.IView;
55
import com.mydagger.demo.feature.user.model.entity.Self;
66

77
import io.reactivex.Observable;

‎app/src/main/java/com/mydagger/demo/feature/user/model/UserModel.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.mydagger.demo.feature.user.model;
22

3-
import com.mydagger.demo.aframe.di.scope.ActivityScope;
3+
import com.solomvp.frame.di.scope.ActivityScope;
44
import com.mydagger.demo.feature.user.contract.UserContract;
55
import com.mydagger.demo.feature.user.model.entity.Self;
66
import com.mydagger.demo.feature.user.model.service.UserService;

‎app/src/main/java/com/mydagger/demo/feature/user/presenter/UserPresenter.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
package com.mydagger.demo.feature.user.presenter;
22

3-
import com.mydagger.demo.base.BasePresenter;
4-
import com.mydagger.demo.base.NObserver;
5-
import com.mydagger.demo.aframe.di.scope.ActivityScope;
3+
import com.solomvp.frame.mvp.BasePresenter;
4+
import com.solomvp.frame.mvp.NObserver;
5+
import com.solomvp.frame.di.scope.ActivityScope;
66
import com.mydagger.demo.feature.user.contract.UserContract;
77
import com.mydagger.demo.feature.user.model.entity.Self;
8-
import com.mydagger.demo.aframe.http.RetryWithDelay;
98

109
import javax.inject.Inject;
1110

0 commit comments

Comments
 (0)