上报

Assets/FrameWork/ProjectManager/Scripts/JinRuRenwu.cs

@@ -1,5 +1,6 @@
 using Immersal.AR;
 using LitJson;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System.Collections;
 using System.Collections.Generic;
@@ -12,7 +13,7 @@ using static XunJianDataManager;
 public class JinRuRenwu : WindowSingleton<JinRuRenwu>
 {
     //RenWuItem rwitem;
-    XunJianTasks rwitem;
+   public  XunJianTasks rwitem;
     public GameObject WenJianLan;
     public TextMeshProUGUI info;
 
@@ -161,6 +162,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         //updateListRef();
         // rwitem = XunJianDataManager.Instance.chooseXunJian.itemList[XunJianDataManager.Instance.chooseXunJian.nowIndex+1];
         rwitem = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex + 1];
+        rwitem.startTime = Time.time;
         if (XunJianDataManager.Instance.chooseXunJian.renwuModelType == RenWuModelType.DianYun)
         {
             LineManager.Instance.setRoad(rwitem.roadList);
@@ -185,6 +187,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         TextBT.SetActive(false);
         // rwitem = XunJianDataManager.Instance.chooseXunJian.itemList[XunJianDataManager.Instance.chooseXunJian.nowIndex];
         rwitem = XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex];
+        rwitem.startTime = Time.time;
         indexText.text = (rwitem.sort).ToString();
         // info.text = rwitem.info;
         info.text = rwitem.title;
@@ -567,10 +570,12 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
     public void successItem()
     {
         rwitem.state = RenWuState.Success;
+       // rwitem.status = 1;
     }
     public void failItem()
     {
         rwitem.state = RenWuState.Fail;
+     //   rwitem.status = 2;
     }
     public void gotoNextItem()
     {
@@ -580,27 +585,44 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         ARSpace.isFind = false;
         // 任务上报  
 
-        JsonData jsonData = new JsonData();
-        jsonData[""] = rwitem.projectId;
+        //JsonData jsonData = new JsonData();
+        //jsonData["projectInspectionTaskId"] = rwitem.projectInspectionId;
+        //jsonData["status"] = rwitem.status;
+        //jsonData["consumingTime"] = (int)(Time.time - rwitem.startTime);
 
-        //WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp("", "", msg =>
-        //{
+      
+        //jsonData["dataFileIds"] = jobject;
 
-        //    JObject data = new JObject();
+        if(rwitem.status != 0)
+        {
+            TasksReport tasks = new TasksReport();
+            tasks.projectInspectionTaskId = rwitem.id;
+            tasks.status = rwitem.status;
+            tasks.consumingTime = (int)(Time.time - rwitem.startTime);
+            tasks.dataFileIds = rwitem.listUpload;
 
+            Debug.Log(JsonConvert.SerializeObject(tasks));
 
+            WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.tasksReport, JsonConvert.SerializeObject(tasks), msg =>
+            {
+                Debug.Log(HttpEdustryAction.tasksReport + " HttpEdustryAction.tasksReport  " + msg);
+                JObject data = new JObject();
 
-        //    if(data["code"].ToString()=="200")
-        //    {
 
-        //        Debug.Log("上报成功" + msg);
-        //    }
-        //    else
-        //    {
-        //        Debug.LogError(" 上报失败"+ msg);
-        //    }
 
-        //}));
+                //if (data["code"].ToString() == "200")
+                //{
+
+                //    Debug.Log("上报成功" + msg);
+                //}
+                //else
+                //{
+                //    Debug.LogError(" 上报失败" + msg);
+                //}
+
+            }));
+        }
+       
 
 
 
@@ -626,3 +648,13 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         WindowsManager.Instance.show(WindowConfig.windowType.XunJianLB);
     }
 }
+
+public class TasksReport
+{
+    public int projectInspectionTaskId { get; set; }
+    public int status { get; set; }
+
+    public int consumingTime { get; set; }
+
+    public List<int> dataFileIds { get; set; }
+}

Assets/FrameWork/ProjectManager/Scripts/Project/XunJian/XunJianDataManager.cs

@@ -386,7 +386,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
         // 加入分页查询
 
         JsonData jsonData = new JsonData();
-        jsonData["page"] = 1;
+        jsonData["page"] = 6;
         jsonData["limit"] = 50;
         Debug.Log(jsonData.ToJson());
         yield return WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.InspectionList, jsonData.ToJson(), (string msg) =>
@@ -811,7 +811,11 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
 
         public RenWuState state =  RenWuState.None;
 
-        public List<string> listUpload = new List<string>();
+        public List<int> listUpload = new List<int>();
+        /// <summary>
+        /// 任务开始时间
+        /// </summary>
+        public float startTime { get; set; }
     }
 
     public class MinioResources

Assets/FrameWork/ProjectManager/Scripts/Project/XunJian/进入任务/CaoZuoLanManager.cs

@@ -118,6 +118,7 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
     {
         Debug.Log("nextInteractable==>"+isActive);
         isChoose = isActive;
+        JinRuRenwu.Instance.rwitem.status = isActive ? 1 : 2;
         xiayibu.GetComponent<Button>().interactable = isActive;
 
     }

Assets/FrameWork/ProjectManager/Scripts/Project/XunJian/进入任务/ChangeCameraSaoMiao.cs

@@ -233,7 +233,7 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
             {
 
 
-
+                JinRuRenwu.Instance.rwitem.listUpload.Add(int.Parse(jObject["data"]["fileId"].ToString()));
                 JObject fildData = JObject.Parse(str[1]);
                 // ÎļþÉÏ´«
                 RoomFileMinio.Instance.PutFile(RoomFileMinio.Instance.bucket, fildData["filePath"].ToString(), fildData["fileName"].ToString(), fildData["objectName"].ToString() + jObject["data"]["uuid"].ToString() + ".mp4", jObject["data"]["uuid"].ToString(), int.Parse(fildData["fileSize"].ToString()), msg =>
@@ -248,18 +248,18 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
 
                         Debug.Log(" ÎļþÉÏ´«³É¹¦ " + msg);
 
-                        string[] listStr = msg.Split('/');
+                        //string[] listStr = msg.Split('/');
 
-                        int id = int.Parse(listStr[listStr.Length - 2]);
+                        //int id = int.Parse(listStr[listStr.Length - 2]);
 
-                        for (int i = 0; i < XunJianDataManager.Instance.chooseXunJian.tasksList.Count; i++)
-                        {
-                            if (XunJianDataManager.Instance.chooseXunJian.tasksList[i].id == id)
-                            {
-                                XunJianDataManager.Instance.chooseXunJian.tasksList[i].listUpload.Add(listStr[listStr.Length - 1]);
-                                break;
-                            }
-                        }
+                        //for (int i = 0; i < XunJianDataManager.Instance.chooseXunJian.tasksList.Count; i++)
+                        //{
+                        //    if (XunJianDataManager.Instance.chooseXunJian.tasksList[i].id == id)
+                        //    {
+                        //        XunJianDataManager.Instance.chooseXunJian.tasksList[i].listUpload.Add(listStr[listStr.Length - 1]);
+                        //        break;
+                        //    }
+                        //}
 
                     }
                     else

Assets/FrameWork/ProjectManager/Scripts/Project/XunJian/进入任务/PaiZhaoDataManager.cs

@@ -136,6 +136,7 @@ public class PaiZhaoDataManager : Singleton<PaiZhaoDataManager>
                     
 
                     JObject fildData = JObject.Parse(str[1]);
+                    JinRuRenwu.Instance.rwitem.listUpload.Add(int.Parse(jObject["data"]["fileId"].ToString()));
                     // ÎļþÉÏ´«
                     RoomFileMinio.Instance.PutFile(RoomFileMinio.Instance.bucket, fildData["filePath"].ToString(), fildData["fileName"].ToString(), fildData["objectName"].ToString()+ jObject["data"]["uuid"].ToString()+".jpg", jObject["data"]["uuid"].ToString(),int.Parse(fildData["fileSize"].ToString()), msg =>
                     {
@@ -149,18 +150,18 @@ public class PaiZhaoDataManager : Singleton<PaiZhaoDataManager>
 
                             Debug.Log(" ÎļþÉÏ´«³É¹¦ " + msg);
 
-                            string [] listStr = msg.Split('/');
+                            //string[] listStr = msg.Split('/');
 
-                            int id = int.Parse(listStr[listStr.Length - 2]);
+                            //int id = int.Parse(listStr[listStr.Length - 2]);
 
-                            for (int i = 0; i < XunJianDataManager.Instance.chooseXunJian.tasksList.Count; i++)
-                            {
-                                if(XunJianDataManager.Instance.chooseXunJian.tasksList[i].id == id)
-                                {
-                                    XunJianDataManager.Instance.chooseXunJian.tasksList[i].listUpload.Add(listStr[listStr.Length - 1]);
-                                    break;
-                                }
-                            }
+                            //for (int i = 0; i < XunJianDataManager.Instance.chooseXunJian.tasksList.Count; i++)
+                            //{
+                            //    if (XunJianDataManager.Instance.chooseXunJian.tasksList[i].id == id)
+                            //    {
+                            //        XunJianDataManager.Instance.chooseXunJian.tasksList[i].listUpload.Add(listStr[listStr.Length - 1]);
+                            //        break;
+                            //    }
+                            //}
 
                         }
                         else