巡检任务新接口对接

Assets/Scripts/HttpGetData.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
+using UnityEngine.Serialization;
 
 
 public class HttpGetData
@@ -334,34 +335,55 @@ public class CharData_water
 [Serializable]
 public class B08_TaskListInfoData
 {
-    public B08_TaskListInfo data;
-}
-[Serializable]
-public class B08_TaskListInfo
-{
-    public B08_TaskInfoData[] list;
-    public int type;
+    public B08_TaskInfoData[] data;
 }
+
 [Serializable]
 public class B08_TaskInfoData
 {
-    public string task_id;
-    public string type;
+    public string xjId;
+    public string fanganId;
+    public string projectId;
+    public string xunjianScope;
+    public int taskExecutor;
+    [FormerlySerializedAs("type")] public string fanganName;
     public string xunjian_scope;
     public string status;
     public string start_time;
-    public B08_TaskItems[] task_items;
+    public string finishedTime;
+    [FormerlySerializedAs("task_items")] public B08_TaskItems[] items;
 }
 [Serializable]
 public class B08_TaskItems
 {
-    public string elevation;//高度
-    public string item_id;
-    public string img_path;
+    [FormerlySerializedAs("item_id")] public string xjItemId;
+    public string xjId;
+    public string faItemId;
+    
+    public B08_TaskItemFiles[] files;
+    
     public string latitude;//维度
-    public string item_name;
     public string longitude;//经度
+
+    public string status;
+
+    public string startTime;
+    public string finishedTime;
+
+    [FormerlySerializedAs("item_name")] public string faItemName;
+}
+
+[Serializable]
+public class B08_TaskItemFiles
+{
+    public string fileId;
+    public int fileCategoryId;
+    public string fileName;
+    public string mimeType;
+    public string filePath;
+    public int folderId;
 }
 
 
+
 #endregion

Assets/Scripts/UI/Item/B08_TaskListItem.cs

@@ -59,7 +59,7 @@ public class B08_TaskListItem : MonoBehaviour
             ctrlText.text = "<color=#00FF3F>收起</color>";
             rect.sizeDelta = new Vector2(360,354);
             more.SetActive(true);
-            gcywLayer.SetTaskImgPanelData(InfoData.task_items);
+            gcywLayer.SetTaskImgPanelData(InfoData.items);
         }
 
         moreMessage = !moreMessage;
@@ -89,7 +89,7 @@ public class B08_TaskListItem : MonoBehaviour
                 break;
         }
         typeText.text = typeStr;
-        titleText.text = data.type;
+        titleText.text = data.fanganName;
         stateText.text = data.status;
         dateText.text = data.start_time;
         for (int i = 0; i < PointItems.Count; i++)
@@ -97,10 +97,10 @@ public class B08_TaskListItem : MonoBehaviour
             Destroy(PointItems[i].gameObject);
         }
         PointItems.Clear();
-        for (int i = 0; i < data.task_items.Length; i++)
+        for (int i = 0; i < data.items.Length; i++)
         {
             B08_TaskPointItem tempItem = Instantiate(pointItemPrefab,itemContent).GetComponent<B08_TaskPointItem>();
-            tempItem.SetData(baseLayer,data.task_items[i],i,data.start_time);
+            tempItem.SetData(baseLayer,data.items[i],i,data.start_time);
             var button = tempItem.GetComponent<ExtendedButton_PointItem>();
             button.index = i;
             button.onPointerEnter += baseLayer.SetTaskPointIconHeightLight;

Assets/Scripts/UI/UIView/GCYW/B08_TaskPointItem.cs

@@ -26,6 +26,6 @@ public class B08_TaskPointItem : MonoBehaviour
         gcywLayer = baseLayer;
         itemIndex = index;
         posAndtimeText.text = $"{(index==0?"起点":"")}  <color=#A5BFE2>{time}</color>";
-        messageText.text = $"{data.item_name}";
+        messageText.text = $"{data.faItemName}";
     }
 }

Assets/Scripts/UI/UIView/GCYW/GCYWLayer.cs

@@ -378,7 +378,7 @@ public class GCYWLayer : YZTRootLayer
         for (int i = 0; i < itemsArray.Length; i++)
         {
             GameObject tempObj = Instantiate(taskPointIconPrefab, taskPointIconContent);
-            tempObj.name = itemsArray[i].item_id;
+            tempObj.name = itemsArray[i].xjItemId;
             tempObj.transform.position = CoordinateConverter.GeoToUnity(double.Parse(itemsArray[i].longitude),
                 double.Parse(itemsArray[i].latitude));
             taskPointIcons.Add(tempObj.GetComponent<TaskPointIcon>());

Assets/Scripts/UI/UIView/GCYW/TaskListPanel.cs

@@ -37,7 +37,7 @@ public class TaskListPanel : MonoBehaviour
         taskItemList.Clear();
         for (int i = 0; i < GlobalData.B08TaskListInfos.Length; i++)
         {
-            var taskInfoList = GlobalData.B08TaskListInfos[i].data.list;
+            var taskInfoList = GlobalData.B08TaskListInfos[i].data;
             if (taskInfoList != null)
             {
                 for (int j = 0; j < taskInfoList.Length; j++)

Assets/Scripts/UI/UIView/GCYW/TaskPhotoPanel.cs

@@ -50,10 +50,10 @@ public class TaskPhotoPanel : MonoBehaviour
     public void ChangePage(int pageIndex)
     {
         var currentData = task_items[pageIndex];
-        string path = currentData.img_path.Replace("10.123.10.11", "58.19.230.46");
+        string path ="http://58.19.230.46:9180/prod-api/uploads/"+currentData.files[0].filePath;
         TextureLoadHelp._Instance.LoadTexFromUrl(path, img);
-        posText.text = currentData.item_name;
-        messageText.text = currentData.item_name;
+        posText.text = currentData.faItemName;
+        messageText.text = currentData.faItemName;
         pageText.text = $"{pageIndex + 1}/{task_items.Length}";
     }
 }