Browse Source

修复报错

胡佳骏 1 year ago
parent
commit
443744c679

+ 2 - 54
Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/ChangeCameraSaoMiao.cs

@@ -223,60 +223,8 @@ public class ChangeCameraSaoMiao : MonoSingleton<ChangeCameraSaoMiao>
         // project /{ projectId}/ inspection /{ projectInspectionId}/{ taskId}
         fileData["objectName"] = "project/" + XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].projectId + "/inspection/" + XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].projectInspectionId + "/" + XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].id + "/";
 
-        WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.storage_projectUploadObject, jData.ToJson(), fileData.ToJson(), async (List<string> str) =>
-        {
-            Debug.Log(HttpEdustryAction.storage_projectUploadObject + "  " + str[0]);
-
-            JObject jObject = JObject.Parse(str[0]);
-
-            if (jObject["code"].ToString() == "200")
-            {
-
-
-                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 =>
-                {
-
-                    // 存入file
-
-                    // XunJianDataManager.Instance.chooseXunJian.tasksList[]
-
-                    if (msg != null)
-                    {
-
-                        Debug.Log(" 文件上传成功 " + msg);
-
-                        //string[] listStr = msg.Split('/');
-
-                        //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;
-                        //    }
-                        //}
-
-                    }
-                    else
-                    {
-                        Debug.LogError("文件上传失败");
-                    }
-
-
-                });
-
-            }
-            else
-            {
-                Debug.LogError("文件预上传失败 " + str);
-            }
-
-        }));
+        GetUploadObject guo = new GetUploadObject();
+        guo.start(jData.ToJson(), fileData.ToJson());
 
     }
 

+ 23 - 39
Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/PaiZhaoDataManager.cs

@@ -123,54 +123,44 @@ public class PaiZhaoDataManager : Singleton<PaiZhaoDataManager>
             // project /{ projectId}/ inspection /{ projectInspectionId}/{ taskId}
             fileData["objectName"] = "project/" + XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].projectId + "/inspection/" + XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].projectInspectionId + "/" + XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex].id + "/";
 
-            WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.storage_projectUploadObject, jData.ToJson(), fileData.ToJson(), async (List<string> str) =>
-            {
-                Debug.Log(HttpEdustryAction.storage_projectUploadObject + "  " + str[0]);
+            GetUploadObject guo = new GetUploadObject();
+            guo.start(jData.ToJson(), fileData.ToJson());
 
-                JObject jObject = JObject.Parse(str[0]);
 
-            if (jObject["code"].ToString() == "200")
-            {
 
-                    
+        }
 
-                    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 =>
-                    {
+    }
 
-                        // 存入file
+    public class GetUploadObject
+    {
+        public void start(string jDatastr, string fileDatastr)
+        {
 
-                       // XunJianDataManager.Instance.chooseXunJian.tasksList[]
 
-                        if(msg!=null)
-                        {
+            WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.storage_projectUploadObject, jDatastr, async (string str) =>
+            {
 
-                            Debug.Log(" 文件上传成功 " + msg);
+                JObject jObject = JObject.Parse(str);
 
-                            //string[] listStr = msg.Split('/');
+                if (jObject["code"].ToString() == "200")
+                {
 
-                            //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;
-                            //    }
-                            //}
 
-                        }
-                        else
-                        {
-                            Debug.LogError("文件上传失败");
-                        }
+                    JObject fildData = JObject.Parse(fileDatastr);
+                    // 文件上传
+                    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 =>
+                    {
+
+                        // 存入file
+
+                        // XunJianDataManager.Instance.chooseXunJian.tasksList[]
 
 
+                        Debug.Log(" 文件上传成功 " + msg);
                     });
-                    
+
                 }
                 else
                 {
@@ -178,14 +168,8 @@ public class PaiZhaoDataManager : Singleton<PaiZhaoDataManager>
                 }
 
             }));
-
-          
-
-           
         }
-
     }
-
     public List<paizhaoData> updateFile()
     {
         if (XunJianDataManager.Instance!=null&& XunJianDataManager.Instance.chooseXunJian!=null)