From 026ed1573ad8b9ba28f0e2c0bf0c9cd85f1dd2ed Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 02 十二月 2020 16:32:00 +0800
Subject: [PATCH] 2020-12-02 1.增加子账号设备分享。 2.房间删除时间优化。3.消息中心接口对接。4.版本检测更新接口对接。
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 74 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index 2b6108e..bc1c8aa 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -7,10 +7,14 @@
namespace HDL_ON.UI
{
+ /// <summary>
+ /// 浣跨敤鏉冮檺椤甸潰
+ /// </summary>
public partial class MemberPermissionPage : FrameLayout
{
MemberPermissionPage bodyView;
Button btnDelMember;
+ VerticalScrolViewLayout roomListView;
ResidenceMemberInfo memberInfo;
@@ -59,13 +63,39 @@
headPortraitView.AddChidren(btnMemberName);
#region RoomList
- VerticalScrolViewLayout roomListView = new VerticalScrolViewLayout()
+ roomListView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(138),
Height = Application.GetRealHeight(471),
//BackgroundColor = CSS_Color.MainBackgroundColor,
};
bodyView.AddChidren(roomListView);
+ #endregion
+
+ btnDelMember = new Button()
+ {
+ Y = Application.GetRealHeight(617),
+ //Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
+ Height = Application.GetRealHeight(50),
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.WarningColor,
+ TextID = StringId.RemoveTheMember,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ bodyView.AddChidren(btnDelMember);
+
+ LoadEventList();
+
+ GetShareDataByAccount();
+ }
+
+ /// <summary>
+ /// 鍔犺浇鎴块棿鍒楄〃,缁熻鍒嗕韩鐨勬暟鎹�
+ /// </summary>
+ void ShowRoomListView()
+ {
+ roomListView.RemoveAll();
var titleView = new FrameLayout()
{
@@ -94,22 +124,6 @@
};
roomListView.AddChidren(btnLine);
- //---------------------------------------------
- //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 DB_ResidenceData.rooms)
{
var roomView = new FrameLayout()
@@ -136,18 +150,18 @@
int addCount = 0;
foreach (var sd in memberInfo.CurResidenceShareDate)
{
- if (room.GetRoomFunctions(false).Find((obj) => obj.sid == sd.fileName) != null)
+ if (room.GetRoomFunctions(false).Find((obj) => obj.deviceId == sd.shareTypeId) != null)
{
addCount++;
}
}
//绉婚櫎褰撳墠浣忓畢宸茬粡涓嶅瓨鍦ㄧ殑鍔熻兘
- for(int i= 0;i< memberInfo.CurResidenceShareDate.Count;)
+ for (int i = 0; i < memberInfo.CurResidenceShareDate.Count;)
{
var sd = memberInfo.CurResidenceShareDate[i];
- if (DB_ResidenceData.functionList.GetAllFunction().Find((obj) => obj.sid == sd.fileName) == null)
+ if (DB_ResidenceData.functionList.GetAllFunction().Find((obj) => obj.deviceId == sd.shareTypeId) == null)
{
- new DAL.Server.HttpServerRequest().DeleteShareData(sd);
+ //new DAL.Server.HttpServerRequest().DeleteShareData(sd);
memberInfo.CurResidenceShareDate.Remove(sd);
}
else
@@ -184,7 +198,7 @@
Action<string> refreshFunctionCount = (newCount) => {
btnFunctionCount.Text = newCount + "/" + room.GetRoomFunctions(false).Count.ToString();
};
- var mmp = new MemberFunctionPermissionPage(memberInfo, room,refreshFunctionCount);
+ var mmp = new MemberFunctionPermissionPage(memberInfo, room, refreshFunctionCount);
MainPage.BasePageView.AddChidren(mmp);
mmp.LoadPage(StringId.PermissionToUse);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -221,22 +235,6 @@
// BackgroundColor = CSS_Color.BackgroundColor,
// });
//}
- #endregion
-
- btnDelMember = new Button()
- {
- Y = Application.GetRealHeight(617),
- //Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
- Height = Application.GetRealHeight(50),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.WarningColor,
- TextID = StringId.RemoveTheMember,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(btnDelMember);
-
- LoadEventList();
}
}
}
--
Gitblit v1.8.0