From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index 0eeee0b..a0af0cd 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -33,7 +33,7 @@
middle = new VerticalRefreshLayout
{
Y = view.topRowLayout.Bottom,
- Height = Application.GetRealHeight(1920 - 184),
+ Height = Application.GetRealHeight(Method.H - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
@@ -142,24 +142,9 @@
/// <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();
- }
+
+ int count = user.UserIdMode.Count;
#region -------鍙栨秷 瀹屾垚
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicTranslucentColor };
this.AddChidren(flMain);
@@ -173,7 +158,23 @@
};
flMain.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
@@ -327,7 +327,7 @@
{
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
--
Gitblit v1.8.0