From bc0f59f028e648e5c028e9eb660c475d13979623 Mon Sep 17 00:00:00 2001
From: YDL <1368269699@qq.com>
Date: Sun, 28 Apr 2024 14:31:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E6=B0=B4=E7=B3=BB=E7=BB=9F=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=80=89=E4=B8=AD=E5=A4=B4=E9=A1=B6=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E7=9A=84=E5=90=8C=E6=97=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/ANet/DeviceFollowTarget.cs     | 10 +++++++
 Assets/Scripts/ANet/DeviceInfo.cs             | 21 +++++++++++++-
 Assets/Scripts/ANet/DeviceItem.cs             |  3 +-
 Assets/Scripts/ANet/DeviceObj.cs              | 29 +++++++++++++++++++
 Assets/Scripts/ANet/Prefabs/DeviceItem.prefab |  1 +
 5 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/Assets/Scripts/ANet/DeviceFollowTarget.cs b/Assets/Scripts/ANet/DeviceFollowTarget.cs
index 7b64d69..7c07923 100644
--- a/Assets/Scripts/ANet/DeviceFollowTarget.cs
+++ b/Assets/Scripts/ANet/DeviceFollowTarget.cs
@@ -31,6 +31,16 @@ public class DeviceFollowTarget : MonoBehaviour
             }
             if (!GetComponent<DeviceLumos>())
                 gameObject.AddComponent<DeviceLumos>();
+
+            if (target.GetComponent<DeviceObj>().BindData.deviceNo != null)
+            {
+                DeviceInfo.Instance.OnShow(target.GetComponent<DeviceObj>().BindData);
+            }
+            else
+            {
+                target.GetComponent<DeviceObj>().SetBindData();
+                DeviceInfo.Instance.OnShow(target.GetComponent<DeviceObj>().BindData);
+            }
         }
     }
 
diff --git a/Assets/Scripts/ANet/DeviceInfo.cs b/Assets/Scripts/ANet/DeviceInfo.cs
index 4d18fbc..7a98c58 100644
--- a/Assets/Scripts/ANet/DeviceInfo.cs
+++ b/Assets/Scripts/ANet/DeviceInfo.cs
@@ -27,6 +27,25 @@ public class DeviceInfo : MonoBehaviour
         infoName.text = "设备信息";
         bindInfo = info;
 
+        foreach (Transform item in DevicePanelManager.Instance.transform)
+        {
+            if (item.GetComponent<DeviceBind>() && item.gameObject.activeSelf)
+            {
+                foreach (Transform child in item.GetComponent<DeviceBind>().BindParent)
+                {
+                    if (child.GetComponent<DeviceItem>())
+                        if (child.GetComponent<DeviceItem>().BindData.deviceNo == info.deviceNo)
+                        {
+                            child.GetComponent<DeviceItem>().Selected.SetActive(true);
+                        }
+                        else
+                        {
+                            child.GetComponent<DeviceItem>().Selected.SetActive(false);
+                        }
+                }
+            }
+        }
+
         foreach (Transform item in infoParent)
         {
             if (item.name != "None")
@@ -83,7 +102,7 @@ public class DeviceInfo : MonoBehaviour
                 go.GetComponent<DeviceInfoItem>().Bind("预警状态 : " + (pinfo.alarmStatus == "0" ? "正常" : "告警"));
             }
         }
-        else if (info.deviceType == (int)DeviceType.消火栓末端|| info.deviceType == (int)DeviceType.消防主管网
+        else if (info.deviceType == (int)DeviceType.消火栓末端 || info.deviceType == (int)DeviceType.消防主管网
             || info.deviceType == (int)DeviceType.喷淋末端 || info.deviceType == (int)DeviceType.喷淋主管网)
         {
             XHSMDInfo pinfo = JsonConvert.DeserializeObject<XHSMDInfo>(info.timelyData.ToString());
diff --git a/Assets/Scripts/ANet/DeviceItem.cs b/Assets/Scripts/ANet/DeviceItem.cs
index e98613b..31948d6 100644
--- a/Assets/Scripts/ANet/DeviceItem.cs
+++ b/Assets/Scripts/ANet/DeviceItem.cs
@@ -12,6 +12,7 @@ public class DeviceItem : MonoBehaviour
     public Button LocalBtn;
     public Button ViewBtn;
     public Image CanLocal;
+    public GameObject Selected;
     void Start()
     {
         LocalBtn.onClick.AddListener(LocalBtn_Click);
@@ -39,7 +40,7 @@ public class DeviceItem : MonoBehaviour
     }
     private void ViewBtn_Click()
     {
-        DeviceInfo.Instance.OnShow(BindData);
+        //DeviceInfo.Instance.OnShow(BindData);
         string deviceName = "";
         foreach (var item in DevicePanelManager.Instance.BindObjectList)
         {
diff --git a/Assets/Scripts/ANet/DeviceObj.cs b/Assets/Scripts/ANet/DeviceObj.cs
index db9514c..e01663e 100644
--- a/Assets/Scripts/ANet/DeviceObj.cs
+++ b/Assets/Scripts/ANet/DeviceObj.cs
@@ -142,5 +142,34 @@ public class DeviceObj : MonoBehaviour
         tIconObj.gameObject.SetActive(isShow);
         gameObject.GetComponent<MeshRenderer>().enabled = isShow;
     }
+    public void SetBindData()
+    {
+        string deviceId = "";
+        foreach (var item in DevicePanelManager.Instance.BindObjectList)
+        {
+            if (item.ObjName == name)
+            {
+                deviceId = item.DeviceId;
+                break;
+            }
+        }
+        if (!string.IsNullOrEmpty(deviceId))
+        {
+            foreach (var datalist in DevicePanelManager.Instance.AllData)
+            {
+                if (datalist.Key == BindType)
+                {
+                    foreach (var data in datalist.Value)
+                    {
+                        if (deviceId == data.deviceNo)
+                        {
+                            BindData = data;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 
diff --git a/Assets/Scripts/ANet/Prefabs/DeviceItem.prefab b/Assets/Scripts/ANet/Prefabs/DeviceItem.prefab
index d2a4134..e985de5 100644
--- a/Assets/Scripts/ANet/Prefabs/DeviceItem.prefab
+++ b/Assets/Scripts/ANet/Prefabs/DeviceItem.prefab
@@ -485,6 +485,7 @@ MonoBehaviour:
   LocalBtn: {fileID: 6612412687128553362}
   ViewBtn: {fileID: 4207703022074011421}
   CanLocal: {fileID: 6574008811849784718}
+  Selected: {fileID: 9007145183056439487}
 --- !u!1 &9007145183056439487
 GameObject:
   m_ObjectHideFlags: 0