Commit 871fad6b authored by 潘梓豪's avatar 潘梓豪

更新

parent 449ed984
...@@ -2,7 +2,6 @@ using System.Collections; ...@@ -2,7 +2,6 @@ using System.Collections;
using UnityEngine.Networking; using UnityEngine.Networking;
using UnityEngine; using UnityEngine;
using TMPro; using TMPro;
using System.IO;
using LitJson; using LitJson;
using System; using System;
...@@ -40,7 +39,7 @@ public class LoginManager : MonoBehaviour ...@@ -40,7 +39,7 @@ public class LoginManager : MonoBehaviour
private void Awake() private void Awake()
{ {
OnReceiveMsg.AddListener(_getData); OnReceiveMsg.AddListener(_getData);
StartCoroutine(GetJson()); StartCoroutine(GetJson());
} }
private void Start() private void Start()
...@@ -87,32 +86,34 @@ public class LoginManager : MonoBehaviour ...@@ -87,32 +86,34 @@ public class LoginManager : MonoBehaviour
{ {
while (true) while (true)
{ {
if (!String.IsNullOrEmpty(productionlineID.text))
using (UnityWebRequest request = UnityWebRequest.Get(productionlineID.text))
{ {
// 设置请求头 using (UnityWebRequest request = UnityWebRequest.Get(productionlineID.text))
request.SetRequestHeader("Content-Type", "application/json"); {
Debug.Log(productionlineID.text);
// 设置请求头
request.SetRequestHeader("Content-Type", "application/json");
// 发送请求并等待响应 // 发送请求并等待响应
yield return request.SendWebRequest(); yield return request.SendWebRequest();
if (!string.IsNullOrEmpty(request.error)) if (!string.IsNullOrEmpty(request.error))
{ {
Debug.LogError(request.error); Debug.LogError(request.error);
} }
else else
{ {
// 解析响应数据 // 解析响应数据
string responseJson = request.downloadHandler.text; string responseJson = request.downloadHandler.text;
Debug.Log("Response: " + responseJson); Debug.Log("Response: " + responseJson);
// 使用 JsonUtility 解析 JSON 数据 // 使用 JsonUtility 解析 JSON 数据
positionData = JsonUtility.FromJson<RobotPositionData>(responseJson); positionData = JsonMapper.ToObject<RobotPositionData>(responseJson);
OnReceiveMsg.Invoke(positionData, "RobotPositionData"); OnReceiveMsg.Invoke(positionData, "RobotPositionData");
IsDataLoaded = true; IsDataLoaded = true;
}
} }
} }
yield return new WaitForSeconds(1); yield return new WaitForSeconds(1);
} }
} }
...@@ -123,40 +124,43 @@ public class LoginManager : MonoBehaviour ...@@ -123,40 +124,43 @@ public class LoginManager : MonoBehaviour
while (true) while (true)
{ {
using (UnityWebRequest request = UnityWebRequest.PostWwwForm(faultInterface.text, jsonData)) if (!String.IsNullOrEmpty(faultInterface.text))
{ {
// 设置请求头 using (UnityWebRequest request = UnityWebRequest.PostWwwForm(faultInterface.text, jsonData))
request.SetRequestHeader("Content-Type", "application/json");
// 设置请求体
byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonData);
request.uploadHandler = new UploadHandlerRaw(bodyRaw);
// 发送请求并等待响应
yield return request.SendWebRequest();
if (!string.IsNullOrEmpty(request.error))
{
Debug.LogError(request.error);
}
else
{ {
// 解析响应数据 // 设置请求头
string responseJson = request.downloadHandler.text; request.SetRequestHeader("Content-Type", "application/json");
// 使用 JsonUtility 解析 JSON 数据 // 设置请求体
faultData = JsonUtility.FromJson<FaultEventData>(responseJson); byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonData);
request.uploadHandler = new UploadHandlerRaw(bodyRaw);
// 发送请求并等待响应
yield return request.SendWebRequest();
// 检查是否成功拿到数据 if (!string.IsNullOrEmpty(request.error))
if (faultData != null && faultData.code == 200)
{ {
OnReceiveMsg.Invoke(faultData, "FaultEventData"); Debug.LogError(request.error);
Debug.Log(faultData);
} }
else else
{ {
Debug.Log("获取故障数据失败"); // 解析响应数据
string responseJson = request.downloadHandler.text;
// 使用 JsonUtility 解析 JSON 数据
faultData = JsonMapper.ToObject<FaultEventData>(responseJson);
// 检查是否成功拿到数据
if (faultData != null && faultData.code == 200)
{
OnReceiveMsg.Invoke(faultData, "FaultEventData");
Debug.Log(faultData);
}
else
{
Debug.Log("获取故障数据失败");
}
} }
} }
} }
...@@ -168,26 +172,29 @@ public class LoginManager : MonoBehaviour ...@@ -168,26 +172,29 @@ public class LoginManager : MonoBehaviour
{ {
while (true) while (true)
{ {
using (UnityWebRequest request = UnityWebRequest.Get(post_url.text + "?lineId=" + lineID.text)) if (!String.IsNullOrEmpty(post_url.text))
{ {
// 设置请求头 using (UnityWebRequest request = UnityWebRequest.Get(post_url.text + "?lineId=" + lineID.text))
//request.SetRequestHeader("Content-Type", "application/json");
// 发送请求并等待响应
yield return request.SendWebRequest();
if (!string.IsNullOrEmpty(request.error))
{
Debug.LogError(request.error);
}
else
{ {
// 解析响应数据 // 设置请求头
line_jd = JsonMapper.ToObject<JsonData>(request.downloadHandler.text); //request.SetRequestHeader("Content-Type", "application/json");
// 发送请求并等待响应
yield return request.SendWebRequest();
if (line_jd != null && line_jd.ContainsKey("data")) if (!string.IsNullOrEmpty(request.error))
{
Debug.LogError(request.error);
}
else
{ {
setData(_parent, line_jd); // 解析响应数据
line_jd = JsonMapper.ToObject<JsonData>(request.downloadHandler.text);
if (line_jd != null && line_jd.ContainsKey("data"))
{
setData(_parent, line_jd);
}
} }
} }
} }
...@@ -268,11 +275,13 @@ public class LoginManager : MonoBehaviour ...@@ -268,11 +275,13 @@ public class LoginManager : MonoBehaviour
rq.SetRequestHeader("Access-Control-Allow-Origin", "*"); rq.SetRequestHeader("Access-Control-Allow-Origin", "*");
rq.SetRequestHeader("Accept", "*"); rq.SetRequestHeader("Accept", "*");
yield return rq.SendWebRequest(); yield return rq.SendWebRequest();
if (string.IsNullOrEmpty(rq.error)) if (string.IsNullOrEmpty(rq.error))
{ {
try try
{ {
inputFieldData = JsonUtility.FromJson<InputFieldData>(rq.downloadHandler.text); inputFieldData = JsonMapper.ToObject<InputFieldData>(rq.downloadHandler.text);
Debug.Log(rq.downloadHandler.text);
if (IsLine1) if (IsLine1)
{ {
productionlineID.text = inputFieldData.productionlineID1; productionlineID.text = inputFieldData.productionlineID1;
......
...@@ -5,7 +5,7 @@ EditorBuildSettings: ...@@ -5,7 +5,7 @@ EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 1 - enabled: 0
path: Assets/_Scenes/1_Main.unity path: Assets/_Scenes/1_Main.unity
guid: a1193329f89803b4f8a14f6c0b15d2c1 guid: a1193329f89803b4f8a14f6c0b15d2c1
- enabled: 0 - enabled: 0
...@@ -14,7 +14,7 @@ EditorBuildSettings: ...@@ -14,7 +14,7 @@ EditorBuildSettings:
- enabled: 0 - enabled: 0
path: Assets/_Scenes/3_Main.unity path: Assets/_Scenes/3_Main.unity
guid: 20c0c67e1155d7340be70873c2eb30f1 guid: 20c0c67e1155d7340be70873c2eb30f1
- enabled: 0 - enabled: 1
path: Assets/_Scenes/4_Main.unity path: Assets/_Scenes/4_Main.unity
guid: da74b35adf3770040b51552fc0cb9a98 guid: da74b35adf3770040b51552fc0cb9a98
- enabled: 0 - enabled: 0
......
...@@ -653,7 +653,7 @@ PlayerSettings: ...@@ -653,7 +653,7 @@ PlayerSettings:
webGLDebugSymbols: 0 webGLDebugSymbols: 0
webGLEmscriptenArgs: webGLEmscriptenArgs:
webGLModulesDirectory: webGLModulesDirectory:
webGLTemplate: APPLICATION:Default webGLTemplate: PROJECT:ZeusWebGL
webGLAnalyzeBuildSize: 0 webGLAnalyzeBuildSize: 0
webGLUseEmbeddedResources: 0 webGLUseEmbeddedResources: 0
webGLCompressionFormat: 2 webGLCompressionFormat: 2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment