Merge branch 'CJL' into NewFilePath

wxr

2020-12-20 6a8e27a164158b31356b30c1e2947b95898275fe

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -653,6 +653,7 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelGray.png" />
    <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" />