合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MasterManagementPage.cs

@@ -3,7 +3,7 @@
using ZigBee.Device;
namespace Shared.Phone.UserCenter.DoorLock
{
    public class MasterManagementPage : DoorLockCommonLayout, ZigBee.Common.IStatus
    public class MasterManagementPage : DoorLockCommonLayout
    {
        /// <summary>
        /// 构造函数
@@ -133,30 +133,10 @@
                    }
                    else
                    {

                        ///备注：WJC的

                        ///记录当前用户信息

                        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;
@@ -164,39 +144,5 @@
                btnMemberName.MouseUpEventHandler += eHandler;
            }
        }

        #region 接口实现
        /// <summary>
        /// 处理变化事件 --将弃用 改用DeviceInfoChange()
        /// </summary>
        /// <returns>The changed.</returns>
        /// <param name="common">Common.</param>
        public void Changed(CommonDevice common)
        {

        }
        /// <summary>
        /// 处理变化事件
        /// </summary>
        /// <param name="common"></param>
        /// <param name="typeTag"></param>
        public void DeviceInfoChange(CommonDevice common, string typeTag)
        {
        }
        /// <summary>
        /// Changeds the IL ogic status.
        /// </summary>
        /// <param name="logic">Logic.</param>
        public void ChangedILogicStatus(ZigBee.Device.Logic logic)
        {
        }
        /// <summary>
        /// Changeds the IS cene status.
        /// </summary>
        /// <param name="scene">Scene.</param>
        public void ChangedISceneStatus(Scene scene)
        {
        }
        #endregion
    }
}