From 627093aca723d4bfb971b97c828e8b3a22dbda78 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 17 七月 2020 17:26:19 +0800
Subject: [PATCH] 2020-07-17-1
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs | 84 +++++++++++++++++++++---------------------
1 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
index c141dc8..2c022f5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Curtain/SiphonateDirectionAndLimitSettionForm.cs
@@ -121,10 +121,10 @@
var form = new BottomItemSelectForm();
form.AddForm(Language.StringByID(R.MyInternationalizationString.uDirectionSelect), listText, nowSelectNo);
- form.FinishSelectEvent += async (index) =>
+ form.FinishSelectEvent += (index) =>
{
//鍙樻洿鏂瑰悜
- var result = await HdlDeviceCurtainLogic.Current.SetCurtainDirection(curtainDevice, index == 0 ? false : true);
+ var result = HdlDeviceCurtainLogic.Current.SetCurtainDirection(curtainDevice, index == 0 ? false : true);
if (result == false)
{
return;
@@ -185,55 +185,55 @@
var frameIcon = new FrameLayout();
frameIcon.X = Application.GetRealWidth(228);
frameIcon.Y = Application.GetRealHeight(121);
- frameIcon.Width = Application.GetMinRealAverage(265);
- frameIcon.Height= Application.GetMinRealAverage(495);
+ frameIcon.Width = this.GetPictrueRealSize(265);
+ frameIcon.Height= this.GetPictrueRealSize(495);
frameIcon.BackgroundImagePath = "Item/DeviceLimitGround.png";
frameBack.AddChidren(frameIcon);
- var frameIconback = new FrameLayoutControl();
- frameIconback.Height = Application.GetMinRealAverage(144);
- frameIconback.Width = Application.GetMinRealAverage(144);
- frameIconback.Radius = (uint)Application.GetMinRealAverage(144) / 2;
+ var frameIconback = new FrameLayoutStatuControl();
+ frameIconback.Height = this.GetPictrueRealSize(144);
+ frameIconback.Width = this.GetPictrueRealSize(144);
+ frameIconback.Radius = (uint)this.GetPictrueRealSize(144) / 2;
frameIconback.BackgroundColor = 0xffeff2fb;
frameIconback.Gravity = Gravity.CenterHorizontal;
- frameIconback.Y = Application.GetMinRealAverage(35);
+ frameIconback.Y = this.GetPictrueRealSize(35);
frameIcon.AddChidren(frameIconback);
- var btnIcon = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(35), false);
+ var btnIcon = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(35), false);
btnIcon.UnSelectedImagePath = "Item/DownTriangle.png";
btnIcon.Gravity = Gravity.Center;
- frameIconback.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
+ frameIconback.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
- var frameText = new FrameLayoutControl();
- frameText.Y= Application.GetMinRealAverage(265);
- frameText.Height = Application.GetMinRealAverage(120);
+ var frameText = new FrameLayoutStatuControl();
+ frameText.Y= this.GetPictrueRealSize(265);
+ frameText.Height = this.GetPictrueRealSize(120);
frameIcon.AddChidren(frameText);
//纭畾
- var btnOk = new NormalViewControl(frameIcon.Width, Application.GetMinRealAverage(60), false);
+ var btnOk = new NormalViewControl(frameIcon.Width, this.GetPictrueRealSize(60), false);
btnOk.TextID = R.MyInternationalizationString.uConfirm1;
btnOk.TextAlignment = TextAlignment.Center;
btnOk.TextColor = UserCenterColor.Current.TextOrangeColor;
- frameText.AddChidren(btnOk, ChidrenBindMode.BindEventOnly);
+ frameText.AddChidren(btnOk, ChidrenBindMode.BindEvent);
//搴曠嚎
- var btnLine1 = new NormalViewControl(Application.GetMinRealAverage(100), ControlCommonResourse.BottomLineHeight, false);
+ var btnLine1 = new NormalViewControl(this.GetPictrueRealSize(100), ControlCommonResourse.BottomLineHeight, false);
btnLine1.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine1.Gravity = Gravity.CenterHorizontal;
- btnLine1.Y = btnOk.Bottom - Application.GetMinRealAverage(8);
+ btnLine1.Y = btnOk.Bottom - this.GetPictrueRealSize(8);
frameText.AddChidren(btnLine1);
//涓嬮檺浣�
- var btnDown = new NormalViewControl(frameIcon.Width, Application.GetMinRealAverage(60), false);
+ var btnDown = new NormalViewControl(frameIcon.Width, this.GetPictrueRealSize(60), false);
btnDown.TextID = R.MyInternationalizationString.uDownLimit;
btnDown.Y = btnOk.Bottom;
btnDown.TextAlignment = TextAlignment.Center;
btnDown.TextColor = UserCenterColor.Current.TextOrangeColor;
- frameText.AddChidren(btnDown, ChidrenBindMode.BindEventOnly);
+ frameText.AddChidren(btnDown, ChidrenBindMode.BindEvent);
//搴曠嚎
- var btnLine2 = new NormalViewControl(Application.GetMinRealAverage(124), ControlCommonResourse.BottomLineHeight, false);
+ var btnLine2 = new NormalViewControl(this.GetPictrueRealSize(124), ControlCommonResourse.BottomLineHeight, false);
btnLine2.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine2.Gravity = Gravity.CenterHorizontal;
- btnLine2.Y = btnDown.Bottom - Application.GetMinRealAverage(8);
+ btnLine2.Y = btnDown.Bottom - this.GetPictrueRealSize(8);
frameText.AddChidren(btnLine2);
//鍥炬爣鐐瑰嚮
@@ -294,55 +294,55 @@
var frameIcon = new FrameLayout();
frameIcon.X = Application.GetRealWidth(619);
frameIcon.Y = Application.GetRealHeight(121);
- frameIcon.Width = Application.GetMinRealAverage(265);
- frameIcon.Height = Application.GetMinRealAverage(495);
+ frameIcon.Width = this.GetPictrueRealSize(265);
+ frameIcon.Height = this.GetPictrueRealSize(495);
frameIcon.BackgroundImagePath = "Item/DeviceLimitGround.png";
frameBack.AddChidren(frameIcon);
- var frameIconback = new FrameLayoutControl();
- frameIconback.Height = Application.GetMinRealAverage(144);
- frameIconback.Width = Application.GetMinRealAverage(144);
- frameIconback.Radius = (uint)Application.GetMinRealAverage(144) / 2;
+ var frameIconback = new FrameLayoutStatuControl();
+ frameIconback.Height = this.GetPictrueRealSize(144);
+ frameIconback.Width = this.GetPictrueRealSize(144);
+ frameIconback.Radius = (uint)this.GetPictrueRealSize(144) / 2;
frameIconback.BackgroundColor = 0xffeff2fb;
frameIconback.Gravity = Gravity.CenterHorizontal;
- frameIconback.Y = Application.GetMinRealAverage(35);
+ frameIconback.Y = this.GetPictrueRealSize(35);
frameIcon.AddChidren(frameIconback);
- var btnIcon = new NormalViewControl(Application.GetMinRealAverage(69), Application.GetMinRealAverage(35), false);
+ var btnIcon = new NormalViewControl(this.GetPictrueRealSize(69), this.GetPictrueRealSize(35), false);
btnIcon.UnSelectedImagePath = "Item/UpTriangle.png";
btnIcon.Gravity = Gravity.Center;
- frameIconback.AddChidren(btnIcon, ChidrenBindMode.BindEventOnly);
+ frameIconback.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
- var frameText = new FrameLayoutControl();
- frameText.Y = Application.GetMinRealAverage(265);
- frameText.Height = Application.GetMinRealAverage(120);
+ var frameText = new FrameLayoutStatuControl();
+ frameText.Y = this.GetPictrueRealSize(265);
+ frameText.Height = this.GetPictrueRealSize(120);
frameIcon.AddChidren(frameText);
//纭畾
- var btnOk = new NormalViewControl(frameIcon.Width, Application.GetMinRealAverage(60), false);
+ var btnOk = new NormalViewControl(frameIcon.Width, this.GetPictrueRealSize(60), false);
btnOk.TextID = R.MyInternationalizationString.uConfirm1;
btnOk.TextAlignment = TextAlignment.Center;
btnOk.TextColor = UserCenterColor.Current.TextOrangeColor;
- frameText.AddChidren(btnOk, ChidrenBindMode.BindEventOnly);
+ frameText.AddChidren(btnOk, ChidrenBindMode.BindEvent);
//搴曠嚎
- var btnLine1 = new NormalViewControl(Application.GetMinRealAverage(100), ControlCommonResourse.BottomLineHeight, false);
+ var btnLine1 = new NormalViewControl(this.GetPictrueRealSize(100), ControlCommonResourse.BottomLineHeight, false);
btnLine1.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine1.Gravity = Gravity.CenterHorizontal;
- btnLine1.Y = btnOk.Bottom - Application.GetMinRealAverage(8);
+ btnLine1.Y = btnOk.Bottom - this.GetPictrueRealSize(8);
frameText.AddChidren(btnLine1);
//涓婇檺浣�
- var btnDown = new NormalViewControl(frameIcon.Width, Application.GetMinRealAverage(60), false);
+ var btnDown = new NormalViewControl(frameIcon.Width, this.GetPictrueRealSize(60), false);
btnDown.TextID = R.MyInternationalizationString.uUpLimit;
btnDown.Y = btnOk.Bottom;
btnDown.TextAlignment = TextAlignment.Center;
btnDown.TextColor = UserCenterColor.Current.TextOrangeColor;
- frameText.AddChidren(btnDown, ChidrenBindMode.BindEventOnly);
+ frameText.AddChidren(btnDown, ChidrenBindMode.BindEvent);
//搴曠嚎
- var btnLine2 = new NormalViewControl(Application.GetMinRealAverage(124), ControlCommonResourse.BottomLineHeight, false);
+ var btnLine2 = new NormalViewControl(this.GetPictrueRealSize(124), ControlCommonResourse.BottomLineHeight, false);
btnLine2.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine2.Gravity = Gravity.CenterHorizontal;
- btnLine2.Y = btnDown.Bottom - Application.GetMinRealAverage(8);
+ btnLine2.Y = btnDown.Bottom - this.GetPictrueRealSize(8);
frameText.AddChidren(btnLine2);
//鍥炬爣鐐瑰嚮
--
Gitblit v1.8.0