From cc37cf55c02da9e49eab9859ed72f146dee6f635 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 11 九月 2023 14:17:55 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index f3d037d..f76fc85 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -25,10 +25,11 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>Full</MtouchLink>
<MtouchDebug>true</MtouchDebug>
- <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>iPhone Developer</CodesignKey>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<CodesignProvision>OnPro2307291-Dev</CodesignProvision>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
@@ -54,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>
@@ -69,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" />
@@ -1611,10 +1613,8 @@
<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\HisenseTv\on.png" />
<BundleResource Include="Resources\Phone\HisenseTv\yingliangjian.png" />
<BundleResource Include="Resources\Phone\HisenseTv\caidan.png" />
- <BundleResource Include="Resources\Phone\HisenseTv\kaiguan.png" />
<BundleResource Include="Resources\Phone\HisenseTv\offtvbj.png" />
<BundleResource Include="Resources\Phone\HisenseTv\offbj.png" />
<BundleResource Include="Resources\Phone\HisenseTv\electricaltvhisense.png" />
@@ -1745,6 +1745,15 @@
<BundleResource Include="Resources\Phone\AksIcon\zdyyou2.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricaltvhisense_blue.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricaltvhisense.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\guan.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\kai.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\kaiguanSelected.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\shouyeSelected.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\yingliangjianSelected.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\yingliangjiaSelected.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" />
+ <BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
--
Gitblit v1.8.0