Merge branch 'temp-wxr' into WJC

陈嘉乐

2021-03-22 551e82d33c9c23442e0ecd320bcfc752f300d9ef

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -939,6 +939,32 @@
    <AndroidAsset Include="Assets\Phone\PirIcon\4.png" />
    <AndroidAsset Include="Assets\Phone\PirIcon\left.png" />
    <AndroidAsset Include="Assets\Phone\PirIcon\right.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\TV\TVAV.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TvocIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TempIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm25Icon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\29.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HumidityIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\13.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TvocBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\20.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Co2Icon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\LowerLimit.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\18.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\InfoIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\4.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Co2Bg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\HumidityBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\5.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\UpperLimit.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\TempBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\6.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\3.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\45.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\1.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm25Bg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\0.png" />
    <AndroidAsset Include="Assets\Phone\PirIcon\add.png" />
  </ItemGroup>
  <ItemGroup>