Browse Source

Bug384、383。延迟初始化定位、XRLocalizer注册OnPoseFound 监听

OnPoseFound += e =>
{
	ARSpace.isFind = true;
};
蓝色星空 1 year ago
parent
commit
f49b5ac225

+ 28 - 18
Assets/ImmersalSDK/Core/Scripts/AR/ARMap.cs

@@ -331,28 +331,38 @@ namespace Immersal.AR
             ParseMapIdAndName();
             InitializeMesh();
 
+            
+            this.RegisterEvent<MapFileSuccessEvent>(async e=>
+            {
+                fileName = e.fileName;
+                if(!fileSuccess)
+                    fileSuccess = true;
+                else
+                {
+                    byte[] s = File.ReadAllBytes(Application.persistentDataPath + "/Map Data/" + e.fileName);
+                    await LoadMap(s);
+                    this.GetComponent<ARMap>().enabled = true;
+                    this.SendCommand(new StartImmersalLocalizerCommand());
+                }
+
+            });
+
             this.RegisterEvent<LoadMapFileEvent>(async e=>
             {
-                //FileStream stream = new FileStream(Application.persistentDataPath + "/Map Data/81060-0515GHz.bytes", FileMode.Open);
-                //StreamReader reader = new StreamReader(stream);
-                //TextAsset textAsset = new TextAsset(await reader.ReadToEndAsync());
-
-                //FileStream stream = new FileStream(Application.persistentDataPath + "/Map Data/81060-0515GHz.bytes", FileMode.Open);
-                //TextAsset textAsset = (TextAsset)new BinaryFormatter().Deserialize(stream);
-
-                // 加载后不显示地图
-                //FileStream stream = new FileStream(Application.persistentDataPath + "/Map Data/81060-0515GHz.bytes", FileMode.Open);
-                //byte[] bytesArray = new byte[stream.Length];
-                //stream.Read(bytesArray, 0, (int)stream.Length);
-                //TextAsset textAsset = new TextAsset(System.Text.Encoding.UTF8.GetString(bytesArray));
-
-                //mapFile = Resources.Load<TextAsset>("Map Data/81060-0515GHz");
-                byte[] s = File.ReadAllBytes(Application.persistentDataPath + "/Map Data/" + e.fileName);
-                await LoadMap(s);
-                this.GetComponent<ARMap>().enabled = true;
-                this.SendCommand(new StartImmersalLocalizerCommand());
+                if(!fileSuccess)
+                    fileSuccess = true;
+                else
+                {
+                    byte[] s = File.ReadAllBytes(Application.persistentDataPath + "/Map Data/" + fileName);
+                    await LoadMap(s);
+                    this.GetComponent<ARMap>().enabled = true;
+                    this.SendCommand(new StartImmersalLocalizerCommand());
+                }
             });
         }
+        private string fileName;
+        private bool fileSuccess;
+
         private void ParseMapIdAndName()
         {
             int id;

+ 0 - 7
Assets/ImmersalSDK/Core/Scripts/AR/ARSpace.cs

@@ -247,7 +247,6 @@ namespace Immersal.AR
             if(pos!=tempVec)
             {
                 tempVec = pos;
-                isFind = true;
             }
             if (space == null)
 		        return;
@@ -258,12 +257,6 @@ namespace Immersal.AR
         		tr.SetPositionAndRotation(pos, rot);
                 //tr.eulerAngles = new Vector3(tr.eulerAngles.x-90,tr.eulerAngles.y,tr.eulerAngles.z);
                 tr.eulerAngles = new Vector3(0,tr.eulerAngles.y,0);
-                /*
-                if(tr.position.y>0.5f)
-                {
-                    tr.position = new Vector3(tr.position.x, 0.5f, tr.position.z);
-                }
-                */
             }
 		}
     }

+ 189 - 189
Assets/MRNavigatorPro.unity

@@ -2106,7 +2106,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 621307277}
+  m_Mesh: {fileID: 486659905}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2257,6 +2257,170 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 413893614}
   m_CullTransparentMesh: 0
+--- !u!43 &486659905
+Mesh:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 10
+  m_SubMeshes:
+  - serializedVersion: 2
+    firstByte: 0
+    indexCount: 0
+    topology: 5
+    baseVertex: 0
+    firstVertex: 0
+    vertexCount: 0
+    localAABB:
+      m_Center: {x: 0, y: 0, z: 0}
+      m_Extent: {x: 0, y: 0, z: 0}
+  m_Shapes:
+    vertices: []
+    shapes: []
+    channels: []
+    fullWeights: []
+  m_BindPose: []
+  m_BoneNameHashes: 
+  m_RootBoneNameHash: 0
+  m_BonesAABB: []
+  m_VariableBoneCountWeights:
+    m_Data: 
+  m_MeshCompression: 0
+  m_IsReadable: 1
+  m_KeepVertices: 0
+  m_KeepIndices: 0
+  m_IndexFormat: 1
+  m_IndexBuffer: 
+  m_VertexData:
+    serializedVersion: 3
+    m_VertexCount: 0
+    m_Channels:
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    m_DataSize: 0
+    _typelessdata: 
+  m_CompressedMesh:
+    m_Vertices:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UV:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Normals:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Tangents:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Weights:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_NormalSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_TangentSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_FloatColors:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_BoneIndices:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Triangles:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UVInfo: 0
+  m_LocalAABB:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
+  m_MeshUsageFlags: 0
+  m_BakedConvexCollisionMesh: 
+  m_BakedTriangleCollisionMesh: 
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 1
+  m_MeshOptimizationFlags: 1
+  m_StreamData:
+    serializedVersion: 2
+    offset: 0
+    size: 0
+    path: 
 --- !u!114 &493550942 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 3134174762876500542, guid: 697420e71aa8bea4b938e2f3986965a6,
@@ -3083,171 +3247,7 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_IsOn: 0
---- !u!43 &621307277
-Mesh:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 10
-  m_SubMeshes:
-  - serializedVersion: 2
-    firstByte: 0
-    indexCount: 0
-    topology: 5
-    baseVertex: 0
-    firstVertex: 0
-    vertexCount: 0
-    localAABB:
-      m_Center: {x: 0, y: 0, z: 0}
-      m_Extent: {x: 0, y: 0, z: 0}
-  m_Shapes:
-    vertices: []
-    shapes: []
-    channels: []
-    fullWeights: []
-  m_BindPose: []
-  m_BoneNameHashes: 
-  m_RootBoneNameHash: 0
-  m_BonesAABB: []
-  m_VariableBoneCountWeights:
-    m_Data: 
-  m_MeshCompression: 0
-  m_IsReadable: 1
-  m_KeepVertices: 0
-  m_KeepIndices: 0
-  m_IndexFormat: 1
-  m_IndexBuffer: 
-  m_VertexData:
-    serializedVersion: 3
-    m_VertexCount: 0
-    m_Channels:
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    m_DataSize: 0
-    _typelessdata: 
-  m_CompressedMesh:
-    m_Vertices:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UV:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Normals:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Tangents:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Weights:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_NormalSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_TangentSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_FloatColors:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_BoneIndices:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Triangles:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UVInfo: 0
-  m_LocalAABB:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
-  m_MeshUsageFlags: 0
-  m_BakedConvexCollisionMesh: 
-  m_BakedTriangleCollisionMesh: 
-  m_MeshMetrics[0]: 1
-  m_MeshMetrics[1]: 1
-  m_MeshOptimizationFlags: 1
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
+  m_IsOn: 1
 --- !u!1 &647507121 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 8030973376965847205, guid: 7e724082e3f166747b1152780155e212,
@@ -5872,7 +5872,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1327983565}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: a6793aeafe13f421caecaaece6133c1d, type: 3}
   m_Name: 
@@ -7322,7 +7322,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0031300166
+      value: -0.0059300708
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -7452,37 +7452,37 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0045451573
+      value: -0.0019608259
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -101.5
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714058937656, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -7492,62 +7492,62 @@ PrefabInstance:
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -35.5
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 188
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 0
+      value: 61
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 100
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -35.5
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3e8996c442fe40541beb734ca45f2bf6, type: 3}
@@ -10364,7 +10364,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.001971011
+      value: 0.000058554444
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -14210,7 +14210,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.00074709277}
+  m_AnchoredPosition: {x: 0, y: -0.0012479936}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

+ 11 - 18
Assets/Scripts/Blue/Controller/ImmersalLocalizerController.cs

@@ -2,6 +2,7 @@ using Immersal.AR;
 using UnityEngine;
 using Blue;
 using UnityEngine.UI;
+using System.Collections;
 
 /// <summary>
 /// 控制Immersal定位
@@ -12,43 +13,35 @@ public class ImmersalLocalizerController: AbstractController
     private Toggle Y_Location_Toggle =>SceneIOCContainer.Instance.Pull("Y_Location_Toggle")as Toggle;
     private Toggle N_Location_Toggle =>SceneIOCContainer.Instance.Pull("N_Location_Toggle")as Toggle;
 
-    [SerializeField] private float rateTime = 2f;
-    private float time = 0f;
-    private bool startLocalizer=false;
     private Color32 blue= new Color32(0, 120, 255, 255);
     private Color32 white= new Color32(255, 255, 255, 255);
 
     private void Awake()
     {
-        this.RegisterEvent<StartImmersalLocalizerEvent>(e=>
+        this.RegisterEvent<StartImmersalLocalizerEvent>(e =>
         {
-            this.enabled = true; // 开启脚本
-            startLocalizer = true; // 开始定位
+            XRLocalizer.enabled = true;
         }).UnRegisterWhenGameObjectDestroyed(gameObject);
 
-        this.RegisterEvent<SuccessImmersalLocalizerEvent>(e=>
+        this.RegisterEvent<SuccessImmersalLocalizerEvent>(e =>
         {
             InstantiateCommand Command = new InstantiateCommand(
                     InstantiateSystem.Instance.BlueObject.NormalPopUp,
                     "定位成功");
             this.SendCommand(Command);
+
             Y_Location_Toggle.transform.Find("Background").GetComponent<Image>().color = white;
             Y_Location_Toggle.transform.Find("Background/Checkmark").GetComponent<Image>().color = white;
             N_Location_Toggle.transform.Find("Background").GetComponent<Image>().color = blue;
             N_Location_Toggle.transform.Find("Background/Checkmark").GetComponent<Image>().color = blue;
-            XRLocalizer.enabled = false;
-            this.enabled = false;
+
+            StartCoroutine(XRLocalizerActive());
         }).UnRegisterWhenGameObjectDestroyed(gameObject);
     }
-    void Update()
-    {
-        time += Time.deltaTime;
 
-        if(time > rateTime  && startLocalizer && !SetSceneActive.Instance.active)
-        {
-            XRLocalizer.Localize();
-            time= 0;
-            Debug.Log("定位一次");
-        }
+    private IEnumerator XRLocalizerActive()
+    {
+        yield return null;
+        XRLocalizer.enabled = false;
     }
 }

+ 0 - 3
Assets/Scripts/Blue/Controller/IsLocation.cs

@@ -14,7 +14,6 @@ public class IsLocation : AbstractController
     public Toggle N_Location_Toggle;
 
     private XRLocalizer XRLocalizer =>SceneIOCContainer.Instance.Pull("XRLocalizer")as XRLocalizer;
-    private ImmersalLocalizerController ImmersalLocalizerController =>SceneIOCContainer.Instance.Pull("ImmersalLocalizerController")as ImmersalLocalizerController;
 
     private Color32 blue= new Color32(0, 120, 255, 255);
     private Color32 white= new Color32(255, 255, 255, 255);
@@ -32,7 +31,6 @@ public class IsLocation : AbstractController
             N_Location_Toggle.transform.Find("Background").GetComponent<Image>().color = white;
             N_Location_Toggle.transform.Find("Background/Checkmark").GetComponent<Image>().color = white;
 
-            ImmersalLocalizerController.enabled = true;
             XRLocalizer.enabled = true;
 
             this.SendCommand(new SetImmersalLocalCommand(true));
@@ -42,7 +40,6 @@ public class IsLocation : AbstractController
     {
         if (isOn)
         {
-            ImmersalLocalizerController.enabled = false;
             XRLocalizer.enabled = false;
 
             this.SendCommand(new SetImmersalLocalCommand(false));

+ 19 - 3
Assets/Scripts/Blue/Event/LoadMapFileEvent.cs

@@ -1,9 +1,25 @@
 using Blue;
 
-/// <summary>
-/// 加载地图文件的事件
+/// <summary>
+/// 地图文件下载成功事件
 /// </summary>
-public class LoadMapFileEvent : IEvent
+public class MapFileSuccessEvent : IEvent
 {
     public string fileName;
 }
+
+
+/// <summary>
+/// 地图文件下载成功事件
+/// </summary>
+public class LoadMapFileEvent : IEvent
+{
+}
+
+public class LoadMapFileCommand : ICommand
+{
+    public void OnExcute()
+    {
+        this.SendEvent<LoadMapFileEvent>();
+    }
+}

+ 2 - 2
Assets/Scripts/Blue/Service/IPointService.cs

@@ -139,7 +139,7 @@ public class PointService : IPointService
                     nFile.Write(File, 0, File.Length); //写入数据
                     nFile.Close(); nFile.Dispose(); nFile = null;//关闭当前流并释放与之相关联的所有系统资源
                     if (fileType == PointFileType.bytes)
-                        this.SendEvent(new LoadMapFileEvent() { fileName = fileName });
+                        this.SendEvent(new MapFileSuccessEvent() { fileName = fileName });
                 }
             }
                
@@ -148,7 +148,7 @@ public class PointService : IPointService
         {
             Debug.LogWarning("文件已存在");
             if (fileType == PointFileType.bytes)
-                this.SendEvent(new LoadMapFileEvent() { fileName = fileName });
+                this.SendEvent(new MapFileSuccessEvent() { fileName = fileName });
         }
     }
     private IEnumerator GetObjectOfRefrence(string url,int sceneID)

+ 0 - 6
Assets/Scripts/Blue/System/GetObjectSystem.cs

@@ -8,8 +8,6 @@ public class GetObjectSystem : SingletonMonobehaviour<GetObjectSystem>
     [SerializeField] private GameObject mesh_test;
     [SerializeField] private GameObject ARSpaceForAll;
     [SerializeField] private XRLocalizer mXRLocalizer;
-    [SerializeField] private ImmersalLocalizerController mImmersalLocalizerController;
-    [SerializeField] private Toggle ImmersalSetToggle;
     [SerializeField] private Toggle AnchorBtnToggle;
 
     [SerializeField] private Toggle Y_Location_Toggle;
@@ -25,8 +23,6 @@ public class GetObjectSystem : SingletonMonobehaviour<GetObjectSystem>
         mesh_test = GameObject.Find("ARSpaceForAll/mesh_test");
         ARSpaceForAll = GameObject.Find("ARSpaceForAll");
         mXRLocalizer = GameObject.Find("ImmersalSDK").GetComponent<XRLocalizer>();
-        mImmersalLocalizerController = GetComponentInChildren<ImmersalLocalizerController>();
-        //ImmersalSetToggle = GameObject.Find("SetBtn/Canvas/Parent/Test/Toggle").GetComponent<Toggle>();
         AnchorBtnToggle = GameObject.Find("SetBtn/Canvas/Parent/AnchorBtn/Toggle").GetComponent<Toggle>();
         Y_Location_Toggle = GameObject.Find("SetBtn/Canvas").transform.Find("LocationPanel/Toggle/Y_Location_Toggle").GetComponent<Toggle>();
         N_Location_Toggle = GameObject.Find("SetBtn/Canvas").transform.Find("LocationPanel/Toggle/N_Location_Toggle").GetComponent<Toggle>();
@@ -37,8 +33,6 @@ public class GetObjectSystem : SingletonMonobehaviour<GetObjectSystem>
         SceneIOCContainer.Instance.Push("mesh_test",mesh_test);
         SceneIOCContainer.Instance.Push("ARSpaceForAll",ARSpaceForAll);
         SceneIOCContainer.Instance.Push("XRLocalizer",mXRLocalizer);
-        SceneIOCContainer.Instance.Push("ImmersalLocalizerController",mImmersalLocalizerController);
-        //SceneIOCContainer.Instance.Push("ImmersalSetToggle",ImmersalSetToggle);
         SceneIOCContainer.Instance.Push("AnchorBtnToggle",AnchorBtnToggle);
         SceneIOCContainer.Instance.Push("Y_Location_Toggle",Y_Location_Toggle);
         SceneIOCContainer.Instance.Push("N_Location_Toggle",N_Location_Toggle);

+ 1 - 0
Assets/Scripts/UI/GameManager.cs

@@ -334,6 +334,7 @@ public class GameManager : MonoSingleton<GameManager>
         InitBoxColliders();
 
         ERNIEBot.SetActive(true);
+        CommandSystem.Instance.Send(new LoadMapFileCommand());
     }