巡检BUG修复

Assets/Game/ShowXunJian/ShowXunJian.prefab

@@ -2535,7 +2535,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1484507779871337330}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 9183237031783825460}
+        m_TargetAssemblyTypeName: XunJianException, Assembly-CSharp
+        m_MethodName: SetText
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 8194649949399713}
+          m_ObjectArgumentAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &2271514404450715593
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2549,6 +2561,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   nameText: {fileID: 8194649949399713}
+  errorBtn: {fileID: 0}
 --- !u!1 &1640817344540155600
 GameObject:
   m_ObjectHideFlags: 0
@@ -8731,11 +8744,29 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   global: 1
   tastItem: {fileID: 5375330686866484778}
+  contentUI: {fileID: 4850563461587722092}
   xjDetails: {fileID: 5004917055192868220}
+  retractBtn: {fileID: 1516103723783865946}
+  expandBtn: {fileID: 4804767857594952835}
   defaultUI: {fileID: 8040946423383846060}
   endUI: {fileID: 6321435222984322341}
   homeEndUI: {fileID: 6686417154385847436}
   checkTaskItem: {fileID: 0}
+  OnReset:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 15090157997580263}
+        m_TargetAssemblyTypeName: ResetTransform, Assembly-CSharp
+        m_MethodName: Execute
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &5521884715922290943
 GameObject:
   m_ObjectHideFlags: 0
@@ -11248,7 +11279,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 4738404782749580659}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: -2694300282446476916}
+        m_TargetAssemblyTypeName: XunJianInitialize, Assembly-CSharp
+        m_MethodName: SetScaleFunction
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &6980957034531317433
 GameObject:
   m_ObjectHideFlags: 0
@@ -12275,6 +12318,7 @@ MonoBehaviour:
   UI2: {fileID: 120999066876803472}
   startImg: {fileID: 21300000, guid: 72a6f38aacb371e4e808f9b74800e742, type: 3}
   loadImg: {fileID: 21300000, guid: 550505d730dce1747829de500692b9f3, type: 3}
+  isUpdata: 0
 --- !u!114 &8274728536915410698
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -12699,7 +12743,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 5194997590792753214}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 9183237031783825460}
+        m_TargetAssemblyTypeName: XunJianException, Assembly-CSharp
+        m_MethodName: SetText
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 1709709011282245356}
+          m_ObjectArgumentAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &6559195367151074050
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -12713,6 +12769,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   nameText: {fileID: 1709709011282245356}
+  errorBtn: {fileID: 0}
 --- !u!1 &7794346974342812525
 GameObject:
   m_ObjectHideFlags: 0
@@ -14810,7 +14867,19 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 2765289071770418795}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 9183237031783825460}
+        m_TargetAssemblyTypeName: XunJianException, Assembly-CSharp
+        m_MethodName: SetText
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 13134088950707736}
+          m_ObjectArgumentAssemblyTypeName: TMPro.TMP_Text, Unity.TextMeshPro
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!114 &8255543511318200522
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -14824,6 +14893,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   nameText: {fileID: 13134088950707736}
+  errorBtn: {fileID: 0}
 --- !u!1 &9198395614267283638
 GameObject:
   m_ObjectHideFlags: 0
@@ -15046,6 +15116,18 @@ PrefabInstance:
       propertyPath: m_RaycastTarget
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3574649648161934019, guid: 87071b209bf7fca41b94d3839f47ca29, type: 3}
+      propertyPath: m_fontColor.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574649648161934019, guid: 87071b209bf7fca41b94d3839f47ca29, type: 3}
+      propertyPath: m_fontColor.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3574649648161934019, guid: 87071b209bf7fca41b94d3839f47ca29, type: 3}
+      propertyPath: m_fontColor.r
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5190978295931163826, guid: 87071b209bf7fca41b94d3839f47ca29, type: 3}
       propertyPath: m_Group
       value: 

Assets/Game/ShowXunJian/XJTaskItem.cs

@@ -23,9 +23,13 @@ public class XJTaskItem : MonoBehaviour
         {  
             if(b)
             {
-                XunJianInitialize.Instance.checkTaskItem = this;
-                // 把数据传递出去
-                xjDetails.InitData(itemData);
+                if (XunJianInitialize.Instance.checkTaskItem != null)
+                {
+                    XunJianInitialize.Instance.xjDetails.SubmitData();
+                    XunJianInitialize.Instance.checkTaskItem.nameText.color = Color.white;
+                }
+
+                XunJianInitialize.Instance.SetCheckIte(this);
             }
         });
         numText.raycastTarget = false;

Assets/Game/ShowXunJian/XunJianDetails.cs

@@ -47,7 +47,7 @@ public class XunJianDetails : MonoBehaviour
 
 
     #region 巡检更新项
-    private bool isUpdata;
+    public bool isUpdata;
     private List<string> listImageUrl; // 图片
     private string recordMemo; // 巡检备注
     private string recordStatus;// 1-正常 0-异常 
@@ -78,7 +78,7 @@ public class XunJianDetails : MonoBehaviour
             normalBG2.gameObject.SetActive(false);
             warningBG1.gameObject.SetActive(false);
             WarningBG2.gameObject.SetActive(true);
-
+            XunJianInitialize.Instance.checkTaskItem.errorObj.SetActive(false);
             LayoutRebuilder.ForceRebuildLayoutImmediate(GetComponent<RectTransform>());
         });
 
@@ -93,7 +93,7 @@ public class XunJianDetails : MonoBehaviour
             normalBG2.gameObject.SetActive(true);
             warningBG1.gameObject.SetActive(true);
             WarningBG2.gameObject.SetActive(false);
-
+            XunJianInitialize.Instance.checkTaskItem.errorObj.SetActive(true);
             LayoutRebuilder.ForceRebuildLayoutImmediate(GetComponent<RectTransform>());
         });
 
@@ -216,10 +216,10 @@ public class XunJianDetails : MonoBehaviour
         }
         else
         {
-            normalBG1.gameObject.SetActive(true);
-            normalBG2.gameObject.SetActive(false);
-            warningBG1.gameObject.SetActive(true);
-            WarningBG2.gameObject.SetActive(false);
+            normalBG1.gameObject.SetActive(false);
+            normalBG2.gameObject.SetActive(true);
+            warningBG1.gameObject.SetActive(false);
+            WarningBG2.gameObject.SetActive(true);
 
             listImageUrl = new List<string>();
             recordStatus = null;
@@ -232,7 +232,7 @@ public class XunJianDetails : MonoBehaviour
 
     private void InitUI()
     {
-        xjName.text = data.inspItemDesc;
+        xjName.text = XunJianInitialize.Instance.GetCheckItemNum().ToString()+"."+ data.inspItemDesc;
         for (int i = 0; i < listImages.Count; i++)
         {
             listImages[i].sprite = startImg;

Assets/Game/ShowXunJian/XunJianErrorBtn.cs

@@ -2,11 +2,24 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using TMPro;
+using UnityEngine.UI;
+
 public class XunJianErrorBtn : MonoBehaviour
 {
     public TMP_Text nameText;
 
-   public void SetName( string name)
+    public Button errorBtn;
+
+    private void Start()
+    {
+        errorBtn = GetComponent<Button>();
+
+        errorBtn.onClick.AddListener(() =>
+        {
+            XunJianInitialize.Instance.xjDetails.isUpdata = true;
+        });
+    }
+    public void SetName( string name)
     {
         nameText.text = name;
 

Assets/Game/ShowXunJian/XunJianException.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using TMPro;
 using static LangChaoJiekou;
 
 public class XunJianException : MonoBehaviour
@@ -11,6 +12,14 @@ public class XunJianException : MonoBehaviour
 
     public List<XunJianErrorBtn> listErrorBtn;
 
+    public void SetText(TMP_Text text)
+    {
+        scInput.text += text.text;
+        scInput.onValueChanged.AddListener(( v) =>
+        {
+            XunJianInitialize.Instance.xjDetails.isUpdata = true;
+        });
+    }
     public void InitData( RoomItem  data )
     {
         for (int i = 0; i < listErrorBtn.Count; i++)

Assets/Game/ShowXunJian/XunJianInitialize.cs

@@ -2,13 +2,18 @@ using Newtonsoft.Json;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Events;
 using static LangChaoJiekou;
 
 public class XunJianInitialize :MonoSingleton<XunJianInitialize>
 {
     public XJTaskItem tastItem;
+    public GameObject contentUI;
     public XunJianDetails xjDetails;
 
+    public GameObject retractBtn;
+    public GameObject expandBtn;
+
     public GameObject defaultUI;
     public GameObject endUI;
     public GameObject homeEndUI;
@@ -17,14 +22,17 @@ public class XunJianInitialize :MonoSingleton<XunJianInitialize>
     public XJTaskItem checkTaskItem;
 
 
+
+    private bool isScale;
     private bool isInit;
 
     private List<XJTaskItem> listItem;
-
+    public UnityEvent OnReset = new UnityEvent(); // ÖØÖÃʼþ
     private void Start()
     {
         isInit = false;
         listItem = new List<XJTaskItem>();
+        isScale = false;
     }
     private void OnEnable()
     {
@@ -40,7 +48,15 @@ public class XunJianInitialize :MonoSingleton<XunJianInitialize>
 
             InitializeData();
         }
+#if UNITY_EDITOR
+        //if (Test) return;
+        return;
+#endif
+        OnReset?.Invoke();
+
     }
+
+
     public void InitializeData( )
     {
        
@@ -52,11 +68,9 @@ public class XunJianInitialize :MonoSingleton<XunJianInitialize>
             listItem.Add(item.GetComponent<XJTaskItem>());
         }
 
-        if (listItem.Count > 0)
+        if (listItem!=null&&listItem.Count > 0)
         {
-            checkTaskItem = listItem[0];
-            xjDetails.InitData(listItem[0].itemData);
-
+            SetCheckIte(listItem[0]);
         }
           
 
@@ -92,18 +106,18 @@ public class XunJianInitialize :MonoSingleton<XunJianInitialize>
             {
                 int num = i - 1;
 
-                if(num>=0)
+               
+
+                if (num>=0)
                 {
-                    checkTaskItem = listItem[num];
-                    xjDetails.InitData(listItem[num].itemData);
+                    SetCheckIte(listItem[num]);
                 }
                 else
                 {
-                    checkTaskItem = listItem[i];
-                    xjDetails.InitData(listItem[i].itemData);
+                    SetCheckIte(listItem[i]);
                 }
 
-
+               
                 break;
             }
         }
@@ -117,22 +131,65 @@ public class XunJianInitialize :MonoSingleton<XunJianInitialize>
             {
                 int num = i + 1;
 
+              
+
                 if (num < listItem.Count)
                 {
-                    checkTaskItem = listItem[num];
-                    xjDetails.InitData(listItem[num].itemData);
+                    SetCheckIte(listItem[num]);
                 }
                 else
                 {
-                    checkTaskItem = listItem[i];
-                    xjDetails.InitData(listItem[i].itemData);
+                    SetCheckIte(listItem[i]);
                 }
 
-
+               
                 break;
             }
         }
     }
+
+    public int GetCheckItemNum()
+    {
+        if (checkTaskItem == null)
+            return -1;
+
+        for (int i = 0; i < listItem.Count; i++)
+        {
+            if (checkTaskItem.itemData.inspItemId == listItem[i].itemData.inspItemId)
+            {
+                return i+1;
+               
+            }
+        }
+
+        return -2;
+    }
+    public void SetCheckIte(XJTaskItem item)
+    {
+        if (checkTaskItem != null)
+        {
+            checkTaskItem.numText.color = Color.white;
+
+            if(checkTaskItem.itemData.recd==null)
+            {
+                checkTaskItem.imageBG.SetActive(false);
+            }
+        }
+        checkTaskItem = item;
+        xjDetails.InitData(item.itemData);
+        checkTaskItem.numText.color = Color.yellow;
+        checkTaskItem.imageBG.SetActive(true);
+    }
+
+    public void SetScaleFunction()
+    {
+        contentUI.SetActive(isScale);
+        xjDetails.gameObject.SetActive(isScale);
+        retractBtn.SetActive(isScale);
+        isScale = !isScale;
+
+        expandBtn.SetActive(isScale);
+    }
     public void back()
     {
         ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: XR
-  productName: "\u667A\u80FD\u5DE1\u68C0Demo"
+  productName: "\u8FDC\u7A0B\u534F\u4F5C"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -146,7 +146,9 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 1.0.0
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: -3507145773158424512, guid: 3df6047a2585e9a4b87f07c19a70fec7, type: 2}
+  - {fileID: -6724271008176559649, guid: aba1d4d6205d4914784889e2d8ed78c4, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -166,7 +168,7 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.XR.XJDemo
+    Android: com.XR.LangChao
   buildNumber:
     Standalone: 0
     iPhone: 0