合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs

@@ -57,33 +57,32 @@
        /// </summary>
        Button btnCommissioningAuthoritySwitchIcon;

        #region F3阶段
        #region 管理员权限迁移
        //FrameLayout administratorPermissionMigrationRow;
        //Button btnAdministratorPermissionMigrationTitle;
        //Button btnAdministratorPermissionMigrationExplan;
        //Button btnAdministratorPermissionMigrationSkinIcon;
        FrameLayout administratorPermissionMigrationRow;
        Button btnAdministratorPermissionMigrationTitle;
        Button btnAdministratorPermissionMigrationExplan;
        Button btnAdministratorPermissionMigrationSkinIcon;
        #endregion

        #region 过户
        ///// <summary>
        ///// 
        ///// </summary>
        //FrameLayout transferRow;
        ///// <summary>
        ///// 
        ///// </summary>
        //Button btnTransferTitle;
        ///// <summary>
        ///// 
        ///// </summary>
        //Button btnTrasferExplan;
        ///// <summary>
        ///// 
        ///// </summary>
        //Button btnTrasferSkinIcon;
        /// <summary>
        /// 
        /// </summary>
        FrameLayout transferRow;
        /// <summary>
        /// 
        /// </summary>
        Button btnTransferTitle;
        /// <summary>
        /// 
        /// </summary>
        Button btnTrasferExplan;
        /// <summary>
        /// 
        /// </summary>
        Button btnTrasferSkinIcon;
        #endregion
        #endregion

        #endregion
        /// <summary>
        /// 更新住宅名称的回调函数
@@ -162,45 +161,46 @@
                    BackgroundColor = CSS_Color.DividingLineColor,
                });
            #region 住宅地址
                        var residenceAddressRow = new FrameLayout()
                        {
                            Y = residenceNameRow.Bottom,
                            Height = Application.GetRealHeight(50),
                            BackgroundColor = CSS_Color.MainBackgroundColor,
                        };
                        contentView.AddChidren(residenceAddressRow);
            var residenceAddressRow = new FrameLayout()
            {
                Y = residenceNameRow.Bottom,
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            contentView.AddChidren(residenceAddressRow);

                        var btnResidenceAddressTitle = new Button()
                        {
                            X = Application.GetRealWidth(16),
                            Width = Application.GetRealWidth(78),
                            TextID = StringId.ResidenceAddress,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextSize = CSS_FontSize.SubheadingFontSize,
                            TextColor = CSS_Color.FirstLevelTitleColor,
                        };
                        residenceAddressRow.AddChidren(btnResidenceAddressTitle);
            var btnResidenceAddressTitle = new Button()
            {
                X = Application.GetRealWidth(16),
                Width = Application.GetRealWidth(78),
                TextID = StringId.ResidenceAddress,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextColor = CSS_Color.FirstLevelTitleColor,
            };
            residenceAddressRow.AddChidren(btnResidenceAddressTitle);

                        btnLocationAddressIcon = new Button()
                        {
                            X = Application.GetRealWidth(333),
                            Gravity = Gravity.CenterVertical,
                            Width = Application.GetMinRealAverage(28),
                            Height = Application.GetMinRealAverage(28),
                            UnSelectedImagePath = "Public/LocationAddressIcon.png",
                        };
                        residenceAddressRow.AddChidren(btnLocationAddressIcon);
            btnLocationAddressIcon = new Button()
            {
                X = Application.GetRealWidth(333),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                //UnSelectedImagePath = "Public/LocationAddressIcon.png",
                UnSelectedImagePath = "Public/Edit.png",
            };
            residenceAddressRow.AddChidren(btnLocationAddressIcon);

                        btnResidenceAddress = new Button()
                        {
                            X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
                            Width = Application.GetRealWidth(200),
                            Text = DB_ResidenceData.Instance.CurrentRegion.homeAddress,
                            TextSize = CSS_FontSize.TextFontSize,
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = CSS_Color.TextualColor,
                        };
                        residenceAddressRow.AddChidren(btnResidenceAddress);
            btnResidenceAddress = new Button()
            {
                X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
                Width = Application.GetRealWidth(200),
                Text = DB_ResidenceData.Instance.CurrentRegion.homeAddress,
                TextSize = CSS_FontSize.TextFontSize,
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = CSS_Color.TextualColor,
            };
            residenceAddressRow.AddChidren(btnResidenceAddress);
            #endregion
            #region 楼层管理
            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
@@ -275,112 +275,112 @@
            roomManagementRow.AddChidren(btnRoomManagementSkinIcon);
            #endregion


            #region F3阶段
            #region 管理员权限迁移
            //contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
            //administratorPermissionMigrationRow = new FrameLayout()
            //{
            //    Height = Application.GetRealHeight(65),
            //    BackgroundColor = CSS_Color.MainBackgroundColor,
            //};
            contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
            administratorPermissionMigrationRow = new FrameLayout()
            {
                Height = Application.GetRealHeight(65),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            //contentView.AddChidren(administratorPermissionMigrationRow);

            //btnAdministratorPermissionMigrationTitle = new Button()
            //{
            //    X = Application.GetRealWidth(16),
            //    Y = Application.GetRealHeight(10),
            //    Width = Application.GetRealWidth(308),
            //    Height = Application.GetRealHeight(24),
            //    TextID = StringId.AdministratorPermissionMigration,
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextSize = CSS_FontSize.SubheadingFontSize,
            //    TextColor = CSS_Color.FirstLevelTitleColor,
            //};
            //administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationTitle);
            btnAdministratorPermissionMigrationTitle = new Button()
            {
                X = Application.GetRealWidth(16),
                Y = Application.GetRealHeight(10),
                Width = Application.GetRealWidth(308),
                Height = Application.GetRealHeight(24),
                TextID = StringId.AdministratorPermissionMigration,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextColor = CSS_Color.FirstLevelTitleColor,
            };
            administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationTitle);

            //btnAdministratorPermissionMigrationExplan = new Button()
            //{
            //    X = Application.GetRealWidth(16),
            //    Y = btnAdministratorPermissionMigrationTitle.Bottom,
            //    Width = Application.GetRealWidth(308),
            //    Height = Application.GetRealHeight(21),
            //    TextID = StringId.AdministratorPermissionMigrationExPlan,
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
            //    TextColor = CSS_Color.PromptingColor1,
            //};
            //administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationExplan);
            btnAdministratorPermissionMigrationExplan = new Button()
            {
                X = Application.GetRealWidth(16),
                Y = btnAdministratorPermissionMigrationTitle.Bottom,
                Width = Application.GetRealWidth(308),
                Height = Application.GetRealHeight(21),
                TextID = StringId.AdministratorPermissionMigrationExPlan,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextColor = CSS_Color.PromptingColor1,
            };
            administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationExplan);


            //btnAdministratorPermissionMigrationSkinIcon = new Button()
            //{
            //    X = Application.GetRealWidth(343),
            //    Gravity = Gravity.CenterVertical,
            //    Width = Application.GetMinRealAverage(16),
            //    Height = Application.GetMinRealAverage(16),
            //    UnSelectedImagePath = "Public/RightIcon.png",
            //};
            //administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationSkinIcon);
            btnAdministratorPermissionMigrationSkinIcon = new Button()
            {
                X = Application.GetRealWidth(343),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/RightIcon.png",
            };
            administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationSkinIcon);

            //administratorPermissionMigrationRow.AddChidren(
            //    new Button()
            //    {
            //        Gravity = Gravity.CenterHorizontal,
            //        Y = Application.GetRealHeight(64),
            //        Height = Application.GetRealHeight(1),
            //        Width = Application.GetRealWidth(343),
            //        BackgroundColor = CSS_Color.DividingLineColor,
            //    });
            #endregion
            administratorPermissionMigrationRow.AddChidren(
                new Button()
                {
                    Gravity = Gravity.CenterHorizontal,
                    Y = Application.GetRealHeight(64),
                    Height = Application.GetRealHeight(1),
                    Width = Application.GetRealWidth(343),
                    BackgroundColor = CSS_Color.DividingLineColor,
                });
            #endregion

            #region F3阶段
            #region 过户
            //transferRow = new FrameLayout()
            //{
            //    Y = administratorPermissionMigrationRow.Bottom,
            //    Height = Application.GetRealHeight(65),
            //    BackgroundColor = CSS_Color.MainBackgroundColor,
            //};
            //contentView.AddChidren(transferRow);
            transferRow = new FrameLayout()
            {
                Y = administratorPermissionMigrationRow.Bottom,
                Height = Application.GetRealHeight(65),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            //有网关才能过户
            if (DB_ResidenceData.Instance.HomeGateway != null && string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId) == false
                && DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
            {
                contentView.AddChidren(transferRow);
            }

            //btnTransferTitle = new Button()
            //{
            //    X = Application.GetRealWidth(16),
            //    Y = Application.GetRealHeight(10),
            //    Width = Application.GetRealWidth(308),
            //    Height = Application.GetRealHeight(24),
            //    TextID = StringId.Transfer,
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextSize = CSS_FontSize.SubheadingFontSize,
            //    TextColor = CSS_Color.FirstLevelTitleColor,
            //};
            //transferRow.AddChidren(btnTransferTitle);
            btnTransferTitle = new Button()
            {
                X = Application.GetRealWidth(16),
                Y = Application.GetRealHeight(10),
                Width = Application.GetRealWidth(308),
                Height = Application.GetRealHeight(24),
                TextID = StringId.Transfer,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.SubheadingFontSize,
                TextColor = CSS_Color.FirstLevelTitleColor,
            };
            transferRow.AddChidren(btnTransferTitle);

            //btnTrasferExplan = new Button()
            //{
            //    X = Application.GetRealWidth(16),
            //    Y = btnTransferTitle.Bottom,
            //    Width = Application.GetRealWidth(308),
            //    Height = Application.GetRealHeight(21),
            //    TextID = StringId.TransferExPlan,
            //    TextAlignment = TextAlignment.CenterLeft,
            //    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
            //    TextColor = CSS_Color.PromptingColor1,
            //};
            //transferRow.AddChidren(btnTrasferExplan);
            btnTrasferExplan = new Button()
            {
                X = Application.GetRealWidth(16),
                Y = btnTransferTitle.Bottom,
                Width = Application.GetRealWidth(308),
                Height = Application.GetRealHeight(21),
                TextID = StringId.TransferExPlan,
                TextAlignment = TextAlignment.CenterLeft,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextColor = CSS_Color.PromptingColor1,
            };
            transferRow.AddChidren(btnTrasferExplan);

            //btnTrasferSkinIcon = new Button()
            //{
            //    X = Application.GetRealWidth(343),
            //    Gravity = Gravity.CenterVertical,
            //    Width = Application.GetMinRealAverage(16),
            //    Height = Application.GetMinRealAverage(16),
            //    UnSelectedImagePath = "Public/RightIcon.png",
            //};
            //transferRow.AddChidren(btnTrasferSkinIcon);
            #endregion
            btnTrasferSkinIcon = new Button()
            {
                X = Application.GetRealWidth(343),
                Gravity = Gravity.CenterVertical,
                Width = Application.GetMinRealAverage(16),
                Height = Application.GetMinRealAverage(16),
                UnSelectedImagePath = "Public/RightIcon.png",
            };
            transferRow.AddChidren(btnTrasferSkinIcon);
            #endregion

            #region 调试权限
@@ -433,7 +433,8 @@
            };
            commissioningAuthorityRow.AddChidren(btnCommissioningAuthoritySwitchIcon);

            btnCommissioningAuthoritySwitchIcon.MouseUpEventHandler = (sender, e) => {
            btnCommissioningAuthoritySwitchIcon.MouseUpEventHandler = (sender, e) =>
            {
                DB_ResidenceData.Instance.CurrentRegion.debugPerm = !DB_ResidenceData.Instance.CurrentRegion.debugPerm;
                btnCommissioningAuthoritySwitchIcon.IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm;
                new System.Threading.Thread(() =>
@@ -449,4 +450,4 @@
            LoadEventList();
        }
    }
}
}