From bd428f23e1eb103c19ebbf1f0165f9e2e7b0a9d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 五月 2023 09:11:18 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into Dev-Branch
---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs | 115 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 95 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
index 5805d72..6d960f5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/CombinedDimmingListPage.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.Common;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
@@ -25,8 +26,8 @@
try
{
var page = new AddGroupControlPage(null,
- ()=> {
-
+ (newGC)=> {
+ ReadGroupControlList();
});
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -38,18 +39,32 @@
contentView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(550),
+ Height = Application.GetRealHeight(667 - 64),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
bodyView.AddChidren(contentView);
+ ReadGroupControlList();
+
+ #region
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+
+
+
+ #endregion
+
+ }
+ /// <summary>
+ /// 璇诲彇缁勬帶鏁版嵁
+ /// </summary>
+ private void ReadGroupControlList()
+ {
new System.Threading.Thread(() => {
- var http = new HttpServerRequest();
- var pack = http.GetGroupControlList();
- if(pack != null)
+ var pack = ApiUtlis.Ins.HttpRequest.GetGroupControlList();
+ if (pack != null)
{
- if(pack.Code == StateCode.SUCCESS )
+ if (pack.Code == StateCode.SUCCESS)
{
try
{
@@ -69,14 +84,8 @@
IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
}
}
- }) { IsBackground = true }.Start();
-
- #region
- contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
-
-
-
- #endregion
+ })
+ { IsBackground = true }.Start();
}
@@ -92,7 +101,6 @@
roomIds = new List<string> { Room.CurrentSpatial.RoomList[0].roomId },
sid = "00000000000000001",
type = "light",
- uids = new List<string>() { Room.CurrentSpatial.RoomList[0].uid },
});
list.Add(new GroupControl()
@@ -101,7 +109,6 @@
roomIds = new List<string> { Room.CurrentSpatial.RoomList[0].roomId },
sid = "00000000000000002",
type = "light",
- uids = new List<string>() { Room.CurrentSpatial.RoomList[0].uid },
});
}
@@ -117,10 +124,11 @@
foreach (var groupControl in list)
{
- var functionRow = new FrameLayout()
+ var functionRow = new RowLayout()
{
Height = Application.GetRealHeight(65),
BackgroundColor = CSS_Color.MainBackgroundColor,
+ LineColor = 0x00000000
};
contentView.AddChidren(functionRow);
@@ -174,8 +182,18 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
var page = new AddGroupControlPage(groupControl,
- () => {
-
+ (newGC) => {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ groupControl.roomIds = newGC.uids;
+ btnFunctionLocationInfo.Text = newGC.GetUidListName();
+ });
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鍒锋柊缇ゆ帶鎴块棿淇℃伅寮傚父:{ex.Message}");
+ }
});
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -186,6 +204,63 @@
btnFunctionName.MouseUpEventHandler = eventHandler;
btnFunctionLocationInfo.MouseUpEventHandler = eventHandler;
+ var btnDelGroupControl = new Button()
+ {
+ TextColor = CSS_Color.MainBackgroundColor,
+ BackgroundColor = CSS_Color.WarningColor,
+ TextID = StringId.Del,
+ TextAlignment = TextAlignment.Center,
+ };
+ functionRow.AddRightView(btnDelGroupControl);
+ btnDelGroupControl.MouseUpEventHandler = (sender1, e1) => {
+ var waitPage = new Loading();
+ this.AddChidren(waitPage);
+ waitPage.Start("");
+ new System.Threading.Thread(() =>
+ {
+ try
+ {
+ var pack = ApiUtlis.Ins.HttpRequest.DelGroupControl(groupControl.userDeviceGroupControlId);
+ if (pack != null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ try
+ {
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ list.Remove(groupControl);
+ LoadGroupControlView(list);
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+ }
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鍒锋柊缁勬帶鏁版嵁寮傚父:{ex.Message}");
+ }
+ });
+ }
+ }catch(Exception ex)
+ {
+ MainPage.Log($"鍒犻櫎缁勬帶寮傚父:{ex.Message}");
+ }
+ finally
+ {
+ Application.RunOnMainThread(() => {
+ if (waitPage != null)
+ {
+ waitPage.Hide();
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+ });
+ }
+ })
+ { IsBackground = true }.Start();
+ };
+
}
}
--
Gitblit v1.8.0