tzy
2021-03-23 132ef8524e38d06da8cf74292a3ac1eff065bb1b
整好新风的UI,待真实设备测试
16个文件已添加
4个文件已修改
62 ■■■■■ 已修改文件
HDL-ON_Android/HDL-ON_Android.csproj 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/HDL-ON_iOS.csproj 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Language.ini 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Comfortable.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/ComfortableSelect.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Energy.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/EnergySelect.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1Select.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2Select.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3Select.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Humidification.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/HumidificationSelect.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/TempAndHumiBack.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Ventilate.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/VentilateSelect.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/Fan/DialogTitleMenuGroud2.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/HDL_ON.projitems 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj
@@ -966,6 +966,22 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm25Bg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\0.png" />
    <AndroidAsset Include="Assets\Phone\PirIcon\add.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\VentilateSelect.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\EnergySelect.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2Select.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan3.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Energy.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\ComfortableSelect.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan1.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan3Select.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\TempAndHumiBack.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Comfortable.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Humidification.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumidificationSelect.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Ventilate.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan1Select.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud2.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1193,6 +1193,22 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TempIcon.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
      <BundleResource Include="Resources\Phone\PirIcon\add.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\VentilateSelect.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\EnergySelect.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan2Select.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan3.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Energy.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\ComfortableSelect.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan1.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan3Select.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\TempAndHumiBack.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Comfortable.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Humidification.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\HumidificationSelect.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Ventilate.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\AirFresh\Fan1Select.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />
HDL-ON_iOS/Resources/Language.ini
@@ -423,11 +423,11 @@
437=Device List
438=humidity:{0}%    air:{1}    wind:{2}
1000=Indoor Humidity
1000=Room Humidity
1001=V-chip
1002=Anion
1003=Sterilization
1004=Humidification
1004=Humidify
1005=Filter Element Reset
1006=Lighting
1007=Automatic
@@ -499,7 +499,18 @@
1073=Please turn on Bluetooth
1074=Location information(GBS) unavailable
1075=Network unavailable
1076=Select infrared remote control
1076=Select infrared remote control
1077=Air Fresh
1078=Residual filter screen
1079=Energy
1080=Ventilated
;别看下面都一样,都是UI特殊要求整的,再加上考虑英文长度
1081=1st Gear
1082=2nd Gear
1083=3rd Gear
1084=1st Gear
1085=2nd Gear
1086=3rd Gear
5000=Music
5001=Group
@@ -1264,6 +1275,17 @@
1074=位置信息(GBS)不可用
1075=网络不可用
1076=选择红外遥控器
1077=新风
1078=当前滤网剩余
1079=节能
1080=通风
1081=1档
1082=2档
1083=3档
1084=风速1档
1085=风速2档
1086=风速3档
5000=音乐
5001=组合
@@ -1392,6 +1414,7 @@
6076=编辑信息
6077=版本升级
6015=在线
6016=离线
6017=版本号
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Comfortable.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/ComfortableSelect.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Energy.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/EnergySelect.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan1Select.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan2Select.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Fan3Select.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Humidification.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/HumidificationSelect.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/TempAndHumiBack.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/Ventilate.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AirFresh/VentilateSelect.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/Fan/DialogTitleMenuGroud2.png
HDL_ON/HDL_ON.projitems
@@ -387,6 +387,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\EnvironmentalScience\EnvironmentalPage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\EnvironmentalScience\EchartsOption_Pie.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\SetPir.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\AirFreshControlPage.cs" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="$(MSBuildThisFileDirectory)DAL\" />