From edf7c324bea0556a3df9096dd41d668a9d41bf51 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 15:58:29 +0800
Subject: [PATCH] 改版是门锁新功能需要给测试部的版本
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs | 218 ++++++++++++++++++++++++++----------------------------
1 files changed, 105 insertions(+), 113 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..fa8c8d1
--- 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>
@@ -19,28 +19,28 @@
/// <summary>
/// 鎺т欢
/// </summary>
- private PMSensor pMSensor = null;
+ private PMSensor pMSensor = null;
/// <summary>
/// 鐘舵�佹帶浠�
/// </summary>
- private NormalViewControl btnStatu = null;
+ private NormalViewControl btnStatu = null;
/// <summary>
/// 褰撳墠鐨勬枃鏈�
/// </summary>
- private string CurrentText = string.Empty;
-
+ private string CurrentText = string.Empty;
+
/// <summary>
/// 璁惧鍚嶇О鎺т欢
/// </summary>
- private NormalViewControl btnDeviceName = null;
-
+ private NormalViewControl btnDeviceName = null;
+
#endregion
#region 鈻� 鍒濆鍖朹____________________________
public override void InitMiddleFrameAfter(FrameLayout frameWhiteBack)
{
//宸︽粦涓嶈兘
- this.ScrollEnabled = true;
+ this.ScrollEnabled = true;
this.pMSensor = (PMSensor)this.device;
//鍏堟竻绌�
this.listControl = new List<ButtonBase>();
@@ -52,19 +52,19 @@
/// 鍒濆鍖朠M2.5浼犳劅鍣ㄦ帶浠�
/// </summary>
/// <param name="frameWhiteBack"></param>
- private void InitFreshAirControl(FrameLayout frameWhiteBack)
+ private void InitFreshAirControl(FrameLayout frameWhiteBack)
{
//婀垮害瀹瑰櫒
var frameHumidityPic = new FrameLayout();
- frameHumidityPic.X = Application.GetMinRealAverage(138);
- frameHumidityPic.Y = Application.GetRealHeight(242);
- frameHumidityPic.Width = Application.GetMinRealAverage(311);
+ frameHumidityPic.X = Application.GetMinRealAverage(138);
+ frameHumidityPic.Y = Application.GetRealHeight(242);
+ frameHumidityPic.Width = Application.GetMinRealAverage(311);
frameHumidityPic.Height = Application.GetMinRealAverage(351);
frameHumidityPic.BackgroundImagePath = "PM2.5Sensor/HumidityPic.png";
frameWhiteBack.AddChidren(frameHumidityPic);
//婀垮害鏂囨湰
- var btnHumidityText = new NormalViewControl(311, 49, true);
+ var btnHumidityText = new NormalViewControl(311, 49, true);
btnHumidityText.Y = Application.GetRealHeight(45);
btnHumidityText.TextID = R.MyInternationalizationString.Humidity;
btnHumidityText.TextSize = 12;
@@ -73,17 +73,17 @@
frameHumidityPic.AddChidren(btnHumidityText);
//婀垮害鏁版嵁锛堢1涓紝listControl銆�0銆戯級
- var btnHumidityStatus = new NormalViewControl(193, 92, true);
+ 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);
this.listControl.Add(btnHumidityStatus);
//婀垮害鍗曚綅
- var btnHumidityUnit = new NormalViewControl(37 + 81, 40, true);
+ var btnHumidityUnit = new NormalViewControl(37 + 81, 40, true);
btnHumidityUnit.Y = Application.GetRealHeight(181 + 46);
btnHumidityUnit.X = Application.GetRealWidth(190);
btnHumidityUnit.Text = "%";
@@ -94,14 +94,14 @@
//娓╁害瀹瑰櫒
var frameTemperaturePic = new FrameLayout();
- frameTemperaturePic.X = Application.GetMinRealAverage(518);
- frameTemperaturePic.Y = Application.GetRealHeight(242);
- frameTemperaturePic.Width = Application.GetMinRealAverage(311);
+ frameTemperaturePic.X = Application.GetMinRealAverage(518);
+ frameTemperaturePic.Y = Application.GetRealHeight(242);
+ frameTemperaturePic.Width = Application.GetMinRealAverage(311);
frameTemperaturePic.Height = Application.GetMinRealAverage(351);
frameTemperaturePic.BackgroundImagePath = "PM2.5Sensor/TemperaturePic.png";
frameWhiteBack.AddChidren(frameTemperaturePic);
//娓╁害鏂囨湰
- var btnTemperatureText = new NormalViewControl(311, 49, true);
+ var btnTemperatureText = new NormalViewControl(311, 49, true);
btnTemperatureText.Y = Application.GetRealHeight(45);
btnTemperatureText.TextID = R.MyInternationalizationString.Temperature;
btnTemperatureText.TextSize = 12;
@@ -110,17 +110,17 @@
frameTemperaturePic.AddChidren(btnTemperatureText);
//娓╁害鏁版嵁锛堢2涓紝listControl銆�1銆戯級
- var btnTemperatureStatus = new NormalViewControl(193, 92, true);
+ 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);
this.listControl.Add(btnTemperatureStatus);
//娓╁害鍗曚綅
- var btnTemperatureUnit = new NormalViewControl(40 + 81, 40, true);
+ var btnTemperatureUnit = new NormalViewControl(40 + 81, 40, true);
btnTemperatureUnit.Y = Application.GetRealHeight(181 + 46);
btnTemperatureUnit.X = Application.GetRealWidth(188);
btnTemperatureUnit.Text = "鈩�";
@@ -131,14 +131,14 @@
//PM2.5浼犳劅鍣ㄧ殑PM2.5瀹瑰櫒
var framePmPic = new FrameLayout();
- framePmPic.X = Application.GetMinRealAverage(138);
- framePmPic.Y = Application.GetRealHeight(662);
- framePmPic.Width = Application.GetMinRealAverage(311);
+ framePmPic.X = Application.GetMinRealAverage(138);
+ framePmPic.Y = Application.GetRealHeight(662);
+ framePmPic.Width = Application.GetMinRealAverage(311);
framePmPic.Height = Application.GetMinRealAverage(351);
framePmPic.BackgroundImagePath = "PM2.5Sensor/PmPic.png";
frameWhiteBack.AddChidren(framePmPic);
//PM2.5鏂囨湰
- var btnPmText = new NormalViewControl(311, 49, true);
+ var btnPmText = new NormalViewControl(311, 49, true);
btnPmText.Y = Application.GetRealHeight(45);
btnPmText.Text = "PM2.5";
btnPmText.TextSize = 12;
@@ -147,17 +147,17 @@
framePmPic.AddChidren(btnPmText);
//PM2.5鏁版嵁锛堢3涓紝listControl銆�2銆戯級
- var btnPmStatus = new NormalViewControl(109 + 40, 92, true);
+ 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);
this.listControl.Add(btnPmStatus);
//PM2.5鍗曚綅
- var btnPmUnit = new NormalViewControl(124 + 15, 43, true);
+ var btnPmUnit = new NormalViewControl(124 + 15, 43, true);
btnPmUnit.Y = Application.GetRealHeight(181 + 46);
btnPmUnit.X = Application.GetRealWidth(150);
btnPmUnit.Text = "渭g/m鲁";
@@ -166,7 +166,7 @@
btnPmUnit.TextAlignment = TextAlignment.CenterLeft;
framePmPic.AddChidren(btnPmUnit);
}
- #endregion
+ #endregion
#region 鈻� 鏄惁鑾峰彇缃戝叧鍙嶉鐨勭粨鏋淿____________
@@ -176,88 +176,63 @@
/// <param name="comandDiv">鍛戒护鍖哄垎</param>
/// <param name="report">涓婃姤鏁版嵁</param>
/// <returns></returns>
- public override bool CheckResponeResultStatu(ReceiveComandDiv comandDiv, CommonDevice report)
- {
- if (comandDiv == ReceiveComandDiv.A璁惧灞炴�т笂鎶�)
- {
- if (report.DeviceStatusReport.CluterID == 1026)
- {
- var attriButeList = report.DeviceStatusReport.AttriBute;
- foreach (var attList in attriButeList)
- {
- if (attList.AttributeId == 0)
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- UpdateStatus();
- });
-
- //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- return true;
- }
- }
- }
- if (report.DeviceStatusReport.CluterID == 1029)
- {
- var attriButeList = report.DeviceStatusReport.AttriBute;
- foreach (var attList in attriButeList)
- {
- if (attList.AttributeId == 0)
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- UpdateStatus();
- });
-
- //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- return true;
- }
- }
- }
- if (report.DeviceStatusReport.CluterID == 1066)
- {
- var attriButeList = report.DeviceStatusReport.AttriBute;
- foreach (var attList in attriButeList)
- {
- if (attList.AttributeId == 0)
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- UpdateStatus();
- });
-
- //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- return true;
- }
- }
- }
- }
- return false;
- }
- #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)
+ public override bool CheckResponeResultStatu(ReceiveComandDiv comandDiv, CommonDevice report)
+ {
+ if (comandDiv == ReceiveComandDiv.A璁惧灞炴�т笂鎶�)
+ {
+ if (report.DeviceStatusReport.CluterID == 1026)
{
- }
- });
+ var attriButeList = report.DeviceStatusReport.AttriBute;
+ foreach (var attList in attriButeList)
+ {
+ if (attList.AttributeId == 0)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ UpdateStatus();
+ });
+ //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
+ return true;
+ }
+ }
+ }
+ if (report.DeviceStatusReport.CluterID == 1029)
+ {
+ var attriButeList = report.DeviceStatusReport.AttriBute;
+ foreach (var attList in attriButeList)
+ {
+ if (attList.AttributeId == 0)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ UpdateStatus();
+ });
+ //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
+ return true;
+ }
+ }
+ }
+ if (report.DeviceStatusReport.CluterID == 1066)
+ {
+ var attriButeList = report.DeviceStatusReport.AttriBute;
+ foreach (var attList in attriButeList)
+ {
+ if (attList.AttributeId == 0)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ UpdateStatus();
+ });
+
+ //宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
+ return true;
+ }
+ }
+ }
+ }
+ return false;
}
#endregion
@@ -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