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 | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
index ce135b9..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),
};
@@ -62,10 +62,13 @@
fraView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
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