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 | 83 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 79 insertions(+), 4 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index b8bd441..09d4aa1 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -30,7 +30,7 @@
<DebugType>portable</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DefineConstants>DEBUG;TRACE;__Android__</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
@@ -44,7 +44,7 @@
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <DefineConstants>TRACE;__Android__;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols>
@@ -135,6 +135,8 @@
<Compile Include="ZXingCustomScanView.cs" />
<Compile Include="ZXingOverlayView.cs" />
<Compile Include="Other\JLCountrycode.cs" />
+ <Compile Include="Other\JPush\JPushReceiver.cs" />
+ <Compile Include="Other\JPush\JPushService.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -201,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>
@@ -214,13 +217,16 @@
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="MQTTnet">
- <Version>3.0.8</Version>
+ <Version>3.0.13</Version>
</PackageReference>
<PackageReference Include="ZXing.Net.Mobile">
<Version>2.4.1</Version>
</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>
@@ -582,6 +588,75 @@
<AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_1.png" />
<AndroidAsset Include="Assets\Phone\LoginIcon\Server.png" />
<AndroidAsset Include="Assets\Phone\PersonalCenter\ServerInfo.png" />
+ <AndroidAsset Include="Assets\Phone\Public\Search.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Function.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Search.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Menu.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Help.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Telephone.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\SendMessage.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Scene.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Close.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Head.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\Transfer.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\All.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\System.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Alarm.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\AllOn.png" />
+ <AndroidAsset Include="Assets\Phone\Collection\MesCenter\Share.png" />
+ <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" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\heatlogic.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\on.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\off.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\timecondition.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\down.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\timeicon.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\lightloguc.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\set.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\addconditiontarget.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\functionicon.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\airconditionerlogic.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon5.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\delayed.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\next.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\curtainlogic.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\weekoff.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\weekon.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\outletlogic.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\back.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\scene.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\editname.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon1.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon2.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon3.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\bjicon4.png" />
+ <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" />
+ <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
</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" />
--
Gitblit v1.8.0