From 985abd7ee6049147119518aa41fb2d08c0cfc40d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 10 一月 2020 17:56:12 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs | 109 ++++++++++++++++++------------------------------------
1 files changed, 36 insertions(+), 73 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
index 95da582..ce7bca5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonLayout.cs
@@ -19,7 +19,7 @@
public FrameLayout bottomRadiusFrameLayout = new FrameLayout()
{
- Height = Application.GetRealHeight(906),
+ Height = Application.GetRealHeight(806),
Y = Application.GetRealHeight(930),
BackgroundColor = ZigbeeColor.Current.XMWhite,
};
@@ -56,6 +56,14 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
TextSize = 14,
};
+
+ public Button line = new Button()
+ {
+ Y = Application.GetRealHeight(138),
+ Height = 1,
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+
#endregion
/// <summary>
@@ -181,6 +189,7 @@
this.bottomRadiusFrameLayout.AddChidren(btnCancel);
this.bottomRadiusFrameLayout.AddChidren(btnBottomTitle);
this.bottomRadiusFrameLayout.AddChidren(btnFinish);
+ this.bottomRadiusFrameLayout.AddChidren(line);
}
/// <summary>
@@ -288,8 +297,8 @@
alert.ConfirmClickEvent += () =>
{
var form = new UserCenter.UserMain.SecondAuthenticationForm();
- form.AddForm();
- };
+ form.AddForm();
+ };
}
doorLock.ReSave();
}
@@ -334,7 +343,7 @@
{
var form = new UserCenter.UserMain.SecondAuthenticationForm();
form.AddForm();
- };
+ };
}
/// <summary>
@@ -346,7 +355,7 @@
/// <param name="btnDoorLockPic">闂ㄩ攣鍥剧墖寮�/鍏虫樉绀�</param>
public void RemoteUnlockRequest(ZigBee.Device.DoorLock doorLock, Action action, Button progressButton = null, Button btnDoorLockPic = null, Button btnStatus = null, Button btnDoorLockTitle = null)
{
- if (doorLock.RemoteUnlockPassword == "")
+ if (string.IsNullOrEmpty(doorLock.RemoteUnlockPassword))
{
string msgRemoteUnlockRequest = Language.StringByID(R.MyInternationalizationString.BindRemoteUnlockDoorlock);
var alertRemoteUnlockRequest = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msgRemoteUnlockRequest, Language.StringByID(R.MyInternationalizationString.GoSetting));
@@ -354,43 +363,20 @@
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alertRemoteUnlockRequest.ConfirmClickEvent += () =>
{
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ functionSetting.Show();
+ functionSetting.devicNameAction += (deviceRename) =>
{
- var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- functionSetting.Show();
- functionSetting.devicNameAction += (deviceRename) =>
+ if (!string.IsNullOrEmpty(deviceRename))
{
- if (!string.IsNullOrEmpty(deviceRename))
+ if (btnDoorLockTitle != null)
{
- if (btnDoorLockTitle != null)
- {
- btnDoorLockTitle.Text = deviceRename;
- }
+ btnDoorLockTitle.Text = deviceRename;
}
- };
- }
- else
- {
- var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- functionSettingSub.Show();
- functionSettingSub.devicNameAction += (deviceRename) =>
- {
- if (!string.IsNullOrEmpty(deviceRename))
- {
- if (!string.IsNullOrEmpty(deviceRename))
- {
- if (btnDoorLockTitle != null)
- {
- btnDoorLockTitle.Text = deviceRename;
- }
- }
- }
- };
- }
+ }
+ };
};
return;
}
@@ -405,7 +391,7 @@
{
var form = new UserCenter.UserMain.SecondAuthenticationForm();
form.AddForm();
- };
+ };
return;
}
@@ -525,43 +511,20 @@
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.DoorlockPasswordDispear), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(CommonPage.Instance);
CommonPage.Loading.Hide();
doorLock.RemoteUnlockPassword = "";
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
+ var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ functionSetting.Show();
+ functionSetting.devicNameAction += (deviceRename) =>
{
- var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- functionSetting.Show();
- functionSetting.devicNameAction += (deviceRename) =>
+ if (!string.IsNullOrEmpty(deviceRename))
{
- if (!string.IsNullOrEmpty(deviceRename))
+ if (btnDoorLockTitle != null)
{
- if (btnDoorLockTitle != null)
- {
- btnDoorLockTitle.Text = deviceRename;
- }
+ btnDoorLockTitle.Text = deviceRename;
}
- };
- }
- else
- {
- var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
- Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
- Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- functionSettingSub.Show();
- functionSettingSub.devicNameAction += (deviceRename) =>
- {
- if (!string.IsNullOrEmpty(deviceRename))
- {
- if (!string.IsNullOrEmpty(deviceRename))
- {
- if (btnDoorLockTitle != null)
- {
- btnDoorLockTitle.Text = deviceRename;
- }
- }
- }
- };
- }
+ }
+ };
});
}
}
@@ -600,7 +563,7 @@
});
};
HdlCheckLogic.Current.CheckSecondarySecurity(action);
- };
+ };
}
// 鑾峰彇鍒板埌鍚嶇О鏇存敼鍥炶皟閫氱煡
public Action<string> devicNameSecAction;
--
Gitblit v1.8.0