From 8b9ce384b26c414db32f98e94e088f5334869c2d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 15:36:28 +0800
Subject: [PATCH] 全部合并了代码，安卓和 IOS 都测试通过了
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
index 5cb3cde..766d806 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
@@ -63,7 +63,7 @@
btnDelete.InitControl();
btnDelete.ButtonClickEvent += (sender, e) =>
{
- var form = new TopRightMenuControl(this, 1, 449);
+ var form = new TopRightMenuControl(1, 449);
//娓呯┖璁板綍
form.AddRowMenu(Language.StringByID(R.MyInternationalizationString.uClearLog), "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
{
@@ -98,15 +98,14 @@
//涓荤嚎绋嬬殑寮傛浼氶樆濉炰富绾跨▼,瀵艰嚧鐣岄潰鏈夋鏃堕棿浼氱櫧灞�,鎵�浠ヨ繖鏍峰瓙璁╃晫闈㈠厛鍑烘潵
//鐒跺悗鍐嶅埛鏂版暟鎹�
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
Application.RunOnMainThread(() =>
{
//鍒濆鍖栬褰曞垪琛�
this.InitLogListInfo();
});
- })
- { IsBackground = true }.Start();
+ });
}
/// <summary>
--
Gitblit v1.8.0