From 8111a96164218c531104d7f958a643f041976a16 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期一, 17 五月 2021 14:41:47 +0800 Subject: [PATCH] 2021-5-17-1 --- HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 81 ++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 33 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs index 1ee2bb0..e6c1598 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs @@ -1,5 +1,6 @@ 锘縰sing System; using System.Collections.Generic; +using System.Text; using HDL_ON.Entity; using HDL_ON.UI.UI2.Intelligence.Automation.LogicView; using Shared; @@ -7,8 +8,12 @@ { public class PirMain : FrameLayout { + /// <summary> + /// 鏋勯�犲嚱鏁� + /// </summary> public PirMain() { + /// 鏍囪鐣岄潰 Tag = "PirMain"; } /// <summary> @@ -71,7 +76,7 @@ ////鍏抽棴鍒锋柊View锛� vv.EndHeaderRefreshing(); - Method.GetControlList(this, () => + PirMethod.GetControlList(this, () => { Application.RunOnMainThread(() => { @@ -87,12 +92,7 @@ SetPir setPir = new SetPir(); MainPage.BasePageView.AddChidren(setPir); - setPir.Show(() => - { - //BackAction(); - ////鍒锋柊鐣岄潰 - UIView(vv); - }); + setPir.Show(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; ///娣诲姞閬ユ帶鍣ㄥ浘鏍囩偣鍑讳簨浠� @@ -108,7 +108,7 @@ //1=绌鸿皟;2=鐢佃;3=椋庢墖;4=鏈洪《鐩�;5=DVD/EVD/VCD;6=鎶曞奖浠�;7=鑷畾涔�; if (if_value == 7) { - Method method = new Method(); + PirMethod method = new PirMethod(); method.AddControl(this, (control) => { //鎴愬姛鍚庣Щ闄�; @@ -121,9 +121,9 @@ } else { - if (if_value == 3 || if_value == 4 || if_value == 5 || if_value == 6) + if (if_value == 6) { - new TipPopView().FlashingBox("鏆傛椂涓嶆敮鎸佽鍔熻兘."); + new TipPopView().FlashingBox(Language.StringByID(StringId.zanshibuzhichigaigongneng)); return; } if (DeviceTypeList.Count == 0) @@ -148,7 +148,6 @@ #endregion ///鍒濆鍖栫晫闈� UIView(vv); - } /// <summary> /// 鍔犺浇UI鐣岄潰 @@ -209,7 +208,7 @@ TipPopView tipPopView = new TipPopView(); tipPopView.TipBox(StringId.tip, text, (dialog) => { - Method.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) => + PirMethod.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) => { dialog.Close(); var function = Pir.currPir.FunctioList.Find((c) => c.sid == Function.sid); @@ -290,27 +289,34 @@ { //娓呯┖涔嬪墠鏁版嵁 DeviceTypeList.Clear(); - var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString()); - for (int a = 0; a < jArray.Count; a++) + try { - var jay = jArray[a]; - var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay); - var objDeviceType = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceType>(str); - if (objDeviceType != null) + var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString()); + for (int a = 0; a < jArray.Count; a++) { - if (null == DeviceTypeList.Find((c) => c.id == objDeviceType.id)) + var jay = jArray[a]; + var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay); + var objDeviceType = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceType>(str); + if (objDeviceType != null) { - DeviceTypeList.Add(objDeviceType); + if (null == DeviceTypeList.Find((c) => c.id == objDeviceType.id)) + { + DeviceTypeList.Add(objDeviceType); + } } } + action(); } - action(); + catch + { + + } } else { if (tag) { - Method method = new Method(); + PirMethod method = new PirMethod(); method.ErrorShow(responsePackNew, ""); } } @@ -329,25 +335,35 @@ { //娓呯┖涔嬪墠鏁版嵁 brandList.Clear(); - var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString()); - for (int a = 0; a < jArray.Count; a++) + try { - var jay = jArray[a]; - var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay); - var brand = Newtonsoft.Json.JsonConvert.DeserializeObject<Brand>(str); - if (brand != null) + var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString()); + for (int a = 0; a < jArray.Count; a++) { - if (null == brandList.Find((c) => c.id == brand.id)) + var jay = jArray[a]; + var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay); + var brand = Newtonsoft.Json.JsonConvert.DeserializeObject<Brand>(str); + if (brand != null) { - brandList.Add(brand); + if (null == brandList.Find((c) => c.id == brand.id)) + { + brandList.Add(brand); + } } } } - actionBrand(brandList); + catch { } + finally + { + Application.RunOnMainThread(() => + { + actionBrand(brandList); + }); + } } else { - Method method = new Method(); + PirMethod method = new PirMethod(); method.ErrorShow(responsePackNew, ""); } }, id, "鍝佺墝鍒楄〃"); @@ -358,7 +374,6 @@ public override void RemoveFromParent() { BackAction(); - BackAction = null; base.RemoveFromParent(); } -- Gitblit v1.8.0