Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC

gxc

2020-01-10 c0021397eeb8335d6d1f20990c71533c3d94e7af

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

@@ -35,5 +35,13 @@
        /// 账号的设置信息

        /// </summary>

        public static AccountOption Option = new AccountOption();
        /// <summary>

        /// 隐匿配置

        /// </summary>
        public static HideOptionInfo HideOption = new HideOptionInfo();
        /// <summary>

        /// 文件加密秘钥

        /// </summary>
        public const string FileEncryptKey = "4^Olh_3f";
    }
}