修复了build的bug

.gitignore

@@ -34,6 +34,7 @@ captures/
 
 # Intellij
 *.iml
+.idea
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta7'
+        classpath 'com.android.tools.build:gradle:3.0.1'
 
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Oct 11 21:25:17 CST 2017
+#Mon Feb 19 10:31:07 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip

library/build.gradle

@@ -6,7 +6,7 @@ android {
 
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 19
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
@@ -21,7 +21,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
+    packageBuildConfig(false)
 }
 
 dependencies {
@@ -31,7 +31,7 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.squareup.okhttp3:okhttp:3.9.0'
+    compile 'com.squareup.okhttp3:okhttp:3.9.1'
 
     compile 'com.squareup.retrofit2:retrofit:2.3.0'
     compile 'com.squareup.retrofit2:converter-gson:2.3.0'

library/src/main/AndroidManifest.xml

@@ -1,2 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="xyz.zzyandzzy.utiliy" />
+    package="xyz.zzyandzzy.utiliy">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+</manifest>

library/src/main/java/xyz/zzyandzzy/utiliy/net/RetrofitGet.java

@@ -1,7 +1,5 @@
 package xyz.zzyandzzy.utiliy.net;
 
-import org.json.JSONObject;
-
 import java.util.Map;
 
 import io.reactivex.Observable;
@@ -14,11 +12,9 @@
 
 public interface RetrofitGet {
     @GET
-    Observable<ResponseBody> doGetForUrl(@Url String url);
-
-    @GET("{path}")
-    Observable<ResponseBody> doGetForPath(@Path("path") String path);
+    Observable<ResponseBody> doGetForUrl(@Url String path);
 
-    @GET("{path}")
-    Observable<ResponseBody> doGetForPathAddQuery(@Path("path") String path, @QueryMap Map<String, String> params);
+    @GET
+    Observable<ResponseBody> doGetForPathAddQuery(@Url String path,
+                                                  @QueryMap Map<String, Object> params);
 }

library/src/main/java/xyz/zzyandzzy/utiliy/net/RetrofitHttpUtils.java

@@ -1,5 +1,7 @@
 package xyz.zzyandzzy.utiliy.net;
 
+import android.support.annotation.CheckResult;
+
 import org.json.JSONObject;
 
 import java.util.Map;
@@ -10,15 +12,20 @@
 import io.reactivex.annotations.NonNull;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
+import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
+import okhttp3.RequestBody;
 import okhttp3.ResponseBody;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
+import retrofit2.http.PATCH;
+import xyz.zzyandzzy.utiliy.log.LogUtils;
 
 public class RetrofitHttpUtils {
     // 超时
     private static final long TIMEOUT = 10;
+    //默认子url
     private static final String BASE_URL = "http://www.zzyandzzy.xyz/";
 
     private static OkHttpClient client = null;
@@ -51,8 +58,9 @@ private static OkHttpClient getInstanceOkHttpClient() {
      * @param baseUrl 子url
      * @return Retrofit
      */
+    @CheckResult
     private static Retrofit getInstanceRetrofit(@NonNull String baseUrl) {
-        if (client == null){
+        if (client == null) {
             client = getInstanceOkHttpClient();
         }
         return new Retrofit.Builder()
@@ -67,8 +75,9 @@ private static Retrofit getInstanceRetrofit(@NonNull String baseUrl) {
      * @param baseUrl 子url
      * @return ResponseBody
      */
+    @CheckResult
     public static Observable<ResponseBody> staticDoGetUrl(@NonNull String baseUrl) {
-        if (retrofit == null){
+        if (retrofit == null) {
             retrofit = getInstanceRetrofit(BASE_URL);
         }
         RetrofitGet retrofitGet = retrofit.create(RetrofitGet.class);
@@ -81,6 +90,7 @@ public static Observable<ResponseBody> staticDoGetUrl(@NonNull String baseUrl) {
      * @param baseUrl 子Url
      * @return JSONObject
      */
+    @CheckResult
     public static Observable<JSONObject> staticDoGetUrlToJson(@NonNull String baseUrl) {
         return staticDoGetUrl(baseUrl).map(new Function<ResponseBody, JSONObject>() {
             @Override
@@ -91,16 +101,81 @@ public JSONObject apply(ResponseBody body) throws Exception {
         });
     }
 
+    /**
+     * @param baseUrl 子url
+     * @return ResponseBody
+     */
+    @CheckResult
+    public static Observable<ResponseBody> staticDoPostUrl(@NonNull String baseUrl) {
+        if (retrofit == null) {
+            retrofit = getInstanceRetrofit(BASE_URL);
+        }
+        RetrofitPost retrofitPost = retrofit.create(RetrofitPost.class);
+        return retrofitPost.doPostForUrl(baseUrl)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    /**
+     * @param baseUrl 子url
+     * @return JSONObject
+     */
+    @CheckResult
+    public static Observable<JSONObject> staticDoPostUrlToJson(@NonNull String baseUrl) {
+        return staticDoPostUrl(baseUrl).map(new Function<ResponseBody, JSONObject>() {
+            @Override
+            public JSONObject apply(ResponseBody body) throws Exception {
+                String str = body.string();
+                return new JSONObject(str);
+            }
+        });
+    }
+
+    /**
+     * @param baseUrl 子url
+     * @param params  Map
+     * @return ResponseBody
+     */
+    @CheckResult
+    public static Observable<ResponseBody> staticDoPostUrl(@NonNull String baseUrl,
+                                                           @NonNull Map<String, Object> params) {
+        if (retrofit == null) {
+            retrofit = getInstanceRetrofit(BASE_URL);
+        }
+        RetrofitPost retrofitPost = retrofit.create(RetrofitPost.class);
+        return retrofitPost.doPostForUrlAddMap(baseUrl, params)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    /**
+     * @param baseUrl 子url
+     * @param params  Map
+     * @return JSONObject
+     */
+    @CheckResult
+    public static Observable<JSONObject> staticDoPostUrlToJson(@NonNull String baseUrl,
+                                                               @NonNull Map<String, Object> params) {
+        return staticDoPostUrl(baseUrl, params).map(new Function<ResponseBody, JSONObject>() {
+            @Override
+            public JSONObject apply(ResponseBody body) throws Exception {
+                String str = body.string();
+                return new JSONObject(str);
+            }
+        });
+    }
+
     /**
      * get
      * 结合了Retrofit框架
      *
      * @param path 路径
      * @return ResponseBody
      */
+    @CheckResult
     public Observable<ResponseBody> doGetPath(@NonNull String path) {
         RetrofitGet retrofitGet = retrofit.create(RetrofitGet.class);
-        return retrofitGet.doGetForPath(path)
+        return retrofitGet.doGetForUrl(path)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }
@@ -112,6 +187,7 @@ public Observable<ResponseBody> doGetPath(@NonNull String path) {
      * @param path 路径
      * @return JSONObject
      */
+    @CheckResult
     public Observable<JSONObject> doGetPathToJson(@NonNull String path) {
         return doGetPath(path).map(new Function<ResponseBody, JSONObject>() {
             @Override
@@ -130,7 +206,9 @@ public JSONObject apply(ResponseBody body) throws Exception {
      * @param params Map
      * @return ResponseBody
      */
-    public Observable<ResponseBody> doGetPath(@NonNull String path, @NonNull Map<String, String> params) {
+    @CheckResult
+    public Observable<ResponseBody> doGetPath(@NonNull String path,
+                                              @NonNull Map<String, Object> params) {
         RetrofitGet retrofitGet = retrofit.create(RetrofitGet.class);
         return retrofitGet.doGetForPathAddQuery(path, params)
                 .subscribeOn(Schedulers.io())
@@ -145,7 +223,9 @@ public Observable<ResponseBody> doGetPath(@NonNull String path, @NonNull Map<Str
      * @param params Map
      * @return JSONObject
      */
-    public Observable<JSONObject> doGetPathToJson(@NonNull String path, @NonNull Map<String, String> params) {
+    @CheckResult
+    public Observable<JSONObject> doGetPathToJson(@NonNull String path,
+                                                  @NonNull Map<String, Object> params) {
         return doGetPath(path, params).map(new Function<ResponseBody, JSONObject>() {
             @Override
             public JSONObject apply(ResponseBody body) throws Exception {
@@ -164,9 +244,11 @@ public JSONObject apply(ResponseBody body) throws Exception {
      * @param params Map
      * @return ResponseBody
      */
-    public Observable<ResponseBody> doPostPath(@NonNull String path, @NonNull Map<String, String> params) {
+    @CheckResult
+    public Observable<ResponseBody> doPostPath(@NonNull String path,
+                                               @NonNull Map<String, Object> params) {
         RetrofitPost retrofitPost = retrofit.create(RetrofitPost.class);
-        return retrofitPost.doPostPath(path, params)
+        return retrofitPost.doPostForPath(path, params)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread());
     }
@@ -180,7 +262,9 @@ public Observable<ResponseBody> doPostPath(@NonNull String path, @NonNull Map<St
      * @param params Map
      * @return JSONObject
      */
-    public Observable<JSONObject> doPostPathToJson(@NonNull String path, @NonNull Map<String, String> params) {
+    @CheckResult
+    public Observable<JSONObject> doPostPathToJson(@NonNull String path,
+                                                   @NonNull Map<String, Object> params) {
         return doPostPath(path, params).map(new Function<ResponseBody, JSONObject>() {
             @Override
             public JSONObject apply(ResponseBody body) throws Exception {
@@ -189,4 +273,35 @@ public JSONObject apply(ResponseBody body) throws Exception {
             }
         });
     }
+
+
+    /**
+     * @param path 路径
+     * @param map  map
+     */
+    public Observable<ResponseBody> doPostPathWithJson(@NonNull String path,
+                                                       @NonNull Map<String, Object> map) {
+        JSONObject jsonObject = new JSONObject(map);
+        RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"),
+                jsonObject.toString());
+        RetrofitPost retrofitPost = (RetrofitPost) retrofit.create(RetrofitPost.class);
+        return retrofitPost.doPostForPathWithJson(path, requestBody)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread());
+    }
+
+    /**
+     * @param path 路径
+     * @param map  map
+     */
+    public Observable<JSONObject> doPostPathWithJsonToJson(@NonNull String path,
+                                                           @NonNull Map<String, Object> map) {
+        return doPostPathWithJson(path, map).map(new Function<ResponseBody, JSONObject>() {
+            @Override
+            public JSONObject apply(ResponseBody responseBody) throws Exception {
+                String str = responseBody.string();
+                return new JSONObject(str);
+            }
+        });
+    }
 }