From bcc1155365489498f171a245d26818be0aa526d0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 25 三月 2021 18:40:59 +0800
Subject: [PATCH] 2021-03-25 1.完善丰林接口对接。
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 73 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 10 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index 248888f..7952804 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -47,14 +47,14 @@
<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>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
- <CodesignProvision>ComHdlOnProDevelopment20210116-2</CodesignProvision>
+<CodesignProvision>ComHdlOnProDevelopment20210225-1</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -92,6 +92,9 @@
</Reference>
<Reference Include="EZSDK.IOS">
<HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Shared.IOS.ESVideoOnSDK">
+ <HintPath>..\..\ESVideoPhoneSDKProject\On+\xamarin\Shared.IOS.ESVideoOnSDK\Shared.IOS.ESVideoOnSDK\bin\Release\Shared.IOS.ESVideoOnSDK.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -443,6 +446,7 @@
<Folder Include="Resources\zh-Hans.lproj\" />
<Folder Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\" />
<Folder Include="Resources\Phone\FunctionIcon\ArmSensor\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -470,7 +474,6 @@
<Compile Include="ZXingOverlayView.cs" />
<Compile Include="Other\JLCountrycode.cs" />
<Compile Include="BlueWifi.cs" />
- <Compile Include="Other\ESVideo.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -884,7 +887,6 @@
<BundleResource Include="Resources\Phone\LogicIcon\-.png" />
<BundleResource Include="Resources\Phone\LogicIcon\+.png" />
<BundleResource Include="Resources\Phone\LogicIcon\point.png" />
- <BundleResource Include="Resources\Phone\LogicIcon\ selected+.png" />
<BundleResource Include="Resources\Phone\LogicIcon\selected-.png" />
<BundleResource Include="Resources\Phone\oRobot.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelGray.png" />
@@ -1007,16 +1009,61 @@
<BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\PowerLowIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerAnionIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerAnionIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerBgIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerBgIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDisinfectIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDisinfectIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerHotDryIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerHotDryIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerLightIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerLightIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerStopIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerStopIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerTimeIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerTimeIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerWindDryIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerWindDryIconOn.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\changesinoutdoor.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerBlueIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerGrayIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon1On.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerDownIcon2On.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon1On.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\ClothesHanger\ClothesHangerUpIcon2On.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\fan.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\dvd.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\stb.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\tv.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\projector.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\air.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\custom.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\priequipment.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\offline.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\search.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\del.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\dropdown.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\addlbuton.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\delbuton.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\Infraredtreasure.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\online.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\adddevice.png" />
+ <BundleResource Include="Resources\Phone\PirIcon\next.png" />
+ <BundleResource Include="Resources\Phone\LogicIcon\selected+.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\More.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>
<ItemGroup>
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
@@ -1052,6 +1099,12 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" />
</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