From 9b76aa77b9c5bf8ccb373cb30e3dca85d224175e Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 25 十月 2024 11:36:49 +0800
Subject: [PATCH] 金茂UI走查,字体更换

---
 HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs
index 3005623..dfb6147 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs
@@ -62,10 +62,15 @@
 
             var contentView = new VerticalScrolViewLayout()
             {
-                Y = Application.GetRealHeight(74 + 16),
+                Y = Application.GetRealHeight(74 ),
                 Height = Application.GetRealHeight(Application.DesignHeight - 74),
             };
             bodyView.AddChidren(contentView);
+
+            contentView.AddChidren(new Button()
+            {
+                Height = Application.GetRealWidth(16)
+            });
 
             #region 娓╁害鍊�
             infoView1 = new FrameLayout()
@@ -130,7 +135,9 @@
                 IsSelected = false,
             };
             infoView1_DateView.AddChidren(infoView1_Date_Month);
-
+#if __IOS__
+            infoView1_DateView.AddChidren(new Button() { Width = Application.GetRealWidth(2) });
+#endif
             infoView1_Date_Year = new Button()
             {
                 Width = Application.GetRealWidth(103),
@@ -269,7 +276,6 @@
                 Height = Application.GetRealWidth(16)
             });
 
-
             if (function.attributes.Find((obj) => obj.key == WaterHeaterJinmao_AttrEnum.volume.ToString()) != null)
             {
                 #region 鐢ㄦ按閲�
@@ -338,7 +344,9 @@
                     IsSelected = false,
                 };
                 infoView2_DateView.AddChidren(infoView2_Date_Month);
-
+#if __IOS__
+                infoView2_DateView.AddChidren(new Button() { Width = Application.GetRealWidth(2) });
+#endif
 
                 infoView2_Date_Year = new Button()
                 {
@@ -989,7 +997,7 @@
                 Radius = (uint)Application.GetRealWidth(12),
             };
             optionBaseView.AddChidren(topView);
-            topView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
+            optionBaseView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
 
             var btnCancel = new Button()
             {
@@ -1004,7 +1012,7 @@
 
             var btnConfrim = new Button()
             {
-                X = Application.GetRealWidth(160),
+                X = Application.GetRealWidth(163),
                 Width = Application.GetRealWidth(160),
                 TextAlignment = TextAlignment.CenterRight,
                 TextColor = CSS_Color.MainColor,
@@ -1320,7 +1328,7 @@
                 Radius = (uint)Application.GetRealWidth(12),
             };
             optionBaseView.AddChidren(topView);
-            topView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
+            optionBaseView.AddChidren(new Button() { Y = Application.GetRealHeight(39), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
 
             var btnCancel = new Button()
             {

--
Gitblit v1.8.0