From f14dcfd967404e197e7ec995ca8d6f2b090d3b7d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 11 九月 2020 09:16:59 +0800
Subject: [PATCH] 优化多功能面板：绑定温湿度传感器目标，和设备列表回路显示。优化数据矫正功能温湿度度不设置的情况。优化门锁时间设置最后一天和最后最后一个月的时间显示等 细节
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp20200828/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
old mode 100644
new mode 100755
similarity index 98%
rename from ZigbeeApp20200828/Shared/Phone/Device/Logic/MemberList.cs
rename to ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 13c0e0d..b5069a6
--- a/ZigbeeApp20200828/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -141,25 +141,10 @@
/// </summary>
/// <param name="user"></param>
public void User(Send.MembershipIfon user)
- {
-
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
- VerticalScrolViewLayout vV = null;
+ {
+
+
int count = user.UserIdMode.Count;
- if (count > 9)
- {
- ///鍏冪礌瓒呭嚭9涓�;
- count = 6;
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
- vV = new VerticalScrolViewLayout
- {
- Y = Application.GetRealHeight(140 + 20),
- Height = Application.GetRealHeight(160 * count),
- };
- //娓呴櫎涔嬪墠鐨勬帶浠�;
- vV.RemoveAll();
- }
-
#region -------鍙栨秷 瀹屾垚
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
this.AddChidren(flMain);
@@ -172,8 +157,24 @@
flMain.RemoveFromParent();
};
flMain.MouseUpEventHandler += clickcancel;
- completeView.Btncancel.MouseUpEventHandler += clickcancel;
-
+ completeView.Btncancel.MouseUpEventHandler += clickcancel;
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ VerticalScrolViewLayout vV = null;
+ if (count > 9)
+ {
+ ///鍏冪礌瓒呭嚭9涓�;
+ count = 6;
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ vV = new VerticalScrolViewLayout
+ {
+ Y = Application.GetRealHeight(140 + 20),
+ Height = Application.GetRealHeight(160 * count),
+ };
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ completeView.Show(count).AddChidren(vV);
+ //娓呴櫎涔嬪墠鐨勬帶浠�;
+ vV.RemoveAll();
+ }
#endregion
///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
string userId = "";
@@ -187,8 +188,7 @@
mFunView lockView = new mFunView();
if (user.UserIdMode.Count > 9)
{
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
- completeView.Show(count).AddChidren(vV);
+
vV.AddChidren(lockView.Show());
}
else
--
Gitblit v1.8.0