From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs | 62 +++++++++++--------------------
1 files changed, 22 insertions(+), 40 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
index 5398b62..098d1b9 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
@@ -84,7 +84,7 @@
//娓呮礂婊ょ綉鎻愮ず鐨凢rameLayout
this.frameClrean = new FrameLayout();
frameClrean.Width = Application.GetRealWidth(600);
- frameClrean.Height = Application.GetMinRealAverage(69);
+ frameClrean.Height = this.GetPictrueRealSize(69);
frameClrean.X = ControlCommonResourse.XXLeft;
frameClrean.Y = Application.GetRealHeight(35);
frameWhiteBack.AddChidren(frameClrean);
@@ -117,8 +117,8 @@
//绌鸿皟鎺т欢鐨勫鍣�
var frameAcBack = new FrameLayout();
frameAcBack.Y = Application.GetRealHeight(412);
- frameAcBack.Width = Application.GetMinRealAverage(671);
- frameAcBack.Height = Application.GetMinRealAverage(671);
+ frameAcBack.Width = this.GetPictrueRealSize(671);
+ frameAcBack.Height = this.GetPictrueRealSize(671);
frameAcBack.Gravity = Gravity.CenterHorizontal;
frameWhiteBack.AddChidren(frameAcBack);
@@ -146,7 +146,7 @@
//绌鸿皟鎺т欢閲岄潰鐨勯偅涓樉绀哄埗鐑�,鍒跺喎鐨勬帶浠�
this.btnNowModeView = new NormalViewControl(200, 55, true);
- btnNowModeView.Y = Application.GetMinRealAverage(184);
+ btnNowModeView.Y = this.GetPictrueRealSize(184);
btnNowModeView.Gravity = Gravity.CenterHorizontal;
btnNowModeView.Text = DeviceAcDetailCardMethord.GetModeNameByModeId(deviceAc.currentSystemMode);
btnNowModeView.TextSize = 12;
@@ -157,8 +157,8 @@
this.btnReduce = new IconViewControl(81);
btnReduce.CanClick = isAcOpen;
btnReduce.UnSelectedImagePath = "AC/Reduce.png";
- btnReduce.X = Application.GetMinRealAverage(132);
- btnReduce.Y = Application.GetMinRealAverage(268);
+ btnReduce.X = this.GetPictrueRealSize(132);
+ btnReduce.Y = this.GetPictrueRealSize(268);
frameAcBack.AddChidren(btnReduce);
btnReduce.ButtonClickEvent += (sender, e) =>
{
@@ -173,7 +173,7 @@
this.btnAdd = new IconViewControl(81);
btnAdd.CanClick = isAcOpen;
btnAdd.UnSelectedImagePath = "AC/Add.png";
- btnAdd.X = frameAcBack.Width - Application.GetMinRealAverage(81 + 132);
+ btnAdd.X = frameAcBack.Width - this.GetPictrueRealSize(81 + 132);
btnAdd.Y = btnReduce.Y;
frameAcBack.AddChidren(btnAdd);
btnAdd.ButtonClickEvent += (sender, e) =>
@@ -187,7 +187,7 @@
//鈩�
var btnUint = new NormalViewControl(100, 66, true);
- btnUint.Y = Application.GetMinRealAverage(366);
+ btnUint.Y = this.GetPictrueRealSize(366);
btnUint.Gravity = Gravity.CenterHorizontal;
btnUint.TextAlignment = TextAlignment.Center;
btnUint.Text = "鈩�";
@@ -520,20 +520,16 @@
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
this.StartCheckResponeResult(this.listControl, (result) =>
{
- //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
- if (result == false)
+ if (result == true)
{
+ //鎺ユ敹鍒扮綉鍏崇殑鍥炲
HdlThreadLogic.Current.RunMain(() =>
{
- //杩樺師鐘舵��
- listControl[0].SelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeSelectedImagePathByFanSwingMode(oldModel);
- listControl[0].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeUnSelectedImagePathByFanSwingMode(oldModel);
+ listControl[0].SelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeSelectedImagePathByFanSwingMode(fanSwingMode);
+ listControl[0].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeUnSelectedImagePathByFanSwingMode(fanSwingMode);
});
}
});
-
- listControl[0].SelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeSelectedImagePathByFanSwingMode(fanSwingMode);
- listControl[0].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeUnSelectedImagePathByFanSwingMode(fanSwingMode);
deviceAc.SetFanSwingAsyncMode(fanSwingMode);
}
@@ -705,20 +701,14 @@
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
this.StartCheckResponeResult(this.listControl, (result) =>
{
- //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
- if (result == false)
+ if (result == true)
{
+ //鎺ユ敹鍒扮綉鍏冲洖澶�
HdlThreadLogic.Current.RunMain(() =>
{
- //杩樺師鐘舵��
- listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByMode(oldModel);
- listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByMode(oldModel);
- });
- }
- else
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
+ listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByMode(mode);
+ listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByMode(mode);
+
//閫侀鐨勬椂鍊�,娌℃湁娓╁害鐨勬蹇�
if (mode == AC.AcMode.FanOnly)
{
@@ -741,10 +731,6 @@
});
}
});
-
- listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByMode(mode);
- listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByMode(mode);
-
deviceAc.SetSystemModeAsync(mode);
}
@@ -800,6 +786,7 @@
//閭ｅ洓涓浘鏍囧彉鏇�
this.listControl[0].IsSelected = isOpen;
this.listControl[1].IsSelected = isOpen;
+ this.listControl[2].IsSelected = isOpen;
this.listControl[3].IsSelected = isOpen;
if (isOpen == true)
{
@@ -823,7 +810,6 @@
}
});
- this.listControl[2].IsSelected = isOpen;
if (isOpen == true)
{
deviceAc.Open();
@@ -955,20 +941,16 @@
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
this.StartCheckResponeResult(this.listControl, (result) =>
{
- //娌℃湁鎺ユ敹鍒扮綉鍏冲洖澶�
- if (result == false)
+ //鎺ユ敹鍒扮綉鍏冲洖澶�
+ if (result == true)
{
HdlThreadLogic.Current.RunMain(() =>
{
- //杩樺師鐘舵��
- listControl[3].SelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(oldModel);
- listControl[3].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(oldModel);
+ listControl[3].SelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(mode);
+ listControl[3].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(mode);
});
}
});
-
- listControl[3].SelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(mode);
- listControl[3].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(mode);
deviceAc.SetFanModeAsync(mode);
}
--
Gitblit v1.8.0