From dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 04 十二月 2020 16:06:47 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL-ON_Android/HDL-ON_Android.csproj | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index c483cc6..093a46e 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" />
@@ -226,6 +225,9 @@
<PackageReference Include="RestSharp">
<Version>106.11.7</Version>
</PackageReference>
+ <PackageReference Include="XamarinLibrary.Xamarin.Android.Manual.JPush">
+ <Version>3.7.0</Version>
+ </PackageReference>
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Language.ini" />
--
Gitblit v1.8.0