From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期二, 16 七月 2024 13:59:56 +0800 Subject: [PATCH] 增加全部挂断 --- HDL-ON_iOS/HDL-ON_iOS.csproj | 120 ++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 80 insertions(+), 40 deletions(-) diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj index f76fc85..3747f4d 100644 --- a/HDL-ON_iOS/HDL-ON_iOS.csproj +++ b/HDL-ON_iOS/HDL-ON_iOS.csproj @@ -30,6 +30,7 @@ <CodesignProvision>OnPro2307291-Dev</CodesignProvision> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <MtouchI18n>cjk</MtouchI18n> + <MtouchSdkVersion>17.5</MtouchSdkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' "> <DebugType>none</DebugType> @@ -55,12 +56,13 @@ <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey> <MtouchDebug>true</MtouchDebug> <MtouchI18n>cjk</MtouchI18n> - <MtouchLink>None</MtouchLink> + <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchEnableSGenConc>false</MtouchEnableSGenConc> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> -<CodesignProvision>OnPro2307291-Dev</CodesignProvision> +<CodesignProvision>0002-OnPro-240704-1-Dev</CodesignProvision> +<MtouchSdkVersion>17.5</MtouchSdkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <DebugType>none</DebugType> @@ -70,12 +72,13 @@ <WarningLevel>4</WarningLevel> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <MtouchArch>ARM64</MtouchArch> - <CodesignKey>Apple Development: xuebiao huang (4P32GXQWWK)</CodesignKey> + <CodesignKey>Apple Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey> <MtouchLink>SdkOnly</MtouchLink> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC"</MtouchExtraArgs> <MtouchI18n>cjk</MtouchI18n> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <CodesignProvision>OnPro2307291-Dev</CodesignProvision> + <CodesignProvision>Automatic</CodesignProvision> + <MtouchSdkVersion>17.5</MtouchSdkVersion> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -119,6 +122,9 @@ <Reference Include="Shared.IOS"> <HintPath>..\DLL\Shared.IOS.dll</HintPath> </Reference> + <Reference Include="Aliyun.Api.LogService"> + <HintPath>..\DLL\Aliyun.Api.LogService.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <PackageReference Include="Newtonsoft.Json"> @@ -133,9 +139,6 @@ <PackageReference Include="RestSharp"> <Version>106.13.0</Version> </PackageReference> - <PackageReference Include="Xamarin.iOS.Bugly"> - <Version>1.0.4</Version> - </PackageReference> <PackageReference Include="Xamarin.Essentials"> <Version>1.7.0</Version> </PackageReference> @@ -144,6 +147,18 @@ </PackageReference> <PackageReference Include="Xamarin.iOS.SwiftRuntimeSupport"> <Version>0.2.1</Version> + </PackageReference> + <PackageReference Include="Google.Protobuf"> + <Version>3.5.1</Version> + </PackageReference> + <PackageReference Include="Microsoft.AspNet.WebApi.Client"> + <Version>5.2.4</Version> + </PackageReference> + <PackageReference Include="Iconic.Zlib.Netstandard"> + <Version>1.0.0</Version> + </PackageReference> + <PackageReference Include="lz4net"> + <Version>1.0.15.93</Version> </PackageReference> </ItemGroup> <ItemGroup> @@ -443,10 +458,6 @@ <ImageAsset Include="Assets.xcassets\wifi_bg.imageset\wifi_bg.png" /> <ImageAsset Include="Assets.xcassets\device_bg.imageset\Contents.json" /> <ImageAsset Include="Assets.xcassets\device_bg.imageset\device_bg.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\640960.png" /> @@ -505,6 +516,7 @@ <Folder Include="Resources\Phone\FunctionIcon\Panel\" /> <Folder Include="Resources\Phone\FunctionIcon\Inverter\" /> <Folder Include="Resources\Phone\FunctionIcon\Electrical\MechanicalArm\" /> + <Folder Include="Resources\Phone\FunctionIcon\GroupControl\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -1584,35 +1596,6 @@ <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\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" /> - <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" /> - <BundleResource Include="Resources\h5\static\images\eidt.png" /> - <BundleResource Include="Resources\h5\static\images\switch-off.svg" /> - <BundleResource Include="Resources\h5\static\images\circle-ic.png" /> - <BundleResource Include="Resources\h5\static\images\inverter-center.png" /> - <BundleResource Include="Resources\h5\static\images\pan_ic.png" /> - <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" /> - <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" /> - <BundleResource Include="Resources\h5\static\images\switch-on.svg" /> - <BundleResource Include="Resources\h5\static\images\inverter-center.webp" /> - <BundleResource Include="Resources\h5\static\images\yinying.png" /> - <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\chunk-vendors.56c88730.js" /> - <BundleResource Include="Resources\h5\static\js\pages-inverter-index.e5e9499f.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\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\yingliangjian.png" /> <BundleResource Include="Resources\Phone\HisenseTv\caidan.png" /> <BundleResource Include="Resources\Phone\HisenseTv\offtvbj.png" /> @@ -1754,6 +1737,63 @@ <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\IlluminationIcon.png" /> <BundleResource Include="Resources\Phone\Collection\GatewayOnlineTipIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\AksFunctionBg.png" /> + <BundleResource Include="Resources\h5\index.html" /> + <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" /> + <BundleResource Include="Resources\h5\static\images\left-icon-unselect.png" /> + <BundleResource Include="Resources\h5\static\images\eidt.png" /> + <BundleResource Include="Resources\h5\static\images\switch-off.svg" /> + <BundleResource Include="Resources\h5\static\images\circle-ic.png" /> + <BundleResource Include="Resources\h5\static\images\inverter-center.png" /> + <BundleResource Include="Resources\h5\static\images\pan_ic.png" /> + <BundleResource Include="Resources\h5\static\images\right-icon-unselect.png" /> + <BundleResource Include="Resources\h5\static\images\up-icon-unselect.png" /> + <BundleResource Include="Resources\h5\static\images\switch-on.svg" /> + <BundleResource Include="Resources\h5\static\images\inverter-center.webp" /> + <BundleResource Include="Resources\h5\static\images\yinying.png" /> + <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-index-index.a5a00a32.js" /> + <BundleResource Include="Resources\h5\static\js\index.3517131b.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\pages-index-index~pages-inverter-index.0253e8cd.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\FunctionIcon\GroupControl\gp_all_off_home_click.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off_home.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_off.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on_home_click.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on_home.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\GroupControl\gp_all_on.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensordryContact_blue.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensordryContact_white.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_blue.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorpir_hold_white.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorpir_hold.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensordryContact.png" /> + <BundleResource Include="Resources\Phone\Collection\FunctionArmOnbg.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensormegahealth.png" /> + <BundleResource Include="Resources\Phone\LogicIcon\selectlocation.png" /> + <BundleResource Include="Resources\Phone\LogicIcon\ganjiedian.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\VideoDoorLockFunctionBg.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorlight.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_off_home_click.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_off_home.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_off.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on_home_click.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on_home.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightScene\gp_all_on.png" /> + <BundleResource Include="Resources\Phone\LogicIcon\electricaltvhisense.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> -- Gitblit v1.8.0