修改测试的API

Assets/2.0/Tools/HttpAction.cs

@@ -9,32 +9,34 @@ public class HttpAction :Singleton<HttpAction>
     //  private string baseUrl = "http://office.ghz-tech.com:3425/guideSystem";
     public const string UrlPointCloud = "https://pro.qulivr.com/mr-navigator/v1";
     //private string token = "";
-    public const string baseurl = "http://office.ghz-tech.com:9904/api";
-    public const string baseurl20 = "https://office.ghz-tech.com:3424/api";
+   // public const string baseurl = "http://office.ghz-tech.com:9904/api";
+ //   public const string baseurl20 = "https://office.ghz-tech.com:3424/api";
     public const string baseurvideo = "https://office.ghz-tech.com:3424/";
 
-    //初始化场景
+    public const string baseurl20 = "https://api-fat2.ghz-tech.com/mr-navigator/v1";
+    public const string baseurl = "https://api-fat2.ghz-tech.com/mr-navigator/v1";
+    //鍒濆�鍖栧満鏅�
     public const string client_snInfo = "/client/snInfo";
 
     //public const string project_detail = "/project/detail";
-    //初始化景点 
+    //鍒濆�鍖栨櫙鐐� 
     public const string sn_init = "/sn/init";
-    //下载
+    //涓嬭浇
     public const string file_download = "/file/download";
 
-    //获取资源 
+    //鑾峰彇璧勬簮 
     public const string material_init = "/material/init";
 
-    //获取账号下场景id 
+    //鑾峰彇璐﹀彿涓嬪満鏅痠d 
     public const string project_init = "/project/index";
 
-    //保存景点位
+    //淇濆瓨鏅�偣浣�
     public const string viewpoint_update = "/viewpoint/update";
 
-    //电量
+    //鐢甸噺
     public const string sn_electricity = "/sn/electricity";
 
-    //识别的景点
+    //璇嗗埆鐨勬櫙鐐�
     public const string sn_viewpoint = "/sn/viewpoint";
 
 

Assets/2.0/User/UserScene/UserSceneManager.cs

@@ -8,27 +8,27 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
 {
     public delegate void UserSceneInitEnd(bool b);
 
-    //ÏÂÔػص÷
+    //下载回调
     public UserSceneInitEnd callback;
 
     int max;
     int now;
 
-    //³¡¾°ÖеÄÄ£ÐÍ
+    //场景中的模型
     public Dictionary<string, UserSceneItem> SceneList = new Dictionary<string, UserSceneItem>();
-    //³õʼ»¯³¡¾°
+    //�始化场景
     public void initScene(string msg)
     {
         SceneList.Clear();
         JsonData data = JsonMapper.ToObject(msg);
         Debug.Log("initScene init"+ msg);
-        if (data["data"].IsArray)
+        if (data["data"]["list"].IsArray)
         {
-            max = data["data"].Count;
+            max = data["data"]["list"].Count;
                 Debug.Log("initScene IsArray");
-            for (int i = 0; i < data["data"].Count; i++)
+            for (int i = 0; i < data["data"]["list"].Count; i++)
             {
-                init(data["data"][i]["id"].ToString(), data["data"][i]["name"].ToString());
+                init(data["data"]["list"][i]["id"].ToString(), data["data"]["list"][i]["name"].ToString());
             }
         }else
         {
@@ -44,7 +44,7 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
         string jsonData = JsonMapper.ToJson(sendNet);
         GameScene.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpAction.client_snInfo, jsonData, (message) =>
         {
-            Debug.Log(" ³õʼ»¯³¡¾° client_snInfo==¡·" + message);
+            Debug.Log(" �始化场景 client_snInfo==》" + message);
             SendInit detail = new SendInit();
             detail.projectId = int.Parse(id);
             detail.sn = SendSN.GetSN();
@@ -52,11 +52,11 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
             HttpTool
             .Instance.PostTest(HttpAction.sn_init, str, (mes) =>
             {
-                Debug.Log(" ³õʼ»¯³¡¾° sn_init==¡·" + mes+"===>id"+ detail.projectId.ToString());
+                Debug.Log(" �始化场景 sn_init==》" + mes+"===>id"+ detail.projectId.ToString());
                 JsonData data = JsonMapper.ToObject(mes);
                 if (data["data"].ToString() != null)
                 {
-                    CreateItem(data["data"], detail.projectId.ToString());
+                    CreateItem(data["data"]["info"], detail.projectId.ToString());
                 }
 
             });
@@ -96,9 +96,9 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
                     si.usi = usi;
                     si.id = msg["listSpoit"][i]["id"].ToString();
                     si.name = msg["listSpoit"][i]["name"].ToString();
-                    if(msg["listSpoit"][i]["spoitTf"]!=null)
+                    if(msg["listSpoit"][i]["spoittf"]!=null)
                     {
-                        si.initSpoitTfInfo(msg["listSpoit"][i]["spoitTf"]);
+                        si.initSpoitTfInfo(msg["listSpoit"][i]["spoittf"]);
                     }
                     else
                     {
@@ -129,7 +129,7 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
                                 {
                                     for (int z = 0; z < msg["listSpoit"][i]["material"][j]["materialList"].Count; z++)
                                     {
-                                        modellist.materialList[z].objectTransform = JsonConvert.DeserializeObject<ObjectTransform>(msg["listSpoit"][i]["material"][j]["materialList"][z]["ObjectTransform"].ToJson());
+                                        modellist.materialList[z].objectTransform = JsonConvert.DeserializeObject<ObjectTransform>(msg["listSpoit"][i]["material"][j]["materialList"][z]["objectTransform"].ToJson());
                                         modellist.materialList[z].initModelObj();
                                     }
                                 }
@@ -149,7 +149,7 @@ public class UserSceneManager : XRTool.Util.Singleton<UserSceneManager>
         usi.vufroiaTrigger.usi = usi;
 
         SceneList.Add(usi.id, usi);
-        Debug.Log("UI   Data   Ìí¼Ó³¡¾°===>"+ usi.id);
+        Debug.Log("UI   Data   添加场景===>"+ usi.id);
         now++;
         if(max<=now)
         {

Assets/Scripts/UI/LoginPanel.cs

@@ -260,7 +260,11 @@ public class LoginPanel : BaseUI
     private void OnClickLogin()
     {
 
-
+#if UNITY_EDITOR
+       // m_AccountStr = "1768147286@qq.com";
+        //m_AccountStr = "666666@qq.com";
+        //m_PasswordStr = "ghztech@402B";
+#endif
         if (string.IsNullOrWhiteSpace(m_AccountStr))
         {
             //m_AccountError.gameObject.SetActive(true);
@@ -294,7 +298,9 @@ public class LoginPanel : BaseUI
         SendLogin sendLogin = new SendLogin();
         sendLogin.email = m_AccountStr;
         sendLogin.password = m_PasswordStr;
+        sendLogin.remember = m_IsRemberPwd;
         string jsonLogin = JsonMapper.ToJson(sendLogin);
+        Debug.Log(jsonLogin);
         UIManager.Instance.ShowUI(UINameConfig.LoadingPanel, typeof(LoadingPanel), (int)ELoadState.login);
 
         if(UserInfo.Instance.is20)
@@ -377,7 +383,7 @@ public class LoginPanel : BaseUI
             JObject jobject = JObject.Parse(message);
             if (jobject["code"].ToString() == "200")
             {
-                message = jobject["data"].ToString();
+                message = jobject["data"]["list"].ToString();
                 if (!string.IsNullOrWhiteSpace(message))
                 {
                     List<SceneValue> listScenesPage = JsonConvert.DeserializeObject<List<SceneValue>>(message);
@@ -484,7 +490,7 @@ public class LoginPanel : BaseUI
                     }
                     CalMat(singleMaterials);
                     CalMat(libraryMaterials);
-                    CalMat(combinationMaterials);
+                //    CalMat(combinationMaterials);
                 }
             }
 
@@ -631,6 +637,8 @@ public class SendLogin
 {
     public string email { get; set; }
     public string password { get; set; }
+
+    public bool remember { get; set; }
 }
 
 public class SendMaterials

Assets/Scripts/UI/SceneChoose.cs

@@ -86,6 +86,7 @@ public class SceneChoose : BaseUI
             {
                 if (mes == "UnityWebRequest Error") return;
                 JObject jObject = JObject.Parse(mes);
+                
                 if (jObject["code"].ToString() == "200")
                 {
                     mes = jObject["data"].ToString();

Packages/manifest.json

@@ -15,7 +15,8 @@
     "com.unity.xr.arkit-face-tracking": "4.2.7",
     "com.unity.xr.interactionsubsystems": "1.0.1",
     "com.unity.xr.openxr": "1.5.3",
-    "jh.xr.engine": "file:D:/JiHe/XRSDK/package",
+    "jh.immersalsdk.engine": "file:G:/GUnityProject/ImmersalSDK/package",
+    "jh.xr.engine": "file:G:/GUnityProject/NavigatorXRSDK/XRSDK/package",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

ProjectSettings/ProjectSettings.asset

@@ -957,10 +957,10 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
+      Proximity: False
       InternetClient: True
       CodeGeneration: False
       BackgroundMediaPlayback: False
-      Proximity: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False