水阀功能

wei

2021-02-01 8da70e1a39328e1769b02bb1e05303916bb30eb5

 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 FunctionType.FloorHeating:
                //        break;
                //    case FunctionType.AC:
                //        break;
                //    case FunctionType.MotorCurtain:
                //    case FunctionType.Curtain:
                //    case FunctionType.RollingShutter:
                //        break;
                //    case FunctionType.Relay:
                //    case FunctionType.Dimmer:
                //    case FunctionType.RGB:
                //    case FunctionType.ColorTemperature:
                //        break;
                //    case FunctionType.Socket:
                //        break;
                //}
                FrameLayout functionView = new FrameLayout()
                {
                    Height = Application.GetRealWidth(161),
@@ -528,7 +506,6 @@
                    Tag = item + "_View",
                    Y = index % 2 == 1 ? lastY2 : lastY1
                };
                MainPage.Log($"Load FunctionView Tag = {item}");
                //高度稍高的view
                if (specialList.Contains(index))
                {
@@ -551,6 +528,7 @@
                {
                    s2View.AddChidren(functionView);
                }
                functionContentViewHeight = functionView.Bottom;


                Button btnName = new Button()
@@ -564,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;
@@ -769,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
@@ -928,7 +907,7 @@
                        Text = floor.roomName,
                        TextSize = CSS_FontSize.SubheadingFontSize,
                        IsSelected = floor.roomId == DB_ResidenceData.Instance.ClassificationChooseFloor.roomId,
                        IsMoreLines = true,
                        //IsMoreLines = true,
                    };
                    contentView.AddChidren(btnHomeName);