From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs
index faf0fb9..b960e83 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/SelectedDeviceView.cs
@@ -18,7 +18,7 @@
public Button iconBtn = new Button
{
Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
+ Height = Application.GetRealWidth(81),
X = Application.GetRealWidth(104),
Y = Application.GetRealHeight(25),
// UnSelectedImagePath = "ZigeeLogic/time.png",
@@ -27,11 +27,12 @@
///
public RowLayout stateRow = new RowLayout
{
- Width = Application.GetRealWidth(800),
+ Width = Application.GetRealWidth(800+58),
Height = Application.GetRealHeight(130),
X = Application.GetRealWidth(222),
- LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
- };
+ LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ SubViewWidth=Application.GetRealWidth(184),//鏀瑰彉缂栬緫鎺т欢瀹藉害澶氬皯锛�
+ };
/// <summary>
/// 鏄剧ず鍚嶅瓧(闄よ澶囩被鍨嬪)
/// </summary>
@@ -49,7 +50,7 @@
/// </summary>
public Button deviceNameBtn = new Button
{
- Y = Application.GetRealHeight(20),
+ Y = Application.GetRealHeight(18),
Height = Application.GetRealHeight(50),
Width = Application.GetRealWidth(400),
TextAlignment = TextAlignment.CenterLeft,
@@ -63,7 +64,7 @@
/// </summary>
public Button regionNameBtn = new Button
{
- Y = Application.GetRealHeight(10 + 70),
+ Y = Application.GetRealHeight(6+ 70),
Width = Application.GetRealWidth(400),
TextAlignment = TextAlignment.CenterLeft,
Height = Application.GetRealHeight(50),
@@ -84,8 +85,15 @@
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
};
-
+ public Button lineBtn = new Button
+ {
+ Width = Application.GetRealWidth(800),
+ // Y=Application.GetRealHeight(130-5),
+ Height =1,//Application.GetRealHeight(5),
+ X = Application.GetRealWidth(222),
+ BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
+ };
/// <summary>
/// 缂栬緫
@@ -109,12 +117,14 @@
middle.AddChidren(selecetdFrameLayout);
selecetdFrameLayout.AddChidren(iconBtn);
selecetdFrameLayout.AddChidren(stateRow);
- stateRow.AddRightView(edit);
- stateRow.AddRightView(del);
+ //stateRow.AddRightView(edit);
+ //stateRow.AddRightView(del);
stateRow.AddChidren(deviceNameBtn);
stateRow.AddChidren(regionNameBtn);
stateRow.AddChidren(ordinaryBtn);
stateRow.AddChidren(selecetddevicestateBtn);
+ lineBtn.Y = selecetdFrameLayout.Height - 1;
+ selecetdFrameLayout.AddChidren(lineBtn);
}
}
--
Gitblit v1.8.0