Merge branch 'F/20231026_RTCChange' of https://gogs.ghz-tech.com:8843/GHzGlass/GHZLangChao into F/20231026_RTCChange

Assets/Game/Blue/Controller/LangChaoRommMinIo.cs

@@ -24,6 +24,7 @@ public class LangChaoRommMinIo : MonoSingleton<LangChaoRommMinIo>
     string minioToken;
 
     string projectId;
+    string region;
     Thread thread;
     private void Start()
     {
@@ -134,33 +135,47 @@ public class LangChaoRommMinIo : MonoSingleton<LangChaoRommMinIo>
                 host = d["data"]["host"].ToString();
                 bucket = d["data"]["bucket"].ToString();
                 path = d["data"]["path"].ToString();
+              
                 Debug.Log(str);
                 bool isHttps = host.Contains("https");
                 var endpoint = host.Split("//")[1];
                 var accessKey = tmpSecretId;//"tr6Nh5D8bnlGaLJE6vb5";
                 var secretKey = tmpSecretKey;// "aVOYdXLnX4MCiKbit8aomZNWvAx8YSpzhiwzFhrI";
                 Debug.Log("endpoint===>" + endpoint + "    isHttps==>" + isHttps);
-                minio = new MinioClient()
+
+                if(d["data"]["region"]!=null&& !string.IsNullOrEmpty(d["data"]["region"].ToString())&& d["data"]["region"].ToString()!="null")
+                {
+                    region = d["data"]["region"].ToString();
+                    minio = new MinioClient()
                                     .WithEndpoint(endpoint)
                                     .WithCredentials(accessKey, secretKey)
                                     .WithSessionToken(minioToken)
                                     .WithSSL(isHttps)
+                                    .WithRegion(region)
                                     .Build();
-               
-                var minioTest = new MinioClient()
+
+                    
+
+                }
+                else
+                {
+                    minio = new MinioClient()
                                     .WithEndpoint(endpoint)
                                     .WithCredentials(accessKey, secretKey)
                                     .WithSessionToken(minioToken)
                                     .WithSSL(isHttps)
                                     .Build();
 
+                }
+                
+
                 
 
                 TimerMgr.Instance.CreateTimer(() =>
                 {
 
-                   // minio = null;
-                }, 1200);
+                    minio = null;
+                }, 3000);
                 callBack?.Invoke(true);
             }
             catch

Assets/Game/ShowLogin/LangChaoLogin.cs

@@ -35,11 +35,13 @@ namespace GHZLangChao
 
             emptyAcc.onClick.AddListener(() => { mAccount_Input.text = string.Empty; });
             emptypas.onClick.AddListener(() => { mPassword_Input.text = string.Empty; });
-            mAccountStr = "13910723157";
-            mPasswordStr = "1";
+            //mAccountStr = "13910723157";
+            //mPasswordStr = "1";
+            mAccountStr = "lisongnan";
+            mPasswordStr = "13579Wp!#%&(";
 #if UNITY_EDITOR
             // OnClickLogin();
-            mAccountStr = "18767144539";
+            // mAccountStr = "18767144539";
 #endif
             mAccount_Input.text = mAccountStr;
             mPassword_Input.text = mPasswordStr;
@@ -82,34 +84,27 @@ namespace GHZLangChao
                 password = mPasswordStr
             };
             string jsonLogin = JsonMapper.ToJson(sendLogin);
-            HttpTool.Instance.PostLogin(HttpActionLang.login, jsonLogin, LoginCallBack);
+          //  HttpTool.Instance.PostLogin(HttpActionLang.login, jsonLogin, LoginCallBack);
+
+            LangChaoJiekou.Instance.GotToLogin(mAccountStr, mPasswordStr, LoginCallBack);
         }
 
         /// <summary>
         /// 登录返回数据
         /// </summary>
-        public void LoginCallBack(string mes)
+        public void LoginCallBack(bool b)
         {
-            JObject obj = JObject.Parse(mes);
-            if (obj["code"].ToString() != "200")
+           
+            if (!b)
                 StartCoroutine(PopUp());
             else
             {
-                if (!string.IsNullOrWhiteSpace(obj["data"].ToString()) && !string.IsNullOrWhiteSpace(obj["data"]["token"].ToString()))
-                {
-                    login.UserInfo.Instance.Token = obj["data"]["token"].ToString();
-                    ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
-
-                    MQTTManager.Instance.SetAccoutInfo(mAccountStr);
-                   
-                    GameStart.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpActionLang.userinfo, "", UserInfoCallBack));
-
-                    JsonData data = new JsonData();
-                    data["id"] = 1;
-                    HttpTool.Instance.Post(HttpActionLang.sceneInit, data.ToJson(), MachineRoomManager.Instance.SceneInitCallBack);
-                }
-                else
-                    StartCoroutine(PopUp());
+                ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowChoose);
+                MQTTManager.Instance.SetAccoutInfo(mAccountStr);
+                GameStart.Instance.StartCoroutine(HttpTool.Instance.SendHttp(HttpActionLang.userinfo, "", UserInfoCallBack));
+                JsonData data = new JsonData();
+                data["id"] = 1;
+                HttpTool.Instance.Post(HttpActionLang.sceneInit, data.ToJson(), MachineRoomManager.Instance.SceneInitCallBack);
             }
         }
 
@@ -129,12 +124,13 @@ namespace GHZLangChao
             {
                 MQTTManager.Instance._username = obj["data"]["name"].ToString();
                 MQTTManager.Instance.roleId = obj["data"]["roleId"].ToString();
-                MQTTManager.Instance.email = obj["data"]["email"].ToString();
+              //  MQTTManager.Instance.email = obj["data"]["email"].ToString();
                 MQTTManager.Instance.phone = obj["data"]["phone"].ToString();
                 MQTTManager.Instance.resourcePool = obj["data"]["resourcePool"].ToString();
-                MQTTManager.Instance.resourcePoolId = int.Parse(obj["data"]["resourcePoolId"].ToString());
-                MQTTManager.Instance.expertType = obj["data"]["expertType"].ToString();
-                MQTTManager.Instance.room = obj["data"]["room"].ToString();         
+                //  MQTTManager.Instance.resourcePoolId = int.Parse(obj["data"]["resourcePoolId"].ToString());
+                //   MQTTManager.Instance.expertType = obj["data"]["expertType"].ToString();
+                //  MQTTManager.Instance.room = obj["data"]["room"].ToString();         
+                MQTTManager.Instance.id = obj["data"]["id"].ToString();
                 MQTTManager.Instance.Signal();
                 
             }

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;
@@ -69,7 +73,7 @@ public class XJTaskItem : MonoBehaviour
             itemData.recd.inspItemName = itemData.inspItemName;
             itemData.recd.recordMemo = null;
             itemData.recd.recordStatus = null;
-            itemData.recd.recordImg = null;
+           // itemData.recd.recordImg = null;
             itemData.recd.recordImgList = null;
         }
 
@@ -79,7 +83,7 @@ public class XJTaskItem : MonoBehaviour
 
             Debug.Log("DGJ ===> Record   ");
 
-            itemData.recd.recordImg = url;
+          //  itemData.recd.recordImg = url;
             itemData.recd.recordStatus = state;
             itemData.recd.recordMemo = memo;
             itemData.recd.recordImgList = imageUrl;
@@ -91,6 +95,8 @@ public class XJTaskItem : MonoBehaviour
                 }
             });
 
+            // 如果这周
+
         }
 
     }

Assets/Game/ShowXunJian/XunJianDetails.cs

@@ -28,13 +28,13 @@ public class XunJianDetails : MonoBehaviour
 
     public XunJianException exception;
 
-    
+
 
     public Button lastBtn;
     public Button nextBtn;
     public Button completeBtn;
 
-  
+
     public XunJianPhotos UI2;
 
     private Image showImage;
@@ -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-异常 
@@ -59,7 +59,7 @@ public class XunJianDetails : MonoBehaviour
         {
             listImages[i].GetComponent<Button>().onClick.AddListener(() =>
             {
-               
+
                 if (!UI2.gameObject.activeSelf)
                     UI2.gameObject.SetActive(true);
 
@@ -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>());
         });
 
@@ -102,7 +102,7 @@ public class XunJianDetails : MonoBehaviour
             // 提交
             SubmitData();
             XunJianInitialize.Instance.LastItem();
-          
+
         });
 
         nextBtn.onClick.AddListener(() =>
@@ -111,7 +111,7 @@ public class XunJianDetails : MonoBehaviour
             SubmitData();
 
             XunJianInitialize.Instance.NextItem();
-            
+
 
         });
 
@@ -126,14 +126,14 @@ public class XunJianDetails : MonoBehaviour
     }
     public void InitData(RoomItem data)
     {
-       // SubmitData();
+        // SubmitData();
 
-       // 提交
+        // 提交
 
 
         this.data = data;
         this.oldData = data;
-       
+
         listImageUrl = null;
         // 根据数据进行初始化
         InitUI();
@@ -149,7 +149,7 @@ public class XunJianDetails : MonoBehaviour
                 for (int i = 0; i < data.recd.recordImgList.Count; i++)
                 {
 
-                    if (!string.IsNullOrEmpty(data.recd.recordImgList[i]))
+                    if (!string.IsNullOrEmpty(data.recd.recordImgList[i]) && data.recd.recordImgList[i] != "null")
                     {
                         Debug.Log(" DGJ ===> recordImgList " + data.recd.recordImgList[i]);
                         JsonData data2 = new JsonData();
@@ -163,7 +163,7 @@ public class XunJianDetails : MonoBehaviour
 
                             if (texture != null)
                             {
-                               
+
                                 for (int i = 0; i < data.recd.recordImgList.Count; i++)
                                 {
                                     Debug.Log("DGJ ===> DownLoadImage2  " + url + "    " + data.recd.recordImgList[i]);
@@ -200,7 +200,7 @@ public class XunJianDetails : MonoBehaviour
                     break;
             }
             // 同步异常
-            exception.gameObject.SetActive(data.recd.recordStatus=="0");
+            exception.gameObject.SetActive(data.recd.recordStatus == "0");
 
             //if (data.recd.recordImg != null)
             //    listImageUrl = JsonConvert.DeserializeObject<List<string>>(data.recd.recordImg);
@@ -209,17 +209,17 @@ public class XunJianDetails : MonoBehaviour
             for (int i = 0; i < data.recd.recordImgList.Count; i++)
             {
                 listImageUrl.Add(data.recd.recordImgList[i]);
-            }          
+            }
             recordStatus = data.recd.recordStatus;
             recordMemo = data.recd.recordMemo;
             exception.scInput.text = data.recd.recordMemo;
         }
         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;
@@ -251,25 +251,11 @@ public class XunJianDetails : MonoBehaviour
         }
 
         // 如果是最后一步  下一步按钮 替换未完成按钮 
-        if(data == XunJianAllData.listRoomItem[XunJianAllData.listRoomItem.Count-1])
+        if (data == XunJianAllData.listRoomItem[XunJianAllData.listRoomItem.Count - 1])
         {
             nextBtn.gameObject.SetActive(false);
             completeBtn.gameObject.SetActive(true);
         }
-    }
-
-
-    /// <summary>
-    ///  重新提交
-    /// </summary>
-    private void ResubmitData()
-    {
-        // 检测数据状态是否有变化，有变化就提交
-
-    
-
-
-
     }
     /// <summary>
     ///  提交数据
@@ -287,7 +273,7 @@ public class XunJianDetails : MonoBehaviour
         }
     }
 
-    public void SetPhotosShowImage( Image image)
+    public void SetPhotosShowImage(Image image)
     {
         this.showImage = image;
     }
@@ -305,13 +291,14 @@ public class XunJianDetails : MonoBehaviour
         string fileName = SaveLocal(texture2D);
         // 将截图应用到Image组件上
         showImage.sprite = Sprite.Create(texture2D, new Rect(0, 0, texture2D.width, texture2D.height), new Vector2(0.5f, 0.5f));
-        StartCoroutine(LangChaoJiekou.Instance.UploadFile(fileName, "http://36.133.197.238:10002" + file_upload, (string msg) => {
+        StartCoroutine(LangChaoJiekou.Instance.UploadFile(fileName, "http://36.133.197.238:10002" + file_upload, (string msg) =>
+        {
 
 
             Debug.Log("UploadFile===>" + msg);
             JsonData data = JsonMapper.ToObject(msg);
 
-            if (listImageUrl == null)
+            if (listImageUrl == null || listImageUrl.Count != listImages.Count)
             {
                 listImageUrl = new List<string>();
                 for (int i = 0; i < listImages.Count; i++)
@@ -325,7 +312,7 @@ public class XunJianDetails : MonoBehaviour
 
             if (data["code"].ToString() == "200")
             {
-               
+
             }
         }));
     }
@@ -339,14 +326,14 @@ public class XunJianDetails : MonoBehaviour
     /// <param name="id">某个步骤的第几张图片</param>
     private string SaveLocal(Texture2D texture2D)
     {
-       
+
         byte[] bytes = texture2D.EncodeToPNG();
         if (!Directory.Exists(Application.persistentDataPath + "/Image"))
             Directory.CreateDirectory(Application.persistentDataPath + "/Image");
-        string filename = Application.persistentDataPath + "/Image" + "/" +data.inspItemName+ showImage.name + ".png";
+        string filename = Application.persistentDataPath + "/Image" + "/" + data.inspItemName + showImage.name + ".png";
         if (File.Exists(filename))
             File.Delete(filename);
-       // Debug.LogError(filename);
+        // Debug.LogError(filename);
         File.WriteAllBytes(filename, bytes);
 
         return filename;

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

@@ -1,14 +1,20 @@
+using LitJson;
 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,20 +23,34 @@ 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()
     {
         defaultUI.SetActive(false);
         endUI.SetActive(false);
         homeEndUI.SetActive(false);
+
+        // Éϱ¨Ñ²¼ì¿ªÊ¼
+
+        JsonData data = new JsonData();
+        data["id"] = XunJianAllData.taskItem.distributeId;
+        StartCoroutine(LangChaoJiekou.Instance.SendHttp(LangChaoJiekou.execute, data.ToJson(), (msg) =>
+        {
+
+            Debug.Log("DGJ ==> /record/execute " + msg);
+            
+        }, "application/json",false));
     }
     private void Update()
     {
@@ -40,7 +60,15 @@ public class XunJianInitialize :MonoSingleton<XunJianInitialize>
 
             InitializeData();
         }
+#if UNITY_EDITOR
+        //if (Test) return;
+        return;
+#endif
+        OnReset?.Invoke();
+
     }
+
+
     public void InitializeData( )
     {
        
@@ -52,11 +80,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 +118,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 +143,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);

Assets/HttpActionLang.cs

@@ -23,6 +23,8 @@ public class HttpActionLang : Singleton<HttpActionLang>
 
     public const string storage_inspectionCredential = "/cmcc-endustry/v1/storage/inspectionCredential"; // 
     public const string storage_roomCredential = "/cmcc-endustry/v1/storage/roomCredential"; // 
+
+   // public const string storage_roomCredential = "";
     
     /// <summary>
     /// 获取刀片机详细信息

Assets/LangChaoJiekou.cs

@@ -34,7 +34,9 @@ public class LangChaoJiekou : MonoSingleton<LangChaoJiekou>
     public const string anon_login = "/inms/api/auth-external-microservice/v1/public/anon/login";
     public const string file_upload = "/inms/metaverse-cooperate/file/upload";
     public const string file_download = "/inms/metaverse-cooperate/file/download";
-    
+
+    public const string execute = "/inms/metaverse-cooperate/record/execute";
+
     public string token = "";
 
 
@@ -56,6 +58,7 @@ public class LangChaoJiekou : MonoSingleton<LangChaoJiekou>
             {
                 JsonData d = JsonMapper.ToObject(msg);
                 token = d["data"]["token"]["accessToken"].ToString();
+                login.UserInfo.Instance.Token = token;
                 callback.Invoke(true);
             }
             catch
@@ -248,16 +251,16 @@ public class LangChaoJiekou : MonoSingleton<LangChaoJiekou>
         public string recordTargetId;
         public string inspItemId;
         public string inspItemName;
-        public string recordImg; // 图片
+      //  public string recordImg; // 图片
         public string recordMemo; // 巡检备注
         public string recordStatus;// 1-正常 0-异常
-        public List<string> recordImgList;
+        public List<string> recordImgList;// 图片
     }
 
     public void Start()
     {
 
-       GotToLogin("lisongnan", "13579Wp!#%&(", (bool b) => {
+      /* GotToLogin("lisongnan", "13579Wp!#%&(", (bool b) => {
 
             if (b)
             {
@@ -265,7 +268,7 @@ public class LangChaoJiekou : MonoSingleton<LangChaoJiekou>
             }
 
         });
-
+      */
         //测试接口
         /*  GotToLogin("lisongnan", "13579Wp!#%&(",(bool b)=> {
 
@@ -446,6 +449,7 @@ public class LangChaoJiekou : MonoSingleton<LangChaoJiekou>
             {
                 url += item + "=" + data[item].ToString() + "&";
             }
+            Debug.Log("URL:" + url + " isPost  " + isPost);
 
             webRequest = UnityWebRequest.Get(url);
 
@@ -496,6 +500,8 @@ public class LangChaoJiekou : MonoSingleton<LangChaoJiekou>
         }
 
     }
+
+  
 }
 
 /*

Assets/Scripts/Data/DataItem.cs

@@ -136,7 +136,7 @@ public class DataItem : MonoBehaviour
         //}
 
        float dis = Vector3.Distance(new Vector3(transform.position.x, 0, transform.position.z), new Vector3(OpenXRCamera.Instance.head.transform.position.x, 0, OpenXRCamera.Instance.head.transform.position.z));
-        Debug.Log(dis + " Dis   DGJ   ===>  " + BladeServerManager.Instance.fadeDis);
+      //  Debug.Log(dis + " Dis   DGJ   ===>  " + BladeServerManager.Instance.fadeDis);
         if (dis > BladeServerManager.Instance.fadeDis)
             Hide();
 

Assets/Scripts/MQTT/MQTTClient.cs

@@ -61,9 +61,9 @@ public class MQTTClient : MonoSingleton<MQTTClient>
     {
         // Subscribe(MQTTManager.Instance.front + "online/" + MQTTManager.Instance.phone);
 
-      // Subscribe(MQTTManager.Instance.front + "personnel/" + MQTTManager.Instance.resourcePool);
-        Subscribe(MQTTManager.Instance.front + "personnel/" + MQTTManager.Instance.resourcePoolId);
-        Subscribe(MQTTManager.Instance.front + "online/" + MQTTManager.Instance.phone);
+       Subscribe(MQTTManager.Instance.front + "personnel/" + MQTTManager.Instance.resourcePool);
+       // Subscribe(MQTTManager.Instance.front + "personnel/" + MQTTManager.Instance.resourcePoolId);
+        Subscribe(MQTTManager.Instance.front + "online/" + MQTTManager.Instance.id);
     }
 
 
@@ -118,7 +118,7 @@ public class MQTTClient : MonoSingleton<MQTTClient>
       //  Debug.Log("DGJ ==>MQTT " + id + account + "  " + username + "   " + certification + "  " + HttpActionLang.Instance.mqttSocket);
 
         DisConnect();
-        qt = new QTTManager(MQTTManager.Instance.id, MQTTManager.Instance.username , MQTTManager.certification, HttpActionLang.Instance.mqttSocket, "1883");
+        qt = new QTTManager(MQTTManager.Instance.clientId, MQTTManager.Instance.username , MQTTManager.certification, HttpActionLang.Instance.mqttSocket, "1883");
         qt.Connect();
         StartCoroutine(Reconnection());
         qt.ConnectionFailed += onFaild;
@@ -289,7 +289,7 @@ public class MQTTClient : MonoSingleton<MQTTClient>
     {
         if (qt != null && qt.IsConnect())
         {
-            Debug.Log(MQTTManager.Instance.id + MQTTManager.Instance.account + "  DGJ  publish =====>  " + channelID + "   " + bs.Length);
+            Debug.Log(MQTTManager.Instance.clientId + MQTTManager.Instance.account + "  DGJ  publish =====>  " + channelID + "   " + bs.Length);
             qt.Publish(channelID, bs, MqttMsgBase.QOS_LEVEL_EXACTLY_ONCE, false);
         }
         else

Assets/Scripts/MQTT/MQTTManager.cs

@@ -16,6 +16,7 @@ public class MQTTManager : MonoSingleton<MQTTManager>,IController
     public string username = "u@unity3";// 需要根据服务器设置
     public string password = null;// 需要根据服务器设置
     public string rid = "mqttx_b4c02ddc"; //其他人的ID
+    public string clientId = "";
     public string account;
     public string roomId;
     public string email;
@@ -55,7 +56,7 @@ public class MQTTManager : MonoSingleton<MQTTManager>,IController
             HttpActionLang.Instance.mqttSocket = obj["data"]["host"].ToString();
             MQTTManager.certification = obj["data"]["certification"].ToString();
             MQTTManager.Instance.front = obj["data"]["topicPrefix"].ToString();
-            MQTTManager.Instance.id = obj["data"]["clientId"].ToString();
+            MQTTManager.Instance.clientId = obj["data"]["clientId"].ToString();
             MQTTManager.Instance.username = obj["data"]["username"].ToString();
             MQTTClient.Instance.Connect();
 

Assets/Scripts/RTC/OnWebSocketMsg.cs

@@ -27,6 +27,7 @@ public class OnWebSocketMsg : MonoSingleton<OnWebSocketMsg>
             case SignalResponse.MessageOneofCase.None:
                 break;
             case SignalResponse.MessageOneofCase.Join:
+              
                 break;
             case SignalResponse.MessageOneofCase.Answer:
                 break;
@@ -35,32 +36,32 @@ public class OnWebSocketMsg : MonoSingleton<OnWebSocketMsg>
             case SignalResponse.MessageOneofCase.Trickle:
                 break;
             case SignalResponse.MessageOneofCase.Update:
-                if(response.Update.Participants!=null)
+                if (response.Update.Participants != null)
                 {
 
                     string msg = response.Update.Participants.ToString();
                     msg = msg.Remove(0, 1);
                     msg = msg.Remove(msg.Length - 1, 1);
-                    Debug.Log("DGJ ==> "+ msg);
-                  
+                  //  Debug.Log("DGJ ==> " + msg);
+
                     JObject obj = JObject.Parse(msg);
 
-                   
+
                     string metadata = obj["metadata"].ToString();
-                    Debug.Log("DGJ == > metadata " + metadata);
+                  //  Debug.Log("DGJ == > metadata " + metadata);
                     metadata = metadata.Replace('\"', '"');
-                    Debug.Log("DGJ == > metadata "+ metadata);
+                    Debug.Log("DGJ == > metadata " + metadata);
 
                     JObject obj2 = JObject.Parse(metadata);
                     Debug.Log("DGJ  ===> roleId  " + obj2["roleId"].ToString());
 
                     string state = obj["state"].ToString();
 
-                    if(state == "DISCONNECTED")
+                    if (state == "DISCONNECTED")
                     {
                         if (obj2["roleId"].ToString() == "2")
                         {
-                            
+
                             RTCRoomManager.Instance.UserOffline(UserEnum.Expert);
 
                         }
@@ -70,9 +71,9 @@ public class OnWebSocketMsg : MonoSingleton<OnWebSocketMsg>
                             RTCRoomManager.Instance.UserOffline(UserEnum.Conterl);
                         }
 
-                       
+                        
                     }
-                    else if(state == "ACTIVE")
+                    else if (state == "ACTIVE")
                     {
                         if (obj2["roleId"].ToString() == "2")
                         {
@@ -86,7 +87,7 @@ public class OnWebSocketMsg : MonoSingleton<OnWebSocketMsg>
                             RTCRoomManager.Instance.ExpertJonin(uid);
                             RTCRoomManager.Instance.UserJoined(UserEnum.Expert, obj2);
 
-                        }
+                        }// 
 
                         if (obj2["roleId"].ToString() == "1")
                         {
@@ -96,11 +97,11 @@ public class OnWebSocketMsg : MonoSingleton<OnWebSocketMsg>
                         if (obj2["roleId"].ToString() == "3")
                         {
                             RTCRoomManager.Instance.UserJoined(UserEnum.Player);
-                          //  RTCRoomManager.Instance.OnLocalUserJoined();
+                            //  RTCRoomManager.Instance.OnLocalUserJoined();
                         }
                     }
-
-                   
+                
+                    
                 }
 
                 break;

Assets/ShowZhidao.prefab

@@ -2649,19 +2649,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 4652231361715167003}
   m_OnClick:
     m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 8708968953541172943}
-        m_TargetAssemblyTypeName: YunWeiZhiDao, Assembly-CSharp
-        m_MethodName: ResetDongHua
-        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
+      m_Calls: []
 --- !u!1 &2998373983078532437
 GameObject:
   m_ObjectHideFlags: 0

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