From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 626cb01..4b08fd6 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -141,10 +141,9 @@
/// </summary>
/// <param name="user"></param>
public void User(Send.MembershipIfon user)
- {
-
-
-
+ {
+
+
int count = user.UserIdMode.Count;
#region -------鍙栨秷 瀹屾垚
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
@@ -158,9 +157,9 @@
flMain.RemoveFromParent();
};
flMain.MouseUpEventHandler += clickcancel;
- completeView.Btncancel.MouseUpEventHandler += clickcancel;
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
- VerticalScrolViewLayout vV = null;
+ completeView.Btncancel.MouseUpEventHandler += clickcancel;
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ VerticalScrolViewLayout vV = null;
if (count > 9)
{
///鍏冪礌瓒呭嚭9涓�;
@@ -171,10 +170,10 @@
Y = Application.GetRealHeight(140 + 20),
Height = Application.GetRealHeight(160 * count),
};
+ //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+ completeView.Show(count).AddChidren(vV);
//娓呴櫎涔嬪墠鐨勬帶浠�;
vV.RemoveAll();
- completeView.Show(count).AddChidren(vV);
-
}
#endregion
///瀹氫袱涓彉閲忚褰曚箣鍓嶇殑鍙�硷紱
@@ -189,7 +188,7 @@
mFunView lockView = new mFunView();
if (user.UserIdMode.Count > 9)
{
- //鍏冪礌瓒呭嚭9涓氨鐢ㄤ笂涓嬫粦鍔ㄦ帶浠�;
+
vV.AddChidren(lockView.Show());
}
else
@@ -328,7 +327,7 @@
{
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0