|
@@ -260,7 +260,6 @@ public class GCJKLayer : YZTRootLayer
|
|
|
|
|
|
private async void OnEnable()
|
|
|
{
|
|
|
- StaticLod.instance.OnFoucusStatic(0);
|
|
|
|
|
|
if (GlobalData.buYuanSensorData != null)
|
|
|
{
|
|
@@ -577,6 +576,7 @@ public class GCJKLayer : YZTRootLayer
|
|
|
{
|
|
|
return;
|
|
|
}
|
|
|
+ StaticLod.instance.OnFoucusStatic(type);
|
|
|
|
|
|
currentDataType = type;
|
|
|
|
|
@@ -606,25 +606,15 @@ public class GCJKLayer : YZTRootLayer
|
|
|
public void SetZhaZhanJianKongData()
|
|
|
{
|
|
|
List<ZhaZhanJianKongData> datas = new List<ZhaZhanJianKongData>();
|
|
|
- for (int i = 0; i < GlobalData.buYuanSensorData.data.Count; i++)
|
|
|
+ var tempSensorData = currentDataType == 0 ? GlobalData.buYuanSensorData.data : GlobalData.taoKouSensorData.data;
|
|
|
+ Debug.Log(tempSensorData.Count);
|
|
|
+ for (int i = 0; i < tempSensorData.Count; i++)
|
|
|
{
|
|
|
datas.Add(new ZhaZhanJianKongData()
|
|
|
{
|
|
|
- name = "闸门_" + GlobalData.buYuanSensorData.data[i].sensor_id,
|
|
|
- openValue = GlobalData.buYuanSensorData.data[i].opening_degree * 0.01f,
|
|
|
- state = GlobalData.buYuanSensorData.data[i].gate_open
|
|
|
- ? ZhaZhanState.open
|
|
|
- : ZhaZhanState.close,
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- for (int i = 0; i < GlobalData.taoKouSensorData.data.Count; i++)
|
|
|
- {
|
|
|
- datas.Add(new ZhaZhanJianKongData()
|
|
|
- {
|
|
|
- name = "闸门_" + GlobalData.taoKouSensorData.data[i].sensor_id,
|
|
|
- openValue = GlobalData.taoKouSensorData.data[i].opening_degree * 0.01f,
|
|
|
- state = GlobalData.taoKouSensorData.data[i].gate_open
|
|
|
+ name = "闸门_" + tempSensorData[i].sensor_id,
|
|
|
+ openValue = tempSensorData[i].opening_degree * 0.01f,
|
|
|
+ state = tempSensorData[i].gate_open
|
|
|
? ZhaZhanState.open
|
|
|
: ZhaZhanState.close,
|
|
|
});
|