From 244ca45a26026afeed0f03138f740deb7121d1b9 Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期一, 30 八月 2021 14:36:23 +0800
Subject: [PATCH] 替换极光推送包

---
 HDL-ON_Android/HDL-ON_Android.csproj |   52 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index f952702..01a60d7 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -53,6 +53,9 @@
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Shared.Droid.JPush">
+      <HintPath>..\..\..\xamarin\JPush\JPushSample\Shared.Droid.JPush\bin\Release\Shared.Droid.JPush.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -163,6 +166,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
+    <Compile Include="Other\JPush\JPushFirmBroadcast.cs" />
+    <Compile Include="Other\JPush\JPushOpenClickActivity.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Application.cs" />
@@ -182,6 +187,7 @@
     <Compile Include="LeChengVideoActivity.cs" />
   </ItemGroup>
   <ItemGroup>
+    <AndroidAsset Include="Assets\agconnect-services.json" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Properties\AndroidManifest.xml" />
     <None Include="Assets\AboutAssets.txt" />
@@ -382,28 +388,40 @@
       </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\drawable\launchImage.xml">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-xhdpi\Loading.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-hdpi\Loading.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-mdpi\Loading.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-xxhdpi\Loading.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
     <AndroidResource Include="Resources\mipmap-xxxhdpi\Loading.png">
-      <SubType></SubType>
-      <Generator></Generator>
+      <SubType>
+      </SubType>
+      <Generator>
+      </Generator>
     </AndroidResource>
   </ItemGroup>
   <ItemGroup>
@@ -484,9 +502,6 @@
     </PackageReference>
     <PackageReference Include="RestSharp">
       <Version>106.11.7</Version>
-    </PackageReference>
-    <PackageReference Include="XamarinLibrary.Xamarin.Android.Manual.JPush">
-      <Version>3.7.0</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Android.Support.Constraint.Layout">
       <Version>1.1.0</Version>
@@ -1357,12 +1372,7 @@
   <ItemGroup>
     <AndroidAsset Include="Assets\Phone\FunctionIcon\DoorLock\DoorLock.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Assets\Phone\FunctionIcon\IrFan\" />
-    <Folder Include="Assets\Phone\PersonalCenter\FacePassage\" />
-    <Folder Include="Assets\Phone\FunctionIcon\Light\LightScene\" />
-    <Folder Include="Assets\Phone\FunctionIcon\Electrical\AirSwitch\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

--
Gitblit v1.8.0