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

xm

2020-05-19 136b9e2fc48249a5ff89874f1080ba94130e7a9e

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

@@ -68,6 +68,10 @@
        /// 徐梅的门锁界面是否是打开的状态

        /// </summary>

        public static bool IsDoorLockPageOpen = false;

        /// <summary>

        /// 是否是界面正在加载中(底层专用,不需要理)

        /// </summary>

        public static bool IsFormAdding = false;

#if Android

        /// <summary>

        /// 两个文本拼接时,为了看起来是正常的，需要减去它们之间的间隔误差