|
@@ -28,90 +28,90 @@ public class OnWebSocketMsg : MonoSingleton<OnWebSocketMsg>
|
|
|
break;
|
|
|
case SignalResponse.MessageOneofCase.Join:
|
|
|
|
|
|
- string msg = response.Join.Participant.Metadata.ToString();
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
-
|
|
|
- string metadata = msg;
|
|
|
-
|
|
|
- metadata = metadata.Replace('\"', '"');
|
|
|
- Debug.Log("DGJ == > metadata " + metadata);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
- JObject obj2 = JObject.Parse(metadata);
|
|
|
- Debug.Log("DGJ ===> roleId " + obj2["roleId"].ToString());
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
- if (obj2["roleId"].ToString() == "2")
|
|
|
- {
|
|
|
- string uid = response.Join.Participant.Sid.ToString();
|
|
|
-
|
|
|
- if (ScenesManager.Instance.getWindow() == ScenesManager.SceneType.ShowRTC)
|
|
|
- {
|
|
|
- ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowRoom);
|
|
|
- }
|
|
|
-
|
|
|
- RTCRoomManager.Instance.ExpertJonin(uid);
|
|
|
- RTCRoomManager.Instance.UserJoined(UserEnum.Expert, obj2);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
- if (obj2["roleId"].ToString() == "1")
|
|
|
- {
|
|
|
- RTCRoomManager.Instance.UserJoined(UserEnum.Conterl, obj2);
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
- if (obj2["roleId"].ToString() == "3")
|
|
|
- {
|
|
|
- RTCRoomManager.Instance.UserJoined(UserEnum.Player);
|
|
|
-
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
+
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
|
|
|
break;
|
|
|
case SignalResponse.MessageOneofCase.Answer:
|
|
@@ -121,6 +121,58 @@ public class OnWebSocketMsg : MonoSingleton<OnWebSocketMsg>
|
|
|
case SignalResponse.MessageOneofCase.Trickle:
|
|
|
break;
|
|
|
case SignalResponse.MessageOneofCase.Update:
|
|
|
+ string msg = response.ToString();
|
|
|
+
|
|
|
+
|
|
|
+ Debug.Log("DGJ ==> " + msg);
|
|
|
+
|
|
|
+ JObject obj = JObject.Parse(msg);
|
|
|
+
|
|
|
+ if(obj["update"]["participants"][0]["metadata"]!=null)
|
|
|
+ {
|
|
|
+ string metadata = obj["update"]["participants"][0]["metadata"].ToString();
|
|
|
+
|
|
|
+
|
|
|
+ metadata = metadata.Replace('\"', '"');
|
|
|
+ Debug.Log("DGJ == > metadata " + metadata);
|
|
|
+
|
|
|
+ JObject obj2 = JObject.Parse(metadata);
|
|
|
+
|
|
|
+
|
|
|
+ string state = obj["update"]["participants"][0]["state"].ToString();
|
|
|
+ Debug.Log(state + " DGJ ===> roleId " + obj2["roleId"].ToString());
|
|
|
+ if (state == "ACTIVE")
|
|
|
+ {
|
|
|
+ if (obj2["roleId"].ToString() == "2")
|
|
|
+ {
|
|
|
+
|
|
|
+ string uid = obj["update"]["participants"][0]["sid"].ToString();
|
|
|
+ if (ScenesManager.Instance.getWindow() == ScenesManager.SceneType.ShowRTC)
|
|
|
+ {
|
|
|
+ ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowRoom);
|
|
|
+ }
|
|
|
+
|
|
|
+ RTCRoomManager.Instance.ExpertJonin(uid);
|
|
|
+ RTCRoomManager.Instance.UserJoined(UserEnum.Expert, obj2);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ if (obj2["roleId"].ToString() == "1")
|
|
|
+ {
|
|
|
+ RTCRoomManager.Instance.UserJoined(UserEnum.Conterl, obj2);
|
|
|
+ }
|
|
|
+
|
|
|
+ if (obj2["roleId"].ToString() == "3")
|
|
|
+ {
|
|
|
+ RTCRoomManager.Instance.UserJoined(UserEnum.Player);
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
break;
|
|
|
case SignalResponse.MessageOneofCase.TrackPublished:
|