From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
index ad9af3c..bc8fa02 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
@@ -106,7 +106,7 @@
btnDeviceName.TextSize = 16;
btnDeviceName.TextColor = UserCenterColor.Current.TextGrayColor1;
btnDeviceName.SelectedTextColor = UserCenterColor.Current.White;
- btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);
+ btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
this.AddChidren(btnDeviceName, ChidrenBindMode.BindEvent);
//鏀堕泦鎺т欢
@@ -219,9 +219,9 @@
btnCollect.IsSelected = collect;
}
//璁惧鍥炬爣涔熷埛鏂�
- HdlDeviceCommonLogic.Current.SetDeviceIconToControl2(btnDeviceIcon, i_device);
+ Common.LocalDevice.Current.SetDeviceIconToControl2(btnDeviceIcon, i_device);
//鍚嶅瓧鍒锋柊
- this.btnDeviceName.Text = HdlDeviceCommonLogic.Current.GetDeviceEpointName(i_device);
+ this.btnDeviceName.Text = Common.LocalDevice.Current.GetDeviceEpointName(i_device);
//妫�娴嬭澶囨槸鍚︽槸鎵撳紑鐘舵��
bool isOpen = this.CheckIsOpenStatu(i_device);
if (this.isHadOpenSwitch == true && i_device.HadReadDeviceStatu == false)
@@ -246,8 +246,39 @@
/// <param name="isOpen"></param>
public void SetCardOpenStatu(bool isOpen)
{
- //璁惧鐘舵�佸繀椤诲埛鏂�
- this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device);
+ //鑾峰彇璁惧绫诲瀷
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.AirQualitySensor)
+ {
+ var aqSensor = (TemperatureSensor)this.device;
+ //绌烘皵璐ㄩ噺浼犳劅鍣�
+ var tempAirQuality = aqSensor.AirQuality(aqSensor);
+ string curQuality = string.Empty;
+ if (tempAirQuality == 1)
+ {
+ curQuality = Language.StringByID(R.MyInternationalizationString.ExcellentAirQuality);
+ }
+ else if (tempAirQuality == 2)
+ {
+ curQuality = Language.StringByID(R.MyInternationalizationString.GoodAirQuality);
+ }
+ else if (tempAirQuality == 3)
+ {
+ curQuality = Language.StringByID(R.MyInternationalizationString.Pollution);
+
+ }
+ else
+ {
+ curQuality = "";
+ }
+ this.btnStatu.Text = curQuality;
+ }
+ else
+ {
+ //璁惧鐘舵�佸繀椤诲埛鏂�
+ this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
+ }
+
//寮�鍏虫帶浠�
if (btnSwitch != null && this.btnSwitch.IsSelected != isOpen)
{
@@ -307,7 +338,7 @@
//濡傛灉杩欎釜鍑芥暟琚噸鍐欑殑璇�,鍒欎唬琛ㄨ繖涓澶囨湁寮�鍏冲姛鑳�
this.isHadOpenSwitch = false;
//榛樿鐢ㄥ湪绾跨姸鎬佹潵鍒ゆ柇
- return HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(i_device);
+ return Common.LocalDevice.Current.CheckDeviceIsOnline(i_device);
}
@@ -482,7 +513,7 @@
public void StartCardLightAppeal()
{
//璁惧鐘舵�佸繀椤诲埛鏂�
- this.btnStatu.Text = HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device);
+ this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device);
if (this.isAppeal == true) { return; }
this.isAppeal = true;
--
Gitblit v1.8.0