From 48c07e0a371f67b97abc7c2e61d7f23d060324fc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 28 一月 2021 18:24:53 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into NewFilePath
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 2289055..c66cced 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -52,6 +52,7 @@
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>SdkOnly</MtouchLink>
+ <CodesignProvision>onpro0804</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -209,6 +210,7 @@
<Compile Include="Scan.cs" />
<Compile Include="ZXingOverlayView.cs" />
<Compile Include="Other\JLCountrycode.cs" />
+ <Compile Include="BlueWifi.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -656,11 +658,64 @@
<BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg5.png" />
<BundleResource Include="Resources\Phone\LogicIcon\location.png" />
<BundleResource Include="Resources\Phone\LoginIcon\changesinoutdoor.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\AirCleanerThiinIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobotThinIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\SleepModeSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\Fan.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\LowGear.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\HandModeSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\Time.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\MidGearSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\AutoMode.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\AirCleanerOff.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\HandMode.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\HeightGearSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\ComfortableMode.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\MidGear.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\SleepMode.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\AirCleanerOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\LowGearSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\AutoModeSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud3.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\HeightGear.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\ComfortableModeSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\Fan\DialogTitleMenuGroud4.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\MuteSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\Battery.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ControlRight.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AreaMode.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AutoMode.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\FixedPointModeSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\Charge.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\CleanSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ControlUp.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\SuctionSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\WallMode.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\FixedPointMode.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ControlLeft.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AreaModeSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ControlDisable.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ChargeSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\Suction.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\Clean.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\AutoModeSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ControlDown.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\VoiceSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\Mute.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\WallModeSelect.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\Voice.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WeepRobot\ControlEnable.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork%402x" />
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\HdlBluWi\Blufi.csproj">
+ <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project>
+ <Name>Blufi</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ProjectExtensions>
--
Gitblit v1.8.0