From 3291885285dfd5d4f665c20676307878dc3163bc Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 20 十二月 2019 16:28:53 +0800
Subject: [PATCH] 请合并最新代码（优化设备不支持的功能）
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
index 03a5d1a..10be4e8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSettingSub.cs
@@ -145,10 +145,9 @@
if (i == 0)
{
bottomRowLayout.Y = Application.GetRealHeight(220);
- btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm);
- btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = Application.GetRealWidth(233);
- btnNext.Text = doorLock.DeviceName;
+ btnName.Text = Language.StringByID(R.MyInternationalizationString.DeviceRemarkXm) + ":";
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58 - 20);
+ btnNextFrameLayout.X = Application.GetRealWidth(233 + 20);
var btnDeviceNameEditText = new EditText()
{
X = Application.GetRealWidth(46),
@@ -220,9 +219,8 @@
{
bottomRowLayout.Y = Application.GetRealHeight(481);
btnName.Text = Language.StringByID(R.MyInternationalizationString.BelongModel) + ":";
- btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58);
- btnNextFrameLayout.X = Application.GetRealWidth(233);
-
+ btnNextFrameLayout.Width = btnNext.Width = Application.GetRealWidth(789 - 58 - 20);
+ btnNextFrameLayout.X = Application.GetRealWidth(253);
btnNext.TextAlignment = TextAlignment.CenterLeft;
btnNext.Height = Application.GetRealHeight(58);
btnNext.Text = doorLock.DeviceName;
--
Gitblit v1.8.0