Browse Source

MQTT 信令处理

DGJ 1 year ago
parent
commit
e8aa20f8af

+ 2 - 5
Assets/Game/Blue/RTC/LangChaoRTC.unity

@@ -20830,7 +20830,7 @@ MonoBehaviour:
   phone: 
   roleId: 
   resourcePool: 
-  experType: 
+  expertType: 
   _username: 
 --- !u!114 &1496039443
 MonoBehaviour:
@@ -20841,13 +20841,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 1496039440}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e619ad1e5dad862488e940a5741e906b, type: 3}
+  m_Script: {fileID: 11500000, guid: 546752eb840669f4d806e9b4deedec69, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   global: 1
-  text: {fileID: 0}
-  input: {fileID: 0}
-  btn: {fileID: 0}
 --- !u!1 &1504529037
 GameObject:
   m_ObjectHideFlags: 0

+ 41 - 25
Assets/Scenes/LangChaoDemo2.unity

@@ -2026,7 +2026,7 @@ Transform:
   m_Children:
   - {fileID: 2085389668}
   m_Father: {fileID: 0}
-  m_RootOrder: 50
+  m_RootOrder: 48
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &122690070
 GameObject:
@@ -2393,7 +2393,7 @@ Transform:
   m_Children:
   - {fileID: 503826677}
   m_Father: {fileID: 0}
-  m_RootOrder: 37
+  m_RootOrder: 35
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &183734197
 GameObject:
@@ -3288,6 +3288,8 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1485402483}
+  - {fileID: 583309982}
+  - {fileID: 1496039441}
   m_Father: {fileID: 0}
   m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4066,7 +4068,7 @@ Transform:
   m_Children:
   - {fileID: 1428694659}
   m_Father: {fileID: 0}
-  m_RootOrder: 41
+  m_RootOrder: 39
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &307533891
 GameObject:
@@ -6130,8 +6132,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -30.59, y: 0.36}
-  m_SizeDelta: {x: 302.9, y: 99.8}
+  m_AnchoredPosition: {x: 177.6, y: -50.3}
+  m_SizeDelta: {x: 1009.7, y: 201.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &469901235
 MonoBehaviour:
@@ -6166,7 +6168,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 1.0M
+  m_Text: 1.0
 --- !u!222 &469901236
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -6353,7 +6355,7 @@ Transform:
   m_Children:
   - {fileID: 334138222}
   m_Father: {fileID: 0}
-  m_RootOrder: 39
+  m_RootOrder: 37
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &482153408
 GameObject:
@@ -7956,13 +7958,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 583309980}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 35
+  m_Father: {fileID: 264371157}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &587736014
 GameObject:
@@ -10515,7 +10517,7 @@ Transform:
   m_Children:
   - {fileID: 1301454615}
   m_Father: {fileID: 0}
-  m_RootOrder: 45
+  m_RootOrder: 43
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &791758554
 GameObject:
@@ -11833,7 +11835,7 @@ Transform:
   m_Children:
   - {fileID: 1455474013}
   m_Father: {fileID: 0}
-  m_RootOrder: 51
+  m_RootOrder: 49
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &874439297
 GameObject:
@@ -14348,7 +14350,7 @@ Transform:
   m_Children:
   - {fileID: 1007470594}
   m_Father: {fileID: 0}
-  m_RootOrder: 48
+  m_RootOrder: 46
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1007470593
 GameObject:
@@ -14787,7 +14789,7 @@ Transform:
   m_Children:
   - {fileID: 1195914728}
   m_Father: {fileID: 0}
-  m_RootOrder: 46
+  m_RootOrder: 44
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1038271688
 GameObject:
@@ -18426,7 +18428,7 @@ Transform:
   m_Children:
   - {fileID: 1674454061}
   m_Father: {fileID: 0}
-  m_RootOrder: 42
+  m_RootOrder: 40
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1341529265
 GameObject:
@@ -18974,7 +18976,7 @@ Transform:
   m_Children:
   - {fileID: 1767066921}
   m_Father: {fileID: 0}
-  m_RootOrder: 40
+  m_RootOrder: 38
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1353351977
 MonoBehaviour:
@@ -19909,7 +19911,7 @@ Transform:
   m_Children:
   - {fileID: 513072084}
   m_Father: {fileID: 0}
-  m_RootOrder: 47
+  m_RootOrder: 45
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1416708796
 GameObject:
@@ -20007,7 +20009,7 @@ Transform:
   m_Children:
   - {fileID: 337898556}
   m_Father: {fileID: 0}
-  m_RootOrder: 49
+  m_RootOrder: 47
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1417717206
 GameObject:
@@ -20366,7 +20368,7 @@ Transform:
   m_Children:
   - {fileID: 1764105085}
   m_Father: {fileID: 0}
-  m_RootOrder: 38
+  m_RootOrder: 36
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1428694658
 GameObject:
@@ -21017,6 +21019,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1496039441}
   - component: {fileID: 1496039442}
+  - component: {fileID: 1496039443}
   m_Layer: 0
   m_Name: MQTT
   m_TagString: Untagged
@@ -21031,13 +21034,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1496039440}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 36
+  m_Father: {fileID: 264371157}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1496039442
 MonoBehaviour:
@@ -21065,6 +21068,19 @@ MonoBehaviour:
   resourcePool: 
   expertType: 
   _username: 
+--- !u!114 &1496039443
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1496039440}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 546752eb840669f4d806e9b4deedec69, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  global: 1
 --- !u!1 &1504529037
 GameObject:
   m_ObjectHideFlags: 0
@@ -23268,7 +23284,7 @@ Transform:
   m_Children:
   - {fileID: 66988797}
   m_Father: {fileID: 0}
-  m_RootOrder: 43
+  m_RootOrder: 41
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1713568285
 GameObject:
@@ -24029,7 +24045,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1746801817
 RectTransform:
   m_ObjectHideFlags: 0
@@ -25529,7 +25545,7 @@ Transform:
   m_Children:
   - {fileID: 634173867}
   m_Father: {fileID: 0}
-  m_RootOrder: 44
+  m_RootOrder: 42
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1909598945
 GameObject:

+ 2 - 1
Assets/Scripts/MQTT/MQTTClient.cs

@@ -85,6 +85,7 @@ public class MQTTClient : MonoSingleton<MQTTClient>
     {
         string msg = Encoding.UTF8.GetString(obj.Message);
         Debug.Log("uid => " + obj.Topic + ":\n" + msg);
+        UILogManager.Instance.text3.text = msg;
         MQTTManager.Instance.Received(msg);
     }
 
@@ -121,7 +122,7 @@ public class MQTTClient : MonoSingleton<MQTTClient>
         //    rid = front+UserInfo.Instance.name + "_Phone";
         //}
 
-
+        Debug.Log("DGJ ==>MQTT " + id + account + "  " + username + "   " + certification + "  " + HttpActionLang.Instance.mqttSocket);
 
         DisConnect();
         qt = new QTTManager(id + account,username , certification, HttpActionLang.Instance.mqttSocket, "1883");

+ 11 - 3
Assets/Scripts/MQTT/MQTTManager.cs

@@ -109,13 +109,21 @@ public class MQTTManager : MonoSingleton<MQTTManager>
         switch (obj["action"].ToString())
         {
             case "timeout": // 超时
-
-
+                UICallManager.Instance.EventTimeOut();
                 break;
 
             case "invite": // 邀请
 
-
+                if(obj["control"]!=null)
+                {
+                    string roomid = obj["rtcRoom"].ToString();
+                    UICallManager.Instance.EventInvite(obj["control"].ToString(), roomid);
+                }
+                else
+                {
+                    Debug.LogError(" 非控制台邀请 ");
+                }
+              
                 break;
 
             case "noexpert": // 无专家

+ 1 - 1
Assets/Scripts/Managers/SynPlayerTransform.cs

@@ -15,7 +15,7 @@ public class SynPlayerTransform : MonoSingleton<SynPlayerTransform>
     {
         transform.eulerAngles = new Vector3(0, player.eulerAngles.y, 0);
         transform.position = new Vector3(player.position.x, 0, player.position.z);
-        UILogManager.Instance.text3.text = transform.localEulerAngles.y.ToString();
+     //   UILogManager.Instance.text3.text = transform.localEulerAngles.y.ToString();
     }
 
     /// <summary>

+ 36 - 4
Assets/Scripts/UICallManager.cs

@@ -6,18 +6,34 @@ using UnityEngine;
 public class UICallManager : MonoSingleton<UICallManager>,IController
 {
 
-    public delegate void TrackingFound(DataItem tagobj);
-    public delegate void TrackingLast(DataItem tagobj);
+   private delegate void TrackingFound(DataItem tagobj);
+   private delegate void TrackingLast(DataItem tagobj);
+   private delegate void Invite(string control, string roomid);
+   private delegate void TimeOut();
+    private delegate void NoExpert();
     /// <summary>
     ///  物体识别到显示  
     /// </summary>
-    public TrackingFound OnTrackFound;
+    private event TrackingFound OnTrackFound;
 
     /// <summary>
     ///  物体超出显示范围 隐藏
     /// </summary>
-    public TrackingLast OnTrackLast;
+    private event TrackingLast OnTrackLast;
 
+    /// <summary>
+    /// 收到邀请
+    /// </summary>
+    private event Invite OnInvite;
+
+    /// <summary>
+    /// 超时
+    /// </summary>
+    private event TimeOut OnTimeOut;
+    /// <summary>
+    /// 无专家
+    /// </summary>
+    private event NoExpert OnNoExpert;
 
     private void Start()
     {
@@ -43,6 +59,22 @@ public class UICallManager : MonoSingleton<UICallManager>,IController
         //ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowXunJian);
         //ShowXunJian.Instance.gotoWindow(ScenesManager.SceneType.ShowDH);
     }
+
+    public void EventInvite(string control, string roomId)
+    {
+        OnInvite?.Invoke(control, roomId);
+    }
+
+    public void EventTimeOut()
+    {
+        OnTimeOut?.Invoke();
+    }
+
+    public void EventNoExpert()
+    {
+        OnNoExpert?.Invoke();
+    }
+
     private void AnyUp(InputKeyCode keyCode, InputDevicePartBase part)
     {
       //  Debug.Log("DGJ ====>  AnyUp  " + keyCode.ToString());