From 5bfb959c47017825c8cf7dc8570c55b04dab694c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 16:42:11 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into wxr6
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index b18bd6a..4e14c8e 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -27,6 +27,7 @@
<MtouchDebug>true</MtouchDebug>
<CodesignKey>iPhone Developer</CodesignKey>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
+ <CodesignProvision>On+Dev-20210428-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@@ -54,7 +55,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-<CodesignProvision>ComHdlOnProDevelopment20210305-1</CodesignProvision>
+<CodesignProvision>On+Dev-20210428-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -933,7 +934,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\ComfortableModeSelect.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud4.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\MuteSelect.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\Battery.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ControlRight.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AreaMode.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AutoMode.png" />
@@ -1231,6 +1231,39 @@
<BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\HouseDefenseIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\BurglarAlarmIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\ArmCenter\HistoryIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SecurityCenterFunctionBg.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\shiwaitianqi.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainDownIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\SmartSpeaker.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" />
+ <BundleResource Include="Resources\Phone\Public\BatteryEnough.png" />
+ <BundleResource Include="Resources\Phone\Public\BatteryNot.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0