From e89eff06b335a16eaaa043b18f35f5463e1bc203 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 18 四月 2023 17:53:49 +0800
Subject: [PATCH] 群控编辑问题修复

---
 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
index b64cdd0..d82cd54 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -358,6 +358,15 @@
                             {
                                 if (pack.Code == StateCode.SUCCESS)
                                 {
+                                    try
+                                    {
+                                        var addTemp = Newtonsoft.Json.JsonConvert.DeserializeObject<GroupControl>(pack.Data.ToString());
+                                        FunctionList.List.groupControls.Add(addTemp);
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        MainPage.Log($"娣诲姞缇ゆ帶鎴愬姛锛岃浆璇戣繑鍥炴暟鎹け璐�:{ex.Message}");
+                                    }
                                     backActon?.Invoke();
                                     this.RemoveFromParent();
                                 }
@@ -383,6 +392,22 @@
                                 this.RemoveFromParent();
                                 return;
                             }
+                            groupControl.sids.Clear();
+                            foreach (var light in groupControlLightList)
+                            {
+                                try
+                                {
+                                    var gc = new GroupControlFunction();
+                                    gc.sid = light.sid;
+                                    gc.spk = light.spk;
+                                    groupControl.sids.Add(gc);
+                                }
+                                catch (Exception ex)
+                                {
+                                    MainPage.Log($"鏂板缇ゆ帶杞崲鏁版嵁寮傚父:{ex.Message}");
+                                }
+                            }
+
                             var pack = Common.ApiUtlis.Ins.HttpRequest.EditGroupControl(new List<GroupControl>() { groupControl });
                             if (pack != null)
                             {
@@ -564,12 +589,8 @@
                                 TextAlignment = TextAlignment.Center,
                                 TextSize = CSS_FontSize.SubheadingFontSize,
                                 TextColor = CSS_Color.FirstLevelTitleColor,
-                                Text = "鍔犺浇鏇村",
+                                TextID = StringId.LoadMore,
                             };
-                            if (Language.CurrentLanguage != "Chinese")
-                            {
-                                btnAppend.Text = "Load more";
-                            }
                             functionListView.AddChidren(btnAppend);
                             btnAppend.MouseUpEventHandler = (sender, e) =>
                             {

--
Gitblit v1.8.0