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/CompleteView.cs | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
index 4a26274..34d8e4c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
@@ -11,7 +11,7 @@
{
Width = Application.GetRealWidth(1080),
Height = Application.GetRealHeight(140 + 320 + 70),
- Y = Application.GetRealHeight(1920 - 530),
+ Y = Application.GetRealHeight(Method.H - 530),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
// Radius = (uint)Application.GetRealHeight(60),
};
@@ -26,30 +26,33 @@
TextID = MyInternationalizationString.cancel,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(200),
+ Width = Application.GetRealWidth(150),
X = Application.GetRealWidth(80),
TextAlignment = TextAlignment.CenterLeft,
TextSize = 14,
+
};
public Button Btntitle = new Button
{
//TextID = MyInternationalizationString.type,
TextColor = ZigbeeColor.Current.LogicBtnTypeColor,
Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(420),
+ Width = Application.GetRealWidth(580),
TextAlignment = TextAlignment.Center,
- X = Application.GetRealWidth(280 + 50),
+ X = Application.GetRealWidth(230+20),
TextSize = 16,
+
};
public Button Btncomplete = new Button
{
TextID = MyInternationalizationString.complete,
TextColor = ZigbeeColor.Current.LogicBtnCompleteColor,
Height = Application.GetRealHeight(140),
- Width = Application.GetRealWidth(200),
+ Width = Application.GetRealWidth(150),
TextAlignment = TextAlignment.CenterRight,
- X = Application.GetRealWidth(750+50),
+ X = Application.GetRealWidth(850),
TextSize = 14,
+
};
#endregion
@@ -57,12 +60,15 @@
{
//n澶氬皯琛�
fraView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
- fraView.Height = Application.GetRealHeight(140 + 70 + 160 * n);
+ fraView.Height = Application.GetRealHeight(1+140 + 70 + 160 * n);//1浣滅敤灏辨槸瑕嗙洊搴曡壊
fraView.Y = Application.GetRealHeight(1920 - 140 - 70 - 160 * n);
- fraView.AddChidren(titleRow);
- fraView.AddChidren(Btncancel);
- fraView.AddChidren(Btntitle);
- fraView.AddChidren(Btncomplete);
+ if (titleRow.Parent == null)
+ {
+ fraView.AddChidren(titleRow);
+ fraView.AddChidren(Btncancel);
+ fraView.AddChidren(Btntitle);
+ fraView.AddChidren(Btncomplete);
+ }
return fraView;
}
--
Gitblit v1.8.0