Merge remote-tracking branch 'origin/lss' into temp-wxr

wxr

2021-03-26 80faceb86399017851f9f72feaaef868a37ff23f

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -335,6 +335,7 @@
    <Folder Include="Assets\Phone\FunctionIcon\Electrical\WaterValve\" />
    <Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
    <Folder Include="Assets\Phone\PirIcon\" />
    <Folder Include="Assets\Phone\VideoIcon\" />
  </ItemGroup>
  <ItemGroup />
  <ItemGroup>
@@ -1034,6 +1035,47 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\irlearn_white.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\curtainswitch_white.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\electricalracks_white.png" />
    <AndroidAsset Include="Assets\Phone\VideoIcon\answer.png" />
    <AndroidAsset Include="Assets\Phone\VideoIcon\danyuanji.png" />
    <AndroidAsset Include="Assets\Phone\VideoIcon\hangup.png" />
    <AndroidAsset Include="Assets\Phone\VideoIcon\keshiduijiang.png" />
    <AndroidAsset Include="Assets\Phone\VideoIcon\menjin.png" />
    <AndroidAsset Include="Assets\Phone\VideoIcon\phone.png" />
    <AndroidAsset Include="Assets\Phone\VideoIcon\weiqiangji.png" />
    <AndroidAsset Include="Assets\Phone\PirIcon\1.png" />
    <AndroidAsset Include="Assets\Phone\PirIcon\2.png" />
    <AndroidAsset Include="Assets\Phone\PirIcon\3.png" />
    <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" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AC\More.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />