.gitignore
@@ -1,11 +1,11 @@ ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. # User-specific files *.suo *.user *.sln.docstates # Build results [Dd]ebug/ [Dd]ebugPublic/ @@ -16,23 +16,26 @@ bld/ [Bb]in/ [Oo]bj/ .vs/ .gitignore .Dll/ # Roslyn cache directories *.ide/ # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* #NUNIT *.VisualState.xml TestResult.xml # Build Results of an ATL Project [Dd]ebugPS/ [Rr]eleasePS/ dlldata.c *_i.c *_p.c *_i.h @@ -57,10 +60,10 @@ *.pidb *.svclog *.scc # Chutzpah Test files _Chutzpah* # Visual C++ cache files ipch/ *.aps @@ -68,46 +71,46 @@ *.opensdf *.sdf *.cachefile # Visual Studio profiler *.psess *.vsp *.vspx # TFS 2012 Local Workspace $tf/ # Guidance Automation Toolkit *.gpState # ReSharper is a .NET coding add-in _ReSharper*/ *.[Rr]e[Ss]harper *.DotSettings.user # JustCode is a .NET coding addin-in .JustCode # TeamCity is a build add-in _TeamCity* # DotCover is a Code Coverage Tool *.dotCover # NCrunch _NCrunch_* .*crunch*.local.xml # MightyMoose *.mm.* AutoTest.Net/ # Web workbench (sass) .sass-cache/ # Installshield output folder [Ee]xpress/ # DocProject is a documentation generator add-in DocProject/buildhelp/ DocProject/Help/*.HxT @@ -117,10 +120,10 @@ DocProject/Help/*.hhp DocProject/Help/Html2 DocProject/Help/html # Click-Once directory publish/ # Publish Web Output *.[Pp]ublish.xml *.azurePubxml @@ -128,27 +131,27 @@ ## web deploy settings but do note that will include unencrypted ## passwords *.pubxml # NuGet Packages packages/* *.nupkg ## TODO: If the tool you use requires repositories.config ## uncomment the next line #!packages/repositories.config # Enable "build/" folder in the NuGet Packages folder since # NuGet packages use it for MSBuild targets. # This line needs to be after the ignore of the build folder # (and the packages folder if the line above has been uncommented) !packages/build/ # Windows Azure Build Output csx/ *.build.csdef # Windows Store app package directory AppPackages/ # Others sql/ *.Cache @@ -161,10 +164,10 @@ *.pfx *.publishsettings node_modules/ # RIA/Silverlight projects Generated_Code/ # Backup & report files from converting an old project file # to a newer Visual Studio version. Backup files are not needed, # because we have git ;-) @@ -172,15 +175,15 @@ Backup*/ UpgradeLog*.XML UpgradeLog*.htm # SQL Server files *.mdf *.ldf # Business Intelligence projects *.rdl.data *.bim.layout *.bim_*.settings # Microsoft Fakes FakesAssemblies/ .vs/HDL_APP_Project/xs/.DS_StoreBinary files differ
.vs/HDL_APP_Project/xs/project-cache/HDL-ON_Android-Debug.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/HDL-ON_Android-Release.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/HDL-ON_Anroid_-Debug.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhone.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhoneSimulator.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Release|iPhone.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Release|iPhoneSimulator.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/Shared.Droid-Debug.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/Shared.Droid.HDLWidget-Debug.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/Shared.Droid.Smartrefresh-Debug.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/Shared.Droid.TouchID-Debug.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/Shared.IOS-Debug.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/Shared.IOS-Release.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/Shared.IOS.TBL-Debug.json
File was deleted .vs/HDL_APP_Project/xs/project-cache/Shared.IOS.TBL-Release.json
File was deleted .vs/HDL_APP_Project/xs/sqlite3/db.lock
.vs/HDL_APP_Project/xs/sqlite3/storage.ideBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-shmBinary files differ
.vs/HDL_APP_Project/xs/sqlite3/storage.ide-walBinary files differ
CommonLib/android/Xamarin.Android.Arch.Core.Common.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Arch.Lifecycle.Common.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Arch.Lifecycle.Runtime.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Support.Animated.Vector.Drawable.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Support.Annotations.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Support.Compat.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Support.Core.UI.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Support.Core.Utils.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Support.Fragment.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Support.Media.Compat.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Support.Vector.Drawable.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Support.v4.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/android/Xamarin.Android.Support.v7.AppCompat.dllold mode 100755 new mode 100644 Binary files differ
CommonLib/dll/Xamarin.Essentials.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Arch.Core.Common.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Arch.Lifecycle.Common.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Arch.Lifecycle.Runtime.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.Animated.Vector.Drawable.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.Annotations.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.Compat.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.Core.UI.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.Core.Utils.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.Design.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.Fragment.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.Media.Compat.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.Transition.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.Vector.Drawable.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.v4.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.v7.AppCompat.dllold mode 100755 new mode 100644 Binary files differ
DLL/Android/Xamarin.Android.Support.v7.RecyclerView.dllold mode 100755 new mode 100644 Binary files differ
DLL/IOS/MJRefresh_Xamarin.dllold mode 100755 new mode 100644 Binary files differ
DLL/IOS/Xamarin.Essentials.dllold mode 100755 new mode 100644 Binary files differ
DLL/Newtonsoft.Json.dllold mode 100755 new mode 100644 Binary files differ
HDL-ON_Android/Assets/Echarts/theme/blue.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/dark.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/gray.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/green.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/helianthus.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/infographic.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/macarons.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/macarons2.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/mint.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/red.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/roma.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/sakura.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Echarts/theme/shine.jsold mode 100755 new mode 100644
HDL-ON_Android/Assets/Language.ini
@@ -395,6 +395,9 @@ 373=æ·»å æ¥¼å±å¤±è´¥ã 374=ä½å® æ°æ®å·²è¢«å é¤ï¼APPå°èªå¨åæ¢å°å¦ä¸ä½å® ã 375=ç½å ³æªè¿æ¥æå¡å¨ï¼æ æ³åå»ºåºæ¯ã 376=欢è¿åå®¶ 377=äºç»´ç 失æï¼è¯·éè¯ 378=éè¯ 5000=é³ä¹ 5001=ç»å HDL-ON_Android/Assets/Phone/ErrorIcon.png
HDL-ON_Android/Assets/Phone/FunctionIcon/AC/AcIcon.pngHDL-ON_Android/Assets/Phone/FunctionIcon/AC/AcOnIcon.pngHDL-ON_Android/Assets/Phone/FunctionIcon/Curtain/CurtainIcon.pngHDL-ON_Android/Assets/Phone/FunctionIcon/FloorHeating/FloorHeatingIcon.pngHDL-ON_Android/Assets/Phone/FunctionIcon/FloorHeating/FloorHeatingOnIcon.pngHDL-ON_Android/Assets/Phone/FunctionIcon/Light/LightIcon.pngHDL-ON_Android/Assets/Phone/FunctionIcon/Music/MusicIcon.pngHDL-ON_Android/Assets/Phone/FunctionIcon/Music/MusicOnIcon.pngHDL-ON_Android/Assets/Phone/FunctionIcon/SwitchOn.pngHDL-ON_Android/Assets/Phone/LogicIcon/+.pngHDL-ON_Android/Assets/Phone/LogicIcon/-.pngHDL-ON_Android/Assets/Phone/LogicIcon/addconditiontarget.pngHDL-ON_Android/Assets/Phone/LogicIcon/airconditionerlogic.pngHDL-ON_Android/Assets/Phone/LogicIcon/back.pngHDL-ON_Android/Assets/Phone/LogicIcon/bjicon1.pngHDL-ON_Android/Assets/Phone/LogicIcon/bjicon2.pngHDL-ON_Android/Assets/Phone/LogicIcon/bjicon3.pngHDL-ON_Android/Assets/Phone/LogicIcon/bjicon4.pngHDL-ON_Android/Assets/Phone/LogicIcon/bjicon5.pngHDL-ON_Android/Assets/Phone/LogicIcon/curtainlogic.pngHDL-ON_Android/Assets/Phone/LogicIcon/delayed.pngHDL-ON_Android/Assets/Phone/LogicIcon/down.pngHDL-ON_Android/Assets/Phone/LogicIcon/editname.pngHDL-ON_Android/Assets/Phone/LogicIcon/functionicon.pngHDL-ON_Android/Assets/Phone/LogicIcon/heatlogic.pngHDL-ON_Android/Assets/Phone/LogicIcon/lightloguc.pngHDL-ON_Android/Assets/Phone/LogicIcon/link.pngHDL-ON_Android/Assets/Phone/LogicIcon/next.pngHDL-ON_Android/Assets/Phone/LogicIcon/off.pngHDL-ON_Android/Assets/Phone/LogicIcon/on.pngHDL-ON_Android/Assets/Phone/LogicIcon/outletlogic.pngHDL-ON_Android/Assets/Phone/LogicIcon/point.pngHDL-ON_Android/Assets/Phone/LogicIcon/scene.pngHDL-ON_Android/Assets/Phone/LogicIcon/selectTheFun.pngHDL-ON_Android/Assets/Phone/LogicIcon/selectTheScene.pngHDL-ON_Android/Assets/Phone/LogicIcon/selectTheTime.pngHDL-ON_Android/Assets/Phone/LogicIcon/selected+.pngHDL-ON_Android/Assets/Phone/LogicIcon/selected-.pngHDL-ON_Android/Assets/Phone/LogicIcon/set.pngHDL-ON_Android/Assets/Phone/LogicIcon/timecondition.pngHDL-ON_Android/Assets/Phone/LogicIcon/timeicon.pngHDL-ON_Android/Assets/Phone/LogicIcon/weekoff.pngHDL-ON_Android/Assets/Phone/LogicIcon/weekon.pngHDL-ON_Android/Assets/Phone/LoginIcon/1.pngHDL-ON_Android/Assets/Phone/LoginIcon/3.pngHDL-ON_Android/Assets/Phone/LoginIcon/AccountIcon.pngHDL-ON_Android/Assets/Phone/LoginIcon/EmailIcon.pngHDL-ON_Android/Assets/Phone/LoginIcon/HidePasswordIcon.pngHDL-ON_Android/Assets/Phone/LoginIcon/PasswordIcon.pngHDL-ON_Android/Assets/Phone/LoginIcon/SearchIcon.pngHDL-ON_Android/Assets/Phone/LoginIcon/ShowPasswordIcon.pngHDL-ON_Android/Assets/Phone/LoginIcon/VerificationCodeIcon.pngHDL-ON_Android/Assets/Phone/MusicIcon/noMusic.pngHDL-ON_Android/Assets/Phone/MusicIcon/selectedMusic.pngHDL-ON_Android/Assets/Phone/Navigation/ClassificationIconOn.pngHDL-ON_Android/Assets/Phone/Navigation/CollectionIconOn.pngHDL-ON_Android/Assets/Phone/Navigation/IntellectualizationIconOn.pngHDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_1.pngHDL-ON_Android/HDL-ON_Android.csproj
@@ -153,57 +153,74 @@ <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" /> <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher_round.xml" /> <AndroidResource Include="Resources\drawable\Loading.png"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\drawable\Icon.png"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\mipmap-xxhdpi\Icon.png"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\xml\network_security_config.xml"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\xml\file_paths.xml"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\layout\zxing_layout.xml"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\mipmap-xhdpi\Icon.png"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\mipmap-mdpi\Icon.png"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\mipmap-hdpi\Icon.png"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\mipmap-anydpi-v26\Icon.png"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> <AndroidResource Include="Resources\mipmap-xxxhdpi\Icon.png"> <SubType></SubType> <Generator></Generator> <SubType> </SubType> <Generator> </Generator> </AndroidResource> </ItemGroup> <ItemGroup> <Folder Include="Resources\drawable\" /> <Folder Include="Resources\layout\" /> <Folder Include="Assets\Phone\Intelligence\" /> <Folder Include="Assets\Phone\DeviceIcon\" /> <Folder Include="Other\" /> <Folder Include="Other\JPush\" /> <AndroidAsset Include="Assets\Phone\LogicIcon\selected+.png" /> </ItemGroup> <ItemGroup> <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" /> @@ -645,7 +662,6 @@ <AndroidAsset Include="Assets\Phone\LogicIcon\-.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\+.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\point.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\ selected+.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\selected-.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\link.png" /> <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheFun.png" /> @@ -660,6 +676,15 @@ <AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" /> <AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\oRobot.png" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\RoomListBg.png" /> </ItemGroup> <ItemGroup> <AndroidAsset Include="Assets\Phone\ErrorIcon.png" /> </ItemGroup> <Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. HDL-ON_Android/Resources/Resource.designer.cs
@@ -1,10 +1,11 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. // æ¤ä»£ç ç±å·¥å ·çæã // è¿è¡æ¶çæ¬:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // å¯¹æ¤æä»¶çæ´æ¹å¯è½ä¼å¯¼è´ä¸æ£ç¡®çè¡ä¸ºï¼å¹¶ä¸å¦æ // éæ°çæä»£ç ï¼è¿äºæ´æ¹å°ä¼ä¸¢å¤±ã // </auto-generated> //------------------------------------------------------------------------------ @@ -14,7 +15,7 @@ { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] public partial class Resource { HDL-ON_Android/Resources/drawable/Icon.pngHDL-ON_Android/Resources/mipmap-anydpi-v26/Icon.pngHDL-ON_Android/Resources/mipmap-hdpi/Icon.pngHDL-ON_Android/Resources/mipmap-mdpi/Icon.pngHDL-ON_Android/Resources/mipmap-xhdpi/Icon.pngHDL-ON_Android/Resources/mipmap-xxhdpi/Icon.pngHDL-ON_Android/Resources/mipmap-xxxhdpi/Icon.pngHDL-ON_Android/libs/armeabi-v7a/libelianjni.soold mode 100755 new mode 100644 Binary files differ
HDL-ON_Android/libs/armeabi-v7a/libjcore127.soold mode 100755 new mode 100644 Binary files differ
HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024¡¤1024@2x.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120¡¤120@2x.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120¡¤120@3x.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180¡¤180@3x.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/20¡¤20.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/29¡¤29.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40¡¤40@2x-1.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40¡¤40@2x.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58¡¤58@2x-1.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58¡¤58@2x.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/60¡¤60@3x.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80¡¤80@2x.pngHDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/87¡¤87@3x.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1024x500.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1125_2436.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1242_2208.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1242_2688.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792_828.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2048X2732 .pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2208_1242.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2436_1125.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2688_1242.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320_480.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/4096X4096.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640_1136-1.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640_1136.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640_960-1.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640_960.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750X1134.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750_1334.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/828_1792.pngHDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.jsonold mode 100755 new mode 100644
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -1,641 +1,714 @@ <?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform> <ProjectGuid>{D998E133-F0DD-4760-BE3C-461632F54DA4}</ProjectGuid> <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <TemplateGuid>{edc1b0fa-90cd-4038-8fad-98fe74adb368}</TemplateGuid> <OutputType>Exe</OutputType> <RootNamespace>HDL_ON_iOS</RootNamespace> <AssemblyName>HDL_ON_iOS</AssemblyName> <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <MtouchEnableSGenConc>true</MtouchEnableSGenConc> <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <RestoreProjectStyle>PackageReference</RestoreProjectStyle> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> <OutputPath>bin\iPhoneSimulator\Debug</OutputPath> <DefineConstants>DEBUG</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <MtouchArch>x86_64</MtouchArch> <MtouchLink>Full</MtouchLink> <MtouchDebug>true</MtouchDebug> <CodesignKey>iPhone Developer</CodesignKey> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' "> <DebugType>none</DebugType> <Optimize>true</Optimize> <OutputPath>bin\iPhoneSimulator\Release</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <MtouchLink>None</MtouchLink> <MtouchArch>x86_64</MtouchArch> <CodesignKey>iPhone Developer</CodesignKey> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> <OutputPath>bin\iPhone\Debug</OutputPath> <DefineConstants>DEBUG</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <MtouchArch>ARM64</MtouchArch> <CodesignKey>iPhone Developer</CodesignKey> <MtouchDebug>true</MtouchDebug> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs> <MtouchI18n>cjk</MtouchI18n> <MtouchLink>SdkOnly</MtouchLink> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <DebugType>none</DebugType> <Optimize>true</Optimize> <OutputPath>bin\iPhone\Release</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <MtouchArch>ARM64</MtouchArch> <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey> <CodesignProvision>dis-onpro-080401</CodesignProvision> <MtouchLink>SdkOnly</MtouchLink> </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> <Reference Include="System.Core" /> <Reference Include="Xamarin.iOS" /> <Reference Include="System.Numerics" /> <Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Web.Services" /> <Reference Include="Shared.IOS"> <HintPath>..\DLL\Shared.IOS.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Shared.IOS.TBL"> <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> </ItemGroup> <ItemGroup> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> <PackageReference Include="Newtonsoft.Json"> <Version>12.0.3</Version> </PackageReference> <PackageReference Include="MQTTnet"> <Version>3.0.13</Version> </PackageReference> <PackageReference Include="Microsoft.AppCenter.Analytics"> <Version>4.0.0</Version> </PackageReference> <PackageReference Include="Microsoft.AppCenter.Crashes"> <Version>4.0.0</Version> </PackageReference> <PackageReference Include="ZXing.Net.Mobile"> <Version>2.4.1</Version> </PackageReference> <PackageReference Include="RestSharp"> <Version>106.11.7</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" /> </ItemGroup> <ItemGroup> <Folder Include="Resources\" /> <Folder Include="Resources\Phone\" /> <Folder Include="Assets.xcassets\LaunchImage.launchimage\" /> <Folder Include="Resources\Phone\Public\" /> <Folder Include="Resources\Phone\PersonalCenter\" /> <Folder Include="Resources\Phone\Navigation\" /> <Folder Include="Resources\Phone\PersonalCenter\PersonalData\" /> <Folder Include="Resources\Phone\Classification\" /> <Folder Include="Resources\Phone\Classification\Room\" /> <Folder Include="Resources\Phone\Collection\" /> <Folder Include="Resources\Phone\Public\DeviceInfoIcon\" /> <Folder Include="Resources\Phone\FunctionIcon\" /> <Folder Include="Resources\Phone\FunctionIcon\Scene\" /> <Folder Include="Resources\Phone\Public\MsgIcon\" /> <Folder Include="Resources\Phone\PersonalCenter\AppUnlockSetting\" /> <Folder Include="Resources\Phone\FunctionIcon\Electrical\" /> <Folder Include="Resources\Phone\FunctionIcon\Socket\" /> <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" /> <InterfaceDefinition Include="Main.storyboard" /> </ItemGroup> <ItemGroup> <None Include="Info.plist" /> <None Include="Entitlements.plist" /> </ItemGroup> <ItemGroup> <Compile Include="Main.cs" /> <Compile Include="AppDelegate.cs" /> <Compile Include="ViewController.cs" /> <Compile Include="ViewController.designer.cs"> <DependentUpon>ViewController.cs</DependentUpon> </Compile> <Compile Include="ViewControllerBase.cs" /> <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" /> <BundleResource Include="Resources\Phone\LoginIcon\SearchIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\VerificationCodeIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\AccountIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\QQIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\PasswordIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\WechatIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\HidePasswordIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\2.png" /> <BundleResource Include="Resources\Phone\LoginIcon\EmailIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\3.png" /> <BundleResource Include="Resources\Phone\LoginIcon\1.png" /> <BundleResource Include="Resources\Language.ini" /> <BundleResource Include="Resources\Phone\Public\BackIcon.png" /> <BundleResource Include="Resources\Phone\Public\Logo.png" /> <BundleResource Include="Resources\Phone\Public\Logo-bg.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\UserTypebg.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AdminTypeIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\MemberTypeIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceManageIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceMemberIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceArmIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceDataBackupIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AuxiliaryFunctionIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AddFunctionIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\NightViewIcon.png" /> <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\PersonalCenter\HomeList3bg.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\QRcodeIcon.png" /> <BundleResource Include="Resources\Phone\Classification\ToggleDisplayThumbnail.png" /> <BundleResource Include="Resources\Phone\Classification\ToggleDisplayLarge.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg.png" /> <BundleResource Include="Resources\Phone\Collection\MsgIcon.png" /> <BundleResource Include="Resources\Phone\Collection\MsgIconTip.png" /> <BundleResource Include="Resources\Phone\Collection\Functionbg.png" /> <BundleResource Include="Resources\Phone\Collection\FunctionOnbg.png" /> <BundleResource Include="Resources\Phone\Collection\ChangeViewbg.png" /> <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\HumidityIcon.png" /> <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\Pm25Icon.png" /> <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\TempIcon.png" /> <BundleResource Include="Resources\Phone\Public\DownIcon.png" /> <BundleResource Include="Resources\Phone\Public\transparent.png" /> <BundleResource Include="Resources\Phone\Collection\CollectionIcon.png" /> <BundleResource Include="Resources\Phone\Collection\CollectionWhiteIcon.png" /> <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\Curtain\CurtainStopIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainStopOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Switch.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\SwitchOn.png" /> <BundleResource Include="Resources\Phone\Public\FuncInfoSetIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheel.png" /> <BundleResource Include="Resources\Phone\Public\ThumbImage.png" /> <BundleResource Include="Resources\Phone\Public\Fragmentbg.png" /> <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\Curtain\CurtainThinIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingThinIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightThinIcon.png" /> <BundleResource Include="Resources\Phone\Public\ChooseIcon.png" /> <BundleResource Include="Resources\Phone\Public\ChooseOnIcon.png" /> <BundleResource Include="Resources\Phone\Public\PlusSignIcon.png" /> <BundleResource Include="Resources\Phone\Public\MinusSignIcon.png" /> <BundleResource Include="Resources\Phone\Collection\CollectionGrayIcon.png" /> <BundleResource Include="Resources\Phone\Public\Switch.png" /> <BundleResource Include="Resources\Phone\Public\SwitchOn.png" /> <BundleResource Include="Resources\Phone\Public\LocationAddressIcon.png" /> <BundleResource Include="Resources\Phone\Public\AddIcon.png" /> <BundleResource Include="Resources\Phone\Public\EditIcon.png" /> <BundleResource Include="Resources\Phone\Public\Right.png" /> <BundleResource Include="Resources\Phone\Public\DownIcon_2.png" /> <BundleResource Include="Resources\Phone\Public\ChooseRoomListbg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Scene\MovieMark.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Scene\SceneIcon.png" /> <BundleResource Include="Resources\Phone\Collection\SceneCovered.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Scene\DelayIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Scene\s2.png" /> <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\FunctionBg\MusicFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\FreshAirFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\EnergyMonitoringFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\EnvironmentalFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SecurityMonitoringFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\LightFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\VideoIntercomFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\PanelFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\FloorHeatingFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\ACFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\CurtainFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\ElectricFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SensorFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\DoorLockFunctionBg.png" /> <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\Restored_Shadow.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenBlueIcon_Shadow.png" /> <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\Public\MsgIcon\TipIconBlack.png" /> <BundleResource Include="Resources\Phone\Public\MsgIcon\TipIconWhite.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\4.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\1On.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\2.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\3.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\4On.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\3On.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\1.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\2On.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerprintIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FaceIdIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\GestureIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\PasswordIcon.png" /> <BundleResource Include="Resources\Phone\Public\TipIcon_Successfully.png" /> <BundleResource Include="Resources\Phone\Public\TipIcon_Failed.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\GestureGrayIcon.png" /> <BundleResource Include="Resources\Phone\Public\Switch_2.png" /> <BundleResource Include="Resources\Phone\Public\SwitchOn_2.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerIconRed.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\NightIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\NightIconGray.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\OrdinaryIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\OrdinaryIconGray.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\AwayIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\AwayIconGray.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconBgGray.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanThinIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketThinIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconOnBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIconOnBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIconBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVPowerIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TV123Icon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVRightIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVOkIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVUpIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVleftIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVDownIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuUpIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVBackIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMuteIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuDownIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\MenuBgIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\PlusIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\ReduceIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TVThinIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TVIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SmogIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\LocationIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\UpArrow.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\WeatherFanSpeedIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\TipInfoIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg1.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorColorTipBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg2.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg3.png" /> <BundleResource Include="Resources\theme\macarons.js" /> <BundleResource Include="Resources\theme\macarons2.js" /> <BundleResource Include="Resources\theme\red.js" /> <BundleResource Include="Resources\theme\roma.js" /> <BundleResource Include="Resources\theme\helianthus.js" /> <BundleResource Include="Resources\theme\green.js" /> <BundleResource Include="Resources\theme\infographic.js" /> <BundleResource Include="Resources\theme\shine.js" /> <BundleResource Include="Resources\theme\gray.js" /> <BundleResource Include="Resources\theme\sakura.js" /> <BundleResource Include="Resources\theme\blue.js" /> <BundleResource Include="Resources\theme\dark.js" /> <BundleResource Include="Resources\theme\mint.js" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIconOn.png" /> <BundleResource Include="Resources\Phone\Public\MsgIcon\LoadingIcon.png" /> <BundleResource Include="Resources\Phone\Collection\NoCollectionBg.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\0.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\1.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\13.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\18.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\2.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\20.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\29.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\3.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\4.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\45.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\5.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\6.png" /> <BundleResource Include="Resources\Phone\MusicIcon\bluetooth.png" /> <BundleResource Include="Resources\Phone\MusicIcon\addMusic1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\prve1Selected.png" /> <BundleResource Include="Resources\Phone\MusicIcon\love1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\selectedIcon.png" /> <BundleResource Include="Resources\Phone\MusicIcon\playList.png" /> <BundleResource Include="Resources\Phone\MusicIcon\myLove.png" /> <BundleResource Include="Resources\Phone\MusicIcon\radio.png" /> <BundleResource Include="Resources\Phone\MusicIcon\filePlay.png" /> <BundleResource Include="Resources\Phone\MusicIcon\collect.png" /> <BundleResource Include="Resources\Phone\MusicIcon\loveMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\qqMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\clear.png" /> <BundleResource Include="Resources\Phone\MusicIcon\radioIcon.png" /> <BundleResource Include="Resources\Phone\MusicIcon\musicIcon.png" /> <BundleResource Include="Resources\Phone\MusicIcon\file.png" /> <BundleResource Include="Resources\Phone\MusicIcon\vol.png" /> <BundleResource Include="Resources\Phone\MusicIcon\usb.png" /> <BundleResource Include="Resources\Phone\MusicIcon\localMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\next1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\loveSelected1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\selectedMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\noMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\addMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\playBj.png" /> <BundleResource Include="Resources\Phone\MusicIcon\loveRadio.png" /> <BundleResource Include="Resources\Phone\MusicIcon\list.png" /> <BundleResource Include="Resources\Phone\MusicIcon\set.png" /> <BundleResource Include="Resources\Phone\MusicIcon\nextSelected.png" /> <BundleResource Include="Resources\Phone\MusicIcon\Merge.png" /> <BundleResource Include="Resources\Phone\MusicIcon\playStatus.png" /> <BundleResource Include="Resources\Phone\MusicIcon\random.png" /> <BundleResource Include="Resources\Phone\MusicIcon\collectSelected.png" /> <BundleResource Include="Resources\Phone\MusicIcon\pause.png" /> <BundleResource Include="Resources\Phone\MusicIcon\progressIcon.png" /> <BundleResource Include="Resources\Phone\MusicIcon\prevSeletced.png" /> <BundleResource Include="Resources\Phone\MusicIcon\MusicBack.png" /> <BundleResource Include="Resources\Phone\MusicIcon\fileList.png" /> <BundleResource Include="Resources\Phone\MusicIcon\myList.png" /> <BundleResource Include="Resources\Phone\MusicIcon\single.png" /> <BundleResource Include="Resources\Phone\MusicIcon\edit.png" /> <BundleResource Include="Resources\Phone\MusicIcon\next.png" /> <BundleResource Include="Resources\Phone\MusicIcon\filePause.png" /> <BundleResource Include="Resources\Phone\MusicIcon\line.png" /> <BundleResource Include="Resources\Phone\MusicIcon\loveSelected.png" /> <BundleResource Include="Resources\Phone\MusicIcon\sourceNetx.png" /> <BundleResource Include="Resources\Phone\MusicIcon\love.png" /> <BundleResource Include="Resources\Phone\MusicIcon\pause1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\play1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\play.png" /> <BundleResource Include="Resources\Phone\MusicIcon\noSelectedIcon.png" /> <BundleResource Include="Resources\Phone\MusicIcon\next1Selected.png" /> <BundleResource Include="Resources\Phone\MusicIcon\prev.png" /> <BundleResource Include="Resources\Phone\MusicIcon\prve1.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\Pm25Icon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\HumidityIcon.png" /> <BundleResource Include="Resources\echartsNew.html" /> <BundleResource Include="Resources\js\bmap.min.js" /> <BundleResource Include="Resources\js\20190126.js" /> <BundleResource Include="Resources\js\china.js" /> <BundleResource Include="Resources\js\dataTool.min.js" /> <BundleResource Include="Resources\js\echarts-all.js" /> <BundleResource Include="Resources\js\echarts-gl.min.js" /> <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\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\Music\MusicThinIcon.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" /> <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_3.png" /> <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_2.png" /> <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_1.png" /> <BundleResource Include="Resources\Phone\LoginIcon\Server.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\ServerInfo.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Function.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Search.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Menu.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Help.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Telephone.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\SendMessage.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Scene.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Close.png" /> <BundleResource Include="Resources\Phone\Public\Search.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Head.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Transfer.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\All.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\System.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\Alarm.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\AllOn.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\Share.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\AlarmOn.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\ShareOn.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\SystemOn.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg1.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg2.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg3.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg4.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg5.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg6.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg7.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg8.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg9.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg10.png" /> <BundleResource Include="Resources\Phone\LogicIcon\heatlogic.png" /> <BundleResource Include="Resources\Phone\LogicIcon\on.png" /> <BundleResource Include="Resources\Phone\LogicIcon\off.png" /> <BundleResource Include="Resources\Phone\LogicIcon\timecondition.png" /> <BundleResource Include="Resources\Phone\LogicIcon\down.png" /> <BundleResource Include="Resources\Phone\LogicIcon\timeicon.png" /> <BundleResource Include="Resources\Phone\LogicIcon\lightloguc.png" /> <BundleResource Include="Resources\Phone\LogicIcon\set.png" /> <BundleResource Include="Resources\Phone\LogicIcon\addconditiontarget.png" /> <BundleResource Include="Resources\Phone\LogicIcon\functionicon.png" /> <BundleResource Include="Resources\Phone\LogicIcon\airconditionerlogic.png" /> <BundleResource Include="Resources\Phone\LogicIcon\bjicon5.png" /> <BundleResource Include="Resources\Phone\LogicIcon\delayed.png" /> <BundleResource Include="Resources\Phone\LogicIcon\next.png" /> <BundleResource Include="Resources\Phone\LogicIcon\curtainlogic.png" /> <BundleResource Include="Resources\Phone\LogicIcon\weekoff.png" /> <BundleResource Include="Resources\Phone\LogicIcon\weekon.png" /> <BundleResource Include="Resources\Phone\LogicIcon\outletlogic.png" /> <BundleResource Include="Resources\Phone\LogicIcon\back.png" /> <BundleResource Include="Resources\Phone\LogicIcon\scene.png" /> <BundleResource Include="Resources\Phone\LogicIcon\editname.png" /> <BundleResource Include="Resources\Phone\LogicIcon\bjicon1.png" /> <BundleResource Include="Resources\Phone\LogicIcon\bjicon2.png" /> <BundleResource Include="Resources\Phone\LogicIcon\bjicon3.png" /> <BundleResource Include="Resources\Phone\LogicIcon\bjicon4.png" /> <BundleResource Include="Resources\Phone\LogicIcon\-.png" /> <BundleResource Include="Resources\Phone\LogicIcon\+.png" /> <BundleResource Include="Resources\Phone\LogicIcon\point.png" /> <BundleResource Include="Resources\Phone\LogicIcon\ selected+.png" /> <BundleResource Include="Resources\Phone\LogicIcon\selected-.png" /> <BundleResource Include="Resources\Phone\oRobot.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelGray.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelTip.png" /> <BundleResource Include="Resources\Phone\RoomListBg.png" /> <BundleResource Include="Resources\Phone\LogicIcon\link.png" /> <BundleResource Include="Resources\Phone\LogicIcon\selectTheFun.png" /> <BundleResource Include="Resources\Phone\LogicIcon\selectTheScene.png" /> <BundleResource Include="Resources\Phone\LogicIcon\selectTheTime.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FaceIdIconBig.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerIconBlue.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> <ITunesArtwork Include="iTunesArtwork%402x" /> </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" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform> <ProjectGuid>{D998E133-F0DD-4760-BE3C-461632F54DA4}</ProjectGuid> <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <TemplateGuid>{edc1b0fa-90cd-4038-8fad-98fe74adb368}</TemplateGuid> <OutputType>Exe</OutputType> <RootNamespace>HDL_ON_iOS</RootNamespace> <AssemblyName>HDL_ON_iOS</AssemblyName> <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <MtouchEnableSGenConc>true</MtouchEnableSGenConc> <MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler> <RestoreProjectStyle>PackageReference</RestoreProjectStyle> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> <OutputPath>bin\iPhoneSimulator\Debug</OutputPath> <DefineConstants>DEBUG</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <MtouchArch>x86_64</MtouchArch> <MtouchLink>Full</MtouchLink> <MtouchDebug>true</MtouchDebug> <CodesignKey>iPhone Developer</CodesignKey> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' "> <DebugType>none</DebugType> <Optimize>true</Optimize> <OutputPath>bin\iPhoneSimulator\Release</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <MtouchLink>None</MtouchLink> <MtouchArch>x86_64</MtouchArch> <CodesignKey>iPhone Developer</CodesignKey> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> <OutputPath>bin\iPhone\Debug</OutputPath> <DefineConstants>DEBUG</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <MtouchArch>ARM64</MtouchArch> <CodesignKey>iPhone Developer</CodesignKey> <MtouchDebug>true</MtouchDebug> <MtouchExtraArgs>-gcc_flags="-dead_strip -ObjC";-w</MtouchExtraArgs> <MtouchI18n>cjk</MtouchI18n> <MtouchLink>SdkOnly</MtouchLink> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' "> <DebugType>none</DebugType> <Optimize>true</Optimize> <OutputPath>bin\iPhone\Release</OutputPath> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <CodesignEntitlements>Entitlements.plist</CodesignEntitlements> <MtouchArch>ARM64</MtouchArch> <CodesignKey>iPhone Distribution: HDL Automation Co., Ltd (BVTA78PRYA)</CodesignKey> <CodesignProvision>dis-onpro-080401</CodesignProvision> <MtouchLink>SdkOnly</MtouchLink> </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> <Reference Include="System.Core" /> <Reference Include="Xamarin.iOS" /> <Reference Include="System.Numerics" /> <Reference Include="System.Numerics.Vectors" /> <Reference Include="System.Web.Services" /> <Reference Include="Shared.IOS"> <HintPath>..\DLL\Shared.IOS.dll</HintPath> <Private>False</Private> </Reference> <Reference Include="Shared.IOS.TBL"> <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> </ItemGroup> <ItemGroup> <PackageReference Include="Xamarin.Essentials" Version="1.5.3.2" /> <PackageReference Include="Newtonsoft.Json"> <Version>12.0.3</Version> </PackageReference> <PackageReference Include="MQTTnet"> <Version>3.0.13</Version> </PackageReference> <PackageReference Include="Microsoft.AppCenter.Analytics"> <Version>4.0.0</Version> </PackageReference> <PackageReference Include="Microsoft.AppCenter.Crashes"> <Version>4.0.0</Version> </PackageReference> <PackageReference Include="ZXing.Net.Mobile"> <Version>2.4.1</Version> </PackageReference> <PackageReference Include="RestSharp"> <Version>106.11.7</Version> </PackageReference> </ItemGroup> <ItemGroup> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024x500.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048X2732 .png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\4096X4096.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750X1134.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\1024.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\120.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\152.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\167.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\180.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\20.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\29.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\40.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\58.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\60.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\76.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\80.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\87.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\AppIcon.appiconset\Contents.json"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\Contents.json"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40·40%402x.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60·60%403x.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58·58%402x.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87·87%403x.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80·80%402x.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120·120%402x.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\120·120%403x.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\180·180%403x.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\20·20.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40·40%402x-1.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\29·29.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58·58%402x-1.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024·1024%402x.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2688.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828_1792.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125_2436.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-1.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136.png"> <Visible>false</Visible> </ImageAsset> <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-1.png"> <Visible>false</Visible> </ImageAsset> </ItemGroup> <ItemGroup> <Folder Include="Assets.xcassets\LaunchImage.launchimage\" /> </ItemGroup> <ItemGroup> <InterfaceDefinition Include="LaunchScreen.storyboard" /> <InterfaceDefinition Include="Main.storyboard" /> </ItemGroup> <ItemGroup> <None Include="Info.plist" /> <None Include="Entitlements.plist" /> </ItemGroup> <ItemGroup> <Compile Include="Main.cs" /> <Compile Include="AppDelegate.cs" /> <Compile Include="ViewController.cs" /> <Compile Include="ViewController.designer.cs"> <DependentUpon>ViewController.cs</DependentUpon> </Compile> <Compile Include="ViewControllerBase.cs" /> <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" /> <BundleResource Include="Resources\Phone\LoginIcon\SearchIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\VerificationCodeIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\AccountIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\QQIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\PasswordIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\WechatIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\HidePasswordIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\2.png" /> <BundleResource Include="Resources\Phone\LoginIcon\EmailIcon.png" /> <BundleResource Include="Resources\Phone\LoginIcon\3.png" /> <BundleResource Include="Resources\Phone\LoginIcon\1.png" /> <BundleResource Include="Resources\Language.ini" /> <BundleResource Include="Resources\Phone\Public\BackIcon.png" /> <BundleResource Include="Resources\Phone\Public\Logo.png" /> <BundleResource Include="Resources\Phone\Public\Logo-bg.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\UserTypebg.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AdminTypeIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\MemberTypeIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceManageIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceMemberIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceArmIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\ResidenceDataBackupIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AuxiliaryFunctionIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AddFunctionIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\NightViewIcon.png" /> <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\PersonalCenter\HomeList3bg.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\PersonalData\QRcodeIcon.png" /> <BundleResource Include="Resources\Phone\Classification\ToggleDisplayThumbnail.png" /> <BundleResource Include="Resources\Phone\Classification\ToggleDisplayLarge.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg.png" /> <BundleResource Include="Resources\Phone\Collection\MsgIcon.png" /> <BundleResource Include="Resources\Phone\Collection\MsgIconTip.png" /> <BundleResource Include="Resources\Phone\Collection\Functionbg.png" /> <BundleResource Include="Resources\Phone\Collection\FunctionOnbg.png" /> <BundleResource Include="Resources\Phone\Collection\ChangeViewbg.png" /> <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\HumidityIcon.png" /> <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\Pm25Icon.png" /> <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\TempIcon.png" /> <BundleResource Include="Resources\Phone\Public\DownIcon.png" /> <BundleResource Include="Resources\Phone\Public\transparent.png" /> <BundleResource Include="Resources\Phone\Collection\CollectionIcon.png" /> <BundleResource Include="Resources\Phone\Collection\CollectionWhiteIcon.png" /> <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\Curtain\CurtainStopIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainCloseOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainStopOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Music\MusicOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Switch.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\SwitchOn.png" /> <BundleResource Include="Resources\Phone\Public\FuncInfoSetIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheel.png" /> <BundleResource Include="Resources\Phone\Public\ThumbImage.png" /> <BundleResource Include="Resources\Phone\Public\Fragmentbg.png" /> <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\Curtain\CurtainThinIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\FloorHeatingThinIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\LightThinIcon.png" /> <BundleResource Include="Resources\Phone\Public\ChooseIcon.png" /> <BundleResource Include="Resources\Phone\Public\ChooseOnIcon.png" /> <BundleResource Include="Resources\Phone\Public\PlusSignIcon.png" /> <BundleResource Include="Resources\Phone\Public\MinusSignIcon.png" /> <BundleResource Include="Resources\Phone\Collection\CollectionGrayIcon.png" /> <BundleResource Include="Resources\Phone\Public\Switch.png" /> <BundleResource Include="Resources\Phone\Public\SwitchOn.png" /> <BundleResource Include="Resources\Phone\Public\LocationAddressIcon.png" /> <BundleResource Include="Resources\Phone\Public\AddIcon.png" /> <BundleResource Include="Resources\Phone\Public\EditIcon.png" /> <BundleResource Include="Resources\Phone\Public\Right.png" /> <BundleResource Include="Resources\Phone\Public\DownIcon_2.png" /> <BundleResource Include="Resources\Phone\Public\ChooseRoomListbg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Scene\MovieMark.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Scene\SceneIcon.png" /> <BundleResource Include="Resources\Phone\Collection\SceneCovered.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Scene\DelayIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Scene\s2.png" /> <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\FunctionBg\MusicFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\FreshAirFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\EnergyMonitoringFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\EnvironmentalFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SecurityMonitoringFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\LightFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\VideoIntercomFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\PanelFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\FloorHeatingFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\ACFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\CurtainFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\ElectricFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\SensorFunctionBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FunctionBg\DoorLockFunctionBg.png" /> <BundleResource Include="Resources\Phone\Public\DeviceInfoIcon\Restored_Shadow.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Curtain\CurtainOpenBlueIcon_Shadow.png" /> <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\Public\MsgIcon\TipIconBlack.png" /> <BundleResource Include="Resources\Phone\Public\MsgIcon\TipIconWhite.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\4.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\1On.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\2.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\3.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\4On.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\3On.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\1.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\2On.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerprintIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FaceIdIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\GestureIcon.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\PasswordIcon.png" /> <BundleResource Include="Resources\Phone\Public\TipIcon_Successfully.png" /> <BundleResource Include="Resources\Phone\Public\TipIcon_Failed.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\GestureGrayIcon.png" /> <BundleResource Include="Resources\Phone\Public\Switch_2.png" /> <BundleResource Include="Resources\Phone\Public\SwitchOn_2.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\AppUnlockSetting\FingerIconRed.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\NightIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\NightIconGray.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\OrdinaryIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\OrdinaryIconGray.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\AwayIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\FloorHeating\AwayIconGray.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconBgGray.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanThinIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketThinIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketOnIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\FanIconOnBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIconOnBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Socket\SocketIconBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVPowerIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TV123Icon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVRightIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVOkIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVUpIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVleftIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVDownIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuUpIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVBackIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMuteIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\TVMenuDownIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\MenuBgIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\PlusIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TV\ReduceIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TVThinIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Electrical\TVIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SmogIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\LocationIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\UpArrow.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\WeatherFanSpeedIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\TipInfoIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg1.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorColorTipBg.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg2.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\SensorHistoryBg3.png" /> <BundleResource Include="Resources\theme\macarons.js" /> <BundleResource Include="Resources\theme\macarons2.js" /> <BundleResource Include="Resources\theme\red.js" /> <BundleResource Include="Resources\theme\roma.js" /> <BundleResource Include="Resources\theme\helianthus.js" /> <BundleResource Include="Resources\theme\green.js" /> <BundleResource Include="Resources\theme\infographic.js" /> <BundleResource Include="Resources\theme\shine.js" /> <BundleResource Include="Resources\theme\gray.js" /> <BundleResource Include="Resources\theme\sakura.js" /> <BundleResource Include="Resources\theme\blue.js" /> <BundleResource Include="Resources\theme\dark.js" /> <BundleResource Include="Resources\theme\mint.js" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIcon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\DiagramIconOn.png" /> <BundleResource Include="Resources\Phone\Public\MsgIcon\LoadingIcon.png" /> <BundleResource Include="Resources\Phone\Collection\NoCollectionBg.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\0.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\1.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\13.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\18.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\2.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\20.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\29.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\3.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\4.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\45.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\5.png" /> <BundleResource Include="Resources\Phone\Public\AirIcon\6.png" /> <BundleResource Include="Resources\Phone\MusicIcon\bluetooth.png" /> <BundleResource Include="Resources\Phone\MusicIcon\addMusic1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\prve1Selected.png" /> <BundleResource Include="Resources\Phone\MusicIcon\love1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\selectedIcon.png" /> <BundleResource Include="Resources\Phone\MusicIcon\playList.png" /> <BundleResource Include="Resources\Phone\MusicIcon\myLove.png" /> <BundleResource Include="Resources\Phone\MusicIcon\radio.png" /> <BundleResource Include="Resources\Phone\MusicIcon\filePlay.png" /> <BundleResource Include="Resources\Phone\MusicIcon\collect.png" /> <BundleResource Include="Resources\Phone\MusicIcon\loveMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\qqMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\clear.png" /> <BundleResource Include="Resources\Phone\MusicIcon\radioIcon.png" /> <BundleResource Include="Resources\Phone\MusicIcon\musicIcon.png" /> <BundleResource Include="Resources\Phone\MusicIcon\file.png" /> <BundleResource Include="Resources\Phone\MusicIcon\vol.png" /> <BundleResource Include="Resources\Phone\MusicIcon\usb.png" /> <BundleResource Include="Resources\Phone\MusicIcon\localMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\next1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\loveSelected1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\selectedMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\noMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\addMusic.png" /> <BundleResource Include="Resources\Phone\MusicIcon\playBj.png" /> <BundleResource Include="Resources\Phone\MusicIcon\loveRadio.png" /> <BundleResource Include="Resources\Phone\MusicIcon\list.png" /> <BundleResource Include="Resources\Phone\MusicIcon\set.png" /> <BundleResource Include="Resources\Phone\MusicIcon\nextSelected.png" /> <BundleResource Include="Resources\Phone\MusicIcon\Merge.png" /> <BundleResource Include="Resources\Phone\MusicIcon\playStatus.png" /> <BundleResource Include="Resources\Phone\MusicIcon\random.png" /> <BundleResource Include="Resources\Phone\MusicIcon\collectSelected.png" /> <BundleResource Include="Resources\Phone\MusicIcon\pause.png" /> <BundleResource Include="Resources\Phone\MusicIcon\progressIcon.png" /> <BundleResource Include="Resources\Phone\MusicIcon\prevSeletced.png" /> <BundleResource Include="Resources\Phone\MusicIcon\MusicBack.png" /> <BundleResource Include="Resources\Phone\MusicIcon\fileList.png" /> <BundleResource Include="Resources\Phone\MusicIcon\myList.png" /> <BundleResource Include="Resources\Phone\MusicIcon\single.png" /> <BundleResource Include="Resources\Phone\MusicIcon\edit.png" /> <BundleResource Include="Resources\Phone\MusicIcon\next.png" /> <BundleResource Include="Resources\Phone\MusicIcon\filePause.png" /> <BundleResource Include="Resources\Phone\MusicIcon\line.png" /> <BundleResource Include="Resources\Phone\MusicIcon\loveSelected.png" /> <BundleResource Include="Resources\Phone\MusicIcon\sourceNetx.png" /> <BundleResource Include="Resources\Phone\MusicIcon\love.png" /> <BundleResource Include="Resources\Phone\MusicIcon\pause1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\play1.png" /> <BundleResource Include="Resources\Phone\MusicIcon\play.png" /> <BundleResource Include="Resources\Phone\MusicIcon\noSelectedIcon.png" /> <BundleResource Include="Resources\Phone\MusicIcon\next1Selected.png" /> <BundleResource Include="Resources\Phone\MusicIcon\prev.png" /> <BundleResource Include="Resources\Phone\MusicIcon\prve1.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\Pm25Icon.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\EnvironmentalScience\HumidityIcon.png" /> <BundleResource Include="Resources\echartsNew.html" /> <BundleResource Include="Resources\js\bmap.min.js" /> <BundleResource Include="Resources\js\20190126.js" /> <BundleResource Include="Resources\js\china.js" /> <BundleResource Include="Resources\js\dataTool.min.js" /> <BundleResource Include="Resources\js\echarts-all.js" /> <BundleResource Include="Resources\js\echarts-gl.min.js" /> <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\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\Music\MusicThinIcon.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" /> <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_3.png" /> <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_2.png" /> <BundleResource Include="Resources\Phone\Public\Dialog\DialogTipTitleIcon_1.png" /> <BundleResource Include="Resources\Phone\LoginIcon\Server.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\ServerInfo.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Function.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Search.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Menu.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Help.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Telephone.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\SendMessage.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Scene.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Support\Close.png" /> <BundleResource Include="Resources\Phone\Public\Search.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Head.png" /> <BundleResource Include="Resources\Phone\PersonalCenter\Transfer.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\All.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\System.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\Alarm.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\AllOn.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\Share.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\AlarmOn.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\ShareOn.png" /> <BundleResource Include="Resources\Phone\Collection\MesCenter\SystemOn.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg1.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg2.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg3.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg4.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg5.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg6.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg7.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg8.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg9.png" /> <BundleResource Include="Resources\Phone\Classification\Room\Roombg10.png" /> <BundleResource Include="Resources\Phone\LogicIcon\heatlogic.png" /> <BundleResource Include="Resources\Phone\LogicIcon\on.png" /> <BundleResource Include="Resources\Phone\LogicIcon\off.png" /> <BundleResource Include="Resources\Phone\LogicIcon\timecondition.png" /> <BundleResource Include="Resources\Phone\LogicIcon\down.png" /> <BundleResource Include="Resources\Phone\LogicIcon\timeicon.png" /> <BundleResource Include="Resources\Phone\LogicIcon\lightloguc.png" /> <BundleResource Include="Resources\Phone\LogicIcon\set.png" /> <BundleResource Include="Resources\Phone\LogicIcon\addconditiontarget.png" /> <BundleResource Include="Resources\Phone\LogicIcon\functionicon.png" /> <BundleResource Include="Resources\Phone\LogicIcon\airconditionerlogic.png" /> <BundleResource Include="Resources\Phone\LogicIcon\bjicon5.png" /> <BundleResource Include="Resources\Phone\LogicIcon\delayed.png" /> <BundleResource Include="Resources\Phone\LogicIcon\next.png" /> <BundleResource Include="Resources\Phone\LogicIcon\curtainlogic.png" /> <BundleResource Include="Resources\Phone\LogicIcon\weekoff.png" /> <BundleResource Include="Resources\Phone\LogicIcon\weekon.png" /> <BundleResource Include="Resources\Phone\LogicIcon\outletlogic.png" /> <BundleResource Include="Resources\Phone\LogicIcon\back.png" /> <BundleResource Include="Resources\Phone\LogicIcon\scene.png" /> <BundleResource Include="Resources\Phone\LogicIcon\editname.png" /> <BundleResource Include="Resources\Phone\LogicIcon\bjicon1.png" /> <BundleResource Include="Resources\Phone\LogicIcon\bjicon2.png" /> <BundleResource Include="Resources\Phone\LogicIcon\bjicon3.png" /> <BundleResource Include="Resources\Phone\LogicIcon\bjicon4.png" /> <BundleResource Include="Resources\Phone\LogicIcon\-.png" /> <BundleResource Include="Resources\Phone\LogicIcon\+.png" /> <BundleResource Include="Resources\Phone\LogicIcon\point.png" /> <BundleResource Include="Resources\Phone\LogicIcon\ selected+.png" /> <BundleResource Include="Resources\Phone\LogicIcon\selected-.png" /> <BundleResource Include="Resources\Phone\oRobot.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelGray.png" /> <BundleResource Include="Resources\Phone\FunctionIcon\Light\ColorWheelTip.png" /> <BundleResource Include="Resources\Phone\RoomListBg.png" /> <BundleResource Include="Resources\Phone\LogicIcon\link.png" /> <BundleResource Include="Resources\Phone\LogicIcon\selectTheFun.png" /> <BundleResource Include="Resources\Phone\LogicIcon\selectTheScene.png" /> <BundleResource Include="Resources\Phone\LogicIcon\selectTheTime.png" /> </ItemGroup> <ItemGroup> <ITunesArtwork Include="iTunesArtwork" /> <ITunesArtwork Include="iTunesArtwork%402x" /> </ItemGroup> <ItemGroup> <BundleResource Include="Resources\Phone\ErrorIcon.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" /> </Project> HDL-ON_iOS/Info.plistold mode 100755 new mode 100644
HDL-ON_iOS/Resources/Language.ini
@@ -395,6 +395,9 @@ 373=æ·»å æ¥¼å±å¤±è´¥ã 374=ä½å® æ°æ®å·²è¢«å é¤ï¼APPå°èªå¨åæ¢å°å¦ä¸ä½å® ã 375=ç½å ³æªè¿æ¥æå¡å¨ï¼æ æ³åå»ºåºæ¯ã 376=欢è¿åå®¶ 377=äºç»´ç 失æï¼è¯·éè¯ 378=éè¯ 5000=é³ä¹ 5001=ç»å HDL-ON_iOS/Resources/Phone/ErrorIcon.png
HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AcIcon.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AcOnIcon.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainIcon.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/FloorHeatingIcon.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/FloorHeatingOnIcon.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/Light/LightIcon.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicIcon.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicOnIcon.pngHDL-ON_iOS/Resources/Phone/FunctionIcon/SwitchOn.pngHDL-ON_iOS/Resources/Phone/LogicIcon/+.pngHDL-ON_iOS/Resources/Phone/LogicIcon/-.pngHDL-ON_iOS/Resources/Phone/LogicIcon/addconditiontarget.pngHDL-ON_iOS/Resources/Phone/LogicIcon/airconditionerlogic.pngHDL-ON_iOS/Resources/Phone/LogicIcon/back.pngHDL-ON_iOS/Resources/Phone/LogicIcon/bjicon1.pngHDL-ON_iOS/Resources/Phone/LogicIcon/bjicon2.pngHDL-ON_iOS/Resources/Phone/LogicIcon/bjicon3.pngHDL-ON_iOS/Resources/Phone/LogicIcon/bjicon4.pngHDL-ON_iOS/Resources/Phone/LogicIcon/bjicon5.pngHDL-ON_iOS/Resources/Phone/LogicIcon/curtainlogic.pngHDL-ON_iOS/Resources/Phone/LogicIcon/delayed.pngHDL-ON_iOS/Resources/Phone/LogicIcon/down.pngHDL-ON_iOS/Resources/Phone/LogicIcon/editname.pngHDL-ON_iOS/Resources/Phone/LogicIcon/functionicon.pngHDL-ON_iOS/Resources/Phone/LogicIcon/heatlogic.pngHDL-ON_iOS/Resources/Phone/LogicIcon/lightloguc.pngHDL-ON_iOS/Resources/Phone/LogicIcon/link.pngHDL-ON_iOS/Resources/Phone/LogicIcon/next.pngHDL-ON_iOS/Resources/Phone/LogicIcon/off.pngHDL-ON_iOS/Resources/Phone/LogicIcon/on.pngHDL-ON_iOS/Resources/Phone/LogicIcon/outletlogic.pngHDL-ON_iOS/Resources/Phone/LogicIcon/point.pngHDL-ON_iOS/Resources/Phone/LogicIcon/scene.pngHDL-ON_iOS/Resources/Phone/LogicIcon/selectTheFun.pngHDL-ON_iOS/Resources/Phone/LogicIcon/selectTheScene.pngHDL-ON_iOS/Resources/Phone/LogicIcon/selectTheTime.pngHDL-ON_iOS/Resources/Phone/LogicIcon/selected+.pngHDL-ON_iOS/Resources/Phone/LogicIcon/selected-.pngHDL-ON_iOS/Resources/Phone/LogicIcon/set.pngHDL-ON_iOS/Resources/Phone/LogicIcon/timecondition.pngHDL-ON_iOS/Resources/Phone/LogicIcon/timeicon.pngHDL-ON_iOS/Resources/Phone/LogicIcon/weekoff.pngHDL-ON_iOS/Resources/Phone/LogicIcon/weekon.pngHDL-ON_iOS/Resources/Phone/LoginIcon/1.pngHDL-ON_iOS/Resources/Phone/LoginIcon/3.pngHDL-ON_iOS/Resources/Phone/LoginIcon/AccountIcon.pngHDL-ON_iOS/Resources/Phone/LoginIcon/EmailIcon.pngHDL-ON_iOS/Resources/Phone/LoginIcon/HidePasswordIcon.pngHDL-ON_iOS/Resources/Phone/LoginIcon/PasswordIcon.pngHDL-ON_iOS/Resources/Phone/LoginIcon/SearchIcon.pngHDL-ON_iOS/Resources/Phone/LoginIcon/ShowPasswordIcon.pngHDL-ON_iOS/Resources/Phone/LoginIcon/VerificationCodeIcon.pngHDL-ON_iOS/Resources/Phone/MusicIcon/noMusic.pngHDL-ON_iOS/Resources/Phone/MusicIcon/selectedMusic.pngHDL-ON_iOS/Resources/Phone/Navigation/ClassificationIconOn.pngHDL-ON_iOS/Resources/Phone/Navigation/CollectionIconOn.pngHDL-ON_iOS/Resources/Phone/Navigation/IntellectualizationIconOn.pngHDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_1.pngHDL-ON_iOS/Resources/js/echarts-all.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/blue.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/dark.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/gray.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/green.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/helianthus.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/infographic.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/macarons.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/macarons2.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/mint.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/red.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/roma.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/sakura.jsold mode 100755 new mode 100644
HDL-ON_iOS/Resources/theme/shine.jsold mode 100755 new mode 100644
HDL-ON_iOS/iTunesArtworkold mode 100755 new mode 100644 Binary files differ
HDL-ON_iOS/iTunesArtwork@2xold mode 100755 new mode 100644 Binary files differ
HDL_APP_Project.sln
@@ -1,6 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 # Visual Studio Version 16 VisualStudioVersion = 16.0.29519.87 MinimumVisualStudioVersion = 10.0.40219.1 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HDL_ON", "HDL_ON\HDL_ON.shproj", "{A5C296B4-CF9A-4205-ACF0-3A6FEA786F12}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDL-ON_Android", "HDL-ON_Android\HDL-ON_Android.csproj", "{09712674-2A38-407B-B1E2-560B2C352F9A}" @@ -8,38 +9,50 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDL-ON_iOS", "HDL-ON_iOS\HDL-ON_iOS.csproj", "{D998E133-F0DD-4760-BE3C-461632F54DA4}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution HDL_ON\HDL_ON.projitems*{09712674-2a38-407b-b1e2-560b2c352f9a}*SharedItemsImports = 4 HDL_ON\HDL_ON.projitems*{a5c296b4-cf9a-4205-acf0-3a6fea786f12}*SharedItemsImports = 13 HDL_ON\HDL_ON.projitems*{d998e133-f0dd-4760-be3c-461632f54da4}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU Debug|iPhoneSimulator = Debug|iPhoneSimulator Release|iPhoneSimulator = Release|iPhoneSimulator Debug|iPhone = Debug|iPhone Debug|iPhoneSimulator = Debug|iPhoneSimulator Release|Any CPU = Release|Any CPU Release|iPhone = Release|iPhone Release|iPhoneSimulator = Release|iPhoneSimulator EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|Any CPU.Build.0 = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|iPhone.ActiveCfg = Debug|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|iPhone.Build.0 = Debug|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|Any CPU.Build.0 = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhone.ActiveCfg = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhone.Build.0 = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhone.ActiveCfg = Debug|iPhone {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhone.Build.0 = Debug|iPhone {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|Any CPU.ActiveCfg = Release|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|Any CPU.Build.0 = Release|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhone.ActiveCfg = Release|iPhone {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhone.Build.0 = Release|iPhone {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator {D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8C0F1E94-EA58-41A0-B620-41091484BCEE} EndGlobalSection EndGlobal HDL_ON/Common/HDLCommon.cs
@@ -270,7 +270,7 @@ Shared.Application.RunOnMainThread(() => { new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show(); GetPushMessageAction?.Invoke(); //GetPushMessageAction?.Invoke(); }); return; } HDL_ON/Common/R.cs
@@ -4,6 +4,9 @@ { public static class StringId { public const int Retry = 378; public const int QRCodeIsInvalid = 377; public const int WellComBackHome = 376; public const int GatewayOfflineCannotCreateScene = 375; public const int ResidenceDeletedSwitchToAnotherResidence = 374; public const int AddFloorFail = 373; HDL_ON/Common/Utlis.cs
@@ -8,7 +8,7 @@ /// <summary> /// 常ç¨å·¥å ·ç±» /// </summary> public static class Utlis public class Utlis { /// <summary> /// å ¨å±æå° @@ -328,55 +328,7 @@ return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString(); } #region æ¶é´æ ¼å¼è½¬æ¢ private const int Second = 1; private const int Minute = 60 * Second; private const int Hour = 60 * Minute; private const int Day = 24 * Hour; private const int Month = 30 * Day; /// <summary> /// æ¶é´è½¬æ¢ /// å°äº1天 æ¾ç¤º æ¶å /// å°äºä¸å¹´ æ¾ç¤º ææ¥ /// 大äºä¸å¹´ æ¾ç¤º å¹´ /// </summary> /// <param name="dateTime"></param> /// <returns></returns> public static string ToFriendlyDisplay(this DateTime dateTime) { var ts = DateTime.Now - dateTime; var delta = ts.TotalSeconds; if (delta < 24 * Hour) { //æ¾ç¤º æ¶:å return dateTime.ToString("HH:mm"); } else if (delta < 12 * Month) { //æ¾ç¤º æ:æ¥ return dateTime.ToString("MM/dd"); } else { //æ¾ç¤º å¹´ return dateTime.ToString("yyyy"); } } /// <summary> /// æ¶é´è½¬æ¢ /// å°äº1天 æ¾ç¤º æ¶å /// å°äºä¸å¹´ æ¾ç¤º ææ¥ /// 大äºä¸å¹´ æ¾ç¤º å¹´ /// </summary> /// <param name="dateTime"></param> /// <returns></returns> public static string ToFriendlyDisplay(long unixTimeStamp) { return ToFriendlyDisplay(UnixToDateTimeMS(unixTimeStamp)); } #endregion } HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -310,23 +310,9 @@ if (RemoteMqttClient.ConnectedHandler == null) { RemoteMqttClient.UseConnectedHandler(async (e) => { if (DB_ResidenceData.Instance.HomeGateway.gatewayStatus) if (DB_ResidenceData.Instance.HomeGateway.GatewayOnline) { Control.Ins.GatewayOnline = true; } else { //new System.Threading.Thread(() => { // while(true) // { // System.Threading.Thread.Sleep(1000); // if (DB_ResidenceData.Instance.HomeGateway.GatewayOnline) // { // Control.Ins.GatewayOnline = true; // break; // } // } //}) { IsBackground = true }.Start(); } IfNeedReadAllDeviceStatus = true; Utlis.WriteLine($"============>Mqttè¿ç¨è¿æ¥æå"); HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -131,13 +131,36 @@ /// ç»å®è°è¯äººåæäº¤çä½å® ,ä¸ä¸ªä½å® åªè½ç»å®ä¸æ¬¡ /// </summary> /// <returns></returns> public ResponsePackNew BindingResidence(string key) public ResponsePackNew BindingResidence(string strUrl) { Dictionary<string, object> d = new Dictionary<string, object>(); //d.Add("homeId", homeId); d.Add("secretKey", key); var requestJson = HttpUtil.GetSignRequestJson(d); return HttpUtil.RequestHttpsPost(NewAPI.Api_Post_BindlingResidence, requestJson, HttpUtil.GlobalRequestHttpsHost); try { if (strUrl.Contains("app/home/deliver") == false) { //éæ³çURL è¿åä¸ä¸ªèªå®ä¹çç¶æç return new ResponsePackNew() { Code = "-100" }; } var client = new RestSharp.RestClient(strUrl); var request = new RestSharp.RestRequest(RestSharp.Method.GET); request.Timeout = 5 * 1000; request.AddHeader("content-type", "application/json"); request.AddHeader("Authorization", UserInfo.Current.LoginTokenString); var response = client.Execute(request); if (response.StatusCode == HttpStatusCode.OK) { return Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(response.Content); } else { return null; } } catch { return null; } } #region 注åãç»å½é¨å @@ -599,7 +622,7 @@ if (mHomeGatewayRes.Count > 0) { DB_ResidenceData.Instance.HomeGateway = mHomeGatewayRes[0]; if(mHomeGatewayRes[0].gatewayStatus) if(mHomeGatewayRes[0].gatewayStatus == "ON_LINE") { //DriverLayer.Control.Ins.IsRemote = true; DriverLayer.Control.Ins.GatewayOnline = true; HDL_ON/DAL/Server/NewApiRes.cs
@@ -569,7 +569,24 @@ /// ON_LINE(0,"å¨çº¿"), /// OFF_LINE(1,"ä¸çº¿"),; /// </summary> public bool gatewayStatus; public string gatewayStatus; /// <summary> /// ç½å ³æ¯å¦å¨çº¿ /// </summary> public bool GatewayOnline { get { if (gatewayStatus == "ON_LINE") { return true; } else { return false; } } } ///// <summary> ///// HDL_ON/Entity/Function/AC.cs
@@ -255,7 +255,7 @@ if (_trait_temp.curValue.ToString() == "{}") _trait_temp.curValue = 16; } //if (_trait_temp.curValue.ToString().Length > 3) if (_trait_temp.curValue.ToString().Length > 3) { var vv = Convert.ToDouble(_trait_temp.curValue); _trait_temp.curValue = Convert.ToInt32(vv); @@ -335,7 +335,7 @@ if (_trait_IndoorTemp.curValue.ToString() == "{}") _trait_IndoorTemp.curValue = 0; } //if (_trait_IndoorTemp.curValue.ToString().Length > 3) if (_trait_IndoorTemp.curValue.ToString().Length > 3) { var vv = Convert.ToDouble(_trait_IndoorTemp.curValue); _trait_IndoorTemp.curValue = Convert.ToInt32(vv); HDL_ON/Entity/Function/FloorHeating.cs
@@ -186,7 +186,7 @@ _trait_IndoorTemp.curValue = 0; } } //if (_trait_IndoorTemp.curValue.ToString().Length > 3) if (_trait_IndoorTemp.curValue.ToString().Length > 3) { var vv = Convert.ToDouble(_trait_IndoorTemp.curValue); _trait_IndoorTemp.curValue = Convert.ToInt32(vv); @@ -224,7 +224,7 @@ if(_trait_temp.curValue.ToString() == "{}") _trait_temp.curValue = 16; } //if (_trait_temp.curValue.ToString().Length > 3) if (_trait_temp.curValue.ToString().Length > 3) { var vv = Convert.ToDouble(_trait_temp.curValue); _trait_temp.curValue = Convert.ToInt32(vv); HDL_ON/Entity/Function/Function.cs
@@ -643,15 +643,15 @@ /// <summary> /// å®¶çµãæåº§ /// </summary> public const string ElectricSocket = "electrical.socket"; public const string ElectricSocket = "electric.socket "; /// <summary> /// å®¶çµãçµè§ /// </summary> public const string ElectricTV = "electrical.tv"; public const string ElectricTV = "electric.tv"; /// <summary> /// å®¶çµã飿 /// </summary> public const string ElectricFan = "electrical.fan"; public const string ElectricFan = "electric.fan"; } } HDL_ON/HDL_ON.projitems
@@ -9,6 +9,7 @@ <Import_RootNamespace>HDL_ON</Import_RootNamespace> </PropertyGroup> <ItemGroup> <Compile Include="$(MSBuildThisFileDirectory)UI\BindingResidence\WellcomToHomeForm.cs" /> <Compile Include="$(MSBuildThisFileDirectory)UI\MainPage.cs" /> <Compile Include="$(MSBuildThisFileDirectory)DAL\FileUtils.cs" /> <Compile Include="$(MSBuildThisFileDirectory)Common\R.cs" /> @@ -261,7 +262,6 @@ <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Scene\SceneAddPage.cs" /> </ItemGroup> <ItemGroup> <Folder Include="$(MSBuildThisFileDirectory)UI\" /> <Folder Include="$(MSBuildThisFileDirectory)DAL\" /> <Folder Include="$(MSBuildThisFileDirectory)DAL\Mqtt\" /> <Folder Include="$(MSBuildThisFileDirectory)Common\" /> @@ -290,7 +290,5 @@ <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\" /> <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\" /> <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\AddRoom\" /> <Folder Include="$(MSBuildThisFileDirectory)UI\BindingResidence\" /> <Folder Include="$(MSBuildThisFileDirectory)Common\Utlis\" /> </ItemGroup> </Project> HDL_ON/UI/BindingResidence/BindingResidencePage.cs
@@ -91,15 +91,10 @@ btnAddNewResidence.MouseUpEventHandler = (sender, e) => { Action<string> action = (str) => { Application.RunOnMainThread(() => { var pm = new DAL.Server.HttpServerRequest(); pm.BindingResidence(str); }); }; Scan.OpenScan((scanString) => { action(scanString); //æ§è¡ç»å®ä½å® this.DoBindResidence(scanString); }); }; @@ -117,5 +112,120 @@ MainPage.GoLoginPage(UserInfo.Current); }; } /// <summary> /// æ§è¡ç»å®ä½å® /// </summary> private void DoBindResidence(string scanString) { var pm = new DAL.Server.HttpServerRequest(); var result = pm.BindingResidence(scanString); if (result == null) { return; } if (result.Code == DAL.Server.StateCode.SUCCESS) { //è°ç¨Onåæ¥çæ¹æ³,å·æ°ä½å® å表åå ¶ç¼å pm.GetHomePager(); //跳转页é¢---- MainPage.GoUserPage(false, () => { //æ¾ç¤ºæ¬¢è¿åå®¶çå¼¹çªçé¢ var form = new WellcomToHomeForm(); form.ShowForm(); }); } //å ¶ä»æ åµå ¨é¨æç¤ºå¤±æ else { //æ¾ç¤ºäºç»´ç å·²ç»è¿æçå¼¹çª this.ShowQrCodeTimeOutView(); } } /// <summary> /// æ¾ç¤ºäºç»´ç å·²ç»è¿æçå¼¹çª /// </summary> private void ShowQrCodeTimeOutView() { //æ´ä¸ªçé¢çç°è²èæ¯ var frameBack = new Dialog(); frameBack.Show(); //ä¸é´ç½è²åºå var frameWite = new FrameLayout(); frameWite.Y = Application.GetRealHeight(223); frameWite.Height = Application.GetRealHeight(245); frameWite.Width = Application.GetRealWidth(288); frameWite.BackgroundColor = CSS.CSS_Color.MainBackgroundColor; frameWite.Radius = (uint)Application.GetRealWidth(12); frameWite.Gravity = Gravity.CenterHorizontal; frameBack.AddChidren(frameWite); //Icon徿 var picIcon = new Button(); picIcon.Y = Application.GetRealHeight(152); picIcon.Height = Application.GetRealWidth(160); picIcon.Width = Application.GetRealWidth(160); picIcon.Gravity = Gravity.CenterHorizontal; picIcon.UnSelectedImagePath = "ErrorIcon.png"; frameBack.AddChidren(picIcon); //äºç»´ç 失æï¼è¯·éè¯ var btnText = new Button(); btnText.Y = Application.GetRealHeight(98); btnText.Height = Application.GetRealHeight(24); btnText.TextSize = 16; btnText.TextAlignment = TextAlignment.Center; btnText.TextColor = CSS.CSS_Color.FirstLevelTitleColor; btnText.TextID = StringId.QRCodeIsInvalid; frameWite.AddChidren(btnText); //åæ¶ var btnCancel = new Button(); btnCancel.X = Application.GetRealWidth(30); btnCancel.Y = btnText.Bottom + Application.GetRealHeight(48); btnCancel.Height = Application.GetRealHeight(44); btnCancel.Width = Application.GetRealWidth(108); btnCancel.TextSize = 16; btnCancel.IsBold = true; btnCancel.TextAlignment = TextAlignment.Center; btnCancel.TextColor = CSS.CSS_Color.MainColor; btnCancel.BackgroundColor = CSS.CSS_Color.MainBackgroundColor; btnCancel.Radius = (uint)Application.GetRealHeight(22); btnCancel.TextID = StringId.Cancel; btnCancel.BorderWidth = 1; btnCancel.BorderColor = CSS.CSS_Color.MainColor; frameWite.AddChidren(btnCancel); btnCancel.MouseUpEventHandler += (sender, e) => { frameBack.Close(); }; //éè¯ var btnRedo = new Button(); btnRedo.Y = btnText.Bottom + Application.GetRealHeight(48); btnRedo.Height = Application.GetRealHeight(44); btnRedo.Width = Application.GetRealWidth(108); btnRedo.TextSize = 16; btnRedo.IsBold = true; btnRedo.TextAlignment = TextAlignment.Center; btnRedo.TextColor = CSS.CSS_Color.MainBackgroundColor; btnRedo.BackgroundColor = CSS.CSS_Color.MainColor; btnRedo.Radius = (uint)Application.GetRealHeight(22); btnRedo.TextID = StringId.Retry; frameWite.AddChidren(btnRedo); btnRedo.X = frameWite.Width - btnRedo.Width - Application.GetRealWidth(30); btnRedo.MouseUpEventHandler += (sender, e) => { Scan.OpenScan((scanString) => { frameBack.Close(); //æ§è¡ç»å®ä½å® this.DoBindResidence(scanString); }); }; } } } HDL_ON/UI/BindingResidence/WellcomToHomeForm.cs
New file @@ -0,0 +1,73 @@ using System; using System.Collections.Generic; using System.Text; using HDL_ON.UI.CSS; using Shared; namespace HDL_ON.UI { /// <summary> /// 欢è¿åå®¶ççé¢ /// </summary> public class WellcomToHomeForm { /// <summary> /// æ¾ç¤ºæ¬¢è¿åå®¶çå¼¹çªçé¢ /// </summary> public void ShowForm() { //æ´ä¸ªçé¢çç°è²èæ¯ var frameBack = new Dialog(); frameBack.Show(); //ä¸é´ç½è²åºå var frameWite = new FrameLayout(); frameWite.Y = Application.GetRealHeight(223); frameWite.Height = Application.GetRealHeight(245); frameWite.Width = Application.GetRealWidth(288); frameWite.BackgroundColor = CSS.CSS_Color.MainBackgroundColor; frameWite.Radius = (uint)Application.GetRealWidth(12); frameWite.Gravity = Gravity.CenterHorizontal; frameBack.AddChidren(frameWite); //Icon徿 var picIcon = new Button(); picIcon.Y = Application.GetRealHeight(152); picIcon.Height = Application.GetRealWidth(160); picIcon.Width = Application.GetRealWidth(160); picIcon.Gravity = Gravity.CenterHorizontal; picIcon.UnSelectedImagePath = "oRobot.png"; frameBack.AddChidren(picIcon); //欢è¿åå®¶ var btnText = new Button(); btnText.Y = Application.GetRealHeight(98); btnText.Height = Application.GetRealHeight(24); btnText.TextSize = 16; btnText.TextAlignment = TextAlignment.Center; btnText.TextColor = CSS.CSS_Color.MainColor; btnText.TextID = StringId.WellComBackHome; frameWite.AddChidren(btnText); //确认 var btnOk = new Button(); btnOk.Y = btnText.Bottom + Application.GetRealHeight(48); btnOk.Height = Application.GetRealHeight(44); btnOk.Width = Application.GetRealWidth(220); btnOk.TextSize = 16; btnOk.IsBold = true; btnOk.TextAlignment = TextAlignment.Center; btnOk.TextColor = CSS.CSS_Color.MainBackgroundColor; btnOk.BackgroundColor = CSS.CSS_Color.MainColor; btnOk.Gravity = Gravity.CenterHorizontal; btnOk.Radius = (uint)Application.GetRealHeight(22); btnOk.TextID = StringId.Confirm; frameWite.AddChidren(btnOk); btnOk.MouseUpEventHandler += (sender, e) => { frameBack.Close(); }; } } } HDL_ON/UI/MainPage.cs
@@ -147,42 +147,30 @@ /// è¿å ¥ä¸»é¡µ /// </summary> /// <param name="isFirstOpen">妿æ¯ç¬¬ä¸æ¬¡å¯å¨ æ£æµæ ¡éªå¯ç </param> public static void GoUserPage(bool isFirstOpen = false) /// <param name="pageShowEvent">主页æ¾ç¤ºä¹å触åçäºä»¶(没æä½å® çè¯,åä¸ä¼è§¦å)</param> public static void GoUserPage(bool isFirstOpen = false, Action pageShowEvent = null) { //å è½½Loadingææ var waitPage = new Loading(); BaseView.AddChidren(waitPage); waitPage.Start(Language.StringByID(StringId.PleaseWait)); //彿²¡æä½å® æ¶,ä¸è½è®©å®å¾ä¸èµ° if (UserInfo.Current.regionList.Count == 0) { waitPage.Hide(); var addResidencePage = new BindingResidencePage(); BaseView.AddChidren(addResidencePage); addResidencePage.LoadView(); return; } new System.Threading.Thread(() => { try { if (UserInfo.Current.regionList.Count == 0) { bool loadPage = true; var pm = new DAL.Server.HttpServerRequest(); while (UserInfo.Current.regionList.Count == 0) { pm.GetHomePager();//å·æ°ä½å® ä¿¡æ¯ System.Threading.Thread.Sleep(2000); if (loadPage) { loadPage = false; Application.RunOnMainThread(() => { waitPage.Hide(); var addResidencePage = new BindingResidencePage(); BaseView.AddChidren(addResidencePage); addResidencePage.LoadView(); }); } } } else { Entity.FunctionList.List.Clear(); Entity.SpatialInfo.CurrentSpatial.Clear(); } Entity.FunctionList.List.Clear(); Entity.SpatialInfo.CurrentSpatial.Clear(); ///çå¾ è·åä½å® ä¿¡æ¯ Application.RunOnMainThread(() => { @@ -224,6 +212,9 @@ //å¯å¨å¯ç éªè¯ new AppUnlockPage().LoadPage(isFirstOpen); } //主页å è½½å®æ,åè°äºä»¶ pageShowEvent?.Invoke(); pageShowEvent = null; }); } catch (Exception ex) HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -376,7 +376,6 @@ // æ¥è¯¢æªè¯»æ¶æ¯å¹¶æ¾ç¤º GetUnreadPushMessages(); RegisterGetPushMessageAction(); } catch (Exception ex) { HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -404,7 +404,7 @@ { try { return Utlis.ToFriendlyDisplay(time); return Utlis.UnixToDateTimeWithFormatMS(time, "HH:mm"); } catch (Exception ex) { @@ -417,14 +417,13 @@ /// </summary> void RegisterGetPushMessageAction() { Action RegisterGetPushMessageAction = () => { if (bodyView != null) { //Utlis.WriteLine("GetPushMessageAction Hæ¶å°æ¨é"); GetUnreadPushMessages(); } }; HDLCommon.GetPushMessageAction = RegisterGetPushMessageAction; //HDLCommon.GetPushMessageAction = () => { // if (bodyView != null) // { // Utlis.WriteLine("GetPushMessageAction Hæ¶å°æ¨é"); // GetUnreadPushMessages(); // } //}; } /// <summary> @@ -432,7 +431,7 @@ /// </summary> void UnregisterGetPushMessageAction() { HDLCommon.GetPushMessageAction = null; //HDLCommon.GetPushMessageAction = null; } #endregion HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -44,16 +44,11 @@ /// </summary> List<PushMessageInfo> PushMessageInfoList = new List<PushMessageInfo>(); /// <summary> /// 页é¢å ³éæ¶é´ /// </summary> Action backAction; public override void RemoveFromParent() { UnregisterGetPushMessageAction(); base.RemoveFromParent(); backAction?.Invoke(); } /// <summary> @@ -71,8 +66,7 @@ /// <param name="backAction"></param> public void LoadPage(Action backAction) { this.backAction = backAction; new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView(); new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView(backAction); AddTopMenuView(); AddMessageView(); @@ -648,14 +642,14 @@ /// </summary> void RegisterGetPushMessageAction() { HDLCommon.GetPushMessageAction = () => { if (bodyView != null) { //Utlis.WriteLine("GetPushMessageAction Mæ¶å°æ¨é"); GetPushMessageList(showMesType); } }; //HDLCommon.GetPushMessageAction = () => //{ // if (bodyView != null) // { // Utlis.WriteLine("GetPushMessageAction Mæ¶å°æ¨é"); // GetPushMessageList(showMesType); // } //}; } /// <summary> @@ -663,7 +657,7 @@ /// </summary> void UnregisterGetPushMessageAction() { HDLCommon.GetPushMessageAction = null; //HDLCommon.GetPushMessageAction = null; } #if DEBUG HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs
@@ -35,6 +35,7 @@ ReloadRoomName(); }; Action delAction = () => { this.RemoveFromParent(); deleteAction?.Invoke(); HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs
@@ -126,8 +126,8 @@ sceneView.btnLine.X = Application.GetRealWidth(20); sceneView.btnLine.Width = Application.GetRealWidth(303); sceneView.btnNextIcon.X = Application.GetRealWidth(303); sceneView.btnNextIcon.Width = Application.GetRealWidth(28); sceneView.btnNextIcon.Height = Application.GetRealWidth(28); sceneView.btnNextIcon.Width = Application.GetMinRealAverage(28); sceneView.btnNextIcon.Height = Application.GetMinRealAverage(28); sceneView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png"; sceneView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png"; verticalRefresh.AddChidren(sceneView.FLayoutView()); HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs
@@ -82,7 +82,6 @@ Height = Application.GetRealHeight(44 * 5), }; var roomList = LogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas)); if (roomList.Count > 5) { bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5); HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -135,6 +135,7 @@ /// <returns></returns> public static List<HDL_ON.Entity.Room> GetGatewayRoomList(string name) { List<Entity.Room> roomList = new List<Entity.Room>(); Entity.Room room1 = new Entity.Room(); room1.roomName = name;//é»è®¤ä¸ä¸ªæ¿é´å为:å ¨é¨åºå @@ -143,14 +144,9 @@ var roomLists = GetGatewayRoomList(); foreach (var room in roomLists) { var devlist = GetRoomDevice(room); if (devlist.Count == 0) { //è¿æ»¤ææ²¡æè®¾å¤çæ¿é´; continue; } roomList.Add(room); } return roomList; } /// <summary> HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -52,7 +52,6 @@ addLogic.Show(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; //å¼å ³å¾æ çç¹å»äºä»¶ logicView.btnSwitchIcon.MouseUpEventHandler += (sender1, e1) => { logicView.btnSwitchIcon.IsSelected = !logicView.btnSwitchIcon.IsSelected; @@ -60,25 +59,16 @@ { logicView.btnSwitchIcon.IsSelected = true; currLogic.enable = "true"; } else { logicView.btnSwitchIcon.IsSelected = false; currLogic.enable = "false"; } //Send.switchLogic(currLogic); new System.Threading.Thread(() => { try { //é»è¾ä½¿è½çå½ä»¤ Send.switchLogic(currLogic); Send.switchLogic(currLogic); } catch { } }) { IsBackground = true }.Start(); }; GetSelectIcon(logicView.frameLayout, currLogic); //if (i==0)éåºæå @@ -210,6 +200,7 @@ return weekTextName.TrimEnd(','); } /// <summary> /// è·åæ¯æçå符串 /// </summary> HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs
@@ -9,6 +9,17 @@ { public class Send { ///// <summary> ///// ä½å® ID ///// </summary> //public static string homeId = Entity.DB_ResidenceData.residenceData.CurReginID; ///// <summary> ///// ç½å ³IDï¼ç§æ¡¡æç½å ³IDå´è¿åæ¯MACï¼ ///// </summary> //public static string gatewayId = DriverLayer.Control.Ins.GatewayId; //public static string homeId = UserInfo.Current.CurReginID; /// <summary> /// ç½å ³ID(è·ååä¹ç½å ³ID) /// </summary> @@ -23,17 +34,12 @@ return Entity.DB_ResidenceData.Instance.HomeGateway.gatewayId; } } /// <summary> /// ä½å® ID /// </summary> public static string homeId { get { return Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID; } } public static string homeId = Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID; /// <summary> /// è·åé»è¾IDå表 @@ -290,6 +296,9 @@ /// <returns></returns> public static ResponsePackNew RequestServerhomeId(object o, string api_Url, int mTimeout = 3) { var requestJson = HttpUtil.GetSignRequestJson(o); return HttpUtil.RequestHttpsPostFroHome(api_Url, requestJson, mTimeout); HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs
@@ -230,11 +230,11 @@ Button btnStartTimeText = new Button { TextSize = LogicView.TextSize.text12, Width = Application.GetRealWidth(32 + 3+20), Width = Application.GetRealWidth(32 + 3), Height = Application.GetRealHeight(17), TextColor = CSS.CSS_Color.textCancelColor, Y = Application.GetRealHeight(17), X = Application.GetRealWidth(260-20), X = Application.GetRealWidth(260), Tag = "0", }; startTimeView.frameLayout.AddChidren(btnStartTimeText); @@ -253,11 +253,11 @@ Button btnEndTimeText = new Button { TextSize = LogicView.TextSize.text12, Width = Application.GetRealWidth(32 + 3+20), Width = Application.GetRealWidth(32 + 3), Height = Application.GetRealHeight(17), TextColor = CSS.CSS_Color.textCancelColor, Y = Application.GetRealHeight(17), X = Application.GetRealWidth(260-20), X = Application.GetRealWidth(260), Tag = "0", }; endTimeView.frameLayout.AddChidren(btnEndTimeText); HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -86,6 +86,7 @@ }; topView.AddChidren(btnSceneTilte); btnAutomationTitle = new Button(); } else { HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs
@@ -27,58 +27,67 @@ TipDivMsg(Language.StringByID(StringId.PlsEntryAccount)); return; } BindMember(memberAccount); var result = new HttpServerRequest().BindResidenceMemberAccount(memberAccount, memberAccount); if(result.Code == StateCode.SUCCESS) { backAction?.Invoke(); this.RemoveFromParent(); var page = new OperationResultDisPalyPage(); page.Show(); page.LoadPage(true, Language.StringByID(StringId.AddMember), Language.StringByID(StringId.WelcomeNewMmember), ""); } else { IMessageCommon.Current.ShowErrorInfoAlter(result.Code); } //switch (result.Code) //{ // //(1)Success åè°ç¨æ¤æ¥å£æå // case "Success": // backAction?.Invoke(); // this.RemoveFromParent(); // var page = new OperationResultDisPalyPage(); // page.Show(); // page.LoadPage(true, Language.StringByID(StringId.AddMember), Language.StringByID(StringId.WelcomeNewMmember), ""); // break; // //(2)ParameterOrEmpty æä¾çåæ°é误ï¼è¯¦æ è§ErrorInfoåæ®µ // case "ParameterOrEmpty": // //(3)NoLogin,åååºå段ä¸[ErrorInfo]为é误信æ¯ä¸º[æ æç»å½Token!] // case "NoLogin": // TipDivMsg(Language.StringByID(StringId.DataExceptionPleaseTryAgain)); // break; // //(4)AccountNoExists åè´¦å·æªæ³¨åï¼è¯·ç»å®å·²æ³¨åçåè´¦å·! // case "AccountNoExists": // TipDivMsg(Language.StringByID(StringId.FailedToAddTheMemberAccountIsNotRegistered)); // break; // //(5)SameAccount,ä¸è½æ·»å èªå·±ä¸ºåè´¦å·! // case "SameAccount": // TipDivMsg(Language.StringByID(StringId.FailedToAddUnableToAddYourself)); // break; // //(6)NoExist ç¨æ·ä¸å卿¤ä½å® // case "NoExist": // TipDivMsg(Language.StringByID(StringId.ThisHomeDoesNotExistForTheUser)); // break; // //(7)Exist è´¦å·å·²å卿¤ä½å® // case "Exist": // TipDivMsg(Language.StringByID(StringId.MemberAccountHasBeenAddedAndCannotBeAddedAgain)); // break; // //(8)Fail æä½å¤±è´¥ // case "Fail": // TipDivMsg(Language.StringByID(StringId.OperationFailed)); // break; // //(9)BeRestrict æéä¸è¶³ // case "BeRestrict": // TipDivMsg(Language.StringByID(StringId.AddFailedInsufficientPermissions)); // break; // //(10)NoAddMainAccount ä¸è½ç»å®ä¸»è´¦å· // case "NoAddMainAccount": // break; //} }; } /// <summary> /// ç»å®è´¦å· /// </summary> /// <param name="memberAccount"></param> void BindMember(string memberAccount) { var waitPage = new Loading(); bodyView.AddChidren(waitPage); waitPage.Start(Language.StringByID(StringId.PleaseWait)); new System.Threading.Thread(() => { try { var result = new HttpServerRequest().BindResidenceMemberAccount(memberAccount, memberAccount); if (result.Code == StateCode.SUCCESS) { Application.RunOnMainThread(() => { backAction?.Invoke(); this.RemoveFromParent(); var page = new OperationResultDisPalyPage(); page.Show(); page.LoadPage(true, Language.StringByID(StringId.AddMember), Language.StringByID(StringId.WelcomeNewMmember), ""); }); } else { IMessageCommon.Current.ShowErrorInfoAlter(result.Code); } } catch { } finally { Application.RunOnMainThread(() => { if (waitPage != null) { waitPage.RemoveFromParent(); waitPage = null; } }); } }) { IsBackground = true }.Start(); } void OpenScen(Action<string> action) HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
@@ -1,4 +1,5 @@ using System; using System.Collections.Generic; using HDL_ON.UI.CSS; using Shared; @@ -112,6 +113,53 @@ // Radius = (uint)Application.GetMinRealAverage(30), //}; //backView.AddChidren(headImage2); //å¼å¯æ£æµä½å® æ¯å¦å·²ç»æ·»å äºççº¿ç¨ this.StartCheckResidenceThread(); } /// <summary> /// å¼å¯æ£æµä½å® æ¯å¦å·²ç»æ·»å äºççº¿ç¨ /// </summary> private void StartCheckResidenceThread() { //è·åä½å® å表çåæ° var requestJson = DAL.Server.HttpUtil.GetSignRequestJson(new DAL.Server.GetHomeListObj() { homeType = HomeTypeEnum.ALL.ToString() }); new System.Threading.Thread(() => { while (this.Parent != null) { System.Threading.Thread.Sleep(4000); //访é®äºç«¯è·åå表 var resultObj = DAL.Server.HttpUtil.RequestHttpsPost(DAL.Server.NewAPI.API_POST_Gethomepager, requestJson); if (resultObj.Code == DAL.Server.StateCode.SUCCESS) { var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString()); if (homeList == null || homeList.Count == 0) { //å¦æè¿æ²¡æä½å® çè¯,ç»§ç»ä¸ä¸æ¬¡æ£æµ continue; } //è°ç¨Onåæ¥çæ¹æ³,å·æ°ä½å® å表åå ¶ç¼å var pm = new DAL.Server.HttpServerRequest(); pm.GetHomePager(); Application.RunOnMainThread(() => { //跳转页é¢---- MainPage.GoUserPage(false, () => { //æ¾ç¤ºæ¬¢è¿åå®¶çå¼¹çªçé¢ var form = new WellcomToHomeForm(); form.ShowForm(); }); }); break; } } }) { IsBackground = true }.Start(); } } } HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/AddRoom/AddRoomPage.cs
@@ -445,52 +445,29 @@ return; } } var waitPage = new Loading(); waitPage.Start(); new Thread(() => var addResult = SpatialInfo.CurrentSpatial.AddRoom(room,out room);//æ£æ¥roomæ¯å¦ä¸ºäºç«¯è¿åçææ°æ°æ® if (addResult == StateCode.SUCCESS) { try var deviceIds = new List<string>(); foreach (var f in roomFunctions) { var addResult = SpatialInfo.CurrentSpatial.AddRoom(room, out room);//æ£æ¥roomæ¯å¦ä¸ºäºç«¯è¿åçææ°æ°æ® if (addResult == StateCode.SUCCESS) deviceIds.Add(f.deviceId); } if (deviceIds.Count > 0) { var bindResult = FunctionList.List.FunctionsBindRooms(new List<string>() { room.roomId }, deviceIds); if (bindResult == StateCode.SUCCESS) { var deviceIds = new List<string>(); foreach (var f in roomFunctions) { deviceIds.Add(f.deviceId); f.roomIds.Add(room.roomId); } if (deviceIds.Count > 0) { var bindResult = FunctionList.List.FunctionsBindRooms(new List<string>() { room.roomId }, deviceIds); if (bindResult == StateCode.SUCCESS) { foreach (var f in roomFunctions) { f.roomIds.Add(room.roomId); } room.GetRoomFunctions(true); } } Application.RunOnMainThread(() => { backAction(room); RemoveFromParent(); }); room.GetRoomFunctions(true); } } catch (Exception ex) { MainPage.Log($"æ·»å æ¿é´å¤±è´¥msg:{ex.Message}"); } finally { Application.RunOnMainThread(() => { waitPage.Hide(); }); } }) { IsBackground = true }.Start(); backAction(room); RemoveFromParent(); } }; } HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs
@@ -31,48 +31,24 @@ { Action action = () => { var waitPage = new Loading(); waitPage.Start(); new Thread(() => var delResult = SpatialInfo.CurrentSpatial.DelRoom(room); if (delResult == StateCode.SUCCESS) { try foreach (var f in FunctionList.List.GetDeviceFunctionList()) { var delResult = SpatialInfo.CurrentSpatial.DelRoom(room); if (delResult == StateCode.SUCCESS) if (f.roomIds.Contains(room.roomId)) { foreach (var f in FunctionList.List.GetDeviceFunctionList()) { if (f.roomIds.Contains(room.roomId)) { f.roomIds.Remove(room.roomId); } } Application.RunOnMainThread(() => { //å é¤äºä»¶åè° this.deleteAction?.Invoke(); this.RemoveFromParent(); }); f.roomIds.Remove(room.roomId); } } catch (Exception ex) { MainPage.Log($"æ·»å æ¿é´å¤±è´¥msg:{ex.Message}"); } finally { Application.RunOnMainThread(() => { waitPage.Hide(); }); } }) { IsBackground = true }.Start(); //å é¤äºä»¶åè° this.deleteAction?.Invoke(); this.RemoveFromParent(); } }; new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.DeleteRoomTip, action); }; } /// <summary> /// æ¾ç¤ºèæ¯å¾éæ©é项 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -395,67 +395,27 @@ //è¾å ¥ç»å½å¯ç éªè¯ Action<string> action = (pw) => { AuthenticationByLoginPassword(pw, optionType); //var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw); //if (resultObj.Code == StateCode.SUCCESS) //{ // PasswordInputPassed(optionType); //} //else //{ // Application.RunOnMainThread(() => // { // Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError)); // }); //} var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw); if (resultObj.Code == StateCode.SUCCESS) { //UserInfo.Current.appUnlockPasswrod = ""; //UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>(); //UserInfo.Current.SaveUserInfo(); //this.RemoveFromParent(); //backAction(); PasswordInputPassed(optionType); } else { Application.RunOnMainThread(() => { Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError)); }); } }; new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true); }; } /// <summary> /// ç»å½å¯ç éªè¯ /// </summary> /// <param name="pw"></param> /// <param name="optionType"></param> void AuthenticationByLoginPassword(string pw, string optionType) { var waitPage = new Loading(); bodyView.AddChidren(waitPage); waitPage.Start(Language.StringByID(StringId.PleaseWait)); new System.Threading.Thread(() => { try { var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw); Application.RunOnMainThread(() => { if (resultObj.Code == StateCode.SUCCESS) { PasswordInputPassed(optionType); } else { Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError)); } }); } catch { } finally { Application.RunOnMainThread(() => { if (waitPage != null) { waitPage.RemoveFromParent(); waitPage = null; } }); } }) { IsBackground = true }.Start(); } } } HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -435,68 +435,30 @@ //è¾å ¥ç»å½å¯ç éªè¯ Action<string> action = (pw) => { AuthenticationByLoginPassword(pw, optionType); //var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw); //if (resultObj.Code == StateCode.SUCCESS) //{ // PasswordInputPassed(optionType); //} //else //{ // Application.RunOnMainThread(() => // { // Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError)); // }); var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw); if (resultObj.Code.ToUpper() == StateCode.SUCCESS) { //UserInfo.Current.appUnlockPasswrod = ""; //UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>(); //UserInfo.Current.SaveUserInfo(); //this.RemoveFromParent(); //backAction(); //} PasswordInputPassed(optionType); } else { Application.RunOnMainThread(() => { Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError)); }); } }; new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true); }; } /// <summary> /// ç»å½å¯ç éªè¯ /// </summary> /// <param name="pw"></param> /// <param name="optionType"></param> void AuthenticationByLoginPassword(string pw, string optionType) { var waitPage = new Loading(); bodyView.AddChidren(waitPage); waitPage.Start(Language.StringByID(StringId.PleaseWait)); new System.Threading.Thread(() => { try { var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw); Application.RunOnMainThread(() => { if (resultObj.Code == StateCode.SUCCESS) { PasswordInputPassed(optionType); } else { Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError)); } }); } catch { } finally { Application.RunOnMainThread(() => { if (waitPage != null) { waitPage.RemoveFromParent(); waitPage = null; } }); } }) { IsBackground = true }.Start(); } } } HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
@@ -46,34 +46,33 @@ /// </summary> Button btnStartupBg; #region F3é¶æ®µ ///// <summary> ///// 设置å®é²é项æç¤º ///// </summary> //Button btnSecuritySelectionTip; ///// <summary> ///// 设置å®é²é项éä¸å¾æ ///// </summary> //Button btnSecuritySelectionIcon; ///// <summary> ///// 设置å®é²éé¡¹èæ¯ ///// </summary> //Button btnSecurityBg; /// <summary> /// 设置å®é²é项æç¤º /// </summary> Button btnSecuritySelectionTip; /// <summary> /// 设置å®é²é项éä¸å¾æ /// </summary> Button btnSecuritySelectionIcon; /// <summary> /// 设置å®é²éé¡¹èæ¯ /// </summary> Button btnSecurityBg; ///// <summary> ///// 设置é¨éé项æç¤º ///// </summary> //Button btnDoorlockSelectionTip; ///// <summary> ///// 设置é¨éé项éä¸å¾æ ///// </summary> //Button btnDoorlockSelectionIcon; ///// <summary> ///// 设置é¨ééé¡¹èæ¯ ///// </summary> //Button btnDoorlockBg; #endregion /// <summary> /// 设置é¨éé项æç¤º /// </summary> Button btnDoorlockSelectionTip; /// <summary> /// 设置é¨éé项éä¸å¾æ /// </summary> Button btnDoorlockSelectionIcon; /// <summary> /// 设置é¨ééé¡¹èæ¯ /// </summary> Button btnDoorlockBg; /// <summary> /// å¯ç 使ç¨éæ©ç详ç»å 容æç¤º @@ -313,93 +312,92 @@ startupDiv.AddChidren(btnStartupSelectionTip); #endregion #region F3é¶æ®µ #region Security //optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) }); optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) }); //FrameLayout securityDiv = new FrameLayout() //{ // Width = Application.GetRealWidth(94), //}; //optionView.AddChidren(securityDiv); FrameLayout securityDiv = new FrameLayout() { Width = Application.GetRealWidth(94), }; optionView.AddChidren(securityDiv); //btnSecurityBg = new Button() //{ // Height = Application.GetRealWidth(174), // UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/3.png", // SelectedImagePath = "PersonalCenter/AppUnlockSetting/3On.png" //}; //securityDiv.AddChidren(btnSecurityBg); btnSecurityBg = new Button() { Height = Application.GetRealWidth(174), UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/3.png", SelectedImagePath = "PersonalCenter/AppUnlockSetting/3On.png" }; securityDiv.AddChidren(btnSecurityBg); //btnSecuritySelectionIcon = new Button() //{ // X = Application.GetRealWidth(5), // Y = Application.GetRealWidth(174), // Width = Application.GetRealWidth(30), // Height = Application.GetRealWidth(30), // UnSelectedImagePath = "Public/ChooseIcon.png", // SelectedImagePath = "Public/ChooseOnIcon.png", //}; //securityDiv.AddChidren(btnSecuritySelectionIcon); btnSecuritySelectionIcon = new Button() { X = Application.GetRealWidth(5), Y = Application.GetRealWidth(174), Width = Application.GetRealWidth(30), Height = Application.GetRealWidth(30), UnSelectedImagePath = "Public/ChooseIcon.png", SelectedImagePath = "Public/ChooseOnIcon.png", }; securityDiv.AddChidren(btnSecuritySelectionIcon); //btnSecuritySelectionTip = new Button() //{ // X = Application.GetRealWidth(30), // Y = Application.GetRealWidth(174), // Width = Application.GetRealWidth(74), // Height = Application.GetRealWidth(30), // TextID = StringId.DefenseAndUndefense, // TextAlignment = TextAlignment.CenterLeft, // TextColor = CSS_Color.FirstLevelTitleColor, // SelectedTextColor = CSS_Color.MainColor, // TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel //}; //securityDiv.AddChidren(btnSecuritySelectionTip); btnSecuritySelectionTip = new Button() { X = Application.GetRealWidth(30), Y = Application.GetRealWidth(174), Width = Application.GetRealWidth(74), Height = Application.GetRealWidth(30), TextID = StringId.DefenseAndUndefense, TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, SelectedTextColor = CSS_Color.MainColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel }; securityDiv.AddChidren(btnSecuritySelectionTip); #endregion #region Doorlock //optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) }); optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) }); //FrameLayout doorlockDiv = new FrameLayout() //{ // Width = Application.GetRealWidth(94), //}; //optionView.AddChidren(doorlockDiv); FrameLayout doorlockDiv = new FrameLayout() { Width = Application.GetRealWidth(94), }; optionView.AddChidren(doorlockDiv); //btnDoorlockBg = new Button() //{ // Height = Application.GetRealWidth(174), // UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/4.png", // SelectedImagePath = "PersonalCenter/AppUnlockSetting/4On.png" //}; //doorlockDiv.AddChidren(btnDoorlockBg); btnDoorlockBg = new Button() { Height = Application.GetRealWidth(174), UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/4.png", SelectedImagePath = "PersonalCenter/AppUnlockSetting/4On.png" }; doorlockDiv.AddChidren(btnDoorlockBg); //btnDoorlockSelectionIcon = new Button() //{ // X = Application.GetRealWidth(5), // Y = Application.GetRealWidth(174), // Width = Application.GetRealWidth(30), // Height = Application.GetRealWidth(30), // UnSelectedImagePath = "Public/ChooseIcon.png", // SelectedImagePath = "Public/ChooseOnIcon.png", //}; //doorlockDiv.AddChidren(btnDoorlockSelectionIcon); btnDoorlockSelectionIcon = new Button() { X = Application.GetRealWidth(5), Y = Application.GetRealWidth(174), Width = Application.GetRealWidth(30), Height = Application.GetRealWidth(30), UnSelectedImagePath = "Public/ChooseIcon.png", SelectedImagePath = "Public/ChooseOnIcon.png", }; doorlockDiv.AddChidren(btnDoorlockSelectionIcon); //btnDoorlockSelectionTip = new Button() //{ // X = Application.GetRealWidth(30), // Y = Application.GetRealWidth(174), // Width = Application.GetRealWidth(74), // Height = Application.GetRealWidth(30), // TextID = StringId.RemoteUnlocking, // TextAlignment = TextAlignment.CenterLeft, // TextColor = CSS_Color.FirstLevelTitleColor, // SelectedTextColor = CSS_Color.MainColor, // TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel //}; //doorlockDiv.AddChidren(btnDoorlockSelectionTip); #endregion btnDoorlockSelectionTip = new Button() { X = Application.GetRealWidth(30), Y = Application.GetRealWidth(174), Width = Application.GetRealWidth(74), Height = Application.GetRealWidth(30), TextID = StringId.RemoteUnlocking, TextAlignment = TextAlignment.CenterLeft, TextColor = CSS_Color.FirstLevelTitleColor, SelectedTextColor = CSS_Color.MainColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel }; doorlockDiv.AddChidren(btnDoorlockSelectionTip); #endregion optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) }); HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
@@ -32,10 +32,8 @@ { btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true; btnStartupBg.IsSelected = btnStartupSelectionIcon.IsSelected = btnStartupSelectionTip.IsSelected = false; #region F3é¶æ®µ //btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = false; //btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = false; #endregion btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = false; btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = false; btnTipMsg.TextID = StringId.UnprotectedTipMsg; @@ -133,93 +131,94 @@ btnStartupSelectionIcon.MouseUpEventHandler = eventHandler2; btnStartupSelectionTip.MouseUpEventHandler = eventHandler2; #region F3é¶æ®µ //EventHandler<MouseEventArgs> eventHandler3 = (sender, e) => //{ // bool result = !btnSecurityBg.IsSelected; // if (!result) // { // //妿åªå©å¸é²/æ¤é²ä¸ç§ ä¸è½åæ¶å¸é²/æ¤é² // if (!CheckIfCanDeselect("2")) return; // } // btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = result; // btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg); // if (result) // { // btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false; // if (!UserInfo.Current.appUnlockPage.Contains("2")) // { // UserInfo.Current.appUnlockPage.Add("2"); // if (UserInfo.Current.appUnlockPasswrod != "") // UserInfo.Current.SaveUserInfo(); // } // unlockOptionView.Visible = true; // } // else // { // if (UserInfo.Current.appUnlockPage.Contains("2")) // { // UserInfo.Current.appUnlockPage.Remove("2"); // } // if (UserInfo.Current.appUnlockPage.Count == 0) // { // btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = result; // btnTipMsg.TextID = StringId.UnprotectedTipMsg; // UserInfo.Current.appUnlockPasswrod = ""; // unlockOptionView.Visible = false; // refreshAction(); // } // UserInfo.Current.SaveUserInfo(); // } //}; //btnSecurityBg.MouseUpEventHandler = eventHandler3; //btnSecuritySelectionIcon.MouseUpEventHandler = eventHandler3; //btnSecuritySelectionTip.MouseUpEventHandler = eventHandler3; EventHandler<MouseEventArgs> eventHandler3 = (sender, e) => { bool result = !btnSecurityBg.IsSelected; if (!result) { //妿åªå©å¸é²/æ¤é²ä¸ç§ ä¸è½åæ¶å¸é²/æ¤é² if (!CheckIfCanDeselect("2")) return; } //EventHandler<MouseEventArgs> eventHandler4 = (sender, e) => //{ // bool result = !btnDoorlockBg.IsSelected; // if (!result) // { // //妿åªå©è¿ç¨å¼éä¸è½åæ¶è¿ç¨å¼é // if (!CheckIfCanDeselect("3")) return; // } btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = result; // btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = result; btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg); // btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg); // if (result) // { // btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false; // if (!UserInfo.Current.appUnlockPage.Contains("3")) // { // UserInfo.Current.appUnlockPage.Add("3"); // if (UserInfo.Current.appUnlockPasswrod != "") // UserInfo.Current.SaveUserInfo(); // } // unlockOptionView.Visible = true; // } // else // { // if (UserInfo.Current.appUnlockPage.Contains("3")) // { // UserInfo.Current.appUnlockPage.Remove("3"); // } // if (UserInfo.Current.appUnlockPage.Count == 0) // { // btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true; // btnTipMsg.TextID = StringId.UnprotectedTipMsg; // UserInfo.Current.appUnlockPasswrod = ""; // unlockOptionView.Visible = false; // refreshAction(); // } // UserInfo.Current.SaveUserInfo(); // } //}; //btnDoorlockBg.MouseUpEventHandler = eventHandler4; //btnDoorlockSelectionIcon.MouseUpEventHandler = eventHandler4; //btnDoorlockSelectionTip.MouseUpEventHandler = eventHandler4; #endregion if (result) { btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false; if (!UserInfo.Current.appUnlockPage.Contains("2")) { UserInfo.Current.appUnlockPage.Add("2"); if (UserInfo.Current.appUnlockPasswrod != "") UserInfo.Current.SaveUserInfo(); } unlockOptionView.Visible = true; } else { if (UserInfo.Current.appUnlockPage.Contains("2")) { UserInfo.Current.appUnlockPage.Remove("2"); } if (UserInfo.Current.appUnlockPage.Count == 0) { btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = result; btnTipMsg.TextID = StringId.UnprotectedTipMsg; UserInfo.Current.appUnlockPasswrod = ""; unlockOptionView.Visible = false; refreshAction(); } UserInfo.Current.SaveUserInfo(); } }; btnSecurityBg.MouseUpEventHandler = eventHandler3; btnSecuritySelectionIcon.MouseUpEventHandler = eventHandler3; btnSecuritySelectionTip.MouseUpEventHandler = eventHandler3; EventHandler<MouseEventArgs> eventHandler4 = (sender, e) => { bool result = !btnDoorlockBg.IsSelected; if (!result) { //妿åªå©è¿ç¨å¼éä¸è½åæ¶è¿ç¨å¼é if (!CheckIfCanDeselect("3")) return; } btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = result; btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg); if (result) { btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false; if (!UserInfo.Current.appUnlockPage.Contains("3")) { UserInfo.Current.appUnlockPage.Add("3"); if (UserInfo.Current.appUnlockPasswrod != "") UserInfo.Current.SaveUserInfo(); } unlockOptionView.Visible = true; } else { if (UserInfo.Current.appUnlockPage.Contains("3")) { UserInfo.Current.appUnlockPage.Remove("3"); } if (UserInfo.Current.appUnlockPage.Count == 0) { btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true; btnTipMsg.TextID = StringId.UnprotectedTipMsg; UserInfo.Current.appUnlockPasswrod = ""; unlockOptionView.Visible = false; refreshAction(); } UserInfo.Current.SaveUserInfo(); } }; btnDoorlockBg.MouseUpEventHandler = eventHandler4; btnDoorlockSelectionIcon.MouseUpEventHandler = eventHandler4; btnDoorlockSelectionTip.MouseUpEventHandler = eventHandler4; } /// <summary> @@ -238,18 +237,16 @@ btnStartupBg.IsSelected = btnStartupSelectionIcon.IsSelected = btnStartupSelectionTip.IsSelected = true; btnTipMsg.Text = Language.StringByID(StringId.AtStartupTipMsg); } #region F3é¶æ®µ //if (UserInfo.Current.appUnlockPage.Contains("2")) //{ // btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = true; // btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg); //} //if (UserInfo.Current.appUnlockPage.Contains("3")) //{ // btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = true; // btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg); //} #endregion if (UserInfo.Current.appUnlockPage.Contains("2")) { btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = true; btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg); } if (UserInfo.Current.appUnlockPage.Contains("3")) { btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = true; btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg); } } } HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -271,11 +271,7 @@ LoadEventList(); new TopViewDiv(bodyView,Language.StringByID(StringId.AC)).LoadTopView_FunctionTop(aC, actionRefresh); new System.Threading.Thread(() => { DriverLayer.Control.Ins.SendReadCommand(aC); }) { IsBackground = true }.Start(); DriverLayer.Control.Ins.SendReadCommand(aC); } /// <summary> /// å è½½ä¿®æ¹æ¨¡å¼åºå HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs
@@ -161,11 +161,6 @@ LoadEventList(); new TopViewDiv(bodyView,Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain, actionRefresh); new System.Threading.Thread(() => { DriverLayer.Control.Ins.SendReadCommand(curtain); }) { IsBackground = true }.Start(); } } HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs
@@ -223,11 +223,6 @@ LoadEventList(); new TopViewDiv(bodyView, Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain,actionRefresh); new System.Threading.Thread(() => { DriverLayer.Control.Ins.SendReadCommand(curtain); }) { IsBackground = true }.Start(); } } HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs
@@ -224,11 +224,7 @@ LoadEventList(); new TopViewDiv(bodyView, Language.StringByID(StringId.Curtain)).LoadTopView_FunctionTop(curtain, actionRefresh); new System.Threading.Thread(() => { DriverLayer.Control.Ins.SendReadCommand(curtain); }) { IsBackground = true }.Start(); } } } HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs
@@ -174,11 +174,7 @@ LoadEventList(); new TopViewDiv(bodyView, Language.StringByID(StringId.Fan)).LoadTopView_FunctionTop(fan, actionRefresh); new System.Threading.Thread(() => { DriverLayer.Control.Ins.SendReadCommand(fan); }) { IsBackground = true }.Start(); } } HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs
@@ -336,7 +336,6 @@ LoadEventList(); new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(tv, actionRefresh); DriverLayer.Control.Ins.SendReadCommand(tv); } HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -248,11 +248,8 @@ LoadEventList(); new TopViewDiv(bodyView, Language.StringByID(StringId.FloorHeating)).LoadTopView_FunctionTop(fh, actionRefresh); new System.Threading.Thread(() => { DriverLayer.Control.Ins.SendReadCommand(fh); }) { IsBackground = true }.Start(); DriverLayer.Control.Ins.SendReadCommand(fh); } /// <summary> /// å è½½ä¿®æ¹æ¨¡å¼åºå HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs
@@ -246,11 +246,7 @@ LoadEventList(); new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh); new System.Threading.Thread(() => { DriverLayer.Control.Ins.SendReadCommand(light); }) { IsBackground = true }.Start(); } HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs
@@ -173,7 +173,7 @@ { X = Application.GetRealWidth(35), Y = btnBrightnessText.Bottom, Width = Application.GetRealWidth(30), Width = Application.GetRealWidth(22), Height = Application.GetRealHeight(21), Text = "0%", TextAlignment = TextAlignment.CenterLeft, @@ -184,7 +184,7 @@ dimmerBar = new DiyImageSeekBar() { X = Application.GetRealWidth(35 +22), X = btnMinValuesText.Right, Y = Application.GetRealHeight(312), Width = Application.GetRealWidth(210), Height = Application.GetRealHeight(54), @@ -204,7 +204,7 @@ { X = dimmerBar.Right, Y = btnBrightnessText.Bottom, Width = Application.GetRealWidth(45), Width = Application.GetRealWidth(35), Height = Application.GetRealHeight(21), Text = "100%", TextAlignment = TextAlignment.CenterLeft, @@ -300,11 +300,6 @@ LoadEventList(); new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh); new System.Threading.Thread(() => { DriverLayer.Control.Ins.SendReadCommand(light); }) { IsBackground = true }.Start(); } } } HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs
@@ -156,11 +156,7 @@ LoadEventList(); new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh); new System.Threading.Thread(() => { DriverLayer.Control.Ins.SendReadCommand(light); }) { IsBackground = true }.Start(); } } } HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs
@@ -102,26 +102,24 @@ { X = Application.GetRealWidth(22), Y = Application.GetRealHeight(261), Width = Application.GetRealWidth(37 + 5+20), Width = Application.GetRealWidth(37 + 5), Height = Application.GetRealHeight(20), TextColor = MusicColor.TextTimeColor, TextSize = TextSize.Text14, TextAlignment = TextAlignment.CenterLeft, }; /// <summary> ///é³ä¹ç»ææ¶é´ /// </summary> public Button endTimeBtn = new Button { X = Application.GetRealWidth(269-20), X = Application.GetRealWidth(269), Y = Application.GetRealHeight(261), Width = Application.GetRealWidth(37 + 5+20), Width = Application.GetRealWidth(37 + 5), Height = Application.GetRealHeight(20), TextColor = MusicColor.TextTimeColor, TextSize = TextSize.Text14, TextAlignment = TextAlignment.CenterRight, }; /// <summary> /// æååç§°ï¼TextViewè¶ åºé¿åº¦èªå·±æ»å¨ï¼ @@ -220,7 +218,7 @@ { X = Application.GetRealWidth(279 - 4), Y = Application.GetRealHeight(418), Width = Application.GetRealWidth(26 + 4+10), Width = Application.GetRealWidth(26 + 4), Height = Application.GetRealHeight(17), Text = "0%", TextColor = MusicColor.MusicNoTxetColor, README.md
File was deleted asset/logo/1024¡¤1024@2x.pngasset/logo/120¡¤120@2x.pngasset/logo/120¡¤120@3x.pngasset/logo/180¡¤180@3x.pngasset/logo/20¡¤20.pngasset/logo/29¡¤29.pngasset/logo/40¡¤40@2x.pngasset/logo/512¡¤512.pngasset/logo/58¡¤58@2x.pngasset/logo/60¡¤60@3x.pngasset/logo/80¡¤80@2x.pngasset/logo/87¡¤87@3x.png