From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:38 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 152 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 142 insertions(+), 10 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 0db5cb8..f3d037d 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -27,7 +27,7 @@
<MtouchDebug>true</MtouchDebug>
<CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
- <CodesignProvision>OnPro230605-1-Dev</CodesignProvision>
+ <CodesignProvision>OnPro2307291-Dev</CodesignProvision>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
@@ -59,7 +59,7 @@
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-<CodesignProvision>OnPro230630-1-Dev</CodesignProvision>
+<CodesignProvision>OnPro2307291-Dev</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -124,12 +124,6 @@
</PackageReference>
<PackageReference Include="MQTTnet">
<Version>3.1.0</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.AppCenter.Analytics">
- <Version>4.4.0</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.AppCenter.Crashes">
- <Version>4.4.0</Version>
</PackageReference>
<PackageReference Include="ZXing.Net.Mobile">
<Version>2.4.1</Version>
@@ -1609,14 +1603,148 @@
<BundleResource Include="Resources\h5\static\images\left-icon.png" />
<BundleResource Include="Resources\h5\static\js\chunk-vendors.56c88730.js" />
<BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.js" />
- <BundleResource Include="Resources\h5\static\js\index.cf368d6e.js" />
+ <BundleResource Include="Resources\h5\static\js\index.31e0ba7a.js" />
+ <BundleResource Include="Resources\h5\static\js\pages-index-index.25064587.js" />
<BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0253e8cd.js" />
- <BundleResource Include="Resources\h5\static\js\pages-index-index.cfb4b30d.js" />
<BundleResource Include="Resources\h5\static\img\inverter-center.18b181f4.png" />
<BundleResource Include="Resources\h5\static\img\co2-reduction-ic.9c75228c.png" />
<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" />
+ <BundleResource Include="Resources\Phone\HisenseTv\yingliangjia.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\shouye.png" />
+ <BundleResource Include="Resources\Phone\HisenseTv\onbj.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_right_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_kuaijin_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\xia.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\xuanze.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_kai.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_jingyin.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_touping_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\bofang.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_xinxi.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\shang.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_shangyibu_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\dankongdeng.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\kuaijin.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_jingyin_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\zdyanjian.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\you.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_xiayibu_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_tingzhi_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_zimu.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\shengdao.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\xiayibu.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\hdmi.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_bofan.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\shang_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_left_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_caidan.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_dianying.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_zanting_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_kaiguang_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_ok.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\zanting.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_dankongdeng.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\zimu.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_zhuye.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_pindaojia_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\yingui.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_shang.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\you_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\quxiao.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\zuo.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\jinchucang.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\guan.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\xiangxia.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_fanhui_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_yingliangjia.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\dengguan.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_shoucang.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_dianshi.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_yule_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\xinxi.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\yingkunext.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_xinxi_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\caidan.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_toupin.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\pindao2.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_dankongdeng_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_yingliangjian.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_pindaojia.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_zimu_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\shixuqi.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_tingzhi.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_yingui.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_xia_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\pindao1.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\zdyxia2.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_pindaojian_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_kuaitui.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\like.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\zuo_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_xia.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_kuaijin.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\kai.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_shangyibu.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_xiayibu.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_shang_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\jia.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\yingku.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_yingliangjian_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\jingyin.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_you.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\fanhui.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_ok_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\gfyingliangjian.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\mubujiang.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_yingui_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_shoucang_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_zanting.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_dengguan.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_pindaojian.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\yinliangjian.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\xinhaoyuan.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\shangyibu.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\jian.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_zhuye_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\touping.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_zuo.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\yingyinzhongkong1.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\dianshi.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\zdyshang1.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_yingliangjia_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_yule.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\mubusheng.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\dianying.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_dianshi_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_kuaitui_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_fanhui.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_caidan_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\xiangshang.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\yingyinzhongkong2.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\yinliangjia.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\aks.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_bofan_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_dengguang_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\xia_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\zdyzuo2.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\ykq_dianying_selected.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\gfyingliangjia.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\huikan.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\kauitui.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\yule.png" />
+ <BundleResource Include="Resources\Phone\AksIcon\tingzhi.png" />
+ <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" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1661,6 +1789,10 @@
<Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
<Name>Blufi</Name>
</ProjectReference>
+ <ProjectReference Include="..\UMSdk\UMSdk.csproj">
+ <Project>{5CD1B2DE-1ABD-4B46-8C97-CCB6EA90346A}</Project>
+ <Name>UMSdk</Name>
+ </ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Base.lproj\Intents.intentdefinition" />
--
Gitblit v1.8.0