From 4e7c1dd0767d551ec3194ead9f3de0a219a802c3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 25 九月 2023 17:24:37 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wxr-2.1
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index a212a7d..5ceca1e 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -55,7 +55,7 @@
<CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
- <MtouchLink>SdkOnly</MtouchLink>
+ <MtouchLink>None</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -70,11 +70,12 @@
<WarningLevel>4</WarningLevel>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey>
+ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchLink>SdkOnly</MtouchLink>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -504,6 +505,7 @@
<Folder Include="Resources\Phone\FunctionIcon\Panel\" />
<Folder Include="Resources\Phone\FunctionIcon\Inverter\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\" />
+ <Folder Include="Resources\Phone\FunctionIcon\GroupControl\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -1724,6 +1726,7 @@
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
<BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" />
<BundleResource Include="Resources\h5\index.html" />
<BundleResource Include="Resources\h5\static\index.63b34199.css" />
<BundleResource Include="Resources\h5\static\images\coal-save-ic.png" />
@@ -1753,6 +1756,12 @@
<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\FunctionIcon\GroupControl\gp_all_off_home_click.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on_home_click.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on_home.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0