“hujiajun” 6 months ago
parent
commit
464f080b80

+ 32 - 53
Assets/DataManager.cs

@@ -532,7 +532,6 @@ public static string Md5(string str)
 
         StartCoroutine(Post_Demo("/detail/tempHumiInfo", data.ToJson(), (string msg) =>
         {
-            try{
             List<LineChartData> sjds = new List<LineChartData>();
             JsonData datamsg = JsonMapper.ToObject(msg);
             LineChartData data = new LineChartData();
@@ -647,10 +646,7 @@ public static string Md5(string str)
             sjds.Add(data);
 
             callback.Invoke(sjds);
-            }
-            catch{
-
-            }
+     
         }));
     }
 
@@ -661,7 +657,6 @@ public static string Md5(string str)
         
         StartCoroutine(Post_Demo("/detail/rackTempHumi", data.ToJson(), (string msg) =>
         {
-            try{
             List<ServerjiguiData> sjds = new List<ServerjiguiData>();
             JsonData data = JsonMapper.ToObject(msg);
             for (int i = 0; i < data["data"]["racks"].Count; i++)
@@ -675,10 +670,6 @@ public static string Md5(string str)
             }
             callback.Invoke(sjds);
 
-            }
-            catch{
-
-            }
         }));
      }
 
@@ -687,7 +678,7 @@ public static string Md5(string str)
     {
         Debug.Log("获取温湿度===》");
         StartCoroutine(Post_Demo("/overview/serverroom","",(string msg)=> {
-            try{
+            
             JsonData data = JsonMapper.ToObject(msg);
 
             ServerData sd = new ServerData();
@@ -714,10 +705,6 @@ public static string Md5(string str)
             }
             callback.Invoke(sd);
 
-            }
-            catch{
-
-            }
         }));
         return;
         ServerData sd = new ServerData();
@@ -770,7 +757,7 @@ public static string Md5(string str)
     {
         Debug.Log("获取video===》");
         StartCoroutine(Post_Demo("/overview/serverLiveOverview", "", (string msg) => {
-            try{
+           
             JsonData data = JsonMapper.ToObject(msg);
 
             ServerData sd = new ServerData();
@@ -808,10 +795,7 @@ public static string Md5(string str)
             }
             callback.Invoke(sd);
 
-            }
-            catch{
-
-            }
+        
         }));
         return;
         ServerData sd = new ServerData();
@@ -896,7 +880,6 @@ public static string Md5(string str)
         Debug.Log("6个服务器===》");
         StartCoroutine(Post_Demo("/overview/intelligentResourceOverview", "", (string msg) =>
         {
-            try{
             JsonData data = JsonMapper.ToObject(msg);
 
 
@@ -947,10 +930,7 @@ public static string Md5(string str)
             p2.value = float.Parse(data["data"]["flops"]["value"].ToString().Split(' ')[0]);
             lp.Add(p2);
             callback.Invoke(lp);
-            }
-            catch{
-
-            }
+       
         }));
             
           return;
@@ -1007,7 +987,6 @@ public static string Md5(string str)
         Debug.Log("获取gpu===》");
         StartCoroutine(Post_Demo("/overview/gpupower", "", (string msg) => {
 
-try{
             JsonData datamsg = JsonMapper.ToObject(msg);
             LineChartData data = new LineChartData();
             data.xdata = new List<string>();
@@ -1037,10 +1016,6 @@ try{
 
             callback.Invoke(data);
 
-            }
-            catch{
-
-            }
         }));
 
         return;
@@ -1077,7 +1052,6 @@ try{
     {
         StartCoroutine(Post_Demo("/overview/warnData", "", (string msg) =>
         {
-            try{
             JsonData datamsg = JsonMapper.ToObject(msg);
             LineChartData data = new LineChartData();
             data.xdata = new List<string>();
@@ -1093,24 +1067,28 @@ try{
                 data.sdata.Add(lc);
 
             }
-
-            for (int i = 0; i < datamsg["data"]["items"].Count; i++)
+            try
             {
 
-                data.xdata.Add(datamsg["data"]["items"][i]["date"].ToString());
-                for (int j = 0; j < data.sdata.Count; j++)
+                for (int i = 0; i < datamsg["data"]["items"].Count; i++)
                 {
-                    data.sdata[j].values.Add(float.Parse(datamsg["data"]["items"][i]["prop_value"][j].ToString()));
 
+                    data.xdata.Add(datamsg["data"]["items"][i]["date"].ToString());
+                    for (int j = 0; j < data.sdata.Count; j++)
+                    {
+                        data.sdata[j].values.Add(float.Parse(datamsg["data"]["items"][i]["prop_value"][j].ToString()));
+
+                    }
                 }
             }
-
-            callback.Invoke(data);
+            catch
+            {
 
             }
-            catch{
 
-            }
+            callback.Invoke(data);
+
+        
         }));
         return;
             LineChartData data = new LineChartData();
@@ -1155,26 +1133,27 @@ try{
     {
         StartCoroutine(Post_Demo("/overview/warnRecord", "", (string msg) =>
         {
-            try{
             JsonData datamsg = JsonMapper.ToObject(msg);
 
             GaoJingListData gjl = new GaoJingListData();
             gjl.list = new List<GaoJingItemData>();
-            for (int i = 0; i < datamsg["data"]["items"].Count; i++)
-            {
-             GaoJingItemData gjid = new GaoJingItemData();
-                gjid.lv = datamsg["data"]["items"][i]["level"].ToString();
-                gjid.time = datamsg["data"]["items"][i]["time"].ToString();
-                gjid.dev = datamsg["data"]["items"][i]["device"].ToString();
-                gjid.type = datamsg["data"]["items"][i]["status"].ToString();
-                gjl.list.Add(gjid);
-            }
-            callback.Invoke(gjl);
+            try{
 
-            }
-            catch{
+                for (int i = 0; i < datamsg["data"]["items"].Count; i++)
+                {
+                GaoJingItemData gjid = new GaoJingItemData();
+                    gjid.lv = datamsg["data"]["items"][i]["level"].ToString();
+                    gjid.time = datamsg["data"]["items"][i]["time"].ToString();
+                    gjid.dev = datamsg["data"]["items"][i]["device"].ToString();
+                    gjid.type = datamsg["data"]["items"][i]["status"].ToString();
+                    gjl.list.Add(gjid);
+                }
+            }catch{
 
             }
+            
+            callback.Invoke(gjl);
+
         }));
         return;
             GaoJingListData gjl = new GaoJingListData();

+ 4 - 0
Assets/DianLiJianKongManager.cs

@@ -127,8 +127,12 @@ public class DianLiJianKongManager : UpdateManager
 
     public void updatetu()
     {
+        if(jiguiindex==0)
+        {
         jiguiindex = sjds[0].id;
         jiguiname.text = sjds[0].name;
+
+        }
         for (int i = 0; i < sjds.Count; i++)
         {
             if(sjds[i].id == jiguiindex)

+ 7 - 1
Assets/RoomToggleChoose.cs

@@ -1,18 +1,24 @@
 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class RoomToggleChoose : MonoBehaviour
 {
     public int id;
     private void OnEnable()
     {
+        if(DataManager.admin!=1)
+        {
+            this.GetComponent<Button>().onClick=new Button.ButtonClickedEvent();
+        }
         //index = this.GetComponentIndex();
     }
 
     public void choose(bool b)
     {
-        if (b&& id!=0)
+        if (b&& id!=0&&DataManager.admin==1)
         {
             ServerRoomManager.chooswsd = id;
             Debug.Log("chooswsd__" + ServerRoomManager.chooswsd);

File diff suppressed because it is too large
+ 57 - 2
Assets/Scenes/16-9.unity


File diff suppressed because it is too large
+ 14 - 43
Assets/Scenes/16-9green.unity


File diff suppressed because it is too large
+ 42 - 0
Assets/Scenes/32-9.unity


File diff suppressed because it is too large
+ 57 - 2
Assets/Scenes/32-9green.unity


+ 21 - 0
Assets/checkadmin.cs

@@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class checkadmin : MonoBehaviour
+{
+    // Start is called before the first frame update
+   private void OnEnable() {
+    Debug.Log("DataManager.admin===>"+DataManager.admin);
+        if(DataManager.admin!=1)
+        {
+            this.gameObject.SetActive(false);
+        }
+   }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

+ 11 - 0
Assets/checkadmin.cs.meta

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

Some files were not shown because too many files changed in this diff