Merge branch 'Dev-Branch' into wjc

wjc

2023-06-07 ad51f05f31440bcc64e0ef248ab32fd12997e565

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

@@ -384,7 +384,9 @@
                                    try
                                    {
                                        var addTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());
                                        FunctionList.List.groupControls.AddRange(addTemp);
                                        if (addTemp != null && addTemp.Count > 0)
                                            groupControl.userDeviceGroupControlId = addTemp[0].userDeviceGroupControlId;
                                        FunctionList.List.groupControls.Add(groupControl);
                                    }
                                    catch (Exception ex)
                                    {
@@ -681,7 +683,7 @@
                    btnChooseAll.TextID = StringId.SelectAll;
                    btnConfrim.IsSelected = false;
                    btnChooseAll.MouseUpEventHandler = (sender2, e2) => {
                        if (groupControlLightList.Count > 0)
                        if (groupControlLightList.Count == listFunc.Count)
                        {
                            groupControlLightList.Clear();
                            btnChooseAll.TextID = StringId.SelectAll;
@@ -689,6 +691,7 @@
                        }
                        else
                        {
                            groupControlLightList.Clear();
                            groupControlLightList.AddRange(listFunc);
                            btnChooseAll.TextID = StringId.Cancel;
                            btnConfrim.IsSelected = true;