Merge branch 'wxr-2.1' into wxr-2.0

wxr

2023-09-06 c2348ebb81ca12b72eee6fbe9eee47925c1a5b07

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

@@ -441,11 +441,16 @@
                                MainPage.Log($"新增群控转换数据异常:{ex.Message}");
                            }
                        }
                        var waitPage = new Loading();
                        bodyView.AddChidren(waitPage);
                        waitPage.Start("");
                        new Thread(() =>
                        {
                        try
                        {
                            groupControl.type = groupControlType.type;
                            groupControl.sid = groupControl.NewGroupControlSid();
                            var pack = Common.ApiUtlis.Ins.HttpRequest.AddGroupControl(new List<GroupControl>() { groupControl });
                                var pack = ApiUtlis.Ins.HttpRequest.AddGroupControl(new List<GroupControl>() { groupControl });
                            if (pack != null)
                            {
                                if (pack.Code == StateCode.SUCCESS)
@@ -461,21 +466,43 @@
                                    {
                                        MainPage.Log($"添加群控异常，转译返回数据失败:{ex.Message}");
                                    }
                                        Application.RunOnMainThread(() =>
                                        {
                                    addActon?.Invoke(groupControl);
                                    this.RemoveFromParent();
                                        });
                                }
                                else
                                {
                                    IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                                }
                            }

                        }
                        catch (Exception ex)
                        {
                            MainPage.Log($"新增群控异常:{ex.Message}");
                        }
                            finally
                            {
                                Application.RunOnMainThread(() => {
                                    try
                                    {
                                        waitPage.Hide();
                                        waitPage = null;
                                    }
                                    catch { }
                                });
                            }
                        })
                        { IsBackground = true }.Start();
                    }
                    else
                    {
                        var waitPage = new Loading();
                        bodyView.AddChidren(waitPage);
                        waitPage.Start("");
                        new Thread(() =>
                    {
                        try
                        {
@@ -504,7 +531,7 @@
                                }
                            }

                            var pack = Common.ApiUtlis.Ins.HttpRequest.EditGroupControl(new List<GroupControl>() { groupControl });
                                var pack = ApiUtlis.Ins.HttpRequest.EditGroupControl(new List<GroupControl>() { groupControl });
                            if (pack != null)
                            {
                                if (pack.Code == StateCode.SUCCESS)
@@ -514,8 +541,11 @@
                                    {
                                        temp = groupControl;
                                    }
                                        Application.RunOnMainThread(() =>
                                        {
                                    addActon?.Invoke(temp);
                                    this.RemoveFromParent();
                                        });
                                }
                                else
                                {
@@ -527,6 +557,21 @@
                        {
                            MainPage.Log($"编辑群控异常:{ex.Message}");
                        }
                            finally
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    try
                                    {
                                        waitPage.Hide();
                                        waitPage = null;
                                    }
                                    catch { }
                                });

                            }
                        })
                        { IsBackground = true }.Start();

                    }
                }