Merge branch 'MRNavigatorPro_Immersal' of ssh://gogs.ghz-tech.com:30979/GHZ/NrealSDK into MRNavigatorPro_Immersal

.gitignore

@@ -32,4 +32,5 @@
 /libopenxr_loader.so
 /libopenxr_loader.so.meta
 /QCAR
-/*.sln
+/*.sln
+/.vs

Assets/Script/BlueScripts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 08905e4436898024fafc92c7098f3741
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/BlueScripts/SendSN.cs

@@ -0,0 +1,16 @@
+public static class SendSN 
+{
+    private static string sn;
+    public static string GetSN()
+    {
+#if UNITY_EDITOR
+        sn = "YARMA11B0V21D22106170295";
+        sn = "ABD1234561";
+#elif UNITY_ANDROID
+        sn = SystemInfo.deviceUniqueIdentifier;
+#else
+        sn = "";
+#endif
+        return sn;
+    }
+}

Assets/Script/BlueScripts/SendSN.cs.meta

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

Assets/Scripts/Net/HttpSocket.cs

@@ -17,7 +17,10 @@ public class HttpSocket : MonoSingleton<HttpSocket>
     public void SendIpToPointPos(Vector3 pos, Action<string> CallBack)
     {
         SendNetConnectPointCloud sendNet = new SendNetConnectPointCloud();
-        sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
+        sendNet.sn = SendSN.GetSN();
+        //sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
         sendNet.projectId = DataManager.Instance.ProjectID;
         sendNet.position.x = pos.x;
         sendNet.position.y = pos.y;
@@ -75,7 +78,10 @@ public class HttpSocket : MonoSingleton<HttpSocket>
                 break;
         }
         SendNetConnectElectricity sendNet = new SendNetConnectElectricity();
-        sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
+        sendNet.sn = SendSN.GetSN();
+        //sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
         sendNet.projectId = DataManager.Instance.ProjectID;
         electricity = 100;
         sendNet.electricity = electricity;
@@ -93,7 +99,10 @@ public class HttpSocket : MonoSingleton<HttpSocket>
     public void SendIpToPointTrigger(string pointId, string name, Action<string> CallBack)
     {
         SendNetConnectPointTrigger sendNet = new SendNetConnectPointTrigger();
-        sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
+        sendNet.sn =SendSN.GetSN();
+        //sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
         sendNet.projectId = DataManager.Instance.ProjectID;
         sendNet.name = name;
         string jsonData = JsonMapper.ToJson(sendNet);
@@ -106,7 +115,10 @@ public class HttpSocket : MonoSingleton<HttpSocket>
     public void SendSnInfo(SceneValue scene, int index, Action<int, string> CallBack)
     {
         SendSnInfo sendNet = new SendSnInfo();
-        sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
+        sendNet.sn =SendSN.GetSN();
+        //sendNet.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
         sendNet.projectId = scene.id;
         string jsonData = JsonMapper.ToJson(sendNet);
 

Assets/Scripts/UI/SceneChoose.cs

@@ -108,14 +108,18 @@ public class SceneChoose : BaseUI
     {
         // 选择场景
         SendInit send = new SendInit();
-        send.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
+        send.sn = SendSN.GetSN();
+        //send.sn = API_GSXR_Slam.SlamManager.plugin.SN;
+
         send.projectId = m_CurrentData.id;
         string jsonString = JsonConvert.SerializeObject(send);
         UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.sceneChoose);
         //通过SN获取场景数据
         HttpTool.Instance.PostTest("/sn/init", jsonString, (message) =>
-        {
-            Debug.Log("/sn/init:  " + message);
+        {
+            Debug.Log("SN:" + send.sn);
+            Debug.Log("通过SN获取场景数据:" + message);
             if (!string.IsNullOrWhiteSpace(message))
             {
                 JObject jobject = JObject.Parse(message);
@@ -125,9 +129,9 @@ public class SceneChoose : BaseUI
                     if (jobject["code"].ToString() == "400")
                     {
                         UIManager.Instance.HideUI(UINameConfig.LoadingPanel);
-                        Module_Notice.getInstance.SetNoticeInfo("场景数据获取失败", jobject["data"].ToString(), NoticeType.Normal, 1.7f);
-                        Module_Notice.getInstance._Follower.WindowAnchor = TextAnchor.UpperCenter;
-                        Module_Notice.getInstance.StartNotice(3f);
+                        //Module_Notice.getInstance.SetNoticeInfo("场景数据获取失败", jobject["data"].ToString(), NoticeType.Normal, 1.7f);
+                        //Module_Notice.getInstance._Follower.WindowAnchor = TextAnchor.UpperCenter;
+                        //Module_Notice.getInstance.StartNotice(3f);
                     }
                 }
                 else

Assets/Scripts/WriteLog.cs

@@ -46,7 +46,7 @@ public class WriteLog : MonoBehaviour
         FileWriter = fileInfo.Open(FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.Read);
         encoding = new UTF8Encoding();
         Application.logMessageReceived += LogCallback;
-        Debug.LogError("开始写入日志");
+        Debug.Log("开始写入日志");
     }
     /// <summary>
     /// Log回调