提交摄像机点位

Assets/Scripts/HttpHelper.cs

@@ -426,7 +426,7 @@ public class HttpHelper : MonoBehaviour
         await requestData.SendWebRequest();
         try
         {
-            if (requestData.result != UnityWebRequest.Result.Success)
+            if (true)
             {
                 Debug.LogWarning("YZTLayer联网不成功，读本地缓存数据,原因:返request不成功");
                 successInternet = false;

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

@@ -260,39 +260,37 @@ public class GCJKLayer : YZTRootLayer
 
     private async void OnEnable()
     {
+        StaticLod.instance.OnFoucusStatic(0);
 
-        if (GlobalData.buYuanSensorData != null)
+        if (GlobalData.buYuanSensorData == null || GlobalData.buYuanSensorData.data.Count < 1)
         {
-            if (GlobalData.buYuanSensorData.data.Count < 1)
-            {
-                await HttpHelper._Instance.SendBuYuan_GetSensorData();
-            }
+            await HttpHelper._Instance.SendBuYuan_GetSensorData();
         }
 
-        if (GlobalData.taoKouSensorData != null)
+        if (GlobalData.taoKouSensorData == null || GlobalData.taoKouSensorData.data.Count < 1)
         {
-            if (GlobalData.taoKouSensorData.data.Count < 1)
-            {
-                await HttpHelper._Instance.SendTaoKou_GetSensorData();
-            }
+            await HttpHelper._Instance.SendTaoKou_GetSensorData();
         }
-
-        if (GlobalData.BuYuanShuiWeiDataList.Count < 1)
-        {
-            await HttpHelper._Instance.InitSWYJData();
-        }
-
-        if (GlobalData.BuYuanShuiYaDataList.Count < 1)
-        {
-            HttpHelper._Instance.GetBuYuanDevicesGroupInfo();
-        }
-
-        if (GlobalData.TaoKouShuiYaDataList.Count < 1)
-        {
-            HttpHelper._Instance.GetTaoKouDevicesGroupInfo();
-        }
-
-        SetCurrentDataToPanel(0);
+        //Debug.LogError(GlobalData.BuYuanShuiWeiDataList.Count + "333");
+        //if (GlobalData.BuYuanShuiWeiDataList.Count < 1)
+        //{
+            
+        //    await HttpHelper._Instance.InitSWYJData();
+        //}
+        //Debug.LogError(GlobalData.BuYuanShuiYaDataList.Count + "444");
+        //if (GlobalData.BuYuanShuiYaDataList.Count < 1)
+        //{
+            
+        //    HttpHelper._Instance.GetBuYuanDevicesGroupInfo();
+        //}
+        //Debug.LogError(GlobalData.TaoKouShuiYaDataList.Count + "555");
+        //if (GlobalData.TaoKouShuiYaDataList.Count < 1)
+        //{
+            
+        //    HttpHelper._Instance.GetTaoKouDevicesGroupInfo();
+        //}
+
+        //SetCurrentDataToPanel(0);
     }
 
 
@@ -798,34 +796,29 @@ public class GCJKLayer : YZTRootLayer
         {
             Destroy(_obsIconCtrls[i].gameObject);
         }
-        //Debug.Log("监控列表数量:"+GlobalData.obsDatas_by.Count);
-        if (currentDataType == 0)
+
+        for (int i = 0; i < GlobalData.obsDatas_by.Count; i++)
         {
-            for (int i = 0; i < GlobalData.obsDatas_by.Count; i++)
-            {
-                ObsItem tempItem = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
-                tempItem.SetData(GlobalData.obsDatas_by[i]);
-                _obsItems.Add(tempItem);
-                ObsIconCtrl tempIcon = Instantiate(obsIconPrefab, _obsIconContent).GetComponent<ObsIconCtrl>();
-                Debug.Log(GlobalData.obsDatas_by[i].name + " " + GlobalData.obsDatas_by[i].targetName);
-                tempIcon.Init(GlobalData.obsDatas_by[i]);
-                _obsIconCtrls.Add(tempIcon);
-                //Debug.Log(StaticLod.instance.GetStaticObj(GlobalData.obsDatas[i].name).gameObject.name);
-            }
+            ObsItem tempItem = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
+            tempItem.SetData(GlobalData.obsDatas_by[i]);
+            _obsItems.Add(tempItem);
+            ObsIconCtrl tempIcon = Instantiate(obsIconPrefab, _obsIconContent).GetComponent<ObsIconCtrl>();
+            Debug.Log(GlobalData.obsDatas_by[i].name + " " + GlobalData.obsDatas_by[i].targetName);
+            tempIcon.Init(GlobalData.obsDatas_by[i]);
+            _obsIconCtrls.Add(tempIcon);
+            //Debug.Log(StaticLod.instance.GetStaticObj(GlobalData.obsDatas[i].name).gameObject.name);
         }
-        else
+
+        for (int i = 0; i < GlobalData.obsDatas_tk.Count; i++)
         {
-            //Debug.Log($"创建补元监控对象:{_obsItems.Count} {_obsIconCtrls.Count} {GlobalData.obsDatas_by.Count} {GlobalData.obsDatas_tk.Count}");
-            for (int i = 0; i < GlobalData.obsDatas_tk.Count; i++)
-            {
-                ObsItem tempItem = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
-                tempItem.SetData(GlobalData.obsDatas_tk[i]);
-                _obsItems.Add(tempItem);
-                ObsIconCtrl tempIcon = Instantiate(obsIconPrefab, _obsIconContent).GetComponent<ObsIconCtrl>();
-                tempIcon.Init(GlobalData.obsDatas_tk[i]);
-                _obsIconCtrls.Add(tempIcon);
-                //Debug.Log(StaticLod.instance.GetStaticObj(GlobalData.obsDatas[i].name).gameObject.name);
-            }
+            Debug.LogError(GlobalData.obsDatas_tk[i].targetName);
+            ObsItem tempItem = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
+            tempItem.SetData(GlobalData.obsDatas_tk[i]);
+            _obsItems.Add(tempItem);
+            ObsIconCtrl tempIcon = Instantiate(obsIconPrefab, _obsIconContent).GetComponent<ObsIconCtrl>();
+            tempIcon.Init(GlobalData.obsDatas_tk[i]);
+            _obsIconCtrls.Add(tempIcon);
+            //Debug.Log(StaticLod.instance.GetStaticObj(GlobalData.obsDatas[i].name).gameObject.name);
         }
         SetObsIconActive(obsToggle.isOn);
     }

Assets/StreamingAssets/layerUnitDatas.json

@@ -638,5 +638,615 @@
         "namePri": "BY_D25",
         "text1": "补元退洪闸",
         "text2": "1号闸"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.78997,
+        "latitude": 29.9348068,
+        "name": "右岸1",
+        "namePri": "TK_D1",
+        "text1": "套口进洪闸",
+        "text2": "右岸1"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.786011,
+        "latitude": 29.9349136,
+        "name": "右岸2",
+        "namePri": "TK_D2",
+        "text1": "套口进洪闸",
+        "text2": "右岸2"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.786011,
+        "latitude": 29.934988,
+        "name": "右岸3",
+        "namePri": "TK_D3",
+        "text1": "套口进洪闸",
+        "text2": "右岸3"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.786263,
+        "latitude": 29.9349136,
+        "name": "右岸4",
+        "namePri": "TK_D4",
+        "text1": "套口进洪闸",
+        "text2": "右岸4"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792809,
+        "latitude": 29.9349136,
+        "name": "配电室1",
+        "namePri": "TK_D5",
+        "text1": "套口进洪闸",
+        "text2": "配电室1"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792809,
+        "latitude": 29.934988,
+        "name": "配电室2",
+        "namePri": "TK_D6",
+        "text1": "套口进洪闸",
+        "text2": "配电室2"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792557,
+        "latitude": 29.9349136,
+        "name": "右岸楼梯",
+        "namePri": "TK_D7",
+        "text1": "套口进洪闸",
+        "text2": "右岸楼梯"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792557,
+        "latitude": 29.93499,
+        "name": "左岸1",
+        "namePri": "TK_D8",
+        "text1": "套口进洪闸",
+        "text2": "左岸1"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.786263,
+        "latitude": 29.9349861,
+        "name": "左岸3",
+        "namePri": "TK_D9",
+        "text1": "套口进洪闸",
+        "text2": "左岸3"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.7864,
+        "latitude": 29.9350319,
+        "name": "左岸2",
+        "namePri": "TK_D10",
+        "text1": "套口进洪闸",
+        "text2": "左岸2"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.786415,
+        "latitude": 29.9350319,
+        "name": "左岸4",
+        "namePri": "TK_D11",
+        "text1": "套口进洪闸",
+        "text2": "左岸4"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.786682,
+        "latitude": 29.9350319,
+        "name": "左岸闸室4",
+        "namePri": "TK_D12",
+        "text1": "套口进洪闸",
+        "text2": "左岸闸室4"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.7867,
+        "latitude": 29.9350319,
+        "name": "左岸一楼大门",
+        "namePri": "TK_D13",
+        "text1": "套口进洪闸",
+        "text2": "左岸一楼大门"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.786972,
+        "latitude": 29.9350319,
+        "name": "闸室1",
+        "namePri": "TK_D14",
+        "text1": "套口进洪闸",
+        "text2": "闸室1"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.786987,
+        "latitude": 29.9350319,
+        "name": "闸室3",
+        "namePri": "TK_D15",
+        "text1": "套口进洪闸",
+        "text2": "闸室3"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.787254,
+        "latitude": 29.9350319,
+        "name": "8孔",
+        "namePri": "TK_D16",
+        "text1": "套口进洪闸",
+        "text2": "8孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.78727,
+        "latitude": 29.9350319,
+        "name": "6孔",
+        "namePri": "TK_D17",
+        "text1": "套口进洪闸",
+        "text2": "6孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.787544,
+        "latitude": 29.9350319,
+        "name": "31孔",
+        "namePri": "TK_D18",
+        "text1": "套口进洪闸",
+        "text2": "31孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.78756,
+        "latitude": 29.9350319,
+        "name": "42孔",
+        "namePri": "TK_D19",
+        "text1": "套口进洪闸",
+        "text2": "42孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.787827,
+        "latitude": 29.9350319,
+        "name": "36孔",
+        "namePri": "TK_D20",
+        "text1": "套口进洪闸",
+        "text2": "36孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.787842,
+        "latitude": 29.9350319,
+        "name": "19孔",
+        "namePri": "TK_D21",
+        "text1": "套口进洪闸",
+        "text2": "19孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.788109,
+        "latitude": 29.9350319,
+        "name": "39孔",
+        "namePri": "TK_D22",
+        "text1": "套口进洪闸",
+        "text2": "39孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.788132,
+        "latitude": 29.9350319,
+        "name": "25孔",
+        "namePri": "TK_D23",
+        "text1": "套口进洪闸",
+        "text2": "25孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.7884,
+        "latitude": 29.9350319,
+        "name": "32孔",
+        "namePri": "TK_D24",
+        "text1": "套口进洪闸",
+        "text2": "32孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.788414,
+        "latitude": 29.9350319,
+        "name": "22孔",
+        "namePri": "TK_D25",
+        "text1": "套口进洪闸",
+        "text2": "22孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.788681,
+        "latitude": 29.9350319,
+        "name": "7孔",
+        "namePri": "TK_D26",
+        "text1": "套口进洪闸",
+        "text2": "7孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.788704,
+        "latitude": 29.9350319,
+        "name": "24孔",
+        "namePri": "TK_D27",
+        "text1": "套口进洪闸",
+        "text2": "24孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.788971,
+        "latitude": 29.9350319,
+        "name": "20孔",
+        "namePri": "TK_D28",
+        "text1": "套口进洪闸",
+        "text2": "20孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.788986,
+        "latitude": 29.9350319,
+        "name": "23孔",
+        "namePri": "TK_D29",
+        "text1": "套口进洪闸",
+        "text2": "23孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.789253,
+        "latitude": 29.9350319,
+        "name": "5孔",
+        "namePri": "TK_D30",
+        "text1": "套口进洪闸",
+        "text2": "5孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.789268,
+        "latitude": 29.9350319,
+        "name": "43孔",
+        "namePri": "TK_D31",
+        "text1": "套口进洪闸",
+        "text2": "43孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.789543,
+        "latitude": 29.9350319,
+        "name": "37孔",
+        "namePri": "TK_D32",
+        "text1": "套口进洪闸",
+        "text2": "37孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.789558,
+        "latitude": 29.9350319,
+        "name": "33孔",
+        "namePri": "TK_D33",
+        "text1": "套口进洪闸",
+        "text2": "33孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.789825,
+        "latitude": 29.9350319,
+        "name": "28孔",
+        "namePri": "TK_D34",
+        "text1": "套口进洪闸",
+        "text2": "28孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.789841,
+        "latitude": 29.9350319,
+        "name": "16孔",
+        "namePri": "TK_D35",
+        "text1": "套口进洪闸",
+        "text2": "16孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.790115,
+        "latitude": 29.9350319,
+        "name": "11孔",
+        "namePri": "TK_D36",
+        "text1": "套口进洪闸",
+        "text2": "11孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.790131,
+        "latitude": 29.9350319,
+        "name": "38孔",
+        "namePri": "TK_D37",
+        "text1": "套口进洪闸",
+        "text2": "38孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.7904,
+        "latitude": 29.9350319,
+        "name": "27孔",
+        "namePri": "TK_D38",
+        "text1": "套口进洪闸",
+        "text2": "27孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.790413,
+        "latitude": 29.9350319,
+        "name": "18孔",
+        "namePri": "TK_D39",
+        "text1": "套口进洪闸",
+        "text2": "18孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.790688,
+        "latitude": 29.9350319,
+        "name": "4孔",
+        "namePri": "TK_D40",
+        "text1": "套口进洪闸",
+        "text2": "4孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.7907,
+        "latitude": 29.9350319,
+        "name": "35孔",
+        "namePri": "TK_D41",
+        "text1": "套口进洪闸",
+        "text2": "35孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.79097,
+        "latitude": 29.9350319,
+        "name": "44孔",
+        "namePri": "TK_D42",
+        "text1": "套口进洪闸",
+        "text2": "44孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.790985,
+        "latitude": 29.9350319,
+        "name": "9孔",
+        "namePri": "TK_D43",
+        "text1": "套口进洪闸",
+        "text2": "9孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.79126,
+        "latitude": 29.9350319,
+        "name": "3孔",
+        "namePri": "TK_D44",
+        "text1": "套口进洪闸",
+        "text2": "3孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.791275,
+        "latitude": 29.9350319,
+        "name": "21孔",
+        "namePri": "TK_D45",
+        "text1": "套口进洪闸",
+        "text2": "21孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.791542,
+        "latitude": 29.9350319,
+        "name": "40孔",
+        "namePri": "TK_D46",
+        "text1": "套口进洪闸",
+        "text2": "40孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.791557,
+        "latitude": 29.9350319,
+        "name": "15孔",
+        "namePri": "TK_D47",
+        "text1": "套口进洪闸",
+        "text2": "15孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.791824,
+        "latitude": 29.9350319,
+        "name": "30孔",
+        "namePri": "TK_D48",
+        "text1": "套口进洪闸",
+        "text2": "30孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.791847,
+        "latitude": 29.9350319,
+        "name": "33孔",
+        "namePri": "TK_D49",
+        "text1": "套口进洪闸",
+        "text2": "33孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792114,
+        "latitude": 29.9350319,
+        "name": "26孔",
+        "namePri": "TK_D50",
+        "text1": "套口进洪闸",
+        "text2": "26孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.79213,
+        "latitude": 29.9350319,
+        "name": "17孔",
+        "namePri": "TK_D51",
+        "text1": "套口进洪闸",
+        "text2": "17孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.7924,
+        "latitude": 29.9350319,
+        "name": "10孔",
+        "namePri": "TK_D52",
+        "text1": "套口进洪闸",
+        "text2": "10孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792419,
+        "latitude": 29.9350319,
+        "name": "12孔",
+        "namePri": "TK_D53",
+        "text1": "套口进洪闸",
+        "text2": "12孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792549,
+        "latitude": 29.93496,
+        "name": "14孔",
+        "namePri": "TK_D54",
+        "text1": "套口进洪闸",
+        "text2": "14孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.786263,
+        "latitude": 29.9349518,
+        "name": "13孔",
+        "namePri": "TK_D55",
+        "text1": "套口进洪闸",
+        "text2": "13孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.786263,
+        "latitude": 29.9349823,
+        "name": "39孔",
+        "namePri": "TK_D56",
+        "text1": "套口进洪闸",
+        "text2": "39孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.7928,
+        "latitude": 29.9349823,
+        "name": "34孔",
+        "namePri": "TK_D57",
+        "text1": "套口进洪闸",
+        "text2": "34孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792557,
+        "latitude": 29.93492,
+        "name": "闸室2",
+        "namePri": "TK_D58",
+        "text1": "套口进洪闸",
+        "text2": "闸室2"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792557,
+        "latitude": 29.93492,
+        "name": "1孔",
+        "namePri": "TK_D59",
+        "text1": "套口进洪闸",
+        "text2": "1孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792557,
+        "latitude": 29.93492,
+        "name": "2孔",
+        "namePri": "TK_D60",
+        "text1": "套口进洪闸",
+        "text2": "2孔"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.792557,
+        "latitude": 29.93492,
+        "name": "外江",
+        "namePri": "TK_D61",
+        "text1": "套口进洪闸",
+        "text2": "外江"
     }
 ]