Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-19 4a9318077bd095fbc7c57c593e5ca8185603dac4

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -654,6 +654,16 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelTip.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\time.png" />
    <AndroidAsset Include="Assets\Phone\Public\ClearIcon.png" />
    <AndroidAsset Include="Assets\Phone\ErrorIcon.png" />
    <AndroidAsset Include="Assets\Phone\oRobot.png" />
    <AndroidAsset Include="Assets\Phone\RoomListBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatrueQuick.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatrueQuickBack.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatureBar.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\CozyIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\MeetingGuestsIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ReadIcon.png" />
    <AndroidAsset Include="Assets\Phone\Public\PopupDialog.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />