Revert "Merge branch 'tzy' into NewFilePath"

wxr

2020-12-17 1a13c963a5fb8cad92bf03667e411f46d6a6a843

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

@@ -68,21 +68,21 @@
                                                                switch (functionType)
                                                                {
                                                                    case FunctionType.FloorHeating:
                                                                        btnText = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                        btnText = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                        break;
                                                                    case FunctionType.AC:
                                                                        btnText = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                        btnText = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                        break;
                                                                }
                                                                break;
                                                            case FunctionCategory.Curtain:
                                                                btnText = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                btnText = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                break;
                                                            case FunctionCategory.Light:
                                                                btnText = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                btnText = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                break;
                                                            case FunctionCategory.Electrical:
                                                                btnText = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                btnText = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
                                                                break;
                                                        }
                                                        btn.Text = btnText;
@@ -96,21 +96,21 @@
                                                                switch (functionType)
                                                                {
                                                                    case FunctionType.FloorHeating:
                                                                        openCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                        openCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                        break;
                                                                    case FunctionType.AC:
                                                                        openCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                        openCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                        break;
                                                                }
                                                                break;
                                                            case FunctionCategory.Curtain:
                                                                openCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                openCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                break;
                                                            case FunctionCategory.Light:
                                                                openCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                openCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                break;
                                                            case FunctionCategory.Electrical:
                                                                openCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                openCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
                                                                break;
                                                        }
                                                        btn.IsSelected = openCount != 0;
@@ -161,7 +161,7 @@
                                        {
                                            continue;
                                        }
                                        var r = DB_ResidenceData.Rooms.Find(s => s.uid == rId);
                                        var r = SpatialInfo.CurrentSpatial.RoomList.Find(s => s.roomId == rId);
                                        if(r == null)
                                        {
                                            continue;
@@ -209,7 +209,7 @@

                            foreach (var m in Music.A31MusicModel.A31MusicModelList)
                            {
                                if (m.roomIds.Contains(room.uid))
                                if (m.roomIds.Contains(room.roomId))
                                {
                                    Music.SendMethod.Pause(m);
                                }
@@ -219,7 +219,7 @@

                        btn.Visible = false;
                    };
                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.TipCloseAllFunctionInRoom, action);
                    new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.TipCloseAllFunctionInRoom, action);
                };
                foreach (var f in room.GetRoomFunctions(false))
                {
@@ -314,7 +314,7 @@
                switch (functionCategory)
                {
                    case ShowFunction.AC:
                        foreach(var f in DB_ResidenceData.functionList.aCs)
                        foreach(var f in FunctionList.List.aCs)
                        {
                            f.trait_on_off.curValue = onoff;
                            //Control.Send(CommandType_A.write, f);
@@ -324,7 +324,7 @@
                        }
                        break;
                    case ShowFunction.Curtain:
                        //foreach (var f in DB_ResidenceData.functionList.curtains)
                        //foreach (var f in FunctionList.List.curtains)
                        //{
                        //    f.trait_on_off.value = onoff;
                        //    //Control.Send(CommandType_A.write, f);
@@ -334,7 +334,7 @@
                        //}
                        break;
                    case ShowFunction.Light:
                        foreach (var f in DB_ResidenceData.functionList.lights)
                        foreach (var f in FunctionList.List.lights)
                        {
                            f.trait_on_off.curValue = onoff;
                            //Control.Send(CommandType_A.write, f);
@@ -356,7 +356,10 @@
        {
            btnOpen.MouseUpEventHandler = (sender, e) =>
            {
                foreach (var f in DB_ResidenceData.functionList.curtains)
                DB_ResidenceData.Instance.GlobalCurtainStatus = true;
                btnOpen.IsSelected = true;
                btnClose.IsSelected = false;
                foreach (var f in FunctionList.List.curtains)
                {
                    f.trait_on_off.curValue = "on";
                    f.percent = 100;
@@ -368,7 +371,10 @@

            btnClose.MouseUpEventHandler = (sender, e) =>
            {
                foreach (var f in DB_ResidenceData.functionList.curtains)
                DB_ResidenceData.Instance.GlobalCurtainStatus = false;
                btnClose.IsSelected = true;
                btnOpen.IsSelected = false;
                foreach (var f in FunctionList.List.curtains)
                {
                    f.trait_on_off.curValue =  "off";
                    f.percent = 0;