From fab43407e01474cc4f7b1d0f4b5e43ce1a038ce4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 16:51:14 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs | 92 +++++++++------------------------------------
1 files changed, 19 insertions(+), 73 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
index addde93..d0745a8 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Method.cs
@@ -228,7 +228,8 @@
/// <summary>
/// 鑾峰彇閬ユ帶鍣ㄥ垪琛�
/// </summary>
- public static void GetControlList(Action actio)
+ /// <param name="action">鍥炶皟鍑芥暟</param>
+ public static void GetControlList(Action action)
{
new System.Threading.Thread(() =>
@@ -272,81 +273,10 @@
Application.RunOnMainThread(() =>
{
- actio();
- });
- }
-
- })
- { IsBackground = true }.Start();
-
- }
- /// <summary>
- /// 鑾峰彇閬ユ帶鍣ㄥ垪琛�
- /// </summary>
- /// <param name="frame">log鍥炬爣鍔犺浇鐣岄潰</param>
- /// <param name="action">鍥炶皟鍑芥暟</param>
- public static void GetControlList1(FrameLayout frame, Action action)
- {
- //鍔犺浇log
- Loading loading = new Loading();
- frame.AddChidren(loading);
- HDL_ON.DAL.Server.ResponsePackNew responsePackNew = null;
- loading.Start();
- new System.Threading.Thread(() =>
- {
- try
- {
- for (int i = 0; i < Pir.pirDeviceList.Count; i++)
- {
- var pirDevice = Pir.pirDeviceList[i];
- try
- {
- responsePackNew = PirSend.ControlList(pirDevice);
-
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- try
- {
- if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
- {
- var jArray = Newtonsoft.Json.Linq.JArray.Parse(responsePackNew.Data.ToString());
- for (int a = 0; a < jArray.Count; a++)
- {
- var jay = jArray[a];
- //鏁版嵁杩斿簭鍒楀寲涓篖ogic瀵硅薄
- var str = Newtonsoft.Json.JsonConvert.SerializeObject(jay);
- var pirJosn = Newtonsoft.Json.JsonConvert.DeserializeObject<Entity.Function>(str);
- if (pirJosn != null)
- {
- if (null == pirDevice.FunctioList.Find((c) => c.sid == pirJosn.sid))
- {
- pirDevice.FunctioList.Add(pirJosn);
- }
- }
-
- }
- }
-
- }
- catch { }
-
- });
- }
- }
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
action();
});
}
+
})
{ IsBackground = true }.Start();
@@ -390,6 +320,22 @@
{ IsBackground = true }.Start();
}
/// <summary>
+ /// 鍙戦�佸懡浠ょ嚎绋�
+ /// </summary>
+ /// <param name="control">鍙戦�佹暟鎹璞�</param>
+ /// <param name="action">鍥炶皟鍑芥暟</param>
+ /// <param name="str">鍒ゆ柇瀛楃</param>
+ /// <param name="frame">log鐖舵帶浠�</param>
+ /// <param name="dialog">log鐖舵帶浠�</param>
+ public void ThreadSend(Control control, Action<HDL_ON.DAL.Server.ResponsePackNew> action, string str, FrameLayout frame, Dialog dialog)
+ {
+
+
+
+ }
+
+
+ /// <summary>
/// MQTT涓婚鎺ㄩ�佷笅鏉ョ殑鏁版嵁
/// </summary>
public static string mqttdata = "";
--
Gitblit v1.8.0