From d72ca686a3e262693f8a6e45e747e8e8da43335b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 06 七月 2021 09:39:03 +0800
Subject: [PATCH] 2021-07-06 1.更新
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 84 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 36 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..49bab2e 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>
@@ -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;
};
///娣诲姞閬ユ帶鍣ㄥ浘鏍囩偣鍑讳簨浠�
@@ -101,7 +101,7 @@
//杩涙潵涓嶅厑璁稿乏婊�
MainPage.BasePageView.ScrollEnabled = false;
View.Buttons buttons = new View.Buttons();
- buttons.AddFrameLayout(this, (if_value, view) =>
+ buttons.AddFrameLayout(this, (if_value, view) =>
{
//鍏抽棴鍏佽宸︽粦
MainPage.BasePageView.ScrollEnabled = true;
@@ -111,8 +111,8 @@
Method method = new Method();
method.AddControl(this, (control) =>
{
- //鎴愬姛鍚庣Щ闄�;
- view.RemoveFromParent();
+ //鎴愬姛鍚庣Щ闄�;
+ view.RemoveFromParent();
AddButton addButton = new AddButton();
MainPage.BasePageView.AddChidren(addButton);
addButton.Show(control);
@@ -123,7 +123,7 @@
{
if (if_value == 3 || if_value == 4 || if_value == 5 || if_value == 6)
{
- new TipPopView().FlashingBox("鏆傛椂涓嶆敮鎸佽鍔熻兘.");
+ new TipPopView().FlashingBox(Language.StringByID(StringId.zanshibuzhichigaigongneng));
return;
}
if (DeviceTypeList.Count == 0)
@@ -131,8 +131,8 @@
GetDeviceTypeList(true, () =>
{
DeviceTypeViewClick(if_value);
- //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
- view.RemoveFromParent();
+ //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
+ view.RemoveFromParent();
});
}
@@ -141,15 +141,14 @@
DeviceTypeViewClick(if_value);
view.RemoveFromParent();
}
-
}
}, 7);
};
#endregion
///鍒濆鍖栫晫闈�
UIView(vv);
-
}
+
/// <summary>
/// 鍔犺浇UI鐣岄潰
/// </summary>
@@ -258,7 +257,6 @@
/// <param name="if_value">鎺т欢绱㈠紩鍊�</param>
private void DeviceTypeViewClick(int if_value)
{
-
var strings = View.Buttons.GetTypeString(if_value).Split('-');
var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
if (jobDeviceType == null)
@@ -274,7 +272,6 @@
});
});
-
}
/// <summary>
/// 璇诲彇绾㈠璁惧绫诲瀷鍒楄〃
@@ -285,26 +282,32 @@
{
PirSend.GetDeviceTypesList(this, (responsePackNew) =>
{
-
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
{
//娓呯┖涔嬪墠鏁版嵁
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
{
@@ -329,21 +332,31 @@
{
//娓呯┖涔嬪墠鏁版嵁
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
{
@@ -358,7 +371,6 @@
public override void RemoveFromParent()
{
BackAction();
- BackAction = null;
base.RemoveFromParent();
}
--
Gitblit v1.8.0