From 7232642ff48a7fbde2018cde652f3e771fa58025 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 27 一月 2021 14:32:55 +0800
Subject: [PATCH] 20200127-英文版处理

---
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs |   90 +++++++++++++++++---------------------------
 1 files changed, 35 insertions(+), 55 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 3e62c97..c44b3d0 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -430,6 +430,7 @@
 
             var lastY1 = Application.GetRealWidth(16);
             var lastY2 = Application.GetRealWidth(16);
+            var functionContentViewHeight = Application.GetRealWidth(16);
 
             var functionCategoryCount = 0;
 
@@ -495,31 +496,8 @@
 
                 }
 
-                if (functionCount == 0 && item != ShowFunction.Music)
-                {
-                    continue;
-                }
                 functionCategoryCount++;
 
-                //FunctionType ft = FunctionType.A31Music
-                //switch (item)
-                //{
-                //    case SPK.FloorHeatStandard:
-                //        break;
-                //    case SPK.AcStandard:
-                //        break;
-                //    case SPK.CurtainTrietex:
-                //    case SPK.CurtainSwitch:
-                //    case SPK.CurtainRoller:
-                //        break;
-                //    case SPK.LightSwitch:
-                //    case SPK.LightDimming:
-                //    case SPK.LightRGB:
-                //    case SPK.LightCCT:
-                //        break;
-                //    case SPK.ElectricSocket:
-                //        break;
-                //}
                 FrameLayout functionView = new FrameLayout()
                 {
                     Height = Application.GetRealWidth(161),
@@ -550,6 +528,7 @@
                 {
                     s2View.AddChidren(functionView);
                 }
+                functionContentViewHeight = functionView.Bottom;
 
 
                 Button btnName = new Button()
@@ -563,6 +542,36 @@
                     TextAlignment = TextAlignment.CenterLeft,
                 };
                 functionView.AddChidren(btnName);
+
+                if (item != ShowFunction.Environmental && functionCount != 0)
+                {
+                    Button btnFunctionCount = new Button()
+                    {
+                        X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
+                        Y = btnName.Bottom,
+                        Width = Application.GetRealWidth(120),
+                        Height = Application.GetRealHeight(24),
+                        TextColor = CSS_Color.PromptingColor1,
+                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                        TextAlignment = TextAlignment.CenterLeft,
+                        Text = "/" + functionCount,
+                    };
+                    functionView.AddChidren(btnFunctionCount);
+                    Button btnOpenCount = new Button()
+                    {
+                        X = Application.GetRealWidth(16),
+                        Y = btnName.Bottom,
+                        Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
+                        Height = Application.GetRealHeight(24),
+                        TextColor = CSS_Color.MainColor,
+                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                        TextAlignment = TextAlignment.CenterLeft,
+                        Text = functionOnCount.ToString(),
+                        Tag = item + "_onCount",
+                        BorderWidth = 0,
+                    };
+                    functionView.AddChidren(btnOpenCount);
+                }
 
 
                 Button btnFunctionViewBg;
@@ -768,42 +777,13 @@
                         MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                     };
                 }
-                if (item != ShowFunction.Environmental && functionCount != 0)
-                {
-                    Button btnFunctionCount = new Button()
-                    {
-                        X = Application.GetRealWidth(17) + Application.GetRealWidth(7 * functionCount.ToString().Length),
-                        Y = btnName.Bottom,
-                        Width = Application.GetRealWidth(120),
-                        Height = Application.GetRealHeight(24),
-                        TextColor = CSS_Color.PromptingColor1,
-                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                        TextAlignment = TextAlignment.CenterLeft,
-                        Text = "/" + functionCount,
-                    };
-                    functionView.AddChidren(btnFunctionCount);
-                    Button btnOpenCount = new Button()
-                    {
-                        X = Application.GetRealWidth(16),
-                        Y = btnName.Bottom,
-                        Width = Application.GetRealWidth(14 * functionCount.ToString().Length),
-                        Height = Application.GetRealHeight(24),
-                        TextColor = CSS_Color.MainColor,
-                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
-                        TextAlignment = TextAlignment.CenterLeft,
-                        Text = functionOnCount.ToString(),
-                        Tag = item + "_onCount",
-                        BorderWidth = 0,
-                    };
-                    functionView.AddChidren(btnOpenCount);
-                }
                 index++;
             }
 
-            if (functionCategoryCount > 4)
+            //if (functionCategoryCount > 4)
             {
-                functionContentView.Height = Application.GetRealHeight((220 * functionCategoryCount / 2) + 20);
-                s1View.Height = s2View.Height = functionContentView.Height;
+                //functionContentView.Height = functionContentViewHeight;// Application.GetRealWidth((240 * (functionCategoryCount / 2)));
+                s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight+ Application.GetRealWidth(40);
             }
 
             #endregion

--
Gitblit v1.8.0