20201218-6

wei

2020-12-18 d53f7315de145266e6465d9f95d11d1712b9a91b

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

old mode 100644
new mode 100755
@@ -69,7 +69,7 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextAlignment = TextAlignment.CenterLeft,
                Text = DB_ResidenceData.residenceData.CurFoor,
                Text = DB_ResidenceData.Instance.CurFloor.roomName,
            };
            roomFloorChangeView.AddChidren(btnFloor);
            #endregion
@@ -83,27 +83,27 @@

            if (titleId == StringId.Lights)
            {
                functionList.AddRange(DB_ResidenceData.functionList.lights);
                functionList.AddRange(FunctionList.List.lights);
            }
            else if (titleId == StringId.AC)
            {
                functionList.AddRange(DB_ResidenceData.functionList.aCs);
                functionList.AddRange(FunctionList.List.aCs);
            }
            else if (titleId == StringId.Curtain)
            {
                functionList.AddRange(DB_ResidenceData.functionList.curtains);
                functionList.AddRange(FunctionList.List.curtains);
            }
            else if (titleId == StringId.FloorHeating)
            {
                functionList.AddRange(DB_ResidenceData.functionList.floorHeatings);
                functionList.AddRange(FunctionList.List.floorHeatings);
            }
            else if (titleId == StringId.Electric)
            {
                functionList.AddRange(DB_ResidenceData.functionList.electricals);
                functionList.AddRange(FunctionList.List.electricals);
            }
            else if (titleId == StringId.EnvironmentalScience)
            {
                functionList.AddRange(DB_ResidenceData.functionList.sensorsEnvironmentalScience);
                functionList.AddRange(FunctionList.List.sensorsEnvironmentalScience);
            }
            functionList.OrderByDescending(o => o.usageCount).ToList();