From 4b378188ce972df432b23d9cb73babb6cc0679c6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 17 一月 2020 14:56:15 +0800
Subject: [PATCH] 合并代码 ver.10086
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 86 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 3c9579d..da5c1cc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -6,7 +6,11 @@
{
public class UserDoorLockPage : DoorLockCommonLayout, ZigBee.Common.IStatus
{
-
+ /// <summary>
+ /// 鏋勯�犲嚱鏁�
+ /// </summary>
+ /// <param name="room"></param>
+ /// <param name="doorLock"></param>
public UserDoorLockPage(Shared.Common.Room room, DeviceUI doorLock)
{
this.doorLock = doorLock.CommonDevice as ZigBee.Device.DoorLock;
@@ -16,12 +20,30 @@
ZigBee.Device.ZbGateway.StatusList.Add(this);
}
- #region 鈼� 鍙橀噺鐢虫槑__________________________
+ #region 鍙橀噺鐢虫槑
+ /// <summary>
+ /// 褰撳墠闂ㄩ攣
+ /// </summary>
ZigBee.Device.DoorLock doorLock;
+ /// <summary>
+ /// 搴曢儴甯冨眬
+ /// </summary>
FrameLayout bottomFrameLayout;
+ /// <summary>
+ /// 褰撳墠鎴块棿
+ /// </summary>
Shared.Common.Room currentRoom;
+ /// <summary>
+ /// 璁惧UI瀵硅薄
+ /// </summary>
DeviceUI deviceUI;
+ /// <summary>
+ /// 璁剧疆浜屾楠岃瘉Action
+ /// </summary>
Action action;
+ /// <summary>
+ /// 涓儴甯冨眬涓棬閿佸悕绉版樉绀�
+ /// </summary>
Button btnDoorLockTitle;
#endregion
@@ -30,8 +52,7 @@
/// </summary>
public void Show()
{
- this.TopFrameLayout(this, "");
-
+ this.TopFrameLayout(this, "");
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
{
RemoveFromParent();
@@ -44,7 +65,7 @@
{
X = Application.GetRealWidth(850 - 116),
Height = Application.GetRealHeight(69),
- Width = Application.GetRealWidth(69),
+ Width = Application.GetRealWidth(0),
};
this.titleFrameLayout.AddChidren(btnShare);
@@ -64,7 +85,7 @@
UnSelectedImagePath = "DoorLock/SettingIcon.png",
};
btnFuncSetFrameLayout.AddChidren(btnFuncSet);
- btnFuncSet.MouseDownEventHandler += (sender, e) =>
+ EventHandler<MouseEventArgs> btnFuncSetHander = (sender, e) =>
{
var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
@@ -81,15 +102,14 @@
}
};
};
-
- btnShare.MouseDownEventHandler += (sender, e) =>
- {
-
- };
-
+ btnFuncSetFrameLayout.MouseDownEventHandler += btnFuncSetHander;
+ btnFuncSet.MouseDownEventHandler += btnFuncSetHander;
+
MidFrameLayoutContent();
}
-
+ /// <summary>
+ /// 涓儴甯冨眬
+ /// </summary>
public void MidFrameLayoutContent()
{
#region UI
@@ -119,32 +139,49 @@
//鑾峰彇Mac鍚嶅瓧
btnDoorLockTitle.Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock);
+ var btnRecordFrameLayout = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(69+15+46),
+ Height = Application.GetRealHeight(69+46 * 2),
+ X = Application.GetRealWidth(752-46),
+ };
+ midTopFrameLayout.AddChidren(btnRecordFrameLayout);
+
var btnRecord = new Button()
{
Width = Application.GetRealWidth(69),
Height = Application.GetRealHeight(69),
- X = Application.GetRealWidth(752),
+ X = Application.GetRealWidth(46),
Y = Application.GetRealHeight(46),
UnSelectedImagePath = "DoorLock/RecordIcon.png",
};
- midTopFrameLayout.AddChidren(btnRecord);
- btnRecord.MouseDownEventHandler += (sender, e) =>
+ btnRecordFrameLayout.AddChidren(btnRecord);
+ EventHandler<MouseEventArgs> handerRecord = (sender, e) =>
{
//鍘嗗彶璁板綍 ---- stan
var form = new DeviceDoorLock.DoorLockHistoryLogForm();
form.AddForm(this.doorLock.DeviceAddr);
};
+ btnRecordFrameLayout.MouseDownEventHandler += handerRecord;
+ btnRecord.MouseDownEventHandler += handerRecord;
+ var btnCollectFrameLayout = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(69+15+46),
+ Height = Application.GetRealHeight(69+46*2),
+ X = Application.GetRealWidth(850-15),
+ };
+ midTopFrameLayout.AddChidren(btnCollectFrameLayout);
var btnCollect = new Button()
{
Width = Application.GetRealWidth(69),
Height = Application.GetRealHeight(69),
- X = Application.GetRealWidth(850),
+ X = Application.GetRealWidth(15),
Y = Application.GetRealHeight(46),
UnSelectedImagePath = "Item/Collection.png",
SelectedImagePath = "Item/CollectionSelected.png"
};
- midTopFrameLayout.AddChidren(btnCollect);
+ btnCollectFrameLayout.AddChidren(btnCollect);
var de = Shared.Common.Room.LoveRoomDeviceUIFilePathList.Find((obj) => obj == deviceUI.FileName);
if (de == null)
{
@@ -154,7 +191,7 @@
{
btnCollect.IsSelected = true;
}
- btnCollect.MouseDownEventHandler += (sender, e) =>
+ EventHandler < MouseEventArgs > handerCollect = (sender, e) =>
{
btnCollect.IsSelected = !btnCollect.IsSelected;
if (btnCollect.IsSelected)
@@ -166,7 +203,8 @@
Shared.Common.Room.CurrentRoom.GetLoveRoom().DeleteDevice(deviceUI.FileName); //鍙栨秷鏀惰棌
}
};
-
+ btnCollectFrameLayout.MouseDownEventHandler += handerCollect;
+ btnCollect.MouseDownEventHandler += handerCollect;
var btnCurrentText = new Button()
{
Width = Application.GetRealWidth(100),
@@ -315,6 +353,7 @@
btnCurrentFrameLayout.AddChidren(btnCurrentRoomName);
#endregion
+ #region 鏁版嵁澶勭悊
EventHandler<MouseEventArgs> hander1 = async (sender, e) =>
{
openFrameLayout.Enable = false;
@@ -343,14 +382,14 @@
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NoAccess), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.NoAccess));
openFrameLayout.Enable = true;
btnDoorOpenPic.Enable = true;
}
}
else
{
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AccountIsFreezed));
openFrameLayout.Enable = true;
btnDoorOpenPic.Enable = true;
}
@@ -381,9 +420,10 @@
};
closeFrameLayout.MouseUpEventHandler += hander2;
btnDoorClosePic.MouseUpEventHandler += hander2;
+ #endregion
}
- #region 鈼� 鎺ュ彛瀹炵幇__________________________
+ #region 鎺ュ彛瀹炵幇
/// <summary>
/// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
/// </summary>
--
Gitblit v1.8.0