ResponseErrorListener

JessYanCoding · JessYanCoding · commit 9f45d9067bc3 · 2017-05-29T14:14:35.000+08:00
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ dependencies {
   RxErrorHandler rxErrorHandler = RxErrorHandler 
                 .builder()
                 .with(this)
-                .responseErroListener(new ResponseErroListener() {
+                .responseErrorListener(new ResponseErroListener() {
                     @Override
                     public void handleResponseError(Context context, Exception e) {
                         Log.w(TAG, "error handle");
diff --git a/app/src/main/java/me/jessyan/rxerrorhandler/demo/MainActivity.java b/app/src/main/java/me/jessyan/rxerrorhandler/demo/MainActivity.java
@@ -9,7 +9,7 @@
 import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
 import me.jessyan.rxerrorhandler.handler.RetryWithDelay;
-import me.jessyan.rxerrorhandler.handler.listener.ResponseErroListener;
+import me.jessyan.rxerrorhandler.handler.listener.ResponseErrorListener;
 
 public class MainActivity extends AppCompatActivity {
     private final String TAG = getClass().getSimpleName();
@@ -23,7 +23,7 @@ protected void onCreate(Bundle savedInstanceState) {
         RxErrorHandler rxErrorHandler = RxErrorHandler
                 .builder()
                 .with(this)
-                .responseErroListener(new ResponseErroListener() {
+                .responseErrorListener(new ResponseErrorListener() {
                     @Override
                     public void handleResponseError(Context context, Throwable t) {
                         Log.w(TAG, "error handle");
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,10 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.2'
-        classpath 'com.novoda:bintray-release:+'
+        //Gradle Android Maven plugin
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+        //Gradle Bintray Plugin
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -15,3 +15,4 @@
 #Fri Sep 02 13:24:52 CST 2016
 #systemProp.http.proxyHost=127.0.0.1
 #systemProp.http.proxyPort=1080
+org.gradle.jvmargs=-Xmx1536m
diff --git a/rxerrorhandler/bintray.gradle b/rxerrorhandler/bintray.gradle
@@ -1,25 +1,93 @@
-apply plugin: 'com.novoda.bintray-release'
+apply plugin: 'com.jfrog.bintray'
+apply plugin: 'com.github.dcendents.android-maven'
 
-allprojects {
-    repositories {
-        jcenter()
-    }
-    tasks.withType(Javadoc) {
-        options{ encoding "UTF-8"
-            charSet 'UTF-8'
-            links "http://docs.oracle.com/javase/7/docs/api"
+Properties properties = new Properties()
+boolean isHasFile = false
+if (project.rootProject.findProject('local.properties') != null){
+    isHasFile = true
+    properties.load(project.rootProject.file('local.properties').newDataInputStream())
+}
+
+def gitUrl = 'https://github.com/JessYanCoding/RxErrorHandler.git'   // Git仓库的url
+def siteUrl = 'https://github.com/JessYanCoding/RxErrorHandler'   // 项目的主页
+
+version = "2.0.2"
+group = "me.jessyan"
+
+
+bintray {
+    user = isHasFile ? properties.getProperty("bintray.user") : System.getenv("bintray_user")
+    key = isHasFile ? properties.getProperty("bintray.apikey") : System.getenv("bintray_apikey")
+
+    pkg {
+        repo = 'maven'
+        name = 'RxErrorHandler'
+        licenses = ["Apache-2.0"]
+        websiteUrl = siteUrl
+        vcsUrl = gitUrl
+        publish = true // 是否是公开项目。
+
+        version {
+            name = "2.0.2"
+            desc = 'Error Handle Of Rxjava.'
+            released = new Date()
+            vcsTag = 'v2.0.2'
+            attributes = ['gradle-plugin': 'com.use.less:com.use.less.gradle:gradle-useless-plugin']
         }
     }
+    configurations = ['archives']
 }
 
 
-def siteUrl = 'https://github.com/JessYanCoding/RxErrorHandler'   // 项目的主页
 
-publish {
-    userOrg = 'jessyancoding'      //bintray注册的用户名
-    groupId = 'me.jessyan'         //compile引用时的第1部分groupId
-    artifactId = 'rxerrorhandler'     //compile引用时的第2部分项目名
-    publishVersion = '2.0.2'    //compile引用时的第3部分版本号
-    desc = 'Error Handle Of Rxjava'
-    website = siteUrl
+install {
+    repositories.mavenInstaller {
+        // This generates POM.xml with proper parameters
+        pom {
+            project {
+                packaging 'aar'
+                // Add your description here
+                name 'RxErrorHandler'
+                description 'Error Handle Of Rxjava.'
+                url siteUrl
+                // Set your license
+                licenses {
+                    license {
+                        name 'The Apache Software License, Version 2.0'
+                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                developers {
+                    developer {
+                        id 'JessYanCoding'        //填写bintray或者github的用户名
+                        name 'jessyan'         //姓名，可以是中文
+                        email 'jess.yan.effort@gmail.com'
+                    }
+                }
+                scm {
+                    connection gitUrl
+                    developerConnection gitUrl
+                    url siteUrl
+                }
+            }
+        }
+    }
+}
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    classifier = 'sources'
+}
+task javadoc(type: Javadoc) {
+    failOnError false
+    source = android.sourceSets.main.java.srcDirs
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+artifacts {
+    archives javadocJar
+    archives sourcesJar
 }
diff --git a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/core/RxErrorHandler.java b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/core/RxErrorHandler.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 
 import me.jessyan.rxerrorhandler.handler.ErrorHandlerFactory;
-import me.jessyan.rxerrorhandler.handler.listener.ResponseErroListener;
+import me.jessyan.rxerrorhandler.handler.listener.ResponseErrorListener;
 
 /**
  * Created by jess on 9/2/16 13:27
@@ -27,7 +27,7 @@ public ErrorHandlerFactory getHandlerFactory() {
 
     public static final class Builder {
         private Context context;
-        private ResponseErroListener responseErroListener;
+        private ResponseErrorListener mResponseErrorListener;
         private ErrorHandlerFactory errorHandlerFactory;
 
         private Builder() {
@@ -38,19 +38,19 @@ public Builder with(Context context) {
             return this;
         }
 
-        public Builder responseErroListener(ResponseErroListener responseErroListener) {
-            this.responseErroListener = responseErroListener;
+        public Builder responseErrorListener(ResponseErrorListener responseErrorListener) {
+            this.mResponseErrorListener = responseErrorListener;
             return this;
         }
 
         public RxErrorHandler build() {
             if (context == null)
-                throw new IllegalStateException("context is required");
+                throw new IllegalStateException("Context is required");
 
-            if (responseErroListener == null)
-                throw new IllegalStateException("responseErroListener is required");
+            if (mResponseErrorListener == null)
+                throw new IllegalStateException("ResponseErrorListener is required");
 
-            this.errorHandlerFactory = new ErrorHandlerFactory(context, responseErroListener);
+            this.errorHandlerFactory = new ErrorHandlerFactory(context, mResponseErrorListener);
 
             return new RxErrorHandler(this);
         }
diff --git a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandlerFactory.java b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/ErrorHandlerFactory.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 
-import me.jessyan.rxerrorhandler.handler.listener.ResponseErroListener;
+import me.jessyan.rxerrorhandler.handler.listener.ResponseErrorListener;
 
 /**
  * Created by jess on 9/2/16 13:47
@@ -11,10 +11,10 @@
 public class ErrorHandlerFactory {
     public final String TAG = this.getClass().getSimpleName();
     private Context mContext;
-    private ResponseErroListener mResponseErroListener;
+    private ResponseErrorListener mResponseErrorListener;
 
-    public ErrorHandlerFactory(Context mContext, ResponseErroListener mResponseErroListener) {
-        this.mResponseErroListener = mResponseErroListener;
+    public ErrorHandlerFactory(Context mContext, ResponseErrorListener mResponseErrorListener) {
+        this.mResponseErrorListener = mResponseErrorListener;
         this.mContext = mContext;
     }
 
@@ -23,6 +23,6 @@ public ErrorHandlerFactory(Context mContext, ResponseErroListener mResponseErroL
      * @param throwable
      */
     public void handleError(Throwable throwable) {
-        mResponseErroListener.handleResponseError(mContext, throwable);
+        mResponseErrorListener.handleResponseError(mContext, throwable);
     }
 }
diff --git a/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/listener/ResponseErrorListener.java b/rxerrorhandler/src/main/java/me/jessyan/rxerrorhandler/handler/listener/ResponseErrorListener.java
@@ -6,10 +6,10 @@
  * Created by jess on 9/2/16 13:58
  * Contact with jess.yan.effort@gmail.com
  */
-public interface ResponseErroListener {
+public interface ResponseErrorListener {
     void handleResponseError(Context context, Throwable t);
 
-    ResponseErroListener EMPTY = new ResponseErroListener() {
+    ResponseErrorListener EMPTY = new ResponseErrorListener() {
         @Override
         public void handleResponseError(Context context, Throwable t) {
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,10 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`	`8`	`classpath 'com.android.tools.build:gradle:2.3.2'`
`9`		`- classpath 'com.novoda:bintray-release:+'`
	`9`	`+ //Gradle Android Maven plugin`
	`10`	`+ classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'`
	`11`	`+ //Gradle Bintray Plugin`
	`12`	`+ classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'`
`10`	`13`	`}`
`11`	`14`	`}`
`12`	`15`