From ad51f05f31440bcc64e0ef248ab32fd12997e565 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 六月 2023 13:25:02 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 5cda6b8..e420bca 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -51,7 +51,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>SdkOnly</MtouchLink>
@@ -59,6 +59,7 @@
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+<CodesignProvision>OnPro230417-1-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -68,7 +69,7 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+ <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
@@ -142,11 +143,11 @@
<PackageReference Include="Xamarin.Essentials">
<Version>1.7.0</Version>
</PackageReference>
- <PackageReference Include="Xamarin.iOS.SwiftRuntimeSupport">
- <Version>0.2.1</Version>
- </PackageReference>
<PackageReference Include="Xamarin.iOS.MJRefresh">
<Version>3.2.2</Version>
+ </PackageReference>
+ <PackageReference Include="Xamarin.iOS.SwiftRuntimeSupport">
+ <Version>0.2.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -460,6 +461,14 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" />
+ <ImageAsset Include="Resources\Assets.xcassets\Contents.json" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\Contents.json" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\launchIcon2.png" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\launchIcon.png" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\Contents.json" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\launchIcon1.png" />
+ <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\Contents.json" />
+ <ImageAsset Include="Resources\Assets.xcassets\.DS_Store" />
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
@@ -1544,8 +1553,9 @@
<BundleResource Include="Resources\h5\static\img\equal-plant-ic.7ef6befa.png" />
<BundleResource Include="Resources\h5\static\img\coal-save-ic.6c5fd125.png" />
<BundleResource Include="Resources\h5\static\font\SourceHanSansCN-Normal.otf" />
+ <BundleResource Include="Resources\Phone\MusicIcon\currentPlayList.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\CombinedDimmingIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockClose.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\OneOpenLock.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" />
@@ -1566,7 +1576,6 @@
<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\VideoDoorLockOpen.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" />
@@ -1576,6 +1585,9 @@
<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\FunctionIcon\Icon\securitydoorezviz.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0