1

app/src/main/java/com/polysoft/nafmii/constants/ServerApi.java

@@ -8,29 +8,16 @@ import java.util.Map;
 
 
 public class ServerApi {
 public class ServerApi {
 
 
-    public static final String url_version = "";
-
-    // 获取广告信息
-    public static final String advertisement = "nafmii-app-public-server/api/app/index/getOpenScreenImage";
-
 
 
+    /**
+     * 获取广告信息
+     *
+     * @param callback
+     * @param <T>
+     */
     public static <T> void postAdvertisement(RequestBack<T> callback) {
     public static <T> void postAdvertisement(RequestBack<T> callback) {
-        post(advertisement, "", callback);
+        String url = "nafmii-app-public-server/api/app/index/getOpenScreenImage";
+        OkhttpApi.doPost(url, "", callback);
     }
     }
 
 
-
-
-    public static <T> void get(String url, RequestBack<T> callback) {
-        get(url, null, callback);
-    }
-
-    public static <T> void get(String url, Map<String, String> param, RequestBack<T> callback) {
-        String newUrl = BuildConfig.API_HOST + url;
-        OkhttpApi.doGet(newUrl, param, callback);
-    }
-
-    public static <T> void post(String url, String param, RequestBack<T> callback) {
-        String newUrl = BuildConfig.API_HOST + url;
-        OkhttpApi.doPost(newUrl, param, callback);
-    }
 }
 }

app/src/main/java/com/polysoft/nafmii/net/OkhttpApi.java

@@ -5,6 +5,7 @@ import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
 
 
 import com.polysoft.nafmii.utils.IOUtils;
 import com.polysoft.nafmii.utils.IOUtils;
+import com.whaty.nafmii.BuildConfig;
 
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NotNull;
 
 
@@ -51,7 +52,8 @@ public class OkhttpApi {
     }
     }
 
 
     public static void doGet(String url, Map<String, String> param, RequestBack callback) {
     public static void doGet(String url, Map<String, String> param, RequestBack callback) {
-        HttpUrl.Builder builder = HttpUrl.parse(url).newBuilder();
+        String newUrl = BuildConfig.API_HOST + url;
+        HttpUrl.Builder builder = HttpUrl.parse(newUrl).newBuilder();
         if (null != param && !param.isEmpty()) {
         if (null != param && !param.isEmpty()) {
             for (Map.Entry<String, String> entry : param.entrySet()) {
             for (Map.Entry<String, String> entry : param.entrySet()) {
                 builder.addQueryParameter(entry.getKey(), entry.getValue());
                 builder.addQueryParameter(entry.getKey(), entry.getValue());
@@ -64,11 +66,12 @@ public class OkhttpApi {
 
 
 
 
     public static void doPost(String url, String param, RequestBack callback) {
     public static void doPost(String url, String param, RequestBack callback) {
+        String newUrl = BuildConfig.API_HOST + url;
         MediaType mediaType = MediaType.parse("application/json;charset=UTF-8");
         MediaType mediaType = MediaType.parse("application/json;charset=UTF-8");
         RequestBody body = RequestBody.create(param, mediaType);
         RequestBody body = RequestBody.create(param, mediaType);
 
 
         Request.Builder request = buildRequest(1);
         Request.Builder request = buildRequest(1);
-        request.url(url).post(body);
+        request.url(newUrl).post(body);
         getInstance().newCall(request.build()).enqueue(new CallbackImpl(callback));
         getInstance().newCall(request.build()).enqueue(new CallbackImpl(callback));
     }
     }