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/EveryyearPage.cs | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs
index 8fe135a..abeb168 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EveryyearPage.cs
@@ -25,15 +25,16 @@
var titleName = new Button
{
TextID = MyInternationalizationString.cycle,
- TextSize = 17,
+ TextSize = 16,
TextColor = ZigbeeColor.Current.LogicTextBlackColor,
+ IsBold = true,
};
topFrameLayout.AddChidren(titleName);
var hdl = new Button
{
Width = Application.GetRealWidth(154),
- Height = Application.GetRealHeight(90),
+ Height = Application.GetRealWidth(90),
X = Application.GetRealWidth(1080 - 160),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "Logo/Logo.png",
@@ -43,7 +44,7 @@
var back = new Button
{
Width = Application.GetRealWidth(110),
- Height = Application.GetRealHeight(110),
+ Height = Application.GetRealWidth(110),
X = Application.GetRealWidth(20),
Gravity = Gravity.CenterVertical,
UnSelectedImagePath = "ZigeeLogic/Back.png",
@@ -76,7 +77,7 @@
var middle = new VerticalScrolViewLayout();
middle.Y = titlerl.Bottom;
- middle.Height = Application.GetRealHeight(1920 - 220 - 180);
+ middle.Height = Application.GetRealHeight(Method.H - 220 - 180);
middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
this.AddChidren(middle);
@@ -116,7 +117,7 @@
var btnStartdateback = new Button
{
Width = Application.GetRealWidth(110),
- Height = Application.GetRealHeight(110),
+ Height = Application.GetRealWidth(110),
UnSelectedImagePath = "ZigeeLogic/next.png",
X = Application.GetRealWidth(1080 - 140),
Gravity = Gravity.CenterVertical,
@@ -159,7 +160,7 @@
var btnenddateback = new Button
{
Width = Application.GetRealWidth(110),
- Height = Application.GetRealHeight(110),
+ Height = Application.GetRealWidth(110),
UnSelectedImagePath = "ZigeeLogic/next.png",
X = Application.GetRealWidth(1080 - 140),
Gravity = Gravity.CenterVertical,
--
Gitblit v1.8.0