上传代码

Assets/Game/Blue/Command/DeviceDetailsUpdataDataCommand.cs

@@ -0,0 +1,21 @@
+using Blue;
+
+namespace GHZLangChao
+{
+    public class DeviceDetailsUpdataDataCommand : ICommand
+    {
+        private DeviceParameters DeviceParameter;
+        public DeviceDetailsUpdataDataCommand(DeviceParameters DeviceParameter)
+        {
+            this.DeviceParameter = DeviceParameter;
+        }
+
+        public void OnExcute()
+        {
+            this.SendEvent(new DeviceDetailsUpdataDataEvent()
+            {
+                DeviceParameter = this.DeviceParameter
+            });
+        }
+    }
+}

Assets/Game/ShowDevice/DeviceControl.cs.meta → Assets/Game/Blue/Command/DeviceDetailsUpdataDataCommand.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 742106b9ee5120d48a3d46b3cf195f41
+guid: b9c7b4b9be0c715419fe54819f681a41
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Game/Blue/Controller/Item/DeviceInfo_Item.cs

@@ -1,9 +1,10 @@
+using Blue;
 using UnityEngine;
 using UnityEngine.UI;
 
 namespace GHZLangChao
 {
-    public class DeviceInfo_Item : MonoBehaviour
+    public class DeviceInfo_Item : AbstractController
     {
         private DeviceParameters DeviceParameter;
 
@@ -12,15 +13,18 @@ namespace GHZLangChao
         {
             DetailsBtn.onClick.AddListener(ClickDetails);
         }
-        public void Init(DeviceParameters DeviceParameter)
+
+        int i;
+        public void Init(DeviceParameters DeviceParameter,int i)
         {
             this.DeviceParameter = DeviceParameter;
+            this.i = i;
         }
 
         private void ClickDetails()
         {
-            ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowDevice);
-            ShowDevice.Instance.gotoWindow(ScenesManager.SceneType.DeviceDetails);
+            DeviceParameter.deviceModel = "NetView400"+i;
+            this.SendCommand(new DeviceDetailsUpdataDataCommand(DeviceParameter)); // 触发事件，打开面板，更新数据
         }
     }
 }

Assets/Game/Blue/Event/DeviceDetailsUpdataDataEvent.cs

@@ -0,0 +1,9 @@
+using Blue;
+
+namespace GHZLangChao
+{
+    public struct DeviceDetailsUpdataDataEvent : IEvent
+    {
+        public DeviceParameters DeviceParameter;
+    }
+}

Assets/Game/Blue/Event/DeviceDetailsUpdataDataEvent.cs.meta

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

Assets/Game/ScenesManager.cs

@@ -36,7 +36,8 @@ public class ScenesManager
 
         //ShowZhiDao = 50001,
 
-        ShowDevice = 60001, // 设备信息
+        ShowDevice = 60001, // 设备基础信息
+        ShowBasicDevice = 61001, // 设备基础详情
         DeviceDetails = 61002, // 设备详情
         Navigationing = 80001, // 导航中
 

Assets/Game/ShowChoose/ChooseManager.cs

@@ -1,12 +1,15 @@
 using System.Collections;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class ChooseManager : MonoBehaviour
 {
     [SerializeField] private GameObject Tip;
+    [SerializeField] private Button NavigationingBtn;
     void Start()
     {
         StartCoroutine(ControlTip());
+        NavigationingBtn.onClick.AddListener(Navigationing);
     }
 
     public void GotoXunJian()
@@ -32,4 +35,11 @@ public class ChooseManager : MonoBehaviour
         yield return new WaitForSeconds(3);
         Tip.SetActive(false);
     }
+
+#region 按钮点击
+        public void Navigationing()
+        {
+            ScenesManager.Instance.showWindow(ScenesManager.SceneType.Navigationing);
+        }
+#endregion
 }

Assets/Game/ShowChoose/ShowChoose.prefab

@@ -1707,6 +1707,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Tip: {fileID: 7897104504025182316}
+  NavigationingBtn: {fileID: 235959186476976474}
 --- !u!114 &8518192312414424363
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/Game/ShowDevice/BasicDeviceControl.cs

@@ -0,0 +1,10 @@
+namespace GHZLangChao
+{
+    public class BasicDeviceControl : AbstractController
+    {
+        public void ShowChoose()
+        {
+            ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
+        }
+    }
+}

Assets/Game/ShowDevice/BasicDeviceControl.cs.meta

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

Assets/Game/ShowDevice/DeviceControl.cs

@@ -1,15 +0,0 @@
-using Blue;
-
-public class DeviceControl : AbstractController
-{
-    
-    void Start()
-    {
-        
-    }
-
-    public void ShowChoose()
-    {
-        ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
-    }
-}

Assets/Game/ShowDevice/DeviceDetailsControl.cs

@@ -0,0 +1,102 @@
+using UnityEngine.UI;
+using Blue;
+using GHZLangChao;
+
+/// <summary>
+/// 设备信息控制面板
+/// </summary>
+public class DeviceDetailsControl : AbstractController
+{
+    //public Text deviceId; // 设备ID
+    //public Text deviceName; // 设备名称
+    public Text deviceModel; // 设备型号
+    public Text deviceType; // 设备类型
+    public Text assetTagNumber; // 资产标签号
+    public Text serialNumber; // 序列号
+    public Text equipmentNumber; // 设备编码
+    public Text assetStatus; // 资产状态
+    public Text deviceStatus; // 设备状态
+    public Text deliveryData; // 交付日期
+
+    public Text enabledDate; // 启用日期
+    public Text serverUsageType; // 服务器使用类型
+    public Text typicalModel; // 典配模型
+    public Text equipmentBrand; // 设备品牌
+    public Text manufacturer; // 生产厂商
+    public Text equipmentWeight; // 设备重量（KG）
+    public Text equipmentPower; // 设备功率（W）
+    public Text originType; // 产地类型
+    public Text collectionCPName; // 集采目录产品名称
+    public Text resourcePool; // 所在资源池
+
+    public Text wherePOD; // 所在POD
+    public Text networkDomain; // 所在网络域
+    public Text city; // 所在城市
+    public Text building; // 所在楼宇
+    public Text floor; // 所在楼层
+    public Text computerRoomName; // 所在机房名称
+    public Text computerRoomCoding; // 所在机房编码
+    public Text cabinetNumber; // 机柜编号
+    public Text uMessage; // U位信息
+    public Text deviceOrientation; // 设备朝向
+
+    public Text manageIP; // 管理IP
+    public Text saveIP; // 存储IP
+    public Text iPMIIP; // IPMIP
+    public Text businessIP; // 业务IP
+    public Text projectName; // 项目名称
+    public Text equipmentSupplier; // 设备供货商
+    public Text assetOwner; // 资产责任人
+    public Text territorialPAManager; // 属地省资产负责人
+    public Text equipmentBTTOrganization; // 设备归属组织
+    public Text facilityManagementOrganization; // 设备管理组织
+    public Text equipmentMaintenanceOrganization; // 设备维护组织
+
+    public Text businessSystem; // 业务系统
+
+    public void UpdateData(DeviceParameters DeviceParameter)
+    {
+        //deviceId.text = DeviceParameter.deviceId.ToString();
+        //deviceName.text = DeviceParameter.deviceName;
+        deviceModel.text = DeviceParameter.deviceModel;
+        assetTagNumber.text = DeviceParameter.assetTagNumber;
+        serialNumber.text = DeviceParameter.serialNumber;
+        equipmentNumber.text = DeviceParameter.equipmentNumber;
+        assetStatus.text = DeviceParameter.assetStatus;
+        deviceStatus.text = DeviceParameter.deviceStatus;
+        deliveryData.text = DeviceParameter.deliveryData;
+
+        enabledDate.text = DeviceParameter.enabledDate;
+        serverUsageType.text = DeviceParameter.serverUsageType;
+        typicalModel.text = DeviceParameter.typicalModel;
+        equipmentBrand.text = DeviceParameter.equipmentBrand;
+        manufacturer.text = DeviceParameter.manufacturer;
+        equipmentWeight.text = DeviceParameter.equipmentWeight.ToString();
+        equipmentPower.text = DeviceParameter.equipmentPower.ToString();
+        originType.text = DeviceParameter.originType;
+        collectionCPName.text = DeviceParameter.collectionCPName;
+        resourcePool.text = DeviceParameter.resourcePool;
+
+        wherePOD.text = DeviceParameter.wherePOD;
+        networkDomain.text = DeviceParameter.networkDomain;
+        city.text = DeviceParameter.city;
+        building.text = DeviceParameter.building;
+        floor.text = DeviceParameter.floor;
+        computerRoomName.text = DeviceParameter.computerRoomName;
+        cabinetNumber.text = DeviceParameter.cabinetNumber;
+        uMessage.text = DeviceParameter.uMessage;
+        deviceOrientation.text = DeviceParameter.deviceOrientation;
+
+        manageIP.text = DeviceParameter.manageIP;
+        saveIP.text = DeviceParameter.saveIP;
+        iPMIIP.text = DeviceParameter.iPMIIP;
+        businessIP.text = DeviceParameter.businessIP;
+        equipmentSupplier.text = DeviceParameter.equipmentSupplier;
+        territorialPAManager.text = DeviceParameter.territorialPAManager;
+        equipmentBTTOrganization.text = DeviceParameter.equipmentBTTOrganization;
+        facilityManagementOrganization.text = DeviceParameter.facilityManagementOrganization;
+        equipmentMaintenanceOrganization.text = DeviceParameter.equipmentMaintenanceOrganization;
+
+        businessSystem.text = DeviceParameter.businessSystem;
+    }
+}

Assets/Game/ShowDevice/DeviceDetailsControl.cs.meta

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

Assets/Game/ShowDevice/ShowDevice.cs

@@ -1,9 +1,25 @@
 using SC.XR.Unity;
+using Blue;
+using GHZLangChao;
 
-public class ShowDevice : RemoteSingleton<ShowDevice>
+public class ShowDevice : RemoteSingleton<ShowDevice>,IController
 {
     public override void initShow()
     {
         base.initShow();
     }
-}
+
+    public override void Awake()
+    {
+        base.Awake();
+        this.RegisterEvent<DeviceDetailsUpdataDataEvent>(e=>
+        {
+            ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowDevice);
+            ShowDevice.Instance.gotoWindow(ScenesManager.SceneType.DeviceDetails);
+            if(DeviceDetailsControl==null)
+                DeviceDetailsControl = GetComponentInChildren<DeviceDetailsControl>();
+            DeviceDetailsControl.UpdateData(e.DeviceParameter);
+        }).UnRegisterWhenGameObjectDestroyed(gameObject);
+    }
+    DeviceDetailsControl DeviceDetailsControl;
+}

Assets/Game/ShowDevice/ShowDevice.prefab

@@ -2767,7 +2767,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 5466424356445212314}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 742106b9ee5120d48a3d46b3cf195f41, type: 3}
+  m_Script: {fileID: 11500000, guid: e9497e0b9166cc34c94ef23097378c90, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!1 &5541364889485737482

Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -91,8 +91,9 @@ GameObject:
   - component: {fileID: 8305409157384248199}
   - component: {fileID: 6907798891694134914}
   - component: {fileID: 5263855501254734901}
+  - component: {fileID: 770239675660213892}
   m_Layer: 5
-  m_Name: Setting
+  m_Name: Navigationing_Btn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -156,6 +157,50 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &770239675660213892
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 443231075548623517}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5263855501254734901}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &493425789189799982
 GameObject:
   m_ObjectHideFlags: 0
@@ -3530,9 +3575,10 @@ MonoBehaviour:
   - {fileID: 2684463194480659542}
   - {fileID: 8387428898964389192}
   ScreenshotImage: {fileID: 6369137603292117617}
+  CancelBtn: {fileID: 8020163195486443145}
   ScreenshotBtn: {fileID: 5367437816521039950}
   SaveBtn: {fileID: 3523176626855364471}
-  CancelBtn: {fileID: 8020163195486443145}
+  NavigationingBtn: {fileID: 770239675660213892}
 --- !u!1 &5519994624036338274
 GameObject:
   m_ObjectHideFlags: 0

Assets/Game/ShowXunJian/StartXunJian.cs

@@ -11,15 +11,16 @@ namespace GHZLangChao
         [SerializeField] private Image[] arrayImage; // 截图显示的画面
         [SerializeField] private Image ScreenshotImage; // 截图的画面
         private int arrayImageIndex = 0; // 截图显示时要显示在哪个Image上的下标
-
+        [SerializeField] private Button CancelBtn;
         [SerializeField] private Button ScreenshotBtn;
         [SerializeField] private Button SaveBtn;
-        [SerializeField] private Button CancelBtn;
+        [SerializeField] private Button NavigationingBtn;
         void Start()
         {
             ScreenshotBtn.onClick.AddListener(ClickScreenshot);
             SaveBtn.onClick.AddListener(ClickSave);
             CancelBtn.onClick.AddListener(ClickCancel);
+            NavigationingBtn.onClick.AddListener(Navigationing);
         }
 
         
@@ -39,7 +40,8 @@ namespace GHZLangChao
             ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowDevice);
         }
 
-        #region 按钮点击
+
+#region 按钮点击
         Sprite sprite;
         private void ClickScreenshot()
         {
@@ -63,6 +65,10 @@ namespace GHZLangChao
         {
             ScreenshotImage.gameObject.SetActive(false);
         }
+        public void Navigationing()
+        {
+            ScenesManager.Instance.showWindow(ScenesManager.SceneType.Navigationing);
+        }
 #endregion
     }
 }

Assets/Scenes/LangChaoDemo.unity

@@ -21480,6 +21480,7 @@ MonoBehaviour:
   selectPanel: {fileID: 0}
   isSelect: 0
   bgTransform: {fileID: 0}
+  DeviceInfoList: []
 --- !u!114 &4247985518656997648
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -21583,6 +21584,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Prefab:
   - {fileID: 5466424356445212314, guid: 516b1dd9af80bba42b8206d3a09635bb, type: 3}
+  - {fileID: 6107917270000557272, guid: c61a8008bf2355c42ad9c16cde9bc3eb, type: 3}
   window: []
 --- !u!1 &4247985519071008213
 GameObject:

Assets/Scripts/Data/DataItem.cs

@@ -48,10 +48,9 @@ public class DataItem : MonoBehaviour
     public void SetDeviceParametersData(List<DeviceParameters> DeviceParameterList)
     {
         this.DeviceParameterList = DeviceParameterList;
-        Debug.LogError("DeviceParameterList:"+DeviceParameterList.Count);
         for (int i = 0; i < DeviceInfoList.Count;i++)
         {
-            DeviceInfoList[i].Init(DeviceParameterList[0]); // 数据只有一个，所以都是0
+            DeviceInfoList[i].Init(DeviceParameterList[0],i); // 数据只有一个，所以都是0
         }
     }