From d89a8ccb3d48d39f920b294c1966a3522ee8adbc Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 23 二月 2021 17:17:37 +0800 Subject: [PATCH] 11 --- HDL-ON_iOS/HDL-ON_iOS.csproj | 197 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 145 insertions(+), 52 deletions(-) diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj index 9dbabb1..9dcbdac 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>ComHdlOnProDevelopment20210116-2</CodesignProvision> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <DebugType>none</DebugType> @@ -89,7 +90,6 @@ </Reference> </ItemGroup> <ItemGroup> - <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> <PackageReference Include="Newtonsoft.Json"> <Version>12.0.3</Version> </PackageReference> @@ -97,10 +97,10 @@ <Version>3.0.13</Version> </PackageReference> <PackageReference Include="Microsoft.AppCenter.Analytics"> - <Version>4.0.0</Version> + <Version>4.1.0</Version> </PackageReference> <PackageReference Include="Microsoft.AppCenter.Crashes"> - <Version>4.0.0</Version> + <Version>4.1.0</Version> </PackageReference> <PackageReference Include="ZXing.Net.Mobile"> <Version>2.4.1</Version> @@ -111,55 +111,9 @@ <PackageReference Include="Xamarin.iOS.Bugly"> <Version>1.0.4</Version> </PackageReference> - </ItemGroup> - <ItemGroup> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024x500.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732 .png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\4096X4096.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1134.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\1024.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\120.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\152.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\167.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\180.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\20.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\29.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\40.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\58.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\60.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\76.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\80.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\87.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\Contents.json" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40路40%402x.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60路60%403x.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58路58%402x.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87路87%403x.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80路80%402x.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120路120%402x.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120路120%403x.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180路180%403x.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20路20.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40路40%402x-1.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29路29.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58路58%402x-1.png" /> - <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024路1024%402x.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2688.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828*1792.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688*1242.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792*828.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125*2436.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436*1125.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242*2208.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750*1334.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208*1242.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320*480.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*960-1.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136.png" /> - <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640*1136-1.png" /> + <PackageReference Include="Xamarin.Essentials"> + <Version>1.6.0</Version> + </PackageReference> </ItemGroup> <ItemGroup> <Folder Include="Resources\" /> @@ -185,6 +139,9 @@ <Folder Include="Resources\Phone\Intelligence\Gallery\" /> <Folder Include="Resources\Phone\FunctionIcon\DeviceIcon\" /> <Folder Include="Other\" /> + <Folder Include="Resources\zh-Hans.lproj\" /> + <Folder Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\" /> + <Folder Include="Resources\Phone\FunctionIcon\ArmSensor\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> @@ -206,6 +163,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" /> @@ -641,11 +599,146 @@ <BundleResource Include="Resources\Phone\FunctionIcon\Light\MeetingGuestsIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\ReadIcon.png" /> <BundleResource Include="Resources\Phone\Public\PopupDialog.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\CozyIconOn.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\MeetingGuestsIconOn.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Light\ReadIconOn.png" /> + <BundleResource Include="Resources\zh-Hans.lproj\InfoPlist.strings" /> + <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\DiyThumbIconOn.png" /> + <BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg2.png" /> + <BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg3.png" /> + <BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg1.png" /> + <BundleResource Include="Resources\Phone\Public\ListCellbg\ListCellbg4.png" /> + <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" /> + <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\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" /> + <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\WaterValve\SetTimeIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorDoorStateBgIconOn.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorPirStateBgIconOn.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorSmokeStateBgIconOn.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIcon.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\ArmSensorWaterImmersionStateBgIconOn.png" /> + <BundleResource Include="Resources\Phone\FunctionIcon\ArmSensor\PowerLowIcon.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" /> + <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> + <MonoDevelop> + <Properties> + <Policies> + <DotNetNamingPolicy ResourceNamePolicy="FileFormatDefault" DirectoryNamespaceAssociation="Hierarchical" /> + </Policies> + </Properties> + </MonoDevelop> + </ProjectExtensions> </Project> \ No newline at end of file -- Gitblit v1.8.0