修改统一的Http请求

Assets/Game/Blue/RTC/Service/RTCService.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using Blue;
 using GHZLangChao;
+using LitJson;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
@@ -41,7 +42,19 @@ public class RTCService : IRTCService
     /// </summary>
     public void CreatRoom()
     {
-        CoroutineSystem.Instance.StartCoroutine(RTCCreateRoom());
+       //CoroutineSystem.Instance.StartCoroutine(RTCCreateRoom());
+        GameStart.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpActionLang.rtc_CreateRoom, "", (string message) => {
+            JObject jobject = JObject.Parse(message);
+            if (jobject["code"].ToString() == "200")
+            {
+                message = jobject["data"].ToString();
+                if (!string.IsNullOrWhiteSpace(message))
+                {
+                    mRTCRoomInfo = JsonConvert.DeserializeObject<RTCRoomInfo>(message);
+                    this.SendEvent(new RTCCreatRoomSuccessEvent() { rtcRoomInfo = mRTCRoomInfo });
+                }
+            }
+        }, "application/x-www-form-urlencoded"));
     }
 
     /// <summary>
@@ -58,7 +71,20 @@ public class RTCService : IRTCService
     /// </summary>
     public void JoinRoom(int roomId)
     {
-        CoroutineSystem.Instance.StartCoroutine(RTCJoinRoom(roomId.ToString()));
+       // CoroutineSystem.Instance.StartCoroutine(RTCJoinRoom(roomId.ToString()));
+        JsonData data = new JsonData();
+        data["roomId"] = roomId;
+        GameStart.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpActionLang.rtc_CreateRoom, data.ToJson(), (string message) => {
+
+            JObject jobject = JObject.Parse(message);
+            if (jobject["code"].ToString() == "200" && !string.IsNullOrEmpty(jobject["data"].ToString()))
+            {
+                message = jobject["data"].ToString();
+                mRTCRoomInfo = JsonConvert.DeserializeObject<RTCRoomInfo>(message);
+                this.SendEvent(new JoinRoomSuccessEvent() { rtcRoomInfo = mRTCRoomInfo });
+            }
+        }, "application/x-www-form-urlencoded"));
+
     }
 
     /// <summary>
@@ -188,7 +214,7 @@ public class RTCService : IRTCService
     #endregion
 
     #region 协程
-
+    /*
     private string message;
     public IEnumerator RTCCreateRoom()
     {
@@ -217,8 +243,8 @@ public class RTCService : IRTCService
                 }
             }
         }
-    }
-
+    }*/
+    /*
     public IEnumerator RTCJoinRoom(string roomID)
     {
         UnityWebRequest webRequest = new UnityWebRequest(HttpAction.mEndustryURL+HttpAction.rtc_CreateRoom,"POST");
@@ -247,6 +273,6 @@ public class RTCService : IRTCService
                 }
             }
         }
-    }
+    }*/
     #endregion
 }

Assets/Game/Blue/RTC/Service/SignallingService.cs

@@ -15,7 +15,18 @@ public class SignallingService : ISignallingService
 
     public void GetContacts()
     {
-        CoroutineSystem.Instance.StartCoroutine(OnGetContacts());
+        GameStart.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpActionLang.signal_contact,"",(string message) => {
+
+            JObject jobject = JObject.Parse(message);
+            if (jobject["code"].ToString() == "200" && !string.IsNullOrEmpty(jobject["data"].ToString()) && !string.IsNullOrEmpty(jobject["data"]["list"].ToString()))
+            {
+                message = jobject["data"]["list"].ToString();
+                List<ContactsInfo> mContactsInfoList = JsonConvert.DeserializeObject<List<ContactsInfo>>(message);
+                this.SendEvent(new GetContactsSuccessEvent() { ContactsInfoList = mContactsInfoList });
+            }
+
+        }));
+       // CoroutineSystem.Instance.StartCoroutine(OnGetContacts());
     }
 
     #region 事件
@@ -27,31 +38,32 @@ public class SignallingService : ISignallingService
     #endregion
 
     #region  协程
-    private string message;
-    private IEnumerator OnGetContacts()
+    /*
+private string message;
+private IEnumerator OnGetContacts()
+{
+    UnityWebRequest webRequest = new UnityWebRequest(HttpAction.mEndustryURL + HttpAction.signal_contact, "POST");
+    //foreach( var head in HttpTool.Instance.RequestHeader) webRequest.SetRequestHeader(head.Key,head.Value); 暂时使用直接写的方式，等后续确定使用此行代码
+    webRequest.SetRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+    webRequest.SetRequestHeader("Authorization", login.UserInfo.Instance.Token);
+    webRequest.downloadHandler = new DownloadHandlerBuffer();
+    yield return webRequest.SendWebRequest();
+    if (webRequest.result == UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
+        Debug.LogError($"Error:{webRequest.error},DownloadHandler:{webRequest.downloadHandler.text}");
+    else
     {
-        UnityWebRequest webRequest = new UnityWebRequest(HttpAction.mEndustryURL + HttpAction.signal_contact, "POST");
-        //foreach( var head in HttpTool.Instance.RequestHeader) webRequest.SetRequestHeader(head.Key,head.Value); 暂时使用直接写的方式，等后续确定使用此行代码
-        webRequest.SetRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-        webRequest.SetRequestHeader("Authorization", login.UserInfo.Instance.Token);
-        webRequest.downloadHandler = new DownloadHandlerBuffer();
-        yield return webRequest.SendWebRequest();
-        if (webRequest.result == UnityWebRequest.Result.ProtocolError || webRequest.result == UnityWebRequest.Result.ConnectionError)
-            Debug.LogError($"Error:{webRequest.error},DownloadHandler:{webRequest.downloadHandler.text}");
-        else
+        if (!string.IsNullOrWhiteSpace(webRequest.downloadHandler.text))
         {
-            if (!string.IsNullOrWhiteSpace(webRequest.downloadHandler.text))
+            message = webRequest.downloadHandler.text;
+            JObject jobject = JObject.Parse(message);
+            if (jobject["code"].ToString() == "200" && !string.IsNullOrEmpty(jobject["data"].ToString()) && !string.IsNullOrEmpty(jobject["data"]["list"].ToString()))
             {
-                message = webRequest.downloadHandler.text;
-                JObject jobject = JObject.Parse(message);
-                if (jobject["code"].ToString() == "200" && !string.IsNullOrEmpty(jobject["data"].ToString()) && !string.IsNullOrEmpty(jobject["data"]["list"].ToString()))
-                {
-                    message = jobject["data"]["list"].ToString();
-                    List<ContactsInfo> mContactsInfoList = JsonConvert.DeserializeObject<List<ContactsInfo>>(message);
-                    this.SendEvent(new GetContactsSuccessEvent() { ContactsInfoList = mContactsInfoList });
-                }
+                message = jobject["data"]["list"].ToString();
+                List<ContactsInfo> mContactsInfoList = JsonConvert.DeserializeObject<List<ContactsInfo>>(message);
+                this.SendEvent(new GetContactsSuccessEvent() { ContactsInfoList = mContactsInfoList });
             }
         }
     }
+}*/
     #endregion
 }

Assets/Scripts/MQTT/MQTTClient.cs

@@ -149,7 +149,7 @@ public class MQTTClient : MonoSingleton<MQTTClient>
             rid = front+UserInfo.Instance.name + "_Phone";
         }
         DisConnect();
-        qt = new QTTManager(front+id, username, password, HttpAction.Instance.officeSocket, "1883");
+        qt = new QTTManager(front+id, username, password, "", "1883");
         qt.Connect();
         StartCoroutine(Reconnection());
         qt.ConnectionFailed += onFaild;