Merge branch 'F/20240102_HotUpdate' of https://gogs.ghz-tech.com:8843/GHzGlass/MREdustryXR into F/20240102_HotUpdate

Assets/FrameWork/ProjectManager/XunJian/列表模块/列表模块.prefab

@@ -429,9 +429,9 @@ RectTransform:
   m_Father: {fileID: 5948358374960567265}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 98.52, y: -31.339}
   m_SizeDelta: {x: 197.04, y: 62.678}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4467556290517043786
@@ -500,7 +500,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6623745393641784182
 RectTransform:
   m_ObjectHideFlags: 0
@@ -6600,9 +6600,9 @@ RectTransform:
   m_Father: {fileID: 6360067357008736703}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 98.52, y: -31.339}
   m_SizeDelta: {x: 197.04, y: 62.678}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8128956367684717728
@@ -7334,7 +7334,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 62.678}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &6004067552479198039
 MonoBehaviour:
@@ -7857,7 +7857,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 62.678}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &843423774124542169
 MonoBehaviour:
@@ -9147,7 +9147,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6646355514563717451
 RectTransform:
   m_ObjectHideFlags: 0

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/XunJianDataManager.cs

@@ -389,12 +389,13 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
 
         JsonData jsonData = new JsonData();
         jsonData["page"] = page++;
-        jsonData["limit"] = 50;
+        jsonData["limit"] = 10;
         Debug.Log(jsonData.ToJson());
         yield return WindowsManager.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.InspectionList, jsonData.ToJson(), (string msg) =>
         {
             Debug.Log("DGJ ===>InspectionList  " + msg);
             JObject jObject = JObject.Parse(msg);
+
             if (jObject["code"].ToString() == "200")
             {
                 List<XunJianData> data = JsonConvert.DeserializeObject<List<XunJianData>>(jObject["data"]["list"].ToString());
@@ -409,9 +410,9 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
                 Debug.Log(HttpEdustryAction.InspectionList +" Count " +listConunt);
                 if(WindowsManager.Instance.isTest)
                 {
-                    xjDataList.Add(testData3());
-                    xjDataList.Add(testData());
-                    xjDataList.Add(testData2());
+                    //xjDataList.Add(testData3());
+                    //xjDataList.Add(testData());
+                    //xjDataList.Add(testData2());
                 }
 
                 #region old 排序
@@ -502,6 +503,8 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
                 
                 peopleList = new Dictionary<string, List<XunJianListData>>();
                 areaList = new Dictionary<string, List<XunJianListData>>();
+
+           
                 for (int i = 0; i < xjDataList.Count; i++)
                 {
                     if (areaList.ContainsKey(xjDataList[i].inarea))