Merge branch 'WJC' into temp-wxr

wxr

2021-03-19 355bf4219bcd33f2178ed3b1aa54e0af71905fdf

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -232,6 +232,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>
@@ -925,6 +926,19 @@
    <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" />
  </ItemGroup>
  <ItemGroup>
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />