From 81307af66465a6b5ba189b0fb9b347787f004a4e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 30 十二月 2020 16:14:15 +0800
Subject: [PATCH] 2020-12-30-1
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
index ce135b9..9417b29 100644
--- 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),
};
@@ -39,7 +39,7 @@
Height = Application.GetRealHeight(140),
Width = Application.GetRealWidth(580),
TextAlignment = TextAlignment.Center,
- X = Application.GetRealWidth(230+20),
+ X = Application.GetRealWidth(230 + 20),
TextSize = 16,
};
@@ -55,17 +55,20 @@
};
#endregion
-
+
public FrameLayout Show(int n)
{
//n澶氬皯琛�
fraView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
- fraView.Height = Application.GetRealHeight(1+140 + 70 + 160 * n);//1浣滅敤灏辨槸瑕嗙洊搴曡壊
+ 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