From 34e965100d635346e2d4cd6e6013bdaed66b3004 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 02 一月 2020 19:52:13 +0800
Subject: [PATCH] 2019.1.2-3
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 71 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 26 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
index 0d18c15..2fdcbd5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
@@ -73,36 +73,50 @@
BackgroundImagePath = "DoorLock/DoorlockPicture.png",
};
this.midFrameLayout.AddChidren(MidTopFrameLayout);
+
+ var btnDeviceText = new Button()
+ {
+ Y = Application.GetRealHeight(288),
+ Height = Application.GetRealHeight(60),
+ Gravity = Gravity.CenterHorizontal,
+ TextColor = ZigbeeColor.Current.XMBlack,
+ TextSize = 15,
+ Text = Common.LocalDevice.Current.GetDeviceMacName(doorLock),
+ };
+ this.midFrameLayout.AddChidren(btnDeviceText);
+
BottomFrameLayout();
}
public void BottomFrameLayout()
{
#region UI
+ //var bottomFrameLayout = new FrameLayout()
+ //{
+ // Height = Application.GetRealHeight(100),
+ // Y = Application.GetRealHeight(418),
+ // Radius = 17,
+ // BackgroundColor = ZigbeeColor.Current.XMWhite,
+ //};
+ //this.midFrameLayout.AddChidren(bottomFrameLayout);
+
+ //var bottomFrameLayout1 = new FrameLayout()
+ //{
+ // Height = Application.GetRealHeight(1319 - 50),
+ // Y = Application.GetRealHeight(418 + 48),
+ // BackgroundColor = ZigbeeColor.Current.XMWhite,
+ //};
+ //this.midFrameLayout.AddChidren(bottomFrameLayout1);
+
var bottomFrameLayout = new FrameLayout()
{
- Height = Application.GetRealHeight(100),
+ Height = Application.GetRealHeight(1319),
Y = Application.GetRealHeight(418),
- Radius = 17,
BackgroundColor = ZigbeeColor.Current.XMWhite,
- };
+ };
this.midFrameLayout.AddChidren(bottomFrameLayout);
-
- var bottomFrameLayout1 = new FrameLayout()
- {
- Height = Application.GetRealHeight(1319 - 50),
- Y = Application.GetRealHeight(418 + 48),
- BackgroundColor = ZigbeeColor.Current.XMWhite,
- };
- this.midFrameLayout.AddChidren(bottomFrameLayout1);
-
- var bottomFrameLayout2 = new FrameLayout()
- {
- Height = Application.GetRealHeight(1000),
- Y = Application.GetRealHeight(418),
- };
- this.midFrameLayout.AddChidren(bottomFrameLayout2);
-
+ bottomFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+
var informationEdit = new Button()
{
Height = Application.GetRealHeight(60),
@@ -113,7 +127,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = 15,
};
- bottomFrameLayout2.AddChidren(informationEdit);
+ bottomFrameLayout.AddChidren(informationEdit);
for (int i = 0; i < 6; i++)
{
@@ -121,7 +135,7 @@
{
Height = Application.GetRealHeight(58),
};
- bottomFrameLayout2.AddChidren(bottomRowLayout);
+ bottomFrameLayout.AddChidren(bottomRowLayout);
var btnName = new Button()
{
@@ -158,7 +172,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
Visible = false,
};
- bottomFrameLayout2.AddChidren(btnLine);
+ bottomFrameLayout.AddChidren(btnLine);
if (i == 0)
{
@@ -172,6 +186,7 @@
Width = Application.GetRealWidth(731),
Height = Application.GetRealHeight(58),
TextColor = ZigbeeColor.Current.XMGray3,
+ TextSize = 14,
PlaceholderTextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor2,
TextAlignment = TextAlignment.CenterLeft,
Text = string.IsNullOrEmpty(doorLock.DeviceName) ? Language.StringByID(R.MyInternationalizationString.UNKnown) : doorLock.DeviceName,
@@ -244,7 +259,7 @@
btnNext.Height = Application.GetRealHeight(58);
btnNext.Text = doorLock.DeviceName;
btnNext.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
-
+ btnNext.TextSize = 14;
btnLine.Visible = true;
btnLine.Y = Application.GetRealHeight(575);
}
@@ -370,10 +385,13 @@
}
}
};
- bottomRowLayout.MouseDownEventHandler += eHandler;
btnNext.MouseDownEventHandler += eHandler;
- btnName.MouseDownEventHandler += eHandler;
- btnNextFrameLayout.MouseDownEventHandler += eHandler;
+ if (i != 4)
+ {
+ bottomRowLayout.MouseDownEventHandler += eHandler;
+ btnName.MouseDownEventHandler += eHandler;
+ btnNextFrameLayout.MouseDownEventHandler += eHandler;
+ }
#endregion
}
@@ -389,6 +407,7 @@
BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
TextSize = 16,
+ IsBold =true,
};
this.midFrameLayout.AddChidren(btnFinifh);
btnFinifh.MouseUpEventHandler += (sender, e) =>
--
Gitblit v1.8.0