From 900a085e5ce1aee2bb60dc5a3b31777805712db2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 28 八月 2021 10:25:51 +0800
Subject: [PATCH] co2 5000数值显示清新的问题
---
HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/CustomerObj.cs | 4 +-
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 18 ++++----
HDL-ON_iOS/Info.plist | 4 +-
HDL_ON/DAL/Server/NewAPI.cs | 3 -
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs | 2
.vs/HDL_APP_Project/xs/UserPrefs.xml | 59 ++++++++++++++---------------
HDL_ON/DAL/DriverLayer/Control.cs | 1
HDL_ON/UI/MainPage.cs | 1
HDL_ON/UI/UI1-Login/LoginPage.cs | 2
HDL_ON/Entity/Function/Sensor.cs | 2
11 files changed, 48 insertions(+), 50 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 00c6fae..fea568a 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,21 +1,18 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/Server/HttpUtil.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI1-Login/LoginPage.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" Line="282" Column="39" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" Line="489" Column="57" />
- <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingResultPage.cs" Line="61" Column="14" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1603" Column="7" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="2184" Column="17" />
- <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="286" Column="28" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" Line="489" Column="60" />
- <File FileName="HDL_ON/Common/R.cs" Line="22" Column="26" />
- <File FileName="HDL_ON/Entity/Function/Sensor.cs" Line="201" Column="73" />
- <File FileName="HDL_ON/UI/UI2/1-HomePage/HomePage.cs" Line="567" Column="62" />
- <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="482" Column="14" />
- <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="313" Column="51" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="830" Column="41" />
+ <File FileName="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" />
+ <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" Line="469" Column="16" />
+ <File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FaceSettingPage.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" Line="206" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2667" Column="87" />
+ <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="665" Column="22" />
+ <File FileName="HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs" Line="837" Column="162" />
+ <File FileName="HDL_ON/Entity/Function/Sensor.cs" Line="240" Column="39" />
+ <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="216" Column="55" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -23,24 +20,25 @@
<Node name="HDL_APP_Project" expanded="True">
<Node name="HDL_ON" expanded="True">
<Node name="DAL" expanded="True">
- <Node name="Server" expanded="True">
- <Node name="HttpUtil.cs" selected="True" />
- </Node>
+ <Node name="Server" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True">
+ <Node name="Function" expanded="True" />
</Node>
<Node name="UI" expanded="True">
+ <Node name="UI1-Login" expanded="True">
+ <Node name="LoginPage.cs" selected="True" />
+ </Node>
<Node name="UI2" expanded="True">
- <Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True" />
+ <Node name="4-PersonalCenter" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="EnvironmentalScience" expanded="True" />
</Node>
</Node>
</Node>
</Node>
+ <Node name="HDL-ON_iOS" expanded="True" />
</Node>
- </State>
- </Pad>
- <Pad Id="MonoDevelop.Debugger.WatchPad">
- <State>
- <Value>cus.customerFaceUrl</Value>
</State>
</Pad>
</Pads>
@@ -51,7 +49,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
@@ -62,11 +60,10 @@
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" line="168" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AirFreshRelayControlPage.cs" line="71" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs" line="468" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="224" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="466" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="523" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="467" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs" line="524" column="1" />
<Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="314" column="1" />
- <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs" relfile="HDL_ON/DAL/Mqtt/MqttClient.cs" line="312" column="1" />
+ <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs" relfile="HDL_ON/DAL/DriverLayer/Control.cs" line="783" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index ca7c98f..8726038 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.2.202108271</string>
+ <string>1.2.202108272</string>
<key>CFBundleVersion</key>
- <string>1.2.08271</string>
+ <string>1.2.08272</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index ff0b043..dd35712 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -1029,6 +1029,7 @@
case SPK.ClothesHanger:
case SPK.AcIr:
case SPK.SenesorMegahealth:
+ case SPK.AirFreshStandard:
//璁惧鐘舵�佹帹閫�
//鐘舵�佹洿鏂�
Stan.HdlDeviceStatuPushLogic.Current.UpdateDeviceStatu(updateTemp.sid, updateTemp.status);
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 8da4766..bd32d6f 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -662,11 +662,10 @@
/// </summary>
public const string API_POST_FL_GetCallList = "/home-wisdom/platform/imou/listCallRecords";
- public const string Api_Post_GetSipInfo = "";
/// <summary>
/// 浜鸿劯褰曞叆
/// </summary>
- public const string Api_Post_InputUserFace = "/community-wisdom/app/doorDevice/inputUserFace";
+ public const string Api_Post_InputUserFace = "/community-wisdom/app/doorDevice/inputUserFaceHouse";//"/community-wisdom/app/doorDevice/inputUserFace";
/// <summary>
/// 寮�鍏充汉鑴稿姛鑳�
/// </summary>
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index 94290cc..63e5b21 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -237,7 +237,7 @@
level = 2;
else if (values < 5000)
level = 3;
- else if (values > 5000)
+ else if (values >= 5000)
level = 4;
break;
case SPK.SensorTemperature:
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 4c5fbd6..2d7b346 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -107,6 +107,7 @@
SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,
SPK.AcIr,SPK.AcStandard,
SPK.FloorHeatStandard,
+ SPK.AirFreshStandard,
};
/// <summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index def2395..f569b2c 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -210,7 +210,7 @@
//etAccount.Text = "18022428438";//wjc
//etAccount.Text = "13602944661";//kx
etAccount.Text = "13226233133";//璞嗚眴
- etAccount.Text = "18316672920";
+ //etAccount.Text = "18316672920";
//etAccount.Text = "18316120654";//tujie
//etAccount.Text = "15626203746";
//etAccount.Text = "13450425807";//榛勭婧� knx椤圭洰
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index e108493..304f655 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -713,9 +713,9 @@
case "tvoc":
{
list = new List<string> {
- Language.StringByID(StringId.zhengchang)+ ":0~399mg/m3",
- Language.StringByID(StringId.chaobiao)+ ":400~699mg/m3",
- Language.StringByID(StringId.yanzhong)+":>700mg/m3",
+ Language.StringByID(StringId.zhengchang)+ ":0~399PPB",
+ Language.StringByID(StringId.chaobiao)+ ":400~699PPB",
+ Language.StringByID(StringId.yanzhong)+":>700PPB",
};
}
break;
@@ -985,15 +985,15 @@
if (intValue >=1 && intValue <= 3)
{
- text = Language.StringByID(StringId.zhengchang) + ":0~399mg/m3";
+ text = Language.StringByID(StringId.zhengchang) + ":0~399PPB";
}
else if (intValue >=4 && intValue<=6)
{
- text = Language.StringByID(StringId.chaobiao) + ":400~699mg/m3";
+ text = Language.StringByID(StringId.chaobiao) + ":400~699PPB";
}
else if (intValue >= 7 && intValue <= 9)
{
- text = Language.StringByID(StringId.yanzhong) + ":>700mg/m3";
+ text = Language.StringByID(StringId.yanzhong) + ":>700PPB";
}
}
break;
@@ -1054,15 +1054,15 @@
break;
case "tvoc":
{
- if (text == Language.StringByID(StringId.zhengchang) + ":0~399mg/m3")
+ if (text == Language.StringByID(StringId.zhengchang) + ":0~399PPB")
{
value = "2";
}
- else if (text == Language.StringByID(StringId.chaobiao) + ":400~699mg/m3")
+ else if (text == Language.StringByID(StringId.chaobiao) + ":400~699PPB")
{
value = "5";
}
- else if (text == Language.StringByID(StringId.yanzhong) + ":>700mg/m3")
+ else if (text == Language.StringByID(StringId.yanzhong) + ":>700PPB")
{
value = "8";
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/CustomerObj.cs b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/CustomerObj.cs
index fc7d818..1abf318 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/CustomerObj.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/CustomerObj.cs
@@ -76,14 +76,14 @@
/// </summary>
public string address;
/// <summary>
- /// 浜鸿劯鐘舵��
+ /// 浜鸿劯褰曞叆鐘舵��
/// 1锛氬綍鍏ョ姸鎬�
/// 2锛氫笅鍙戞垚鍔�
/// 3锛氫笅鍙戝け璐�
/// </summary>
public int faceStatus = 0;
/// <summary>
- /// 浜鸿劯鐘舵��
+ /// 浜鸿劯寮�鍚姸鎬�
/// 1锛氬紑鍚姸鎬�
/// 2锛氬叧闂姸鎬�
/// 3锛氭竻闄や汉鑴告暟鎹�
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index f9f005e..c3506ee 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
@@ -104,7 +104,7 @@
InDefenseMode.alarm = false;
Control.Ins.ControlSecurity(InDefenseMode, "enable");
};
- new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteSceneTip, action);
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.ClearTheSecurityAlarmTip, action);
}
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index 510234f..38805f8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -528,7 +528,7 @@
btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
break;
case SPK.SensorTVOC:
- btnTitle.Text = "TVOC(mg/m3)";
+ btnTitle.Text = "TVOC(PPB)";
break;
case SPK.SensorCO2:
btnTitle.Text = "CO2(PPM)";
--
Gitblit v1.8.0