From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs | 176 +++++++++++++++++++++++-----------------------------------
1 files changed, 71 insertions(+), 105 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
index 2858bfa..89f9c6e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
@@ -4,7 +4,7 @@
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DoorLock
{
- public class UndistributeDoorlockUserPage : DoorLockCommonLayout, ZigBee.Common.IStatus
+ public class UndistributeDoorlockUserPage : DoorLockCommonLayout
{
/// <summary>
/// 鏋勯�犲嚱鏁�
@@ -17,15 +17,36 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
}
- #region 鈼� 鍙橀噺鐢虫槑__________________________
+ #region 鍙橀噺鐢虫槑
+ /// <summary>
+ /// 褰撳墠闂ㄩ攣
+ /// </summary>
ZigBee.Device.DoorLock doorLock;
+ /// <summary>
+ /// 搴曢儴鐧借壊甯冨眬
+ /// </summary>
FrameLayout bottomFrameLayout;
+ /// <summary>
+ /// 褰撳墠绫诲瀷
+ /// </summary>
string currentType = string.Empty;
+ /// <summary>
+ /// 鏈湴璐︽埛鍒楄〃
+ /// </summary>
List<Shared.Phone.UserCenter.MemberInfoRes> localAccountList;
+ /// <summary>
+ /// 婊戝姩甯冨眬View
+ /// </summary>
VerticalRefreshLayout bodyView;
+ /// <summary>
+ /// 淇濆瓨涔嬪墠鎼滅储鍒版湰鍦伴棬閿佺敤鎴峰垪琛�
+ /// </summary>
Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj> oldLocalDoorLockUserList = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();
#endregion
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夎处鎴风殑闂ㄩ攣鐢ㄦ埛鍒楄〃
+ /// </summary>
void ReadDoorLockUserInfo()
{
System.Threading.Tasks.Task.Run(async () =>
@@ -35,6 +56,7 @@
var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
if (oldLocalDoorLockUserList.Count != 0)
{
+ //濡傛灉鏈娌℃湁鎼滅储鍒帮紝鎻愮ず缃戝叧娌℃湁鍥炲
if (list.Count == 0)
{
Application.RunOnMainThread(() =>
@@ -84,6 +106,9 @@
}
}
+ /// <summary>
+ /// 涓儴甯冨眬
+ /// </summary>
public void MidFrameLayoutContent()
{
var midTopFrameLayout = new FrameLayout()
@@ -102,7 +127,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextSize = 12,
- IsBold =true,
+ IsBold = true,
};
midTopFrameLayout.AddChidren(btnAllMethod);
// 绫诲瀷鍖哄垎
@@ -137,11 +162,12 @@
SelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
};
midTopFrameLayout.AddChidren(btnNext);
- btnNext.MouseUpEventHandler += (sender, e) =>
+ EventHandler<MouseEventArgs> handerSideLip = (sender, e) =>
{
SideslipFramelayout();
};
-
+ btnNext.MouseUpEventHandler += handerSideLip;
+ btnAllMethod.MouseUpEventHandler += handerSideLip;
var btnLine = new Button
{
Y = midTopFrameLayout.Bottom,
@@ -163,6 +189,9 @@
};
}
+ /// <summary>
+ /// 鍒锋柊鍒楄〃
+ /// </summary>
void RefreshList(int unlockMethod = -1)
{
this.midFrameLayout.RemoveAll();
@@ -173,7 +202,7 @@
foreach (var curUserId in doorLock.localDoorLockUserList.Keys)
{
var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
- if (curDoorLockUser.ConnectedAccount != "")
+ if (!string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount))
{
continue;
}
@@ -244,7 +273,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
Gravity = Gravity.CenterVertical,
- TextSize =15,
+ TextSize = 15,
};
rowFrameLayout.AddChidren(btnText);
@@ -267,7 +296,7 @@
switch (curDoorLockUser.UnlockType)
{
case 0:
- if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
{
btnText.Text = curDoorLockUser.UserName;
}
@@ -277,7 +306,7 @@
}
break;
case 3:
- if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
{
btnText.Text = curDoorLockUser.UserName;
}
@@ -287,7 +316,7 @@
}
break;
case 15:
- if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
{
btnText.Text = curDoorLockUser.UserName;
}
@@ -311,7 +340,9 @@
}
}
- //鏈湴璐︽埛
+ /// <summary>
+ /// 鍒嗛厤鏈湴璐︽埛
+ /// </summary>
void MatchUsersFrameLayout(ZigBee.Device.DoorLock.LocaDoorLockObj curDoorLockUser)
{
#region UI
@@ -326,7 +357,7 @@
{
Height = Application.GetRealHeight(100),
Y = Application.GetRealHeight(1253),
- Radius =(uint) Application.GetRealHeight(100/2),
+ Radius = (uint)Application.GetRealHeight(100 / 2),
BackgroundColor = ZigbeeColor.Current.XMWhite,
};
flMain.AddChidren(bottomFrameLayout);
@@ -334,7 +365,7 @@
var bottomFrameLayout1 = new FrameLayout()
{
Height = Application.GetRealHeight(668 - 60),
- Y = Application.GetRealHeight(1253+58),
+ Y = Application.GetRealHeight(1253 + 58),
BackgroundColor = ZigbeeColor.Current.XMWhite,
};
flMain.AddChidren(bottomFrameLayout1);
@@ -370,7 +401,7 @@
Y = Application.GetRealHeight(35),
Height = Application.GetRealHeight(63),
Width = Application.GetRealWidth(762),
- Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
+ Text = Language.StringByID(R.MyInternationalizationString.MatchUser),
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextSize = 16,
TextAlignment = TextAlignment.Center,
@@ -431,8 +462,8 @@
var btnChoose = new Button()
{
- Width = Application.GetRealWidth(60),
- Height = Application.GetRealHeight(60),
+ Width = Application.GetMinRealAverage(60),
+ Height = Application.GetMinRealAverage(60),
X = Application.GetRealWidth(861 + 81),
Y = Application.GetRealHeight(35),
SelectedImagePath = "DoorLock/SelectedIcon.png",
@@ -457,7 +488,7 @@
btnLine.Visible = false;
}
- if (currentAccount.UserName != "" && currentAccount.UserName != null)
+ if (!string.IsNullOrEmpty(currentAccount.UserName))
{
btnUserName.Text = currentAccount.UserName;
}
@@ -547,7 +578,7 @@
switch (curDoorLockUser.UnlockType)
{
case 0:
- if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
{
addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
}
@@ -557,7 +588,7 @@
}
break;
case 3:
- if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
{
addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
}
@@ -567,7 +598,7 @@
}
break;
case 15:
- if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
{
addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
}
@@ -640,9 +671,12 @@
};
}
- // 渚ц竟瀵艰埅鏍�
+ /// <summary>
+ /// 渚ц竟瀵艰埅鏍忔悳绱�
+ /// </summary>
void SideslipFramelayout()
{
+ #region sidelipFrameLayout UI
var dialog = new Dialog
{
};
@@ -671,10 +705,13 @@
Y = Application.GetRealHeight(28),
};
sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
+ #endregion
+
Button oldbutton = null;
Button oldbuttonText = null;
for (var i = 0; i < 4; i++)
{
+ #region rowFrameLayout UI
var rowFrameLayout = new RowLayout()
{
Height = Application.GetRealHeight(150),
@@ -702,7 +739,9 @@
TextAlignment = TextAlignment.CenterLeft,
};
rowFrameLayout.AddChidren(btnMethodText);
+ #endregion
+ #region 鏁版嵁澶勭悊
EventHandler<MouseEventArgs> hander = (sender, e) =>
{
if (!btnAllMethod.IsSelected)
@@ -728,75 +767,35 @@
rowFrameLayout.MouseUpEventHandler += hander;
btnAllMethod.MouseUpEventHandler += hander;
btnMethodText.MouseUpEventHandler += hander;
+ DisplayAllUnlockMethod(i, btnAllMethod, btnMethodText);
- switch (i)
+ if (string.IsNullOrEmpty(doorLock.currentUserDisplayMethod) && i == 0)
{
- case 0:
- btnAllMethod.UnSelectedImagePath = "DoorLock/AllMethod.png";
- btnAllMethod.SelectedImagePath = "DoorLock/AllMethodOn.png";
- btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.AllMethod);
- break;
- case 1:
- btnAllMethod.UnSelectedImagePath = "DoorLock/Password.png";
- btnAllMethod.SelectedImagePath = "DoorLock/PasswordOn.png";
- btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.PasswordUnlock);
- break;
- case 2:
- btnAllMethod.UnSelectedImagePath = "DoorLock/Fingerprint.png";
- btnAllMethod.SelectedImagePath = "DoorLock/FingerprintOn.png";
- btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.FingerprintUnlock);
- break;
- case 3:
- btnAllMethod.UnSelectedImagePath = "DoorLock/proximityCard.png";
- btnAllMethod.SelectedImagePath = "DoorLock/proximityCardOn.png";
- btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock);
- break;
- }
-
- if (doorLock.currentUserDisplayMethod == "" && i == 0)
- {
- btnAllMethod.IsSelected = true;
- btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- btnMethodText.IsBold = true;
- oldbutton = btnAllMethod;
- oldbuttonText = btnMethodText;
+ CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
}
if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod) && i == 0)
{
- btnAllMethod.IsSelected = true;
- btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- btnMethodText.IsBold = true;
- oldbutton = btnAllMethod;
- oldbuttonText = btnMethodText;
+ CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
}
if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock) && i == 1)
{
- btnAllMethod.IsSelected = true;
- btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- btnMethodText.IsBold = true;
- oldbutton = btnAllMethod;
- oldbuttonText = btnMethodText;
+ CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
}
if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock) && i == 2)
{
- btnAllMethod.IsSelected = true;
- btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- btnMethodText.IsBold = true;
- oldbutton = btnAllMethod;
- oldbuttonText = btnMethodText;
+ CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
}
if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock) && i == 3)
{
- btnAllMethod.IsSelected = true;
- btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- btnMethodText.IsBold = true;
- oldbutton = btnAllMethod;
- oldbuttonText = btnMethodText;
+ CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
}
+ #endregion
}
}
- //绫诲瀷鍖哄垎
+ /// <summary>
+ /// 绫诲瀷鍖哄垎
+ /// </summary>
void TypeRefresh()
{
if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock))
@@ -816,38 +815,5 @@
RefreshList();
}
}
- #region 鈼� 鎺ュ彛瀹炵幇__________________________
- /// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
- /// </summary>
- /// <returns>The changed.</returns>
- /// <param name="common">Common.</param>
- public void Changed(CommonDevice common)
- {
-
- }
- /// <summary>
- /// 澶勭悊鍙樺寲浜嬩欢
- /// </summary>
- /// <param name="common"></param>
- /// <param name="typeTag"></param>
- public void DeviceInfoChange(CommonDevice common, string typeTag)
- {
- }
- /// <summary>
- /// Changeds the IL ogic status.
- /// </summary>
- /// <param name="logic">Logic.</param>
- public void ChangedILogicStatus(ZigBee.Device.Logic logic)
- {
- }
- /// <summary>
- /// Changeds the IS cene status.
- /// </summary>
- /// <param name="scene">Scene.</param>
- public void ChangedISceneStatus(Scene scene)
- {
- }
- #endregion
}
}
--
Gitblit v1.8.0