From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL-ON_Android/HDL-ON_Android.csproj | 64 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 50d8794..40665d6 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -146,6 +146,15 @@
<Reference Include="videophone">
<HintPath>..\DLL\FL\Android\videophone.dll</HintPath>
</Reference>
+ <Reference Include="Square.OkHttp3">
+ <HintPath>..\DLL\EZvizMonitor\Square.OkHttp3.dll</HintPath>
+ </Reference>
+ <Reference Include="Square.OkIO">
+ <HintPath>..\DLL\EZvizMonitor\Square.OkIO.dll</HintPath>
+ </Reference>
+ <Reference Include="ys">
+ <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
@@ -324,6 +333,10 @@
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
+ <AndroidResource Include="Resources\drawable\launchImage.xml">
+ <SubType></SubType>
+ <Generator></Generator>
+ </AndroidResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable\" />
@@ -362,14 +375,20 @@
<PackageReference Include="XamarinLibrary.Xamarin.Android.Manual.JPush">
<Version>3.7.0</Version>
</PackageReference>
- <PackageReference Include="Bugly">
- <Version>4.3.1</Version>
- </PackageReference>
<PackageReference Include="Xamarin.Android.Support.Constraint.Layout">
<Version>1.1.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Android.Support.Constraint.Layout.Solver">
<Version>1.1.0</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AppCenter">
+ <Version>4.2.0</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AppCenter.Crashes">
+ <Version>4.2.0</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AppCenter.Analytics">
+ <Version>4.2.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -1078,6 +1097,45 @@
<AndroidAsset Include="Assets\Phone\PirIcon\add.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\More.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\Energy\EnergyDrodDownIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\VentilateSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\EnergySelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2Select.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan3.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Energy.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\ComfortableSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan1.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan3Select.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\TempAndHumiBack.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Comfortable.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Humidification.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumidificationSelect.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Ventilate.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan1Select.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud2.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\airFreshjinmao.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_blue.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\airFreshjinmao_white.png" />
+ <AndroidAsset Include="Assets\Phone\Public\RightSlideBackIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\FunctionBg\SecurityCenterFunctionBg.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\DisasterAlarmIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\InDefenseBigIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\AddDefenseIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HouseDefenseIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HolidayDefenseIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\AtHomeDefenseIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\AtHomeDefenseIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\NoDefenseBigIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HolidayDefenseIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HouseDefenseIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\BurglarAlarmIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\ArmCenter\HistoryIcon.png" />
+ <AndroidAsset Include="Assets\Phone\LogicIcon\shiwaitianqi.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainDownIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainDownIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
+ <AndroidAsset Include="Assets\Phone\PersonalCenter\SmartSpeaker.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
--
Gitblit v1.8.0