From 74a9ba8e9a2df9c39f9c2eb212a5ac889a055cd4 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 03 十二月 2019 10:47:51 +0800
Subject: [PATCH] 优化UI细节（请合并最新代码）
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs | 36 +++++++++---------------------------
1 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
index e7062c3..b23a780 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDevicePage.cs
@@ -20,7 +20,6 @@
Button roomTextButton = new Button();
Button devicetypeButton = new Button();
VerticalScrolViewLayout middle;
- HorizontalScrolViewLayout devicetypehorizontalScrol1;
FrameLayout clickframeLayout = new FrameLayout();
Button clickbutton = new Button();
Button clicktextcolcrbutton = new Button();
@@ -122,16 +121,6 @@
};
this.AddChidren(roomhorizontalScrol);
-
- devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
- {
- Width = Application.GetRealWidth(1080 - 58-200),
- Height = Application.GetRealHeight(280),
- Y = roomhorizontalScrol.Bottom,
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- X = Application.GetRealWidth(58+200),
- };
- this.AddChidren(devicetypehorizontalScrol1);
///璁惧绫诲瀷婊戝姩鎺т欢
var devicetypehorizontalScrol = new HorizontalScrolViewLayout()
{
@@ -140,18 +129,20 @@
Y = roomhorizontalScrol.Bottom,
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
X = Application.GetRealWidth(58),
- Radius = (uint)Application.GetRealHeight(50),
+ // Radius = (uint)Application.GetRealHeight(50),
};
this.AddChidren(devicetypehorizontalScrol);
+ devicetypehorizontalScrol.SetCornerWithSameRadius(20, HDLUtils.RectCornerBottomLeft);
middle = new VerticalScrolViewLayout();
middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40);
middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
middle.X = Application.GetRealWidth(58);
- middle.Radius = (uint)Application.GetRealHeight(50);
+ //middle.Radius = (uint)Application.GetRealHeight(50);
this.AddChidren(middle);
+ middle.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft);
///鐩墠鏀寔鐨勮澶�
List<DeviceType> deviceTypeList = new List<DeviceType> {
@@ -353,14 +344,12 @@
}
if (list.Count == 0)
{
- devicetypehorizontalScrol.Height = 0;
- devicetypehorizontalScrol1.Height = 0;
+ devicetypehorizontalScrol.Height = 0;
middle.Height = 0;
}
else
{
devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
- devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);
middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
}
AllDeviceTypeView(list, devicetypehorizontalScrol);
@@ -393,13 +382,11 @@
if (list.Count == 0)
{
devicetypehorizontalScrol.Height = 0;
- devicetypehorizontalScrol1.Height = 0;
middle.Height = 0;
}
else
{
devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
- devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);
middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
}
AllDeviceTypeView(list, devicetypehorizontalScrol);
@@ -693,14 +680,6 @@
{
flMain.RemoveFromParent();
};
- var devicefra1 = new FrameLayout
- {
- Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(100),
- Y = Application.GetRealHeight(1920 - 100),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- };
- flMain.AddChidren(devicefra1);
var devicefra = new FrameLayout
{
@@ -709,9 +688,10 @@
Height = Application.GetRealHeight(530 + 160),
Y = Application.GetRealHeight(1920 - 530 - 160),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- Radius = (uint)Application.GetRealHeight(60),
+ //Radius = (uint)Application.GetRealHeight(60),
};
flMain.AddChidren(devicefra);
+ devicefra.SetCornerWithSameRadius(20, HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
#region -------鍙栨秷 瀹屾垚
var timetype = new RowLayout
@@ -1947,6 +1927,8 @@
openBtnSelected.Visible = false;
closeBtnSelected.Visible = true;
pausePickerViewfra.Height = Application.GetRealHeight(600);
+ //濡傛灉绌鸿皟鐘舵�佹槸鍏筹紱鐩存帴璺冲嚭for寰潖锛�
+ break;
}
}
--
Gitblit v1.8.0