改多少提交多少

Assets/Scripts/HttpHelper.cs

@@ -1103,6 +1103,43 @@ public class HttpHelper : MonoBehaviour
         }
 
         requestData1.Dispose();
+
+
+        successInternet = true;
+        UnityWebRequest requestData2 = UnityWebRequest.Get(ServerAddress.APIGetGeSWZData6H);
+        await requestData2.SendWebRequest();
+        try
+        {
+            if (requestData2.result != UnityWebRequest.Result.Success)
+            {
+                Debug.LogWarning("水文站联网不成功,原因:返request不成功");
+                successInternet = false;
+            }
+            else
+            {
+                JObject jsonObject = JObject.Parse(requestData2.downloadHandler.text);
+
+                // 提取data字段的值
+                JToken dataToken = jsonObject["data"];
+                JToken codeToken = jsonObject["code"];
+                if (codeToken.ToString() == "200")
+                {
+                    GlobalData.sWZDatas6H = JsonConvert.DeserializeObject<List<SWZData>>(dataToken.ToString());
+                }
+                else
+                {
+                    Debug.LogWarning("水文站联网不成功,原因:返序列化失败");
+                    successInternet = false;
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            successInternet = false;
+            Debug.LogWarning("水文站联网不成功,原因:" + e.ToString());
+        }
+
+        requestData2.Dispose();
     }
 
 

Assets/Scripts/UI/Data/GlobalData.cs

@@ -64,6 +64,11 @@ public class GlobalData
     /// </summary>
     public static List<SWZData> sWZDatas = new List<SWZData>();
 
+    /// <summary>
+    /// 一张图第三页水文数据
+    /// </summary>
+    public static List<SWZData> sWZDatas6H = new List<SWZData>();
+
     /// <summary>
     /// 一张图第三页补元监控数据
     /// </summary>

Assets/Scripts/UI/Tools/ServerAddress.cs

@@ -64,6 +64,11 @@ public class ServerAddress
     /// </summary>
     public static string APIGetGeSWZData = YZTServerPYAddress + "/get-six-hour-sw-data?hours=24";
 
+    /// <summary>
+    /// 获取水文站检测数据6H
+    /// </summary>
+    public static string APIGetGeSWZData6H = YZTServerPYAddress + "/get-six-hour-sw-data?hours=6";
+
     /// <summary>
     /// 获取重点地区水位检测数据
     /// </summary>

Assets/Scripts/UI/UIView/BigScreen/BigScreenLayer.cs

@@ -463,7 +463,7 @@ public class BigScreenLayer : MonoBehaviour
     {
         await new WaitUntil(() =>
         {
-            return GlobalData.swDatas.Count > 0 && GlobalData.qXZDatas.Count > 0 && GlobalData.sWZDatas.Count > 0;
+            return GlobalData.swDatas.Count > 0 && GlobalData.sWZDatas.Count > 0;
         });
         ChangeLocationWeatherData(0);
         swDrop0.onValueChanged.AddListener((index) =>

Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -547,6 +547,13 @@ public class GCJKLayer : YZTRootLayer
             }
         });
     }
+    public override void OnUILeave()
+    {
+        base.OnUILeave();
+        viewMode = ViewMode.normal;
+        miniMap.gameObject.SetActive(false);
+        main.gameObject.SetActive(true);
+    }
 
     public async void OnGlobalWeatherClick()
     {

Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -138,9 +138,12 @@ public class SWYJLayer : YZTRootLayer
     public ShuiWeiCtrl swXY;
 
     public Text title;
+
+    public Dropdown dropdown;
     private void Awake()
     {
         Init();
+        dropdown.ClearOptions();
         BuYuanDataButton = this.transform.Find("Main/BuYuanButton").GetComponent<Button>();
         BuYuanDataButton.onClick.AddListener(() =>
         {
@@ -178,48 +181,31 @@ public class SWYJLayer : YZTRootLayer
 
     void InitSWZData()
     {
-        if (GlobalData.qXZDatas.Count < 1 || GlobalData.qXZDatas1h.Count < 1)
+        if (GlobalData.sWZDatas.Count < 1 || GlobalData.sWZDatas6H.Count < 1)
             return;
 
-        float total24Value = 0;
-        float max24Value = float.MinValue;
-        float avg24Value = 0;
-        float xtValue = 0;
-        for (int i = 0; i < GlobalData.qXZDatas.Count; i++)
-        {
-            if (GlobalData.qXZDatas[i].STNM.Contains("新滩"))
-            {
-                xtValue = GlobalData.qXZDatas[i].dropSum6;
-            }
-            total24Value += GlobalData.qXZDatas[i].dropSum6;
-            max24Value = MathF.Max(max24Value, GlobalData.qXZDatas[i].dropSum6);
+        dropdown.ClearOptions();
+        List<Dropdown.OptionData> data = new List<Dropdown.OptionData>();
+        for (int i = 0; i < GlobalData.sWZDatas.Count; i++) {
+            data.Add(new Dropdown.OptionData(GlobalData.sWZDatas[i].STNM.Trim()));
         }
+        dropdown.AddOptions(data);
 
-        avg24Value = total24Value / GlobalData.qXZDatas.Count;
-
-        float total1Value = 0;
-        float max1Value = float.MinValue;
-        float avg1Value = 0;
-
-        for (int i = 0; i < GlobalData.qXZDatas1h.Count; i++)
+        dropdown.onValueChanged.RemoveAllListeners();
+        dropdown.onValueChanged.AddListener((int index) =>
         {
-            total1Value += GlobalData.qXZDatas1h[i].dropSum6;
-            max1Value = MathF.Max(max1Value, GlobalData.qXZDatas1h[i].dropSum6);
-        }
-
-        avg1Value = total1Value / GlobalData.qXZDatas.Count;
-
+            _dangQianYuLiangText.text =
+            $"{GlobalData.sWZDatas6H[index].dropSum6} <size=14><color=#A5BBE2>mm</color></size>";
+            _zuiDaYuLiangText.text =
+                $"{GlobalData.sWZDatas[index].dropSum6} <size=14><color=#A5BBE2>mm</color></size>";
+            _weatherTypeText.text = $"{GlobalData.sWZDatas[index].STNM.Trim()}";
+        });
 
         _dangQianYuLiangText.text =
-            $"{max1Value.ToString("0.00")} <size=14><color=#A5BBE2>mm</color></size>";
+            $"{GlobalData.sWZDatas6H[0].dropSum6} <size=14><color=#A5BBE2>mm</color></size>";
         _zuiDaYuLiangText.text =
-            $"{max24Value.ToString("0.00")} <size=14><color=#A5BBE2>mm</color></size>";
-        _pingJunYuLiangText.text =
-            $"{avg1Value.ToString("0.00")} <size=14><color=#A5BBE2>mm</color></size>";
-        _chaoJingZhanDianText.text =
-            $"{avg24Value.ToString("0.00")} <size=14><color=#A5BBE2>mm</color></size>";
-
-        _weatherTypeText.text = $"{xtValue} <size=14><color=#A5BBE2>mm</color></size>";
+            $"{GlobalData.sWZDatas[0].dropSum6} <size=14><color=#A5BBE2>mm</color></size>";
+        _weatherTypeText.text = $"{GlobalData.sWZDatas[0].STNM.Trim()}";
         //todo 换图标
     }
 
@@ -384,7 +370,7 @@ public class SWYJLayer : YZTRootLayer
         _zuiDaYuLiangText = this.transform.Find("Left/QuanYuYuLiang/ZuiDaYuLiang/numText").GetComponent<Text>();
         _pingJunYuLiangText = this.transform.Find("Left/QuanYuYuLiang/PingJunYuLiang/numText").GetComponent<Text>();
         _chaoJingZhanDianText = this.transform.Find("Left/QuanYuYuLiang/ChaoZhanYuJing/numText").GetComponent<Text>();
-        _weatherTypeText = this.transform.Find("Left/QuanYuYuLiang/weatherTypeValue").GetComponent<Text>();
+        _weatherTypeText = this.transform.Find("Left/QuanYuYuLiang/weatherTypeName").GetComponent<Text>();
         _weatherTypeIcon = this.transform.Find("Left/QuanYuYuLiang/weatherIcon").GetComponent<Image>();
 
 

Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -468,9 +468,9 @@ public class YZTLayer : YZTRootLayer
     {
         await new WaitUntil(() =>
         {
-            return GlobalData.qXZDatas.Count > 0;
+            return GlobalData.sWZDatas.Count > 0;
         });
-        int qxzCount = GlobalData.qXZDatas.Count;
+        int swzCount = GlobalData.sWZDatas.Count;
         string maxName = "";
         float maxValue = -99f;
         int value010 = 0;
@@ -479,14 +479,14 @@ public class YZTLayer : YZTRootLayer
         int value50100 = 0;
         int value100200 = 0;
         int value200 = 0;
-        for (int i = 0; i < qxzCount; i++)
+        for (int i = 0; i < swzCount; i++)
         {
-            float value = GlobalData.qXZDatas[i].dropSum6;
+            float value = GlobalData.sWZDatas[i].dropSum6;
             if (value > maxValue)
             {
 
                 maxValue = value;
-                maxName = GlobalData.qXZDatas[i].STNM;
+                maxName = GlobalData.sWZDatas[i].STNM;
             }
             if (value >= 0 && value < 10)
             {
@@ -514,7 +514,7 @@ public class YZTLayer : YZTRootLayer
             }
         }
 
-        rainText.text = $"数据时间:17日12时至18日12时(过去24小时)\r\n蓄洪区共有{qxzCount}个雨量站，其中几个雨量站监测有降雨最大降雨测站为{maxName}站点，降雨量{maxValue}mm.";
+        rainText.text = $"数据时间:(过去24小时)\r\n蓄洪区共有{swzCount}个雨量站，其中几个雨量站监测有降雨最大降雨测站为{maxName}站点，降雨量{maxValue}mm.";
         rainTextNum[0].text = value010.ToString();
         rainTextNum[1].text = value1025.ToString();
         rainTextNum[2].text = value2550.ToString();