wxr
2020-09-01 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -59,21 +59,21 @@
                                                            switch (functionType)
                                                            {
                                                                case FunctionType.FloorHeating:
                                                                    btnText = DB_ResidenceData.residenceData.functionList.floorHeatings.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.floorHeatings.Count;
                                                                    btnText = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count + "/" + DB_ResidenceData.functionList.floorHeatings.Count;
                                                                    break;
                                                                case FunctionType.AC:
                                                                    btnText = DB_ResidenceData.residenceData.functionList.aCs.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.aCs.Count;
                                                                    btnText = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count + "/" + DB_ResidenceData.functionList.aCs.Count;
                                                                    break;
                                                            }
                                                            break;
                                                        case FunctionCategory.Curtain:
                                                            btnText = DB_ResidenceData.residenceData.functionList.curtains.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.curtains.Count;
                                                            btnText = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count + "/" + DB_ResidenceData.functionList.curtains.Count;
                                                            break;
                                                        case FunctionCategory.Light:
                                                            btnText = DB_ResidenceData.residenceData.functionList.lights.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.lights.Count;
                                                            btnText = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count + "/" + DB_ResidenceData.functionList.lights.Count;
                                                            break;
                                                        case FunctionCategory.Electrical:
                                                            btnText = DB_ResidenceData.residenceData.functionList.electricals.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.electricals.Count;
                                                            btnText = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count + "/" + DB_ResidenceData.functionList.electricals.Count;
                                                            break;
                                                    }
                                                    btn.Text = btnText;
@@ -111,7 +111,7 @@
                            var btn = view1.GetChildren(j) as Button;
                            if (btn.Tag != null && btn.Tag.ToString() == "AllClose")
                            {
                                if (function.on_off == "on")
                                if (function.trait_on_off.value.ToString() == "on")
                                {
                                    btn.Visible = true;
                                }
@@ -123,12 +123,12 @@
                                        {
                                            continue;
                                        }
                                        var r = DB_ResidenceData.residenceData.rooms.Find(s => s.sid == rId);
                                        var r = DB_ResidenceData.rooms.Find(s => s.sid == rId);
                                        if(r == null)
                                        {
                                            continue;
                                        }
                                        var ssd = r.functions.FindAll((obj) => obj.on_off == "on" && obj.functionCategory != FunctionCategory.Scene);
                                        var ssd = r.GetRoomFunctions(false).FindAll((obj) => obj.trait_on_off.value.ToString() == "on" && obj.functionCategory != FunctionCategory.Scene);
                                        var sss = ssd.Count;
                                        if (sss == 0)
                                        {
@@ -154,29 +154,29 @@
                {
                    Action action = () =>
                    {
                        foreach (var f in room.functions)
                        foreach (var f in room.GetRoomFunctions(false))
                        {
                            if (f.functionCategory == FunctionCategory.Scene)
                            {
                                continue;
                            }
                            f.on_off = "off";
                            f.trait_on_off.value = "off";
                            //Control.Send(CommandType_A.write, f);
                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                            d.Add("on_off", f.on_off.ToString());
                            d.Add("on_off", f.trait_on_off.value.ToString());
                            Control.SendWriteCommand(f, d);
                        }
                        btn.Visible = false;
                    };
                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.TipCloseAllFunctionInRoom, action);
                };
                foreach (var f in room.functions)
                foreach (var f in room.GetRoomFunctions(false))
                {
                    if (f.functionCategory == FunctionCategory.Scene)
                    {
                        continue;
                    }
                    if (f.on_off == "on")
                    if (f.trait_on_off.value.ToString() == "on")
                    {
                        btn.Visible = true;
                        break;
@@ -262,12 +262,12 @@
                switch(functionCategory)
                {
                    case ShowFunction.AC:
                        foreach(var f in DB_ResidenceData.residenceData.functionList.aCs)
                        foreach(var f in DB_ResidenceData.functionList.aCs)
                        {
                            f.on_off = btn.IsSelected ? "on" : "off";
                            f.trait_on_off.value = btn.IsSelected ? "on" : "off";
                            //Control.Send(CommandType_A.write, f);
                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                            d.Add("on_off", f.on_off.ToString());
                            d.Add("on_off", f.trait_on_off.value.ToString());
                            Control.SendWriteCommand(f, d);
                        }
                        break;
@@ -275,12 +275,12 @@
                      
                        break;
                    case ShowFunction.Light:
                        foreach (var f in DB_ResidenceData.residenceData.functionList.lights)
                        foreach (var f in DB_ResidenceData.functionList.lights)
                        {
                            f.on_off = btn.IsSelected ? "on" : "off";
                            f.trait_on_off.value = btn.IsSelected ? "on" : "off";
                            //Control.Send(CommandType_A.write, f);
                            System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                            d.Add("on_off", f.on_off.ToString());
                            d.Add("on_off", f.trait_on_off.value.ToString());
                            Control.SendWriteCommand(f, d);
                        }
                        break;
@@ -303,12 +303,12 @@
                }
                btnOpen.IsSelected = true;
                btnClose.IsSelected = false;
                foreach (var f in DB_ResidenceData.residenceData.functionList.curtains)
                foreach (var f in DB_ResidenceData.functionList.curtains)
                {
                    f.on_off = "on";
                    f.trait_on_off.value = "on";
                    //Control.Send(CommandType_A.write, f);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("on_off", f.on_off.ToString());
                    d.Add("on_off", f.trait_on_off.value.ToString());
                    Control.SendWriteCommand(f, d);
                }
            };
@@ -321,12 +321,12 @@
                }
                btnClose.IsSelected = true;
                btnOpen.IsSelected = false;
                foreach (var f in DB_ResidenceData.residenceData.functionList.curtains)
                foreach (var f in DB_ResidenceData.functionList.curtains)
                {
                    f.on_off =  "off";
                    f.trait_on_off.value =  "off";
                    //Control.Send(CommandType_A.write, f);
                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
                    d.Add("on_off", f.on_off.ToString());
                    d.Add("on_off", f.trait_on_off.value.ToString());
                    Control.SendWriteCommand(f, d);
                }
            };