From a56a485926a8927f904d7f4795c371c25b35753a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 18:18:15 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath

---
 HDL-ON_Android/HDL-ON_Android.csproj |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 998d684..e7375df 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -228,6 +228,9 @@
     <PackageReference Include="XamarinLibrary.Xamarin.Android.Manual.JPush">
       <Version>3.7.0</Version>
     </PackageReference>
+    <PackageReference Include="Bugly">
+      <Version>4.3.1</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="Assets\Language.ini" />
@@ -653,6 +656,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" />
@@ -662,6 +666,10 @@
     <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" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\CozyIconOn.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\MeetingGuestsIconOn.png" />
+    <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ReadIconOn.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />

--
Gitblit v1.8.0