From 136b9e2fc48249a5ff89874f1080ba94130e7a9e Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 19 五月 2020 11:12:29 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs | 112 ++++++++++++++++++++++++++++----------------------------
1 files changed, 56 insertions(+), 56 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 7790e40..774a737
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
@@ -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>();
@@ -56,15 +56,15 @@
{
//婀垮害瀹瑰櫒
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,7 +73,7 @@
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 = 30;
@@ -83,7 +83,7 @@
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(180);
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,7 +110,7 @@
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 = 30;
@@ -120,7 +120,7 @@
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(180);
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;
@@ -156,7 +156,7 @@
framePmPic.AddChidren(btnPmStatus);
this.listControl.Add(btnPmStatus);
- //PM2.5鍗曚綅 锛堢4涓紝listControl銆�3銆戯級
+ //PM2.5鍗曚綅 锛堢4涓紝listControl銆�3銆戯級
var btnPmUnit = new NormalViewControl(120 + 26, 43, true);
btnPmUnit.Y = Application.GetRealHeight(181 + 46);
btnPmUnit.X = Application.GetRealWidth(153);
@@ -177,58 +177,58 @@
/// <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)
+ 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(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
UpdateStatus();
});
//宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- return true;
+ return true;
}
- }
- }
- if (report.DeviceStatusReport.CluterID == 1029)
- {
- var attriButeList = report.DeviceStatusReport.AttriBute;
- foreach (var attList in attriButeList)
- {
- if (attList.AttributeId == 0)
+ }
+ }
+ if (report.DeviceStatusReport.CluterID == 1029)
+ {
+ var attriButeList = report.DeviceStatusReport.AttriBute;
+ foreach (var attList in attriButeList)
+ {
+ if (attList.AttributeId == 0)
{
- HdlThreadLogic.Current.RunMain(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
UpdateStatus();
});
//宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- return true;
+ return true;
}
- }
- }
- if (report.DeviceStatusReport.CluterID == 1066)
- {
- var attriButeList = report.DeviceStatusReport.AttriBute;
- foreach (var attList in attriButeList)
- {
- if (attList.AttributeId == 0)
+ }
+ }
+ if (report.DeviceStatusReport.CluterID == 1066)
+ {
+ var attriButeList = report.DeviceStatusReport.AttriBute;
+ foreach (var attList in attriButeList)
+ {
+ if (attList.AttributeId == 0)
{
- HdlThreadLogic.Current.RunMain(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
UpdateStatus();
});
//宸茬粡鎺ユ敹鍒扮綉鍏崇殑鍙嶉
- return true;
+ return true;
}
}
}
--
Gitblit v1.8.0