From e22fdb94322e6cec38e5e4a9aec13d431a133fde Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 28 四月 2020 16:32:35 +0800 Subject: [PATCH] 上传合并后的代码 --- ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs index 2c2f206..eaf94e5 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/AirSwitchCloudContrDirectionForm.cs @@ -30,8 +30,8 @@ { //鍥剧墖 var framePic = new FrameLayout(); - framePic.Width = Application.GetMinRealAverage(858); - framePic.Height = Application.GetMinRealAverage(850); + framePic.Width = this.GetPictrueRealSize(858); + framePic.Height = this.GetPictrueRealSize(850); framePic.Gravity = Gravity.CenterHorizontal; framePic.Y = Application.GetRealHeight(58); bodyFrameLayout.AddChidren(framePic); @@ -40,36 +40,36 @@ framePic.AddChidren(btnPic); //鎸囩ず鐏� - var btnLinght = new NormalViewControl(Application.GetMinRealAverage(100), Application.GetMinRealAverage(40), false); - btnLinght.X = Application.GetMinRealAverage(487); - btnLinght.Y = Application.GetMinRealAverage(202); + var btnLinght = new NormalViewControl(this.GetPictrueRealSize(100), this.GetPictrueRealSize(40), false); + btnLinght.X = this.GetPictrueRealSize(487); + btnLinght.Y = this.GetPictrueRealSize(202); btnLinght.TextColor = UserCenterColor.Current.TextGrayColor3; btnLinght.TextSize = 8.45f; btnLinght.TextID = R.MyInternationalizationString.uPilotLamp; framePic.AddChidren(btnLinght); //宸ヤ綔 - var btnWork = new NormalViewControl(Application.GetMinRealAverage(70), Application.GetMinRealAverage(40), false); - btnWork.X = Application.GetMinRealAverage(628); - btnWork.Y = Application.GetMinRealAverage(113); + var btnWork = new NormalViewControl(this.GetPictrueRealSize(70), this.GetPictrueRealSize(40), false); + btnWork.X = this.GetPictrueRealSize(628); + btnWork.Y = this.GetPictrueRealSize(113); btnWork.TextColor = UserCenterColor.Current.TextGrayColor3; btnWork.TextSize = 8.45f; btnWork.TextID = R.MyInternationalizationString.uWork; framePic.AddChidren(btnWork); //閰嶅 - var btnPair = new NormalViewControl(Application.GetMinRealAverage(70), Application.GetMinRealAverage(40), false); - btnPair.X = Application.GetMinRealAverage(628); - btnPair.Y = Application.GetMinRealAverage(217); + var btnPair = new NormalViewControl(this.GetPictrueRealSize(70), this.GetPictrueRealSize(40), false); + btnPair.X = this.GetPictrueRealSize(628); + btnPair.Y = this.GetPictrueRealSize(217); btnPair.TextColor = UserCenterColor.Current.TextGrayColor3; btnPair.TextSize = 8.45f; btnPair.TextID = R.MyInternationalizationString.uPair; framePic.AddChidren(btnPair); //绾㈣壊鎸囩ず鐏棯鐑� - var btnGreanLinght = new NormalViewControl(Application.GetMinRealAverage(455), Application.GetMinRealAverage(45), false); - btnGreanLinght.X = Application.GetMinRealAverage(397); - btnGreanLinght.Y = Application.GetMinRealAverage(295); + var btnGreanLinght = new NormalViewControl(this.GetPictrueRealSize(455), this.GetPictrueRealSize(45), false); + btnGreanLinght.X = this.GetPictrueRealSize(397); + btnGreanLinght.Y = this.GetPictrueRealSize(295); btnGreanLinght.TextAlignment = TextAlignment.Center; btnGreanLinght.TextColor = UserCenterColor.Current.TextGrayColor3; btnGreanLinght.TextSize = 10; -- Gitblit v1.8.0