完全合并了Wjc，Xm 的 代码

黄学彪

2019-10-24 31497bb69602433d94c8a28ea01c3ee3c7cc8576

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs

File was renamed from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlPanelLogic.cs
@@ -9,24 +9,24 @@
    /// <summary>

    /// 干接点的逻辑

    /// </summary>

    public class HdlPanelLogic

    public class HdlDevicePanelLogic

    {

        #region ■ 变量声明___________________________



        /// <summary>

        /// 干接点的逻辑

        /// </summary>
        private static HdlPanelLogic m_Current = null;
        private static HdlDevicePanelLogic m_Current = null;
        /// <summary>

        /// 干接点的逻辑

        /// </summary>
        public static HdlPanelLogic Current

        public static HdlDevicePanelLogic Current

        {

            get

            {

                if (m_Current == null)

                {

                    m_Current = new HdlPanelLogic();

                    m_Current = new HdlDevicePanelLogic();

                }

                return m_Current;

            }

@@ -44,7 +44,7 @@
        /// <summary>

        /// 初始化

        /// </summary>

        public HdlPanelLogic()

        public HdlDevicePanelLogic()

        {

            //从本地文件还原干接点的私有属性

            this.LoadDryContactFunctionFromLocaltion();