From 00ab3ddb140ba8bb88b5cf572b004a85e1da85e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs
index 9968b1e..3890e8f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/CoercePswEditorForm.cs
@@ -27,6 +27,10 @@
/// 鍒楄〃鐨勬甯冩帶浠�
/// </summary>
private FrameLayout frameTable = null;
+ /// <summary>
+ /// 褰撳墠鐨勮仈绯讳汉鍒楄〃
+ /// </summary>
+ private List<ZigBee.Device.Safeguard.PushTargetInfo> listPhoneData = null;
#endregion
@@ -82,6 +86,7 @@
btnPassword.TextSize = 24;
btnPassword.TextColor = 0xfffc744b;
btnPassword.Text = i_password;
+ btnPassword.IsBold = true;
frameback.AddChidren(btnPassword);
//鍒濆鍖栧垪琛ㄦ帶浠�
@@ -150,7 +155,7 @@
HdlThreadLogic.Current.RunMain(() =>
{
- var listPhoneData = new List<ZigBee.Device.Safeguard.PushTargetInfo>();
+ this.listPhoneData = new List<ZigBee.Device.Safeguard.PushTargetInfo>();
//鑱旂郴浜�
var rowContact = new FrameRowControl(listview.rowSpace / 2);
rowContact.UseClickStatu = false;
@@ -257,6 +262,16 @@
if (result == true)
{
rowContact.RemoveFromParent();
+
+ //绉婚櫎缂撳瓨
+ string checkKeys = areaCode + "-" + phone;
+ for (int i = 0; i < this.listPhoneData.Count; i++)
+ {
+ if (listPhoneData[i].PushNumber == checkKeys)
+ {
+ listPhoneData.RemoveAt(i);
+ }
+ }
}
}
--
Gitblit v1.8.0