Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

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

@@ -231,6 +231,10 @@
                };
                foreach (var f in room.GetRoomFunctions(false))
                {
                    //if(f.spk == SPK.OtherCommon)
                    //{
                    //    continue;
                    //}
                    if (f.trait_on_off.curValue.ToString() == "on")
                    {
                        btn.Visible = true;
@@ -385,12 +389,30 @@
                                        System.Threading.Thread.Sleep(sleepTime);
                                    }
                                    break;
                                case ShowFunction.MechanicalArm:
                                    foreach (var f in FunctionList.List.GetMechanicalArmList())
                                    {
                                        f.trait_on_off.curValue = onoff;
                                        Dictionary<string, string> d = new Dictionary<string, string>();
                                        d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
                                        Control.Ins.SendWriteCommand(f, d);
                                        System.Threading.Thread.Sleep(sleepTime);
                                    }
                                    break;
                            }
                        }
                        else
                        {
                            switch (functionCategory)
                            {
                                case ShowFunction.FreshAir:
                                    List<Function> faList = new List<Function>();
                                    foreach (var f in FunctionList.List.GetAirFreshList())
                                    {
                                        faList.Add(f);
                                    }
                                    Control.Ins.SwtichFunctions(onoff == "on", faList);
                                    break;
                                case ShowFunction.AC:
                                    List<Function> acList = new List<Function>();
                                    foreach(var f in FunctionList.List.GetAcList())
@@ -423,6 +445,14 @@
                                    }
                                    Control.Ins.SwtichFunctions(onoff == "on", eleList);
                                    break;
                                case ShowFunction.MechanicalArm:
                                    List<Function> meArmList = new List<Function>();
                                    foreach (var f in FunctionList.List.GetMechanicalArmList())
                                    {
                                        meArmList.Add(f);
                                    }
                                    Control.Ins.SwtichFunctions(onoff == "on", meArmList);
                                    break;
                            }


@@ -430,7 +460,7 @@
                    }
                    catch (Exception ex)
                    {
                        MainPage.Log($"{functionCategory}全开全关失败:{ex.Message}");
                        MainPage.Log("Error", $"{functionCategory}全开全关失败:{ex.Message}");
                    }
                    finally
                    {