YDL
/
HK_LongZhiMeng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

数据刷新导致源数据清空问题修复

develop
杨栋梁 11 months ago
parent
da2dace272
commit
b308241a3f
4 changed files with 97 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Assets/Scripts/ANet/DeviceFollowTarget.cs
  2. 13
      Assets/Scripts/ANet/DeviceInfo.cs
  3. 2
      Assets/Scripts/ANet/DeviceItem.cs
  4. 110
      Assets/Scripts/ANet/DevicePanelManager.cs

2
Assets/Scripts/ANet/DeviceFollowTarget.cs
Unescape View File

@ -19,6 +19,8 @@ public class DeviceFollowTarget : MonoBehaviour
} }
public void ViewClick() public void ViewClick()
{ {
if (GetComponent<DeviceLumos>() && DeviceInfo.Instance.gameObject.activeSelf)
return;
if (FindObjectOfType<FloorButtonsPanel>()) if (FindObjectOfType<FloorButtonsPanel>())
FindObjectOfType<FloorButtonsPanel>().ChangeFloor(target.GetComponent<DeviceObj>().floorId); FindObjectOfType<FloorButtonsPanel>().ChangeFloor(target.GetComponent<DeviceObj>().floorId);
Camera.main.GetComponent<CameraOrbit>().SetCameraView(target.position, 15); Camera.main.GetComponent<CameraOrbit>().SetCameraView(target.position, 15);

13
Assets/Scripts/ANet/DeviceInfo.cs
Unescape View File

@ -125,15 +125,18 @@ public class DeviceInfo : MonoBehaviour
} }
gameObject.SetActive(true); gameObject.SetActive(true);
StopAllCoroutines(); StopAllCoroutines();
StartCoroutine(Refresh()); StartCoroutine(Refresh(infobase.deviceNo));
} }
IEnumerator Refresh() IEnumerator Refresh(string deviceNo)
{ {
DevicePanelManager.Instance.RefreshData(); DevicePanelManager.Instance.RefreshData(deviceNo);
yield return new WaitForSeconds(5); yield return new WaitForSeconds(5);
Debug.Log("刷新"); Debug.Log("刷新");
var data = DevicePanelManager.Instance.GetDeviceData(bindInfo); var data = DevicePanelManager.Instance.GetDeviceData(deviceNo);
OnShow(data); if (data != null)
{
OnShow(data);
}
} }
} }
public class InfoBase public class InfoBase

2
Assets/Scripts/ANet/DeviceItem.cs
Unescape View File

@ -40,6 +40,8 @@ public class DeviceItem : MonoBehaviour
} }
private void ViewBtn_Click() private void ViewBtn_Click()
{ {
if (Selected.gameObject.activeSelf && DeviceInfo.Instance.gameObject.activeSelf)
return;
string deviceName = ""; string deviceName = "";
foreach (var item in DevicePanelManager.Instance.BindObjectList) foreach (var item in DevicePanelManager.Instance.BindObjectList)
{ {

110
Assets/Scripts/ANet/DevicePanelManager.cs
Unescape View File

@ -269,7 +269,7 @@ public class DevicePanelManager : MonoBehaviour
} }
private void Start() private void Start()
{ {
} }
private void OnDestroy() private void OnDestroy()
{ {
@ -281,18 +281,24 @@ public class DevicePanelManager : MonoBehaviour
LoadDeviceObjConfig(); LoadDeviceObjConfig();
} }
public void RefreshData() public void RefreshAllData()
{ {
StopAllCoroutines(); StopAllCoroutines();
LoadDeciceData(); LoadDeciceData();
} }
public DeviceList GetDeviceData(DeviceList data) public void RefreshData(string deviceNo)
{
StopAllCoroutines();
LoadDeciceData(deviceNo);
}
public DeviceList GetDeviceData(string deviceNo)
{ {
DeviceList data = null;
foreach (var item in AllData) foreach (var item in AllData)
{ {
foreach (var value in item.Value) foreach (var value in item.Value)
{ {
if (value.deviceNo == data.deviceNo) if (value.deviceNo == deviceNo)
{ {
data = value; data = value;
break; break;
@ -301,23 +307,26 @@ public class DevicePanelManager : MonoBehaviour
} }
return data; return data;
} }
private void LoadDeciceData() private void LoadDeciceData(string deviceNo = null)
{ {
AllData.Clear(); if (deviceNo == null)
foreach (DeviceType i in Enum.GetValues(typeof(DeviceType)))
{ {
if (i != DeviceType.空) AllData.Clear();
foreach (DeviceType i in Enum.GetValues(typeof(DeviceType)))
{ {
KeyValuePair<DeviceType, List<DeviceList>> info = new KeyValuePair<DeviceType, List<DeviceList>>( if (i != DeviceType.空)
i, new List<DeviceList>()); {
AllData.Add(info); KeyValuePair<DeviceType, List<DeviceList>> info = new KeyValuePair<DeviceType, List<DeviceList>>(
i, new List<DeviceList>());
AllData.Add(info);
}
} }
} }
foreach (var item in AllData) foreach (var item in AllData)
{ {
int iType = (int)item.Key; int iType = (int)item.Key;
LoadDiviceData(buildId, iType.ToString(), item.Key); LoadDiviceData(buildId, iType.ToString(), item.Key, deviceNo);
LoadDiviceData(buildId1, iType.ToString(), item.Key); LoadDiviceData(buildId1, iType.ToString(), item.Key, deviceNo);
} }
} }
private void LateUpdate() private void LateUpdate()
@ -362,7 +371,7 @@ public class DevicePanelManager : MonoBehaviour
{ {
timmer = 0; timmer = 0;
getDataError = false; getDataError = false;
RefreshData(); RefreshAllData();
Debug.LogWarning("从对方服务器获取数据错误!"); Debug.LogWarning("从对方服务器获取数据错误!");
} }
} }
@ -459,7 +468,7 @@ public class DevicePanelManager : MonoBehaviour
go.GetComponent<DeviceBind>().DataBind(type, bindData, null == NowClickObject ? null : NowClickObject.name); go.GetComponent<DeviceBind>().DataBind(type, bindData, null == NowClickObject ? null : NowClickObject.name);
} }
} }
private void LoadDiviceData(long buildId, string diviceId, DeviceType type) private void LoadDiviceData(long buildId, string diviceId, DeviceType type, string deviceNo = null)
{ {
using (MD5 md5Hash = MD5.Create()) using (MD5 md5Hash = MD5.Create())
{ {
@ -482,25 +491,49 @@ public class DevicePanelManager : MonoBehaviour
{ {
Post<diveceSourceData, TotaDivecelInfo>($"{baseHttpUrl}?appKey={key}", postData, (d) => Post<diveceSourceData, TotaDivecelInfo>($"{baseHttpUrl}?appKey={key}", postData, (d) =>
{ {
Debug.Log(d.code); //Debug.Log(d.code);
if (d.code != 200) if (d.code != 200)
{ {
getDataError = true; getDataError = true;
return; return;
} }
foreach (var item in d.data.list) if (deviceNo == null)
{ {
foreach (var data in AllData) foreach (var item in d.data.list)
{ {
if (data.Key == type) foreach (var data in AllData)
{ {
if (!data.Value.Contains(item)) if (data.Key == type)
{ {
data.Value.Add(item); data.Value.Add(item);
} }
} }
} }
} }
else
{
foreach (var item in d.data.list)
{
if (item.deviceNo == deviceNo)
{
foreach (var data in AllData)
{
if (data.Key == type)
{
for (int i = 0; i < data.Value.Count; i++)
{
if (data.Value[i].deviceNo == deviceNo)
{
data.Value[i] = item;
Debug.Log("数据刷新成功!");
break;
}
}
}
}
}
}
}
}, (a, b) => }, (a, b) =>
{ {
Debug.LogError(a + b); Debug.LogError(a + b);
@ -511,19 +544,46 @@ public class DevicePanelManager : MonoBehaviour
{ {
PostJson<diveceSourceData, TotaDivecelInfo>($"?appKey={key}", postData, (d) => PostJson<diveceSourceData, TotaDivecelInfo>($"?appKey={key}", postData, (d) =>
{ {
Debug.Log(d.code); //Debug.Log(d.code);
if (d.code != 200) if (d.code != 200)
{ {
getDataError = true; getDataError = true;
return; return;
} }
foreach (var item in d.data.list) if (deviceNo == null)
{ {
foreach (var data in AllData) foreach (var item in d.data.list)
{ {
if (data.Key == type) foreach (var data in AllData)
{ {
data.Value.Add(item); if (data.Key == type)
{
data.Value.Add(item);
}
}
}
}
else
{
foreach (var item in d.data.list)
{
if (item.deviceNo == deviceNo)
{
foreach (var data in AllData)
{
if (data.Key == type)
{
for (int i = 0; i < data.Value.Count; i++)
{
if (data.Value[i].deviceNo == deviceNo)
{
data.Value[i] = item;
Debug.Log("数据刷新成功!");
break;
}
}
}
}
} }
} }
} }

Write Preview
Loading…
Cancel
Save