20200928

wxr

2020-09-29 51cb254cbd616e84b7a466b195eb43ab097c3897

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

@@ -191,18 +191,32 @@
                {
                    Action action = () =>
                    {
                        foreach (var f in room.GetRoomFunctions(false))
                        new System.Threading.Thread(() =>
                        {
                            if (f.functionCategory == FunctionCategory.Scene)
                            foreach (var f in room.GetRoomFunctions(false))
                            {
                                continue;
                                if (f.functionCategory == FunctionCategory.Scene)
                                {
                                    continue;
                                }

                                f.trait_on_off.value = "off";
                                //Control.Send(CommandType_A.write, f);
                                Dictionary<string, string> d = new Dictionary<string, string>();
                                d.Add("on_off", f.trait_on_off.value.ToString());
                                Control.SendWriteCommand(f, d);
                            }
                            f.trait_on_off.value = "off";
                            //Control.Send(CommandType_A.write, f);
                            Dictionary<string, string> d = new Dictionary<string, string>();
                            d.Add("on_off", f.trait_on_off.value.ToString());
                            Control.SendWriteCommand(f, d);
                        }

                            foreach (var m in Music.A31MusicModel.A31MusicModelList)
                            {
                                if (m.roomIdList.Contains(room.sid))
                                {
                                    Music.SendMethod.Pause(m);
                                }
                            }
                        })
                        { IsBackground = true }.Start();

                        btn.Visible = false;
                    };
                    new PublicAssmebly().TipMsg(StringId.Tip, StringId.TipCloseAllFunctionInRoom, action);
@@ -310,7 +324,14 @@
                        }
                        break;
                    case ShowFunction.Curtain:
                      
                        //foreach (var f in DB_ResidenceData.functionList.curtains)
                        //{
                        //    f.trait_on_off.value = onoff;
                        //    //Control.Send(CommandType_A.write, f);
                        //    Dictionary<string, string> d = new Dictionary<string, string>();
                        //    d.Add("percent", "100");
                        //    Control.SendWriteCommand(f, d);
                        //}
                        break;
                    case ShowFunction.Light:
                        foreach (var f in DB_ResidenceData.functionList.lights)