github/AndroidMVPSample
1
0
Fork 0
mirror of https://github.com/WuXiaolong/AndroidMVPSample.git synced 2025-06-06 21:34:04 +08:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
wuxiaolong 2017-06-02 16:37:57 +08:00
parent 77bfdb5d4a
commit 6d23bebca7
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -1,8 +1,8 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 24
buildToolsVersion "23.0.3"
compileSdkVersion 25
buildToolsVersion "25.0.3"
defaultConfig {
applicationId "com.wuxiaolong.androidmvpsample"
@ -21,7 +21,7 @@ android {
dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.wuxiaolong.androidutils:androidutils:1.0.5'
compile 'com.jakewharton:butterknife:7.0.1'
compile 'com.squareup.retrofit2:retrofit:2.0.2'

4
app/src/main/java/com/wuxiaolong/androidmvpsample/mvp/other/BasePresenter.java
View File

@ -1,7 +1,7 @@
package com.wuxiaolong.androidmvpsample.mvp.other;
import com.wuxiaolong.androidmvpsample.retrofit.ApiStores;
import com.wuxiaolong.androidmvpsample.retrofit.AppClient;
import com.wuxiaolong.androidmvpsample.retrofit.ApiClient;
import rx.Observable;
import rx.Subscriber;
@ -23,7 +23,7 @@ public class BasePresenter<V> {
public void attachView(V mvpView) {
this.mvpView = mvpView;
apiStores = AppClient.retrofit().create(ApiStores.class);
apiStores = ApiClient.retrofit().create(ApiStores.class);
}

2
app/src/main/java/com/wuxiaolong/androidmvpsample/retrofit/AppClient.java → app/src/main/java/com/wuxiaolong/androidmvpsample/retrofit/ApiClient.java
View File

@ -14,7 +14,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
* 微信公众号：吴小龙同学
* 个人博客：http://wuxiaolong.me/
*/
public class AppClient {
public class ApiClient {
public static Retrofit mRetrofit;
public static Retrofit retrofit() {

7
app/src/main/java/com/wuxiaolong/androidmvpsample/ui/BaseActivity.java
View File

@ -14,7 +14,7 @@ import android.widget.Toast;
import com.wuxiaolong.androidmvpsample.R;
import com.wuxiaolong.androidmvpsample.retrofit.ApiStores;
import com.wuxiaolong.androidmvpsample.retrofit.AppClient;
import com.wuxiaolong.androidmvpsample.retrofit.ApiClient;
import com.wuxiaolong.androidutils.library.LogUtil;
import java.util.ArrayList;
@ -37,7 +37,6 @@ import rx.subscriptions.CompositeSubscription;
*/
public class BaseActivity extends AppCompatActivity {
public Activity mActivity;
public ApiStores apiStores = AppClient.retrofit().create(ApiStores.class);
private CompositeSubscription mCompositeSubscription;
private List<Call> calls;
@ -72,6 +71,10 @@ public class BaseActivity extends AppCompatActivity {
super.onDestroy();
}
public ApiStores apiStores() {
return ApiClient.retrofit().create(ApiStores.class);
}
public void addCalls(Call call) {
if (calls == null) {
calls = new ArrayList<>();

4
app/src/main/java/com/wuxiaolong/androidmvpsample/ui/MainActivity.java
View File

@ -75,7 +75,7 @@ public class MainActivity extends MvpActivity<MainPresenter> implements MainView
private void loadDataByRetrofit() {
showProgressDialog();
Call<MainModel> call = apiStores.loadDataByRetrofit("101190201");
Call<MainModel> call = apiStores().loadDataByRetrofit("101190201");
call.enqueue(new RetrofitCallback<MainModel>() {
@Override
public void onSuccess(MainModel model) {
@ -103,7 +103,7 @@ public class MainActivity extends MvpActivity<MainPresenter> implements MainView
//全国+国外主要城市代码http://mobile.weather.com.cn/js/citylist.xml
private void loadDataByRetrofitRxjava() {
showProgressDialog();
addSubscription(apiStores.loadDataByRetrofitRxjava("101220602"),
addSubscription(apiStores().loadDataByRetrofitRxjava("101220602"),
new ApiCallback<MainModel>() {
@Override
public void onSuccess(MainModel model) {

2
build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.android.tools.build:gradle:2.3.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Thu Sep 22 09:35:31 CST 2016
#Fri Jun 02 11:35:48 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip