From bbcd6c2017762f9a0e6cf0ac6466bbf78f593b14 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 19 四月 2021 09:36:40 +0800
Subject: [PATCH] Merge branch 'wxr4' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
index a4884ea..49bab2e 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs
@@ -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);
@@ -131,8 +131,8 @@
GetDeviceTypeList(true, () =>
{
DeviceTypeViewClick(if_value);
- //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
- view.RemoveFromParent();
+ //鑾峰彇鎴愬姛涔嬪悗绉婚櫎
+ view.RemoveFromParent();
});
}
@@ -141,7 +141,6 @@
DeviceTypeViewClick(if_value);
view.RemoveFromParent();
}
-
}
}, 7);
};
@@ -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
{
--
Gitblit v1.8.0