20200914

wxr

2020-09-14 a251442d9fc088b3d8cf74d20b959f0f6103b095

 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs

@@ -62,7 +62,7 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextAlignment = TextAlignment.CenterLeft,
                Text = OnAppConfig.Instance.CurFoor,
                Text = DB_ResidenceData.residenceData.CurFoor,
            };
            roomFloorChangeView.AddChidren(btnFoor);
            #endregion
@@ -74,7 +74,7 @@
            };
            bodyView.AddChidren(functionListView);

            foreach (var function in DB_ResidenceData.residenceData.functionList.functions)
            foreach (var function in DB_ResidenceData.functionList.GetAllFunction())
            {
                if (titleId == StringId.Lights)
                {
@@ -116,10 +116,7 @@
                if (titleId == StringId.EnvironmentalScience)
                {

                    if (function.functionType != FunctionType.PM10 ||
                    function.functionType != FunctionType.PM25 ||
                    function.functionType != FunctionType.Noise ||
                    function.functionType != FunctionType.WindPower ||
                    if (function.functionType != FunctionType.PM25 ||
                    function.functionType != FunctionType.CO2 ||
                    function.functionType != FunctionType.Temp ||
                    function.functionType != FunctionType.TVOC ||
@@ -139,7 +136,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.functionCategory.ToString() + "-" + function.functionType
                        Tag = function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);
@@ -155,7 +152,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.functionCategory.ToString() + "-" + function.functionType
                        Tag = function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);