Browse Source

优化代码

蓝色星空 1 year ago
parent
commit
6f8e79bc5e

+ 13 - 15
Assets/Scripts/Blue/Controller/SavePanel.cs

@@ -34,34 +34,32 @@ public class SavePanel : AbstractController
     {
         meshTest.transform.parent = parent;
 
-        pos.x = meshTest.localPosition.x; 
-        pos.y = meshTest.localPosition.y; 
-        pos.z = meshTest.localPosition.z;
-        rot.x = meshTest.localEulerAngles.x; 
-        rot.y = meshTest.localEulerAngles.y; 
-        rot.z = meshTest.localEulerAngles.x;
+        posRotlist[0].x = meshTest.localPosition.x;
+        posRotlist[0].y = meshTest.localPosition.y;
+        posRotlist[0].z = meshTest.localPosition.z;
+        posRotlist[1].x = meshTest.localEulerAngles.x;
+        posRotlist[1].y = meshTest.localEulerAngles.y;
+        posRotlist[1].z = meshTest.localEulerAngles.z;
         string jsonString = JsonConvert.SerializeObject(posRotlist);
-
         this.SendCommand(new UploadCommand(this.GetService<IUpOrDownloadService>().URL, jsonString));
         sCToggleSwitch3D.isOn = false;
         gameObject.SetActive(false);
     }
-
     private void Cancle()
     {
         meshTest.transform.parent = parent;
-        posRotlist = this.GetService<IUpOrDownloadService>().PosRot;
+        List<ScenePosRotInfo> TempPosRotlist = this.GetService<IUpOrDownloadService>().PosRot;
 
-        float posX = posRotlist[0].x;
-        float posY = posRotlist[0].y;
-        float posZ = posRotlist[0].z;
+        float posX = TempPosRotlist[0].x;
+        float posY = TempPosRotlist[0].y;
+        float posZ = TempPosRotlist[0].z;
 
         Vector3 pos = new Vector3(posX, posY, posZ);
         meshTest.localPosition = pos;
 
-        float rotX = posRotlist[1].x;
-        float rotY = posRotlist[1].y;
-        float rotZ = posRotlist[1].z;
+        float rotX = TempPosRotlist[1].x;
+        float rotY = TempPosRotlist[1].y;
+        float rotZ = TempPosRotlist[1].z;
         meshTest.localEulerAngles = new Vector3(rotX, rotY, rotZ);
 
         sCToggleSwitch3D.isOn = false;

+ 17 - 5
Assets/Scripts/Blue/Service/IUpOrDownloadService.cs

@@ -27,8 +27,6 @@ public class UpOrDownloadService : IUpOrDownloadService
 
     }
 
-
-
     void IUpOrDownloadService.GetScenePosRot(string Url)
     {
         RootSystem.Instance.StartCoroutine(GetScenePosRotRequest(Url));
@@ -45,7 +43,7 @@ public class UpOrDownloadService : IUpOrDownloadService
         {
             webRequest.SetRequestHeader("authorization", HttpTool.Instance.Token);
 
-            //ÉèÖÃheader
+            //??header
             foreach (var v in HttpTool.Instance.RequestHeader)
             {
                 webRequest.SetRequestHeader(v.Key, v.Value);
@@ -86,7 +84,7 @@ public class UpOrDownloadService : IUpOrDownloadService
             byte[] bodyRaw = Encoding.UTF8.GetBytes(d2.ToJson());
 
             webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
-            //webRequest.downloadHandler = new DownloadHandlerBuffer();
+            webRequest.downloadHandler = new DownloadHandlerBuffer();
 
             webRequest.SetRequestHeader("Content-Type", "application/json;charset=utf-8");
             webRequest.SetRequestHeader("authorization", HttpTool.Instance.Token);
@@ -107,7 +105,21 @@ public class UpOrDownloadService : IUpOrDownloadService
             }
             else
             {
-                Debug.LogError("Upload Success");
+                Debug.LogError(webRequest.downloadHandler.text);
+                if (!string.IsNullOrWhiteSpace(webRequest.downloadHandler.text))
+                {
+                    string message = webRequest.downloadHandler.text;
+                    JObject jobject = JObject.Parse(message);
+                    if (jobject["code"].ToString() == "200")
+                    {
+                        message = jobject["data"].ToString();
+                        if (!string.IsNullOrWhiteSpace(message))
+                        {
+                            List<ScenePosRotInfo> ScenePosRotInfoList = JsonConvert.DeserializeObject<List<ScenePosRotInfo>>(message);
+                            PosRot = ScenePosRotInfoList;
+                        }
+                    }
+                }
                 InstantiateCommand Command = new InstantiateCommand(
                     InstantiateSystem.Instance.BlueObject.WarningPopUp,
                     InstantiateSystem.Instance.BlueObject.SuccessText);

+ 1 - 1
Assets/Scripts/Blue/Temp/MoveChange.cs

@@ -12,6 +12,7 @@ public class MoveChange : MonoBehaviour
     {
         moveGame = GameObject.Find("ARSpaceForAll/mesh_test");
         parent = GameObject.Find("ARSpaceForAll").transform;
+        y = moveGame.transform.position.y;
 
         DispatcherBase.KeyDownDelegateRegister(keyDownEventDelegate);
         DispatcherBase.KeyUpDelegateRegister(keyUpEventDelegate);
@@ -20,7 +21,6 @@ public class MoveChange : MonoBehaviour
     {
         Debug.Log("keyDownEventDelegate===>" + keyCode);
         moveGame.transform.parent = parent;
-        y = moveGame.transform.position.y;
         isDown = false;
     }