对接数据展示改为UI菜单点击就显示,完事再做绑定

Assets/Common/UIViews/SmokeSystemMenuPanel.prefab

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!114 &8255146214669565358
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4999091202410805330}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  menuType: 451
 --- !u!1 &1284425863110501170
 GameObject:
   m_ObjectHideFlags: 0
@@ -34,6 +47,7 @@ RectTransform:
   - {fileID: 1325331408989018968}
   - {fileID: 4626956716126372069}
   - {fileID: 7775960828792048586}
+  - {fileID: 6646158883303316946}
   m_Father: {fileID: 4605042051543821276}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -94,6 +108,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_AllowSwitchOff: 1
+--- !u!114 &5608643362048250933
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 850222240561995019}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  menuType: 453
 --- !u!1 &5129777507806714983
 GameObject:
   m_ObjectHideFlags: 0
@@ -157,6 +184,19 @@ MonoBehaviour:
   AirVentToggle: {fileID: 7226065830476652015}
   SmokeExtractionFanToggle: {fileID: 3898676836414080594}
   SmokeVentToggle: {fileID: 2145228960572886397}
+--- !u!114 &6553844113038112468
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1711717827286548540}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d52e25c232aba6a42a4bd0e25637df8b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  menuType: 452
 --- !u!1001 &1043810148363852483
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -326,6 +366,12 @@ PrefabInstance:
       objectReference: {fileID: 7264114960646921176}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3}
+--- !u!1 &4999091202410805330 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe,
+    type: 3}
+  m_PrefabInstance: {fileID: 1043810148363852483}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &1339583546896267403 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
@@ -338,7 +384,7 @@ MonoBehaviour:
     type: 3}
   m_PrefabInstance: {fileID: 1043810148363852483}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
+  m_GameObject: {fileID: 4999091202410805330}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
@@ -531,6 +577,187 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &4670397351121174426
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 3568763422270519259}
+    m_Modifications:
+    - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 27728249048338114, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_sharedMaterial
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 35720438686548627, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_Text
+      value: "\u8865\u98CE\u673A"
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 120
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_text
+      value: "\u6392\u70DF\u53E3"
+      objectReference: {fileID: 0}
+    - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_textInfo.lineCount
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_textInfo.pageCount
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_textInfo.wordCount
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_textInfo.materialCount
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5339687320768106799, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_textInfo.characterCount
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_Name
+      value: BFJ
+      objectReference: {fileID: 0}
+    - target: {fileID: 7694350058640778495, guid: abaedecb7e34aaa4da518e785ba2adbe,
+        type: 3}
+      propertyPath: m_Group
+      value: 
+      objectReference: {fileID: 7264114960646921176}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3}
+--- !u!1 &850222240561995019 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe,
+    type: 3}
+  m_PrefabInstance: {fileID: 4670397351121174426}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &6646158883303316946 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
+    type: 3}
+  m_PrefabInstance: {fileID: 4670397351121174426}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6691561184422486701
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -700,6 +927,12 @@ PrefabInstance:
       objectReference: {fileID: 7264114960646921176}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: abaedecb7e34aaa4da518e785ba2adbe, type: 3}
+--- !u!1 &1711717827286548540 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5412215398799319697, guid: abaedecb7e34aaa4da518e785ba2adbe,
+    type: 3}
+  m_PrefabInstance: {fileID: 6691561184422486701}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &4626956716126372069 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 2083886726171419208, guid: abaedecb7e34aaa4da518e785ba2adbe,
@@ -712,7 +945,7 @@ MonoBehaviour:
     type: 3}
   m_PrefabInstance: {fileID: 6691561184422486701}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
+  m_GameObject: {fileID: 1711717827286548540}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3}

Assets/Scripts/ANet/DeviceBind.cs

@@ -12,7 +12,7 @@ public class DeviceBind : MonoBehaviour
     public Text Title;
     public Button CloseBtn;
 
-    public void DataBind(DeviceType bindType, List<DeviceList> binddata, string bindobj = null)
+    public void DataBind(DeviceType bindType, List<DeviceList> binddata, string bindobjname = null)
     {
         Title.text = bindType.ToString() + "列表";
         Binddata = binddata;
@@ -35,7 +35,7 @@ public class DeviceBind : MonoBehaviour
                 {
                     if (de.DeviceId == item.deviceNo)
                     {
-                        if (de.ObjName == bindobj)
+                        if (de.ObjName == bindobjname)
                         {
                             showColor = Color.red;
                         }

Assets/Scripts/ANet/DeviceInfo.cs

@@ -50,7 +50,7 @@ public class DeviceInfo : MonoBehaviour
             GameObject go = Instantiate(infoItem, infoParent);
             go.GetComponent<DeviceInfoItem>().Bind("类型 : " + infobase.deviceTypeName);
         }
-        if (info.deviceType == 256 || info.deviceType == 258)
+        if (info.deviceType == (int)DeviceType.水泵 || info.deviceType == (int)DeviceType.喷淋泵)
         {
             PLInfo pinfo = JsonConvert.DeserializeObject<PLInfo>(info.timelyData.ToString());
             {
@@ -71,7 +71,7 @@ public class DeviceInfo : MonoBehaviour
                 go.GetComponent<DeviceInfoItem>().Bind("启停状态 : " + (pinfo.startStopStatus == "0" ? "停止" : "启动"));
             }
         }
-        else if (info.deviceType == 401)
+        else if (info.deviceType == (int)DeviceType.水箱)
         {
             SXInfo pinfo = JsonConvert.DeserializeObject<SXInfo>(info.timelyData.ToString());
             {
@@ -83,9 +83,10 @@ public class DeviceInfo : MonoBehaviour
                 go.GetComponent<DeviceInfoItem>().Bind("预警状态 : " + (pinfo.alarmStatus == "0" ? "正常" : "告警"));
             }
         }
-        else if (info.deviceType == 305)
+        else if (info.deviceType == (int)DeviceType.消火末端|| info.deviceType == (int)DeviceType.消防主管网
+            || info.deviceType == (int)DeviceType.喷淋末端 || info.deviceType == (int)DeviceType.喷淋主管网)
         {
-            XHSInfo pinfo = JsonConvert.DeserializeObject<XHSInfo>(info.timelyData.ToString());
+            XHSMDInfo pinfo = JsonConvert.DeserializeObject<XHSMDInfo>(info.timelyData.ToString());
             {
                 GameObject go = Instantiate(infoItem, infoParent);
                 go.GetComponent<DeviceInfoItem>().Bind("压力 : " + pinfo.pressure);
@@ -104,6 +105,16 @@ public class DeviceInfo : MonoBehaviour
             go.GetComponent<DeviceInfoItem>().Bind("描述 : " + infobase.descript);
         }
         gameObject.SetActive(true);
+        StopAllCoroutines();
+        StartCoroutine(Refresh());
+    }
+    IEnumerator Refresh()
+    {
+        DevicePanelManager.Instance.RefreshData();
+        yield return new WaitForSeconds(5);
+        Debug.Log("刷新");
+        var data = DevicePanelManager.Instance.GetDeviceData(bindInfo);
+        OnShow(data);
     }
 }
 public class InfoBase
@@ -133,7 +144,7 @@ public class PLInfo : InfoBase
     public string powerState;
     public string manualAutomaticState;
 }
-public class XHSInfo : InfoBase
+public class XHSMDInfo : InfoBase
 {
     public string pressure;
     public string alarmStatus;

Assets/Scripts/ANet/DeviceMenuToggle.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+[RequireComponent(typeof(Toggle))]
+public class DeviceMenuToggle : MonoBehaviour
+{
+    public DeviceType menuType;
+    private Toggle M_toggle;
+    void Start()
+    {
+        M_toggle = GetComponent<Toggle>();
+        M_toggle.onValueChanged.AddListener(M_toggle_ValueChanged);
+    }
+
+    private void M_toggle_ValueChanged(bool isOn)
+    {
+        if (isOn)
+        {
+            DevicePanelManager.Instance.ShowBindList(menuType);
+        }
+        else
+        {
+            DevicePanelManager.Instance.ShowBindList(DeviceType.空);
+        }
+    }
+}

Assets/Scripts/ANet/DeviceMenuToggle.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d52e25c232aba6a42a4bd0e25637df8b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/ANet/DeviceObj.cs

@@ -20,4 +20,9 @@ public class DeviceObj : MonoBehaviour
         }
         DevicePanelManager.Instance.ShowBindList(BindType, this);
     }
+    public void ShowList()
+    {
+        DevicePanelManager.Instance.ShowBindList(BindType, this);
+    }
 }
+

Assets/Scripts/ANet/DevicePanelManager.cs

@@ -173,12 +173,16 @@ public class DeviceList
 public enum DeviceType
 {
     空 = 0,
-    水泵,
-    水箱,
-    消火栓,
-    喷淋泵,
-    排烟风机,
-    送风机
+    水泵 = 258,//
+    喷淋泵 = 256,//
+    水箱 = 401,//  
+    消火末端 = 305,//
+    喷淋末端 = 304,//
+    喷淋主管网 = 301,//
+    消防主管网 = 302,//
+    送风机 = 451,
+    排烟风机 = 452,
+    补风机 = 453,
 }
 public class DevicePanelManager : MonoBehaviour
 {
@@ -193,19 +197,14 @@ public class DevicePanelManager : MonoBehaviour
     private int pageSize = 100000;
     private long buildId = 1162809597414907904;//凯德虹口商业中心--大型城市综合体
     private long buildId1 = 1162809590251036672;//凯德虹口商业中心-超高层
-    //private string diveceId = "256";
-    public List<DeviceList> ShuiBengList = new List<DeviceList>();
-    public List<DeviceList> ShuiXiangList = new List<DeviceList>();
-    public List<DeviceList> XHSList = new List<DeviceList>();
-    public List<DeviceList> PenLinBengList = new List<DeviceList>();
-    public List<DeviceList> PaiYanJiList = new List<DeviceList>();
-    public List<DeviceList> SongFengJiList = new List<DeviceList>();
+    //服务端获取全部数据
+    public List<KeyValuePair<DeviceType, List<DeviceList>>> AllData = new List<KeyValuePair<DeviceType, List<DeviceList>>>();
+    public DeviceType textType;
     #endregion
     #region 本地数据绑定
     public List<DeviceObjConfig> BindObjectList = new List<DeviceObjConfig>();
     public DeviceObj NowClickObject;
     public DeviceType NowType;
-    private string objPath = "/DeviceObj.json";
     private string objId = "binddataid";
     #endregion
     void Awake()
@@ -217,90 +216,102 @@ public class DevicePanelManager : MonoBehaviour
         LoadDeciceData();
         LoadDeviceObjConfig();
     }
-
-    private void LoadDeciceData()
+    public void RefreshData()
     {
-        ShuiBengList.Clear();
-        ShuiXiangList.Clear();
-        XHSList.Clear();
-        PenLinBengList.Clear();
-        PaiYanJiList.Clear();
-        SongFengJiList.Clear();
-
-        LoadDiviceData(buildId, "258", DeviceType.水泵);
-        LoadDiviceData(buildId, "401", DeviceType.水箱);
-        LoadDiviceData(buildId, "305", DeviceType.消火栓);
-        LoadDiviceData(buildId, "256", DeviceType.喷淋泵);
-        LoadDiviceData(buildId, "452", DeviceType.排烟风机);
-        LoadDiviceData(buildId, "451", DeviceType.送风机);
-
-        LoadDiviceData(buildId1, "258", DeviceType.水泵);
-        LoadDiviceData(buildId1, "401", DeviceType.水箱);
-        LoadDiviceData(buildId1, "305", DeviceType.消火栓);
-        LoadDiviceData(buildId1, "256", DeviceType.喷淋泵);
-        LoadDiviceData(buildId1, "452", DeviceType.排烟风机);
-        LoadDiviceData(buildId1, "451", DeviceType.送风机);
+        LoadDeciceData();
     }
-    private void LateUpdate()
+    public DeviceList GetDeviceData(DeviceList data)
     {
-        //if (Input.GetKeyDown(KeyCode.L))
-        //{
-        //    LoadDiviceData(buildId, "258", DeviceType.水泵);
-        //}
-        //if (Input.GetKeyDown(KeyCode.T))
-        //{
-        //    StopAllCoroutines();
-        //    StartCoroutine(waitToBind(DeviceType.喷淋泵, PenLinBengList));
-        //}
-        //if (Input.GetKeyDown(KeyCode.A))
-        //{
-        //    StopAllCoroutines();
-        //    StartCoroutine(waitToBind(DeviceType.排烟风机, PaiYanJiList));
-        //}
-        //if (Input.GetKeyDown(KeyCode.S))
-        //{
-        //    StopAllCoroutines();
-        //    StartCoroutine(waitToBind(DeviceType.水泵, ShuiBengList));
-        //}
-        //if (Input.GetKeyDown(KeyCode.D))
-        //{
-        //    StopAllCoroutines();
-        //    StartCoroutine(waitToBind(DeviceType.水箱, ShuiXiangList));
-        //}
-        //if (Input.GetKeyDown(KeyCode.F))
-        //{
-        //    StopAllCoroutines();
-        //    StartCoroutine(waitToBind(DeviceType.消火栓, XHSList));
-        //}
+        foreach (var item in AllData)
+        {
+            foreach (var value in item.Value)
+            {
+                if (value.deviceNo == data.deviceNo)
+                {
+                    data = value;
+                    break;
+                }
+            }
+        }
+        return data;
     }
-    public void ShowBindList(DeviceType type, DeviceObj selectObject)
+    private void LoadDeciceData()
     {
-        StopAllCoroutines();
-        NowClickObject = selectObject;
-        NowType = type;
-        if (type == DeviceType.水泵)
+        AllData.Clear();
+        foreach (DeviceType i in Enum.GetValues(typeof(DeviceType)))
         {
-            StartCoroutine(waitToBind(DeviceType.水泵, ShuiBengList));
+            if (i != DeviceType.空)
+            {
+                KeyValuePair<DeviceType, List<DeviceList>> info = new KeyValuePair<DeviceType, List<DeviceList>>(
+                    i, new List<DeviceList>());
+                AllData.Add(info);
+            }
         }
-        else if (type == DeviceType.水箱)
+        foreach (var item in AllData)
         {
-            StartCoroutine(waitToBind(DeviceType.水箱, ShuiXiangList));
+            int iType = (int)item.Key;
+            LoadDiviceData(buildId, iType.ToString(), item.Key);
+            LoadDiviceData(buildId1, iType.ToString(), item.Key);
         }
-        else if (type == DeviceType.消火栓)
+    }
+    private void LateUpdate()
+    {
+       
+        if(Input.GetKeyDown(KeyCode.T))
         {
-            StartCoroutine(waitToBind(DeviceType.消火栓, XHSList));
+            ShowBindList(textType);
         }
-        else if (type == DeviceType.喷淋泵)
+    }
+
+    public void ShowBindList(DeviceType type)
+    {
+        StopAllCoroutines();
+        NowClickObject = null;
+        NowType = type;
+        if (type != DeviceType.空)
         {
-            StartCoroutine(waitToBind(DeviceType.喷淋泵, PenLinBengList));
+            List<DeviceList> infoList = new List<DeviceList>();
+            foreach (var item in AllData)
+            {
+                if (item.Key == type)
+                {
+                    foreach (var value in item.Value)
+                    {
+                        infoList.Add(value);
+                    }
+                    break;
+                }
+            }
+            StartCoroutine(waitToBind(type, infoList));
         }
-        else if (type == DeviceType.排烟风机)
+        else
         {
-            StartCoroutine(waitToBind(DeviceType.排烟风机, PaiYanJiList));
+            foreach (Transform item in transform)
+            {
+                item.gameObject.SetActive(false);
+            }
         }
-        else if (type == DeviceType.送风机)
+    }
+    public void ShowBindList(DeviceType type, DeviceObj selectObject)
+    {
+        StopAllCoroutines();
+        NowClickObject = selectObject;
+        NowType = type;
+        if (type != DeviceType.空)
         {
-            StartCoroutine(waitToBind(DeviceType.送风机, SongFengJiList));
+            List<DeviceList> infoList = new List<DeviceList>();
+            foreach (var item in AllData)
+            {
+                if (item.Key == type)
+                {
+                    foreach (var value in item.Value)
+                    {
+                        infoList.Add(value);
+                    }
+                    break;
+                }
+            }
+            StartCoroutine(waitToBind(type, infoList));
         }
         else
         {
@@ -318,7 +329,7 @@ public class DevicePanelManager : MonoBehaviour
         {
             if (item.GetComponent<DeviceBind>() && item.GetComponent<DeviceBind>().BindType == type)
             {
-                item.GetComponent<DeviceBind>().DataBind(type, bindData, NowClickObject.name);
+                item.GetComponent<DeviceBind>().DataBind(type, bindData, null == NowClickObject ? null : NowClickObject.name);
                 has = true;
             }
             else
@@ -330,7 +341,7 @@ public class DevicePanelManager : MonoBehaviour
         {
             var go = Instantiate(DeviceBindPrefab, transform);
             go.name = type.ToString();
-            go.GetComponent<DeviceBind>().DataBind(type, bindData, NowClickObject.name);
+            go.GetComponent<DeviceBind>().DataBind(type, bindData, null == NowClickObject ? null : NowClickObject.name);
         }
     }
     private void LoadDiviceData(long buildId, string diviceId, DeviceType type)
@@ -357,55 +368,22 @@ public class DevicePanelManager : MonoBehaviour
                 Post<diveceSourceData, TotaDivecelInfo>($"{baseHttpUrl}?appKey={key}", postData, (d) =>
                 {
                     Debug.Log(d.code);
-                    if (type == DeviceType.水泵)
-                    {
-                        foreach (var item in d.data.list)
-                        {
-                            ShuiBengList.Add(item);
-                        }
-                    }
-                    else if (type == DeviceType.水箱)
-                    {
-                        //ShuiXiangList = d.data.list;
-                        foreach (var item in d.data.list)
-                        {
-                            ShuiXiangList.Add(item);
-                        }
-                    }
-                    else if (type == DeviceType.消火栓)
+                    foreach (var item in d.data.list)
                     {
-                        //XHSList = d.data.list;
-                        foreach (var item in d.data.list)
+                        foreach (var data in AllData)
                         {
-                            XHSList.Add(item);
-                        }
-                    }
-                    else if (type == DeviceType.喷淋泵)
-                    {
-                        //PenLinBengList = d.data.list;
-                        foreach (var item in d.data.list)
-                        {
-                            PenLinBengList.Add(item);
-                        }
-                    }
-                    else if (type == DeviceType.排烟风机)
-                    {
-                        //PaiYanJiList = d.data.list;
-                        foreach (var item in d.data.list)
-                        {
-                            PaiYanJiList.Add(item);
-                        }
-                    }
-                    else if (type == DeviceType.送风机)
-                    {
-                        foreach (var item in d.data.list)
-                        {
-                            SongFengJiList.Add(item);
+                            if (data.Key == type)
+                            {
+                                if (!data.Value.Contains(item))
+                                {
+                                    data.Value.Add(item);
+                                }
+                            }
                         }
                     }
                 }, (a, b) =>
                 {
-                    Debug.Log(a + b);
+                    Debug.LogError(a + b);
                 });
             }
             else
@@ -413,55 +391,19 @@ public class DevicePanelManager : MonoBehaviour
                 PostJson<diveceSourceData, TotaDivecelInfo>($"?appKey={key}", postData, (d) =>
                 {
                     Debug.Log(d.code);
-                    if (type == DeviceType.水泵)
-                    {
-                        foreach (var item in d.data.list)
-                        {
-                            ShuiBengList.Add(item);
-                        }
-                    }
-                    else if (type == DeviceType.水箱)
-                    {
-                        //ShuiXiangList = d.data.list;
-                        foreach (var item in d.data.list)
-                        {
-                            ShuiXiangList.Add(item);
-                        }
-                    }
-                    else if (type == DeviceType.消火栓)
-                    {
-                        //XHSList = d.data.list;
-                        foreach (var item in d.data.list)
-                        {
-                            XHSList.Add(item);
-                        }
-                    }
-                    else if (type == DeviceType.喷淋泵)
-                    {
-                        //PenLinBengList = d.data.list;
-                        foreach (var item in d.data.list)
-                        {
-                            PenLinBengList.Add(item);
-                        }
-                    }
-                    else if (type == DeviceType.排烟风机)
+                    foreach (var item in d.data.list)
                     {
-                        //PaiYanJiList = d.data.list;
-                        foreach (var item in d.data.list)
+                        foreach (var data in AllData)
                         {
-                            PaiYanJiList.Add(item);
-                        }
-                    }
-                    else if (type == DeviceType.送风机)
-                    {
-                        foreach (var item in d.data.list)
-                        {
-                            SongFengJiList.Add(item);
+                            if (data.Key == type)
+                            {
+                                data.Value.Add(item);
+                            }
                         }
                     }
                 }, (a, b) =>
                 {
-                    Debug.Log(a + b);
+                    Debug.LogError(a + b);
                 });
             }
         }
@@ -576,13 +518,13 @@ public class DevicePanelManager : MonoBehaviour
             }
             HttpManager.Instance.Get<string>(url, d =>
             {
-                Debug.Log("aaaaaaaaaaaaaaaaaaaaaa:" + d);
+                //Debug.Log("aaaaaaaaaaaaaaaaaaaaaa:" + d);
                 BindObjectList = JsonConvert.DeserializeObject<List<DeviceObjConfig>>(d);
             });
         }
         catch
         {
-            Debug.Log("暂无数据!");
+            Debug.LogError("暂无数据!");
         }
     }
     public void SaveDeviceObjConfig(DeviceObjConfig config)
@@ -612,4 +554,6 @@ public class DevicePanelManager : MonoBehaviour
             ShowBindList(NowType, NowClickObject);
         });
     }
+
+    
 }

Assets/Scripts/ANet/Prefabs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 19d0b5cc55a8d514cbf750d03b546b34
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/EquipmentController.cs

@@ -11,7 +11,7 @@ public class EquipmentController : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        if (equipmentType == EquipmentType.SmokeVent)
+        if (equipmentType == EquipmentType.SmokeExtractionFan)
         {
             if (!GetComponent<DeviceObj>())
             {
@@ -27,22 +27,6 @@ public class EquipmentController : MonoBehaviour
             }
             GetComponent<DeviceObj>().BindType = DeviceType.送风机;
         }
-        else if (equipmentType == EquipmentType.OutdoorHydrant)
-        {
-            if (!GetComponent<DeviceObj>())
-            {
-                gameObject.AddComponent<DeviceObj>();
-            }
-            GetComponent<DeviceObj>().BindType = DeviceType.消火栓;
-        }
-        else if (equipmentType == EquipmentType.PumpRoomAndWaterTank)
-        {
-            if (!GetComponent<DeviceObj>())
-            {
-                gameObject.AddComponent<DeviceObj>();
-            }
-            GetComponent<DeviceObj>().BindType = DeviceType.水箱;
-        }
     }
 
     private void OnMouseDown()

Assets/Scripts/UIManager/View/WaterSystemMenuPanel.cs

@@ -5,6 +5,8 @@ using UniRx;
 public class WaterSystemMenuPanel : UIView 
 {
     public Toggle PumpRoomToggle;
+    public Toggle SXToggle;
+    public Toggle PLBToggle;
     public Toggle IndoorHydrantToggle;
     public Toggle PumpAdapterToggle;
     public Toggle OutdoorHydrantToggle;
@@ -15,6 +17,12 @@ public class WaterSystemMenuPanel : UIView
         //泵房水箱
         PumpRoomToggle.OnValueChangedAsObservable()
            .Subscribe(Value => MainMenu.Instance.OnPumpRoom(Value));
+        //水泵
+        SXToggle.OnValueChangedAsObservable()
+           .Subscribe(Value => MainMenu.Instance.OnPumpRoom(Value));
+        //喷淋泵
+        PLBToggle.OnValueChangedAsObservable()
+           .Subscribe(Value => MainMenu.Instance.OnPumpRoom(Value));
         //室内消火栓
         IndoorHydrantToggle.OnValueChangedAsObservable()
            .Subscribe(Value => MainMenu.Instance.OnIndoorHydrant(Value));