From 7232642ff48a7fbde2018cde652f3e771fa58025 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 27 一月 2021 14:32:55 +0800
Subject: [PATCH] 20200127-英文版处理
---
HDL-ON_Android/HDL-ON_Android.csproj | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 4ff5a5b..d53e103 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.6.0" />
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
@@ -225,6 +224,12 @@
</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="Bugly">
+ <Version>4.3.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -618,16 +623,13 @@
<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" />
@@ -643,6 +645,40 @@
<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" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelGray.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorWheelTip.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\time.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ClearIcon.png" />
+ <AndroidAsset Include="Assets\Phone\ErrorIcon.png" />
+ <AndroidAsset Include="Assets\Phone\oRobot.png" />
+ <AndroidAsset Include="Assets\Phone\RoomListBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatrueQuick.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatrueQuickBack.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ColorTemperatureBar.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\CozyIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\MeetingGuestsIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ReadIcon.png" />
+ <AndroidAsset Include="Assets\Phone\Public\PopupDialog.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\CozyIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\MeetingGuestsIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Light\ReadIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FloorHeating\DiyThumbIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg2.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg3.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg1.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg4.png" />
+ <AndroidAsset Include="Assets\Phone\Public\ListCellbg\ListCellbg5.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\location.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\changesinoutdoor.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\UserTypebg2.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0