Merge branch 'Dev-Branch-2024' into wjc

mac

2024-07-25 16bea1d248f0010049bceaa562939297fa26b130

 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,6 +389,16 @@
                                        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
@@ -423,6 +437,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;
                            }