Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

mac

2023-08-29 2d5cd35af7437ad4015d38594d8c721dc6166b11

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

@@ -4,6 +4,7 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Newtonsoft.Json;
using Shared;

namespace HDL_ON.UI
@@ -29,7 +30,10 @@
                        var page = new AddGroupControlPage(null,
                            (newGC) =>
                            {
                                ReadGroupControlList();
                                Application.RunOnMainThread(() =>
                                {
                                    LoadGroupControlView();
                                });
                            }, () => { });
                        MainPage.BasePageView.AddChidren(page);
                        page.LoadPage();
@@ -71,8 +75,57 @@
                    {
                        try
                        {
                            FunctionList.List.groupControls.Clear();
                            FunctionList.List.groupControls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());
                            //FunctionList.List.groupControls.Clear();
                            //FunctionList.List.groupControls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());

                            try
                            {
                                var groupControlList = JsonConvert.DeserializeObject<List<GroupControl>>(pack.Data.ToString());
                                var readSidList = new List<string>();
                                foreach (var temp in groupControlList)
                                {
                                    FunctionList.List.groupControls.Clear();
                                    readSidList.Add(temp.userDeviceGroupControlId);
                                    if (readSidList.Count >= 20)
                                    {
                                        var data = ApiUtlis.Ins.HttpRequest.GetGroupControInfo(readSidList);
                                        if (data != null)
                                        {
                                            if (data.Code == StateCode.SUCCESS)
                                            {
                                                var groupControlInfoList = JsonConvert.DeserializeObject<List<GroupControl>>(data.Data.ToString());
                                                FunctionList.List.groupControls.AddRange(groupControlInfoList);
                                            }
                                            else
                                            {
                                                IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                                            }
                                        }
                                        readSidList.Clear();
                                    }
                                }
                                if (readSidList.Count > 0)
                                {
                                    var data = ApiUtlis.Ins.HttpRequest.GetGroupControInfo(readSidList);
                                    if (data != null)
                                    {
                                        if (data.Code == StateCode.SUCCESS)
                                        {
                                            var groupControlInfoList = JsonConvert.DeserializeObject<List<GroupControl>>(data.Data.ToString());
                                            FunctionList.List.groupControls.AddRange(groupControlInfoList);
                                        }
                                        else
                                        {
                                            IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
                                        }
                                    }
                                    readSidList.Clear();
                                }
                            }
                            catch (Exception ex)
                            {
                                MainPage.Log($"读取组控列表失败:{ex.Message}");
                            }

                            Application.RunOnMainThread(() =>
                            {