SXElectricalInspection/Assets/Adam/Scripts/BiaoJiController.cs

@@ -63,15 +63,15 @@ namespace QianHuo
         // Use this for initialization
         private void Start()
         {
-            //userState = GlobalFlag.biaojiData.userState;
+            userState = GlobalFlag.biaojiData.userState;
-            //warnningType = GlobalFlag.biaojiData.warningType;
+            warnningType = GlobalFlag.biaojiData.warningType;
-            //onSite = GlobalFlag.biaojiData.onSite;
+            onSite = GlobalFlag.biaojiData.onSite;
 
 
-            //if (userState == "正常") return;
+            if (userState == "正常") return;
             if (guimenFengYing.GetComponent<DoolsPlayer>())
                 guimenFengYing.GetComponent<DoolsPlayer>()._collider.enabled = true;
-            //guimenFengYing.SetActive(false);
+            guimenFengYing.SetActive(false);
             GameManager.Instance.YanDian = true;
             if (isGuanFu)
             {
@@ -146,7 +146,7 @@ namespace QianHuo
         /// </summary>
         public void SwitchDianLiuErrorObjs()
         {
-            string onSiteState = GlobalFlag.biaojiData.warningType;
+            string onSiteState = GlobalFlag.biaojiData.onSite;
             for (int i = 0; i < errorObjs.Length; i++)
             {
                 int index = i;
@@ -164,7 +164,7 @@ namespace QianHuo
         /// </summary>
         public void SwitchDianLiuCorrectObjs()
         {
-            string onSiteState = GlobalFlag.biaojiData.warningType;
+            string onSiteState = GlobalFlag.biaojiData.onSite;
             for (int i = 0; i < correctObjs.Length; i++)
             {
                 int index = i;
@@ -179,8 +179,8 @@ namespace QianHuo
 
         public void SwitchABC()
         {
-            //if (!string.IsNullOrEmpty(GlobalFlag.biaojiData.selectInfo))
+            if (!string.IsNullOrEmpty(GlobalFlag.biaojiData.selectInfo))
-            //    abc = ToolUtility.GetInfos(GlobalFlag.biaojiData.selectInfo, '_');
+                abc = ToolUtility.GetInfos(GlobalFlag.biaojiData.selectInfo, '_');
 
             for (int i = 0; i < currentErrorObj.objChildren.Length; i++)
             {
@@ -227,7 +227,7 @@ namespace QianHuo
 
         public void SwitchDianYaErrorObjs()
         {
-            string onSiteState = GlobalFlag.biaojiData.warningType;
+            string onSiteState = GlobalFlag.biaojiData.onSite;
             for (int i = 0; i < dianYaCorrectObjs.Length; i++)
             {
                 dianYaCorrectObjs[i].objParent.SetActive(false);
@@ -241,7 +241,7 @@ namespace QianHuo
 
         public void SwitchDianYaCorrectObjs()
         {
-            string onSiteState = GlobalFlag.biaojiData.warningType;
+            string onSiteState = GlobalFlag.biaojiData.onSite;
             for (int i = 0; i < dianYaErrorObjs.Length; i++)
             {
                 dianYaErrorObjs[i].objParent.SetActive(false);

SXElectricalInspection/Assets/Adam/Scripts/Data/BiaoJIData.cs

@@ -15,19 +15,19 @@ namespace BjData
     [Serializable]
     public class BiaoJIData
     {
+        public string userState;
         /// <summary>
         /// 错误状态
         /// </summary>
         public string warningType;
-        public string oneWayAA;
+        /// <summary>
-        public string oneWayAV;
+        /// 状态
+        /// </summary>
+        public string onSite;
+        /// <summary>
+        /// 选择信息
+        /// </summary>
+        public string selectInfo;
 
-        public string AA;
-        public string BA;
-        public string CA;
-        public string AV;
-        public string BV;
-        public string CV;
-        public string N;
     }
 }

SXElectricalInspection/Assets/Adam/Scripts/Data/MessageData.cs

@@ -77,33 +77,4 @@ public class MessageData
     /// µçѹ
     /// </summary>
     public string voltage;
-    /// <summary>
-    /// ÁãÐòµçÁ÷
-    /// </summary>
-    public string zerosequencecurrent;
-    /// <summary>
-    /// AA
-    /// </summary>
-    public string aphasecurrent;
-    /// <summary>
-    /// BA
-    /// </summary>
-    public string bphasecurrent;
-    /// <summary>
-    /// CA
-    /// </summary>
-    public string cphasecurrent;
-    /// <summary>
-    /// AV
-    /// </summary>
-    public string aphasevoltage;
-    /// <summary>
-    /// BV
-    /// </summary>
-    public string bphasevoltage;
-    /// <summary>
-    /// CV
-    /// </summary>
-    public string cphasevoltage;
-
 }

SXElectricalInspection/Assets/Adam/Scripts/ExamusersController.cs

@@ -23,9 +23,8 @@ namespace Adam
 
         private void Start()
         {
-            //string json = FileUtil.ReadFromLocal("Local/通用数据接口.json");
+            string json = FileUtil.ReadFromLocal("Local/通用数据接口.json");
-            //root = JsonConvert.DeserializeObject<Root>(json);
+            root = JsonConvert.DeserializeObject<Root>(json);
-            Init();
         }
 
 
@@ -50,7 +49,7 @@ namespace Adam
             //string _url = url + userNub;
             //root = await AsyncWebReq.Get<Root>(_url);
 
-            //currentEC = GetDateItemByUserID(null);
+            currentEC = GetDateItemByUserID(null);
 
             GlobalFlag.biaojiData = BiaoJiData();
             GlobalFlag.Beilv = currentEC.Beilv;
@@ -199,16 +198,10 @@ namespace Adam
         public BiaoJIData BiaoJiData()
         {
             BiaoJIData temp = new BiaoJIData();
-            temp.warningType = UIManager.Instance.messageData.stubtype;
+            temp.userState = currentEC.UserState;
-            temp.oneWayAA = UIManager.Instance.messageData.electriccurrent;
+            temp.warningType = currentEC.WarningType;
-            temp.oneWayAV = UIManager.Instance.messageData.voltage;
+            temp.onSite = currentEC.OnSite;
-            temp.N = UIManager.Instance.messageData.zerosequencecurrent;
+            temp.selectInfo = currentEC.SelectCatch;
-            temp.AA = UIManager.Instance.messageData.aphasecurrent;
-            temp.BA = UIManager.Instance.messageData.bphasecurrent;
-            temp.CA = UIManager.Instance.messageData.cphasecurrent;
-            temp.AV = UIManager.Instance.messageData.aphasevoltage;
-            temp.BV = UIManager.Instance.messageData.bphasevoltage;
-            temp.CV = UIManager.Instance.messageData.cphasevoltage;
             return temp;
         }
 

SXElectricalInspection/Assets/Adam/Scripts/Views/ThreeTransformerPhotovoltaicView.cs

@@ -18,41 +18,41 @@ namespace Views
     {
         public SpriteRenderer spriteRenderer;
         public TextMesh textMesh;
+        public string isFD;
         public Sprite[] sprites;
         public List<string> infos = new List<string>();
         /// <summary>
         /// 表计信息
         /// </summary>
-        public List<EnergylistItem> energylist = new List<EnergylistItem>();
+        public List<ttpData.JfpgItem> ttpData = new List<ttpData.JfpgItem>();
         /// <summary>
         /// 是否正常
         /// </summary>
         public TrainState trainData;
-        private void Start()
+
+        // Use this for initialization
+        private void OnEnable ()
         {
-            energylist = UIManager.Instance.messageData.energylist;
+            //ttpData = ExamusersController.Instance.GetTTPDs();
-            for (int i = 0; i < energylist.Count; i++)
+            for (int i = 0; i < ttpData.Count; i++)
             {
                 int index = i;
-                for (int j = 0; j < energylist[index].worklist.Count; j++)
+                if (isFD.Equals(ttpData[index].type))
                 {
-                    int indexJ = j;
+                    infos = ttpData[index].rdj;
-                    infos.Add(energylist[index].worklist[indexJ].valuework);
+                    infos.Add(ttpData[index].AA1.ToString());
+                    infos.Add(ttpData[index].AV1.ToString());
+                    //if (GlobalFlag.sceneData.info0 == "单相")
+                    //{
+                    //    textMesh.text = infos[0];
+                    //    return;
+                    //}
+                    infos.Add(ttpData[index].BA1.ToString());
+                    infos.Add(ttpData[index].BV1.ToString());
+                    infos.Add(ttpData[index].CA1.ToString());
+                    infos.Add(ttpData[index].CV1.ToString());
                 }
             }
-            if (UIManager.Instance.messageData.scenename == "swdygpb")
-            {
-                infos.Add(UIManager.Instance.messageData.electriccurrent);
-                infos.Add(UIManager.Instance.messageData.voltage);
-                textMesh.text = infos[0];
-                return;
-            }
-            infos.Add(UIManager.Instance.messageData.aphasecurrent);
-            infos.Add(UIManager.Instance.messageData.bphasecurrent);
-            infos.Add(UIManager.Instance.messageData.cphasecurrent);
-            infos.Add(UIManager.Instance.messageData.aphasevoltage);
-            infos.Add(UIManager.Instance.messageData.bphasevoltage);
-            infos.Add(UIManager.Instance.messageData.cphasevoltage);
             textMesh.text = infos[0];
         }
 

SXElectricalInspection/Assets/GameAssets/Models/电箱(new)/Prefeb/三相_无互感器_无光伏.prefab

@@ -6571,7 +6571,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 919132149155446097, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1437794174185993398, guid: 13e6757fcb98e1e4bbc94e07f67e0dbb, type: 3}
       propertyPath: m_Layer

SXElectricalInspection/Assets/GuYuan/AmmeterManager/Multimeter.cs

@@ -15,9 +15,10 @@ public class Multimeter : MonoBehaviour
     public string VV;
     public bool isok = false;
 
-    private  void Start()
+    private async void Start()
     {
-        activation =  ClampAmmetersManager.Instance.Init(name);
+        float tempFloat = await ClampAmmetersManager.Instance.Init(name);
+        activation = tempFloat.ToString();
     }
 
     private void OnMouseDown()

SXElectricalInspection/Assets/GuYuan/GameManager/GameManager.cs

@@ -120,21 +120,21 @@ public class GameManager : MonoBehaviour
     }
     public void init()
     {
-        //if (UIManager.Instance.Reconnection.HandGameObject)
+        if (UIManager.Instance.Reconnection.HandGameObject)
-        //{
+        {
-        //    ToolsShow(UIManager.Instance.Reconnection.HandGameObject);
+            ToolsShow(UIManager.Instance.Reconnection.HandGameObject);
-        //    UIManager.Instance.toolsItemManager.recoverBtn.gameObject.SetActive(true);
+            UIManager.Instance.toolsItemManager.recoverBtn.gameObject.SetActive(true);
-        //}
+        }
-        //Player.transform.GetComponent<FirstPersonController>().enabled = true;
+        Player.transform.GetComponent<FirstPersonController>().enabled = true;
-        //Player.transform.localPosition = UIManager.Instance.Reconnection.PlayerPos;
+        Player.transform.localPosition = UIManager.Instance.Reconnection.PlayerPos;
-        //Player.transform.localEulerAngles = UIManager.Instance.Reconnection.PlayerRot;
+        Player.transform.localEulerAngles = UIManager.Instance.Reconnection.PlayerRot;
-        //HuiFuim.gameObject.SetActive(true);
+        HuiFuim.gameObject.SetActive(true);
-        //HuiFuim.DOFade(0.8f, 0.25f);
+        HuiFuim.DOFade(0.8f, 0.25f);
-        //HuiFuim.DOFade(0, 0.25f).SetDelay(2).OnComplete(() =>
+        HuiFuim.DOFade(0, 0.25f).SetDelay(2).OnComplete(() =>
-        //{
+        {
-        //    HuiFuim.gameObject.SetActive(false);
+            HuiFuim.gameObject.SetActive(false);
-        //});
+        });
-        //UIManager.Instance.Reconnection.ison = false;
+        UIManager.Instance.Reconnection.ison = false;
     }
     public void show(string Str)
     {
@@ -149,7 +149,6 @@ public class GameManager : MonoBehaviour
     {
         if (transform)
         {
-            if (DoolsPlayer == null) return;
             switch (interactiveEnum)
             {
                 case Interactive.none:

SXElectricalInspection/Assets/GuYuan/Interactive/BoxPengZhuang.cs

@@ -16,14 +16,14 @@ public class BoxPengZhuang : MonoBehaviour
     // Start is called before the first frame update
     void Start()
     {
-        //WorkingPersonnel.instance.init();
+        WorkingPersonnel.instance.init();
-        //if (UIManager.Instance.ganTanHao)
+        if (UIManager.Instance.ganTanHao)
-        //{
+        {
-        //    if (UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId)&&UIManager.Instance.isBox)
+            if (UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId)&&UIManager.Instance.isBox)
-        //    {
+            {
-        //        gameObject.SetActive(false);
+                gameObject.SetActive(false);
-        //    }
+            }
-        //}
+        }
     }
 
     private async void OnTriggerEnter(Collider other)
@@ -36,11 +36,11 @@ public class BoxPengZhuang : MonoBehaviour
                 g1.init(dialogue);
                 gameObject.transform.parent.GetComponent<NPCWaypoints>().StartMove();
                 gameObject.SetActive(false);
-                //if (!UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId))
+                if (!UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId))
-                //{
+                {
-                //    gameObject.SetActive(false);
+                    gameObject.SetActive(false);
-                //    UIManager.Instance.isBox = true;
+                    UIManager.Instance.isBox = true;
-                //}
+                }
                 await FractionManager.Instance.overAsync(3, 2, "¹¤×÷Ö¤");
             }
         }

SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersInteractive.cs

@@ -13,21 +13,21 @@ public class ClampAmmetersInteractive : MonoBehaviour
     public List<float> floats;
     public string Fuan;
     public string unit;
-    private  void Start()
+    private async void Start()
     {
         if (!transform.GetComponent<MeshCollider>())
         {
             transform.AddComponent<MeshCollider>();
         }
 
-        Fuan =  ClampAmmetersManager.Instance.Init(name);
+        float tempFloat = await ClampAmmetersManager.Instance.Init(name);
+        Fuan = tempFloat.ToString();
     }
     [ContextMenu("ÔËÐÐ")]
     void init()
     {
         g1 = transform.GetChild(0).GetComponent<Transform>().gameObject;
         name = g1.name;
-        Fuan = ClampAmmetersManager.Instance.Init(name);
     }
     private void OnMouseDown()
     {

SXElectricalInspection/Assets/GuYuan/Interactive/ClampAmmetersManager.cs

@@ -1,4 +1,3 @@
-using BjData;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,22 +14,19 @@ public class ClampAmmetersManager : MonoSingleton<ClampAmmetersManager>
     public List<ThreeTransformerPhotovoltaicView> Three;
     [SerializeField] List<GameObject> gameObjects = new List<GameObject>();
     public DoolsPlayer DoolsPlayer;
-    public BiaoJIData biaoJiData = new BiaoJIData();
     private void Awake()
     {
-
+        run();
     }
     // Start is called before the first frame update
     void Start()
     {
         //init();
-        biaoJiData = GlobalFlag.biaojiData;
         StartCoroutine(QiDon());
     }
     IEnumerator QiDon()
     {
-        yield return new WaitForSeconds(1);
+        yield return new WaitForSeconds(3);
-        run();
     }
     /// <summary>
     /// 获取低下预设数据
@@ -42,135 +38,263 @@ public class ClampAmmetersManager : MonoSingleton<ClampAmmetersManager>
         Multimeter = GetComponentsInChildren<Multimeter>().ToList();
         Three = GetComponentsInChildren<ThreeTransformerPhotovoltaicView>().ToList();
     }
-    public string Init(string name)
+    public async Task<float> Init(string name)
+    {
+        await Task.Delay(2000);
+        float temp = 0;
+        if (Three[0].ttpData.Count >= 2)
         {
-        string temp = "";
-
             Debug.Log("akjshd走：222");
             switch (name)
             {
                 case "用电_AA1":
-                temp = biaoJiData.AA;
+                    temp = Three[0].ttpData[0].AA1;
                     break;
                 case "用电_AA2":
-                temp = biaoJiData.AA;
+                    temp = Three[0].ttpData[0].AA2;
                     break;
                 case "用电_AA3":
-                temp = biaoJiData.AA;
+                    temp = Three[0].ttpData[0].AA3;
                     break;
                 case "用电_BA1":
-                temp = biaoJiData.BA;
+                    temp = Three[0].ttpData[0].BA1;
                     break;
                 case "用电_BA2":
-                temp = biaoJiData.BA;
+                    temp = Three[0].ttpData[0].BA2;
                     break;
                 case "用电_BA3":
-                temp = biaoJiData.BA;
+                    temp = Three[0].ttpData[0].BA3;
                     break;
                 case "用电_CA1":
-                temp = biaoJiData.CA;
+                    temp = Three[0].ttpData[0].CA1;
                     break;
                 case "用电_CA2":
-                temp = biaoJiData.CA;
+                    temp = Three[0].ttpData[0].CA2;
                     break;
                 case "用电_CA3":
-                temp = biaoJiData.CA;
+                    temp = Three[0].ttpData[0].CA3;
                     break;
                 case "用电_1A":
                 case "用电_1B":
                 case "用电_1C":
-                temp = biaoJiData.AA;
+                    temp = show(name, Three[0].ttpData[0].AA1);
                     break;
 
                 case "用电_AV1":
-                temp = biaoJiData.AV;
+                    temp = Three[0].ttpData[0].AV1;
                     break;
                 case "用电_AV2":
-                temp = biaoJiData.AV;
+                    temp = Three[0].ttpData[0].AV2;
                     break;
                 case "用电_AV3":
-                temp = biaoJiData.AV;
+                    temp = Three[0].ttpData[0].AV3;
                     break;
                 case "用电_BV1":
-                temp = biaoJiData.BV;
+                    temp = Three[0].ttpData[0].BV1;
                     break;
                 case "用电_BV2":
-                temp = biaoJiData.BV;
+                    temp = Three[0].ttpData[0].BV2;
                     break;
                 case "用电_BV3":
-                temp = biaoJiData.BV;
+                    temp = Three[0].ttpData[0].BV3;
                     break;
                 case "用电_CV1":
-                temp = biaoJiData.CV;
+                    temp = Three[0].ttpData[0].CV1;
                     break;
                 case "用电_CV2":
-                temp = biaoJiData.CV;
+                    temp = Three[0].ttpData[0].CV2;
                     break;
                 case "用电_CV3":
-                temp = biaoJiData.CV;
+                    temp = Three[0].ttpData[0].CV3;
                     break;
 
                 #region 发电
                 case "发电_AV1":
-                temp = biaoJiData.AV;
+                    temp = Three[0].ttpData[1].AV1;
                     break;
                 case "发电_AV2":
-                temp = biaoJiData.AV;
+                    temp = Three[0].ttpData[1].AV2;
                     break;
                 case "发电_AV3":
-                temp = biaoJiData.AV;
+                    temp = Three[0].ttpData[1].AV3;
                     break;
                 case "发电_BV1":
-                temp = biaoJiData.BV;
+                    temp = Three[0].ttpData[1].BV1;
                     break;
                 case "发电_BV2":
-                temp = biaoJiData.BV;
+                    temp = Three[0].ttpData[1].BV2;
                     break;
                 case "发电_BV3":
-                temp = biaoJiData.BV;
+                    temp = Three[0].ttpData[1].BV3;
                     break;
                 case "发电_CV1":
-                temp = biaoJiData.CV;
+                    temp = Three[0].ttpData[1].CV1;
                     break;
                 case "发电_CV2":
-                temp = biaoJiData.CV;
+                    temp = Three[0].ttpData[1].CV2;
                     break;
                 case "发电_CV3":
-                temp = biaoJiData.CV;
+                    temp = Three[0].ttpData[1].CV3;
                     break;
 
                 case "发电_AA1":
-                temp = biaoJiData.AA;
+                    temp = Three[0].ttpData[1].AA1;
                     break;
                 case "发电_AA2":
-                temp = biaoJiData.AA;
+                    temp = Three[0].ttpData[1].AA2;
                     break;
                 case "发电_AA3":
-                temp = biaoJiData.AA;
+                    temp = Three[0].ttpData[1].AA3;
                     break;
                 case "发电_BA1":
-                temp = biaoJiData.BA;
+                    temp = Three[0].ttpData[1].BA1;
                     break;
                 case "发电_BA2":
-                temp = biaoJiData.BA;
+                    temp = Three[0].ttpData[1].BA2;
                     break;
                 case "发电_BA3":
-                temp = biaoJiData.BA;
+                    temp = Three[0].ttpData[1].BA3;
                     break;
                 case "发电_CA1":
-                temp = biaoJiData.CA;
+                    temp = Three[0].ttpData[1].CA1;
                     break;
                 case "发电_CA2":
-                temp = biaoJiData.CA;
+                    temp = Three[0].ttpData[1].CA2;
                     break;
                 case "发电_CA3":
-                temp = biaoJiData.CA;
+                    temp = Three[0].ttpData[1].CA3;
                     break;
                 #endregion
                 default:
                     break;
             }
+        }
+        else
+        {
+            Debug.Log("akjshd走：");
+            switch (name)
+            {
+                case "用电_AA1":
+                    temp = Three[0].ttpData[0].AA1;
+                    break;
+                case "用电_AA2":
+                    temp = Three[0].ttpData[0].AA2;
+                    break;
+                case "用电_AA3":
+                    temp = Three[0].ttpData[0].AA3;
+                    break;
+                case "用电_BA1":
+                    temp = Three[0].ttpData[0].BA1;
+                    break;
+                case "用电_BA2":
+                    temp = Three[0].ttpData[0].BA2;
+                    break;
+                case "用电_BA3":
+                    temp = Three[0].ttpData[0].BA3;
+                    break;
+                case "用电_CA1":
+                    temp = Three[0].ttpData[0].CA1;
+                    break;
+                case "用电_CA2":
+                    temp = Three[0].ttpData[0].CA2;
+                    break;
+                case "用电_CA3":
+                    temp = Three[0].ttpData[0].CA3;
+                    break;
+                case "用电_1A":
+                case "用电_1B":
+                case "用电_1C":
+                    temp = show(name, Three[0].ttpData[0].AA1);
+                    break;
 
+                case "用电_AV1":
+                    temp = Three[0].ttpData[0].AV1;
+                    break;
+                case "用电_AV2":
+                    temp = Three[0].ttpData[0].AV2;
+                    break;
+                case "用电_AV3":
+                    temp = Three[0].ttpData[0].AV3;
+                    break;
+                case "用电_BV1":
+                    temp = Three[0].ttpData[0].BV1;
+                    break;
+                case "用电_BV2":
+                    temp = Three[0].ttpData[0].BV2;
+                    break;
+                case "用电_BV3":
+                    temp = Three[0].ttpData[0].BV3;
+                    break;
+                case "用电_CV1":
+                    temp = Three[0].ttpData[0].CV1;
+                    break;
+                case "用电_CV2":
+                    temp = Three[0].ttpData[0].CV2;
+                    break;
+                case "用电_CV3":
+                    temp = Three[0].ttpData[0].CV3;
+                    break;
+
+                #region 发电
+                case "发电_AV1":
+                    temp = Three[0].ttpData[0].AV1;
+                    break;
+                case "发电_AV2":
+                    temp = Three[0].ttpData[0].AV2;
+                    break;
+                case "发电_AV3":
+                    temp = Three[0].ttpData[0].AV3;
+                    break;
+                case "发电_BV1":
+                    temp = Three[0].ttpData[0].BV1;
+                    break;
+                case "发电_BV2":
+                    temp = Three[0].ttpData[0].BV2;
+                    break;
+                case "发电_BV3":
+                    temp = Three[0].ttpData[0].BV3;
+                    break;
+                case "发电_CV1":
+                    temp = Three[0].ttpData[0].CV1;
+                    break;
+                case "发电_CV2":
+                    temp = Three[0].ttpData[0].CV2;
+                    break;
+                case "发电_CV3":
+                    temp = Three[0].ttpData[0].CV3;
+                    break;
+
+
+                case "发电_AA1":
+                    temp = Three[0].ttpData[0].AA1;
+                    break;
+                case "发电_AA2":
+                    temp = Three[0].ttpData[0].AA2;
+                    break;
+                case "发电_AA3":
+                    temp = Three[0].ttpData[0].AA3;
+                    break;
+                case "发电_BA1":
+                    temp = Three[0].ttpData[0].BA1;
+                    break;
+                case "发电_BA2":
+                    temp = Three[0].ttpData[0].BA2;
+                    break;
+                case "发电_BA3":
+                    temp = Three[0].ttpData[0].BA3;
+                    break;
+                case "发电_CA1":
+                    temp = Three[0].ttpData[0].CA1;
+                    break;
+                case "发电_CA2":
+                    temp = Three[0].ttpData[0].CA2;
+                    break;
+                case "发电_CA3":
+                    temp = Three[0].ttpData[0].CA3;
+                    break;
+                    #endregion
+            }
+        }
         for (int i = 0; i < gameObjects.Count; i++)
         {
             if (gameObjects[i].name.Equals(""))
@@ -178,19 +302,25 @@ public class ClampAmmetersManager : MonoSingleton<ClampAmmetersManager>
                 gameObjects[i].SetActive(true);
             }
         }
+        switch (name)
+        {
+            default:
+                break;
+        }
         Debug.Log("当前数据：" + temp);
         return temp;
     }
     float show(string name, float dianyliu)
     {
-        if (!string.IsNullOrEmpty(name))
+        if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(GlobalFlag.biaojiData.userState))
         {
             //if (GlobalFlag.biaojiData.userState == "正常")
             //{
             //    
             //}
             dianyliu = dianyliu * GlobalFlag.Beilv;
-
+            if (GlobalFlag.biaojiData.userState == "异常")
+            {
                 if (GlobalFlag.biaojiData.warningType == "电流异常")
                 {
                     switch (name.Substring(3, 2))
@@ -208,7 +338,7 @@ public class ClampAmmetersManager : MonoSingleton<ClampAmmetersManager>
                             break;
                     }
                 }
-            else if (GlobalFlag.biaojiData.warningType == "˽»»»¥¸ÐÆ÷")
+                else if(GlobalFlag.biaojiData.warningType=="私换互感器")
                 {
                     
                     if (!string.IsNullOrEmpty(GlobalFlag.isChange))
@@ -227,6 +357,7 @@ public class ClampAmmetersManager : MonoSingleton<ClampAmmetersManager>
 
                 }
             }
+        }
         return dianyliu;
     }
 }

SXElectricalInspection/Assets/GuYuan/KDLURL/follow.cs

@@ -11,10 +11,10 @@ public class follow : ToolBase
     // Start is called before the first frame update
     void Start()
     {
-        //if (UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId))
+        if (UIManager.Instance.ganTanHao.KeyGanTanHao.ContainsKey(GlobalFlag.userId))
-        //{
+        {
-        //    gameObject.SetActive(false);
+            gameObject.SetActive(false);
-        //}
+        }
     }
     private void Update()
     {

SXElectricalInspection/Assets/StreamingAssets/Message.json

@@ -9,7 +9,7 @@
       "valuepoint": "14WQ2403130197001"
     },
     {
-      "testpoint": "供电单位",
+      "testpoint": "供电公司",
       "valuepoint": "山西某供电公司"
     },
     {
@@ -24,10 +24,6 @@
       "testpoint": "工单状态",
       "valuepoint": "已发布"
     },
-    {
-      "testpoint": "工单类型",
-      "valuepoint": "窃电"
-    },
     {
       "testpoint": "台区编号",
       "valuepoint": "0000141123"
@@ -137,7 +133,7 @@
       "valuepoint": "窃电"
     },
     {
-      "testpoint": "合同容量/运行容量",
+      "testpoint": "合同容量",
       "valuepoint": "48kW"
     },
     {
@@ -168,6 +164,10 @@
       "testpoint": "城乡类别",
       "valuepoint": "城市"
     },
+    {
+      "testpoint": "运行容量",
+      "valuepoint": "48kw"
+    },
     {
       "testpoint": "立户日期",
       "valuepoint": "2009/8/15"
@@ -329,13 +329,6 @@
     }
   ],
   "stubtype": "电流短接",
-  "electriccurrent": "0",
+  "electriccurrent": "电流",
-  "voltage": "225",
+  "voltage": "电压"
-  "zerosequencecurrent": "0",
-  "aphasecurrent": "25.999",
-  "bphasecurrent": "0",
-  "cphasecurrent": "26.153",
-  "aphasevoltage": "225",
-  "bphasevoltage": "228.8",
-  "cphasevoltage": "227.7"
 }

SXElectricalInspection/Assets/StreamingAssets/build_info.txt

@@ -1 +1 @@
-Build from ADAM at 2024/6/6 13:46:52
+Build from LGZN_H at 2024/6/5 19:41:40