Merge branch 'dev-tzy' into dev-2020xm

xm

2020-05-21 6c027ca3f13f622c59f45c42f476dd9939ad5226

 ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs

@@ -65,10 +65,6 @@
        /// </summary>

        public static int BottomLineHeight = 1;

        /// <summary>

        /// 徐梅的门锁界面是否是打开的状态

        /// </summary>

        //public static bool IsDoorLockPageOpen = false;

        /// <summary>

        /// 门锁界面是否是更新状态

        /// </summary>

        public static Action<bool> UpdateDoorLockStatusAction = null;