合并了代码

黄学彪

2020-12-31 fe3b2466c68b5db70d38e78039703add3b8b1dfe

 ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs

@@ -47,8 +47,8 @@
            FunView athomeView = new FunView();
            athomeView.iconBtn.UnSelectedImagePath = "ZigeeLogic/athome.png";
            athomeView.funnameBtn.TextID = MyInternationalizationString.logicathomegarrison;
            athomeView.funnextBtn.Width = Application.GetMinRealAverage(60);
            athomeView.funnextBtn.Height = Application.GetMinRealAverage(60);
            athomeView.funnextBtn.Width = Application.GetRealWidth(60);
            athomeView.funnextBtn.Height = Application.GetRealWidth(60);
            athomeView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
            athomeView.funnextBtn.Visible = false;
            middle.AddChidren(athomeView.FunFrameView());
@@ -79,8 +79,8 @@
            withdrawalView.funFrameLayout.Y = leaveView.funFrameLayout.Bottom;
            withdrawalView.iconBtn.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
            withdrawalView.funnameBtn.TextID = MyInternationalizationString.withdrawal;
            withdrawalView.funnextBtn.Width = Application.GetMinRealAverage(60);
            withdrawalView.funnextBtn.Height = Application.GetMinRealAverage(60);
            withdrawalView.funnextBtn.Width = Application.GetRealWidth(60);
            withdrawalView.funnextBtn.Height = Application.GetRealWidth(60);
            withdrawalView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
            withdrawalView.funnextBtn.Visible = false;
            middle.AddChidren(withdrawalView.FunFrameView());
@@ -95,8 +95,8 @@
            urgentwithdView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBlankBackgroundColor; ///改变最后功能快线条颜色
            urgentwithdView.iconBtn.UnSelectedImagePath = "ZigeeLogic/withdrawal.png";
            urgentwithdView.funnameBtn.TextID = MyInternationalizationString.urgentwithdrawal;
            urgentwithdView.funnextBtn.Width = Application.GetMinRealAverage(60);
            urgentwithdView.funnextBtn.Height = Application.GetMinRealAverage(60);
            urgentwithdView.funnextBtn.Width = Application.GetRealWidth(60);
            urgentwithdView.funnextBtn.Height = Application.GetRealWidth(60);
            urgentwithdView.funnextBtn.UnSelectedImagePath = "ZigeeLogic/selected.png";
            urgentwithdView.funnextBtn.Visible = false;
            middle.AddChidren(urgentwithdView.FunFrameView());
@@ -202,7 +202,7 @@
                if (!athomeView.funnextBtn.Visible && !leaveView.funnextBtn.Visible && !withdrawalView.funnextBtn.Visible && !urgentwithdView.funnextBtn.Visible)
                {

                    var alert = new ShowMsgControl(ShowMsgType.Normal,
                    var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
                              Language.StringByID(MyInternationalizationString.securitytip),
                             Language.StringByID(MyInternationalizationString.confrim));
                    alert.Show();