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/UserCenter/DoorLock/MasterManagementPage.cs | 42 +++++++-----------------------------------
1 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
index b1fb776..c501829 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs
@@ -9,7 +9,7 @@
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
- public MasterManagementPage(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj)
+ public MasterManagementPage(ZigBee.Device.DoorLock doorLock, MemberInfoRes accountObj)
{
this.doorLock = doorLock;
this.accountObj = accountObj;
@@ -24,7 +24,7 @@
/// <summary>
/// 褰撳墠璐︽埛
/// </summary>
- Shared.Phone.UserCenter.MemberInfoRes accountObj;
+ MemberInfoRes accountObj;
#endregion
/// <summary>
@@ -32,15 +32,7 @@
/// </summary>
public void Show()
{
- string accountTitle = "";
- if (accountObj.UserName != null)
- {
- accountTitle = accountObj.UserName;
- }
- else
- {
- accountTitle = accountObj.Account;
- }
+ string accountTitle = accountObj.ShowName;
this.TopFrameLayout(this, accountTitle);
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -133,30 +125,10 @@
}
else
{
- ///澶囨敞锛歐JC鐨�
- ///璁板綍褰撳墠鐢ㄦ埛淇℃伅
- Phone.Device.Logic.Send.UserMemberInfoRes = accountObj;
- Phone.Device.Logic.Send.CurrentDoorLock = doorLock;
- if (accountObj == null)
- {
- ///闃叉鎶涘紓甯�
- Phone.Device.Logic.Send.UserMemberInfoRes = new MemberInfoRes();
- }
- if (doorLock == null)
- {
- ///闃叉鎶涘紓甯�
- Phone.Device.Logic.Send.CurrentDoorLock = new ZigBee.Device.DoorLock();
- }
- ///杩涙潵鍒锋柊涓�娆¤澶囧垪琛紱
- Common.Logic.LogicDviceList.Clear();
- if (Common.Logic.LogicDviceList.Count == 0)
- {
- Common.Logic.LogicDviceList.AddRange(LocalDevice.Current.listAllDevice.ToArray());
- }
- var doorLockLogicList = new Phone.Device.Logic.DoorLockLogic.LockLogicList();
- UserView.HomePage.Instance.AddChidren(doorLockLogicList);
- UserView.HomePage.Instance.PageIndex += 1;
- doorLockLogicList.Show();
+ ///璁板綍褰撳墠鐢ㄦ埛淇℃伅H06C
+ ///wjc
+ Shared.Phone.Device.Logic.SkipView.SkipAddLogic(1, doorLock, accountObj);
+
}
};
btnRight.MouseUpEventHandler += eHandler;
--
Gitblit v1.8.0