From 21412331475a2bdfe259a4299462bc27d2a7922c Mon Sep 17 00:00:00 2001
From: Afeijia <ifeijia@qq.com>
Date: Tue, 9 Jul 2024 21:02:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=A5=E5=BF=97-20240709-2?=
 =?UTF-8?q?101=EF=BC=9A=201=E3=80=81=E7=9B=B8=E6=9C=BA=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Scripts/wj/Device/CameraDevice.cs                 | 5 ++++-
 .../Assets/Scripts/wj/Manager/ApiManager.cs                  | 1 +
 .../Assets/Scripts/wj/Manager/MainScene.cs                   | 1 +
 BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs  | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs
index 722a7a48..674f0c1f 100644
--- a/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs
+++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Device/CameraDevice.cs
@@ -9,6 +9,9 @@ public class CameraDevice : DeviceBase
     /// </summary>
     public void SetActiveState()
     {
-        DeviceUI.gameObject.SetActive(T_BAS_CAMERA != null);
+        if (DeviceUI != null)
+        {
+            DeviceUI.gameObject.SetActive(T_BAS_CAMERA != null);
+        }
     }
 }
diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs
index 46dce501..9edecbd7 100644
--- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs
+++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs
@@ -155,6 +155,7 @@ public class ApiManager : Singleton<ApiManager>
                 }
             }
         }));
+        //return;
         //获取摄像机列表
         StartCoroutine(GetCameraList());
         //获取堆区列表
diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs
index 5c208dc6..b2648f2f 100644
--- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs
+++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs
@@ -112,6 +112,7 @@ public class MainScene : Singleton<MainScene>
             {
                 DeviceBase.CameraList[i].T_BAS_CAMERA = _camera;
                 DeviceBase.CameraList[i].DeviceUI.InitData();
+                DeviceBase.CameraList[i].SetActiveState();
             }
             else
             {
diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs
index 9a24eca2..f7796d16 100644
--- a/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs
+++ b/BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceUIBase.cs
@@ -46,6 +46,8 @@ public class DeviceUIBase : MonoBehaviour, IPointerClickHandler
         {
             case DeviceType.CAMERA:
                 transform.name = "Camera_UI_" + DeviceIndex;
+                //默认不展示摄像机
+                gameObject.SetActive(false);
                 break;
             case DeviceType.BELT_SCALE:
                 break;