Browse Source

添加xml post上传soap方法

YanYi 7 years ago
parent
commit
8116656033

+ 2 - 3
okhttp2/src/main/java/com/mylove/okhttp/ObservableRequest.java

@@ -43,7 +43,7 @@ class ObservableRequest {
 
     private static OkHttpClient okHttpClient;
     private String mCacheUrl = "";
-    private static MediaType mediaType;
+    private MediaType mediaType = MediaType.parse("text/xml; charset=UTF-8");
     private static String urlMsg;
     private static String label;
 
@@ -68,7 +68,7 @@ class ObservableRequest {
         return instance;
     }
 
-    static ObservableRequest getInstance(MediaType mediaType1, String msg, String labelStr, Context context, RequestType type1, CallType type2) {
+    static ObservableRequest getInstance(String msg, String labelStr, Context context, RequestType type1, CallType type2) {
         if (instance == null) {
             synchronized (ObservableRequest.class) {
                 if (instance == null) {
@@ -83,7 +83,6 @@ class ObservableRequest {
                 }
             }
         }
-        mediaType = mediaType1;
         urlMsg = msg;
         label = labelStr;
         mContext = context;

+ 2 - 2
okhttp2/src/main/java/com/mylove/okhttp/OkHttpUtil.java

@@ -36,8 +36,8 @@ public class OkHttpUtil {
         return AutoRequest.getInstance(mContext, url, RequestType.POST);
     }
 
-    public XMLRequest postXMLToSoap(String url, String mediaTypeStr) {
-        return XMLRequest.getInstance(mContext, url, mediaTypeStr, RequestType.POST_XML_SOAP);
+    public XMLRequest postXMLToSoap(String url) {
+        return XMLRequest.getInstance(mContext, url, RequestType.POST_XML_SOAP);
     }
 
     public AutoRequest postUpFile(String url) {

+ 3 - 7
okhttp2/src/main/java/com/mylove/okhttp/XMLRequest.java

@@ -5,8 +5,6 @@ import android.content.Context;
 
 import java.util.Map;
 
-import okhttp3.MediaType;
-
 /**
  * @author myLove
  * @time 2018/1/4 15:14
@@ -21,12 +19,11 @@ public class XMLRequest {
     @SuppressLint("StaticFieldLeak")
     private static Context mContext;
     private static RequestType requestType;
-    private static MediaType mediaType;
 
     private XMLRequest() {
     }
 
-    public static XMLRequest getInstance(Context context, String str, String mediaTypeStr, RequestType type) {
+    public static XMLRequest getInstance(Context context, String str, RequestType type) {
         if (instance == null) {
             synchronized (XMLRequest.class) {
                 if (instance == null) {
@@ -36,16 +33,15 @@ public class XMLRequest {
         }
         mContext = context;
         url = str;
-        mediaType = MediaType.parse(str);
         requestType = type;
         return instance;
     }
 
     public void sync(String urlMsg, String labelStr, Map<Object, Object> map, onOkHttpListener onOkHttpListener) {
-        ObservableRequest.getInstance(mediaType, urlMsg, labelStr, mContext, requestType, CallType.SYNC).request(url, map, onOkHttpListener);
+        ObservableRequest.getInstance(urlMsg, labelStr, mContext, requestType, CallType.SYNC).request(url, map, onOkHttpListener);
     }
 
     public void async(String urlMsg, String labelStr, Map<Object, Object> map, onOkHttpListener onOkHttpListener) {
-        ObservableRequest.getInstance(mediaType, urlMsg, labelStr, mContext, requestType, CallType.ASYNC).request(url, map, onOkHttpListener);
+        ObservableRequest.getInstance(urlMsg, labelStr, mContext, requestType, CallType.ASYNC).request(url, map, onOkHttpListener);
     }
 }