From 18a7f9f40e5fab3bee5d4ac3d8fd0273dea052d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期日, 26 四月 2020 12:05:28 +0800
Subject: [PATCH] 先上传一个非最新的版本
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs | 69 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
index 9631854..6b371cf 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
@@ -1,5 +1,4 @@
锘縰sing Shared.Common;
-using Shared.Phone.Device.AC;
using Shared.Phone.UserCenter;
using System;
using System.Collections.Generic;
@@ -71,7 +70,7 @@
this.deviceAc = (AC)this.device;
//鍏堟竻绌�
this.listControl = new List<ButtonBase>();
- if (device.HadReadDeviceStatu == true && ACControlBase.IsOpen(deviceAc) == true)
+ if (device.HadReadDeviceStatu == true && DeviceAcDetailCardMethord.IsOpen(deviceAc) == true)
{
//璁剧疆鐘舵�佹枃瀛� 褰撳墠瀹ゆ俯
this.SetStatuText(deviceAc.currentLocalTemperature + "鈩�");
@@ -113,7 +112,7 @@
/// <param name="frameWhiteBack"></param>
private void InitAcControl(FrameLayout frameWhiteBack)
{
- bool isAcOpen = ACControlBase.IsOpen(deviceAc);
+ bool isAcOpen = DeviceAcDetailCardMethord.IsOpen(deviceAc);
//绌鸿皟鎺т欢鐨勫鍣�
var frameAcBack = new FrameLayout();
@@ -123,7 +122,7 @@
frameAcBack.Gravity = Gravity.CenterHorizontal;
frameWhiteBack.AddChidren(frameAcBack);
- this.nowProgressValue = ACControlBase.GetCurrentModeTemperature(deviceAc);
+ this.nowProgressValue = DeviceAcDetailCardMethord.GetCurrentModeTemperature(deviceAc);
if (nowProgressValue < 16) { nowProgressValue = 16; }
if (nowProgressValue > 32) { nowProgressValue = 32; }
//绌鸿皟鎺т欢
@@ -149,7 +148,7 @@
this.btnNowModeView = new NormalViewControl(200, 55, true);
btnNowModeView.Y = Application.GetMinRealAverage(184);
btnNowModeView.Gravity = Gravity.CenterHorizontal;
- btnNowModeView.Text = ACControlBase.GetModeNameByModeId(deviceAc.currentSystemMode);
+ btnNowModeView.Text = DeviceAcDetailCardMethord.GetModeNameByModeId(deviceAc.currentSystemMode);
btnNowModeView.TextSize = 12;
btnNowModeView.TextAlignment = TextAlignment.Center;
frameAcBack.AddChidren(btnNowModeView);
@@ -219,14 +218,14 @@
btnFanSwingMode.X = XX;
btnFanSwingMode.Y = YY;
- btnFanSwingMode.UnSelectedImagePath = ACControlBase.GetFanSwingModeUnSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
- btnFanSwingMode.SelectedImagePath = ACControlBase.GetFanSwingModeSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
+ btnFanSwingMode.UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeUnSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
+ btnFanSwingMode.SelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
btnFanSwingMode.IsSelected = isAcOpen;
frameWhiteBack.AddChidren(btnFanSwingMode);
btnFanSwingMode.ButtonClickEvent += (sender, e) =>
{
//绌鸿皟鎵撳紑鐘舵�佹墠鑳界偣鍑�
- if (ACControlBase.IsOpen(deviceAc) == true)
+ if (DeviceAcDetailCardMethord.IsOpen(deviceAc) == true)
{
//閫夋嫨鎽嗛
this.SelectFanSwing(frameWhiteBack);
@@ -241,8 +240,8 @@
var btnModel = new IconViewControl(81);
btnModel.X = XX;
btnModel.Y = YY;
- btnModel.UnSelectedImagePath = ACControlBase.GetModeUnSelectedImagePathByModeId(deviceAc.currentSystemMode);
- btnModel.SelectedImagePath = ACControlBase.GetModeSelectedImagePathByModeId(deviceAc.currentSystemMode);
+ btnModel.UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByModeId(deviceAc.currentSystemMode);
+ btnModel.SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByModeId(deviceAc.currentSystemMode);
btnModel.IsSelected = isAcOpen;
frameWhiteBack.AddChidren(btnModel);
XX = btnModel.Right + IconSpace;
@@ -250,7 +249,7 @@
btnModel.ButtonClickEvent += (sender, e) =>
{
//绌鸿皟鎵撳紑鐘舵�佹墠鑳界偣鍑�
- if (ACControlBase.IsOpen(deviceAc) == true)
+ if (DeviceAcDetailCardMethord.IsOpen(deviceAc) == true)
{
//閫夋嫨妯″紡
this.SelectAcModel(frameWhiteBack);
@@ -276,15 +275,15 @@
var btnFanMode = new IconViewControl(81);
btnFanMode.X = XX;
btnFanMode.Y = YY;
- btnFanMode.UnSelectedImagePath = ACControlBase.GetFanModeUnSelectedImagePathByFanModeId(deviceAc.currentFanMode);
- btnFanMode.SelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanModeId(deviceAc.currentFanMode);
+ btnFanMode.UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanModeUnSelectedImagePathByFanModeId(deviceAc.currentFanMode);
+ btnFanMode.SelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanModeId(deviceAc.currentFanMode);
btnFanMode.IsSelected = isAcOpen;
frameWhiteBack.AddChidren(btnFanMode);
this.listControl.Add(btnFanMode);
btnFanMode.ButtonClickEvent += (sender, e) =>
{
//绌鸿皟鎵撳紑鐘舵�佹墠鑳界偣鍑�
- if (ACControlBase.IsOpen(deviceAc) == true)
+ if (DeviceAcDetailCardMethord.IsOpen(deviceAc) == true)
{
//閫夋嫨妯″紡
this.SelectAcWindSpeed(frameWhiteBack);
@@ -496,14 +495,14 @@
HdlThreadLogic.Current.RunMain(() =>
{
//杩樺師鐘舵��
- listControl[0].SelectedImagePath = ACControlBase.GetFanSwingModeSelectedImagePathByFanSwingMode(oldModel);
- listControl[0].UnSelectedImagePath = ACControlBase.GetFanSwingModeUnSelectedImagePathByFanSwingMode(oldModel);
+ listControl[0].SelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeSelectedImagePathByFanSwingMode(oldModel);
+ listControl[0].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeUnSelectedImagePathByFanSwingMode(oldModel);
});
}
});
- listControl[0].SelectedImagePath = ACControlBase.GetFanSwingModeSelectedImagePathByFanSwingMode(fanSwingMode);
- listControl[0].UnSelectedImagePath = ACControlBase.GetFanSwingModeUnSelectedImagePathByFanSwingMode(fanSwingMode);
+ listControl[0].SelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeSelectedImagePathByFanSwingMode(fanSwingMode);
+ listControl[0].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeUnSelectedImagePathByFanSwingMode(fanSwingMode);
deviceAc.SetFanSwingAsyncMode(fanSwingMode);
}
@@ -655,8 +654,8 @@
HdlThreadLogic.Current.RunMain(() =>
{
//杩樺師鐘舵��
- listControl[1].SelectedImagePath = ACControlBase.GetModeSelectedImagePathByMode(oldModel);
- listControl[1].UnSelectedImagePath = ACControlBase.GetModeUnSelectedImagePathByMode(oldModel);
+ listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByMode(oldModel);
+ listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByMode(oldModel);
});
}
else
@@ -686,8 +685,8 @@
}
});
- listControl[1].SelectedImagePath = ACControlBase.GetModeSelectedImagePathByMode(mode);
- listControl[1].UnSelectedImagePath = ACControlBase.GetModeUnSelectedImagePathByMode(mode);
+ listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByMode(mode);
+ listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByMode(mode);
deviceAc.SetSystemModeAsync(mode);
}
@@ -880,14 +879,14 @@
HdlThreadLogic.Current.RunMain(() =>
{
//杩樺師鐘舵��
- listControl[3].SelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanMode(oldModel);
- listControl[3].UnSelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanMode(oldModel);
+ listControl[3].SelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(oldModel);
+ listControl[3].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(oldModel);
});
}
});
- listControl[3].SelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanMode(mode);
- listControl[3].UnSelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanMode(mode);
+ listControl[3].SelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(mode);
+ listControl[3].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanMode(mode);
deviceAc.SetFanModeAsync(mode);
}
@@ -1008,11 +1007,11 @@
arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCArcScaleSeekBarStartColor, ZigbeeColor.Current.GXCArcScaleSeekBarEndColor);
}
}
- this.listControl[1].SelectedImagePath = ACControlBase.GetModeSelectedImagePathByModeId(deviceAc.currentSystemMode);
- this.listControl[1].UnSelectedImagePath = ACControlBase.GetModeUnSelectedImagePathByModeId(deviceAc.currentSystemMode);
- this.btnNowModeView.Text = ACControlBase.GetModeNameByModeId(deviceAc.currentSystemMode);
- arcScaleSeekBar.Progress = ACControlBase.GetCurrentModeTemperature(deviceAc);
- arcScaleSeekBar.IsClickable = ACControlBase.IsOpen(deviceAc);
+ this.listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByModeId(deviceAc.currentSystemMode);
+ this.listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByModeId(deviceAc.currentSystemMode);
+ this.btnNowModeView.Text = DeviceAcDetailCardMethord.GetModeNameByModeId(deviceAc.currentSystemMode);
+ arcScaleSeekBar.Progress = DeviceAcDetailCardMethord.GetCurrentModeTemperature(deviceAc);
+ arcScaleSeekBar.IsClickable = DeviceAcDetailCardMethord.IsOpen(deviceAc);
//璁剧疆鐘舵�佹枃瀛� 褰撳墠瀹ゆ俯
this.SetStatuText(deviceAc.currentLocalTemperature + "鈩�");
//閫侀娌℃湁娓╁害鐨勬蹇�
@@ -1050,8 +1049,8 @@
{
this.listControl[3].IsSelected = true;
}
- this.listControl[3].SelectedImagePath = ACControlBase.GetFanModeSelectedImagePathByFanModeId(deviceAc.currentFanMode);
- this.listControl[3].UnSelectedImagePath = ACControlBase.GetFanModeUnSelectedImagePathByFanModeId(deviceAc.currentFanMode);
+ this.listControl[3].SelectedImagePath = DeviceAcDetailCardMethord.GetFanModeSelectedImagePathByFanModeId(deviceAc.currentFanMode);
+ this.listControl[3].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanModeUnSelectedImagePathByFanModeId(deviceAc.currentFanMode);
});
//宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
return true;
@@ -1065,8 +1064,8 @@
{
this.listControl[0].IsSelected = true;
}
- this.listControl[0].SelectedImagePath = ACControlBase.GetFanSwingModeSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
- this.listControl[0].UnSelectedImagePath = ACControlBase.GetFanSwingModeUnSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
+ this.listControl[0].SelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
+ this.listControl[0].UnSelectedImagePath = DeviceAcDetailCardMethord.GetFanSwingModeUnSelectedImagePathByFanSwingModeId(deviceAc.currentFanSwingMode);
});
//宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
return true;
--
Gitblit v1.8.0