From 5851291c78b2cb5532e6938c77b5f51eb06a6ad2 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 21 十二月 2020 19:41:07 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 2660c79..12d12ff 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>
@@ -107,6 +107,9 @@
</PackageReference>
<PackageReference Include="RestSharp">
<Version>106.11.7</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.iOS.Bugly">
+ <Version>1.0.4</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -628,6 +631,8 @@
<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" />
@@ -636,6 +641,9 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Light\MeetingGuestsIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Light\ReadIcon.png" />
<BundleResource Include="Resources\Phone\Public\PopupDialog.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\CozyIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\MeetingGuestsIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\ReadIconOn.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0