HDL-ON_Android/Assets/Phone/FunctionIcon/EnvirSensor/Pm10Bg.png
@@ -192,11 +192,11 @@ <Reference Include="LcVideoSdk"> <HintPath>..\DLL\LC\Android\LcVideoSdk.dll</HintPath> </Reference> <Reference Include="HdlEzvizDroid"> <HintPath>..\DLL\HdlEzvizDroid.dll</HintPath> </Reference> <Reference Include="Shared.Droid"> <HintPath>..\DLL\Android\Shared.Droid.dll</HintPath> </Reference> <Reference Include="HdlEzvizDroid"> <HintPath>..\..\..\HdlEzvizDroid.dll</HintPath> </Reference> </ItemGroup> <ItemGroup> @@ -620,6 +620,8 @@ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on_home.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\LightScene\gp_all_on.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\electricaltvhisense.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" /> <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" /> </ItemGroup> <ItemGroup> <AndroidResource Include="Resources\values\colors.xml" /> HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202311151"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.4.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202312081"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <uses-permission android:name="android.permission.RECEIVE_SMS" /> <!--友盟--> HDL-ON_Android/Resources/Resource.designer.cs
Diff too large HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1778,6 +1778,8 @@ <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on_home.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on.png" /> <BundleResource Include="Resources\Phone\LogicIcon\electricaltvhisense.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvirSensor/Pm10Bg.png
@@ -1492,6 +1492,7 @@ FloorHeatingPage.UpdataStates(localFunction); break; case SPK.SensorPm25: case SPK.SensorPm10: case SPK.SensorCO2: case SPK.SensorTVOC: case SPK.SensorTemperature: HDL_ON/Entity/Function/Function.cs
@@ -1499,6 +1499,7 @@ /// </summary> public const string Illuminance = "illuminance"; public const string Pm25 = "pm25"; public const string Pm10 = "pm10"; public const string Tvoc = "tvoc"; /// <summary> /// 状态,传感器 HDL_ON/Entity/Function/Sensor.cs
@@ -61,6 +61,10 @@ case SPK.SensorHumidity: attr = function.GetAttribute(FunctionAttributeKey.Humidity); break; case SPK.SensorPm10: attr = function.GetAttribute(FunctionAttributeKey.Pm10); break; } } double value = 0.0; @@ -98,6 +102,12 @@ switch (spk) { case SPK.SensorPm25: _intervalValue.Add("0 ~ 50"); _intervalValue.Add("51 ~ 100"); _intervalValue.Add("101 ~ 150"); _intervalValue.Add("151 ~"); break; case SPK.SensorPm10: _intervalValue.Add("0 ~ 35"); _intervalValue.Add("36 ~ 75"); _intervalValue.Add("76 ~ 115"); @@ -211,6 +221,7 @@ _levelColorList.Add(0xFFFF3D3D); break; case SPK.SensorTVOC: case SPK.SensorPm10: _levelColorList.Add(0xFFADE764); _levelColorList.Add(0xFFFFD154); _levelColorList.Add(0xFFFF9D54); @@ -246,6 +257,7 @@ switch (spk) { case SPK.SensorPm25: case SPK.SensorPm10: _levelTextList.Add(StringId.Great); _levelTextList.Add(StringId.Good); _levelTextList.Add(StringId.MildPollution); HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@ /// <summary> /// 版本号 /// </summary> public static string VersionString = "2.4.2"; public static string VersionString = "2.4.3"; ///// <summary> ///// 客户端类型 ///// </summary> HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -274,10 +274,7 @@ int index = 0; foreach (var sensor in FunctionList.List.GetEnvirSensorsList()) { if (sensor.spk == SPK.SensorPm10) { continue; } if(SPK.EvironmentSensorList().Contains(sensor.spk) ) { foreach (var seTemp in sensor.attributes) @@ -375,6 +372,10 @@ case SPK.SensorPm25: imagePath = "FunctionIcon/EnvirSensor/Pm25Bg.png"; iconPath = "FunctionIcon/EnvirSensor/Pm25Icon.png"; break; case SPK.SensorPm10: imagePath = "FunctionIcon/EnvirSensor/Pm25Bg.png"; iconPath = "FunctionIcon/EnvirSensor/Pm10Icon.png"; break; case SPK.SensorTVOC: imagePath = "FunctionIcon/EnvirSensor/TvocBg.png"; @@ -588,6 +589,9 @@ { case SPK.SensorPm25: btnTitle.Text = "PM2.5(ug/m³)";//² break; case SPK.SensorPm10: btnTitle.Text = "PM10(ug/m³)";//² break; case SPK.SensorTemperature: btnTitle.Text = Language.StringByID(StringId.Temp) + "(°C)"; @@ -929,6 +933,9 @@ case SPK.SensorCO2: attr = updateTemp.GetAttribute(FunctionAttributeKey.Co2); break; case SPK.SensorPm10: attr = updateTemp.GetAttribute(FunctionAttributeKey.Pm10); break; case SPK.SensorTemperature: attr = updateTemp.GetAttribute(FunctionAttributeKey.Temperature); break;
