From f77a3add1e7ab266e473da9128bbe5758ba3a890 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期日, 20 十二月 2020 19:29:03 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 91e5634..849af29 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -62,7 +62,7 @@
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
<CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
- <CodesignProvision>dis-onpro-080401</CodesignProvision>
+ <CodesignProvision>Automatic:AdHoc</CodesignProvision>
<MtouchLink>SdkOnly</MtouchLink>
</PropertyGroup>
<ItemGroup>
@@ -594,16 +594,13 @@
<BundleResource Include="Resources\Phone\LogicIcon\heatlogic.png" />
<BundleResource Include="Resources\Phone\LogicIcon\on.png" />
<BundleResource Include="Resources\Phone\LogicIcon\off.png" />
- <BundleResource Include="Resources\Phone\LogicIcon\timecondition.png" />
<BundleResource Include="Resources\Phone\LogicIcon\down.png" />
- <BundleResource Include="Resources\Phone\LogicIcon\timeicon.png" />
<BundleResource Include="Resources\Phone\LogicIcon\lightloguc.png" />
<BundleResource Include="Resources\Phone\LogicIcon\set.png" />
<BundleResource Include="Resources\Phone\LogicIcon\addconditiontarget.png" />
<BundleResource Include="Resources\Phone\LogicIcon\functionicon.png" />
<BundleResource Include="Resources\Phone\LogicIcon\airconditionerlogic.png" />
<BundleResource Include="Resources\Phone\LogicIcon\bjicon5.png" />
- <BundleResource Include="Resources\Phone\LogicIcon\delayed.png" />
<BundleResource Include="Resources\Phone\LogicIcon\next.png" />
<BundleResource Include="Resources\Phone\LogicIcon\curtainlogic.png" />
<BundleResource Include="Resources\Phone\LogicIcon\weekoff.png" />
@@ -625,6 +622,22 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelGray.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelTip.png" />
<BundleResource Include="Resources\Phone\RoomListBg.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\link.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectTheFun.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectTheScene.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selectTheTime.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FaceIdIconBig.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerIconBlue.png" />
+ <BundleResource Include="Resources\Phone\Public\ClearIcon.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\time.png" />
+ <BundleResource Include="Resources\Phone\ErrorIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorTemperatrueQuick.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorTemperatrueQuickBack.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorTemperatureBar.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\CozyIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\MeetingGuestsIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\ReadIcon.png" />
+ <BundleResource Include="Resources\Phone\Public\PopupDialog.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0