From 6031a2d7faaa4f0271b0e9cecaa228e411ceca11 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 24 二月 2021 17:52:33 +0800
Subject: [PATCH] 2021-2-24-1
---
HDL-ON_Android/HDL-ON_Android.csproj | 138 ++++++++++++++++++++++++++-------------------
1 files changed, 80 insertions(+), 58 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 3ed98a8..7512d0a 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -153,80 +153,64 @@
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" />
<AndroidResource Include="Resources\drawable\Loading.png">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\Icon.png">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\xml\network_security_config.xml">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\xml\file_paths.xml">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\layout\zxing_layout.xml">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-xhdpi\Icon.png">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-mdpi\Icon.png">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-hdpi\Icon.png">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-anydpi-v26\Icon.png">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png">
- <SubType>
- </SubType>
- <Generator>
- </Generator>
+ <SubType></SubType>
+ <Generator></Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\LogicIcon\selected+.png" />
+ <Folder Include="Resources\drawable\" />
+ <Folder Include="Resources\layout\" />
+ <Folder Include="Assets\Phone\Intelligence\" />
+ <Folder Include="Assets\Phone\DeviceIcon\" />
+ <Folder Include="Other\" />
+ <Folder Include="Other\JPush\" />
+ <Folder Include="Assets\Phone\PirIcon\" />
</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.5.3.2" />
+ <PackageReference Include="Xamarin.Essentials" Version="1.6.0" />
<PackageReference Include="Xamarin.Android.Support.v4">
<Version>28.0.0.3</Version>
</PackageReference>
@@ -244,6 +228,9 @@
</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>
@@ -637,16 +624,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" />
@@ -662,6 +646,7 @@
<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" />
@@ -671,19 +656,56 @@
<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\LogicIcon\sensor.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\air.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\custom.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\dvd.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\fan.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\Infraredtreasure.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\projector.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\search.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\tv.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\stb.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\offline.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\online.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\priequipment.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\addlbuton.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\del.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\delbuton.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\dropdown.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\adddevice.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\next.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\failed.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\icon1.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\icon2.png" />
+ <AndroidAsset Include="Assets\Phone\PirIcon\succeed.png" />
</ItemGroup>
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\oRobot.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RoomListBg.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\ErrorIcon.png" />
</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