From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制

---
 HDL-ON_Android/HDL-ON_Android.csproj |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 4ff5a5b..09d4aa1 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,12 +203,13 @@
     <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" />
     <PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" />
     <PackageReference Include="Xamarin.Android.Support.v4">
       <Version>28.0.0.3</Version>
     </PackageReference>
@@ -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>
@@ -643,6 +645,14 @@
     <AndroidAsset Include="Assets\Phone\LogicIcon\-.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\+.png" />
     <AndroidAsset Include="Assets\Phone\LogicIcon\point.png" />
+    <AndroidAsset Include="Assets\Phone\LogicIcon\ selected+.png" />
+    <AndroidAsset Include="Assets\Phone\LogicIcon\selected-.png" />
+    <AndroidAsset Include="Assets\Phone\LogicIcon\link.png" />
+    <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheFun.png" />
+    <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheScene.png" />
+    <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheTime.png" />
+    <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FaceIdIconBig.png" />
+    <AndroidAsset Include="Assets\Phone\PersonalCenter\AppUnlockSetting\FingerIconBlue.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />

--
Gitblit v1.8.0