添加注释

Assets/Scripts/BaseManager/DataManager.cs

@@ -156,7 +156,7 @@ public class DataManager : SingletonMono<DataManager>
             InstantiateCommand Command= new InstantiateCommand(
                 InstantiateSystem.Instance.BlueObject.WarningPopUp,
                 InstantiateSystem.Instance.BlueObject.NetErrorText);
-            CommandExtensionSystem.Instance.Send(Command);
+            CommandSystem.Instance.Send(Command);
             return;
         }
 

Assets/Scripts/Blue/0.FrameworkDesign/IOC/AbstractArchitectureComponentInjector.cs

@@ -154,7 +154,7 @@ namespace Blue
             for (int i = 0; i < length; i++)
             {
                 FieldInfo tmpField = tmpFieldArr[i];
-                AutoInjectAttribute autoInjectAttribute = tmpField.GetCustomAttribute<AutoInjectAttribute>();
+                AutoAttribute autoInjectAttribute = tmpField.GetCustomAttribute<AutoAttribute>();
                 if (autoInjectAttribute != null)
                 {
                     InjectInfo injectInfo = new InjectInfo()

Assets/Scripts/Blue/0.FrameworkDesign/IOC/AutoInjectAttribute.cs → Assets/Scripts/Blue/0.FrameworkDesign/IOC/AutoAttribute.cs

@@ -3,22 +3,22 @@ using System;
 namespace Blue
 {
     /// <summary>
-    /// 自动注入---可以对字段应用属性
+    /// 自动化
     /// </summary>
     [AttributeUsage(AttributeTargets.Field)]
-    public class AutoInjectAttribute : Attribute
+    public class AutoAttribute : Attribute
     {
         private Type type;
         private InjectScope scope;
-        public AutoInjectAttribute()
+        public AutoAttribute()
         {
             scope = InjectScope.Singleton;
         }
-        public AutoInjectAttribute(Type injectType):base()
+        public AutoAttribute(Type injectType):base()
         {
             type = injectType;
         }
-        public AutoInjectAttribute(Type injectType, InjectScope injectScope)
+        public AutoAttribute(Type injectType, InjectScope injectScope)
         {
             type = injectType;
             scope = injectScope;

Assets/Scripts/Blue/0.FrameworkDesign/IOC/AutoInjectAttribute.cs.meta → Assets/Scripts/Blue/0.FrameworkDesign/IOC/AutoAttribute.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 622e02399eec8d14ead869f91635ffab
+guid: a1ba8f9fa51acb24f88d6e14968e5b25
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

Assets/Scripts/Blue/Command/InstantiateCommand.cs

@@ -1,6 +1,10 @@
 using Blue;
 using UnityEngine;
 
+/// <summary>
+/// 实例化命令
+/// 添加要实例化的物体、实例化物体的内容
+/// </summary>
 public class InstantiateCommand : ICommand
 {
     private GameObject prefab;

Assets/Scripts/Blue/Command/StartImmersalLocalizerCommand.cs

@@ -1,5 +1,8 @@
 using Blue;
 
+/// <summary>
+/// 开始Immersal本地化定位识别命令
+/// </summary>
 public class StartImmersalLocalizerCommand : ICommand
 {
     public void OnExcute()

Assets/Scripts/Blue/Controller/SavePanel.cs

@@ -42,7 +42,7 @@ public class SavePanel : AbstractController
         posRotlist[1].y = meshTest.localEulerAngles.y;
         posRotlist[1].z = meshTest.localEulerAngles.z;
         string jsonString = JsonConvert.SerializeObject(posRotlist);
-        this.SendCommand(new UploadCommand(URL, jsonString));
+        this.SendCommand(new PointPosRotUploadCommand(URL, jsonString));
         sCToggleSwitch3D.isOn = false;
         gameObject.SetActive(false);
     }

Assets/Scripts/Blue/Event/GetScenePosRotEvent.cs

@@ -1,6 +1,9 @@
 using Blue;
 using System.Collections.Generic;
 
+/// <summary>
+/// »ñÈ¡³¡¾° Pos¡¢Rotʼþ
+/// </summary>
 public class GetScenePosRotEvent : IEvent
 {
     public List<ScenePosRotInfo> PosRot;

Assets/Scripts/Blue/Event/LoadMapFileEvent.cs

@@ -1,5 +1,8 @@
 using Blue;
 
+/// <summary>
+/// 加载地图文件的事件
+/// </summary>
 public class LoadMapFileEvent : IEvent
 {
     public string fileName;

Assets/Scripts/Blue/Event/StartImmersalLocalizerEvent.cs

@@ -1,5 +1,8 @@
 using Blue;
 
+/// <summary>
+/// ¿ªÊ¼Immersal¶¨Î»Ê¼þ
+/// </summary>
 public class StartImmersalLocalizerEvent : IEvent
 {
 

Assets/Scripts/Blue/MRNavigatorPro.cs

@@ -18,11 +18,11 @@ public class MRNavigatorPro : AbstractArchitecture<MRNavigatorPro>
     {
         this.RegisterService<ISendLogService>(new SendLogService());
         this.RegisterService<IUpOrDownloadService>(new UpOrDownloadService());
+        this.RegisterService<IPointService>(new PointService());
     }
 
     private void RegisterUtility()
     {
-        this.RegisterUtility<IGetAngleByTwoPointUtility>(new GetAngleByTwoPointUtility());
         this.RegisterUtility<GetFileNameUtility>(new GetFileNameUtility());
     }
 }

Assets/Scripts/Blue/Service/IPointService.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6b05ad2380630b544bd8941db6b967e5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Blue/Service/IUpOrDownloadService.cs

@@ -11,7 +11,7 @@ using UnityEngine.Networking;
 public interface IUpOrDownloadService : IService
 {
     List<ScenePosRotInfo> PosRot { get; }
-    void GetScenePosRot(string Url,int projectID);
+    void GetScenePosRot(int projectID);
     void UploadScenePosRot(string Url, string JsonString);
 }
 
@@ -19,25 +19,26 @@ public class UpOrDownloadService : IUpOrDownloadService
 {
     public List<ScenePosRotInfo> PosRot { get; private set; }
     public int ProjectID { get; private set; }
+    private string UrlPointCloudPosRot;
 
     public void OnInit()
     {
-
+        UrlPointCloudPosRot = "https://api-fat1.ghz-tech.com/mr-navigator/v1/project/position";
     }
 
-    void IUpOrDownloadService.GetScenePosRot(string Url,int projectID)
+    void IUpOrDownloadService.GetScenePosRot(int projectID)
     {
-        RootSystem.Instance.StartCoroutine(GetScenePosRotRequest(Url,projectID));
+        CoroutineSystem.Instance.StartCoroutine(GetScenePosRotRequest(projectID));
     }
 
     void IUpOrDownloadService.UploadScenePosRot(string Url, string JsonString)
     {
-        RootSystem.Instance.StartCoroutine(RequestUpload(Url,JsonString));
+        CoroutineSystem.Instance.StartCoroutine(RequestUpload(Url,JsonString));
     }
 
-    private IEnumerator GetScenePosRotRequest(string Url,int projectID)
+    private IEnumerator GetScenePosRotRequest(int projectID)
     {
-        using (UnityWebRequest webRequest = new UnityWebRequest(Url, "POST"))
+        using (UnityWebRequest webRequest = new UnityWebRequest(UrlPointCloudPosRot, "POST"))
         {
             ProjectID = projectID;
             ScenePointBodyInfo TestGet = new ScenePointBodyInfo();
@@ -86,7 +87,6 @@ public class UpOrDownloadService : IUpOrDownloadService
             d2["position"] = data;
             d2["id"] = ProjectID;
             d2["unity"] = true;
-            Debug.LogError("d2.ToJson():" + d2.ToJson());
             byte[] bodyRaw = Encoding.UTF8.GetBytes(d2.ToJson());
 
             webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
@@ -107,11 +107,10 @@ public class UpOrDownloadService : IUpOrDownloadService
                 InstantiateCommand Command = new InstantiateCommand(
                     InstantiateSystem.Instance.BlueObject.WarningPopUp,
                     InstantiateSystem.Instance.BlueObject.NetErrorText);
-                CommandExtensionSystem.Instance.Send(Command);
+                CommandSystem.Instance.Send(Command);
             }
             else
             {
-                Debug.LogError(webRequest.downloadHandler.text);
                 if (!string.IsNullOrWhiteSpace(webRequest.downloadHandler.text))
                 {
                     string message = webRequest.downloadHandler.text;
@@ -129,7 +128,7 @@ public class UpOrDownloadService : IUpOrDownloadService
                 InstantiateCommand Command = new InstantiateCommand(
                     InstantiateSystem.Instance.BlueObject.WarningPopUp,
                     InstantiateSystem.Instance.BlueObject.SuccessText);
-                CommandExtensionSystem.Instance.Send(Command);
+                CommandSystem.Instance.Send(Command);
             }
         }
     }

Assets/Scripts/Blue/Test/BlueTest.cs

@@ -18,7 +18,7 @@ public class BlueTest : AbstractController
             string jsonString = JsonConvert.SerializeObject(list);
             string url = "https://api-fat1.ghz-tech.com/mr-navigator/v1/project/position/396";
             //HttpTool.Instance.UploadScenePosRot(url,jsonString,CallBack);
-            //this.SendCommand(new UploadCommand(url, HttpTool.Instance.RequestHeader, HttpTool.Instance.Token, jsonString));
+            //this.SendCommand(new PointPosRotUploadCommand(url, HttpTool.Instance.RequestHeader, HttpTool.Instance.Token, jsonString));
         }
     }
     private void CallBack(string e)

Assets/Scripts/Blue/Utility/CoroutineUtility.cs

@@ -5,11 +5,11 @@ public static class CoroutineUtility
 {
     public static void StartCoroutine(IEnumerator  coroutine)
     {
-        RootSystem.Instance.Start_Coroutine(coroutine);
+        CoroutineSystem.Instance.Start_Coroutine(coroutine);
     }
 
     public static void StopCoroutine(Coroutine  coroutine)
     {
-        RootSystem.Instance.Stop_Coroutine(coroutine);
+        CoroutineSystem.Instance.Stop_Coroutine(coroutine);
     }
 }