From 9508510f0b27da3278fa1161eb2ba3dd1e3e2030 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 26 七月 2023 13:14:00 +0800 Subject: [PATCH] 2023年07月26日13:12:21 --- HDL-ON_iOS/HDL-ON_iOS.csproj | 182 +++++++++++++++++++++++++++++++------------- 1 files changed, 127 insertions(+), 55 deletions(-) diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj index d8caeaa..0db5cb8 100644 --- a/HDL-ON_iOS/HDL-ON_iOS.csproj +++ b/HDL-ON_iOS/HDL-ON_iOS.csproj @@ -25,9 +25,9 @@ <MtouchArch>x86_64</MtouchArch> <MtouchLink>Full</MtouchLink> <MtouchDebug>true</MtouchDebug> - <CodesignKey>iPhone Developer</CodesignKey> - <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs> - <CodesignProvision>On+Dev-20210616-1</CodesignProvision> + <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey> + <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> + <CodesignProvision>OnPro230605-1-Dev</CodesignProvision> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' "> @@ -51,7 +51,7 @@ <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> @@ -59,6 +59,7 @@ <MtouchEnableSGenConc>false</MtouchEnableSGenConc> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> +<CodesignProvision>OnPro230630-1-Dev</CodesignProvision> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <DebugType>none</DebugType> @@ -68,7 +69,7 @@ <WarningLevel>4</WarningLevel> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <MtouchArch>ARM64</MtouchArch> - <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey> + <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey> <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchI18n>cjk</MtouchI18n> @@ -86,32 +87,32 @@ <HintPath>..\DLL\Shared.IOS.TBL.dll</HintPath> <Private>False</Private> </Reference> - <Reference Include="MJRefresh_Xamarin"> - <HintPath>..\DLL\IOS\MJRefresh_Xamarin.dll</HintPath> - </Reference> <Reference Include="Shared.IOS.JLCountryCode"> <HintPath>..\DLL\IOS\Shared.IOS.JLCountryCode.dll</HintPath> - </Reference> - <Reference Include="EZSDK.IOS"> - <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath> - </Reference> - <Reference Include="Shared.IOS.ESVideoOnSDK"> - <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath> - </Reference> - <Reference Include="Shared.IOS.LCVideoOnSDK"> - <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath> </Reference> <Reference Include="Shared.IOS.HDLSceneSiri"> <HintPath>..\DLL\IOS\Shared.IOS.HDLSceneSiri.dll</HintPath> </Reference> + <Reference Include="HDL.Shared.IOS.ScanQRCode"> + <HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath> + </Reference> <Reference Include="Shared.IOS.HDLLinphoneSDK"> <HintPath>..\DLL\Linphone\iOS\Shared.IOS.HDLLinphoneSDK.dll</HintPath> + </Reference> + <Reference Include="Shared.IOS.LCVideoOnSDK"> + <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath> + </Reference> + <Reference Include="Shared.IOS.HDLCNVRSDK"> + <HintPath>..\DLL\IOS\Shared.IOS.HDLCNVRSDK.dll</HintPath> + </Reference> + <Reference Include="Shared.IOS.ESVideoOnSDK"> + <HintPath>..\DLL\FL\iOS\Shared.IOS.ESVideoOnSDK.dll</HintPath> </Reference> <Reference Include="Shared.IOS.HDLFVSDK"> <HintPath>..\DLL\IOS\Shared.IOS.HDLFVSDK.dll</HintPath> </Reference> - <Reference Include="HDL.Shared.IOS.ScanQRCode"> - <HintPath>..\DLL\IOS\HDL.Shared.IOS.ScanQRCode.dll</HintPath> + <Reference Include="EZSDK.IOS"> + <HintPath>..\DLL\IOS\EZSDK.IOS.dll</HintPath> </Reference> <Reference Include="Shared.IOS"> <HintPath>..\DLL\Shared.IOS.dll</HintPath> @@ -141,6 +142,12 @@ </PackageReference> <PackageReference Include="Xamarin.Essentials"> <Version>1.7.0</Version> + </PackageReference> + <PackageReference Include="Xamarin.iOS.MJRefresh"> + <Version>3.2.2</Version> + </PackageReference> + <PackageReference Include="Xamarin.iOS.SwiftRuntimeSupport"> + <Version>0.2.1</Version> </PackageReference> </ItemGroup> <ItemGroup> @@ -454,6 +461,14 @@ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\12422208.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\7501334.png" /> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\22081242.png" /> + <ImageAsset Include="Resources\Assets.xcassets\Contents.json" /> + <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\Contents.json" /> + <ImageAsset Include="Resources\Assets.xcassets\launchIcon2.imageset\launchIcon2.png" /> + <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\launchIcon.png" /> + <ImageAsset Include="Resources\Assets.xcassets\launchIcon.imageset\Contents.json" /> + <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\launchIcon1.png" /> + <ImageAsset Include="Resources\Assets.xcassets\launchIcon1.imageset\Contents.json" /> + <ImageAsset Include="Resources\Assets.xcassets\.DS_Store" /> </ItemGroup> <ItemGroup> <Folder Include="Resources\" /> @@ -492,6 +507,8 @@ <Folder Include="Base.lproj\" /> <Folder Include="Resources\Phone\FunctionIcon\CAC\" /> <Folder Include="Resources\Phone\FunctionIcon\Panel\" /> + <Folder Include="Resources\Phone\FunctionIcon\Inverter\" /> + <Folder Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -1280,30 +1297,6 @@ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainUpIconOn.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\SmartSpeaker.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" /> - <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" /> <BundleResource Include="Resources\Phone\Public\BatteryEnough.png" /> <BundleResource Include="Resources\Phone\Public\BatteryNot.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\irpjt_blue.png" /> @@ -1515,11 +1508,88 @@ <BundleResource Include="Resources\Phone\FunctionIcon\Acst\grey\ModeHumiIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Acst\BackIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Acst\ThumbImage.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Inverter\Icon1.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Inverter\Icon2.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Inverter\Icon3.png" /> + <BundleResource Include="Resources\Phone\Public\IotCheckIcon.png" /> + <BundleResource Include="Resources\Phone\Public\IotCheckOnIcon.png" /> + <BundleResource Include="Resources\Phone\Public\LinkIotIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensormmv_pose.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmBg.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\MechanicalArmOnBg.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\MechanicalArmFunctionBg.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\electricalmechanical_arm.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_blue.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\electricalmechanical_arm_white.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\securityipcamimou.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_blue.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\securityipcamimou_white.png" /> + <BundleResource Include="Resources\Phone\MusicIcon\currentPlayList.png" /> + <BundleResource Include="Resources\Phone\PersonalCenter\CombinedDimmingIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Redistribution.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorLock.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\OneOpenLock.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue2.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockManager.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\RTV.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\LockPictrue1.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon2.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\CrearPswBackgroud.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon3.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Editor.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\NormallyOpenIcon1.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Connect.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Cell.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\History.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLocking.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\HistoryList.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Screen.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\BindScene.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Shard.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Delete.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnConnect.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\More.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Mute.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Voice.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLocked.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue1.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\Hide.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue2.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UnLockPictrue3.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\securitydoorezviz.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockClose1.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorLockOpen1.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorfulBar.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\groupControl_blue.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\groupControl_white.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorlockUserManager.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\groupControl.png" /> + <BundleResource Include="Resources\Phone\LogicIcon\SeriesIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UserRightsManagement\NfcIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UserRightsManagement\DigitalPasswordIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UserRightsManagement\FingerprintIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UserRightsManagement\DigitalPasswordOnIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UserRightsManagement\FingerprintOnIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UserRightsManagement\NfcOnIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UserRightsManagement\FaceOnIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\UserRightsManagement\FaceIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\peephole.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\securityipcamez.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\AutomaitcTriggerIcon_blue.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\AutomaitcTriggerIcon_white.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\FaceUnlockImage.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\ManualTriggerIcon_blue.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\ManualTriggerIcon_white.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\TouchUnlcokImage.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorlockHelpImage1.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorlockHelpImage2.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorlockHelpImage3.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\DoorlockHelpImage4.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HorseRaceLampIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\DoorLock\VideoDoorlockBatteryManagementBg.png" /> + <BundleResource Include="Resources\Phone\Classification\Room\HomePagebg.png" /> <BundleResource Include="Resources\h5\index.html" /> - <BundleResource Include="Resources\h5\static\js\pages-inverter-index.3b3b0fdd.js" /> - <BundleResource Include="Resources\h5\static\js\chunk-vendors.9e7e69a0.js" /> - <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.cac3b1d6.js" /> - <BundleResource Include="Resources\h5\static\index.2772579d.css" /> + <BundleResource Include="Resources\h5\static\index.63b34199.css" /> <BundleResource Include="Resources\h5\static\images\coal-save-ic.png" /> <BundleResource Include="Resources\h5\static\images\inverter-center.svg" /> <BundleResource Include="Resources\h5\static\images\equal-plant-ic.png" /> @@ -1537,14 +1607,16 @@ <BundleResource Include="Resources\h5\static\images\down-icon-unselect.png" /> <BundleResource Include="Resources\h5\static\images\co2-reduction-ic.png" /> <BundleResource Include="Resources\h5\static\images\left-icon.png" /> - <BundleResource Include="Resources\h5\static\js\pages-inverter-index.aea6a122.js" /> - <BundleResource Include="Resources\h5\static\js\pages-index-index.7634b70a.js" /> - <BundleResource Include="Resources\h5\static\js\pages-index-index~pages-inverter-index.0b8ec7be.js" /> - <BundleResource Include="Resources\h5\static\js\index.95903989.js" /> + <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\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" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> @@ -1571,10 +1643,6 @@ <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024.png" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\HdlBluWi\Blufi.csproj"> - <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project> - <Name>Blufi</Name> - </ProjectReference> <ProjectReference Include="..\SiriIntents\SiriIntents.csproj"> <IsAppExtension>true</IsAppExtension> <Project>{760980F5-1CD3-4F4F-9134-34D87BECD790}</Project> @@ -1589,6 +1657,10 @@ <Project>{8B1652FA-5158-4D57-B90D-07BB91766625}</Project> <Name>SiriKit</Name> </ProjectReference> + <ProjectReference Include="..\HdlBluWi\Blufi.csproj"> + <Project>{2DDF4C3C-6998-432E-9F43-6786D82F0630}</Project> + <Name>Blufi</Name> + </ProjectReference> </ItemGroup> <ItemGroup> <Content Include="Base.lproj\Intents.intentdefinition" /> -- Gitblit v1.8.0