Skip to content

Commit eb41c84

Browse files
committed
Upgrade AndroidSdk and improve demo
1 parent 5cd864d commit eb41c84

File tree

4 files changed

+40
-22
lines changed

4 files changed

+40
-22
lines changed

app/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.3"
4+
compileSdkVersion rootProject.compileSdkVersion
5+
buildToolsVersion rootProject.buildToolsVersion
66

77
defaultConfig {
88
applicationId "me.jessyan.rxerrorhandler.demo"
9-
minSdkVersion 15
10-
targetSdkVersion 25
11-
versionCode 3
12-
versionName "2.0.2"
9+
minSdkVersion rootProject.minSdkVersion
10+
targetSdkVersion rootProject.targetSdkVersion
11+
versionCode rootProject.versionCode
12+
versionName rootProject.versionName
1313
}
1414
buildTypes {
1515
release {
@@ -25,8 +25,8 @@ android {
2525

2626
dependencies {
2727
compile fileTree(include: ['*.jar'], dir: 'libs')
28-
testCompile 'junit:junit:4.12'
2928
compile 'com.android.support:appcompat-v7:25.3.1'
29+
compile 'io.reactivex.rxjava2:rxjava:2.1.3'
3030
// compile 'me.jessyan:rxerrorhandler:2.0.2'
3131
compile project(':rxerrorhandler')
3232
}

app/src/main/java/me/jessyan/rxerrorhandler/demo/MainActivity.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
package me.jessyan.rxerrorhandler.demo;
22

33
import android.content.Context;
4+
import android.net.ParseException;
45
import android.os.Bundle;
56
import android.support.v7.app.AppCompatActivity;
67
import android.util.Log;
78

9+
import org.json.JSONException;
10+
11+
import java.net.SocketTimeoutException;
12+
import java.net.UnknownHostException;
13+
814
import io.reactivex.Observable;
915
import me.jessyan.rxerrorhandler.core.RxErrorHandler;
1016
import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
@@ -19,19 +25,25 @@ protected void onCreate(Bundle savedInstanceState) {
1925
super.onCreate(savedInstanceState);
2026
setContentView(R.layout.activity_main);
2127

22-
2328
RxErrorHandler rxErrorHandler = RxErrorHandler
2429
.builder()
2530
.with(this)
2631
.responseErrorListener(new ResponseErrorListener() {
2732
@Override
2833
public void handleResponseError(Context context, Throwable t) {
29-
Log.w(TAG, "error handle");
34+
if (t instanceof UnknownHostException) {
35+
//do something ...
36+
} else if (t instanceof SocketTimeoutException) {
37+
//do something ...
38+
} else if (t instanceof ParseException || t instanceof JSONException) {
39+
//do something ...
40+
}
41+
Log.w(TAG, "Error handle");
3042
}
3143
}).build();
3244

3345
Observable
34-
.error(new Exception("erro"))
46+
.error(new Exception("Error"))
3547
.retryWhen(new RetryWithDelay(3, 2))//retry(http connect timeout)
3648
.subscribe(new ErrorHandleSubscriber<Object>(rxErrorHandler) {
3749
@Override

build.gradle

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.2'
8+
classpath 'com.android.tools.build:gradle:2.3.3'
99
classpath 'com.novoda:bintray-release:0.4.0'
1010

1111
}
@@ -22,3 +22,12 @@ allprojects {
2222
task clean(type: Delete) {
2323
delete rootProject.buildDir
2424
}
25+
26+
ext {
27+
minSdkVersion = 15
28+
targetSdkVersion = 26
29+
compileSdkVersion = 26
30+
buildToolsVersion = "26.0.1"
31+
versionCode = 5
32+
versionName = "2.0.5"
33+
}

rxerrorhandler/build.gradle

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "25.0.3"
4+
compileSdkVersion rootProject.compileSdkVersion
5+
buildToolsVersion rootProject.buildToolsVersion
66

77
defaultConfig {
8-
minSdkVersion 15
9-
targetSdkVersion 25
10-
versionCode 3
11-
versionName "2.0.2"
8+
minSdkVersion rootProject.minSdkVersion
9+
targetSdkVersion rootProject.targetSdkVersion
10+
versionCode rootProject.versionCode
11+
versionName rootProject.versionName
12+
consumerProguardFiles 'proguard-rules.pro'
1213
}
1314
buildTypes {
1415
release {
@@ -24,11 +25,7 @@ android {
2425

2526
dependencies {
2627
compile fileTree(dir: 'libs', include: ['*.jar'])
27-
testCompile 'junit:junit:4.12'
28-
compile 'com.android.support:appcompat-v7:25.3.1'
29-
compile 'io.reactivex.rxjava2:rxjava:2.1.0'
30-
28+
provided 'io.reactivex.rxjava2:rxjava:2.1.3'
3129
}
3230

33-
3431
apply from: 'bintray.gradle'

0 commit comments

Comments
 (0)