From 77e7b5223dd04a6e036dc952efb38f2b770a6828 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 09 六月 2020 13:50:43 +0800
Subject: [PATCH] 2020--6-9
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 90 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index d44096e..b453c04 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -85,6 +85,9 @@
<PackageReference Include="Microsoft.AppCenter.Crashes">
<Version>3.1.0</Version>
</PackageReference>
+ <PackageReference Include="ZXing.Net.Mobile">
+ <Version>2.4.1</Version>
+ </PackageReference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
@@ -150,6 +153,10 @@
<Folder Include="Resources\Phone\FunctionIcon\" />
<Folder Include="Resources\Phone\FunctionIcon\Scene\" />
<Folder Include="Resources\Phone\Public\MsgIcon\" />
+ <Folder Include="Resources\Phone\PersonalCenter\AppUnlockSetting\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Electrical\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Socket\" />
+ <Folder Include="Resources\Phone\FunctionIcon\EnvironmentalScience\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -168,6 +175,7 @@
</Compile>
<Compile Include="ViewControllerBase.cs" />
<Compile Include="Reachability.cs" />
+ <Compile Include="Scan.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -268,8 +276,6 @@
<BundleResource Include="Resources\Phone\Public\AddIcon.png" />
<BundleResource Include="Resources\Phone\Public\EditIcon.png" />
<BundleResource Include="Resources\Phone\Public\Right.png" />
- <BundleResource Include="Resources\Phone\Public\UnSelectionIcon.png" />
- <BundleResource Include="Resources\Phone\Public\SelectionIcon.png" />
<BundleResource Include="Resources\Phone\Public\DownIcon_2.png" />
<BundleResource Include="Resources\Phone\Public\ChooseRoomListbg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Scene\MovieMark.png" />
@@ -319,6 +325,86 @@
<BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIconGray.png" />
<BundleResource Include="Resources\Phone\Public\MsgIcon\TipIconBlack.png" />
<BundleResource Include="Resources\Phone\Public\MsgIcon\TipIconWhite.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\4.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\1On.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\2.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\3.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\3On.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\4On.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\1.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\2On.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerprintIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FaceIdIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\GestureIcon.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\PasswordIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\TipIcon_Successfully.png" />
+ <BundleResource Include="Resources\Phone\Public\TipIcon_Failed.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\GestureGrayIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\Switch_2.png" />
+ <BundleResource Include="Resources\Phone\Public\SwitchOn_2.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerIconRed.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\NightIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\NightIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\OrdinaryIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\OrdinaryIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\AwayIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\AwayIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconBgGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanThinIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketThinIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanOnIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketOnIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconOnBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIconOnBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIconBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVPowerIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TV123Icon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVRightIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVOkIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVleftIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVBackIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMuteIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\MenuBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\PlusIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\ReduceIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TVThinIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TVIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SmogIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\LocationIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\UpArrow.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\WeatherFanSpeedIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\TipInfoIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorColorTipBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg3.png" />
+ <BundleResource Include="Resources\echarts.html" />
+ <BundleResource Include="Resources\theme\macarons.js" />
+ <BundleResource Include="Resources\theme\macarons2.js" />
+ <BundleResource Include="Resources\theme\red.js" />
+ <BundleResource Include="Resources\theme\roma.js" />
+ <BundleResource Include="Resources\theme\helianthus.js" />
+ <BundleResource Include="Resources\theme\green.js" />
+ <BundleResource Include="Resources\theme\infographic.js" />
+ <BundleResource Include="Resources\theme\shine.js" />
+ <BundleResource Include="Resources\theme\gray.js" />
+ <BundleResource Include="Resources\theme\sakura.js" />
+ <BundleResource Include="Resources\theme\blue.js" />
+ <BundleResource Include="Resources\theme\dark.js" />
+ <BundleResource Include="Resources\theme\mint.js" />
+ <BundleResource Include="Resources\js\echarts-all.tmp" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIconOn.png" />
+ <BundleResource Include="Resources\Phone\Public\MsgIcon\LoadingIcon.png" />
+ <BundleResource Include="Resources\Phone\Collection\NoCollectionBg.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0