Merge branch 'dev-cqy（1.5.9）' into Dev-Branch

wxr

2023-04-21 fa9ed0cc5f6a585eb6ac61510ffe7245434275ec

 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs

@@ -605,17 +605,12 @@
                                }
                                if (groupControlLightList.Count == functions.Count)
                                {
                                    if (!btnChooseAll.IsSelected)
                                    {
                                        btnChooseAll.IsSelected = true;
                                    }
                                    btnChooseAll.TextID = StringId.SelectedAll;
                                }
                                else
                                {
                                    if (btnChooseAll.IsSelected)
                                    {
                                        btnChooseAll.IsSelected = false;
                                    }
                                    if(btnChooseAll.TextID != StringId.Cancel)
                                        btnChooseAll.TextID = StringId.Cancel;
                                }
                            };
                            if (groupControl.sids.Find((obj) => obj.sid == function.sid) != null)