From f17bb6c60db1f24ce05df96aa27d4680e2df0ce6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 15 一月 2020 17:16:13 +0800
Subject: [PATCH] 请合并最新代码，（优化代码格式，完成开会后的细节测试）
---
ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 107 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 83 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index ce7bca5..b3f08b2 100644
--- a/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp20190114/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -7,23 +7,31 @@
{
public class DoorLockCommonLayout : EditorCommonForm
{
+ /// <summary>
+ /// 鏋勯�犲嚱鏁�
+ /// </summary>
public DoorLockCommonLayout()
- {
-
+ {
}
- #region 鈼� 鍙橀噺鐢虫槑__________________________
+ #region 鍙橀噺鐢虫槑
public FrameLayout topFrameLayout = new FrameLayout { Height = Application.GetRealHeight(184), BackgroundColor = ZigbeeColor.Current.XMTopFrameLayout };
- public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1921 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
- #region 鈼� 搴曢儴鏈夊渾瑙掑竷灞�__________________________
+ public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1921 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };
+ #region 搴曢儴鏈夊渾瑙掑竷灞�
+ /// 鑳屾櫙闃村奖鐣岄潰
+ /// </summary>
public FrameLayout shadowRadiusFrameLayout = new FrameLayout { BackgroundColor = 0x0f000000 };
-
+ /// <summary>
+ /// 璁剧疆鍦嗚鐨勭晫闈�
+ /// </summary>
public FrameLayout bottomRadiusFrameLayout = new FrameLayout()
{
Height = Application.GetRealHeight(806),
Y = Application.GetRealHeight(930),
BackgroundColor = ZigbeeColor.Current.XMWhite,
};
-
+ /// <summary>
+ /// 搴曢儴鍦嗚涓殑鍙栨秷鎸夐挳
+ /// </summary>
public Button btnCancel = new Button
{
X = Application.GetRealWidth(81),
@@ -34,7 +42,9 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextSize = 14,
};
-
+ /// <summary>
+ /// 搴曢儴鍦嗚涓殑鏍囬鏍�
+ /// </summary>
public Button btnBottomTitle = new Button
{
X = Application.GetRealWidth(446 - 50),
@@ -45,7 +55,9 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextSize = 16,
};
-
+ /// <summary>
+ /// 搴曢儴鍦嗚涓殑纭鎸夐挳
+ /// </summary>
public Button btnFinish = new Button
{
X = Application.GetRealWidth(919),
@@ -55,26 +67,21 @@
Text = Language.StringByID(R.MyInternationalizationString.Complete),
TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
- };
-
+ };
+ /// <summary>
+ /// 搴曢儴鍦嗚涓殑鏍囬鏍忎笅鐨勭嚎鏉�
+ /// </summary>
public Button line = new Button()
{
Y = Application.GetRealHeight(138),
Height = 1,
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
- };
-
+ };
+
#endregion
-
- /// <summary>
- /// 鈼� 涓儴鍒锋柊甯冨眬__________________________
- /// </summary>
- //public VerticalRefreshLayout midVerticalScrolViewLayout = new VerticalRefreshLayout()
- //{
- //};
-
+
/// <summary>
- /// 鈼� 鏍囬鏍忓竷灞�__________________________
+ /// 鏍囬鏍忓竷灞�
/// </summary>
public FrameLayout titleFrameLayout = new FrameLayout
{
@@ -138,7 +145,8 @@
this.AddChidren(topFrameLayout);
topFrameLayout.AddChidren(btnBackFrameLayout);
topFrameLayout.AddChidren(titleFrameLayout);
- topFrameLayout.AddChidren(btnTitleLine);
+ topFrameLayout.AddChidren(btnTitleLine);
+
var title = new Button()
{
TextAlignment = TextAlignment.CenterLeft,
@@ -566,6 +574,57 @@
};
}
// 鑾峰彇鍒板埌鍚嶇О鏇存敼鍥炶皟閫氱煡
- public Action<string> devicNameSecAction;
+ public Action<string> devicNameSecAction;
+
+
+ /// <summary>
+ /// 褰撳墠閫変腑鐨勫紑閿佹柟寮�
+ /// </summary>
+ /// <param name="btnAllMethod"></param>
+ /// <param name="btnMethodText"></param>
+ /// <param name="oldbutton"></param>
+ /// <param name="oldbuttonText"></param>
+ public void CurrentSelectUnlockMethod(Button btnAllMethod, Button btnMethodText, Button oldbutton, Button oldbuttonText)
+ {
+ btnAllMethod.IsSelected = true;
+ btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ btnMethodText.IsBold = true;
+ oldbutton = btnAllMethod;
+ oldbuttonText = btnMethodText;
+ }
+
+ /// <summary>
+ /// 鏄剧ず鎵�鏈夊紑閿佹柟寮忕殑鏁版嵁
+ /// </summary>
+ /// <param name="curIndex"></param>
+ /// <param name="btnAllMethod"></param>
+ /// <param name="btnMethodText"></param>
+ public void DisplayAllUnlockMethod(int curIndex, Button btnAllMethod, Button btnMethodText)
+ {
+ switch (curIndex)
+ {
+ 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;
+ }
+ }
+
}
}
--
Gitblit v1.8.0