|
@@ -2112,7 +2112,7 @@ public class HttpHelper : MonoBehaviour
|
|
|
{
|
|
|
jsonStr = await B08_API_GetToken();
|
|
|
GetToken tokenResult= JsonConvert.DeserializeObject<GetToken>(jsonStr);
|
|
|
- Debug.Log("GetToken:" + tokenResult.data.token);
|
|
|
+ //Debug.Log("GetToken:" + tokenResult.data.token);
|
|
|
token = tokenResult.data.token;
|
|
|
}
|
|
|
catch (Exception e)
|
|
@@ -2123,7 +2123,7 @@ public class HttpHelper : MonoBehaviour
|
|
|
try
|
|
|
{
|
|
|
jsonStr = await B08_API_TaskInfoList(1,999);
|
|
|
- Debug.Log("B08_API_TaskInfoList" + jsonStr);
|
|
|
+ //Debug.Log("B08_API_TaskInfoList" + jsonStr);
|
|
|
GlobalData.B08TaskListData = JsonConvert.DeserializeObject<B08_TaskListInfoData>(jsonStr);
|
|
|
//Debug.Log("GlobalData.B08TaskListData: "+GlobalData.B08TaskListData.rows.Length);
|
|
|
// GlobalData.B08TaskListInfos = new B08_TaskListInfoData[GlobalData.B08InspectType.data.Length];
|
|
@@ -2141,8 +2141,8 @@ public class HttpHelper : MonoBehaviour
|
|
|
Debug.Log("tempInfo null! :"+tempResult);
|
|
|
}
|
|
|
string taskLocationResult = await B08_API_TaskLocation(GlobalData.B08TaskListData.rows[i].id);
|
|
|
- //Debug.Log($"taskLocationResult id={GlobalData.B08TaskListData.rows[i].id}:" + taskLocationResult);
|
|
|
- GlobalData.B08TaskListData.rows[i].infoData.Locations = JsonConvert.DeserializeObject<B08_TaskLocationInfo>(taskLocationResult).data;
|
|
|
+ Debug.Log($"taskLocationResult id={GlobalData.B08TaskListData.rows[i].id}:" + taskLocationResult);
|
|
|
+ GlobalData.B08TaskListData.rows[i].infoData.Locations = JsonConvert.DeserializeObject<B08_TaskLocationData>(taskLocationResult).data.locations;
|
|
|
|
|
|
}
|
|
|
}
|
|
@@ -2208,7 +2208,7 @@ public class HttpHelper : MonoBehaviour
|
|
|
public async Task<string> B08_API_GetToken()
|
|
|
{
|
|
|
string cmdUrl = ServerAddress.API_GetToken;
|
|
|
- Debug.Log("!!!:" + cmdUrl);
|
|
|
+ //Debug.Log("!!!:" + cmdUrl);
|
|
|
UnityWebRequest www = new UnityWebRequest(cmdUrl, "Post");
|
|
|
www.downloadHandler = new DownloadHandlerBuffer();
|
|
|
www.SetRequestHeader("Content-Type", "application/json");
|
|
@@ -2283,8 +2283,8 @@ public class HttpHelper : MonoBehaviour
|
|
|
public async Task<string> B08_API_TaskLocation(string id)
|
|
|
{
|
|
|
string cmdUrl = ServerAddress.API_B08_taskLocation;
|
|
|
- cmdUrl += $"/{id}";
|
|
|
- //Debug.Log("!!!:" + cmdUrl +" token:"+token);
|
|
|
+ cmdUrl += $"/{id}?useOptimized=true&includeWorkOrderInfo=true&limit=100";
|
|
|
+ Debug.Log("!!!:" + cmdUrl +" token:"+token);
|
|
|
UnityWebRequest www = new UnityWebRequest(cmdUrl, "Get");
|
|
|
www.downloadHandler = new DownloadHandlerBuffer();
|
|
|
www.SetRequestHeader("Content-Type", "application/json");
|