合并了IOS的代码

hxb

2022-08-30 25429f085093d89d543a0b90e30d0d62d1b7dac9

 ZigbeeApp/Shared/Phone/UserCenter/Safety/PasswordMenuForm.cs

@@ -50,14 +50,14 @@
            var btnUserPswText = rowUserPsw.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uSafetyPassword), 700, 60);

            btnUserPswText.TextSize = 15;

            btnUserPswText.Y = Application.GetRealHeight(12) + rowUserPsw.chidrenYaxis;

            rowUserPsw.AddChidren(btnUserPswText, ChidrenBindMode.BindEventOnly);

            rowUserPsw.AddChidren(btnUserPswText, ChidrenBindMode.BindEvent);

            //用于在家布防、离家布防、撤防操作

            var btnTip1 = rowUserPsw.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uUserInGarrisonAndWithdrawGarrison), 700, 50, true);

            //这个坐标有点特殊

            btnTip1.Y = Application.GetRealHeight(72) + rowUserPsw.chidrenYaxis;

            btnTip1.TextSize = 12;

            btnTip1.TextColor = UserCenterColor.Current.TextGrayColor1;

            rowUserPsw.AddChidren(btnTip1, ChidrenBindMode.BindEventOnly);

            rowUserPsw.AddChidren(btnTip1, ChidrenBindMode.BindEvent);

            //向右的图标

            rowUserPsw.AddRightArrow();

            //底线

@@ -84,14 +84,14 @@
            var btnCoercePswText = rowCoercePsw.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uCoercePassword), 700, 60);

            btnCoercePswText.TextSize = 15;

            btnCoercePswText.Y = Application.GetRealHeight(12) + rowCoercePsw.chidrenYaxis;

            rowCoercePsw.AddChidren(btnCoercePswText, ChidrenBindMode.BindEventOnly);

            rowCoercePsw.AddChidren(btnCoercePswText, ChidrenBindMode.BindEvent);

            //输入该密码，立即通知他人

            var btnTip2 = rowCoercePsw.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uEnterPasswordToNotifyOthersImmediately), 700, 50, true);

            //这个坐标有点特殊

            btnTip2.Y = Application.GetRealHeight(72) + rowCoercePsw.chidrenYaxis;

            btnTip2.TextSize = 12;

            btnTip2.TextColor = UserCenterColor.Current.TextGrayColor1;

            rowCoercePsw.AddChidren(btnTip2, ChidrenBindMode.BindEventOnly);

            rowCoercePsw.AddChidren(btnTip2, ChidrenBindMode.BindEvent);

            //向右的图标

            rowCoercePsw.AddRightArrow();

            rowCoercePsw.ButtonClickEvent += async (sender, e) =>