Merge remote-tracking branch 'origin/newBranch1' into WJC

JLChen

2021-08-28 299f4b1218c0d3721aa92bf091950d6708942583

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs

@@ -84,7 +84,6 @@
        /// 区域成员小区域文本
        /// </summary>
        Button btnResidenceMemberText;
        #region F3阶段
        /// <summary>
        /// 区域安放小区域
        /// </summary>
@@ -121,9 +120,7 @@
        /// 区域添加功能小区域文本
        /// </summary>
        Button btnResidenceAddFunctionText;
        #endregion

        #region F3阶段
        ///// <summary>
        ///// 软件设置区域
        ///// </summary>
@@ -155,7 +152,6 @@
        /// </summary>
        Button btnSmartSpeakerText;

        #endregion

        public PersonalCenterPage()
        {
@@ -478,7 +474,6 @@
                    residenceArmView.AddChidren(btnResidenceArmText);
                    #endregion
                }
                #region F3阶段

                #region ---数据备份区域
                //residenceDataBackupView = new FrameLayout()
@@ -541,6 +536,8 @@
                //residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
                #endregion

                if (DB_ResidenceData.Instance.GatewayType == 1)
                {
                #region ---添加功能区域
                residenceAddFunctionView = new FrameLayout()
                {
@@ -571,7 +568,7 @@
                };
                residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
                #endregion
                #endregion
                }
            }
            else
            {