From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index bc1c8aa..99953e8 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -124,7 +124,23 @@
};
roomListView.AddChidren(btnLine);
- foreach (var room in DB_ResidenceData.rooms)
+ //---------------------------------------------
+ //var roomListView = new VerticalScrolViewLayout()
+ //{
+ // Y = btnLine.Bottom,
+ // Height = Application.GetRealHeight(440),
+ //};
+ //contentView.AddChidren(roomListView);
+
+ //List<Function> funss = new List<Function>();
+ //if (memberInfo.CurResidenceShareDate.Count > 0)
+ //{
+ // foreach (var sd in memberInfo.CurResidenceShareDate)
+ // {
+ // funss.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<ShareData>(System.Text.Encoding.UTF8.GetString(sd.ShareDataBytes)));
+ // }
+ //}
+ foreach (var room in SpatialInfo.CurrentSpatial.RoomList)
{
var roomView = new FrameLayout()
{
@@ -142,7 +158,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = room.name,
+ Text = room.roomName,
};
roomView.AddChidren(btnRoomName);
@@ -159,7 +175,7 @@
for (int i = 0; i < memberInfo.CurResidenceShareDate.Count;)
{
var sd = memberInfo.CurResidenceShareDate[i];
- if (DB_ResidenceData.functionList.GetAllFunction().Find((obj) => obj.deviceId == sd.shareTypeId) == null)
+ if (FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.deviceId == sd.shareTypeId) == null)
{
//new DAL.Server.HttpServerRequest().DeleteShareData(sd);
memberInfo.CurResidenceShareDate.Remove(sd);
@@ -206,8 +222,9 @@
roomView.MouseUpEventHandler = eHandler;
btnRoomName.MouseUpEventHandler = eHandler;
btnRight.MouseUpEventHandler = eHandler;
+ btnFunctionCount.MouseUpEventHandler = eHandler;
- if (DB_ResidenceData.rooms.IndexOf(room) < DB_ResidenceData.rooms.Count - 2)
+ if (SpatialInfo.CurrentSpatial.RoomList.IndexOf(room) < SpatialInfo.CurrentSpatial.RoomList.Count - 2)
{
var btnRoomLine = new Button()
{
--
Gitblit v1.8.0