From 4a5e9d0447aae9b264a98ea1f4c95417d0f4aa91 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:20:01 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL-ON_Android/HDL-ON_Android.csproj | 47 ++++++++++++++++++++++++++---------------------
1 files changed, 26 insertions(+), 21 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 6484577..c04a550 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -125,6 +125,9 @@
<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" />
@@ -135,6 +138,7 @@
<Compile Include="ZXingCustomScanView.cs" />
<Compile Include="ZXingOverlayView.cs" />
<Compile Include="Other\JLCountrycode.cs" />
+ <Compile Include="JPush.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
@@ -593,27 +597,28 @@
<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\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\bjicon.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\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" />
+ </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