From 0a8ec482a5ad10bf3cd7010c89630b42ecaca741 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:19:31 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 76 ++++++++++++++++++++++++++++++++-----
1 files changed, 65 insertions(+), 11 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index fc4a08f..a28c075 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -51,9 +51,10 @@
<MtouchDebug>true</MtouchDebug>
<MtouchI18n>cjk</MtouchI18n>
<MtouchLink>SdkOnly</MtouchLink>
- <CodesignProvision>onpro0804</CodesignProvision>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs>
<MtouchEnableSGenConc>false</MtouchEnableSGenConc>
+<CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
+ <CodesignProvision>ComHdlOnProDevelopment20210116-2</CodesignProvision>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<DebugType>none</DebugType>
@@ -90,7 +91,7 @@
<HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath>
</Reference>
<Reference Include="EZSDK.IOS">
- <HintPath>..\..\Xamarin鎺т欢搴揬EZOpenSDK\EZSDK.IOS\EZSDK.IOS\bin\Release\EZSDK.IOS.dll</HintPath>
+ <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -487,15 +488,16 @@
<Folder Include="Resources\Phone\FunctionIcon\DeviceIcon\" />
<Folder Include="Other\" />
<Folder Include="Resources\zh-Hans.lproj\" />
+ <Folder Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
<InterfaceDefinition Include="Main.storyboard" />
- <InterfaceDefinition Include="EZ\EZVideoTalkViewcontroller.xib" />
- <InterfaceDefinition Include="EZ\EZSupportViewController.xib" />
- <InterfaceDefinition Include="EZ\EZMain.storyboard" />
- <InterfaceDefinition Include="EZ\AddDevice.storyboard" />
<InterfaceDefinition Include="Resources\LaunchScreen.xib" />
+ <InterfaceDefinition Include="Resources\EZ\Base.lproj\EZVideoTalkViewcontroller.xib" />
+ <InterfaceDefinition Include="Resources\EZ\Base.lproj\EZSupportViewController.xib" />
+ <InterfaceDefinition Include="Resources\EZ\Base.lproj\EZMain.storyboard" />
+ <InterfaceDefinition Include="Resources\EZ\Base.lproj\AddDevice.storyboard" />
</ItemGroup>
<ItemGroup>
<None Include="Info.plist" />
@@ -514,6 +516,7 @@
<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" />
@@ -1011,15 +1014,32 @@
<BundleResource Include="Resources\query_loading.gif" />
<BundleResource Include="Resources\com.hri.hpc.mobile.ios.player.metallib" />
<BundleResource Include="Resources\zh-Hans.lproj\Localizable.strings" />
- <BundleResource Include="Resources\zh-Hans.lproj\EZMain.strings" />
- <BundleResource Include="Resources\zh-Hans.lproj\AddDevice.strings" />
<BundleResource Include="Resources\en.lproj\Localizable.strings" />
- <BundleResource Include="Resources\en.lproj\EZMain.strings" />
- <BundleResource Include="Resources\en.lproj\AddDevice.strings" />
- <BundleResource Include="Resources\MJRefresh.bundle\arrow%402x.png" />
<BundleResource Include="Resources\Base.lproj\Localizable.strings" />
<BundleResource Include="Resources\Phone\LogicIcon\sensor.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\UserTypebg2.png" />
+ <BundleResource Include="Resources\MJRefresh.bundle\arrow%402x.png" />
+ <BundleResource Include="Resources\MJRefresh.bundle\zh-Hans.lproj\Localizable.strings" />
+ <BundleResource Include="Resources\MJRefresh.bundle\en.lproj\Localizable.strings" />
+ <BundleResource Include="Resources\MJRefresh.bundle\zh-Hant.lproj\Localizable.strings" />
+ <BundleResource Include="Resources\en.lproj\AddDevice.strings" />
+ <BundleResource Include="Resources\en.lproj\EZMain.strings" />
+ <BundleResource Include="Resources\zh-Hans.lproj\AddDevice.strings" />
+ <BundleResource Include="Resources\zh-Hans.lproj\EZMain.strings" />
+ <BundleResource Include="Resources\Phone\tuya_logo.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\UserTypebg2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\WaterValveOnBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\ref.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WaterValveIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WeepRobotIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\AirCleanerIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\FanIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WeepRobotIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\WaterValveIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\FanIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\HomePageIcon\AirCleanerIcon.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
@@ -1031,6 +1051,40 @@
<Name>Blufi</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60x60.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58x58.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87x87.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80x80.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120x120.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120x120-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20x20.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29x29.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58x58-1.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40x40-2.png" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80x80-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\.DS_Store" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" />
+ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422688.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\8281792.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\26881242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792828.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\11252436.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\24361125.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320480.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640960-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\6401136-1.png" />
+ </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