From 4c40f503acf2bcf90d294cc439ef46ba259b9c60 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 02 十二月 2019 09:27:46 +0800
Subject: [PATCH] 新版本，如果 IOS 编译报错，先注释掉
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
index 98bb400..8b5ba3c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DoorLock/DoorLockHistoryLogForm.cs
@@ -98,13 +98,10 @@
//涓荤嚎绋嬬殑寮傛浼氶樆濉炰富绾跨▼,瀵艰嚧鐣岄潰鏈夋鏃堕棿浼氱櫧灞�,鎵�浠ヨ繖鏍峰瓙璁╃晫闈㈠厛鍑烘潵
//鐒跺悗鍐嶅埛鏂版暟鎹�
- HdlThreadLogic.Current.RunThread(() =>
+ HdlThreadLogic.Current.RunMainInThread(() =>
{
- Application.RunOnMainThread(() =>
- {
- //鍒濆鍖栬褰曞垪琛�
- this.InitLogListInfo();
- });
+ //鍒濆鍖栬褰曞垪琛�
+ this.InitLogListInfo();
});
}
@@ -167,6 +164,11 @@
btnScreeningIcon.Gravity = Gravity.CenterVertical;
btnScreeningIcon.UnSelectedImagePath = "Item/ScreeningType.png";
frameTitle.AddChidren(btnScreeningIcon, ChidrenBindMode.NotBind);
+ btnScreeningIcon.ButtonClickEvent += (sender, e) =>
+ {
+ //鏄剧ず绫诲瀷绛涢�夌晫闈�
+ this.ShowDoorLockScreeningTypeForm();
+ };
//搴曠嚎
frameTitle.AddBottomLine();
@@ -313,7 +315,7 @@
}
else
{
- btnIcon.UnSelectedImagePath = "Item/UnLockSuccess.png";
+ btnIcon.UnSelectedImagePath = "Item/UnLockFail.png";
}
//淇℃伅
@@ -510,6 +512,7 @@
List<string> listUser = null;
if (listSearchUserId.Contains("-1") == false)
{
+ listUser = new List<string>();
listUser.AddRange(listSearchUserId);
//绉婚櫎鍏朵粬,鍥犱负浜戠鍥哄畾浼氱粰
listUser.Remove("");
@@ -519,6 +522,7 @@
List<int> listLock = null;
if (listSearchLockId.Contains(-1) == false)
{
+ listLock = new List<int>();
listLock.AddRange(listSearchLockId);
}
--
Gitblit v1.8.0