From de3bc335c02364f1f8eff777e9c1dfa00dabca3b Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期五, 04 十二月 2020 14:23:59 +0800 Subject: [PATCH] 1 --- HDL-ON_Android/HDL-ON_Android.csproj | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj index 6ce18d8..ebcbe32 100644 --- a/HDL-ON_Android/HDL-ON_Android.csproj +++ b/HDL-ON_Android/HDL-ON_Android.csproj @@ -125,9 +125,6 @@ <Reference Include="Shared.Droid.JLCountryCode"> <HintPath>..\DLL\Android\Shared.Droid.JLCountryCode.dll</HintPath> </Reference> - <Reference Include="JPushAndroid"> - <HintPath>..\DLL\Android\JPushAndroid.dll</HintPath> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="MainActivity.cs" /> @@ -138,7 +135,8 @@ <Compile Include="ZXingCustomScanView.cs" /> <Compile Include="ZXingOverlayView.cs" /> <Compile Include="Other\JLCountrycode.cs" /> - <Compile Include="JPush.cs" /> + <Compile Include="Other\JPush\JPushReceiver.cs" /> + <Compile Include="Other\JPush\JPushService.cs" /> </ItemGroup> <ItemGroup> <None Include="Resources\AboutResources.txt" /> @@ -205,6 +203,7 @@ <Folder Include="Assets\Phone\Intelligence\" /> <Folder Include="Assets\Phone\DeviceIcon\" /> <Folder Include="Other\" /> + <Folder Include="Other\JPush\" /> </ItemGroup> <ItemGroup> <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" /> @@ -225,6 +224,9 @@ </PackageReference> <PackageReference Include="RestSharp"> <Version>106.11.7</Version> + </PackageReference> + <PackageReference Include="XamarinLibrary.Xamarin.Android.Manual.JPush"> + <Version>3.7.0</Version> </PackageReference> </ItemGroup> <ItemGroup> @@ -605,6 +607,16 @@ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\AlarmOn.png" /> <AndroidAsset Include="Assets\Phone\Collection\MesCenter\ShareOn.png" /> <AndroidAsset Include="Assets\Phone\Collection\MesCenter\SystemOn.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg1.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg2.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg3.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg4.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg5.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg6.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg7.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg8.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg9.png" /> + <AndroidAsset Include="Assets\Phone\Classification\Room\Roombg10.png" /> </ItemGroup> <ItemGroup> <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" /> -- Gitblit v1.8.0