|
@@ -123,54 +123,44 @@ public class PaiZhaoDataManager : Singleton<PaiZhaoDataManager>
|
|
|
|
|
|
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 =>
|
|
|
- {
|
|
|
+ }
|
|
|
|
|
|
-
|
|
|
+ public class GetUploadObject
|
|
|
+ {
|
|
|
+ public void start(string jDatastr, string fileDatastr)
|
|
|
+ {
|
|
|
|
|
|
-
|
|
|
|
|
|
- if(msg!=null)
|
|
|
- {
|
|
|
+ WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.storage_projectUploadObject, jDatastr, async (string str) =>
|
|
|
+ {
|
|
|
|
|
|
- Debug.Log(" 文件上传成功 " + msg);
|
|
|
+ JObject jObject = JObject.Parse(str);
|
|
|
|
|
|
-
|
|
|
+ if (jObject["code"].ToString() == "200")
|
|
|
+ {
|
|
|
|
|
|
-
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
- }
|
|
|
- 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 =>
|
|
|
+ {
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
+ 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)
|