请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

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

@@ -5,7 +5,7 @@

namespace Shared.Phone.UserCenter.DoorLock
{
    public class AddUnLockMethodTip : DoorLockCommonLayout, ZigBee.Common.IStatus
    public class AddUnLockMethodTip : DoorLockCommonLayout
    {
        /// 构造函数
        /// </summary>
@@ -18,11 +18,23 @@
            BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
        }

        #region ◆ 变量申明__________________________
        #region 变量申明
        /// <summary>
        /// 当前门锁
        /// </summary>
        ZigBee.Device.DoorLock doorLock;
        /// <summary>
        /// 当前账户
        /// </summary>
        Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
        /// <summary>
        /// 当前类型
        /// </summary>
        string currentType = string.Empty;
        Action<string, string> action;//接收通知
        /// <summary>
        /// 接收通知
        /// </summary>
        Action<string, string> action;

        #endregion

@@ -62,7 +74,6 @@
        /// </summary>
        public override void RemoveFromParent()
        {
            ZbGateway.StatusList.Remove(this);
            if (doorLock.Gateway != null || doorLock.Gateway.GwResDataAction != null)
            {
                doorLock.Gateway.GwResDataAction -= action;
@@ -70,6 +81,9 @@
            base.RemoveFromParent();
        }

        /// <summary>
        /// 中部布局
        /// </summary>
        public void MidFrameLayoutContent()
        {
            var topMidFrameLayout = new FrameLayout
@@ -152,7 +166,7 @@
                Gravity = Gravity.CenterHorizontal,
                Radius = (uint)Application.GetRealHeight(127 / 2),
                TextSize = 16,
                IsBold =true,
                IsBold = true,
                Enable = false,
                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect,
            };
@@ -276,40 +290,5 @@
                entryStatusPage.Show();
            };
        }


        #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
    }
}