From bae09e0de011e82ae29f0e473a9bd2af423c015a Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Tue, 21 Nov 2023 11:20:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Temp/Scripts/View_Panel2.cs              |  1 +
 .../Zion/Scripts/Adam/Data/ThinkDevicesData.cs  | 17 +++++++++++++++++
 Assets/Zion/Scripts/Adam/Utility/GlobalFlag.cs  |  4 ++++
 .../Scripts/ModelFunction/EquipmentCommon.cs    | 11 ++++++++---
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Assets/Temp/Scripts/View_Panel2.cs b/Assets/Temp/Scripts/View_Panel2.cs
index e6031dc1..4872104e 100644
--- a/Assets/Temp/Scripts/View_Panel2.cs
+++ b/Assets/Temp/Scripts/View_Panel2.cs
@@ -574,6 +574,7 @@ public class View_Panel2 : XUIPanel
             GameObject subjectTemp = GameObject.Instantiate(currentRoomSubjectItem, currentRoomSubjectItemConnect);
             subjectTemp.SetActive(true);
             subjectTemp.name = di[index].Id;
+            GlobalFlag.practiceSubjectID = subjectTemp.name;
             subjectTemp.transform.GetChild(0).GetComponent<Text>().text = di[index].Name;
             subjectTemp.GetComponent<Button>().onClick.AddListener(async () =>
             {
diff --git a/Assets/Zion/Scripts/Adam/Data/ThinkDevicesData.cs b/Assets/Zion/Scripts/Adam/Data/ThinkDevicesData.cs
index f18f8e14..905e5e1e 100644
--- a/Assets/Zion/Scripts/Adam/Data/ThinkDevicesData.cs
+++ b/Assets/Zion/Scripts/Adam/Data/ThinkDevicesData.cs
@@ -4,6 +4,23 @@ using System;
 
 namespace AdamThinkDevicesData
 {
+    [Serializable]
+    public class ReturnDeviceID
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool state;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string message;
+        /// <summary>
+        /// 
+        /// </summary>
+        public string data;
+    }
+
     [Serializable]
     public class List_paraItem
     {
diff --git a/Assets/Zion/Scripts/Adam/Utility/GlobalFlag.cs b/Assets/Zion/Scripts/Adam/Utility/GlobalFlag.cs
index 2664f9be..a87cc2f5 100644
--- a/Assets/Zion/Scripts/Adam/Utility/GlobalFlag.cs
+++ b/Assets/Zion/Scripts/Adam/Utility/GlobalFlag.cs
@@ -16,4 +16,8 @@ public class GlobalFlag
     /// 当前想定ID
     /// </summary>
     public static string currentThinkId;
+    /// <summary>
+    /// 当前房间科目ID
+    /// </summary>
+    public static string practiceSubjectID;
 }
diff --git a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs
index 09b94db0..988260f5 100644
--- a/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs
+++ b/Assets/Zion/Scripts/ModelFunction/EquipmentCommon.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using AdamThinkDevicesData;
 using AdamSync;
+using LitJson;
 
 /// <summary>
 /// 设备
@@ -85,12 +86,15 @@ public class EquipmentCommon : MonoBehaviour
     /// 
     /// </summary>
     /// <param name="weaponitemone"></param>
-    public void FillInTheData(List<List_paraItem> weaponitemone)
+    public async void FillInTheData(List<List_paraItem> weaponitemone)
     {
         if (equipmentCommon)
         {
-            string msg = $"send2room {equipmentCommon.equipmentType}+{transform.position.ToString().Replace(" ", "").Replace("(", "").Replace(")", "")}+{transform.eulerAngles.ToString().Replace(" ", "").Replace("(", "").Replace(")", "")}";
-            Debug.Log(msg);
+            string paraListJson = JsonMapper.ToJson(weaponitemone);
+            ReturnDeviceID returnID = await AsyncWebReq.Post<ReturnDeviceID>("http://111.229.30.246:48888/Handler/Thinkingfile.ashx?action=querypracticedevicedetail&PracticeId=" + GlobalFlag.roomID + "&PracticeSubjectId=" + GlobalFlag.practiceSubjectID + "&device_name=" + equipmentCommon.equipmentType + "&para_list=" + paraListJson, null);
+
+            string msg = $"send2room {equipmentCommon.equipmentType}+{transform.position.ToString().Replace(" ", "").Replace("(", "").Replace(")", "")}+{transform.eulerAngles.ToString().Replace(" ", "").Replace("(", "").Replace(")", "") + "," + returnID}";
+            Debug.Log(returnID.message);
             _ = SyncCreateRoom.SendMessageAsync(msg);
         }
         switch (equipmentType)
@@ -115,6 +119,7 @@ public class EquipmentCommon : MonoBehaviour
             default:
                 break;
         }
+       
     }
 }