From dc0309e64f02227d8e1468b7326c07955f804612 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 22 六月 2022 11:22:18 +0800
Subject: [PATCH] 修改引用路径
---
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
index d774ce2..bc8fa02 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/Base/DeviceCardCommon.cs
@@ -230,6 +230,13 @@
//绛夊緟缃戝叧鍥炲鍚庝細閲嶆柊鍒锋柊,涓嶇劧涓�鐩存槸鍏抽棴鐘舵��
isOpen = false;
}
+ //濡傛灉鏄紶鎰熷櫒绫�,鍒欓粯璁ゆ槸鍏崇殑鏁堟灉
+ if (this.device.Type == DeviceType.PMSensor || this.device.Type == DeviceType.IASZone
+ || this.device.Type == DeviceType.TemperatureSensor)
+ {
+ isOpen = false;
+ }
+
this.SetCardOpenStatu(isOpen);
}
@@ -239,8 +246,39 @@
/// <param name="isOpen"></param>
public void SetCardOpenStatu(bool isOpen)
{
- //璁惧鐘舵�佸繀椤诲埛鏂�
- this.btnStatu.Text = HdlDeviceOtherLogic.Current.GetDeviceStatu(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)
{
@@ -401,6 +439,15 @@
this.ResponeResult = 1;
}
+ /// <summary>
+ /// 鎺ユ敹缃戝叧鍥炲鐨勭姸鎬�(true:宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍥炲 false:杩樻病鏈夋帴鏀跺埌缃戝叧鍥炲)
+ /// </summary>
+ /// <returns></returns>
+ public bool ReceiveResponeResultStatu()
+ {
+ return this.ResponeResult == 1;
+ }
+
#endregion
#region 鈻� 鏄剧ず浣庣數閲廮________________________
@@ -503,7 +550,7 @@
/// <summary>
/// 鍒囨崲鍗＄墖鐘舵�佺壒鏁�
/// </summary>
- private void SwitchCardStatuAppeal(bool isOpen)
+ public void SwitchCardStatuAppeal(bool isOpen)
{
if (this.btnBackGroud.IsSelected == isOpen)
{
--
Gitblit v1.8.0