From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 126 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 111 insertions(+), 15 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index cb2ac55..e019735 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -27,7 +27,6 @@
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
- <MtouchSdkVersion>13.1</MtouchSdkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@@ -50,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>
@@ -77,6 +78,12 @@
</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>
</ItemGroup>
<ItemGroup>
@@ -139,8 +146,13 @@
<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\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -200,8 +212,6 @@
<BundleResource Include="Resources\Phone\Navigation\IntellectualizationIconOn.png" />
<BundleResource Include="Resources\Phone\Navigation\CollectionIconOn.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\HomeListbg.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\EditIcon.png" />
- <BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\Right.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\QRcodeIcon.png" />
<BundleResource Include="Resources\Phone\Classification\ToggleDisplayThumbnail.png" />
<BundleResource Include="Resources\Phone\Classification\ToggleDisplayLarge.png" />
@@ -211,18 +221,16 @@
<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" />
<BundleResource Include="Resources\Phone\Collection\CollectionWhiteIcon.png" />
- <BundleResource Include="Resources\Phone\Collection\Switch.png" />
- <BundleResource Include="Resources\Phone\Collection\SwitchOn.png" />
<BundleResource Include="Resources\Phone\Classification\Room\AllCloseIcon.png" />
- <BundleResource Include="Resources\Phone\Public\SwitchClose.png" />
- <BundleResource Include="Resources\Phone\Public\SwitchOn.png" />
+ <BundleResource Include="Resources\Phone\Public\PowerClose.png" />
+ <BundleResource Include="Resources\Phone\Public\PowerOpen.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\AC\AcIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\AC\AcOnIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainStopIcon.png" />
@@ -245,8 +253,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\SwitchClose_Shadow.png" />
- <BundleResource Include="Resources\Phone\Public\SwitchOn_Shadow.png" />
<BundleResource Include="Resources\Phone\Public\Restored_Shadow.png" />
<BundleResource Include="Resources\Phone\Public\Edit.png" />
<BundleResource Include="Resources\Phone\Public\RightIcon.png" />
@@ -259,8 +265,98 @@
<BundleResource Include="Resources\Phone\Public\PlusSignIcon.png" />
<BundleResource Include="Resources\Phone\Public\MinusSignIcon.png" />
<BundleResource Include="Resources\Phone\Collection\CollectionGrayIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Light\RelayCloseIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Light\RelayOpenIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\Switch.png" />
+ <BundleResource Include="Resources\Phone\Public\SwitchOn.png" />
+ <BundleResource Include="Resources\Phone\Public\LocationAddressIcon.png" />
+ <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\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" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0