From bff8993501334c4f3c5f902216fe03253be747f8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 四月 2020 16:59:01 +0800
Subject: [PATCH] 合并新代码
---
ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
index 90cfa37..0bdf308 100755
--- a/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
+++ b/ZigbeeApp20200414/Shared/Phone/UserCenter/Device/DoorLock/DoorLockScreeningTypeForm.cs
@@ -16,19 +16,19 @@
/// </summary>
public Action<List<string>, List<int>> FinishSelectEvent = null;
/// <summary>
- /// 褰撳墠閫夋嫨鐢ㄦ埛
+ /// 褰撳墠閫夋嫨鐢ㄦ埛((-1:鎵�鏈� -9999:鍏朵粬))
/// </summary>
private List<string> listSelectUser = new List<string>();
/// <summary>
- /// 褰撳墠閫夋嫨鐨勫紑閿佹柟寮�
+ /// 褰撳墠閫夋嫨鐨勫紑閿佹柟寮�(-1:鎵�鏈� 0:瀵嗙爜 15:鎸囩汗 3:IC鍗� 9000:甯稿紑妯″紡(鑷畾涔夌殑))
/// </summary>
private List<int> listSelectLock = new List<int>();
/// <summary>
- /// 鍓嶅洖鐨勯�夋嫨鐢ㄦ埛
+ /// 鍓嶅洖鐨勯�夋嫨鐢ㄦ埛(閲嶇疆閫夐」涓撶敤)
/// </summary>
private List<string> listOldSelectUser = new List<string>();
/// <summary>
- /// 鍓嶅洖鐨勯�夋嫨寮�閿佹柟寮�
+ /// 鍓嶅洖鐨勯�夋嫨寮�閿佹柟寮�(閲嶇疆閫夐」涓撶敤)
/// </summary>
private List<int> listOldSelectLock = new List<int>();
@@ -176,7 +176,7 @@
dicUser.Add(keys, i_dicUser[keys]);
}
//鍏朵粬
- dicUser.Add("", Language.StringByID(R.MyInternationalizationString.uOther));
+ dicUser.Add("-9999", Language.StringByID(R.MyInternationalizationString.uOther));
//閫夋嫨鐢ㄦ埛
var btnTitle = new NormalViewControl(600, 58, true);
@@ -289,6 +289,13 @@
btnCard.TextID = R.MyInternationalizationString.uIcCard;
btnCard.Name = "3";
frameDetail.AddChidren(btnCard);
+
+ //甯稿紑妯″紡
+ var btnNormallyOpen = this.InitLockSelectButton(listSelectLock.Contains(9000));
+ btnNormallyOpen.Y = btnAll.Bottom + Application.GetRealWidth(29);
+ btnNormallyOpen.TextID = R.MyInternationalizationString.uNormallyOpenMode;
+ btnNormallyOpen.Name = "9000";
+ frameDetail.AddChidren(btnNormallyOpen);
}
#endregion
--
Gitblit v1.8.0