From f788a1e320b8505435ed66e2456ddb2d0a838f76 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 19 十一月 2020 19:58:14 +0800
Subject: [PATCH] 2020-11-19 1.优化绑定和解绑页面。2.修改密码功能实现，UI界面实现，接口实现。
---
HDL-ON_iOS/HDL-ON_iOS.csproj | 128 +++++++++++++++++++++++++++---------------
1 files changed, 83 insertions(+), 45 deletions(-)
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index a9c9834..be15a71 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -36,6 +36,7 @@
<WarningLevel>4</WarningLevel>
<MtouchLink>None</MtouchLink>
<MtouchArch>x86_64</MtouchArch>
+<CodesignKey>iPhone Developer</CodesignKey>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<DebugSymbols>true</DebugSymbols>
@@ -46,10 +47,9 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<MtouchArch>ARM64</MtouchArch>
- <CodesignKey>iPhone Developer: xuebiao huang (4P32GXQWWK)</CodesignKey>
+ <CodesignKey>iPhone Developer</CodesignKey>
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs>
- <CodesignProvision>onpro0804</CodesignProvision>
<MtouchI18n>cjk</MtouchI18n>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
@@ -82,6 +82,9 @@
<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>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
@@ -99,6 +102,9 @@
</PackageReference>
<PackageReference Include="ZXing.Net.Mobile">
<Version>2.4.1</Version>
+ </PackageReference>
+ <PackageReference Include="RestSharp">
+ <Version>106.11.7</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
@@ -171,6 +177,9 @@
<Folder Include="Resources\Phone\FunctionIcon\EnvironmentalScience\" />
<Folder Include="Resources\Phone\Public\AirIcon\" />
<Folder Include="Resources\Phone\PersonalCenter\ResetPassword\" />
+ <Folder Include="Resources\Phone\Intelligence\Gallery\" />
+ <Folder Include="Resources\Phone\FunctionIcon\DeviceIcon\" />
+ <Folder Include="Other\" />
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="LaunchScreen.storyboard" />
@@ -191,6 +200,7 @@
<Compile Include="Reachability.cs" />
<Compile Include="Scan.cs" />
<Compile Include="ZXingOverlayView.cs" />
+ <Compile Include="Other\JLCountrycode.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
@@ -222,13 +232,6 @@
<BundleResource Include="Resources\Phone\PersonalCenter\SwitchIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\GeneralSettingsIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\SupportIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\UserPageNavbg.png" />
- <BundleResource Include="Resources\Phone\Navigation\CollectionIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\IntellectualizationIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\PersonalCenterIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\PersonalCenterIconOn.png" />
- <BundleResource Include="Resources\Phone\Navigation\IntellectualizationIconOn.png" />
- <BundleResource Include="Resources\Phone\Navigation\CollectionIconOn.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\HomeList3bg.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\QRcodeIcon.png" />
<BundleResource Include="Resources\Phone\Classification\ToggleDisplayThumbnail.png" />
@@ -249,8 +252,6 @@
<BundleResource Include="Resources\Phone\Classification\Room\AllCloseIcon.png" />
<BundleResource Include="Resources\Phone\Public\PowerClose.png" />
<BundleResource Include="Resources\Phone\Public\PowerOpen.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcOnIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainStopIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseOnIcon.png" />
@@ -274,7 +275,6 @@
<BundleResource Include="Resources\Phone\Public\Restored_Shadow.png" />
<BundleResource Include="Resources\Phone\Public\Edit.png" />
<BundleResource Include="Resources\Phone\Public\RightIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcThinIcon1.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainThinIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingThinIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Light\LightThinIcon.png" />
@@ -299,11 +299,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Scene\s1.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainBgOnIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainBgIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\MusicFunctionBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\FreshAirFunctionBg.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\EnergyMonitoringFunctionBg.png" />
@@ -323,19 +318,6 @@
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenWhiteIcon_Shadow.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseWhiteIcon_Shadow.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseBlueIcon_Shadow.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\DivBg1.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\DivBg2.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIconGray.png" />
<BundleResource Include="Resources\Phone\Public\MsgIcon\TipIconBlack.png" />
<BundleResource Include="Resources\Phone\Public\MsgIcon\TipIconWhite.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\4.png" />
@@ -494,33 +476,89 @@
<BundleResource Include="Resources\js\echarts.min.js" />
<BundleResource Include="Resources\js\ecStat.min.js" />
<BundleResource Include="Resources\js\world.js" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIconOn.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicPlayOnIcon.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicPlayIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\InfoOnIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\ResetPassword\DialogTipTitleIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\MediumIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\MediumIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\LowIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\LowIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\HightIconGray.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\HighIcon.png" />
- <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatIconGray.png" />
<BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicThinIcon.png" />
- <BundleResource Include="Resources\Phone\Navigation\HomePageIconOn.png" />
- <BundleResource Include="Resources\Phone\Navigation\HomePageIcon.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\HomeList1bg.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\HomeList2bg.png" />
<BundleResource Include="Resources\Phone\PersonalCenter\HomeList4bg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\RelayOnBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\RelayBg.png" />
+ <BundleResource Include="Resources\Phone\Navigation\HomePageIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\HomePageIcon.png" />
+ <BundleResource Include="Resources\Phone\Navigation\UserPageNavbg.png" />
+ <BundleResource Include="Resources\Phone\Navigation\PersonalCenterIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\PersonalCenterIcon.png" />
+ <BundleResource Include="Resources\Phone\Navigation\IntellectualizationIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\IntellectualizationIcon.png" />
+ <BundleResource Include="Resources\Phone\Navigation\CollectionIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\CollectionIcon.png" />
+ <BundleResource Include="Resources\Phone\Navigation\ClassificationIconOn.png" />
+ <BundleResource Include="Resources\Phone\Navigation\ClassificationIcon.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\CreateScene3Bg.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\CreateScene1Bg.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\CreateScene2Bg.png" />
+ <BundleResource Include="Resources\Phone\Public\FuncInfoSetIcon_white.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\FunctionIconHumidity.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\FunctionIconTemp.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\FunctionIconPm25.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\FunctionIconTVOC.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\FunctionIconCO2.png" />
+ <BundleResource Include="Resources\Phone\PersonalCenter\HomeListbg.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg1.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg2.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg3.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg4.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg5.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg6.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg7.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg8.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg9.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\scenebg10.png" />
+ <BundleResource Include="Resources\Phone\Intelligence\Gallery\chooseTipIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\LowIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcOnIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\LowIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIconOn.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DivBg2.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DivBg1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AirSupplyIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindLowIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AcThinIcon1.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindMediumIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\MediumIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\CoolIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\AutoIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DehumidificationIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\WindHighIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\MediumIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HighIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HeatingIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\DiyThumbIcon2On.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\AC\HightIconGray.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Light\BrightnessBg.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\RollingShutterIcon.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\MotorCurtainIcon.png" />
+ <BundleResource Include="Resources\Phone\OnIcon.png" />
+ <BundleResource Include="Resources\Phone\TipNot.png" />
+ <BundleResource Include="Resources\Phone\FunctionIcon\DeviceIcon\VoicePanelIcon.png" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork%402x" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Resources\Phone\Navigation\ClassificationIcon.png" />
- <AndroidAsset Include="Resources\Phone\Navigation\ClassificationIconOn.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" />
--
Gitblit v1.8.0