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 | 149 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 140 insertions(+), 9 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 9c41574..b453c04 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -49,6 +49,8 @@
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
+ <CodesignProvision>On_Dev-0327</CodesignProvision>
+ <MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -76,6 +78,15 @@
</PackageReference>
<PackageReference Include="MQTTnet">
<Version>3.0.8</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AppCenter.Analytics">
+ <Version>3.1.0</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.AppCenter.Crashes">
+ <Version>3.1.0</Version>
+ </PackageReference>
+ <PackageReference Include="ZXing.Net.Mobile">
+ <Version>2.4.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -138,9 +149,14 @@
<Folder Include="Resources\Phone\Classification\" />
<Folder Include="Resources\Phone\Classification\Room\" />
<Folder Include="Resources\Phone\Collection\" />
- <Folder Include="Resources\Phone\Public\InfoIcon\" />
+ <Folder Include="Resources\Phone\Public\DeviceInfoIcon\" />
<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" />
@@ -159,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" />
@@ -209,9 +226,9 @@
<BundleResource Include="Resources\Phone\Collection\Functionbg.png" />
<BundleResource Include="Resources\Phone\Collection\FunctionOnbg.png" />
<BundleResource Include="Resources\Phone\Collection\ChangeViewbg.png" />
- <BundleResource Include="Resources\Phone\Public\InfoIcon\HumidityIcon.png" />
- <BundleResource Include="Resources\Phone\Public\InfoIcon\Pm25Icon.png" />
- <BundleResource Include="Resources\Phone\Public\InfoIcon\TempIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\HumidityIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\Pm25Icon.png" />
+ <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\TempIcon.png" />
<BundleResource Include="Resources\Phone\Public\DownIcon.png" />
<BundleResource Include="Resources\Phone\Public\transparent.png" />
<BundleResource Include="Resources\Phone\Collection\CollectionIcon.png" />
@@ -241,8 +258,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheel.png" />
<BundleResource Include="Resources\Phone\Public\ThumbImage.png" />
<BundleResource Include="Resources\Phone\Public\Fragmentbg.png" />
- <BundleResource Include="Resources\Phone\Public\PowerClose_Shadow.png" />
- <BundleResource Include="Resources\Phone\Public\PowerOpen_Shadow.png" />
<BundleResource Include="Resources\Phone\Public\Restored_Shadow.png" />
<BundleResource Include="Resources\Phone\Public\Edit.png" />
<BundleResource Include="Resources\Phone\Public\RightIcon.png" />
@@ -261,19 +276,135 @@
<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" />
<BundleResource Include="Resources\Phone\FunctionIcon\Scene\SceneIcon.png" />
<BundleResource Include="Resources\Phone\Collection\SceneCovered.png" />
- <BundleResource Include="Resources\Phone\Collection\SceneCoveredOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Scene\DelayIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Scene\s2.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Scene\s1.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainBgOnIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\MusicFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\FreshAirFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\EnergyMonitoringFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\EnvironmentalFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SecurityMonitoringFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\LightFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\VideoIntercomFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\PanelFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\FloorHeatingFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\ACFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\CurtainFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\ElectricFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SensorFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\DoorLockFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\Restored_Shadow.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenBlueIcon_Shadow.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenWhiteIcon_Shadow.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseWhiteIcon_Shadow.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseBlueIcon_Shadow.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DivBg1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DivBg2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIcon.png" />
+ <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