From 99da2604f81af29afc6b3c6f4f128b4e5a8a5649 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 12:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs | 58 +++++++++++++++++++++++++---------------------------------
1 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
old mode 100755
new mode 100644
index 45f747d..c238832
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
@@ -11,7 +11,7 @@
/// </summary>
public class DevicePmSensorDetailCardForm : DeviceDetailCardCommonForm
{
- #region 鈻� 鍙橀噺澹版槑___________________________
+ #region 鈻� 鍙橀噺澹版槑___________________________
/// <summary>
/// 鐣岄潰涓婂彲浠ユ搷浣滅殑鎺т欢
/// </summary>
@@ -76,7 +76,7 @@
var btnHumidityStatus = new NormalViewControl(193, 92, true);
btnHumidityStatus.Y = Application.GetRealHeight(181);
btnHumidityStatus.Text = "20";
- btnHumidityStatus.TextSize = 32;
+ btnHumidityStatus.TextSize = 30;
btnHumidityStatus.TextColor = ZigbeeColor.Current.XMWhite;
btnHumidityStatus.TextAlignment = TextAlignment.CenterRight;
frameHumidityPic.AddChidren(btnHumidityStatus);
@@ -113,7 +113,7 @@
var btnTemperatureStatus = new NormalViewControl(193, 92, true);
btnTemperatureStatus.Y = Application.GetRealHeight(181);
btnTemperatureStatus.Text = "20";
- btnTemperatureStatus.TextSize = 32;
+ btnTemperatureStatus.TextSize = 30;
btnTemperatureStatus.TextColor = ZigbeeColor.Current.XMWhite;
btnTemperatureStatus.TextAlignment = TextAlignment.CenterRight;
frameTemperaturePic.AddChidren(btnTemperatureStatus);
@@ -149,8 +149,8 @@
//PM2.5鏁版嵁锛堢3涓紝listControl銆�2銆戯級
var btnPmStatus = new NormalViewControl(109 + 40, 92, true);
btnPmStatus.Y = Application.GetRealHeight(181);
- btnPmStatus.Text = "35";
- btnPmStatus.TextSize = 32;
+ btnPmStatus.Text = "155";
+ btnPmStatus.TextSize = 30;
btnPmStatus.TextColor = ZigbeeColor.Current.XMWhite;
btnPmStatus.TextAlignment = TextAlignment.CenterRight;
framePmPic.AddChidren(btnPmStatus);
@@ -166,7 +166,7 @@
btnPmUnit.TextAlignment = TextAlignment.CenterLeft;
framePmPic.AddChidren(btnPmUnit);
}
- #endregion
+ #endregion
#region 鈻� 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋淿____________
@@ -236,31 +236,6 @@
}
#endregion
- #region 鈻� 璁剧疆鏂规硶
- /// <summary>
- ///鍛戒护
- ///0:Off
- ///1:Low
- ///3:High
- ///4:On
- ///5:Auto
- /// 15:Manual
- /// </summary>
- private void SetFanComand(int command)
- {
- //妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
- this.StartCheckResponeResult(this.listControl, (result) =>
- {
- //鎺ユ敹鍒扮綉鍏冲洖澶�
- if (result == true)
- {
- }
- });
-
-
- }
- #endregion
-
#region 鈻� 鍒锋柊鐘舵�乢____________
/// <summary>
/// 鍒锋柊鐘舵��
@@ -271,8 +246,25 @@
this.listControl[0].Text = pMSensor.currentTemperature.ToString();
this.listControl[1].Text = pMSensor.currentHumidity.ToString();
this.listControl[2].Text = pMSensor.currentPmData.ToString();
- //璁剧疆鐘舵�佹枃瀛�
- this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
+ //璁剧疆鐘舵�佹枃瀛�
+ this.btnStatu.Text = Language.StringByID(R.MyInternationalizationString.AirQuality) + "";
+ }
+
+ /// <summary>
+ /// 璐ㄩ噺绛夌骇
+ /// </summary>
+ private string QuailityType()
+ {
+ string curQuality = string.Empty;
+
+ if (pMSensor.currentPmData <= 35 && pMSensor.currentPmData >= 0)
+ {
+
+ }
+ this.listControl[2].Text = pMSensor.currentPmData.ToString();
+
+ //璁剧疆鐘舵�佹枃瀛�
+ return curQuality;
}
#endregion
}
--
Gitblit v1.8.0