From 7ca4d7e50871c558e5927b6b0eeecb2071fdf14c Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:07:47 +0800
Subject: [PATCH] Revert "20201127 合并嘉乐代码"
---
HDL-ON_Android/Assets/Language.ini | 64 -
HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs | 4
HDL-ON_iOS/HDL-ON_iOS.csproj | 16
HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs | 4
HDL_ON/HDL_ON.projitems | 27
HDL_ON/UI/UI0-Public/Widget/TextButton.cs | 93 -
HDL_ON/DAL/Server/IMessageCommon.cs | 93 -
HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs | 4
HDL-ON_Android/HDL-ON_Android.csproj | 20
HDL_ON/DAL/Server/NewApiRes.cs | 123 -
HDL_ON/Common/HDLCommon.cs | 242 +++
HDL_ON/UI/UI0-Public/WebViewDialog.cs | 15
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 73 -
HDL_ON/UI/UI1-Login/LoginPage.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs | 30
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 26
HDL_ON/Common/Constant.cs | 80 -
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 5
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs | 21
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 32
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 228 ++-
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/AboutOnPage.cs | 56 +
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs | 142 --
HDL_ON/DAL/Server/HttpServerRequest的副本.cs | 168 +++
HDL_ON/DAL/Server/HttpUtil.cs | 128 ++
HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs | 12
.vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhoneSimulator.json | 1
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs | 2
HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs | 22
HDL_ON/UI/UI0-Public/ConfirmDialog.cs | 61
.vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhone.json | 1
HDL-ON_iOS/AppDelegate.cs | 24
HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs | 4
HDL_ON/Entity/UserInfo.cs | 2
HDL-ON_iOS/Resources/Language.ini | 26
HDL_ON/Common/Utlis.cs | 100 -
HDL_ON/UI/UI1-Login/RegisterPageBLL.cs | 94 -
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs | 18
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs | 2
HDL_ON/UI/MainPage.cs | 26
HDL-ON_Android/Application.cs | 1
HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs | 37
HDL_ON/UI/UI0-Public/LineView.cs | 20
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs | 7
HDL_ON/UI/UI1-Login/RegisterPage.cs | 130 -
HDL_ON/UI/UI1-Login/SelectServerDialog.cs | 60
/dev/null | 101 -
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs | 38
HDL_ON/DAL/Server/NewAPI.cs | 52
HDL_ON/Entity/OnAppConfig.cs | 8
HDL_ON/UI/UI2/4-PersonalCenter/GetSupportPage.cs | 13
HDL_ON/Common/R.cs | 82 -
HDL_ON/DAL/Server/HttpServerRequest.cs | 516 +-------
HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs | 17
61 files changed, 1,190 insertions(+), 2,015 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhone.json b/.vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhone.json
new file mode 100644
index 0000000..dc3208f
--- /dev/null
+++ b/.vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhone.json
@@ -0,0 +1 @@
+{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter.analytics/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.Analytics.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter.analytics/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.Analytics.iOS.Bindings.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter.crashes/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.Crashes.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter.crashes/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.Crashes.iOS.Bindings.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.iOS.Bindings.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/Desktop/HDL_APP_Project/DLL/IOS/MJRefresh_Xamarin.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/mqttnet/3.0.13/lib/netstandard2.1/MQTTnet.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/mscorlib.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/newtonsoft.json/12.0.2/lib/netstandard2.0/Newtonsoft.Json.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/OpenTK-1.0.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/restsharp/106.11.7/lib/netstandard2.0/RestSharp.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/Desktop/HDL_APP_Project/DLL/Shared.IOS.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/Desktop/HDL_APP_Project/DLL/IOS/Shared.IOS.JLCountryCode.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/Desktop/HDL_APP_Project/DLL/Shared.IOS.TBL.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.Core.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Drawing.Common.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.Numerics.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.Numerics.Vectors.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.Web.Services.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.Xml.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/xamarin.essentials/1.1.0/lib/xamarinios10/Xamarin.Essentials.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Xamarin.iOS.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/zxing.net.mobile/2.4.1/lib/Xamarin.iOS10/ZXing.Net.Mobile.Core.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/zxing.net.mobile/2.4.1/lib/Xamarin.iOS10/zxing.portable.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/zxing.net.mobile/2.4.1/lib/Xamarin.iOS10/ZXingNetMobile.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.Contracts.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.FileVersionInfo.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Security.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XPath.XDocument.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.WebSockets.Client.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Dynamic.Runtime.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Serialization.Xml.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Principal.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.ThreadPool.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Cng.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ComponentModel.EventBasedAsync.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Encryption.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.CompilerServices.VisualC.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.DeriveBytes.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/netstandard.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.UnmanagedMemoryStream.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceModel.Http.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.FileSystem.AccessControl.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XPath.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XmlDocument.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.Xsl.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Resources.Writer.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Console.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Cache.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Sockets.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Text.Encoding.Extensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.NetworkInformation.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Utilities.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Principal.Windows.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Claims.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceModel.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Hashing.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ComponentModel.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.FileSystem.DriveInfo.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.X509Certificates.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Numerics.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.FileSystem.Watcher.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.TraceSource.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.Emit.Lightweight.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Text.Encoding.CodePages.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Linq.Expressions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Timer.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.InteropServices.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.Pipes.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.HttpListener.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Text.RegularExpressions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Tasks.Parallel.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Collections.NonGeneric.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Collections.Concurrent.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Overlapped.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Pkcs.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Handles.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Data.SqlClient.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ObjectModel.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.WebHeaderCollection.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.InteropServices.RuntimeInformation.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ComponentModel.TypeConverter.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Mail.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Tasks.Extensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Linq.Parallel.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XDocument.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.SecureString.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/Microsoft.Win32.Registry.AccessControl.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.RSA.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ComponentModel.Annotations.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.FileSystem.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.Compression.ZipFile.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.InteropServices.WindowsRuntime.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Linq.Queryable.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Resources.ResourceManager.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Resources.Reader.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Collections.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.Emit.ILGeneration.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Data.Common.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.NameResolution.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ComponentModel.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceProcess.ServiceController.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Loader.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceModel.Security.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.AuthenticationManager.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.ReaderWriter.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Tasks.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.Tracing.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.AppContext.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Buffers.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Encryption.ECDsa.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Csp.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.TextWriterTraceListener.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Text.Encoding.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.MemoryMappedFiles.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.OpenSsl.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/Microsoft.Win32.Registry.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Globalization.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.RandomNumberGenerator.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Collections.Specialized.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.ProtectedData.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ValueTuple.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XPath.XmlDocument.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.ServicePoint.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XmlSerializer.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.Extensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Globalization.Extensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Extensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Resources.ReaderWriter.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Encoding.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.IsolatedStorage.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.AccessControl.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceModel.NetTcp.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.AccessControl.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.TypeExtensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Globalization.Calendars.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Requests.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.WebSockets.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.Emit.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.FileSystem.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Serialization.Json.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Algorithms.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Thread.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Linq.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.Process.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.Tools.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Hashing.Algorithms.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.Debug.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/Microsoft.Win32.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Serialization.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.TraceEvent.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Drawing.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Serialization.Formatters.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Ping.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceModel.Duplex.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.StackTrace.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.DispatchProxy.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Encryption.Aes.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Memory.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Primitives.dll","Aliases":[],"Framework":null}],"Files":["/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Main.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/AppDelegate.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ViewController.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ViewController.designer.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ViewControllerBase.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Reachability.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Scan.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ZXingOverlayView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/JLCountrycode.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/MainPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/FileUtils.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/R.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttInfoConfig.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/ResponseEntity/ResponsePack.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Enumerative/EmptyHttpReques.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequestBase.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Room.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Enumerative/Command.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Enumerative/MyEnum.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/DB_ResidenceData.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Function.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/OnAppConfig.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/UserInfo.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/BusData.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmebly.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/CSS/CSS.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/UserPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/UserPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ChooseFloorPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/1-HomePage/HomePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/LoginPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/LoginPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/ResetPassword_VerificationCode.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/BaseView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/RegisterPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/TopViewDiv.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/FunctionPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/RoomPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/AC.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Curtain.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/FloorHeating.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Light.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/ResponseEntity/CityInfo.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/AppUnlockPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Fan.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/SwitchSocket.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/TV.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Sensor.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/AProtocolEntity.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31USBMusicList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayStatus.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31LocalMusicList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveMusicList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/BindAccountPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordOptionPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/UpdataTcpResidenceDataDialog.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/GalleryPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AboutOnPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AutomationMenuPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/GetSupportPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Panel/PanelPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Device/DeviceModule.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Device/SBK_SceneListObj.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSettingPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/NewAPI.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpUtil.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/Utlis.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/IMessageCommon.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/NewApiRes.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/HDLCommon.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/LineView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/ConfirmDialog.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/WebViewDialog.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/Constant.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/Widget/TextButton.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/SelectServerDialog.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control_Udp.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/CRC.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Packet.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Target.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/UdpSocket.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1024x500.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2048X2732 .png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/4096X4096.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750X1134.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/1024.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/120.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/152.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/167.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/180.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/20.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/29.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/40.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/58.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/60.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/76.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/80.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/87.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/Contents.json","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40路40@2x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/60路60@3x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58路58@2x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/87路87@3x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80路80@2x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120路120@2x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120路120@3x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180路180@3x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/20路20.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40路40@2x-1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/29路29.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58路58@2x-1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024路1024@2x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1242*2688.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/828*1792.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2688*1242.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792*828.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1125*2436.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2436*1125.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1242*2208.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750*1334.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2208*1242.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640*960.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320*480.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640*960-1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640*1136.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640*1136-1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/LaunchScreen.storyboard","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Main.storyboard","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Info.plist","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Entitlements.plist","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/ShowPasswordIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/SearchIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/VerificationCodeIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/AccountIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/QQIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/PasswordIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/WechatIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/HidePasswordIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/EmailIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/3.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Language.ini","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/BackIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Logo.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Logo-bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/UserTypebg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AdminTypeIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/MemberTypeIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceManageIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceMemberIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceArmIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceDataBackupIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AuxiliaryFunctionIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AddFunctionIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/NightViewIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/SwitchIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/GeneralSettingsIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/SupportIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/HomeList3bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/PersonalData/QRcodeIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Classification/ToggleDisplayThumbnail.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Classification/ToggleDisplayLarge.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Classification/Room/Roombg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/MsgIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/MsgIconTip.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/Functionbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/FunctionOnbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/ChangeViewbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DeviceInfoIcon/HumidityIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DeviceInfoIcon/Pm25Icon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DeviceInfoIcon/TempIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DownIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/transparent.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/CollectionIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/CollectionWhiteIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Classification/Room/AllCloseIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/PowerClose.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/PowerOpen.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainStopIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainCloseIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainCloseOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainOpenIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainOpenOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainStopOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/FloorHeatingIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/FloorHeatingOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/LightIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/LightOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Switch.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/SwitchOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/FuncInfoSetIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/ColorWheel.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/ThumbImage.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Fragmentbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Restored_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Edit.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/RightIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/FloorHeatingThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/LightThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/ChooseIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/ChooseOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/PlusSignIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/MinusSignIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/CollectionGrayIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Switch.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/SwitchOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/LocationAddressIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AddIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/EditIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Right.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DownIcon_2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/ChooseRoomListbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Scene/MovieMark.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Scene/SceneIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/SceneCovered.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Scene/DelayIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Scene/s2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Scene/s1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainBgOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainBgIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/MusicFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/FreshAirFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/EnergyMonitoringFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/EnvironmentalFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/LightFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/VideoIntercomFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/PanelFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/FloorHeatingFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/ACFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/CurtainFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/ElectricFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/SensorFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/DoorLockFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DeviceInfoIcon/Restored_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainOpenBlueIcon_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainOpenWhiteIcon_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainCloseWhiteIcon_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainCloseBlueIcon_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/MsgIcon/TipIconBlack.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/MsgIcon/TipIconWhite.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/4.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/1On.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/3.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/4On.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/3On.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/2On.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/FingerprintIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/FaceIdIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/GestureIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/PasswordIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/TipIcon_Successfully.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/TipIcon_Failed.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/GestureGrayIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Switch_2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/SwitchOn_2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/FingerIconRed.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/NightIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/NightIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/OrdinaryIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/OrdinaryIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/AwayIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/AwayIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanIconBgGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanIconBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Socket/SocketThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Socket/SocketIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Socket/SocketOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanIconOnBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Socket/SocketIconOnBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Socket/SocketIconBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVPowerIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TV123Icon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVRightIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVOkIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVUpIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVleftIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVDownIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVMenuUpIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVMenuIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVBackIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVMuteIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVMenuDownIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/MenuBgIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/PlusIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/ReduceIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TVThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TVIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/SmogIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/LocationIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/UpArrow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/WeatherFanSpeedIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/TipInfoIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/SensorHistoryBg1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/SensorColorTipBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/SensorHistoryBg2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/SensorHistoryBg3.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/macarons.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/macarons2.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/red.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/roma.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/helianthus.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/green.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/infographic.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/shine.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/gray.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/sakura.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/blue.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/dark.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/mint.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/DiagramIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/DiagramIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/MsgIcon/LoadingIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/NoCollectionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/0.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/13.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/18.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/20.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/29.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/3.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/4.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/45.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/5.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/6.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/bluetooth.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/addMusic1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/prve1Selected.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/love1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/selectedIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/playList.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/myLove.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/radio.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/filePlay.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/collect.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/loveMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/qqMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/clear.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/radioIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/musicIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/file.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/vol.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/usb.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/localMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/next1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/loveSelected1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/selectedMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/noMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/addMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/playBj.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/loveRadio.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/list.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/set.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/nextSelected.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/Merge.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/playStatus.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/random.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/collectSelected.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/pause.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/progressIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/prevSeletced.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/MusicBack.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/fileList.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/myList.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/single.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/edit.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/next.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/filePause.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/line.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/loveSelected.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/sourceNetx.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/love.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/pause1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/play1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/play.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/noSelectedIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/next1Selected.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/prev.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/prve1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/Pm25Icon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/HumidityIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/echartsNew.html","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/bmap.min.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/20190126.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/china.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/dataTool.min.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/echarts-all.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/echarts-gl.min.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/echarts.min.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/ecStat.min.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/world.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicPlayOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicPlayIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/InfoOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResetPassword/DialogTipTitleIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/HomeList1bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/HomeList2bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/HomeList4bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/RelayOnBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/RelayBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/HomePageIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/HomePageIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/UserPageNavbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/PersonalCenterIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/PersonalCenterIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/IntellectualizationIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/IntellectualizationIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/CollectionIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/CollectionIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/ClassificationIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/ClassificationIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/CreateScene3Bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/CreateScene1Bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/CreateScene2Bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/FuncInfoSetIcon_white.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/FunctionIconHumidity.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/FunctionIconTemp.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/FunctionIconPm25.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/FunctionIconTVOC.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/FunctionIconCO2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/HomeListbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg3.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg4.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg5.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg6.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg7.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg8.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg9.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg10.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/chooseTipIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AutoIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/LowIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DiyThumbIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AcOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AcIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DehumidificationIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AirSupplyIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/LowIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DiyThumbIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DivBg2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DivBg1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/CoolIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindMediumIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindLowIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AirSupplyIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindLowIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AcThinIcon1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindMediumIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/HeatingIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/MediumIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/CoolIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AutoIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DehumidificationIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindHighIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindHighIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/MediumIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/HighIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/HeatIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/HeatingIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DiyThumbIcon2On.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/HightIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/BrightnessBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/RollingShutterIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/MotorCurtainIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/OnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/TipNot.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/DeviceIcon/VoicePanelIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/iTunesArtwork","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/iTunesArtwork@2x"],"BuildActions":["Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","InterfaceDefinition","InterfaceDefinition","None","None","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","ITunesArtwork","ITunesArtwork"],"Analyzers":[],"AdditionalFiles":[],"EditorConfigFiles":[]}
\ No newline at end of file
diff --git a/.vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhoneSimulator.json b/.vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhoneSimulator.json
new file mode 100644
index 0000000..dc3208f
--- /dev/null
+++ b/.vs/HDL_APP_Project/xs/project-cache/HDL-ON_iOS-Debug|iPhoneSimulator.json
@@ -0,0 +1 @@
+{"Format":1,"ProjectReferences":[],"MetadataReferences":[{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter.analytics/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.Analytics.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter.analytics/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.Analytics.iOS.Bindings.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter.crashes/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.Crashes.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter.crashes/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.Crashes.iOS.Bindings.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/microsoft.appcenter/4.0.0/lib/Xamarin.iOS10/Microsoft.AppCenter.iOS.Bindings.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/Desktop/HDL_APP_Project/DLL/IOS/MJRefresh_Xamarin.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/mqttnet/3.0.13/lib/netstandard2.1/MQTTnet.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/mscorlib.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/newtonsoft.json/12.0.2/lib/netstandard2.0/Newtonsoft.Json.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/OpenTK-1.0.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/restsharp/106.11.7/lib/netstandard2.0/RestSharp.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/Desktop/HDL_APP_Project/DLL/Shared.IOS.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/Desktop/HDL_APP_Project/DLL/IOS/Shared.IOS.JLCountryCode.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/Desktop/HDL_APP_Project/DLL/Shared.IOS.TBL.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.Core.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Drawing.Common.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.Numerics.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.Numerics.Vectors.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.Web.Services.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/System.Xml.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/xamarin.essentials/1.1.0/lib/xamarinios10/Xamarin.Essentials.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Xamarin.iOS.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/zxing.net.mobile/2.4.1/lib/Xamarin.iOS10/ZXing.Net.Mobile.Core.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/zxing.net.mobile/2.4.1/lib/Xamarin.iOS10/zxing.portable.dll","Aliases":[],"Framework":null},{"FilePath":"/Users/kaede/.nuget/packages/zxing.net.mobile/2.4.1/lib/Xamarin.iOS10/ZXingNetMobile.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.Contracts.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.FileVersionInfo.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Security.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XPath.XDocument.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.WebSockets.Client.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Dynamic.Runtime.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Serialization.Xml.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Principal.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.ThreadPool.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Cng.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ComponentModel.EventBasedAsync.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Encryption.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.CompilerServices.VisualC.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.DeriveBytes.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/netstandard.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.UnmanagedMemoryStream.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceModel.Http.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.FileSystem.AccessControl.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XPath.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XmlDocument.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.Xsl.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Resources.Writer.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Console.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Cache.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Sockets.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Text.Encoding.Extensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.NetworkInformation.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Utilities.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Principal.Windows.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Claims.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceModel.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Hashing.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ComponentModel.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.FileSystem.DriveInfo.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.X509Certificates.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Numerics.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.FileSystem.Watcher.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.TraceSource.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.Emit.Lightweight.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Text.Encoding.CodePages.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Linq.Expressions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Timer.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.InteropServices.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.Pipes.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.HttpListener.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Text.RegularExpressions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Tasks.Parallel.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Collections.NonGeneric.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Collections.Concurrent.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Overlapped.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Pkcs.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Handles.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Data.SqlClient.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ObjectModel.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.WebHeaderCollection.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.InteropServices.RuntimeInformation.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ComponentModel.TypeConverter.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Mail.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Tasks.Extensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Linq.Parallel.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XDocument.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.SecureString.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/Microsoft.Win32.Registry.AccessControl.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.RSA.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ComponentModel.Annotations.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.FileSystem.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.Compression.ZipFile.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.InteropServices.WindowsRuntime.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Linq.Queryable.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Resources.ResourceManager.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Resources.Reader.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Collections.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.Emit.ILGeneration.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Data.Common.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.NameResolution.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ComponentModel.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceProcess.ServiceController.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Loader.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceModel.Security.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.AuthenticationManager.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.ReaderWriter.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Tasks.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.Tracing.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.AppContext.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Buffers.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Encryption.ECDsa.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Csp.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.TextWriterTraceListener.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Text.Encoding.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.MemoryMappedFiles.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.OpenSsl.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/Microsoft.Win32.Registry.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Globalization.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.RandomNumberGenerator.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Collections.Specialized.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.ProtectedData.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ValueTuple.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XPath.XmlDocument.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.ServicePoint.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Xml.XmlSerializer.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.Extensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Globalization.Extensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Extensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Resources.ReaderWriter.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Encoding.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.IsolatedStorage.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.AccessControl.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceModel.NetTcp.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.AccessControl.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.TypeExtensions.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Globalization.Calendars.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Requests.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.WebSockets.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.Emit.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.IO.FileSystem.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Serialization.Json.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Algorithms.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Threading.Thread.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Linq.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.Process.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.Tools.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Hashing.Algorithms.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.Debug.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/Microsoft.Win32.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Serialization.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.TraceEvent.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Drawing.Primitives.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Runtime.Serialization.Formatters.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Ping.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.ServiceModel.Duplex.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Diagnostics.StackTrace.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Reflection.DispatchProxy.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Security.Cryptography.Encryption.Aes.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Memory.dll","Aliases":[],"Framework":null},{"FilePath":"/Library/Frameworks/Xamarin.iOS.framework/Versions/14.6.0.15/lib/mono/Xamarin.iOS/Facades/System.Net.Primitives.dll","Aliases":[],"Framework":null}],"Files":["/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Main.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/AppDelegate.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ViewController.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ViewController.designer.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ViewControllerBase.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Reachability.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Scan.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/ZXingOverlayView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Other/JLCountrycode.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/MainPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/FileUtils.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/R.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttInfoConfig.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequest.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/ResponseEntity/ResponsePack.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Enumerative/EmptyHttpReques.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpServerRequestBase.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Room.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Enumerative/Command.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Enumerative/MyEnum.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/DB_ResidenceData.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Function.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/OnAppConfig.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/UserInfo.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/BusData.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmebly.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/CSS/CSS.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/UserPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/UserPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ChooseFloorPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/1-HomePage/HomePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomsManagementPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/LoginPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/LoginPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/ResetPassword_VerificationCode.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/BaseView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/RegisterPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/TopViewDiv.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/AC/ACPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/FunctionPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/FunctionControlZoneBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/RoomPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/RoomPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/2-Classification/ClassificaitionPublicBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Scene.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/FunctionList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/AC.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Curtain.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/FloorHeating.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Light.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/ResponseEntity/CityInfo.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/AppUnlockPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Fan.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/SwitchSocket.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/TV.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Sensor.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/AProtocolEntity.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31Radio.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31RadioList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveRadioList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31USBMusicList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayStatus.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/SendMethod.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31LocalMusicList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31LoveMusicList.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/DialogView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/TopView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/PlayView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/TipView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicSourceView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/SongView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPageBLL.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/BindAccountPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordOptionPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/UpdateThread.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Music/View/MyListView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/UpdataTcpResidenceDataDialog.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/GalleryPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AboutOnPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SceneFunctionListEditPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneFunctionInfoPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Scene/SetSceneLocationPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/3-Intelligence/Automation/AutomationMenuPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/GetSupportPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Panel/PanelPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Device/DeviceModule.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Device/SBK_SceneListObj.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSettingPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/NewAPI.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/HttpUtil.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/Utlis.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/IMessageCommon.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Server/NewApiRes.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/HDLCommon.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/LineView.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/ConfirmDialog.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/WebViewDialog.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/Constant.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/Widget/TextButton.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI1-Login/SelectServerDialog.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control_TcpServer.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Control_Udp.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/CRC.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Packet.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Target.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/UdpSocket.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/DAL/Mqtt/MqttClient.cs","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1024x500.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2048X2732 .png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/4096X4096.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750X1134.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/1024.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/120.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/152.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/167.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/180.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/20.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/29.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/40.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/58.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/60.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/76.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/80.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/87.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/AppIcon.appiconset/Contents.json","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/Contents.json","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40路40@2x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/60路60@3x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58路58@2x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/87路87@3x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/80路80@2x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120路120@2x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/120路120@3x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/180路180@3x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/20路20.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/40路40@2x-1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/29路29.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/58路58@2x-1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/1024路1024@2x.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1242*2688.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/828*1792.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2688*1242.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1792*828.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1125*2436.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2436*1125.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/1242*2208.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/750*1334.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/2208*1242.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640*960.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/320*480.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640*960-1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640*1136.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Assets.xcassets/LaunchImage.launchimage/640*1136-1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/LaunchScreen.storyboard","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Main.storyboard","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Info.plist","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Entitlements.plist","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/ShowPasswordIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/SearchIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/VerificationCodeIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/AccountIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/QQIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/PasswordIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/WechatIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/HidePasswordIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/EmailIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/3.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/LoginIcon/1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Language.ini","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/BackIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Logo.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Logo-bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/UserTypebg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AdminTypeIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/MemberTypeIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceManageIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceMemberIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceArmIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResidenceDataBackupIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AuxiliaryFunctionIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AddFunctionIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/NightViewIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/SwitchIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/GeneralSettingsIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/SupportIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/HomeList3bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/PersonalData/QRcodeIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Classification/ToggleDisplayThumbnail.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Classification/ToggleDisplayLarge.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Classification/Room/Roombg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/MsgIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/MsgIconTip.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/Functionbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/FunctionOnbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/ChangeViewbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DeviceInfoIcon/HumidityIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DeviceInfoIcon/Pm25Icon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DeviceInfoIcon/TempIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DownIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/transparent.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/CollectionIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/CollectionWhiteIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Classification/Room/AllCloseIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/PowerClose.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/PowerOpen.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainStopIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainCloseIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainCloseOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainOpenIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainOpenOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainStopOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/FloorHeatingIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/FloorHeatingOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/LightIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/LightOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Switch.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/SwitchOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/FuncInfoSetIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/ColorWheel.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/ThumbImage.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Fragmentbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Restored_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Edit.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/RightIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/FloorHeatingThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/LightThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/ChooseIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/ChooseOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/PlusSignIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/MinusSignIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/CollectionGrayIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Switch.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/SwitchOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/LocationAddressIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AddIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/EditIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Right.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DownIcon_2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/ChooseRoomListbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Scene/MovieMark.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Scene/SceneIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/SceneCovered.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Scene/DelayIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Scene/s2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Scene/s1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainBgOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainBgIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/MusicFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/FreshAirFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/EnergyMonitoringFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/EnvironmentalFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/SecurityMonitoringFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/LightFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/VideoIntercomFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/PanelFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/FloorHeatingFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/ACFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/CurtainFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/ElectricFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/SensorFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FunctionBg/DoorLockFunctionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/DeviceInfoIcon/Restored_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainOpenBlueIcon_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainOpenWhiteIcon_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainCloseWhiteIcon_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/CurtainCloseBlueIcon_Shadow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/MsgIcon/TipIconBlack.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/MsgIcon/TipIconWhite.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/4.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/1On.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/3.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/4On.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/3On.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/2On.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/FingerprintIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/FaceIdIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/GestureIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/PasswordIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/TipIcon_Successfully.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/TipIcon_Failed.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/GestureGrayIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/Switch_2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/SwitchOn_2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/AppUnlockSetting/FingerIconRed.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/NightIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/NightIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/OrdinaryIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/OrdinaryIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/AwayIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/FloorHeating/AwayIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanIconBgGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanIconBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Socket/SocketThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Socket/SocketIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Socket/SocketOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/FanIconOnBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Socket/SocketIconOnBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Socket/SocketIconBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVPowerIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TV123Icon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVRightIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVOkIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVUpIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVleftIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVDownIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVMenuUpIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVMenuIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVBackIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVMuteIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/TVMenuDownIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/MenuBgIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/PlusIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TV/ReduceIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TVThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Electrical/TVIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/SmogIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/LocationIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/UpArrow.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/WeatherFanSpeedIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/TipInfoIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/SensorHistoryBg1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/SensorColorTipBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/SensorHistoryBg2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/SensorHistoryBg3.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/macarons.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/macarons2.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/red.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/roma.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/helianthus.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/green.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/infographic.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/shine.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/gray.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/sakura.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/blue.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/dark.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/theme/mint.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/DiagramIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/DiagramIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/MsgIcon/LoadingIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Collection/NoCollectionBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/0.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/13.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/18.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/20.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/29.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/3.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/4.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/45.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/5.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/AirIcon/6.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/bluetooth.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/addMusic1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/prve1Selected.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/love1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/selectedIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/playList.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/myLove.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/radio.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/filePlay.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/collect.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/loveMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/qqMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/clear.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/radioIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/musicIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/file.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/vol.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/usb.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/localMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/next1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/loveSelected1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/selectedMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/noMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/addMusic.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/playBj.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/loveRadio.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/list.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/set.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/nextSelected.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/Merge.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/playStatus.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/random.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/collectSelected.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/pause.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/progressIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/prevSeletced.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/MusicBack.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/fileList.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/myList.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/single.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/edit.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/next.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/filePause.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/line.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/loveSelected.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/sourceNetx.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/love.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/pause1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/play1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/play.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/noSelectedIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/next1Selected.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/prev.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/MusicIcon/prve1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/Pm25Icon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/HumidityIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/echartsNew.html","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/bmap.min.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/20190126.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/china.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/dataTool.min.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/echarts-all.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/echarts-gl.min.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/echarts.min.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/ecStat.min.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/js/world.js","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicPlayOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicPlayIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/InfoOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/ResetPassword/DialogTipTitleIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Music/MusicThinIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/HomeList1bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/HomeList2bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/HomeList4bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/RelayOnBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/RelayBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/HomePageIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/HomePageIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/UserPageNavbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/PersonalCenterIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/PersonalCenterIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/IntellectualizationIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/IntellectualizationIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/CollectionIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/CollectionIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/ClassificationIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Navigation/ClassificationIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/CreateScene3Bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/CreateScene1Bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/CreateScene2Bg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Public/FuncInfoSetIcon_white.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/FunctionIconHumidity.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/FunctionIconTemp.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/FunctionIconPm25.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/FunctionIconTVOC.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/EnvironmentalScience/FunctionIconCO2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/PersonalCenter/HomeListbg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg3.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg4.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg5.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg6.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg7.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg8.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg9.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/scenebg10.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/Intelligence/Gallery/chooseTipIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AutoIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/LowIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DiyThumbIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AcOnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AcIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DehumidificationIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AirSupplyIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/LowIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DiyThumbIconOn.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DivBg2.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DivBg1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/CoolIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindMediumIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindLowIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AirSupplyIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindLowIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AcThinIcon1.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindMediumIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/HeatingIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/MediumIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/CoolIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/AutoIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DehumidificationIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindHighIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/WindHighIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/MediumIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/HighIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/HeatIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/HeatingIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/DiyThumbIcon2On.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/AC/HightIconGray.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Light/BrightnessBg.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/RollingShutterIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/Curtain/MotorCurtainIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/OnIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/TipNot.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/Resources/Phone/FunctionIcon/DeviceIcon/VoicePanelIcon.png","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/iTunesArtwork","/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/iTunesArtwork@2x"],"BuildActions":["Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","Compile","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","ImageAsset","InterfaceDefinition","InterfaceDefinition","None","None","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","BundleResource","ITunesArtwork","ITunesArtwork"],"Analyzers":[],"AdditionalFiles":[],"EditorConfigFiles":[]}
\ No newline at end of file
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 1e33f4e..f84ae5d 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -115,7 +115,6 @@
void init()
{
//鎵嬫満鍚嶇О Android.OS.Build.Manufacturer;
- OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
}
void checkSomeInfo()
{
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 30d97ad..c631567 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -13,12 +13,6 @@
14=Register
42=Network anomaly
-10001=Failed to request the server, please try again later!
-10002=System maintenance, please try again later!
-10003=Login failed, please add a home first!
-10004=Account already exists
-
-
[Chinese]
1=鐧诲綍
2=鎵嬫満鍙风櫥褰�
@@ -307,8 +301,8 @@
285=缁戝畾鎵嬫満鍙�
286=缁戝畾鎵嬫満鎴愬姛
287=缁戝畾鎵嬫満澶辫触
-288=淇敼缁戝畾鎵嬫満
-289=瑙ｉ櫎鎵嬫満缁戝畾
+288=鎵嬫満鍙蜂慨鏀�
+289=瑙ｇ粦鎵嬫満鍙�
290=璇诲彇鍘嗗彶鏁版嵁澶辫触
291=鏆傛棤宸叉敹钘忕殑鍦烘櫙
292=鍏充簬ON
@@ -377,11 +371,6 @@
355=鍏充簬
356=鐗堟湰鍙�
357=姝ゅ姛鑳芥殏鏈紑鏀撅紒
-358=鐢佃瘽:
-359=閭:
-360=闈㈡澘鍦烘櫙
-361=鏈坊鍔�
-362=鍏ㄩ��
5000=闊充箰
5001=缁勫悎
@@ -432,52 +421,3 @@
5046=璋冭妭闊抽噺
5047=浣犳墜鏈烘殏鏈畨瑁�"QQ闊充箰"{\r\n}璇峰墠寰�鎵嬫満鍟嗗満瀹夎
-9000=璇蜂娇鐢ㄦ柊鐨勬墜鏈鸿处鍙风櫥褰旳PP
-9001=璇蜂娇鐢ㄦ柊鐨勯偖绠辫处鍙风櫥褰旳PP
-9002=鐧诲綍鎵嬫満淇敼瀹屾垚
-9003=鐧诲綍鎵嬫満缁戝畾瀹屾垚
-9004=鐧诲綍閭淇敼瀹屾垚
-9005=鐧诲綍閭缁戝畾瀹屾垚
-9006=楠岃瘉鐮佸彲鑳戒細寤惰繜锛岃鍐嶇瓑涓�浼�
-9007=鍐嶇瓑涓�浼�
-9008=杩斿洖
-9009=涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�
-9010=鏂板瘑鐮�
-9011=鍐嶆杈撳叆鏂板瘑鐮�
-9012=鍚屾剰
-9013=鐢ㄦ埛鍗忚
-9014=闅愮鏀跨瓥
-9015=鍜�
-9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
-9017=纭閫�鍑虹櫥褰曪紵
-9018=璇烽�夋嫨鍥藉/鍖哄煙
-9019=绔嬪嵆鏇存柊
-9020=浠ュ悗鍐嶈
-9021=鍥藉/鍦板尯
-9022=鏈嶅姟鍣ㄤ俊鎭�
-9023=褰撳墠璐﹀彿鏈嶅姟鍣ㄦ墍灞烇細
-9024=*鏈嶅姟鍣ㄦ槸鎮ㄥ綋鍓嶄簯绔暟鎹瓨鍌ㄧ殑鎵�鍦ㄥ尯鍩�,鏃犻渶蹇呰,鎴戜滑涓嶅缓璁彂鐢熻縼绉�
-9025=鑻ラ渶瑕佽縼绉绘湇鍔″櫒,璇锋嫧鎵�
-9026=鍔熻兘浠嬬粛
-9027=鎶曡瘔
-9028=鐗堟湰鏇存柊
-9029=(鏍囬璇峰甫鎶曡瘔瀛楁牱锛屾垜浠細浼樺厛澶勭悊)
-9030=澶嶅埗鎴愬姛
-9031=绌虹┖濡備篃
-9032=鍙戠幇鏂扮増鏈�
-9033=宸茬粡鏄渶鏂扮増鏈�
-9034=鎴戜滑鑳戒负浣犳彁渚涗粈涔堝府鍔╋紵
-9035=鍔熻兘闂
-9036=鍦烘櫙闂
-9037=APP浣跨敤杈呭姪
-9038=甯歌闂
-
-
-
-10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
-10001=璇锋眰鏈嶅姟鍣ㄥけ璐ワ紝璇风◢鍚庡啀璇曪紒
-10002=绯荤粺缁存姢涓�,璇风◢鍚庡啀璇�!
-10003=鐧诲綍澶辫触锛岃鍏堟坊鍔犱綇瀹咃紒
-10004=璐﹀彿宸插瓨鍦�
-10005=楠岃瘉鐮佸彂閫侀绻侊紝璇风◢鍚庡啀璇曪紒
-10006=绛惧悕閿欒
diff --git a/HDL-ON_Android/Assets/Phone/LoginIcon/Server.png b/HDL-ON_Android/Assets/Phone/LoginIcon/Server.png
deleted file mode 100644
index f3b16ea..0000000
--- a/HDL-ON_Android/Assets/Phone/LoginIcon/Server.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/Head.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/Head.png
deleted file mode 100644
index b15d2ea..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/Head.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/ServerInfo.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/ServerInfo.png
deleted file mode 100644
index eecc590..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/ServerInfo.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Close.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Close.png
deleted file mode 100644
index de1e192..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Close.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Function.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Function.png
deleted file mode 100644
index 4a0598c..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Function.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Help.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Help.png
deleted file mode 100644
index 9990493..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Help.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Menu.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Menu.png
deleted file mode 100644
index 71810f4..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Menu.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Scene.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Scene.png
deleted file mode 100644
index fcf3715..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Scene.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Search.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Search.png
deleted file mode 100644
index 77711cb..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Search.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/SendMessage.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/SendMessage.png
deleted file mode 100644
index e8f67ed..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/SendMessage.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Telephone.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Telephone.png
deleted file mode 100644
index 120fed1..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/Support/Telephone.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/PersonalCenter/Transfer.png b/HDL-ON_Android/Assets/Phone/PersonalCenter/Transfer.png
deleted file mode 100644
index c81184b..0000000
--- a/HDL-ON_Android/Assets/Phone/PersonalCenter/Transfer.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_1.png b/HDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_1.png
deleted file mode 100755
index 2954076..0000000
--- a/HDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_1.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_2.png b/HDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_2.png
deleted file mode 100644
index 8450325..0000000
--- a/HDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_2.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_3.png b/HDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_3.png
deleted file mode 100644
index 3a6658f..0000000
--- a/HDL-ON_Android/Assets/Phone/Public/Dialog/DialogTipTitleIcon_3.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/Assets/Phone/Public/Search.png b/HDL-ON_Android/Assets/Phone/Public/Search.png
deleted file mode 100644
index 77711cb..0000000
--- a/HDL-ON_Android/Assets/Phone/Public/Search.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index e1316cb..4c9a923 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -30,7 +30,7 @@
<DebugType>portable</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE;__Android__</DefineConstants>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
@@ -44,7 +44,7 @@
<DebugType>portable</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE;__Android__;</DefineConstants>
+ <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols>
@@ -577,22 +577,6 @@
<AndroidAsset Include="Assets\Phone\OnIcon.png" />
<AndroidAsset Include="Assets\Phone\TipNot.png" />
<AndroidAsset Include="Assets\Phone\DeviceIcon\VoicePanelIcon.png" />
- <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_3.png" />
- <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_2.png" />
- <AndroidAsset Include="Assets\Phone\Public\Dialog\DialogTipTitleIcon_1.png" />
- <AndroidAsset Include="Assets\Phone\LoginIcon\Server.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\ServerInfo.png" />
- <AndroidAsset Include="Assets\Phone\Public\Search.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Function.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Search.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Menu.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Help.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Telephone.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\SendMessage.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Scene.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\Support\Close.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\Head.png" />
- <AndroidAsset Include="Assets\Phone\PersonalCenter\Transfer.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" />
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 9335648..4dfffc8 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -100,15 +100,15 @@
string userPhoneName = UIDevice.CurrentDevice.Name;
OnAppConfig.Instance.PushDeviceToken = DeviceToken;
- OnAppConfig.Instance.PhoneName = userPhoneName;
- OnAppConfig.Instance.SaveUserConfig();
+ //UserConfig.Instance.phoneName = userPhoneName;
+ //UserConfig.Instance.SaveUserConfig();
}
if (OnAppConfig.Instance.PushDeviceToken != DeviceToken)
{
string userPhoneName = UIDevice.CurrentDevice.Name;
OnAppConfig.Instance.PushDeviceToken = DeviceToken;
- OnAppConfig.Instance.PhoneName = userPhoneName;
- OnAppConfig.Instance.SaveUserConfig();
+ //UserConfig.Instance.phoneName = userPhoneName;
+ //UserConfig.Instance.SaveUserConfig();
}
}
@@ -194,15 +194,15 @@
//NSString* nsCount = [[NSLocale currentLocale] objectForKey: NSLocaleCountryCode];
application.StatusBarStyle = UIStatusBarStyle.DarkContent;
- //string nsCount = NSLocale.CurrentLocale.CountryCode;
+ string nsCount = NSLocale.CurrentLocale.CountryCode;
- //if ( UserInfo.Current != null && nsCount != UserInfo.Current.areaCode.ToString())
- //{
- // //int.TryParse(nsCount,out UserInfo.Current.areaCode);
- // //2020-11-18
- // UserInfo.Current.areaCode = nsCount;
- // OnAppConfig.Instance.SaveUserConfig();
- //}
+ if ( UserInfo.Current != null && nsCount != UserInfo.Current.areaCode.ToString())
+ {
+ //int.TryParse(nsCount,out UserInfo.Current.areaCode);
+ //2020-11-18
+ UserInfo.Current.areaCode = nsCount;
+ OnAppConfig.Instance.SaveUserConfig();
+ }
application.IdleTimerDisabled = true;
application.RegisterForRemoteNotificationTypes(UIRemoteNotificationType.Alert | UIRemoteNotificationType.Badge | UIRemoteNotificationType.Sound);
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index fe64565..bb7e0b5 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -557,22 +557,6 @@
<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" />
</ItemGroup>
<ItemGroup>
<ITunesArtwork Include="iTunesArtwork" />
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 30d97ad..9890b84 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -450,28 +450,10 @@
9015=鍜�
9016=璇峰厛闃呰骞跺悓鎰忋�婄敤鎴峰崗璁�嬪拰銆婇殣绉佹斂绛栥��
9017=纭閫�鍑虹櫥褰曪紵
-9018=璇烽�夋嫨鍥藉/鍖哄煙
-9019=绔嬪嵆鏇存柊
-9020=浠ュ悗鍐嶈
-9021=鍥藉/鍦板尯
-9022=鏈嶅姟鍣ㄤ俊鎭�
-9023=褰撳墠璐﹀彿鏈嶅姟鍣ㄦ墍灞烇細
-9024=*鏈嶅姟鍣ㄦ槸鎮ㄥ綋鍓嶄簯绔暟鎹瓨鍌ㄧ殑鎵�鍦ㄥ尯鍩�,鏃犻渶蹇呰,鎴戜滑涓嶅缓璁彂鐢熻縼绉�
-9025=鑻ラ渶瑕佽縼绉绘湇鍔″櫒,璇锋嫧鎵�
-9026=鍔熻兘浠嬬粛
-9027=鎶曡瘔
-9028=鐗堟湰鏇存柊
-9029=(鏍囬璇峰甫鎶曡瘔瀛楁牱锛屾垜浠細浼樺厛澶勭悊)
-9030=澶嶅埗鎴愬姛
-9031=绌虹┖濡備篃
-9032=鍙戠幇鏂扮増鏈�
-9033=宸茬粡鏄渶鏂扮増鏈�
-9034=鎴戜滑鑳戒负浣犳彁渚涗粈涔堝府鍔╋紵
-9035=鍔熻兘闂
-9036=鍦烘櫙闂
-9037=APP浣跨敤杈呭姪
-9038=甯歌闂
-
+9018=閫夋嫨鍥藉鎴栧尯鍩�
+9019=鏇存柊
+9020=蹇界暐
+9021=鎴戠殑浜岀淮鐮�
10000=鏃犳晥鐧诲綍瀵嗛挜锛岃閲嶆柊鐧诲綍锛�
diff --git a/HDL-ON_iOS/Resources/Phone/LoginIcon/Server.png b/HDL-ON_iOS/Resources/Phone/LoginIcon/Server.png
deleted file mode 100644
index f3b16ea..0000000
--- a/HDL-ON_iOS/Resources/Phone/LoginIcon/Server.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Head.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/Head.png
deleted file mode 100644
index b15d2ea..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Head.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/ServerInfo.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/ServerInfo.png
deleted file mode 100644
index eecc590..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/ServerInfo.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Close.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Close.png
deleted file mode 100644
index de1e192..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Close.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Function.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Function.png
deleted file mode 100644
index 4a0598c..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Function.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Help.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Help.png
deleted file mode 100644
index 9990493..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Help.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Menu.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Menu.png
deleted file mode 100644
index 71810f4..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Menu.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Scene.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Scene.png
deleted file mode 100644
index fcf3715..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Scene.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Search.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Search.png
deleted file mode 100644
index 77711cb..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Search.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/SendMessage.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/SendMessage.png
deleted file mode 100644
index e8f67ed..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/SendMessage.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Telephone.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Telephone.png
deleted file mode 100644
index 120fed1..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Support/Telephone.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Transfer.png b/HDL-ON_iOS/Resources/Phone/PersonalCenter/Transfer.png
deleted file mode 100644
index c81184b..0000000
--- a/HDL-ON_iOS/Resources/Phone/PersonalCenter/Transfer.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_1.png b/HDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_1.png
deleted file mode 100755
index 2954076..0000000
--- a/HDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_1.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_2.png b/HDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_2.png
deleted file mode 100644
index 8450325..0000000
--- a/HDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_2.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_3.png b/HDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_3.png
deleted file mode 100644
index 3a6658f..0000000
--- a/HDL-ON_iOS/Resources/Phone/Public/Dialog/DialogTipTitleIcon_3.png
+++ /dev/null
Binary files differ
diff --git a/HDL-ON_iOS/Resources/Phone/Public/Search.png b/HDL-ON_iOS/Resources/Phone/Public/Search.png
deleted file mode 100644
index 77711cb..0000000
--- a/HDL-ON_iOS/Resources/Phone/Public/Search.png
+++ /dev/null
Binary files differ
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
index 46c8b0a..2372b65 100644
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -10,39 +10,28 @@
/// <summary>
/// 鐢ㄦ埛鍗忚
/// </summary>
- public const string URL_USERAGREEMENT = "https://developer.hdlcontrol.com/HDLOnPlusUserAgreement.html";
+ public const string URL_UserAgreement = "https://developer.hdlcontrol.com/HDLOnPlusUserAgreement.html";
/// <summary>
/// 闅愮鏀跨瓥
/// </summary>
- public const string URL_PRIVACYPOLICY = "https://developer.hdlcontrol.com/HDLOnPlusPrivacyPolicy.html";
- /// <summary>
- /// 鎶�鏈敮鎸佺數璇濆彿鐮�
- /// </summary>
- public const string SUPPORT_TELEPHONENUMBER = "4008558535";
- /// <summary>
- /// 鎶�鏈敮鎸侀偖绠卞湴鍧�
- /// </summary>
- public const string SUPPORT_EMAIL = "hdltickets@hdlautomation.com";
- /// <summary>
- /// 鑻规灉鍟嗗簵鍦板潃
- /// </summary>
- public const string URL_APPSTORE = "https://apps.apple.com/cn/app/on/id1532353432";
+ public const string URL_PrivacyPolicy = "https://developer.hdlcontrol.com/HDLOnPlusPrivacyPolicy.html";
-
- }
+
+
+ }
#endregion
#region 鈻� 鍏ㄥ眬鏋氫妇 ____________________________
- ///// <summary>
- ///// 瀹㈡埛绔被鍨� 濡侶dlOn銆丒voyoHome銆佽皟璇曞疂
- ///// </summary>
- //public enum APIClientType
- //{
- // HDL_ON,
- // EvoyoHome,
- // 璋冭瘯瀹�,
- // HDL_ON_PRO
- //}
+ /// <summary>
+ /// 瀹㈡埛绔被鍨� 濡侶dlOn銆丒voyoHome銆佽皟璇曞疂
+ /// </summary>
+ public enum APIClientType
+ {
+ HDL_ON,
+ EvoyoHome,
+ 璋冭瘯瀹�,
+ HDL_ON_PRO
+ }
/// <summary>
/// 澶囦唤绫诲瀷
@@ -148,45 +137,6 @@
/// </summary>
ADMIN,
- }
-
-
- /// <summary>
- ///
- /// </summary>
- public enum PhoneDeviceType
- {
- /// <summary>
- /// Android
- /// </summary>
- Android = 0,
- /// <summary>
- /// IOS
- /// </summary>
- IOS = 1,
- /// <summary>
- /// WinPhone
- /// </summary>
- WinPhone,
- }
-
- /// <summary>
- /// APP 绫诲瀷
- /// </summary>
- public enum SoftwareType
- {
- /// <summary>
- /// Evoyo銆丱N銆丱N_Plus
- /// </summary>
- Evoyo = 0,
- /// <summary>
- /// IOS
- /// </summary>
- ON = 1,
- /// <summary>
- /// WinPhone
- /// </summary>
- ON_Plus,
}
#endregion
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 43e137d..0bd5640 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -3,7 +3,6 @@
using HDL_ON;
using HDL_ON.UI.CSS;
using HDL_ON.DAL.Server;
-using HDL_ON.UI;
namespace HDL_ON
{
@@ -74,16 +73,18 @@
/// </summary>
public void CheckIfNeedForceUpdate()
{
+ // //return;
System.Threading.Tasks.Task.Run(() =>
{
try
{
var requestObj = new ForceUpdateObj()
{
- LanguageType = Utlis.GetPostLanguageType()
+
+
};
-#if __IOS__
- requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
+#if Android
+ requestObj.DeviceType = 1;
#endif
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
@@ -114,6 +115,17 @@
});
+
+ //ForceUpdateInfo mForceUpdateInfo = new ForceUpdateInfo () {
+ // IsNeedForceUpdate = true,
+ // AndroidUrl = "https://shouji.baidu.com/software/26667787.html",
+ // AndroidUrl_En = "https://shouji.baidu.com/software/26667787.html",
+ // IosUrl = "https://apps.apple.com/cn/app/hdl-on/id1029839624",
+ // ReasonStr = "1.鍙戠幇鏂扮増鏈珹pp,褰撳墠鐗堟湰宸插仠鐢�,椹笂鏇存柊!\n2.璇蜂笅杞藉拰瀹夎鏂扮増鏈�!",
+ // ReasonStr_En = "1. Discover the new version of the App, the current version is disabled, update now! \n2. Please download and install the new version!"
+ //};
+
+ //ShowForceUpdateDialog (mForceUpdateInfo);
}
/// <summary>
@@ -122,63 +134,209 @@
/// </summary>
public void ShowForceUpdateDialog(ForceUpdateInfo mForceUpdateInfo)
{
- // 1.1 娌℃湁鏇存柊 杩斿洖
+
+ //if (!mForceUpdateInfo.IsNeedForceUpdate) return;
+
if (mForceUpdateInfo.UpdateType == 0) return;
- // 1.2 鏈夋柊鐗堟湰浣嗘槸蹇界暐杩� 杩斿洖
+
if (mForceUpdateInfo.UpdateType == 1 && (UserInfo.Current.IgnoreUpdateVersion == mForceUpdateInfo.NewVersion)) return;
- // 2.1 鏈夋柊鐗堟湰娌℃湁蹇界暐杩� 鎻愮ず鏇存柊
+
+ Dialog dialog = new Dialog();
+
+ FrameLayout dialogBodyView = new FrameLayout()
+ {
+ Gravity = Gravity.Center,
+ Width = Application.GetRealWidth(500),
+ Height = Application.GetRealHeight(500),
+ BackgroundColor = 0xFF000000,
+ Radius = (uint)Application.GetRealWidth(10),
+ //BorderColor = SkinStyle.Current.Transparent,
+ BorderWidth = 0,
+ };
+ dialog.AddChidren(dialogBodyView);
+
+ Button btnTitle = new Button()
+ {
+ Height = Application.GetRealHeight(80),
+ BackgroundColor = 0x00000000,
+ TextAlignment = TextAlignment.Center,
+ TextID = StringId.Tip,
+ TextColor = 0xFFFFFFFF
+ };
+ dialogBodyView.AddChidren(btnTitle);
+
+
+ FrameLayout centerView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(80),
+ Height = Application.GetRealHeight(340),
+ BackgroundColor = 0xFFFFFFFF,
+ };
+ dialogBodyView.AddChidren(centerView);
+
+ Button btnMessage = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(20),
+ Width = Application.GetRealWidth(400),
+ //Height = Application.GetRealHeight (300),
+ //Text = mForceUpdateInfo.ReasonStr,
+ TextAlignment = TextAlignment.TopLeft,
+ //TextColor = SkinStyle.Current.TextColor,
+ IsMoreLines = true
+ };
+ centerView.AddChidren(btnMessage);
+
+
+ FrameLayout bottomView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(420),
+ Height = Application.GetRealHeight(80),
+ BackgroundColor = 0xFFFFFFFF,
+
+ };
+ dialogBodyView.AddChidren(bottomView);
+
+ var mAndroidUrl = mForceUpdateInfo.AndroidUrl;
+ if (Language.CurrentLanguage == "Chinese")
+ {
+ btnMessage.Text = mForceUpdateInfo.ReasonStr;
+
+ }
+ else
+ {
+ btnMessage.Text = mForceUpdateInfo.ReasonStr_En;
+ mAndroidUrl = mForceUpdateInfo.AndroidUrl_En;
+ }
+
+
if (mForceUpdateInfo.UpdateType == 1)
{
- Action okAction = () =>
+ #region 鎻愮ず鏇存柊
+ Button btnNext = new Button()
{
- if (string.IsNullOrEmpty(mForceUpdateInfo.NewVersionUrl)) return;
-
- HDLUtils.OpenUrl(mForceUpdateInfo.NewVersionUrl);
+ Width = Application.GetRealWidth(249),
+ TextID = StringId.Ignore,
+ TextAlignment = TextAlignment.Center,
+ TextColor = 0xFFFFFFFF,
+ BackgroundColor = 0xFF000000,
+ //Text = "蹇界暐"
+ };
+ bottomView.AddChidren(btnNext);
+ btnNext.MouseUpEventHandler += (sender2, e2) =>
+ {
+ //UserConfig.Instance.IfIgnoreUpdate = true;
+ UserInfo.Current.IgnoreUpdateVersion = mForceUpdateInfo.NewVersion;
+ UserInfo.Current.SaveUserInfo();
+ dialog.Close();
};
- Action cancelAction = () =>
+ Button btnSave = new Button()
{
- //UserInfo.Current.IgnoreUpdateVersion = mForceUpdateInfo.NewVersion;
- //UserInfo.Current.SaveUserInfo();
+ X = btnNext.Right + 1,
+ Width = Application.GetRealWidth(250),
+ TextID = StringId.Update,
+ TextAlignment = TextAlignment.Center,
+ TextColor = 0xFFFFFFFF,
+ BackgroundColor = 0xFF000000,
+ //Text = "鏇存柊"
+ };
+ bottomView.AddChidren(btnSave);
+
+ btnSave.MouseUpEventHandler += (sender2, e2) =>
+ {
+ dialog.Close();
+ try
+ {
+
+#if __IOS__
+ HDLUtils.OpenUrl(mForceUpdateInfo.IosUrl);
+ //UIApplication.SharedApplication.OpenUrl (new Foundation.NSUrl ("https://apps.apple.com/cn/app/hdl-on/id1029839624"));
+
+#elif Android
+ HDLUtils.OpenUrl(mAndroidUrl);
+ SharedMethod.SharedMethod.OpenUrl (mAndroidUrl);
+ //SharedMethod.SharedMethod.OpenUrl ("https://shouji.baidu.com/software/26667787.html");
+
+#endif
+ }
+ catch
+ {
+ //璺宠浆涓嬭浇鍦板潃澶辫触
+ Utlis.WriteLine("open url error");
+ }
};
- //1鎻愮ず鏇存柊
- var dialog = new UpdateTipDialog();
- var tipStr = Language.StringByID(StringId.VersionNumber) + mForceUpdateInfo.NewVersion;
- dialog.ShowUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mForceUpdateInfo.ReasonStr, okAction, cancelAction);
+ #endregion
}
- else if (mForceUpdateInfo.UpdateType == 2) //2.2 闇�瑕佸己鍒舵洿鏂�
+ else if (mForceUpdateInfo.UpdateType == 2)
{
- //2寮哄埗鏇存柊
- //"1.鍙戠幇鏂扮増鏈珹pp,褰撳墠鐗堟湰宸插仠鐢�,椹笂鏇存柊!\n2.璇蜂笅杞藉拰瀹夎鏂扮増鏈�!....."
- Action okAction = () =>
+ #region 寮哄埗鏇存柊
+ Button btnSave = new Button()
{
- if (string.IsNullOrEmpty(mForceUpdateInfo.NewVersionUrl)) {
- Utlis.ShowTip(Language.StringByID(StringId.DataExceptionPleaseTryAgain));
- return;
- };
+ Width = Application.GetRealWidth(500),
+ TextID = StringId.Confirm,
+ TextAlignment = TextAlignment.Center,
+ TextColor = 0xFFFFFFFF,
+ BackgroundColor = 0xFF000000,
+ };
+ bottomView.AddChidren(btnSave);
- HDLUtils.OpenUrl(mForceUpdateInfo.NewVersionUrl);
- };
-
- //1鎻愮ず鏇存柊
- var dialog = new UpdateTipDialog();
- var tipStr = Language.StringByID(StringId.VersionNumber) + mForceUpdateInfo.NewVersion;
- dialog.ShowForcedUpdateDialog(Language.StringByID(StringId.DiscoverNewVersion), tipStr, mForceUpdateInfo.ReasonStr, okAction);
- }
- else //3. 鍙渶鎻愮ず
- {
- //3鎻愮ず閫氱煡
- Action okAction = () =>
+ //var mAndroidUrl = mForceUpdateInfo.AndroidUrl;
+ //if (Language.CurrentLanguage == "Chinese") {
+ // btnMessage.Text = mForceUpdateInfo.ReasonStr;
+
+ //} else {
+ // btnMessage.Text = mForceUpdateInfo.ReasonStr_En;
+ // mAndroidUrl = mForceUpdateInfo.AndroidUrl_En;
+ //}
+
+ btnSave.MouseUpEventHandler += (sender2, e2) =>
{
-
+ try
+ {
+
+#if __IOS__
+ HDLUtils.OpenUrl(mForceUpdateInfo.IosUrl);
+ //UIApplication.SharedApplication.OpenUrl (new Foundation.NSUrl ("https://apps.apple.com/cn/app/hdl-on/id1029839624"));
+
+#elif Android
+ HDLUtils.OpenUrl(mAndroidUrl);
+ //SharedMethod.SharedMethod.OpenUrl ("https://shouji.baidu.com/software/26667787.html");
+
+#endif
+ }
+ catch
+ {
+ //璺宠浆涓嬭浇鍦板潃澶辫触
+ Utlis.WriteLine("open url error");
+ }
};
- var dialog = new UpdateTipDialog();
- dialog.ShowTipDialog(Language.StringByID(StringId.Tip), mForceUpdateInfo.ReasonStr, okAction);
+ #endregion
}
+ else
+ {
+ #region 鎻愮ず閫氱煡
+ Button btnSave = new Button()
+ {
+ Width = Application.GetRealWidth(500),
+ TextID = StringId.Close,
+ TextAlignment = TextAlignment.Center,
+ TextColor = 0xFFFFFFFF,
+ BackgroundColor = 0xFF000000,
+ };
+ bottomView.AddChidren(btnSave);
+
+ btnSave.MouseUpEventHandler += (sender2, e2) =>
+ {
+ dialog.Close();
+ };
+ #endregion
+ }
+ dialog.Show();
+
}
-
#endregion
}
}
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 33ad7fa..18ab3a8 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -501,90 +501,22 @@
/// </summary>
public const int IfConfirmLogout = 9017;
/// <summary>
- /// 璇烽�夋嫨鍥藉/鍖哄煙
+ /// 閫夋嫨鍥藉鎴栧尯鍩�
/// </summary>
- public const int PleaseSelectCountryOrRegion = 9018;
+ public const int SelectCountryOrRegion = 9018;
/// <summary>
- /// 绔嬪嵆鏇存柊
+ /// 鏇存柊
/// </summary>
public const int Update = 9019;
/// <summary>
- /// 浠ュ悗鍐嶈
+ /// 蹇界暐
/// </summary>
public const int Ignore = 9020;
/// <summary>
- /// 鍥藉/鍦板尯
+ /// 鎴戠殑浜岀淮鐮�
/// </summary>
- public const int CountryOrRegion = 9021;
- /// <summary>
- /// 鏈嶅姟鍣ㄤ俊鎭�
- /// </summary>
- public const int ServerInformation = 9022;
- /// <summary>
- /// 褰撳墠璐﹀彿鏈嶅姟鍣ㄦ墍灞烇細
- /// </summary>
- public const int CurrentAccountServerOwnership = 9023;
- /// <summary>
- /// *鏈嶅姟鍣ㄦ槸鎮ㄥ綋鍓嶄簯绔暟鎹瓨鍌ㄧ殑鎵�鍦ㄥ尯鍩燂紝鏃犻渶蹇呰锛屾垜浠笉寤鸿鍙戠敓杩佺Щ
- /// </summary>
- public const int CurrentAccountServerOwnershipTip = 9024;
- /// <summary>
- /// 鑻ラ渶瑕佽縼绉绘湇鍔″櫒锛岃鎷ㄦ墦
- /// </summary>
- public const int ToMigrateTheServerPleaseCall = 9025;
- /// <summary>
- /// 鍔熻兘浠嬬粛
- /// </summary>
- public const int FunctionIntroduced = 9026;
- /// <summary>
- /// 鎶曡瘔
- /// </summary>
- public const int Complaints = 9027;
- /// <summary>
- /// 鐗堟湰鏇存柊
- /// </summary>
- public const int VersionUpdate = 9028;
- /// <summary>
- /// (鏍囬璇峰甫鎶曡瘔瀛楁牱锛屾垜浠細浼樺厛澶勭悊)
- /// </summary>
- public const int WillGivePriorityToTheTreatmen = 9029;
- /// <summary>
- /// 澶嶅埗鎴愬姛
- /// </summary>
- public const int CopySuccess = 9030;
- /// <summary>
- /// 绌虹┖濡備篃
- /// </summary>
- public const int ContentIsEmpty = 9031;
- /// <summary>
- /// 鍙戠幇鏂扮増鏈�
- /// </summary>
- public const int DiscoverNewVersion = 9032;
- /// <summary>
- /// 宸茬粡鏄渶鏂扮増鏈�
- /// </summary>
- public const int IsLatestVersion = 9033;
- /// <summary>
- /// 鎴戜滑鑳戒负浣犳彁渚涗粈涔堝府鍔╋紵
- /// </summary>
- public const int WhatCanWeDoForYou = 9034;
- /// <summary>
- /// 鍔熻兘闂
- /// </summary>
- public const int FunctionalQuestion = 9035;
- /// <summary>
- /// 鍦烘櫙闂
- /// </summary>
- public const int SceneQuestion = 9036;
- /// <summary>
- /// APP浣跨敤杈呭姪
- /// </summary>
- public const int AppUsageAssistance = 9037;
- /// <summary>
- /// 甯歌闂
- /// </summary>
- public const int CommonQuestion = 9038;
-
+ public const int MyQRCode = 9021;
+
#region 缃戠粶璇锋眰鍝嶅簲閿欒鎻愮ず淇℃伅
/// <summary>
diff --git a/HDL_ON/Common/Utlis.cs b/HDL_ON/Common/Utlis.cs
index e5e76f9..4a8ae49 100644
--- a/HDL_ON/Common/Utlis.cs
+++ b/HDL_ON/Common/Utlis.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using Shared;
using System.Text.RegularExpressions;
-using System.Text;
namespace HDL_ON
{
@@ -170,105 +169,6 @@
//闇�瑕佸鍔犱竴涓宸��
return btn.GetTextWidth() + Application.GetRealWidth(4);
#endif
- }
-
-
- /// <summary>
- /// 鐢熸垚闅忔満瀛楃涓�
- /// </summary>
- /// <param name="length">瀛楃涓茬殑闀垮害</param>
- /// <returns></returns>
- public static string CreateRandomString(int length)
- {
- // 鍒涘缓涓�涓猄tringBuilder瀵硅薄瀛樺偍瀵嗙爜
- StringBuilder sb = new StringBuilder();
- //浣跨敤for寰幆鎶婂崟涓瓧绗﹀～鍏呰繘StringBuilder瀵硅薄閲岄潰鍙樻垚14浣嶅瘑鐮佸瓧绗︿覆
- for (int i = 0; i < length; i++)
- {
- Random random = new Random(Guid.NewGuid().GetHashCode());
- //闅忔満閫夋嫨閲岄潰鍏朵腑鐨勪竴绉嶅瓧绗︾敓鎴�
- switch (random.Next(3))
- {
- case 0:
- //璋冪敤鐢熸垚鐢熸垚闅忔満鏁板瓧鐨勬柟娉�
- sb.Append(createNum());
- break;
- case 1:
- //璋冪敤鐢熸垚鐢熸垚闅忔満灏忓啓瀛楁瘝鐨勬柟娉�
- sb.Append(createSmallAbc());
- break;
- case 2:
- //璋冪敤鐢熸垚鐢熸垚闅忔満澶у啓瀛楁瘝鐨勬柟娉�
- sb.Append(createBigAbc());
- break;
- }
- }
- return sb.ToString();
- }
-
- /// <summary>
- /// 鐢熸垚鍗曚釜闅忔満鏁板瓧
- /// </summary>
- static int createNum()
- {
- Random random = new Random(Guid.NewGuid().GetHashCode());
- int num = random.Next(10);
- return num;
- }
-
- /// <summary>
- /// 鐢熸垚鍗曚釜澶у啓闅忔満瀛楁瘝
- /// </summary>
- static string createBigAbc()
- {
- //A-Z鐨� ASCII鍊间负65-90
- Random random = new Random(Guid.NewGuid().GetHashCode());
- int num = random.Next(65, 91);
- string abc = Convert.ToChar(num).ToString();
- return abc;
- }
-
- /// <summary>
- /// 鐢熸垚鍗曚釜灏忓啓闅忔満瀛楁瘝
- /// </summary>
- static string createSmallAbc()
- {
- //a-z鐨� ASCII鍊间负97-122
- Random random = new Random(Guid.NewGuid().GetHashCode());
- int num = random.Next(97, 123);
- string abc = Convert.ToChar(num).ToString();
- return abc;
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="unixTimeStamp"></param>
- /// <returns></returns>
- public static DateTime UnixToDateTime(long unixTimeStamp)
- {
- DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
- return startTime.AddSeconds(unixTimeStamp);
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="unixTimeStamp"></param>
- /// <returns></returns>
- public static long DateTimeToUnix(DateTime dateTime)
- {
- DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
- return (long)(dateTime - startTime).TotalSeconds; // 鐩稿樊绉掓暟
- }
-
-
- /// <summary>
- /// 鑾峰彇璇锋眰鎻愪氦鐨勮瑷�鍙傛暟
- /// </summary>
- public static string GetPostLanguageType()
- {
- return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
}
}
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index a16880b..af880db 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -1,10 +1,9 @@
-using System;
+锘縰sing System;
using System.Collections.Generic;
using System.IO;
-using System.Net;
+using System.Net;
using System.Text;
using HDL_ON.DAL.Mqtt;
-using HDL_ON.DAL.Net;
using HDL_ON.Entity;
using Newtonsoft.Json.Linq;
using Shared;
@@ -69,29 +68,29 @@
}
- //public string GetRequestResultMsg(string resultCode)
- //{
- // string result = "";
- // switch (resultCode.ToUpper())
- // {
- // case "USERNAMEORPWDERROR":
- // result = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
- // break;
- // case "ACCOUNTNOEXISTS":
- // result = Language.StringByID(StringId.ACCOUNTNOEXISTS);
- // break;
- // case "SENDFAIL":
- // result = Language.StringByID(StringId.FailedToSendVerificationCode);
- // break;
- // case "EXIST":
- // result = Language.StringByID(StringId.AccountAlreadyUse);
- // break;
- // case "Self:Net_Error":
- // result = Language.StringByID(StringId.NetworkAnomaly);
- // break;
- // }
- // return result;
- //}
+ public string GetRequestResultMsg(string resultCode)
+ {
+ string result = "";
+ switch (resultCode.ToUpper())
+ {
+ case "USERNAMEORPWDERROR":
+ result = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
+ break;
+ case "ACCOUNTNOEXISTS":
+ result = Language.StringByID(StringId.ACCOUNTNOEXISTS);
+ break;
+ case "SENDFAIL":
+ result = Language.StringByID(StringId.FailedToSendVerificationCode);
+ break;
+ case "EXIST":
+ result = Language.StringByID(StringId.AccountAlreadyUse);
+ break;
+ case "Self:Net_Error":
+ result = Language.StringByID(StringId.NetworkAnomaly);
+ break;
+ }
+ return result;
+ }
#region 鈻� 閫氱敤璇锋眰鎺ュ彛_______________________
/// <summary>
@@ -113,19 +112,15 @@
{
var requestJson = HttpUtil.GetSignRequestJson(new RefreshTokenObj()
{
- refreshToken = UserInfo.Current.refreshToken,
+ refreshToken = UserInfo.Current.refreshToken,
});
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Login, requestJson);
if (revertObj.Code.ToUpper() == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(revertObj.Data.ToString());
-
UserInfo.Current.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
UserInfo.Current.LastTime = DateTime.Now;
UserInfo.Current.SaveUserInfo();
-
-
- UserInfo.Current.refreshToken = revertData.refreshToken;
return true;
}
return false;
@@ -135,7 +130,13 @@
#region 娉ㄥ唽銆佺櫥褰曢儴鍒�
-
+ /// <summary>
+ /// 鑾峰彇璇锋眰鎻愪氦鐨勮瑷�鍙傛暟
+ /// </summary>
+ public string GetPostLanguageType()
+ {
+ return Language.CurrentLanguage == "Chinese" ? LanguageTypeEnum.CHINESE.ToString() : LanguageTypeEnum.ENGLISH.ToString();
+ }
/// <summary>
/// 閫氱敤 鍙戦�侀獙璇佺爜鏂规硶
@@ -150,7 +151,7 @@
var requestObj = new VerifyCodeSendObj()
{
verifyType = (int)verifyType,
- languageType = Utlis.GetPostLanguageType()
+ languageType = GetPostLanguageType()
};
// 鏄惁鏄墜鏈�
if (isPhone)
@@ -259,7 +260,7 @@
/// <returns></returns>
public ResponsePackNew ValidatorCode(VerifyType verifyType, string account, string code, bool isPhone, bool verifySuccessFail = true)
{
- var requestObj = new VerifyCodeCheckObj() { verifyCode = code, verifyType = (int)verifyType, verifySuccessFail = verifySuccessFail };
+ var requestObj = new VerifyCodeCheckObj() { verifyCode = code, verifyType = (int)verifyType , verifySuccessFail = verifySuccessFail };
if (isPhone)
{
//鎵嬫満
@@ -288,29 +289,26 @@
if (resultObj.Code == StateCode.SUCCESS)
{
var info = Newtonsoft.Json.JsonConvert.DeserializeObject<MemberInfoRes>(resultObj.Data.ToString());
- UserInfo.Current.userEmailInfo = info.memberEmail;
- UserInfo.Current.userMobileInfo = info.memberPhone;
- UserInfo.Current.userName = info.memberName;
- if (!string.IsNullOrEmpty(info.memberPhonePrefix))
- {
- UserInfo.Current.areaCode = info.memberPhonePrefix;
- }
+ UserInfo.Current.userEmailInfo = info.memberEmail;
+ UserInfo.Current.userMobileInfo = info.memberPhone;
+ UserInfo.Current.userName = info.memberName;
+ UserInfo.Current.areaCode = info.memberPhonePrefix;
//鏄惁闇�瑕佽幏鍙栧ご鍍�
if (bGetHeadImage)
{
var headImageBytes = DownHeadImage();
- if (headImageBytes != null && headImageBytes.Length > 0)
+ if (headImageBytes != null)
{
- UserInfo.Current.headImagePageBytes = headImageBytes;
+ UserInfo.Current.headImagePageBytes = headImageBytes;
FileStream fs = null;
try
{
- UserInfo.Current.headImagePageBytes = headImageBytes;
+ UserInfo.Current.headImagePageBytes = headImageBytes;
var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", "headImage.png");
fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
fs.Write(headImageBytes, 0, headImageBytes.Length);
fs.Flush();
- UserInfo.Current.headImagePagePath = filePath;
+ UserInfo.Current.headImagePagePath = filePath;
}
catch (Exception ex)
{
@@ -327,7 +325,7 @@
}
}
- UserInfo.Current.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
MainPage.Log("鑾峰彇鐢ㄦ埛淇℃伅鎴愬姛銆�");
}
@@ -398,11 +396,10 @@
/// <returns></returns>
public ResponsePackNew EditUserName(string userName)
{
- var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberNameRes()
- {
- memberName = userName
- });
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
+ var requestJson = HttpUtil.GetSignRequestJson(new UpdateMemberNameRes() {
+ memberName = userName
+ });
+ return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UpdateMemberInfo, requestJson);
}
/// <summary>
@@ -429,7 +426,7 @@
/// <returns></returns>
public string BindAccount(string account, string code = "", bool isPhone = false)
{
- var requestObj = new BindWithAccountObj() { verifyCode = code };
+ var requestObj = new BindWithAccountObj() { verifyCode = code};
if (isPhone)
{
//鎵嬫満
@@ -451,7 +448,7 @@
/// <returns></returns>
public string UnBindAccount(bool isPhone)
{
- var requestObj = new UnBindAccountObj() { unBindLabel = isPhone ? "PHONE" : "EMAIL" };
+ var requestObj = new UnBindAccountObj() { unBindLabel = isPhone ? "PHONE": "EMAIL" };
var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPost(NewAPI.API_POST_Member_UnbindWithAccount, requestJson).Code;
}
@@ -466,18 +463,17 @@
{
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetHomeListObj() { homeType = homeType.ToString() });
var resultObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_Gethomepager, requestJson);
- if (resultObj.Code == StateCode.SUCCESS)
+ if(resultObj.Code == StateCode.SUCCESS)
{
var homeList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<RegionInfoResNew>>(resultObj.Data.ToString());
- if (homeList == null || homeList.Count == 0)
- {
+ if (homeList == null || homeList.Count == 0) {
}
else
{
- UserInfo.Current.regionList = new List<RegionInfoRes>();
-
+ UserInfo.Current.regionList = new List<RegionInfoRes>();
+
foreach (var mHome in homeList)
{
var home = new RegionInfoRes()
@@ -501,22 +497,21 @@
{
continue;
}
- UserInfo.Current.regionList.Add(home);
- }
-
- if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
- {
- DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
+ UserInfo.Current.regionList.Add(home);
+ if (string.IsNullOrEmpty(DB_ResidenceData.residenceData.CurReginID))
+ {
+ DB_ResidenceData.residenceData.CurReginID = UserInfo.Current.regionList[0].RegionID;
+ }
}
DB_ResidenceData.residenceData.SaveResidenceData();
- UserInfo.Current.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
}
-
+
}
return resultObj.Code;
- //string jsonString = "{" +
+ //string jsonString = "{" +
// "\"RequestVersion\":" + "\"" + MainPage.VersionString + "\"" + "," +
// "\"RequestSource\":" + "\"" + "2" + "\"" + "," +
// "\"HomeType\":" + "\"" + "1" + "\"" + "," +
@@ -602,11 +597,11 @@
homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
};
- if (editId == 0)
+ if(editId == 0)
{
requestObj.homeName = editName;
}
- else if (editId == 1)
+ else if(editId == 1)
{
requestObj.Address = editName;
}
@@ -629,7 +624,7 @@
var mHomeGatewayRes = Newtonsoft.Json.JsonConvert.DeserializeObject<List<HomeGatewayInfo>>(revertObj.Data.ToString());
if (nowhomeId == DB_ResidenceData.residenceData.residecenInfo.RegionID)
{
- if (mHomeGatewayRes != null)
+ if(mHomeGatewayRes != null)
{
if (mHomeGatewayRes.Count > 0)
{
@@ -642,7 +637,7 @@
}
DB_ResidenceData.residenceData.SaveResidenceData();
}
-
+
if (mHomeGatewayRes != null)
{
//Utlis.WriteLine ("鑾峰緱褰撳墠浣忓畢缃戝叧涓暟锛�" + mHomeGatewayRes.content.Count);
@@ -661,7 +656,7 @@
/// <returns></returns>
public ResponsePackNew GetResidenceMemberAccount()
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
+ var requestJson = HttpUtil.GetSignRequestJson(new HomeIdObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID });
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_FindAll, requestJson);
}
@@ -676,7 +671,7 @@
childAccountId = subaccount.childAccountId,
homeId = subaccount.homeId
};
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Delete, requestJson);
}
@@ -688,7 +683,7 @@
/// <returns></returns>
public ResponsePackNew EditSubAccountNickName(string nickName, string childAccountId)
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildNickNameObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildNickNameObj()
{
homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
childAccountId = childAccountId,
@@ -705,7 +700,7 @@
/// <returns></returns>
public ResponsePackNew ChangeCreateSceneState(bool isAllow, string childAccountId)
{
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new UpdateChildAllowCreateSceneObj()
+ var requestJson = HttpUtil.GetSignRequestJson(new UpdateChildAllowCreateSceneObj()
{
homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
childAccountId = childAccountId,
@@ -726,12 +721,12 @@
//string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
//return RequestHttps($"{severAddress}/ZigbeeDataShare/GetShareDataBySubAccount", jsonString, true);
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new HomeShareFindAll()
+ var requestJson = HttpUtil.GetSignRequestJson(new HomeShareFindAll()
{
homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID,
childAccountId = childAccountId
});
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_FindAll, requestJson);
}
@@ -816,7 +811,7 @@
homeId = shareData.homeId,
homeShareId = shareData.id
});
- return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
+ return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Home_Share_Delete, requestJson);
//Dictionary<string, string> d = new Dictionary<string, string>();
//d.Add("DistributedMark", shareData.DistributedMark);
//d.Add("HouseDistributedMark", shareData.HouseDistributedMark);
@@ -846,7 +841,7 @@
{
//娣诲姞瀛愯处鍙�
var requestObj = new ChildAddObj() { homeId = DB_ResidenceData.residenceData.residecenInfo.RegionID, account = subAccount, nickName = nickName };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
+ var requestJson = HttpUtil.GetSignRequestJson(requestObj);
return HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_Child_Add, requestJson);
}
@@ -861,316 +856,6 @@
d.Add("Account", account);
string jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(d);
return RequestHttps($"{severAddress}/ZigbeeUsers/GetSubAccountInfo", jsonString, true);
- }
-
- /// <summary>
- /// 涓嬭浇瀛愯处鍙风敤鎴峰ご鍍�
- /// </summary>
- /// <param name="subaccoun"></param>
- /// <returns></returns>
- public byte[] DownChildHeadImage(ResidenceMemberInfo subaccount)
- {
- var requestObj = new ChildBaseObj()
- {
- childAccountId = subaccount.childAccountId,
- homeId = subaccount.homeId
- };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- var replaceToken = "";
- if (DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
- {
- replaceToken = DB_ResidenceData.residenceData.MasterToken;
- }
- return HttpUtil.RequestHttpsDownload(NewAPI.API_POST_Child_DownloadHeadImage, requestJson,null);
- }
-
-
- #endregion
- /// <summary>
- /// 鑾峰彇MQTT杩滅▼杩炴帴淇℃伅鎺ュ彛
- /// </summary>
- public MqttInfo GetMqttRemoteInfo(string attachClientId)
- {
- try
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMqttRemoteInfoObj()
- {
- attachClientId = attachClientId,
- homeType = HomeTypeEnum.BUSPRO.ToString()
- });
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetMqttRemoteInfo, requestJson, DB_ResidenceData.residenceData.residecenInfo.regionUrl);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<MqttInfo>(revertObj.Data.ToString());
- }
- else
- {
- Utlis.WriteLine("GetMqttRemoteInfo error");
- return null;
- }
- }
- catch
- {
- return null;
- }
- }
-
- #region 鎺ㄩ��
- /// <summary>
- /// 鎻愪氦鎺ㄩ�侀渶瑕佺殑鍏抽敭鏍囪瘑淇℃伅
- /// </summary>
- public bool PushSerivceAddPushInfo()
- {
- try
- {
- string deviceType = PhoneDeviceType.Android.ToString();
-#if __IOS__
- deviceType = PhoneDeviceType.IOS.ToString();
-#endif
- //鏄惁鐢熸垚妯″紡
- bool isProduce = true;
-#if DEBUG
- isProduce = false;
-#endif
-
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushDeviceToken)) return false;
-
- var mAddpushinfoObj = new AddpushinfoObj()
- {
- pushToken = OnAppConfig.Instance.PushDeviceToken,
- deviceName = OnAppConfig.Instance.PhoneName,
- deviceType = deviceType,
- produce = isProduce,
-
- };
- var mAddpushinfoJson = Newtonsoft.Json.JsonConvert.SerializeObject(mAddpushinfoObj);
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_AddToken, mAddpushinfoJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- if (revertObj.Data != null)
- {
- var pushId = revertObj.Data.ToString();
- if (!string.IsNullOrEmpty(pushId))
- {
- OnAppConfig.Instance.PushId = pushId;
- OnAppConfig.Instance.SaveUserConfig();
- return true;
- }
- }
- Utlis.WriteLine("AddToken 鎴愬姛");
- }
- else
- {
- Utlis.WriteLine("AddToken 澶辫触");
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
-
- /// <summary>
- /// 鏌ヨ鎺ㄩ�佷俊鎭垪琛�
- /// </summary>
- /// <returns></returns>
- public ResponsePackNew PushSerivceGetpushmessagelist()
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new GetMessageListObj()
- {
- pushId = OnAppConfig.Instance.PushId
- });
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Getpushmessagelist, requestJson);
- }
-
- /// <summary>
- /// 娓呯┖娑堟伅璁板綍
- /// </summary>
- /// <returns></returns>
- public bool PushSerivceClearmessagelist()
- {
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
- {
- pushId = OnAppConfig.Instance.PushId
- });
-
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Clearmessagelist, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return true;
- }
- else
- {
-
- }
- return false;
- }
-
- /// <summary>
- /// 閫�鍑虹櫥褰曪紝娓呯┖鎺ㄩ�佹爣璇�
- /// </summary>
- /// <returns></returns>
- public bool PushSerivceSignOut()
- {
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
- try
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj() {
- pushId = OnAppConfig.Instance.PushId
- });
-
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_DeleteToken, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return true;
- }
- else
- {
-
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
-
- /// <summary>
- /// 鏍囪娑堟伅鍏ㄩ儴宸茶
- /// </summary>
- /// <param name="msgId"></param>
- /// <returns></returns>
- public bool PushSerivceMarkAllMessageRead()
- {
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
- try
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushIdObj()
- {
- pushId = OnAppConfig.Instance.PushId
- });
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_ALLMarkread, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return true;
- }
- else
- {
-
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
-
- /// <summary>
- /// 鏍囪鎸囧畾娑堟伅宸茶
- /// </summary>
- /// <param name="msgId"></param>
- /// <returns></returns>
- public bool PushSerivceMarkMessageRead(string msgId)
- {
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
- try
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
- {
- msgId = msgId
- });
-
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Markread, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return true;
- }
- else
- {
-
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
-
- /// <summary>
- /// 閫氳繃涓婚敭id鍒犻櫎涓�鏉℃帹閫佽褰�
- /// </summary>
- /// <param name="msgId"></param>
- /// <returns></returns>
- public bool PushSerivceDeleteMessage(string msgId)
- {
- if (string.IsNullOrEmpty(OnAppConfig.Instance.PushId)) return false;
-
- try
- {
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(new PushMsgIdObj()
- {
- msgId = msgId
- });
-
- var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_PushSerivce_Deletepushinfo, requestJson);
- if (revertObj.Code == StateCode.SUCCESS)
- {
- return true;
- }
- else
- {
-
- }
- return false;
- }
- catch
- {
- return false;
- }
- }
- #endregion
-
- #region 妫�娴嬫洿鏂�
- /// <summary>
- ///
- /// </summary>
- /// <returns></returns>
- public ResponsePackNew CheckAppVersion()
- {
- var requestObj = new ForceUpdateObj()
- {
- LanguageType = Utlis.GetPostLanguageType()
- };
-#if __IOS__
- requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
-#endif
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_CheckAppVersion, requestJson);
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <returns></returns>
- public ResponsePackNew GetAppVersion()
- {
- var requestObj = new ForceUpdateObj()
- {
-
- };
-#if __IOS__
- requestObj.DeviceType = PhoneDeviceType.IOS.ToString();
-#endif
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
- return HttpUtil.RequestHttpsPost(NewAPI.API_POST_GetAppVersion, requestJson);
}
#endregion
@@ -1290,33 +975,32 @@
#endregion
#region 澶囦唤閮ㄥ垎
- ///// <summary>
- ///// 鑾峰彇浣忓畢澶囦唤鍒楄〃
- ///// </summary>
- //public Dictionary<int, string> GetRegionLastBackupId()
- //{
- // //Dialog dialog = new Dialog();
- // //dialog.Show();
+ /// <summary>
+ /// 鑾峰彇浣忓畢澶囦唤鍒楄〃
+ /// </summary>
+ public Dictionary<int, string> GetRegionLastBackupId()
+ {
+ //Dialog dialog = new Dialog();
+ //dialog.Show();
- // Dictionary<int, string> backupList = new Dictionary<int, string>();
- // Dictionary<string, object> d = new Dictionary<string, object>();
- // d.Add("LevelID", DB_ResidenceData.residenceData.residecenInfo.RegionID);// 199200);
- // var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
- // var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder", requestJson, true);
- // if (revertObj == null || revertObj.ResponseData == null)
- // {
- // return new Dictionary<int, string>();
- // }
- // var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString());
- // foreach (var j in jt)
- // {
- // var folderId = (int)j.GetValue("FolderID");
- // var folderName = j.GetValue("FolderName").ToString();
- // backupList.Add(folderId, folderName);
- // }
- // return backupList;
- //}
-
+ Dictionary<int, string> backupList = new Dictionary<int, string>();
+ Dictionary<string, object> d = new Dictionary<string, object>();
+ d.Add("LevelID", DB_ResidenceData.residenceData.residecenInfo.RegionID);// 199200);
+ var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(d);
+ var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder", requestJson, true);
+ if (revertObj == null || revertObj.ResponseData == null)
+ {
+ return new Dictionary<int, string>();
+ }
+ var jt = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JObject>>(revertObj.ResponseData.ToString());
+ foreach (var j in jt)
+ {
+ var folderId = (int)j.GetValue("FolderID");
+ var folderName = j.GetValue("FolderName").ToString();
+ backupList.Add(folderId, folderName);
+ }
+ return backupList;
+ }
/* 2020-09-01 寮冪敤 鎭㈠鏃ф暟鎹姛鑳藉湪bus杞欢涓婂疄鐜�
/// <summary>
/// 鑾峰彇澶囦唤鏂囦欢鍒楄〃
@@ -1796,4 +1480,4 @@
}
-}
+}
\ No newline at end of file
diff --git "a/HDL_ON/DAL/Server/HttpServerRequest\347\232\204\345\211\257\346\234\254.cs" "b/HDL_ON/DAL/Server/HttpServerRequest\347\232\204\345\211\257\346\234\254.cs"
new file mode 100644
index 0000000..894adaa
--- /dev/null
+++ "b/HDL_ON/DAL/Server/HttpServerRequest\347\232\204\345\211\257\346\234\254.cs"
@@ -0,0 +1,168 @@
+锘�
+ #region 娉ㄥ唽銆佺櫥褰曢儴鍒�
+ /// <summary>
+ /// 璐﹀彿鐧诲綍-浣跨敤瀵嗙爜
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/Login";
+
+ /// <summary>
+ /// 楠岃瘉鐮佺櫥褰�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/LoginValidCode
+
+ /// <summary>
+ /// 鎵嬫満鍙风爜娉ㄥ唽
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/SignIn
+
+ ///鑾峰彇鍖哄煙浠ｇ爜
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/GetAreaCode
+
+ /// <summary>
+ /// 楠岃瘉鐭俊鎴栬�呴偖绠遍獙璇佺爜锛屼箣鍚庢敞鍐�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/ValidataCodeAndRegisterAccount
+
+
+ /// <summary>
+ /// 鑾峰彇娉ㄥ唽楠岃瘉鐮�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/RegisterSendVerCode
+
+ /// <summary>
+ /// 鑾峰彇鐧诲綍楠岃瘉鐮�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/LoginSendVerCode
+
+ /// <summary>
+ /// 鍙戦�侀獙璇佺爜
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/LoginSendVerCode
+
+ /// <summary>
+ /// 楠岃瘉楠岃瘉鐮�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/ValidatorCode
+
+ /// <summary>
+ /// 閲嶈瀵嗙爜
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/ResetPassword
+ #endregion
+
+ #region 涓汉淇℃伅閮ㄥ垎
+ /// <summary>
+ /// 鑾峰彇鐢ㄦ埛淇℃伅
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/GetAccountInfo
+
+ /// <summary>
+ /// 鏇存柊鐢ㄦ埛鏄电О
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/UpdateUserName
+
+ /// <summary>
+ /// 鏇存柊鐢ㄦ埛澶村儚
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/UpdateHeadImage
+
+ /// <summary>
+ /// 鏇存敼缁戝畾璐︽埛鐨勯偖绠辨垨鑰呮墜鏈哄彿
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/BindAccount
+ #endregion
+
+ #region 浣忓畢閮ㄥ垎
+ /// <summary>
+ /// 鑾峰彇浣忓畢鍒楄〃
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager
+ /// <summary>
+ /// 缂栬緫浣忓畢淇℃伅
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/EditHome
+
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/GetSubAccountByDistributedMark
+
+ /// <summary>
+ /// 鍒犻櫎浣忓畢涓嬬殑鎴愬憳璐﹀彿
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/DeletedSubAccount
+
+ /// <summary>
+ /// 淇敼瀛愯处鍙锋樀绉�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/EditSubAccountNickName
+ /// <summary>
+ /// 淇敼瀛愯处鍙峰垱寤哄満鏅潈闄�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/ChangeCreateSceneState
+
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/GetShareDataBySubAccount
+
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/GetOneShareData
+
+ /// <summary>
+ /// 澧炲姞鍏变韩鏁版嵁鍒楄〃
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/AddShareData
+
+ /// <summary>
+ /// 澧炲姞鍏变韩鏁版嵁
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/EditShareData
+
+ /// <summary>
+ /// 鍒犻櫎鍏变韩鏁版嵁
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/DeleteShareData
+ /// <summary>
+ /// 鍒犻櫎瀛愯处鍙峰綋鍓嶄綇瀹呯殑鎵�鏈夊叡浜暟鎹�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeDataShare/DeleteShareData
+
+ /// <summary>
+ /// 缁戝畾瀛愯处鍙峰埌浣忓畢涓�
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/BindSubAccount
+
+ /// <summary>
+ /// 鑾峰彇浣忓畢涓嬬殑鎴愬憳璐﹀彿
+ /// </summary>
+ //https://global.hdlcontrol.com/HangZhouHdlCloudApi/ZigbeeUsers/GetSubAccountInfo
+ #endregion
+
+ #region 鑾峰彇澶╂皵閮ㄥ垎
+ /// <summary>
+ /// 鑾峰彇鎸囧畾缁忕含搴︾殑鍩庡競淇℃伅
+ /// </summary>
+ //string url = $"https://developer.hdlcontrol.com/Weather/Weather/FindCity/?lon={lon}&lat={lat}";
+ //url = $"https://developer.hdlcontrol.com/Weather/Weather/GetAirQualityAndWeather/?cid={MainPage.cityInfo.cid}";
+
+ #endregion
+
+ #region 澶囦唤閮ㄥ垎
+ /// <summary>
+ /// 鑾峰彇浣忓畢澶囦唤鍒楄〃
+ /// </summary>
+ //var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/GetUserFolder
+
+ /// <summary>
+ /// 鑾峰彇澶囦唤鏂囦欢鍒楄〃
+ /// </summary>
+ //var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/UserBackupList
+
+ /// <summary>
+ /// 鑾峰彇澶囦唤鎴块棿鏁版嵁
+ /// </summary>
+ //var revertObj = RequestHttps("https://developer.hdlcontrol.com/api/BackupDetail
+ #endregion
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 6784b4c..cbc603d 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -555,3 +555,131 @@
}
+
+namespace Shared.Securitys
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public partial class EncryptionService
+ {
+ #region 鍔犲瘑
+ /// <summary>
+ /// 鍔犲瘑涓婚涓築ase64
+ /// </summary>
+ /// <param name="pToEncrypt"></param>
+ /// <param name="key"></param>
+ /// <returns></returns>
+ public static string AesEncryptTopic(string pToEncrypt, string key)
+ {
+ if (string.IsNullOrEmpty(pToEncrypt)) return null;
+ if (string.IsNullOrEmpty(key)) return pToEncrypt;
+ //闇�瑕佸姞瀵嗗唴瀹圭殑鏄庢枃娴�
+ Byte[] toEncryptArray = Encoding.UTF8.GetBytes(pToEncrypt);
+
+ //閰嶇疆AES鍔犲瘑Key(瀵嗛挜銆佸悜閲忋�佹ā寮忋�佸～鍏�)
+ RijndaelManaged rm = new RijndaelManaged
+ {
+ Key = Encoding.UTF8.GetBytes(key),
+ IV = Encoding.UTF8.GetBytes(key),
+ Mode = CipherMode.CBC,
+ Padding = PaddingMode.PKCS7
+ };
+
+ //鍒涘缓AES鍔犲瘑鍣ㄥ璞�
+ ICryptoTransform cTransform = rm.CreateEncryptor();
+
+ //浣跨敤AES灏嗘槑鏂囨祦杞垚瀵嗘枃瀛楄妭鏁扮粍
+ Byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
+
+ //灏咥ES鐢熸垚鐨勫瘑鏂囧瓧鑺傛暟缁勮浆鎴怋ase64瀛楃涓�
+ return Convert.ToBase64String(resultArray, 0, resultArray.Length);
+ }
+
+
+ /// <summary>
+ /// 鍔犲瘑璐熻浇涓轰簩杩涘埗娴�
+ /// </summary>
+ /// <param name="toEncryptArray"></param>
+ /// <param name="key"></param>
+ /// <returns></returns>
+ public static byte[] AesEncryptPayload(byte[] toEncryptArray, string key)
+ {
+ if (string.IsNullOrEmpty(key)) return toEncryptArray;
+ //閰嶇疆AES鍔犲瘑Key(瀵嗛挜銆佸悜閲忋�佹ā寮忋�佸～鍏�)
+ var rm = new RijndaelManaged
+ {
+ Key = Encoding.UTF8.GetBytes(key),
+ IV = Encoding.UTF8.GetBytes(key),
+ Mode = CipherMode.CBC,
+ Padding = PaddingMode.PKCS7
+ };
+
+ //鍒涘缓AES鍔犲瘑鍣ㄥ璞�
+ var cTransform = rm.CreateEncryptor();
+ //浣跨敤AES灏嗘槑鏂囨祦杞垚瀵嗘枃瀛楄妭鏁扮粍
+ return cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
+ }
+ #endregion
+
+
+ #region 瑙ｅ瘑
+ /// <summary>
+ /// 瑙ｅ瘑涓婚鏁版嵁
+ /// </summary>
+ /// <param name="pToDecrypt"></param>
+ /// <param name="key"></param>
+ /// <returns></returns>
+ public static string AesDecryptTopic(string pToDecrypt, string key)
+ {
+ //AES瀵嗘枃Base64杞垚瀛楃涓�
+ Byte[] toEncryptArray = Convert.FromBase64String(pToDecrypt);
+
+ //閰嶇疆AES鍔犲瘑Key(瀵嗛挜銆佸悜閲忋�佹ā寮忋�佸～鍏�)
+ RijndaelManaged rm = new RijndaelManaged
+ {
+ Key = Encoding.UTF8.GetBytes(key),
+ IV = Encoding.UTF8.GetBytes(key),
+ Mode = CipherMode.CBC,
+ Padding = PaddingMode.PKCS7
+ };
+
+ //鍒涘缓AES瑙ｅ瘑鍣ㄥ璞�
+ ICryptoTransform cTransform = rm.CreateDecryptor();
+
+ //浣跨敤AES灏嗗瘑鏂囨祦杞垚鏄庢枃鐨勫瓧鑺傛暟缁�
+ Byte[] resultArray = cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
+
+ //杞垚瀛楃涓�
+ return Encoding.UTF8.GetString(resultArray);
+ }
+
+ /// <summary>
+ /// 閲囩敤Aes瑙ｅ瘑璐熻浇鏁版嵁
+ /// </summary>
+ /// <param name="toEncryptArray"></param>
+ /// <param name="key"></param>
+ /// <returns></returns>
+ public static byte[] AesDecryptPayload(byte[] toEncryptArray, string key)
+ {
+ //閰嶇疆AES鍔犲瘑Key(瀵嗛挜銆佸悜閲忋�佹ā寮忋�佸～鍏�)
+ var rm = new RijndaelManaged
+ {
+ Key = Encoding.UTF8.GetBytes(key),
+ IV = Encoding.UTF8.GetBytes(key),
+ Mode = CipherMode.CBC,
+ Padding = PaddingMode.PKCS7
+ };
+
+ //鍒涘缓AES瑙ｅ瘑鍣ㄥ璞�
+ var cTransform = rm.CreateDecryptor();
+
+ //浣跨敤AES灏嗗瘑鏂囨祦杞垚鏄庢枃鐨勫瓧鑺傛暟缁�
+ return cTransform.TransformFinalBlock(toEncryptArray, 0, toEncryptArray.Length);
+ }
+ #endregion
+
+
+
+ }
+}
diff --git a/HDL_ON/DAL/Server/IMessageCommon.cs b/HDL_ON/DAL/Server/IMessageCommon.cs
index 5b9e64d..cc5f79c 100644
--- a/HDL_ON/DAL/Server/IMessageCommon.cs
+++ b/HDL_ON/DAL/Server/IMessageCommon.cs
@@ -9,7 +9,7 @@
/// </summary>
public class IMessageCommon
{
-
+
/// <summary>
/// 鎺ュ彛绫荤殑杩斿洖淇℃伅
/// </summary>
@@ -30,12 +30,6 @@
return m_Current;
}
}
-
- /// <summary>
- /// 鏄惁鍦ㄨ幏鍙杢oken
- /// </summary>
- public bool isGetingToken;
-
/// <summary>
/// 鏃犺閿欒(璁块棶浜戠鏃讹紝姝ゆ搷浣滃皢涓嶄細寮瑰嚭閿欒)
/// </summary>
@@ -75,7 +69,7 @@
//楠岃瘉鐮佸彂閫侀绻侊紝璇风◢鍚庡啀璇曪紒
stateCodeDic["15"] = HDL_ON.StringId.VerificationCodeSentFrequently;
//浼氳瘽瓒呮椂锛岃鏇存柊token
- stateCodeDic[StateCode.TOKEN_EXPIRED] = HDL_ON.StringId.NotLogin;
+ stateCodeDic["10001"] = HDL_ON.StringId.NotLogin;
////鐧诲綍澶辫触锛岃处鍙锋垨鑰呭瘑鐮侀敊璇�
stateCodeDic["10008"] = HDL_ON.StringId.LoginFailed_AccountOrPasswordError;
//璐﹀彿涓嶅瓨鍦�
@@ -237,72 +231,32 @@
{
try
{
- //濡傛灉鏄痶oken杩囨湡鍒欏埛鏂皌oken
- if (statuCode == StateCode.TOKEN_EXPIRED)
+ string mes = GetMsgByRequestName(statuCode);
+ if (mes == null) return;
+ if (!string.IsNullOrEmpty(tipStr))
{
- StartRefreshToken();
+ mes = tipStr + "\n" + mes;
+ }
+ if (isTipStyle)
+ {
+ Application.RunOnMainThread(() => {
+ var tip = new Tip()
+ {
+ Text = mes,
+ CloseTime = closeTime,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(MainPage.BaseView);
+ });
}
else
{
- string mes = GetMsgByRequestName(statuCode);
- if (mes == null) return;
- if (!string.IsNullOrEmpty(tipStr))
- {
- mes = tipStr + "\n" + mes;
- }
- if (isTipStyle)
- {
- Application.RunOnMainThread(() =>
- {
- var tip = new Tip()
- {
- Text = mes,
- CloseTime = closeTime,
- Direction = AMPopTipDirection.None
- };
- tip.Show(MainPage.BaseView);
- });
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Alert("", mes, Language.StringByID(HDL_ON.StringId.Close)).Show();
- });
- }
+ Application.RunOnMainThread(() => {
+ new Alert("", mes, Language.StringByID(HDL_ON.StringId.Close)).Show();
+ });
}
}
catch { }
- }
-
- /// <summary>
- /// StartRefreshToken
- /// </summary>
- public void StartRefreshToken()
- {
- if (isGetingToken) return;
-
- new System.Threading.Thread(() =>
- {
- isGetingToken = true;
-
- try
- {
- var success = new HttpServerRequest().RefreshToken();
- if (success) {
- Utlis.WriteLine("RefreshToken success");
- }
- }
- catch
- {
- }
- finally
- {
- isGetingToken = false;
- }
- })
- { IsBackground = true }.Start();
-
}
}
@@ -316,14 +270,9 @@
/// </summary>
public const string SUCCESS = "0";
/// <summary>
- /// 浼氳瘽瓒呮椂锛岃鏇存柊token
- /// </summary>
- public const string TOKEN_EXPIRED = "10001";
- /// <summary>
/// 璐﹀彿涓嶅瓨鍦ㄧ殑閿欒鐮�
/// </summary>
public const string ACCOUNT_NOT_EXIST = "10010";
-
}
}
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 22ce041..f4a3187 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -118,10 +118,7 @@
/// 瀛愯处鍙风鐞嗗憳鑾峰彇涓昏处鍙锋巿鏉僒oken
/// </summary>
public const string API_POST_Child_GetMasterToken = "/home-wisdom/child/account/masterToken/get";
- /// <summary>
- /// 涓嬭浇瀛愯处鍙峰ご鍍�
- /// </summary>
- public const string API_POST_Child_DownloadHeadImage = "/home-wisdom/child/account/getHeadPortrait";
+
#region 鏁版嵁鍒嗕韩
/// <summary>
/// 鍒嗕韩鎸囧畾鏂囦欢缁欐寚瀹氭垚鍛�
@@ -246,46 +243,39 @@
#endregion
- #region 鈻� PushSerivce -- 鎺ㄩ�佹湇鍔℃帴鍙__________________________
+ #region 鈻� pushserivce -- 鎺ㄩ�佹湇鍔℃帴鍙__________________________
/// <summary>
- /// 娣诲姞鎺ㄩ�乀oken
+ /// 娣诲姞鎺ㄩ�佹秷鎭�
/// </summary>
- public const string API_POST_PushSerivce_AddToken = "/smart-footstone/app/push-information/add";
- /// <summary>
- /// 鍒犻櫎鎺ㄩ�乀oken
- /// </summary>
- public const string API_POST_PushSerivce_DeleteToken = "/smart-footstone/app/push-information/delete";
- /// <summary>
- /// 鑾峰彇鎺ㄩ�佹秷鎭褰�
- /// </summary>
- public const string API_POST_PushSerivce_Getpushmessagelist = "/smart-footstone/app/message/list";
+ public const string API_POST_Pushserivce_Addpushinfo = "/pushserivce/V1/addpushinfo";
+
/// <summary>
/// 娓呯┖鎺ㄩ�佺殑娑堟伅璁板綍
/// </summary>
- public const string API_POST_PushSerivce_Clearmessagelist = "/smart-footstone/app/message/clear";
+ public const string API_DELETE_Pushserivce_Clearmessagelist = "/pushserivce/V1/clearmessagelist/{pushId}";
+
+ /// <summary>
+ /// 鍒犻櫎鎺ㄩ�佹秷鎭�
+ /// </summary>
+ public const string API_DELETE_Pushserivce_Deletepushinfo = "/pushserivce/V1/deletepushinfo/{pushId}";
+
+ /// <summary>
+ /// 鑾峰彇鎺ㄩ�佹秷鎭褰�
+ /// </summary>
+ public const string API_GET_Pushserivce_Getpushmessagelist = "/pushserivce/V1/getpushmessagelist/{pushId}";
+
/// <summary>
/// 鏍囪娑堟伅宸茶
/// </summary>
- public const string API_POST_PushSerivce_Markread = "/smart-footstone/app/message/read";
- /// <summary>
- /// 鏍囪娑堟伅鍏ㄩ儴宸茶
- /// </summary>
- public const string API_POST_PushSerivce_ALLMarkread = "/smart-footstone/app/message/read_all";
- /// <summary>
- /// 閫氳繃涓婚敭id鍒犻櫎涓�鏉℃帹閫佽褰�
- /// </summary>
- public const string API_POST_PushSerivce_Deletepushinfo = "/smart-footstone/app/message/delete_by_id";
+ public const string API_PUT_Pushserivce_Markread = "/pushserivce/V1/markread/{pushId}";
#endregion
#region 鈻� -- 妫�娴嬫洿鏂版帴鍙__________________________
/// <summary>
- /// 妫�娴嬫洿鏂�,鏄惁闇�瑕佸己鍒舵洿鏂�
+ /// 妫�娴嬫洿鏂�
/// </summary>
- public const string API_POST_CheckAppVersion= "/smart-footstone/app/checkAppVersion";
- /// <summary>
- /// 鏌ヨAPP鏈�鏂扮増鏈�
- /// </summary>
- public const string API_POST_GetAppVersion = "/smart-footstone/app/getAppVersion";
+ public const string API_POST_CheckAppVersion= "/speakerservices/BatchEdit_V2";
+
#endregion
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 8f5bf92..6703451 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -944,8 +944,16 @@
/// 鏌ヨ鏌愪綇瀹呮煇瀛愯处鍙风殑鍒嗕韩鏂囦欢淇℃伅
/// </summary>
[System.Serializable]
- public class HomeShareFindAll : ChildBaseObj
+ public class HomeShareFindAll
{
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
+ /// <summary>
+ /// 瀛愯处鍙穒d
+ /// </summary>
+ public string childAccountId;
}
@@ -1024,7 +1032,7 @@
/// </summary>
public string deviceName;
/// <summary>
- /// Android銆両OS銆乄inPhone
+ ///
/// </summary>
public string deviceType;
/// <summary>
@@ -1034,50 +1042,23 @@
/// <summary>
/// 鎺ㄩ�両D
/// </summary>
- public string pushToken;
+ public string pushid;
/// <summary>
- /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+ /// 1鏄疕DL_ON銆�2HDL_Zigbee
/// </summary>
- public string software = SoftwareType.ON_Plus.ToString();
+ //public string software = MainPage.RequestSource;
+ public string software = "HDL_ON";
}
- /// <summary>
- ///
- /// </summary>
+
[System.Serializable]
- public class PushIdObj
+ public class PushserivceIdObj
{
/// <summary>
///
/// </summary>
- public string pushId;
+ public string id;
}
-
- /// <summary>
- ///
- /// </summary>
- [System.Serializable]
- public class GetMessageListObj: PushIdObj
- {
- /// <summary>
- /// 浣忓畢涓婚敭id
- /// 1銆佷紶绌烘煡璇㈠叏閮紙闇�瑕佹牴鎹敤鎴峰煙鍚嶆煡璇級 2銆佷紶鎸囧畾浣忓畢ID鏌ヨ鎸囧畾璁板綍 锛堥渶瑕佹牴鎹綇瀹呭煙鍚嶆煡璇級
- /// </summary>
- public string homeId;
- }
-
- /// <summary>
- /// 娑堟伅璁板綍Id
- /// </summary>
- [System.Serializable]
- public class PushMsgIdObj
- {
- /// <summary>
- /// 娑堟伅璁板綍Id
- /// </summary>
- public string msgId;
- }
-
///// <summary>
///// 鎺ㄩ�佹秷鎭垪琛�
@@ -1142,21 +1123,24 @@
{
/// <summary>
/// 鎵嬫満绫诲瀷
- /// Android銆両OS銆乄inPhone
+ ///
+ /// 0鏄痠OS
+ /// 1鏄疉ndroid
+ /// 2鏄疉ndroid 鏂扮殑鍖呭悕鐗堟湰
/// </summary>
- public string DeviceType = PhoneDeviceType.Android.ToString();
+ public int DeviceType = 0;
/// <summary>
///
/// </summary>
public string RequestVersion = MainPage.VersionString;
/// <summary>
- /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+ ///
/// </summary>
- public string Software = SoftwareType.ON_Plus.ToString();
+ public string RequestSource = MainPage.ClientType;
/// <summary>
/// 璇█
/// </summary>
- public string LanguageType;
+ public string languageType;
}
/// <summary>
@@ -1165,16 +1149,35 @@
public class ForceUpdateInfo
{
- ///// <summary>
- ///// 闇�瑕佸己鍒舵洿鏂�
- ///// </summary>
- //public bool IsNeedForceUpdate;
/// <summary>
- /// 1.鎻愮ず鏇存柊鐨勫唴瀹�
- /// 2.寮哄埗鏇存柊鍘熷洜
- /// 3.鎻愮ず鐨勯�氱煡鍐呭
+ /// 闇�瑕佸己鍒舵洿鏂�
+ /// </summary>
+ public bool IsNeedForceUpdate;
+
+ /// <summary>
+ /// 寮哄埗鏇存柊鍘熷洜
/// </summary>
public string ReasonStr;
+ /// <summary>
+ /// 寮哄埗鏇存柊鍘熷洜
+ /// </summary>
+ public string ReasonStr_En;
+
+ /// <summary>
+ /// 鏂扮増鏈琲OS App Store涓嬭浇鍦板潃
+ /// </summary>
+ public string IosUrl;
+
+ /// <summary>
+ /// 鏂扮増鏈珹ndroid搴旂敤甯傚満涓嬭浇鍦板潃
+ /// </summary>
+ public string AndroidUrl;
+
+ /// <summary>
+ /// 鏂扮増鏈珹ndroid 鑻辨枃搴旂敤甯傚満涓嬭浇鍦板潃 Google Play
+ /// </summary>
+ public string AndroidUrl_En;
+
/// <summary>
/// O 涓嶉渶瑕佹洿鏂�
/// 1 鎻愮ず鏇存柊
@@ -1182,35 +1185,13 @@
/// 3 鎻愮ず閫氱煡鍐呭
/// </summary>
public int UpdateType;
+
/// <summary>
/// 褰撳墠鏂扮増鏈彿
/// </summary>
public string NewVersion;
- /// <summary>
- /// 褰撳墠鏂扮増鏈彿
- /// </summary>
- public string NewVersionUrl;
}
-
- /// <summary>
- /// 妫�娴婣PP鐗堟湰 鍝嶅簲鍙傛暟
- /// 濡傛灉鏄痠OS杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
- /// 濡傛灉鏄疉ndroid杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
- /// </summary>
- public class APPVersion
- {
- /// <summary>
- /// 褰撳墠鏈�鏂扮殑鐗堟湰鍙�
- /// </summary>
- public string NewVersion;
-
- /// <summary>
- /// 褰撳墠鏈�鏂扮増鏈笅杞藉湴鍧�
- /// </summary>
- public string NewVersionUrl;
- }
-
#endregion
diff --git a/HDL_ON/Entity/OnAppConfig.cs b/HDL_ON/Entity/OnAppConfig.cs
index d77875c..5b40237 100644
--- a/HDL_ON/Entity/OnAppConfig.cs
+++ b/HDL_ON/Entity/OnAppConfig.cs
@@ -55,14 +55,6 @@
/// 淇℃伅鎺ㄩ�佹爣璁�
/// </summary>
public string PushDeviceToken;
- /// <summary>
- /// phoneName
- /// </summary>
- public string PhoneName;
- /// <summary>
- /// 娣诲姞鎺ㄩ�乀oken鎴愬姛鏃惰繑鍥炵殑Id
- /// </summary>
- public string PushId;
public string SetLanguage = "";
diff --git a/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs b/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
index 7c4961b..e55a923 100644
--- a/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
+++ b/HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs
@@ -191,10 +191,10 @@
/// 浣忓畢鍖哄煙鍚嶅瓧
/// </summary>
public string homeRegionName;
- /// <summary>
- /// 鏄惁缁戝畾缃戝叧
- /// </summary>
- public bool isBindGateway;
+ ///// <summary>
+ ///// 鏄惁缁戝畾缃戝叧
+ ///// </summary>
+ //public bool isBindGateway;
/// <summary>
/// 浣忓畢鍦板潃
/// </summary>
diff --git a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
index f049bc2..28a173c 100644
--- a/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
+++ b/HDL_ON/Entity/ResponseEntity/ResidenceMemberInfo.cs
@@ -80,43 +80,14 @@
/// </summary>
public string createTime;
/// <summary>
+ /// 鐢ㄦ埛璐﹀彿
+ /// </summary>
+ public string Account = "";
+ /// <summary>
/// 鐢ㄦ埛鍚嶅瓧
/// </summary>
public string UserName = "";
- /// <summary>
- ///
- /// </summary>
- public string childAccountEmail;
- /// <summary>
- ///
- /// </summary>
- public string childAccountPhone;
- /// <summary>
- /// 鐢ㄦ埛璐﹀彿
- /// 浼樺厛鏄剧ず鎵嬫満鍙凤紝濡傛灉鎵嬫満鍙蜂负绌哄垯鏄剧ず閭鍦板潃
- /// </summary>
- public string Account
- {
- get
- {
- if (!string.IsNullOrEmpty(childAccountPhone))
- {
- return childAccountPhone;
- }
- else
- {
- if (!string.IsNullOrEmpty(childAccountEmail))
- {
- return childAccountEmail;
- }
- else
- {
- return "";
- }
- }
- }
- }
}
public class ShareData
diff --git a/HDL_ON/Entity/UserInfo.cs b/HDL_ON/Entity/UserInfo.cs
index 41c601a..8a0552d 100644
--- a/HDL_ON/Entity/UserInfo.cs
+++ b/HDL_ON/Entity/UserInfo.cs
@@ -152,7 +152,7 @@
/// <summary>
/// UserType B绔处鍙� C绔处鍙�
/// </summary>
- public string userType = "USER_C";
+ public string userType = "C";
/// <summary>
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index 2029728..074d27e 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -169,8 +169,6 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Scene\SetSceneLocationPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\AutomationMenuPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupportPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)DriverLayer\Control_TcpClient.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)DriverLayer\Control_TcpServer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Panel\PanelPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SearchDevice\SearchDevicePage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\SearchDevice\VoicePanelScenePage.cs" />
@@ -186,6 +184,9 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\NewBindAccountPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\NewBindVerificationCodePage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\HDLCommon.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\LineView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\ConfirmDialog.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\WebViewDialog.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\Constant.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\TextButton.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI1-Login\SelectServerDialog.cs" />
@@ -199,23 +200,6 @@
<Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\UdpSocket.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\A_Protocol_Common.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DAL\Mqtt\MqttClient.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MyQRCodePage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\ListCellView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\UpdateTipDialog.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MyServerInfoPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\AboutOnPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\FunctionIntroductionPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\ComplaintsPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\EmptyTipView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\LineView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\ConfirmDialog.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\WebViewDialog.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\FAQHelpPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\ListIconCellView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\QuestionListPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\GetSupportPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\TransferConfirmPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\ConfirmButton.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)UI\" />
@@ -243,8 +227,5 @@
<Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI0-Public\Widget\" />
<Folder Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\" />
- <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AboutOn\" />
- <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\" />
- <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\RoomListManage\Transfer\" />
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index bb50cbc..dc9f64e 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -1,4 +1,4 @@
-using System;
+锘縰sing System;
using System.Collections.Generic;
using HDL_ON.DAL;
using HDL_ON.UI;
@@ -27,11 +27,10 @@
/// 鐗堟湰鍙�
/// </summary>
public static string VersionString = "1.0.0924";
- ///// <summary>
- ///// 瀹㈡埛绔被鍨�
- ///// </summary>
- //public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
-
+ /// <summary>
+ /// 瀹㈡埛绔被鍨�
+ /// </summary>
+ public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
/// <summary>
///
/// </summary>
@@ -94,21 +93,18 @@
}
else
{
-
- new System.Threading.Thread(() =>
- {
- var pm = new DAL.Server.HttpServerRequest();
- pm.RefreshToken();//鍒锋柊Token
- pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- })
- { IsBackground = true }.Start();
new System.Threading.Thread(() =>
{
var pm =new DAL.Server.HttpServerRequest();
pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
})
{ IsBackground = true }.Start();
-
+ new System.Threading.Thread(() =>
+ {
+ var pm = new DAL.Server.HttpServerRequest();
+ pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+ })
+ { IsBackground = true }.Start();
GoUserPage();
//鍚姩瀵嗙爜楠岃瘉
new AppUnlockPage().LoadPage();
diff --git a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs b/HDL_ON/UI/UI0-Public/ConfirmDialog.cs
similarity index 70%
rename from HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
rename to HDL_ON/UI/UI0-Public/ConfirmDialog.cs
index 40f7b1d..e3e2527 100644
--- a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
+++ b/HDL_ON/UI/UI0-Public/ConfirmDialog.cs
@@ -6,7 +6,7 @@
{
/// <summary>
/// 閫氱敤浜屾纭鐣岄潰
- /// 鍙互鑷畾涔夋寜閽枃瀛椼�佹彁绀哄唴瀹规敮鎸佸琛屾樉绀�
+ /// 鍙互鑷畾涔夋寜閽枃瀛�
/// </summary>
public class ConfirmDialog : Dialog
{
@@ -15,20 +15,21 @@
/// </summary>
public ConfirmDialog()
{
-
+
}
/// <summary>
/// 鍒濆鍖朌ialog
/// </summary>
- /// <param name="titleStr"></param>
- /// <param name="msgStr"></param>
+ /// <param name="titleId"></param>
+ /// <param name="msgId"></param>
/// <param name="okAction"></param>
/// <param name="cancelAction"></param>
/// <param name="cancelID"></param>
/// <param name="confirmID"></param>
- void ShowDialogBase(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID = StringId.Cancel, int confirmID = StringId.Confirm)
+ void ShowDialogBase(int titleId, int msgId, Action okAction, Action cancelAction, int cancelID = StringId.Cancel, int confirmID = StringId.Confirm)
{
+
this.BackgroundColor = CSS_Color.DialogTransparentColor1;
FrameLayout contentView = new FrameLayout()
@@ -45,28 +46,26 @@
Button btnTitle = new Button()
{
- Y = Application.GetRealHeight(20),
- Height = Application.GetRealHeight(22),
+ Y = Application.GetRealHeight(16),
+ Height = Application.GetRealHeight(30),
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.SubheadingFontSize,
TextAlignment = TextAlignment.Center,
IsBold = true,
- Text = titleStr,
+ TextID = titleId,
};
contentView.AddChidren(btnTitle);
- //鎻愮ず鍐呭鎸夐挳
Button btnMsg = new Button()
{
- Y = btnTitle.Bottom + Application.GetRealHeight(4),
- X = Application.GetRealWidth(6),
- Height = Application.GetRealHeight(46),
- Width = Application.GetRealWidth(258),
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealHeight(25),
+ Y = btnTitle.Bottom,
+ Width = Application.GetRealHeight(200),
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = msgStr,
- IsMoreLines = true,
+ TextID = msgId,
};
contentView.AddChidren(btnMsg);
@@ -108,7 +107,7 @@
//渚嬶細鍙充笅鍦嗚 澶у皬涓�50
int mRectCornerID = HDLUtils.RectCornerBottomRight;
btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
-
+
btnCancel.MouseUpEventHandler += (sender, e) =>
{
this.Close();
@@ -132,7 +131,7 @@
/// <param name="callBackAction"></param>
public void ShowDialog(int titleId, int msgId, Action okAction, Action cancelAction = null)
{
- this.ShowDialogBase(Language.StringByID(titleId), Language.StringByID(msgId), okAction, cancelAction);
+ this.ShowDialogBase(titleId, msgId, okAction, cancelAction);
}
/// <summary>
@@ -147,33 +146,7 @@
/// <param name="confirmID"></param>
public void ShowDialog(int titleId, int msgId, Action okAction, Action cancelAction, int cancelID, int confirmID)
{
- this.ShowDialogBase(Language.StringByID(titleId), Language.StringByID(msgId), okAction, cancelAction, cancelID, confirmID);
- }
-
- /// <summary>
- /// 鍔犺浇鎻愮ずDialog
- /// </summary>
- /// <param name="titleId"></param>
- /// <param name="msgId"></param>
- /// <param name="callBackAction"></param>
- public void ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction = null)
- {
- this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction);
- }
-
- /// <summary>
- /// 鍔犺浇鎻愮ずDialog
- /// 鍙互鑷畾涔夋寜閽枃瀛�
- /// </summary>
- /// <param name="titleStr"></param>
- /// <param name="msgStr"></param>
- /// <param name="okAction"></param>
- /// <param name="cancelAction"></param>
- /// <param name="cancelID"></param>
- /// <param name="confirmID"></param>
- public void ShowDialog(string titleStr, string msgStr, Action okAction, Action cancelAction, int cancelID, int confirmID)
- {
- this.ShowDialogBase(titleStr, msgStr, okAction, cancelAction, cancelID, confirmID);
+ this.ShowDialogBase(titleId, msgId, okAction, cancelAction, cancelID, confirmID);
}
}
diff --git a/HDL_ON/UI/UI0-Public/LineView.cs b/HDL_ON/UI/UI0-Public/LineView.cs
new file mode 100644
index 0000000..eaf0f04
--- /dev/null
+++ b/HDL_ON/UI/UI0-Public/LineView.cs
@@ -0,0 +1,20 @@
+锘縰sing System;
+using Shared;
+using HDL_ON.UI.CSS;
+
+namespace HDL_ON.UI
+{
+ /// <summary>
+ /// 閫氱敤LineView
+ /// </summary>
+ public class LineView : FrameLayout
+ {
+ public LineView()
+ {
+ X = Application.GetRealWidth(16);
+ Height = Application.GetRealHeight(1);
+ Width = Application.GetRealWidth(343);
+ BackgroundColor = CSS_Color.DividingLineColor;
+ }
+ }
+}
diff --git a/HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs b/HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs
index 7c0c2de..9b7a74f 100644
--- a/HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs
+++ b/HDL_ON/UI/UI0-Public/OperationSuccessPromptPage.cs
@@ -68,8 +68,8 @@
Y = Application.GetRealHeight(401),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
BackgroundColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.MainBackgroundColor,
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index b274695..0b31b9d 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -101,7 +101,7 @@
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(30),
- Width = Application.GetRealWidth(270),
+ Width = Application.GetRealWidth(150),
Height = Application.GetRealHeight(25),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.HeadlineFontSize,
diff --git a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs b/HDL_ON/UI/UI0-Public/WebViewDialog.cs
similarity index 73%
rename from HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
rename to HDL_ON/UI/UI0-Public/WebViewDialog.cs
index 926ef73..7845cdf 100644
--- a/HDL_ON/UI/UI0-Public/Widget/WebViewDialog.cs
+++ b/HDL_ON/UI/UI0-Public/WebViewDialog.cs
@@ -10,27 +10,21 @@
/// </summary>
public class WebViewDialog : Dialog
{
- /// <summary>
- /// bodyView
- /// </summary>
FrameLayout bodyView;
-
- /// <summary>
- /// WebViewDialog
- /// </summary>
public WebViewDialog()
{
bodyView = new FrameLayout();
}
+
/// <summary>
- /// 鍔犺浇椤甸潰
+ ///
/// </summary>
/// <param name="titleStr"></param>
/// <param name="url"></param>
public void LoadPage(string titleStr, string url)
{
- bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
+ bodyView.BackgroundColor = CSS_Color.BackgroundColor;
this.AddChidren(bodyView);
new TopViewDiv(this, bodyView, titleStr).LoadTopView();
@@ -38,11 +32,8 @@
var webView = new WebView() {
Y = Application.GetRealHeight(64),
Height = bodyView.Height - Application.GetRealHeight(64),
- X = Application.GetRealWidth(16),
- Width = bodyView.Width - Application.GetRealWidth(32)
};
bodyView.AddChidren(webView);
-
//鍔犺浇缃戝潃
webView.LoadRequest(url);
this.Show();
diff --git a/HDL_ON/UI/UI0-Public/Widget/ConfirmButton.cs b/HDL_ON/UI/UI0-Public/Widget/ConfirmButton.cs
deleted file mode 100644
index 32b2f6e..0000000
--- a/HDL_ON/UI/UI0-Public/Widget/ConfirmButton.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.CSS;
-using Shared;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 閫氱敤纭鎸夐挳
- /// </summary>
- public class ConfirmButton : Button
- {
- public ConfirmButton()
- {
- Gravity = Gravity.CenterHorizontal;
- Width = Application.GetRealWidth(220);
- Height = Application.GetRealWidth(44);
- BackgroundColor = CSS_Color.MainColor;
- TextAlignment = TextAlignment.Center;
- TextColor = CSS_Color.MainBackgroundColor;
- TextSize = CSS_FontSize.SubheadingFontSize;
- IsBold = true;
- Radius = (uint)Application.GetRealWidth(22);
- BorderColor = 0x00000000;
- BorderWidth = 0;
-
- }
- }
-}
diff --git a/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs b/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
deleted file mode 100644
index 877297c..0000000
--- a/HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.CSS;
-using Shared;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 閫氱敤鎻愮ずView--鍐呭涓虹┖
- /// 绌虹┖濡備篃
- /// </summary>
- public class EmptyTipView : FrameLayout
- {
- /// <summary>
- /// 鎻愮ず鏂囧瓧
- /// </summary>
- public Button BtnTipNotText;
-
- /// <summary>
- /// 鎻愮ず鍥剧墖
- /// </summary>
- public Button BtnTipNot;
-
- /// <summary>
- ///
- /// </summary>
- public EmptyTipView()
- {
- int tipHeight = Application.GetRealWidth(180);
-
- this.Height = tipHeight + Application.GetRealHeight(17);
-
- BtnTipNot = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Width = tipHeight,
- Height = tipHeight,
- UnSelectedImagePath = "TipNot.png",
- };
- this.AddChidren(BtnTipNot);
-
- //绌虹┖濡備篃
- Button btnTipNotText = new Button()
- {
- Y = tipHeight,
- Height = Application.GetRealHeight(17),
- TextID = StringId.ContentIsEmpty,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- };
- this.AddChidren(btnTipNotText);
- }
-
- }
-}
diff --git a/HDL_ON/UI/UI0-Public/Widget/LineView.cs b/HDL_ON/UI/UI0-Public/Widget/LineView.cs
deleted file mode 100644
index 7ceef9c..0000000
--- a/HDL_ON/UI/UI0-Public/Widget/LineView.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-锘縰sing System;
-using Shared;
-using HDL_ON.UI.CSS;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 閫氱敤LineView
- /// 鍒嗗壊绾縑iew
- /// </summary>
- public class LineView : FrameLayout
- {
- //public LineView()
- //{
- // X = Application.GetRealWidth(16);
- // Height = Application.GetRealHeight(1);
- // Width = Application.GetRealWidth(343);
- // BackgroundColor = CSS_Color.DividingLineColor;
- //}
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="parentHeight"></param>
- public LineView(int parentHeight)
- {
- X = Application.GetRealWidth(16);
- Height = Application.GetRealHeight(1);
- Width = Application.GetRealWidth(343);
- BackgroundColor = CSS_Color.DividingLineColor;
- Y = parentHeight - Height;
- }
- }
-}
diff --git a/HDL_ON/UI/UI0-Public/Widget/ListCellView.cs b/HDL_ON/UI/UI0-Public/Widget/ListCellView.cs
deleted file mode 100644
index db429f7..0000000
--- a/HDL_ON/UI/UI0-Public/Widget/ListCellView.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.CSS;
-using Shared;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 閫氱敤ListCellView
- /// 鏀寔瀹氫箟 涓绘爣棰樸�佸壇鏍囬銆乬o鍥炬爣銆佷笅鍒掔嚎銆佺偣鍑讳簨浠�
- /// </summary>
- public class ListCellView : FrameLayout
- {
- /// <summary>
- /// 鏍囬
- /// </summary>
- public Button BtnTilte;
- /// <summary>
- /// 鍓爣棰�
- /// </summary>
- public Button BtnSubtitle;
- /// <summary>
- /// 绠ご鍥炬爣
- /// </summary>
- public Button BtnGo;
- /// <summary>
- /// 鍒嗗壊绾�
- /// </summary>
- public LineView LineView;
- /// <summary>
- /// 鐐瑰嚮瑙﹀彂瀵逛簨浠�
- /// </summary>
- public Action GoAction;
-
-
- /// <summary>
- /// ListCellView 榛樿
- /// </summary>
- public ListCellView()
- {
- ShowView();
- }
-
- /// <summary>
- /// ListCellView 鎸囧畾鍙傛暟
- /// </summary>
- /// <param name="tilteText"></param>
- /// <param name="subtitleText"></param>
- /// <param name="action"></param>
- /// <param name="isShowImageBtn"></param>
- public ListCellView(string tilteText, string subtitleText, Action action, bool isShowImageBtn = true)
- {
-
- ShowView(tilteText, subtitleText, action, isShowImageBtn);
- }
-
- /// <summary>
- ///
- /// </summary>
- /// <param name="tilteText"></param>
- /// <param name="subtitleText"></param>
- /// <param name="action"></param>
- /// <param name="isShowImageBtn"></param>
- void ShowView(string tilteText = "", string subtitleText = "", Action action = null, bool isShowImageBtn = true)
- {
- this.BackgroundColor = CSS_Color.MainBackgroundColor;
- this.Height = Application.GetRealHeight(50);
- this.GoAction = action;
- /// <summary>
- /// 鏍囬
- /// </summary>
- BtnTilte = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(120),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- Text = tilteText,
- };
- this.AddChidren(BtnTilte);
- /// <summary>
- /// 鍓爣棰�
- /// </summary>
- BtnSubtitle = new Button()
- {
- X = Application.GetRealWidth(100),
- Width = Application.GetRealWidth(230),
- TextAlignment = TextAlignment.CenterRight,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.TextFontSize,
- Text = subtitleText,
-
- };
- this.AddChidren(BtnSubtitle);
-
- /// <summary>
- /// 鍓嶈繘鍥炬爣
- /// </summary>
- BtnGo = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
-
- if (isShowImageBtn)
- {
- this.AddChidren(BtnGo);
- }
-
- LineView = new LineView(this.Height);
- this.AddChidren(LineView);
-
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
- GoAction?.Invoke();
- };
- BtnTilte.MouseUpEventHandler = eventHandler;
- BtnSubtitle.MouseUpEventHandler = eventHandler;
- BtnGo.MouseUpEventHandler = eventHandler;
-
- }
- }
-}
diff --git a/HDL_ON/UI/UI0-Public/Widget/ListIconCellView.cs b/HDL_ON/UI/UI0-Public/Widget/ListIconCellView.cs
deleted file mode 100644
index 2b1a000..0000000
--- a/HDL_ON/UI/UI0-Public/Widget/ListIconCellView.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.CSS;
-using Shared;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 閫氱敤ListIconCellView
- /// 鏀寔瀹氫箟 鍥炬爣銆佷富鏍囬銆乬o鍥炬爣銆佷笅鍒掔嚎銆佺偣鍑讳簨浠�
- /// </summary>
- public class ListIconCellView : FrameLayout
- {
- /// <summary>
- /// 鍥炬爣鎸夐挳
- /// </summary>
- public Button BtnIcon;
- /// <summary>
- /// 鏍囬
- /// </summary>
- public Button BtnTilte;
- /// <summary>
- /// 绠ご鍥炬爣鎸夐挳
- /// </summary>
- public Button BtnGo;
- /// <summary>
- /// 鍒嗗壊绾�
- /// </summary>
- public LineView LineView;
-
- /// <summary>
- /// 鐐瑰嚮瑙﹀彂瀵逛簨浠�
- /// </summary>
- public Action GoAction;
-
- /// <summary>
- ///
- /// </summary>
- public ListIconCellView()
- {
- ShowView();
- }
-
- /// <summary>
- ///
- /// </summary>
- void ShowView()
- {
- this.Height = Application.GetRealHeight(50);
- this.BackgroundColor = CSS_Color.MainBackgroundColor;
-
- BtnIcon = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(24),
- Height = Application.GetRealWidth(24),
- Gravity = Gravity.CenterVertical,
- };
- this.AddChidren(BtnIcon);
-
- /// <summary>
- /// 鏍囬
- /// </summary>
- BtnTilte = new Button()
- {
- X = Application.GetRealWidth(52),
- Width = Application.GetRealWidth(278),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- };
-
- this.AddChidren(BtnTilte);
-
- /// <summary>
- /// 鍓嶈繘鍥炬爣
- /// </summary>
- BtnGo = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- this.AddChidren(BtnGo);
-
- LineView = new LineView(this.Height);
- this.AddChidren(LineView);
- //LineView.Y = this.Height - LineView.Height;
-
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
- GoAction?.Invoke();
- };
- BtnTilte.MouseUpEventHandler = eventHandler;
- BtnGo.MouseUpEventHandler = eventHandler;
-
- }
- }
-}
diff --git a/HDL_ON/UI/UI0-Public/Widget/TextButton.cs b/HDL_ON/UI/UI0-Public/Widget/TextButton.cs
index 4148731..c0a5b02 100644
--- a/HDL_ON/UI/UI0-Public/Widget/TextButton.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/TextButton.cs
@@ -1,9 +1,7 @@
锘縰sing System;
using Shared;
-
#if __IOS__
using UIKit;
-using Foundation;
#endif
namespace HDL_ON.UI
@@ -11,7 +9,6 @@
/// <summary>
/// TextButton
/// 瑙ｅ喅iOS 鏂囨湰鍒拌竟妗嗘湁杈硅窛闂
- ///
/// </summary>
public class TextButton : Button
{
@@ -23,93 +20,5 @@
#endif
}
-
- int _lineSpacing;
- /// <summary>
- /// 璁剧疆琛岄棿璺�
- /// </summary>
- public int LineSpacing
- {
- set
- {
- _lineSpacing = value;
- SetButtonLineSpacing(_lineSpacing);
- }
- }
-
-
-#if __IOS__
- /// <summary>
- /// 鎸夐挳璁剧疆琛岃窛鏂规硶
- /// </summary>
- /// <param name="spacing"></param>
- void SetButtonLineSpacing(int spacing)
- {
- UIStringAttributes stringAttributes = new UIStringAttributes
- {
- Font = (this.uiView as MyButton).TitleLabel.Font,
- ForegroundColor = UIColor.Black,
- ParagraphStyle = new NSMutableParagraphStyle() { LineSpacing = spacing }
- };
- var AttributedText = new NSMutableAttributedString(Text);
- AttributedText.AddAttributes(stringAttributes, new NSRange(0, Text.Length));
- (this.uiView as MyButton).TitleLabel.AttributedText = AttributedText;
- }
-
- /// <summary>
- /// 鏄剧ず褰撳墠鏂囧瓧闇�瑕佸嚑琛�
- /// </summary>
- /// <returns></returns>
- int GetNeedLinesWithWidth()
- {
- return 0;
- }
- /**
-
-
-// @param width 缁欏畾涓�涓搴�
-// @return 杩斿洖琛屾暟
-// */
-//- (NSInteger) needLinesWithWidth:(CGFloat) width
-// {
-// //鍒涘缓涓�涓猯abe
-// UILabel * label = [[UILabel alloc]
-// init];
-// //font鍜屽綋鍓峫abel淇濇寔涓�鑷�
-// label.font = self.font;
-// NSString* text = self.text;
-// NSInteger sum = 0;
-// //鎬昏鏁板彈鎹㈣绗﹀奖鍝嶏紝鎵�浠ヨ繖閲岃绠楁�昏鏁帮紝闇�瑕佺敤鎹㈣绗﹀垎闅旇繖娈垫枃瀛楋紝鐒跺悗璁＄畻姣忔鏂囧瓧鐨勮鏁帮紝鐩稿姞鍗虫槸鎬昏鏁般��
-// NSArray* splitText = [text componentsSeparatedByString: @"\n"];
-// for (NSString* sText in splitText)
-// {
-// label.text = sText;
-// //鑾峰彇杩欐鏂囧瓧涓�琛岄渶瑕佺殑size
-// CGSize textSize = [label systemLayoutSizeFittingSize: CGSizeZero];
-// //size.width/鎵�闇�瑕佺殑width 鍚戜笂鍙栨暣灏辨槸杩欐鏂囧瓧鍗犵殑琛屾暟
-// NSInteger lines = ceilf(textSize.width / width);
-// //褰撴槸0鐨勬椂鍊欙紝璇存槑杩欐槸鎹㈣锛岄渶瑕佹寜涓�琛岀畻銆�
-// lines = lines == 0 ? 1 : lines;
-// sum += lines;
-// }
-// return sum;
-// }
-
- //#elif __Android__
-#else
-
- /// <summary>
- /// 鎸夐挳璁剧疆琛岃窛鏂规硶
- /// </summary>
- /// <param name="spacing"></param>
- void SetButtonLineSpacing(int spacing)
- {
- (this.AndroidView as Android.Widget.Button).SetLineSpacing(spacing, 1);
- }
-
-#endif
- }
-
-
-
+ }
}
diff --git a/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs b/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
deleted file mode 100644
index fb23965..0000000
--- a/HDL_ON/UI/UI0-Public/Widget/UpdateTipDialog.cs
+++ /dev/null
@@ -1,345 +0,0 @@
-锘縰sing System;
-using Shared;
-using HDL_ON.UI.CSS;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// UpdateTipDialog
- /// </summary>
- public class UpdateTipDialog : Dialog
- {
-
- public UpdateTipDialog()
- {
- }
-
- /// <summary>
- /// 鍒濆鍖朌ialog
- /// </summary>
- /// <param name="titleStr"></param>
- /// <param name="tipStr"></param>
- /// <param name="msgStr"></param>
- /// <param name="okAction"></param>
- /// <param name="cancelAction"></param>
- /// <param name="cancelID"></param>
- /// <param name="confirmID"></param>
- void ShowDialogBase(string titleStr, string tipStr, string msgStr, Action okAction, Action cancelAction, bool isForceUpdate, int cancelID = StringId.Ignore, int confirmID = StringId.Update)
- {
- this.BackgroundColor = CSS_Color.DialogTransparentColor1;
-
- FrameLayout contentView = new FrameLayout()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetMinRealAverage(223),
- Width = Application.GetRealWidth(288),
- Height = Application.GetRealHeight(302),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(12),
- BorderWidth = 0,
- BorderColor = 0x00000000,
- };
- this.AddChidren(contentView);
-
- Button btnTitle = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetMinRealAverage(95),
- Height = Application.GetMinRealAverage(30),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
- Text = titleStr
- };
- contentView.AddChidren(btnTitle);
-
- Button btnTip = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = btnTitle.Bottom,
- Height = Application.GetMinRealAverage(17),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = tipStr
- };
- contentView.AddChidren(btnTip);
-
- int btnMesY = btnTip.Bottom + Application.GetMinRealAverage(5);
- int lineY = Application.GetRealHeight(258);
-
- VerticalScrolViewLayout mesView = new VerticalScrolViewLayout()
- {
- X = Application.GetRealWidth(16),
- Y = btnMesY,
- Width = contentView.Width - Application.GetRealWidth(32),
- Height = lineY - btnMesY - Application.GetMinRealAverage(5),
- };
- contentView.AddChidren(mesView);
-
- Button btnMes = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Width = mesView.Width,
- Height = mesView.Height,
- TextAlignment = TextAlignment.TopLeft,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.TextFontSize,
- IsMoreLines = true,
- Text = msgStr,
- //BackgroundColor = CSS_Color.AuxiliaryColor2
-
- };
- mesView.AddChidren(btnMes);
-
- Button btnLine = new Button()
- {
- Y = lineY,
- Height = Application.GetRealHeight(1),
- Width = contentView.Width,
- BackgroundColor = CSS_Color.DividingLineColor,
- };
- contentView.AddChidren(btnLine);
-
- if (!isForceUpdate)
- {
- int Width144 = Application.GetRealWidth(144);
- Button btnCancel = new Button()
- {
- Y = btnLine.Bottom,
- Width = Width144,
- Height = Application.GetRealHeight(44),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = cancelID,
- };
- contentView.AddChidren(btnCancel);
-
- Button btnConfirm = new Button()
- {
- X = contentView.Width - Width144,
- Y = btnLine.Y,
- Width = Width144,
- Height = Application.GetRealHeight(44),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.MainBackgroundColor,
- BackgroundColor = CSS_Color.MainColor,
- TextID = confirmID,
- };
- contentView.AddChidren(btnConfirm);
- //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
- int mRectCornerID = HDLUtils.RectCornerBottomRight;
- btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
-
- btnCancel.MouseUpEventHandler += (sender, e) =>
- {
- this.Close();
- cancelAction?.Invoke();
- };
-
- btnConfirm.MouseUpEventHandler += (sender, e) =>
- {
- this.Close();
- okAction?.Invoke();
- };
- }
- else
- {
- Button btnConfirm = new Button()
- {
- Y = btnLine.Y,
- Width = contentView.Width,
- Height = Application.GetRealHeight(44),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.MainBackgroundColor,
- BackgroundColor = CSS_Color.MainColor,
- TextID = confirmID,
- };
- contentView.AddChidren(btnConfirm);
- //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
- int mRectCornerID = HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerBottomLeft;
- btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
-
- btnConfirm.MouseUpEventHandler += (sender, e) =>
- {
- //dialog绂佹鍏抽棴
- okAction?.Invoke();
- };
- }
-
- Button btnHeadImage = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetMinRealAverage(152),
- Width = Application.GetMinRealAverage(160),
- Height = Application.GetMinRealAverage(160),
- BorderColor = 0x00000000,
- BorderWidth = 0,
- UnSelectedImagePath = "Public/Dialog/DialogTipTitleIcon_3.png",
- };
- this.AddChidren(btnHeadImage);
-
- this.Show();
- }
-
-
- /// <summary>
- /// 鍔犺浇鎻愮ず鏇存柊Dialog
- /// </summary>
- /// <param name="titleStr"></param>
- /// <param name="tipStr"></param>
- /// <param name="msgStr"></param>
- /// <param name="okAction"></param>
- /// <param name="cancelAction"></param>
- public void ShowUpdateDialog(string titleStr, string tipStr, string msgStr, Action okAction, Action cancelAction = null)
- {
- this.ShowDialogBase(titleStr, tipStr, msgStr, okAction, cancelAction, false);
- }
-
- /// <summary>
- /// 鍔犺浇寮哄埗鏇存柊Dialog
- /// Dialog涓嶅叧闂�
- /// </summary>
- /// <param name="titleStr"></param>
- /// <param name="tipStr"></param>
- /// <param name="msgStr"></param>
- /// <param name="okAction"></param>
- /// <param name="cancelAction"></param>
- public void ShowForcedUpdateDialog(string titleStr, string tipStr, string msgStr, Action okAction)
- {
- this.ShowDialogBase(titleStr, tipStr, msgStr, okAction, null, true);
- }
-
- /// <summary>
- /// 鍒濆鍖朌ialog
- /// </summary>
- /// <param name="titleStr"></param>
- /// <param name="tipStr"></param>
- /// <param name="msgStr"></param>
- /// <param name="okAction"></param>
- /// <param name="cancelAction"></param>
- /// <param name="cancelID"></param>
- /// <param name="confirmID"></param>
- void ShowTipDialogBase(string titleStr, string msgStr, Action okAction, int confirmID = StringId.Close)
- {
- this.BackgroundColor = CSS_Color.DialogTransparentColor1;
-
- FrameLayout contentView = new FrameLayout()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetMinRealAverage(223),
- Width = Application.GetRealWidth(288),
- Height = Application.GetRealHeight(302),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(12),
- BorderWidth = 0,
- BorderColor = 0x00000000,
- };
- this.AddChidren(contentView);
-
- Button btnTitle = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetMinRealAverage(95),
- Height = Application.GetMinRealAverage(30),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
- Text = titleStr
- };
- contentView.AddChidren(btnTitle);
-
- int btnMesY = btnTitle.Bottom + Application.GetMinRealAverage(5);
- int lineY = Application.GetRealHeight(258);
-
- VerticalScrolViewLayout mesView = new VerticalScrolViewLayout()
- {
- X = Application.GetRealWidth(16),
- Y = btnMesY,
- Width = contentView.Width - Application.GetRealWidth(32),
- Height = lineY - btnMesY - Application.GetMinRealAverage(5),
- };
- contentView.AddChidren(mesView);
-
- Button btnMes = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Width = mesView.Width,
- Height = mesView.Height,
- TextAlignment = TextAlignment.TopLeft,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.TextFontSize,
- IsMoreLines = true,
- Text = msgStr,
- BackgroundColor = CSS_Color.AuxiliaryColor2
-
- };
- mesView.AddChidren(btnMes);
-
- Button btnLine = new Button()
- {
- Y = lineY,
- Height = Application.GetRealHeight(1),
- Width = contentView.Width,
- BackgroundColor = CSS_Color.DividingLineColor,
- };
- contentView.AddChidren(btnLine);
-
-
- Button btnConfirm = new Button()
- {
- Y = btnLine.Y,
- Width = contentView.Width,
- Height = Application.GetRealHeight(44),
- TextAlignment = TextAlignment.Center,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.MainBackgroundColor,
- BackgroundColor = CSS_Color.MainColor,
- TextID = confirmID,
- };
- contentView.AddChidren(btnConfirm);
- //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
- int mRectCornerID = HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerBottomLeft;
- btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
-
- btnConfirm.MouseUpEventHandler += (sender, e) =>
- {
- this.Close();
- okAction?.Invoke();
- };
-
- Button btnHeadImage = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetMinRealAverage(152),
- Width = Application.GetMinRealAverage(160),
- Height = Application.GetMinRealAverage(160),
- BorderColor = 0x00000000,
- BorderWidth = 0,
- UnSelectedImagePath = "Public/Dialog/DialogTipTitleIcon_3.png",
- };
- this.AddChidren(btnHeadImage);
-
- this.Show();
- }
-
- /// <summary>
- /// 鍔犺浇鎻愮ず閫氱煡Dialog
- /// </summary>
- /// <param name="titleStr"></param>
- /// <param name="tipStr"></param>
- /// <param name="msgStr"></param>
- /// <param name="okAction"></param>
- /// <param name="cancelAction"></param>
- public void ShowTipDialog(string titleStr, string msgStr, Action okAction)
- {
- this.ShowTipDialogBase(titleStr, msgStr, okAction);
- }
-
-
-
- }
-}
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
index e936f17..5fccaf0 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -499,8 +499,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(421),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextID = StringId.ConfirmReset,
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
index 25b6fc5..33b5fa3 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs
@@ -477,7 +477,7 @@
Width = Application.GetRealWidth(288),
Height = Application.GetRealHeight(206),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealHeight(12),
+ Radius = (uint)Application.GetRealWidth(12),
BorderWidth = 0,
BorderColor = 0x00000000,
};
@@ -526,7 +526,7 @@
Y = Application.GetRealHeight(150),
Width = Application.GetRealWidth(84),
Height = Application.GetRealWidth(84),
- Radius = (uint)Application.GetRealHeight(42),
+ Radius = (uint)Application.GetRealWidth(42),
BorderColor = 0x00000000,
BorderWidth = 0,
UnSelectedImagePath = "LoginIcon/2.png",
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 4051d39..9dbe678 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -448,8 +448,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(403),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextID = StringId.Login,
@@ -611,8 +611,8 @@
/// <param name="isOpenPrivacyPolicy">鏄惁闅愮鏀跨瓥</param>
private void OpenWebViewPage(bool isOpenPrivacyPolicy)
{
- string url = isOpenPrivacyPolicy ? Constant.URL_PRIVACYPOLICY : Constant.URL_USERAGREEMENT;
- string titleStr = isOpenPrivacyPolicy ? Language.StringByID(StringId.PrivacyPolicy) : Language.StringByID(StringId.UserAgreement);
+ string url = isAgreePrivacyPolicy ? Constant.URL_PrivacyPolicy : Constant.URL_UserAgreement;
+ string titleStr = isAgreePrivacyPolicy ? Language.StringByID(StringId.PrivacyPolicy) : Language.StringByID(StringId.UserAgreement);
new WebViewDialog().LoadPage(titleStr, url);
}
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 85229b6..cc1ccf6 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -1,4 +1,4 @@
-using System;
+锘縰sing System;
using System.Text.RegularExpressions;
using System.Threading;
using System.Collections.Generic;
@@ -93,13 +93,36 @@
if (result.Code != StateCode.SUCCESS)
{
IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
- ShowBtnAccountViewBottomLineError();
return;
}
else
{
//妫�娴嬪綋鍓嶉厤缃煙鍚嶆槸鍚︿竴鑷达紝涓嶄竴鑷村垯鏇挎崲
CheckAndSetUserRequestHost(result);
+ //
+ Application.RunOnMainThread(() =>
+ {
+ btnGetVerificationCode.IsSelected = false;
+ btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
+ });
+ new Thread(() =>
+ {
+ while (time > 0)
+ {
+ time--;
+ Application.RunOnMainThread(() =>
+ {
+ btnGetVerificationCode.Text = time.ToString() + "s";
+ });
+ Thread.Sleep(1000);
+ }
+ Application.RunOnMainThread(() =>
+ {
+ btnGetVerificationCode.IsSelected = true;
+ btnGetVerificationCode.TextID = StringId.GetVerificationCode;
+ });
+ })
+ { IsBackground = true }.Start();
//2.1璇锋眰鑾峰彇楠岃瘉鐮�
var resultObj = pm.VerificationCodeSend(VerifyType.VERIFY_LOGIN, account, true, phoneZoneCode);
@@ -114,38 +137,87 @@
// 鎻愮ず閿欒
IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
}
- else
- {
- Application.RunOnMainThread(() =>
- {
- btnGetVerificationCode.IsSelected = false;
- btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
- });
-
- new Thread(() =>
- {
- while (time > 0)
- {
- time--;
- Application.RunOnMainThread(() =>
- {
- btnGetVerificationCode.Text = time.ToString() + "s";
- });
- Thread.Sleep(1000);
- }
- Application.RunOnMainThread(() =>
- {
- btnGetVerificationCode.IsSelected = true;
- btnGetVerificationCode.TextID = StringId.GetVerificationCode;
- });
- })
- { IsBackground = true }.Start();
- }
}
})
{ IsBackground = true }.Start();
+ // btnGetVerificationCode.IsSelected = false ;
+ // btnGetVerificationCode.TextColor = CSS_Color.PromptingColor1;
+ // int time = 60;
+ // new Thread(() =>
+ // {
+ // while (time > 0)
+ // {
+ // time--;
+ // Application.RunOnMainThread(() =>
+ // {
+ // btnGetVerificationCode.Text = time.ToString() + "s";
+ // });
+ // Thread.Sleep(1000);
+ // }
+ // Application.RunOnMainThread(() =>
+ // {
+ // btnGetVerificationCode.IsSelected = true;
+ // btnGetVerificationCode.TextID = StringId.GetVerificationCode;
+ // });
+ // })
+ // { IsBackground = true }.Start();
+ // new Thread(() =>
+ // {
+ // //鑾峰彇楠岃瘉鐮�
+ // var result = pm.GetLoginVerCode(phoneNumber);
+ // if (result.StateCode.ToUpper() == StateCode.SUCCESS_CODE)
+ // {
+ // }
+ // //鐧诲綍澶辫触
+ // else
+ // {
+ // string tipStr = "Sever erorr";
+ // switch (result.StateCode.ToUpper())
+ // {
+ // case "USERNAMEORPWDERROR":
+ // tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
+ // Application.RunOnMainThread(() =>
+ // {
+ // btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ // btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ // });
+ // break;
+ // case "ACCOUNTNOEXISTS":
+ // tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
+ // Application.RunOnMainThread(() =>
+ // {
+ // btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ // btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+ // });
+ // break;
+ // case "SENDFAIL":
+ // tipStr = Language.StringByID(StringId.FailedToSendVerificationCode);
+ // Application.RunOnMainThread(() =>
+ // {
+ // btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ // btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+ // });
+ // break;
+ // case "Self:Net_Error":
+ // tipStr = Language.StringByID(StringId.NetworkAnomaly);
+ // break;
+ // }
+ // Application.RunOnMainThread(() =>
+ // {
+ // //鎻愮ず鍘熷洜
+ // var tip = new Tip()
+ // {
+ // Text = tipStr,
+ // CloseTime = 1,
+ // Direction = AMPopTipDirection.None
+ // };
+ // tip.Show(bodyView);
+ // });
+ // }
+ // })
+ // { IsBackground = true }.Start();
}
};
}
@@ -247,8 +319,8 @@
//if (btnGetVerificationCode.Parent != null)
//{
- //btnGetVerificationCode.RemoveFromParent();
- btnGetVerificationCode.Visible = false;
+ //btnGetVerificationCode.RemoveFromParent();
+ btnGetVerificationCode.Visible = false;
//}
//闅愯棌瀵嗙爜
etPassword.SecureTextEntry = true;
@@ -279,8 +351,8 @@
btnPasswordIcon.IsSelected = false;
//if (btnGetVerificationCode.Parent != null)
//{
- //btnGetVerificationCode.RemoveFromParent();
- btnGetVerificationCode.Visible = false;
+ //btnGetVerificationCode.RemoveFromParent();
+ btnGetVerificationCode.Visible = false;
//}
//闅愯棌瀵嗙爜
etPassword.SecureTextEntry = true;
@@ -496,7 +568,7 @@
{
btnLogin.IsSelected = false;
}
- if (Regex.IsMatch(account, @"^[1]+\d{10}"))//&& account.Length == 11)
+ if (Regex.IsMatch(account, @"^[1]+\d{10}") )//&& account.Length == 11)
{
btnGetVerificationCode.IsSelected = true;
btnGetVerificationCode.TextColor = CSS_Color.MainBackgroundColor;
@@ -538,7 +610,6 @@
if (result.Code != StateCode.SUCCESS)
{
IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
- ShowBtnAccountViewBottomLineError();
return;
}
else
@@ -550,7 +621,7 @@
//鐧诲綍
var loginResult = LoadMethod_Login();
- if (!string.IsNullOrEmpty(verAccount))//楠岃瘉鐧诲綍璐﹀彿
+ if( !string.IsNullOrEmpty (verAccount))//楠岃瘉鐧诲綍璐﹀彿
{
Application.RunOnMainThread(() =>
{
@@ -586,7 +657,7 @@
OnAppConfig.Instance.RefreshUserConfig();
DB_ResidenceData.InitRoomFunction();
}
- if (UserInfo.Current.userEmailInfo == "464027401@qq.com")
+ if ( UserInfo.Current.userEmailInfo == "464027401@qq.com")
{
DB_ResidenceData.residenceData.floors.Add(new Floor() { name = "1F", sid = "09888" });
var r111 = new Room() { sid = "0001", name = "Room-1", floorId = "09888", backgroundImage = "Classification/Room/Roombg.png" };
@@ -940,30 +1011,54 @@
//鐧诲綍澶辫触
else
{
+ //2020-11-13 寰呬慨鏀�
+ string tipStr = "Sever erorr";
+ switch (loginResult.Code)
+ {
+ case "ValidCodeAndPhoneNoEqual":
+ tipStr = Language.StringByID(StringId.VerificationCodeError);
+ Application.RunOnMainThread(() =>
+ {
+ btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ });
+ break;
+ case "USERNAMEORPWDERROR":
+ tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
+ Application.RunOnMainThread(() =>
+ {
+ btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
+ });
+ break;
+ case "ACCOUNTNOEXISTS":
+ tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
+ Application.RunOnMainThread(() =>
+ {
+ btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+ btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
+ });
+ break;
+ case "NoRecord":
+ tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode);
+ break;
+ case "Self:Net_Error":
+ tipStr = Language.StringByID(StringId.NetworkAnomaly);
+ break;
+ }
//璐﹀彿鎴栬�呭瘑鐮侀敊璇�
Application.RunOnMainThread(() =>
{
- if (loginResult.Code == "10008")
- {
- //鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒
- btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
- }
- else if (loginResult.Code == "10010")
- {
- //鐢ㄦ埛涓嶅瓨鍦�
- btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
- }
- else if (loginResult.Code == "14")
- {
- btnPasswordViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnPasswordViewBottomLine.Height = Application.GetRealHeight(2);
- }
waitPage.Hide();
+ //鎻愮ず鍘熷洜
+ var tip = new Tip()
+ {
+ Text = tipStr,
+ CloseTime = 1,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(bodyView);
});
-
- IMessageCommon.Current.ShowErrorInfoAlter(loginResult.Code);
}
return result;
}
@@ -978,8 +1073,7 @@
if (responsePack == StateCode.SUCCESS)
{
//2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
- if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
- {
+ if ( UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0){
result = true;
}
//result = true;
@@ -1014,9 +1108,6 @@
// });
//};
- //鍒ゆ柇鏄惁鍚屾剰浜嗛殣绉佹斂绛�
- if (CheckPrivacyPolicy() == false) return;
-
var registerPage = new RegisterPage();
registerPage.Show();
registerPage.ShowDialog();
@@ -1050,18 +1141,5 @@
};
}
-
- /// <summary>
- /// 鐢ㄦ埛涓嶅瓨鍦�
- /// </summary>
- void ShowBtnAccountViewBottomLineError()
- {
- Application.RunOnMainThread(() =>
- {
- //鐢ㄦ埛涓嶅瓨鍦�
- btnAccountViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnAccountViewBottomLine.Height = Application.GetRealHeight(2);
- });
- }
}
-}
+}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI1-Login/RegisterPage.cs b/HDL_ON/UI/UI1-Login/RegisterPage.cs
index f69f6d2..720f2ab 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPage.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPage.cs
@@ -27,36 +27,6 @@
/// 閫夋嫨閭鐧诲綍鎸夐挳
/// </summary>
Button btnEmailLogin;
- #region 鏈嶅姟鍣ㄩ�夋嫨
- /// <summary>
- /// 鏈嶅姟鍣ㄥ尯鍩�
- /// </summary>
- FrameLayout serverView;
- /// <summary>
- /// 鏈嶅姟鍣↖con鎸夐挳
- /// </summary>
- Button btnServerIcon;
- /// <summary>
- /// 鏈嶅姟鍣ㄦ枃鏈
- /// </summary>
- Button btnServerText;
- ///// <summary>
- ///// 鏈嶅姟鍣ㄦ枃鏈
- ///// </summary>
- //EditText etServer;
- ///// <summary>
- ///// 鏈嶅姟鍣ㄥ瓙鍖哄煙閲岄潰鐨勫垎鍓茬嚎1
- ///// </summary>
- //Button btnLineVertical_server;
- /// <summary>
- ///鏈嶅姟鍣╣o鎸夐挳
- /// </summary>
- Button btnServerGo;
- /// <summary>
- /// 鏈嶅姟鍣ㄥ瓙鍖哄煙搴曢儴妯嚎
- /// </summary>
- Button btnServerBottomLine;
- #endregion
/// <summary>
/// 璐﹀彿瀛愬尯鍩�
/// </summary>
@@ -198,10 +168,6 @@
/// 鎵嬫満鍖哄彿
/// </summary>
string phoneZoneCode = "86";
- /// <summary>
- /// 鏄惁閫夋嫨杩囨湇鍔″櫒
- /// </summary>
- bool isSelectServer;
string registerPhone;
string registerEmail;
@@ -261,66 +227,11 @@
bodyView.AddChidren(btnEmailLogin);
#endregion
- #region 鏈嶅姟鍣ㄩ�夋嫨
- serverView = new FrameLayout()
- {
- X = Application.GetRealWidth(28),
- Y = Application.GetRealHeight(167),
- Width = Application.GetRealWidth(319),
- Height = Application.GetRealHeight(44),
- };
- bodyView.AddChidren(serverView);
-
- btnServerIcon = new Button()
- {
- X = Application.GetRealWidth(9),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(20),
- Height = Application.GetMinRealAverage(20),
- UnSelectedImagePath = "LoginIcon/Server.png",
-
- };
- serverView.AddChidren(btnServerIcon);
-
- btnServerText = new Button()
- {
- X = Application.GetRealWidth(49),
- Width = Application.GetRealWidth(319 - 78),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.PleaseSelectCountryOrRegion,
- };
- serverView.AddChidren(btnServerText);
-
- #region 瀵嗙爜鐧诲綍-鎺т欢鍔犺浇
- btnServerGo = new Button()
- {
- X = Application.GetRealWidth(303),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- serverView.AddChidren(btnServerGo);
-
- #endregion
- btnServerBottomLine = new Button()
- {
- Y = Application.GetRealHeight(42),
- BackgroundColor = CSS_Color.DividingLineColor,
- SelectedBackgroundColor = CSS_Color.MainColor,
- Height = Application.GetRealHeight(1),
- };
- serverView.AddChidren(btnServerBottomLine);
- #endregion
-
- int topPadding = Application.GetRealHeight(12);
#region 璐﹀彿濉啓
accountView = new FrameLayout()
{
X = Application.GetRealWidth(28),
- Y = serverView.Bottom + topPadding,
+ Y = Application.GetRealHeight(167),
Width = Application.GetRealWidth(319),
Height = Application.GetRealHeight(44),
};
@@ -402,7 +313,7 @@
passwordView = new FrameLayout()
{
X = Application.GetRealWidth(28),
- Y = accountView.Bottom + topPadding,
+ Y = Application.GetRealHeight(223),
Width = Application.GetRealWidth(319),
Height = Application.GetRealHeight(44),
};
@@ -468,7 +379,7 @@
repeatPasswordView = new FrameLayout()
{
X = Application.GetRealWidth(28),
- Y = passwordView.Bottom + topPadding,
+ Y = Application.GetRealHeight(279),
Width = Application.GetRealWidth(319),
Height = Application.GetRealHeight(44),
};
@@ -536,8 +447,7 @@
verificationCodeView = new FrameLayout()
{
X = Application.GetRealWidth(28),
- Y = repeatPasswordView.Bottom + topPadding,
- //Y = Application.GetRealHeight(335),
+ Y = Application.GetRealHeight(335),
Width = Application.GetRealWidth(319),
Height = Application.GetRealHeight(44),
};
@@ -614,11 +524,10 @@
btnRegister = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = verificationCodeView.Bottom + Application.GetRealHeight(42),
- //Y = Application.GetRealHeight(421),
+ Y = Application.GetRealHeight(421),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextID = StringId.Register,
@@ -818,15 +727,28 @@
var responsePack = pm.GetHomePager();
if (responsePack == StateCode.SUCCESS)
{
- //2020-11-13 寰呯‘璁わ紝娌℃湁浣忓畢锛屼笉绠楃櫥褰曟垚鍔�
- if (UserInfo.Current.regionList != null && UserInfo.Current.regionList.Count > 0)
- {
- result = true;
- }
}
else
{
- IMessageCommon.Current.ShowErrorInfoAlter(responsePack);
+ var tipStr = "Server erorr";
+ switch (responsePack)
+ {
+ case "NoLogin":
+ tipStr = Language.StringByID(StringId.InvalidLoginCertificate);
+ break;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ //鎻愮ず鍘熷洜
+ var tip = new Tip()
+ {
+ Text = tipStr,
+ CloseTime = 1,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(bodyView);
+ });
+
}
return result;
}
diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index b6dc594..25fd27b 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -21,7 +21,6 @@
LoadEvent_Register();
LoadEvent_LimtPasswordLength();
LoadEvent_TextChange();
- LoadEvent_Server();
//var areaCodeList = pm.GetAreaCode();
}
/// <summary>
@@ -69,7 +68,7 @@
//閫夋嫨鎵嬫満娉ㄥ唽
btnPhoneLogin.MouseUpEventHandler = (sender, e) =>
{
- if (registerType == 0)
+ if(registerType == 0)
{
return;
}
@@ -207,7 +206,7 @@
}
}
}
- if (accountType == 0)
+ if(accountType ==0)
{
registerPhone = etAccount.Text.Trim();
}
@@ -368,9 +367,6 @@
{
if ((sender as Button).IsSelected)
{
- //鍒ゆ柇鏄惁閫夋嫨浜嗘湇鍔″櫒锛岄�夋嫨浜嗘墠鑳藉彂閫侀獙璇佺爜
- if (CheckIfSelectServer() == false) return;
-
string account = etAccount.Text.Trim();
int time = 60;
new Thread(() =>
@@ -385,7 +381,7 @@
{
//鐭俊鍙戦�侀棿闅�60s
(sender as Button).IsSelected = false;
-
+
});
//2.1 寮�濮嬪�掕鏃�
new Thread(() =>
@@ -425,13 +421,11 @@
IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
}
- }
- else if (result.Code.ToUpper() == StateCode.SUCCESS)
+ }else if (result.Code.ToUpper() == StateCode.SUCCESS)
{
//3.鎻愮ず璐﹀彿宸插瓨鍦紝鏃犳硶閲嶅娉ㄥ唽
Utlis.ShowAlertOnMainThread(Language.StringByID(StringId.AccountAlreadyUse));
- }
- else
+ } else
{
//4.鎻愮ず鍏跺畠寮傚父閿欒
IMessageCommon.Current.ShowErrorInfoAlter(result.Code);
@@ -496,7 +490,7 @@
{
btnRegister.MouseUpEventHandler = (sender, e) =>
{
- if (etPassword.Text.Trim().Length > 13 || etPassword.Text.Trim().Length < 6)
+ if(etPassword.Text.Trim().Length > 13 || etPassword.Text.Trim().Length<6)
{
new Tip()
{
@@ -508,9 +502,6 @@
}
if (btnRegister.IsSelected)
{
- //鍒ゆ柇鏄惁閫夋嫨浜嗘湇鍔″櫒锛岄�夋嫨浜嗘墠鑳藉彂閫侀獙璇佺爜
- if (CheckIfSelectServer() == false) return;
-
waitPage = new Loading();
new PublicAssmebly().LoadPage_WaitPage(LoadMethod_RegisterThread(), bodyView, waitPage);
}
@@ -597,79 +588,6 @@
});
}
});
- }
-
- /// <summary>
- /// 鍔犺浇鏈嶅姟鍣ㄩ�夋嫨鎸夐挳浜嬩欢
- /// </summary>
- void LoadEvent_Server()
- {
- //鍒ゆ柇涔嬪墠鏄惁閫夋嫨杩�
- if (UserInfo.Current.GlobalRegion != null && !string.IsNullOrEmpty(UserInfo.Current.GlobalRegion.regionUrl))
- {
-
- SetServerText();
- }
-
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
- Action selectAction = () =>
- {
- //鏈嶅姟鍣ㄩ�夋嫨杩囨爣璁颁负true
- SetServerText();
- };
- new SelectServerDialog(selectAction).LoadPage();
-
- };
-
- btnServerGo.MouseUpEventHandler = eventHandler;
- btnServerText.MouseUpEventHandler = eventHandler;
- }
-
- /// <summary>
- /// 妫�娴嬫槸鍚﹂�夋嫨浜嗘湇鍔″櫒
- /// </summary>
- /// <returns></returns>
- private bool CheckIfSelectServer()
- {
- if (isSelectServer == false)
- {
- //璇峰厛閫夋嫨鍥藉/鍖哄煙
- Utlis.ShowTip(Language.StringByID(StringId.PleaseSelectCountryOrRegion));
- ShowServerBottomLineState(true);
- return false;
- }
- return true;
- }
-
- /// <summary>
- /// 鏈嶅姟鍣ㄤ笅鍒掔嚎鏍峰紡
- /// </summary>
- /// <param name="isError"></param>
- void ShowServerBottomLineState(bool isError)
- {
- if (isError)
- {
- btnServerBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
- btnServerBottomLine.Height = Application.GetRealHeight(2);
- }
- else
- {
- btnServerBottomLine.BackgroundColor = CSS_Color.DividingLineColor;
- btnServerBottomLine.Height = Application.GetRealHeight(1);
- }
- }
-
- /// <summary>
- ///
- /// </summary>
- void SetServerText()
- {
- //鏈嶅姟鍣ㄩ�夋嫨杩囨爣璁颁负true
- isSelectServer = true;
- ShowServerBottomLineState(false);
- btnServerText.TextColor = CSS_Color.FirstLevelTitleColor;
- btnServerText.Text = UserInfo.Current.GlobalRegion.regionName;
}
}
}
\ No newline at end of file
diff --git a/HDL_ON/UI/UI1-Login/SelectServerDialog.cs b/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
index 2b262db..4ad3d99 100644
--- a/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
+++ b/HDL_ON/UI/UI1-Login/SelectServerDialog.cs
@@ -25,26 +25,23 @@
/// <summary>
///
/// </summary>
- public SelectServerDialog(Action selectAction)
+ public SelectServerDialog()
{
bodyView = new FrameLayout();
- this.selectAction = selectAction;
}
- /// <summary>
- ///
- /// </summary>
+ /// <summary>
+ ///
+ /// </summary>
public void LoadPage()
{
- bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
+ bodyView.BackgroundColor = CSS_Color.BackgroundColor;
this.AddChidren(bodyView);
- //鍔犺浇椤堕儴鑿滃崟鏍�
- new TopViewDiv(this, bodyView, Language.StringByID(StringId.PleaseSelectCountryOrRegion)).LoadTopView();
+ new TopViewDiv(this, bodyView, Language.StringByID(StringId.SelectCountryOrRegion)).LoadTopView();
+
//鍔犺浇鏈嶅姟鍣ㄥ尯鍩熼�夋嫨
AddRegionalSelectionView();
- //Show
- this.Show();
}
@@ -61,11 +58,24 @@
};
bodyView.AddChidren(VerticalScrolViewMiddle);
+ //var TipView = new Button()
+ //{
+ // Y = bodyView.Height - Application.GetRealHeight(60),
+ // Width = LayoutParams.MatchParent,
+ // Height = Application.GetRealHeight(60),
+ // BackgroundColor = 0xFFFFFFE0,
+ // TextSize = 11,
+ // //Text = "璇烽�夋嫨娉ㄥ唽鐨勫尯鍩�",
+ // //TextID = R.MyInternationalizationString.SelectRegisteredArea,
+ // TextColor = 0xFF1F1F1F,
+ // IsMoreLines = true
+ //};
+ //bodyView.AddChidren(TipView);
+
var waitPage = new Loading();
waitPage.Start("Please wait...");
- System.Threading.Tasks.Task.Run(() =>
- {
+ System.Threading.Tasks.Task.Run(() => {
try
{
var dataList = new List<GlobalRegionListRes>();
@@ -73,8 +83,7 @@
var revertObj = HttpUtil.RequestHttpsPost(NewAPI.API_POST_GlobalRegionList, requestJson, HttpUtil.GlobalRequestHttpsHost);
if (revertObj.Code == StateCode.SUCCESS)
{
- Application.RunOnMainThread(() =>
- {
+ Application.RunOnMainThread(() => {
var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<GlobalRegionListRes>>(revertObj.Data.ToString());
if (responseDataObj != null)
{
@@ -97,12 +106,11 @@
}
catch
{
-
+
}
finally
{
- Application.RunOnMainThread(() =>
- {
+ Application.RunOnMainThread(() => {
waitPage.Hide();
});
}
@@ -117,29 +125,26 @@
/// <param name="VerticalScrolViewMiddle"></param>
void AddRowView(GlobalRegionListRes mGlobalRegion, VerticalScrolViewLayout VerticalScrolViewMiddle)
{
- var rowView = new FrameLayout()
+ var rowView = new RowLayout()
{
Height = Application.GetRealHeight(44),
};
VerticalScrolViewMiddle.AddChidren(rowView);
- var urlBtn = new Button()
- {
+ var urlBtn = new Button() {
X = Application.GetRealWidth(16),
Height = rowView.Height,
- Width = Application.GetRealWidth(200),
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- TextAlignment = TextAlignment.CenterLeft
+ Gravity = Gravity.CenterLeft
};
rowView.AddChidren(urlBtn);
- //var lineView = new LineView();
- //rowView.AddChidren(lineView);
- //lineView.Y = rowView.Height - lineView.Height;
+ var lineView = new LineView();
+ rowView.AddChidren(lineView);
+ lineView.Y = rowView.Height - lineView.Height;
- EventHandler<MouseEventArgs> eHandler = (sender, e) =>
- {
+ EventHandler<MouseEventArgs> eHandler = (sender, e) => {
UserInfo.Current.RequestHttpsHost = mGlobalRegion.regionUrl;
UserInfo.Current.GlobalRegion = mGlobalRegion;
UserInfo.Current.SaveUserInfo();
@@ -150,7 +155,6 @@
rowView.MouseUpEventHandler += eHandler;
urlBtn.MouseUpEventHandler += eHandler;
- urlBtn.Text = mGlobalRegion.regionName;
if (mGlobalRegion.regionUrl == UserInfo.Current.RequestHttpsHost)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
deleted file mode 100644
index 9b068fd..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs
+++ /dev/null
@@ -1,332 +0,0 @@
-锘縰sing System;
-using Shared;
-using HDL_ON.UI.CSS;
-using System.Net;
-using System.Text;
-using HDL_ON.DAL.Server;
-using System.Threading.Tasks;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 鍏充簬椤甸潰
- /// </summary>
- public class AboutOnPage : FrameLayout
- {
- /// <summary>
- ///
- /// </summary>
- FrameLayout bodyView;
- /// <summary>
- /// 鐗堟湰鏇存柊ListCellView
- /// </summary>
- ListCellView versionUpdateView;
-
- /// <summary>
- /// 鏂扮増鏈殑鐗堟湰鍙凤紝鏌ヨ鍒版柊鐗堟湰鎵嶈祴鍊�
- /// </summary>
- string newAppVersion;
- /// <summary>
- /// 鏂扮増鏈殑涓嬭浇鍦板潃
- /// iOS 榛樿涓鸿嫻鏋滃晢搴楀湴鍧�
- /// Android 浜戠杩斿洖鍦板潃
- /// </summary>
- string newAppVersionUrl = "";
-
- /// <summary>
- ///
- /// </summary>
- public AboutOnPage()
- {
- bodyView = this;
- }
-
- /// <summary>
- ///
- /// </summary>
- public void LoadPage()
- {
- new TopViewDiv(bodyView, Language.StringByID(StringId.About)).LoadTopView();
-
- Button btnOnIcon = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealWidth(106),
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealWidth(58),
- UnSelectedImagePath = "OnIcon.png",
- };
- bodyView.AddChidren(btnOnIcon);
-
- Button btnOnTitle = new Button()
- {
- //Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealWidth(184),
- Height = Application.GetRealWidth(28),
- TextAlignment = TextAlignment.Center,
- Text = "ON+",
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
- IsBold = true,
- };
- bodyView.AddChidren(btnOnTitle);
-
- Button btnOnVersion = new Button()
- {
- Y = btnOnTitle.Bottom,
- Height = Application.GetRealWidth(25),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = Language.StringByID(StringId.VersionNumber) + " " + MainPage.VersionString,
- };
- bodyView.AddChidren(btnOnVersion);
-
-
- var lineView = new FrameLayout()
- {
- Y = Application.GetRealHeight(281),
- Height = Application.GetRealHeight(1),
- BackgroundColor = CSS_Color.DividingLineColor,
- };
- bodyView.AddChidren(lineView);
-
- #region 鍔熻兘浠嬬粛
- var functionView = new ListCellView()
- {
- Y = lineView.Bottom,
- };
- bodyView.AddChidren(functionView);
- functionView.BtnTilte.TextID = StringId.FunctionIntroduced;
- Action functionAction = () =>
- {
- var mPage = new FunctionIntroductionPage();
- MainPage.BasePageView.AddChidren(mPage);
- mPage.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- functionView.GoAction = functionAction;
- #endregion
-
- #region 鎶曡瘔
- var complaintsView = new ListCellView()
- {
- Y = functionView.Bottom,
- };
- bodyView.AddChidren(complaintsView);
- complaintsView.BtnTilte.TextID = StringId.Complaints;
- Action complaintsAction = () =>
- {
- var mPage = new ComplaintsPage();
- MainPage.BasePageView.AddChidren(mPage);
- mPage.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- complaintsView.GoAction = complaintsAction;
- #endregion
-
- #region 鐗堟湰鏇存柊
- versionUpdateView = new ListCellView()
- {
- Y = complaintsView.Bottom,
- };
- bodyView.AddChidren(versionUpdateView);
- versionUpdateView.BtnTilte.TextID = StringId.VersionUpdate;
- Action versionUpdateAction = () =>
- {
- //OpenUrl();
-
- TestDDDDD();
- };
- versionUpdateView.GoAction = versionUpdateAction;
- #endregion
-
- CheckIfNeedUpdateAsync();
- }
-
-
- /// <summary>
- /// 鍒ゆ柇鏄惁闇�瑕佽皟鏁存柊鐗堟湰涓嬭浇鍦板潃
- /// </summary>
- void OpenUrl()
- {
- if (!string.IsNullOrEmpty(newAppVersion))
- {
- HDLUtils.OpenUrl(newAppVersionUrl);
- }
- else
- {
- Utlis.ShowTip(Language.StringByID(StringId.IsLatestVersion));
- }
- }
-
- /// <summary>
- /// 妫�娴嬫槸鍚﹂渶瑕佹洿鏂�
- /// Android绛夋帴鍙ｅ疄鐜�
- /// </summary>
- /// <returns></returns>
- void CheckIfNeedUpdateAsync(bool isTip = false)
- {
- new System.Threading.Thread(() =>
- {
- newAppVersion = CanUpdateAsync();
- Application.RunOnMainThread(() =>
- {
- if (!string.IsNullOrEmpty(newAppVersion))
- {
- //鍙戠幇鏂扮増鏈�
- versionUpdateView.BtnSubtitle.TextColor = CSS_Color.MainColor;
- versionUpdateView.BtnSubtitle.Text = Language.StringByID(StringId.DiscoverNewVersion) + "(" + newAppVersion + ")";
- }
- else
- {
- //宸茬粡鏄渶鏂扮増鏈�
- versionUpdateView.BtnSubtitle.TextColor = CSS_Color.PromptingColor1;
- versionUpdateView.BtnSubtitle.Text = Language.StringByID(StringId.IsLatestVersion);
- }
- });
-
- })
- { IsBackground = true }.Start();
- }
-
- /// <summary>
- /// 妫�鏌ョ増鏈�
- /// </summary>
- /// <returns></returns>
- string CanUpdateAsync()
- {
-#if __IOS__
- try
- {
- var versionResult = RequestHttpsiOSAppVersionAsync();
- if (versionResult == null || versionResult.Results == null)
- {
- return "";
- }
- var results = Newtonsoft.Json.Linq.JArray.Parse(versionResult.Results.ToString());
- if (results[0] == null)
- {
- return "";
- }
- var newVersion = results[0]["version"]?.ToString();
- //var updateContent = results[0]["releaseNotes"]?.ToString();
- if (newVersion.CompareTo(MainPage.VersionString) > 0)
- {
- newAppVersionUrl = Constant.URL_APPSTORE;
- return newVersion;
- }
- return "";
- }
- catch
- {
- return "";
- }
-
-#else
- try
- {
- var versionResult = GetAndroidAppVersion();
- if (versionResult == null)
- {
- return "";
- }
- var newVersion = versionResult.NewVersion;
- if (newVersion.CompareTo(MainPage.VersionString) > 0)
- {
- newAppVersionUrl = versionResult.NewVersionUrl;
- return newVersion;
- }
- return "";
- }
- catch (Exception ex)
- {
- return "";
- }
-#endif
- }
-
-
-#if __IOS__
- /// <summary>
- /// 鑾峰彇iOS-APP鐗堟湰淇℃伅
- /// </summary>
- /// <returns>The https app version async.</returns>
- ResultPack RequestHttpsiOSAppVersionAsync()
- {
- try
- {
- var webClient = new WebClient { };
- var result = webClient.DownloadData("https://itunes.apple.com/cn/lookup?id=1532353432");
- if (result == null)
- {
- return null;
- }
- return Newtonsoft.Json.JsonConvert.DeserializeObject<ResultPack>(Encoding.UTF8.GetString(result));
- }
- catch
- {
- return null;
- }
- }
-
-#else
-
- /// <summary>
- /// 鑾峰彇 Android-APP 鐗堟湰淇℃伅
- /// </summary>
- /// <returns>The https app version async.</returns>
- private APPVersion GetAndroidAppVersion()
- {
- try
- {
- var result = new HttpServerRequest().GetAppVersion();
- if (result.Code == StateCode.SUCCESS)
- {
- if (result.Data == null)
- {
- return null;
- }
-
- var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<APPVersion>(result.Data.ToString());
- return responeData;
- }
- return null;
- }
- catch (Exception ex)
- {
- return null;
- }
- }
-
-
-#endif
-
- int updateType = 0;
- void TestDDDDD()
- {
- updateType = 1;
-
- ForceUpdateInfo forceUpdateInfo = new ForceUpdateInfo()
- {
- UpdateType = updateType,
- NewVersionUrl = Constant.URL_APPSTORE,
- NewVersion = "1.0.0925",
- ReasonStr = "1銆侀椤靛叏鏂版敼鐗堣璁★紝UI鏇存竻鏅� \n2銆佷慨澶岯UG \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳� \n3銆佹柊澧為煶绠卞姛鑳�"
- };
-
- HDLCommon.Current.ShowForceUpdateDialog(forceUpdateInfo);
- }
-
- }
-
- /// <summary>
- /// 鑻规灉鍟嗗簵鏌ヨ鍝嶅簲鍖呮牸寮�
- /// </summary>
- [System.Serializable]
- public class ResultPack
- {
- public int ResultCount { get; set; }
- public object Results { get; set; }
- }
-}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
deleted file mode 100644
index ea908e1..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/ComplaintsPage.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-锘縰sing System;
-using Shared;
-using HDL_ON.UI.CSS;
-using Xamarin.Essentials;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 鎶曡瘔椤甸潰
- /// </summary>
- public class ComplaintsPage : FrameLayout
- {
- FrameLayout bodyView;
-
- /// <summary>
- /// 褰撳墠
- /// </summary>
- VerticalScrolViewLayout bodyScrolView;
-
- public ComplaintsPage()
- {
- bodyView = this;
- }
-
- public void LoadPage()
- {
- new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints)).LoadTopView();
-
- int bodyY = Application.GetRealHeight(64);
- bodyScrolView = new VerticalScrolViewLayout()
- {
- Y = bodyY,
- Height = bodyView.Height - bodyY,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
-
- #region 鎶曡瘔鑱旂郴
- FrameLayout phoneRow = new FrameLayout()
- {
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(50),
- };
- bodyView.AddChidren(phoneRow);
-
- Button btnPhoneTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(48),
- TextID = StringId.Telephone,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- };
- phoneRow.AddChidren(btnPhoneTitle);
-
- Button btnPhoneText = new Button()
- {
- X = btnPhoneTitle.Right,
- Width = Application.GetRealWidth(200),
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.TextFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "400 855 8535",
- };
- phoneRow.AddChidren(btnPhoneText);
- /// <summary>
- /// 鍓嶈繘鍥炬爣
- /// </summary>
- var btnImage = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- phoneRow.AddChidren(btnImage);
- phoneRow.AddChidren(new Button() { X = Application.GetRealWidth(16), Y = Application.GetRealWidth(49), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
-
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
- PhoneDialer.Open(Constant.SUPPORT_TELEPHONENUMBER);
- };
-
- phoneRow.MouseUpEventHandler = eventHandler;
- btnPhoneText.MouseUpEventHandler = eventHandler;
- btnImage.MouseUpEventHandler = eventHandler;
- #endregion
-
- #region 鑱旂郴閭
- FrameLayout emailRow = new FrameLayout()
- {
- Y = phoneRow.Bottom,
- Height = Application.GetRealHeight(54),
- };
- bodyView.AddChidren(emailRow);
-
- Button btnEmailTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(48),
- TextID = StringId.Email_,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- };
- emailRow.AddChidren(btnEmailTitle);
-
- Button btnEmailText = new Button()
- {
- X = btnEmailTitle.Right,
- Y = Application.GetRealHeight(8),
- Height = Application.GetRealHeight(20),
- Width = Application.GetRealWidth(200),
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.TextFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- Text = Constant.SUPPORT_EMAIL,
- };
- emailRow.AddChidren(btnEmailText);
-
- Button btnEmailTipText = new Button()
- {
- X = btnEmailTitle.Right,
- Y = btnEmailText.Bottom + Application.GetRealHeight(4),
- Height = Application.GetRealHeight(20),
- Width = Application.GetRealWidth(200),
- TextAlignment = TextAlignment.TopLeft,
- TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
- TextColor = CSS_Color.PromptingColor1,
- TextID = StringId.WillGivePriorityToTheTreatmen,
- };
- emailRow.AddChidren(btnEmailTipText);
- /// <summary>
- /// 鍓嶈繘鍥炬爣
- /// </summary>
- var btnImage2 = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- emailRow.AddChidren(btnImage2);
-
- emailRow.AddChidren(new Button() { X = Application.GetRealWidth(16), Y = emailRow.Height - Application.GetRealHeight(1), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
-
- EventHandler<MouseEventArgs> eventHandler2 = (sender, e) =>
- {
- CopyToClipboard(Constant.SUPPORT_EMAIL);
- };
-
- emailRow.MouseUpEventHandler = eventHandler2;
- btnEmailText.MouseUpEventHandler = eventHandler2;
- btnImage2.MouseUpEventHandler = eventHandler2;
- #endregion
- }
-
-
-
- /// <summary>
- /// 澶嶅埗鍒板壀鍒囨澘
- /// </summary>
- /// <param name="text"></param>
- void CopyToClipboard(string text)
- {
- Clipboard.SetTextAsync(text);
- Utlis.ShowTip(text + "\n" + Language.StringByID(StringId.CopySuccess));
- }
-
- }
-
-}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs
deleted file mode 100644
index 9f6526c..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-锘縰sing System;
-using Shared;
-using HDL_ON.UI.CSS;
-using System.Collections.Generic;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 鍔熻兘浠嬬粛
- /// </summary>
- public class FunctionIntroductionPage : FrameLayout
- {
- FrameLayout bodyView;
- /// <summary>
- ///
- /// </summary>
- FrameLayout emptyTipFrameLayout;
- /// <summary>
- /// 褰撳墠
- /// </summary>
- VerticalScrolViewLayout bodyScrolView;
- /// <summary>
- /// 鍐呭涓虹┖鎻愮ずView
- /// </summary>
- EmptyTipView emptyTipView;
-
- public FunctionIntroductionPage()
- {
- bodyView = this;
- }
-
- public void LoadPage()
- {
- new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionIntroduced)).LoadTopView();
-
- int bodyY = Application.GetRealHeight(64);
- bodyScrolView = new VerticalScrolViewLayout()
- {
- Y = bodyY,
- Height = bodyView.Height - bodyY,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(bodyScrolView);
-
- AddEmptyTipView();
-
- //TestLoad();
- }
-
- /// <summary>
- /// 娣诲姞鍐呭涓虹┖鎻愮ず椤甸潰
- /// </summary>
- void AddEmptyTipView()
- {
- emptyTipView = new EmptyTipView()
- {
- Gravity = Gravity.Center
- };
- bodyView.AddChidren(emptyTipView);
- }
-
- /// <summary>
- /// 鍔犺浇鍖哄煙閫夋嫨RowView
- /// </summary>
- /// <param name="VerticalScrolViewMiddle"></param>
- void AddRowView(VerticalScrolViewLayout VerticalScrolViewMiddle, HelpURLInfo functionInfo)
- {
- var rowView = new FrameLayout()
- {
- Height = Application.GetRealHeight(54),
- };
- VerticalScrolViewMiddle.AddChidren(rowView);
-
- //鏍囬
- var btnTilte = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(8),
- Width = Application.GetRealWidth(320),
- Height = Application.GetRealHeight(20),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- Text = functionInfo.Title
- };
- rowView.AddChidren(btnTilte);
-
- //鍓爣棰�
- var btnSubtitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = btnTilte.Bottom + Application.GetRealHeight(4),
- Width = Application.GetRealWidth(320),
- Height = Application.GetRealHeight(14),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
- Text = functionInfo.CreateTime
- };
-
- rowView.AddChidren(btnSubtitle);
-
- var btnGo = new Button()
- {
- X = Application.GetRealWidth(343),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
-
- rowView.AddChidren(btnGo);
-
- var lineView = new LineView(rowView.Height);
- rowView.AddChidren(lineView);
-
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
- new WebViewDialog().LoadPage(functionInfo.Title, functionInfo.Url);
- };
-
- btnTilte.MouseUpEventHandler = eventHandler;
- btnSubtitle.MouseUpEventHandler = eventHandler;
- btnGo.MouseUpEventHandler = eventHandler;
- }
-
- #region 娴嬭瘯
- List<HelpURLInfo> list = new List<HelpURLInfo>();
- /// <summary>
- ///
- /// </summary>
- void TestLoad()
- {
- list.Add(new HelpURLInfo()
- {
- Title = "HDL ON PRO 1.0.10 涓昏鏇存柊",
- CreateTime = "11鏈�26",
- Url = Constant.URL_PRIVACYPOLICY,
- });
-
- list.Add(new HelpURLInfo()
- {
- Title = "HDL ON PRO 1.0.09 涓昏鏇存柊",
- CreateTime = "10鏈�26",
- Url = Constant.URL_PRIVACYPOLICY,
- });
-
- list.Add(new HelpURLInfo()
- {
- Title = "HDL ON PRO 1.0.08 涓昏鏇存柊",
- CreateTime = "09鏈�26",
- Url = Constant.URL_PRIVACYPOLICY,
- });
-
- foreach (var info in list)
- {
- AddRowView(bodyScrolView, info);
- }
- }
- #endregion
- }
-
-
- /// <summary>
- /// 甯姪缃戦〉鍦板潃
- /// </summary>
- [System.Serializable]
- public class HelpURLInfo
- {
- /// <summary>
- ///
- /// </summary>
- public string Title;
- /// <summary>
- ///
- /// </summary>
- public string CreateTime;
- /// <summary>
- ///
- /// </summary>
- public string Url;
- }
-}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AboutOnPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOnPage.cs
new file mode 100644
index 0000000..1a8753c
--- /dev/null
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AboutOnPage.cs
@@ -0,0 +1,56 @@
+锘縰sing System;
+using Shared;
+using HDL_ON.UI.CSS;
+
+namespace HDL_ON.UI
+{
+ public class AboutOnPage : FrameLayout
+ {
+ FrameLayout bodyView;
+
+ public AboutOnPage()
+ {
+ bodyView = this;
+ }
+
+ public void LoadPage()
+ {
+ new TopViewDiv(bodyView, Language.StringByID(StringId.About)).LoadTopView();
+
+ Button btnOnIcon = new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealWidth(106),
+ Width = Application.GetRealWidth(58),
+ Height = Application.GetRealWidth(58),
+ UnSelectedImagePath = "OnIcon.png",
+ };
+ bodyView.AddChidren(btnOnIcon);
+
+ Button btnOnTitle = new Button()
+ {
+ //Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealWidth(184),
+ Height = Application.GetRealWidth(28),
+ TextAlignment = TextAlignment.Center,
+ Text = "ON+",
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
+ IsBold = true,
+ };
+ bodyView.AddChidren(btnOnTitle);
+
+ Button btnOnVersion = new Button()
+ {
+ Y = btnOnTitle.Bottom,
+ Height = Application.GetRealWidth(25),
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.TextualColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Text = Language.StringByID(StringId.VersionNumber) + " " + MainPage.VersionString,
+ };
+ bodyView.AddChidren(btnOnVersion);
+
+ }
+ }
+}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
index 331dc4a..cc2daf6 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs
@@ -9,15 +9,8 @@
/// </summary>
public partial class AccountBindInfoPage : FrameLayout
{
- /// <summary>
- ///
- /// </summary>
FrameLayout bodyView;
- /// <summary>
- ///
- /// </summary>
Action<string> action;
-
/// <summary>
/// 淇淇℃伅鐨勭被鍨�
/// 1:閭锛�2:鎵嬫満
@@ -27,10 +20,6 @@
/// 鐣岄潰鏍囬
/// </summary>
int titleId;
-
- /// <summary>
- ///
- /// </summary>
public AccountBindInfoPage()
{
bodyView = this;
@@ -83,7 +72,7 @@
Y = Application.GetRealHeight(213),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
+ Height = Application.GetRealHeight(44),
BackgroundColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.MainBackgroundColor,
@@ -129,7 +118,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
var cbe = new ChangeBindAccountPage();
- cbe.IsUnbind = false;
+ cbe.isUnbind = false;
MainPage.BasePageView.AddChidren(cbe);
if (optionType == 1)
{
@@ -152,7 +141,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
var cbe = new ChangeBindAccountPage();
- cbe.IsUnbind = true;//鏄惁涓鸿В缁戞爣璁�
+ cbe.isUnbind = true;//鏄惁涓鸿В缁戞爣璁�
MainPage.BasePageView.AddChidren(cbe);
if (optionType == 1)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs
index 1faeae0..44b9478 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs
@@ -18,17 +18,7 @@
/// <summary>
///
/// </summary>
- Button btnTitle;
- /// <summary>
- ///
- /// </summary>
- Button btnContent;
-
- /// <summary>
- ///
- /// </summary>
Action<string> action;
-
/// <summary>
/// 鎿嶄綔鐩爣绫诲瀷 1:閭锛�2:鎵嬫満
/// </summary>
@@ -36,8 +26,16 @@
/// <summary>
/// 鏄惁涓鸿В缁戦獙璇�
/// </summary>
- public bool IsUnbind;
-
+ public bool isUnbind;
+
+ /// <summary>
+ ///
+ /// </summary>
+ Button btnTitle;
+ /// <summary>
+ ///
+ /// </summary>
+ Button btnContent;
/// <summary>
/// ChangeBindAccountPage
@@ -103,7 +101,7 @@
Y = Application.GetRealHeight(213),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
+ Height = Application.GetRealHeight(44),
BackgroundColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.MainBackgroundColor,
@@ -150,12 +148,12 @@
{
if (optionType == 2)
{
- btnTitle.TextID = IsUnbind ? StringId.CurPhone : StringId.PhoneNumberVerification;
+ btnTitle.TextID = isUnbind ? StringId.CurPhone : StringId.PhoneNumberVerification;
btnContent.Text = UserInfo.Current.userMobileInfo;
}
else
{
- btnTitle.TextID = IsUnbind ? StringId.CurrentEmail : StringId.EmailVerification;
+ btnTitle.TextID = isUnbind ? StringId.CurrentEmail : StringId.EmailVerification;
btnContent.Text = UserInfo.Current.userEmailInfo;
}
}
@@ -234,7 +232,7 @@
{
button.BackgroundColor = CSS_Color.PromptingColor1;
var vcp = new ChangeBindVerificationCodePage();
- vcp.IsUnbind = IsUnbind;
+ vcp.isUnbind = isUnbind;
MainPage.BasePageView.AddChidren(vcp);
vcp.LoadPage(action, titleId, optionType, time);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs
index b599c70..6508861 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs
@@ -32,18 +32,13 @@
Button btnNum6Line;
EditText et;
- /// <summary>
- ///
- /// </summary>
+
Button btnResend;
- /// <summary>
- ///
- /// </summary>
+
Button btnTip;
- /// <summary>
- ///
- /// </summary>
+
Action<string> action;
+
/// <summary>
///
/// </summary>
@@ -57,10 +52,11 @@
/// 鍊掕鏃舵椂闂�
/// </summary>
int time = 0;
+
/// <summary>
/// 鏄惁涓鸿В缁戦獙璇�
/// </summary>
- public bool IsUnbind;
+ public bool isUnbind;
/// <summary>
///
@@ -262,7 +258,7 @@
Y = Application.GetRealHeight(276),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
+ Height = Application.GetRealHeight(44),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.Center,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs
index 8362af1..494fc3f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs
@@ -16,10 +16,6 @@
FrameLayout bodyView;
Button btnBind;
EditText etContent;
-
- /// <summary>
- ///
- /// </summary>
Action<string> action;
/// <summary>
@@ -34,6 +30,7 @@
/// 鏄惁鎹㈢粦
/// </summary>
bool isModifyBind;
+
/// <summary>
/// 鎵嬫満鍖哄彿
/// </summary>
@@ -60,7 +57,7 @@
if (isModifyBind)
{
//淇敼缁戝畾
- titleId = isPhone ? StringId.EntryNewPhone : StringId.EntryNewEmail;
+ titleId = isPhone ? StringId.ModifyBindingPhone : StringId.ModifyBindingEmail;
}
else
{
@@ -68,106 +65,11 @@
titleId = isPhone ? StringId.BoundMobileInfo : StringId.BoundEmailInfo;
}
+
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
- if (isPhone)
- {
- AddPhoneFrameLayout();
- }
- else
- {
- AddEmailFrameLayout();
- }
-
- //鐐瑰嚮鑾峰彇楠岃瘉鐮�
- LoadEvent_GetVerification(btnBind);
-
- }
-
- /// <summary>
- ///
- /// </summary>
- void AddPhoneFrameLayout() {
- #region 濡傛灉鏄墜鏈�
- //鎵嬫満鍥藉鍖哄彿閫夋嫨鎸夐挳
- ListCellView codeView = new ListCellView() {
- Y = Application.GetRealHeight(64),
- };
- bodyView.AddChidren(codeView);
- //璺宠浆鍥藉鍖哄彿閫夋嫨鐣岄潰
- Action selectAction = () =>
- {
- JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
- if (!string.IsNullOrEmpty(code))
- {
- phoneZoneCode = code;
- codeView.BtnSubtitle.Text = "+" + phoneZoneCode;
- }
- });
- };
- codeView.GoAction = selectAction;
- codeView.BtnTilte.Text = Language.StringByID(StringId.CountryOrRegion);
- codeView.BtnSubtitle.Text = "+" + phoneZoneCode;
-
- //鎵嬫満鍙疯緭鍏ユ
- FrameLayout rowView = new FrameLayout()
- {
- Y = codeView.Bottom,
- Height = Application.GetRealHeight(50),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(rowView);
-
- //缁戝畾鎵嬫満鍙�
- Button btnTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(180),
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = titleId,
- };
- rowView.AddChidren(btnTitle);
-
- etContent = new EditText()
- {
- Width = Application.GetRealWidth(359),
- TextColor = CSS_Color.PromptingColor1,
- TextSize = CSS_FontSize.TextFontSize,
- TextAlignment = TextAlignment.CenterRight,
- Foucs = true
- };
- rowView.AddChidren(etContent);
-
- btnBind = new Button()
- {
- Y = Application.GetRealHeight(213),
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- BackgroundColor = CSS_Color.MainColor,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.MainBackgroundColor,
- TextID = StringId.GetVerificationCode,
- TextSize = CSS_FontSize.SubheadingFontSize,
- IsBold = true,
- Radius = (uint)Application.GetRealWidth(22),
- BorderColor = 0x00000000,
- BorderWidth = 0,
- };
- bodyView.AddChidren(btnBind);
- #endregion
- }
-
- /// <summary>
- ///
- /// </summary>
- void AddEmailFrameLayout()
- {
- #region 濡傛灉鏄偖绠�
FrameLayout rowView = new FrameLayout()
{
Y = Application.GetRealHeight(72),
@@ -176,7 +78,7 @@
};
bodyView.AddChidren(rowView);
- //缁戝畾閭
+ //缁戝畾閭鎴栬�呯粦瀹氭墜鏈哄彿
Button btnTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -203,7 +105,7 @@
Y = Application.GetRealHeight(213),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
+ Height = Application.GetRealHeight(44),
BackgroundColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.MainBackgroundColor,
@@ -215,9 +117,11 @@
BorderWidth = 0,
};
bodyView.AddChidren(btnBind);
- #endregion
- }
+ //鐐瑰嚮鑾峰彇楠岃瘉鐮�
+ LoadEvent_GetVerification(btnBind);
+
+ }
}
@@ -235,32 +139,6 @@
{
Application.HideSoftInput();
var account = etContent.Text.Trim();
-
- //濡傛灉鏄崲缁戞娴嬫槸鍚︾浉鍚屽笎鍙�
- if (isModifyBind)
- {
- if (isPhone)
- {
- if(account == UserInfo.Current.userMobileInfo)
- {
- //鎻愮ず鎹㈢粦甯愬彿鐩稿悓
- Utlis.ShowTip(Language.StringByID(StringId.EntryNewPhone));
- return;
- }
- }
- else
- {
- if (account == UserInfo.Current.userEmailInfo)
- {
- //鎻愮ず鎹㈢粦甯愬彿鐩稿悓
- Utlis.ShowTip(Language.StringByID(StringId.EntryNewEmail));
- return;
- }
-
- }
- }
-
-
#region 姝ｅ垯琛ㄨ揪寮�
//1.妫�娴嬭处鍙锋槸鍚﹀悎娉�
if (!isPhone)
@@ -330,7 +208,7 @@
{
button.BackgroundColor = CSS_Color.PromptingColor1;
var vcp = new NewBindVerificationCodePage();
- vcp.PhoneZoneCode = phoneZoneCode;
+ vcp.phoneZoneCode = phoneZoneCode;
MainPage.BasePageView.AddChidren(vcp);
vcp.LoadPage(action, titleId, account, isPhone, time, isModifyBind);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs
index 3b501fe..91255e5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs
@@ -52,20 +52,20 @@
/// <summary>
/// 鏄惁鎵嬫満
/// </summary>
- bool isPhone;
+ public bool isPhone;
/// <summary>
/// 鏄惁鎹㈢粦
/// </summary>
- bool isModifyBind;
+ public bool isModifyBind;
/// <summary>
/// 鏂扮粦瀹氱殑璐﹀彿
/// </summary>
- string verAccount;
+ public string verAccount;
/// <summary>
/// 鎵嬫満鍖哄彿
/// </summary>
- public string PhoneZoneCode = "86";
+ public string phoneZoneCode = "86";
public NewBindVerificationCodePage()
@@ -268,7 +268,7 @@
Y = Application.GetRealHeight(276),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
+ Height = Application.GetRealHeight(44),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.Center,
@@ -642,7 +642,7 @@
}
else
{
- resultObj = new HttpServerRequest().VerificationCodeSend(VerifyType.REGISTER_USER_SYSTEM, verAccount, true, PhoneZoneCode);
+ resultObj = new HttpServerRequest().VerificationCodeSend(VerifyType.REGISTER_USER_SYSTEM, verAccount, true, phoneZoneCode);
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/FAQHelpPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/FAQHelpPage.cs
deleted file mode 100644
index 35c79c2..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/FAQHelpPage.cs
+++ /dev/null
@@ -1,287 +0,0 @@
-锘縰sing System;
-using Shared;
-using HDL_ON.UI.CSS;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 鑾峰彇鏀寔-甯歌闂椤甸潰
- /// </summary>
- public class FAQHelpPage : FrameLayout
- {
- /// <summary>
- ///
- /// </summary>
- FrameLayout bodyView;
- /// <summary>
- /// 鎼滅储椤甸潰
- /// </summary>
- FrameLayout searchView;
- /// <summary>
- /// 鑿滃崟鎸夐挳
- /// </summary>
- Button btnMenu;
- /// <summary>
- /// 鐢佃瘽鎸夐挳
- /// </summary>
- Button btnTelephone;
- /// <summary>
- /// 鍙戦�佷俊鎭寜閽�
- /// </summary>
- Button btnSendMes;
-
-
- /// <summary>
- /// 鑿滃崟鎸夐挳鏄惁灞曞紑
- /// </summary>
- bool isbtnMenuOpen;
-
- public FAQHelpPage()
- {
- bodyView = this;
- }
-
- public void LoadPage()
- {
- bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.GetSupport)).LoadTopView();
-
- //鎼滅储鎸夐挳
- searchView = new FrameLayout()
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(76),
- Height = Application.GetRealHeight(28),
- Width = Application.GetRealWidth(343),
- Radius = (uint)Application.GetRealHeight(6),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(searchView);
-
- ImageView searchImage = new ImageView()
- {
- Width = Application.GetRealWidth(20),
- Height = Application.GetRealWidth(20),
- Gravity = Gravity.Center,
- ImagePath = "PersonalCenter/Support/Search.png"
- };
- searchView.AddChidren(searchImage);
-
- #region Help
- var helpView = new FrameLayout()
- {
- Y = Application.GetRealHeight(112),
- Height = Application.GetRealHeight(208),
- BackgroundColor = CSS_Color.MainBackgroundColor,
-
- };
- bodyView.AddChidren(helpView);
-
- var helpTip = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(10),
- Height = Application.GetRealHeight(28),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- Width = Application.GetRealWidth(200),
- TextID = StringId.WhatCanWeDoForYou
- };
- helpView.AddChidren(helpTip);
-
- #region 鍔熻兘闂
- var functionView = new ListIconCellView()
- {
- Y = Application.GetRealHeight(58),
- };
- helpView.AddChidren(functionView);
- functionView.BtnTilte.TextID = StringId.FunctionalQuestion;
- functionView.BtnIcon.UnSelectedImagePath = "PersonalCenter/Support/Function.png";
-
- Action functionAction = () =>
- {
- OpenQuestionListPage(1);
- };
- functionView.GoAction = functionAction;
- #endregion
-
- #region 鍦烘櫙闂
- var sceneView = new ListIconCellView()
- {
- Y = functionView.Bottom,
- };
- helpView.AddChidren(sceneView);
- sceneView.BtnTilte.TextID = StringId.SceneQuestion;
- sceneView.BtnIcon.UnSelectedImagePath = "PersonalCenter/Support/Scene.png";
-
- Action sceneAction = () =>
- {
- OpenQuestionListPage(2);
- };
- sceneView.GoAction = functionAction;
- #endregion
-
- #region APP浣跨敤闂
- var appUseView = new ListIconCellView()
- {
- Y = sceneView.Bottom,
- };
- helpView.AddChidren(appUseView);
- appUseView.BtnTilte.TextID = StringId.AppUsageAssistance;
- appUseView.BtnIcon.UnSelectedImagePath = "PersonalCenter/Support/Help.png";
- appUseView.LineView.RemoveFromParent();
-
- Action appUseAction = () =>
- {
- OpenQuestionListPage(3);
- };
- appUseView.GoAction = appUseAction;
- #endregion
- #endregion
-
-
- #region question View
- int qY = Application.GetRealHeight(328);
- var questionView = new FrameLayout()
- {
- Y = qY,
- Height = bodyView.Height - qY,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(questionView);
-
- var questionTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(10),
- Height = Application.GetRealHeight(28),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- Width = Application.GetRealWidth(200),
- Text = Language.StringByID(StringId.CommonQuestion) + ":"
- };
- questionView.AddChidren(questionTitle);
- #endregion
-
- #region 鍔熻兘鎸夐挳
- btnMenu = new Button()
- {
- Y = Application.GetRealHeight(542),
- X = Application.GetRealWidth(302),
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealWidth(58),
- UnSelectedImagePath = "PersonalCenter/Support/Menu.png",
- SelectedImagePath = "PersonalCenter/Support/Close.png",
- };
- bodyView.AddChidren(btnMenu);
-
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
- isbtnMenuOpen = !isbtnMenuOpen;
- SetMenuButtonState(isbtnMenuOpen);
- };
- btnMenu.MouseUpEventHandler = eventHandler;
-
- btnTelephone = new Button()
- {
- Y = Application.GetRealHeight(494),
- X = Application.GetRealWidth(274),
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealWidth(58),
- UnSelectedImagePath = "PersonalCenter/Support/Telephone.png",
- Visible = false,
- };
- bodyView.AddChidren(btnTelephone);
-
- btnTelephone.MouseUpEventHandler = (sender, e) =>
- {
- OpenGetSupportPage();
- };
-
- btnSendMes = new Button()
- {
- Y = Application.GetRealHeight(590),
- X = Application.GetRealWidth(274),
- Width = Application.GetRealWidth(58),
- Height = Application.GetRealWidth(58),
- UnSelectedImagePath = "PersonalCenter/Support/SendMessage.png",
- Visible = false,
- };
- bodyView.AddChidren(btnSendMes);
-
- btnSendMes.MouseUpEventHandler = (sender, e) =>
- {
- OpenGetSupportPage();
- };
-
- #endregion
-
-
- }
-
-
-
- /// <summary>
- /// 鏄惁灞曞紑
- /// </summary>
- /// <param name="isOpen"></param>
- void SetMenuButtonState(bool isOpen)
- {
- btnMenu.IsSelected = isOpen;
- btnTelephone.Visible = isOpen;
- btnSendMes.Visible = isOpen;
-
-
- if (isOpen)
- {
- //灞曞紑
-
- }
- else
- {
- //鍏抽棴闅愯棌
-
- }
-
- }
-
- /// <summary>
- /// 鎵撳紑闂鍒楄〃椤甸潰
- /// </summary>
- /// <param name="questionType">1:鍔熻兘闂 2:鍦烘櫙闂 3:APP浣跨敤杈呭姪</param>
- void OpenQuestionListPage(int questionType)
- {
- int titleId = 0;
- if (questionType == 1)
- {
- titleId = StringId.FunctionalQuestion;
- }
- else if (questionType == 2)
- {
- titleId = StringId.SceneQuestion;
- }
- else if (questionType == 3)
- {
- titleId = StringId.AppUsageAssistance;
- }
-
- var mPage = new QuestionListPage();
- MainPage.BasePageView.AddChidren(mPage);
- mPage.LoadPage(titleId);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
-
- /// <summary>
- /// 鎵撳紑鑾峰彇鏀寔鐢佃瘽椤甸潰
- /// </summary>
- void OpenGetSupportPage()
- {
- var mPage = new GetSupportPage();
- MainPage.BasePageView.AddChidren(mPage);
- mPage.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- }
- }
-}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/QuestionListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/QuestionListPage.cs
deleted file mode 100644
index c6527b6..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/QuestionListPage.cs
+++ /dev/null
@@ -1,66 +0,0 @@
-锘縰sing System;
-using Shared;
-using HDL_ON.UI.CSS;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 闂鍒楄〃椤甸潰
- /// 鍔熻兘闂銆佸満鏅棶棰樸�丄PP浣跨敤杈呭姪
- /// </summary>
- public class QuestionListPage : FrameLayout
- {
- /// <summary>
- /// bodyView
- /// </summary>
- FrameLayout bodyView;
- /// <summary>
- /// 褰撳墠
- /// </summary>
- VerticalScrolViewLayout bodyScrolView;
- /// <summary>
- /// emptyTipView
- /// </summary>
- EmptyTipView emptyTipView;
-
- /// <summary>
- ///
- /// </summary>
- public QuestionListPage()
- {
- bodyView = this;
- }
-
- /// <summary>
- /// 鍔犺浇鏄剧ず缃戦〉
- /// </summary>
- /// <param name="titleId"></param>
- public void LoadPage(int titleId)
- {
- new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
-
- int bodyY = Application.GetRealHeight(64);
- bodyScrolView = new VerticalScrolViewLayout()
- {
- Y = bodyY,
- Height = bodyView.Height - bodyY,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(bodyScrolView);
-
- AddEmptyTipView();
- }
-
- /// <summary>
- /// 娣诲姞鍐呭涓虹┖鎻愮ず椤甸潰
- /// </summary>
- void AddEmptyTipView()
- {
- emptyTipView = new EmptyTipView()
- {
- Gravity = Gravity.Center
- };
- bodyView.AddChidren(emptyTipView);
- }
- }
-}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/GetSupportPage.cs
similarity index 92%
rename from HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs
rename to HDL_ON/UI/UI2/4-PersonalCenter/GetSupportPage.cs
index d9b916d..ecbaae2 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/GetSupport/GetSupportPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/GetSupportPage.cs
@@ -4,19 +4,10 @@
namespace HDL_ON.UI
{
- /// <summary>
- /// 鑾峰彇鏀寔鐢佃瘽椤甸潰
- /// </summary>
public class GetSupportPage : FrameLayout
{
- /// <summary>
- ///
- /// </summary>
- FrameLayout bodyView;
- /// <summary>
- ///
- /// </summary>
+ FrameLayout bodyView;
public GetSupportPage()
{
bodyView = this;
@@ -82,7 +73,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = Constant.SUPPORT_EMAIL,
+ Text = "hdltickets@hdlautomation.com",
};
emailRow.AddChidren(btnEmailText);
emailRow.AddChidren(new Button() { X = Application.GetRealWidth(16), Y = Application.GetRealWidth(49), Height = Application.GetRealHeight(1), BackgroundColor = CSS_Color.DividingLineColor });
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
index 80b04df..8f420ab 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
@@ -70,7 +70,7 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(244),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
+ Height = Application.GetRealHeight(44),
Radius = (uint)Application.GetRealWidth(22),
BorderWidth = 0,
BorderColor = 0x00000000,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs
index 9b58b29..f72ed24 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/ChooseShareMemberTargetListPage.cs
@@ -77,7 +77,7 @@
Y = Application.GetRealHeight(519 + 64),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
+ Height = Application.GetRealHeight(44),
BackgroundColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.MainBackgroundColor,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
index 5d38e92..b2b32f8 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
@@ -119,7 +119,7 @@
Y = Application.GetRealHeight(519 + 64),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
+ Height = Application.GetRealHeight(44),
BackgroundColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.MainBackgroundColor,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
index e8b73b7..79c7a1d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPageBLL.cs
@@ -69,22 +69,22 @@
var responeObj = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ResidenceMemberInfo>>(responePack.Data.ToString());
foreach (var mInfo in responeObj)
{
- //ResponsePack memberInfoResponePack = new HttpServerRequest().GetResidenceMemberAccountInfo(mInfo.childAccountId);
- //var dataStr = JObject.FromObject(memberInfoResponePack.ResponseData);
- //FileStream fs = null;
+ ResponsePack memberInfoResponePack = new HttpServerRequest().GetResidenceMemberAccountInfo(mInfo.childAccountId);
+ var dataStr = JObject.FromObject(memberInfoResponePack.ResponseData);
+ FileStream fs = null;
try
{
- //var headImageString = dataStr.GetValue("HeadImage").ToString();
- //if (!string.IsNullOrEmpty(headImageString))
- //{
- // var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
- // var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
- // var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", mInfo.childAccountId + ".png");
- // fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
- // fs.Write(headImageBytes, 0, headImageBytes.Length);
- // fs.Flush();
- // mInfo.headImagePagePath = filePath;
- //}
+ var headImageString = dataStr.GetValue("HeadImage").ToString();
+ if (!string.IsNullOrEmpty(headImageString))
+ {
+ var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(headImageString);
+ var headImageBytes = Newtonsoft.Json.JsonConvert.DeserializeObject<byte[]>(jsonString);
+ var filePath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "/", mInfo.childAccountId + ".png");
+ fs = new FileStream(filePath, FileMode.Create, FileAccess.Write);
+ fs.Write(headImageBytes, 0, headImageBytes.Length);
+ fs.Flush();
+ mInfo.headImagePagePath = filePath;
+ }
if(string.IsNullOrEmpty(mInfo.nickName))
{
mInfo.nickName = mInfo.UserName;
@@ -96,11 +96,11 @@
}
finally
{
- //if (fs != null)
- //{
- // fs.Close();
- //}
- ////-----------鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
+ if (fs != null)
+ {
+ fs.Close();
+ }
+ //-----------鑾峰彇浣忓畢涓嬪瓙璐﹀彿鐨勫叡浜暟鎹垪琛�
LoadMethod_GetMemberSharedDataList(mInfo);
}
residenceMemberInfos.Add(mInfo);
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index 91a039c..6548ff3 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -54,7 +54,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = memberInfo.nickName + "(" + memberInfo.Account + ")",
+ Text = memberInfo.nickName + "(" + memberInfo.UserName + ")",
};
headPortraitView.AddChidren(btnMemberName);
@@ -226,8 +226,7 @@
btnDelMember = new Button()
{
Y = Application.GetRealHeight(617),
- //Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
- Height = Application.GetRealHeight(50),
+ Height = MainPage.Increase ? Application.GetRealHeight(70) : Application.GetRealHeight(50),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.WarningColor,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
deleted file mode 100644
index 1cfac08..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.CSS;
-using Shared;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 鎴戠殑浜岀淮鐮侀〉闈�
- /// </summary>
- public class MyQRCodePage : FrameLayout
- {
- FrameLayout bodyView;
-
- public MyQRCodePage()
- {
- bodyView = this;
- }
-
- public void LoadPage()
- {
- bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.MyQRcode)).LoadTopView();
-
- int backViewHeight = Application.GetRealHeight(132) + Application.GetRealWidth(266);
- FrameLayout backView = new FrameLayout()
- {
- Y = Application.GetRealHeight(144),
- X = Application.GetRealWidth(20),
- Height = backViewHeight,
- Width = Application.GetRealWidth(335),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Radius = (uint)Application.GetRealWidth(8),
- };
- bodyView.AddChidren(backView);
-
- #region 澶村儚銆佹樀绉般�佸笎鍙�
- FrameLayout headView = new FrameLayout()
- {
- Y = Application.GetRealHeight(16),
- Height = Application.GetRealHeight(60),
- };
- backView.AddChidren(headView);
-
- ImageView headImage = new ImageView()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetMinRealAverage(60),
- Height = Application.GetMinRealAverage(60),
- Radius = (uint)Application.GetMinRealAverage(30),
- ImagePath = UserInfo.Current.headImagePagePath,
- };
- headView.AddChidren(headImage);
-
- //鐢ㄦ埛鍚嶇О
- var btnUserName = new Button()
- {
- X = headImage.Right + Application.GetRealWidth(12),
- Width = Application.GetRealWidth(200),
- Height = Application.GetRealHeight(30),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.UsersWhoNameIsEmpty,
- IsBold = true
- };
- headView.AddChidren(btnUserName);
-
- if (!string.IsNullOrEmpty(UserInfo.Current.userName))
- {
- btnUserName.Text = UserInfo.Current.userName;
- }
-
- //鐢ㄦ埛甯愬彿
- var btnEmail = new Button()
- {
- X = headImage.Right + Application.GetRealWidth(12),
- Y = btnUserName.Bottom,
- Height = Application.GetRealHeight(30),
- TextAlignment = TextAlignment.TopLeft,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = UserInfo.Current.accountString
- };
- headView.AddChidren(btnEmail);
- #endregion
-
- //浜岀淮鐮�
- int codeWidth = Application.GetRealWidth(266);
- ImageView codeImage = new ImageView()
- {
- X = Application.GetRealWidth(35),
- Y = Application.GetRealHeight(104),
- Height = codeWidth,
- Width = codeWidth,
- ImageBytes = Scan.BytesFromText(UserInfo.Current.accountString, codeWidth, codeWidth),
- };
- backView.AddChidren(codeImage);
-
- ////浜岀淮鐮佷腑蹇冨ご鍍�
- //int imageWidth = Application.GetMinRealAverage(60);
- //int imageX = codeImage.X + (codeWidth - imageWidth) / 2;
- //int imageY = codeImage.Y + (codeWidth - imageWidth) / 2;
- //ImageView headImage2 = new ImageView()
- //{
- // X = imageX,
- // Y = imageY,
- // Width = imageWidth,
- // Height = imageWidth,
- // ImagePath = UserInfo.Current.headImagePagePath,
- // BorderColor = CSS_Color.MainBackgroundColor,
- // BorderWidth = (uint)Application.GetRealWidth(2),
- // Radius = (uint)Application.GetMinRealAverage(30),
- //};
- //backView.AddChidren(headImage2);
- }
- }
-}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
deleted file mode 100644
index 47df8f0..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-锘縰sing System;
-using HDL_ON.UI.CSS;
-using Shared;
-using Xamarin.Essentials;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 鎴戠殑鏈嶅姟鍣ㄤ俊鎭〉闈�
- /// </summary>
- public class MyServerInfoPage : FrameLayout
- {
- FrameLayout bodyView;
-
- public MyServerInfoPage()
- {
- bodyView = this;
- }
-
- public void LoadPage()
- {
- bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
- //鏈嶅姟鍣ㄤ俊鎭�
- new TopViewDiv(bodyView, Language.StringByID(StringId.ServerInformation)).LoadTopView();
-
- ImageView imageView = new ImageView()
- {
- Y = Application.GetMinRealAverage(88),
- Width = Application.GetMinRealAverage(200),
- Height = Application.GetMinRealAverage(180),
- ImagePath = "PersonalCenter/ServerInfo.png",
- Gravity = Gravity.CenterHorizontal
- };
- bodyView.AddChidren(imageView);
-
- var serverBtn = new Button()
- {
- X = Application.GetRealWidth(40),
- Y = imageView.Bottom + Application.GetRealHeight(12),
- Width = Application.GetRealWidth(295),
- Height = Application.GetRealHeight(22),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- //Text = "褰撳墠璐﹀彿鏈嶅姟鍣ㄦ墍灞烇細涓浗锛屼唬鐮亁xxx",
- IsBold = true
-
- };
- bodyView.AddChidren(serverBtn);
-
- var tipBtn = new Button()
- {
- X = Application.GetRealWidth(40),
- Y = serverBtn.Bottom + Application.GetRealHeight(12),
- Width = Application.GetRealWidth(295),
- Height = Application.GetRealHeight(80),
- TextAlignment = TextAlignment.TopLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.TextFontSize,
- //Text = "*鏈嶅姟鍣ㄦ槸鎮ㄥ綋鍓嶄簯绔暟鎹瓨鍌ㄧ殑鎵�鍦ㄥ尯鍩燂紝鏃犻渶蹇呰锛屾垜浠笉寤鸿鍙戠敓杩佺Щ",
- TextID = StringId.CurrentAccountServerOwnershipTip,
- IsMoreLines = true
-
- };
- bodyView.AddChidren(tipBtn);
-
- var callBtn = new TextButton()
- {
- X = Application.GetRealWidth(40),
- Y = Application.GetRealHeight(606),
- Width = Application.GetRealWidth(168),
- Height = Application.GetRealHeight(22),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.TextualColor,
- TextSize = CSS_FontSize.TextFontSize,
- //Text = "*鑻ラ渶瑕佽縼绉绘湇鍔″櫒锛岃鎷ㄦ墦",
- TextID = StringId.ToMigrateTheServerPleaseCall,
-
- };
- bodyView.AddChidren(callBtn);
- callBtn.Width = callBtn.GetTextWidth() + Application.GetRealWidth(2);
-
- var phoneBtn = new TextButton()
- {
- X = callBtn.Right + Application.GetRealHeight(2),
- Y = Application.GetRealHeight(606),
- Width = Application.GetRealWidth(200),
- Height = Application.GetRealHeight(22),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- Text = "400-855-8535",
- IsBold = true
- };
- bodyView.AddChidren(phoneBtn);
-
- phoneBtn.MouseUpEventHandler += (sender, e) =>
- {
- PhoneDialer.Open(Constant.SUPPORT_TELEPHONENUMBER);
- };
-
- serverBtn.Text = Language.StringByID(StringId.CurrentAccountServerOwnership) + UserInfo.Current.GlobalRegion.regionName;
-
- }
- }
-}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 834db5c..f6d7949 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -61,10 +61,10 @@
};
dispalyView.AddChidren(contentView);
- if (UserInfo.Current.regionList.Count < 3)
+ if ( UserInfo.Current.regionList.Count < 3)
{
}
- else if (UserInfo.Current.regionList.Count < 4)
+ else if ( UserInfo.Current.regionList.Count < 4)
{
dispalyView = new FrameLayout()
{
@@ -79,7 +79,7 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (UserInfo.Current.regionList.Count < 5)
+ else if ( UserInfo.Current.regionList.Count < 5)
{
dispalyView = new FrameLayout()
{
@@ -113,7 +113,7 @@
- foreach (var home in UserInfo.Current.regionList)
+ foreach (var home in UserInfo.Current.regionList)
{
var btnHomeName = new Button()
{
@@ -130,7 +130,7 @@
};
contentView.AddChidren(btnHomeName);
- if (UserInfo.Current.regionList.IndexOf(home) < UserInfo.Current.regionList.Count - 1)
+ if ( UserInfo.Current.regionList.IndexOf(home) < UserInfo.Current.regionList.Count - 1)
{
contentView.AddChidren(new Button()
{
@@ -145,7 +145,7 @@
var regionId = (string)btnHomeName.Tag;
dialog.Close();
//DB_ResidenceData.residenceData.CurReginID = regionId;
- LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+ LoadEvent_ChangeCurHome( UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
LoadContentView();
};
}
@@ -208,7 +208,7 @@
}
//鍊掑嚭鏂颁綇瀹呮暟鎹�
FileUtils.RestoreRegionFiles(newRegionRootPath);
- UserInfo.Current.SaveUserInfo();
+ UserInfo.Current.SaveUserInfo();
DB_ResidenceData.residenceData.EixtAccount();
DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
OnAppConfig.Instance.SaveUserConfig();
@@ -270,11 +270,11 @@
{
Action updataHeadImage = () =>
{
- userHeadImageView.ImagePath = UserInfo.Current.headImagePagePath;
+ userHeadImageView.ImagePath = UserInfo.Current.headImagePagePath;
};
Action updataUserName = () =>
{
- btnUserName.Text = UserInfo.Current.userName;
+ btnUserName.Text = UserInfo.Current.userName;
};
var personalDataView = new PersonalDataPage(updataHeadImage, updataUserName);
@@ -292,8 +292,7 @@
#region 鎴愬憳绠＄悊
void LoadEvent_GoMemberManagement()
{
- EventHandler<MouseEventArgs> eHandler = (sender, e) =>
- {
+ EventHandler<MouseEventArgs> eHandler = (sender, e) => {
var mmp = new MemberManagementPage();
MainPage.BasePageView.AddChidren(mmp);
mmp.LoadPage();
@@ -308,8 +307,7 @@
#region 娣诲姞璁惧
void LoadEvent_SkipbtnAddFunctionPage()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
var page = new SearchDevicePage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
@@ -341,13 +339,7 @@
{
btnSupportText.MouseUpEventHandler = (sender, e) =>
{
- //var getsupportPage = new GetSupportPage();
- //MainPage.BasePageView.AddChidren(getsupportPage);
- //getsupportPage.LoadPage();
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
-
- var getsupportPage = new FAQHelpPage();
+ var getsupportPage = new GetSupportPage();
MainPage.BasePageView.AddChidren(getsupportPage);
getsupportPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index ffb66f9..f915cbe 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -13,11 +13,6 @@
/// </summary>
FrameLayout bodyView;
/// <summary>
- /// 褰撳墠
- /// </summary>
- VerticalScrolViewLayout bodyScrolView;
-
- /// <summary>
/// 澶村儚鍖哄煙
/// </summary>
FrameLayout headPortraitView;
@@ -188,27 +183,13 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView();
- bodyScrolView = new VerticalScrolViewLayout()
- {
- Y = Application.GetRealHeight(64),
- VerticalScrollBarEnabled = false,
- Height = Application.GetRealHeight(551),
- };
- bodyView.AddChidren(bodyScrolView);
-
- if (MainPage.Increase)
- {
- bodyScrolView.Height = Application.GetRealHeight(541);
- }
-
headPortraitView = new FrameLayout()
{
- //Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64),
Height = Application.GetRealHeight(124),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
-
- bodyScrolView.AddChidren(headPortraitView);
+ bodyView.AddChidren(headPortraitView);
userHeadImageView = new ImageView()
{
@@ -216,28 +197,22 @@
Width = Application.GetMinRealAverage(84),
Height = Application.GetMinRealAverage(84),
Radius = (uint)Application.GetMinRealAverage(42),
- ImagePath = UserInfo.Current.headImagePagePath,
+ ImagePath = UserInfo.Current.headImagePagePath,
};
headPortraitView.AddChidren(userHeadImageView);
#region 涓汉淇℃伅閫夐」鍖哄煙
- var topPaddingView = new FrameLayout()
- {
- Height = Application.GetRealHeight(8)
- };
- bodyScrolView.AddChidren(topPaddingView);
-
/// <summary>
/// 涓汉淇℃伅閫夐」鍖哄煙
/// </summary>
optionListView = new VerticalScrolViewLayout()
{
- //Y = headPortraitView.Bottom + Application.GetRealHeight(8),
+ Y = headPortraitView.Bottom + Application.GetRealHeight(8),
Height = Application.GetRealHeight(51 * 6),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
};
- bodyScrolView.AddChidren(optionListView);
+ bodyView.AddChidren(optionListView);
#region 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// <summary>
/// 涓汉閫夐」-鍚嶅瓧鍖哄煙
@@ -270,7 +245,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
+ Text = string.IsNullOrEmpty( UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
};
userNameView.AddChidren(btnUserName);
/// <summary>
@@ -367,7 +342,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = GetBindAccountText(UserInfo.Current.userEmailInfo)
+ Text = GetBindAccountText( UserInfo.Current.userEmailInfo)
};
userEmailInfoView.AddChidren(btnUserEmailInfo);
/// <summary>
@@ -416,7 +391,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = GetBindAccountText(UserInfo.Current.userMobileInfo)
+ Text = GetBindAccountText( UserInfo.Current.userMobileInfo)
};
userPhoneInfoView.AddChidren(btnUserPhoneInfo);
/// <summary>
@@ -502,21 +477,16 @@
#endregion
#region 瑙ｉ攣璁剧疆鍖哄煙
- var topPaddingView2 = new FrameLayout()
- {
- Height = Application.GetRealHeight(8)
- };
- bodyScrolView.AddChidren(topPaddingView2);
/// <summary>
/// 瑙ｉ攣璁剧疆鍖哄煙
/// </summary>
interpretationSettingsView = new FrameLayout()
{
- //Y = optionListView.Bottom + Application.GetRealHeight(8),
+ Y = optionListView.Bottom + Application.GetRealHeight(8),
BackgroundColor = CSS_Color.MainBackgroundColor,
- Height = Application.GetRealHeight(66),
+ Height = Application.GetRealHeight(65),
};
- bodyScrolView.AddChidren(interpretationSettingsView);
+ bodyView.AddChidren(interpretationSettingsView);
btnInterpretationSettingsTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -527,7 +497,6 @@
TextID = StringId.InterpretationSettings,
};
interpretationSettingsView.AddChidren(btnInterpretationSettingsTitle);
-
btnInterpretationSettingsTip = new Button()
{
X = Application.GetRealWidth(16),
@@ -549,26 +518,6 @@
UnSelectedImagePath = "Public/Right.png",
};
interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
- interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
- #endregion
-
- #region 鏈嶅姟鍣ㄤ俊鎭�
- ListCellView myServerInfoCellView = new ListCellView()
- {
- };
- bodyScrolView.AddChidren(myServerInfoCellView);
- //璺宠浆鏈嶅姟鍣ㄤ俊鎭�
- Action selectAction = () =>
- {
- var myServerInfoPage = new MyServerInfoPage();
- MainPage.BasePageView.AddChidren(myServerInfoPage);
- myServerInfoPage.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- myServerInfoCellView.GoAction = selectAction;
- myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
- myServerInfoCellView.LineView.RemoveFromParent();
-
#endregion
btnLogout = new Button()
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
index 09934a6..ee4a9d6 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs
@@ -19,7 +19,6 @@
LoadEvent_ChangeBindEmail();
LoadEvent_ChangeBindPhone();
LoadEvent_SkipModifyPassword();
- LoadEvent_MyQRcode();
GetUserInfo();
}
@@ -230,26 +229,6 @@
};
btnUserName.MouseUpEventHandler = eventHandler;
btnEditUserNameIcon.MouseUpEventHandler = eventHandler;
- }
-
- /// <summary>
- /// 鍔犺浇鎴戠殑浜岀淮鐮佷簨浠�
- /// </summary>
- void LoadEvent_MyQRcode()
- {
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
- {
- //鎴戠殑浜岀淮鐮�
- var aep = new MyQRCodePage();
- MainPage.BasePageView.AddChidren(aep);
- aep.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
- };
- _QRcodeView.MouseUpEventHandler = eventHandler;
- btnQRcode.MouseUpEventHandler = eventHandler;
- btnQRcodeIcon.MouseUpEventHandler = eventHandler;
- btnQRcodeRight.MouseUpEventHandler = eventHandler;
}
#region 淇敼缁戝畾閭
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
index a28f956..ff630c4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs
@@ -83,8 +83,9 @@
Foucs = true
};
rowView.AddChidren(etPassword);
- var lineView = new LineView(rowView.Height);
+ var lineView = new LineView();
rowView.AddChidren(lineView);
+ lineView.Y = rowView.Height - lineView.Height;
#endregion
#region 鍐嶆杈撳叆鏂板瘑鐮�
@@ -125,8 +126,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(224),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextID = StringId.Confirm,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs
index 01d6efe..4f3ed20 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordVerificationCodePage.cs
@@ -253,7 +253,7 @@
Y = Application.GetRealHeight(276),
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
+ Height = Application.GetRealHeight(44),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.Center,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
index a3ffcd4..4dff35c 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/FloorsManagementPage.cs
@@ -254,8 +254,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(582),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
BackgroundColor = CSS_Color .MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index 35d4bff..aea4a6b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -57,25 +57,6 @@
/// </summary>
Button btnCommissioningAuthoritySwitchIcon;
- #region 杩囨埛
- /// <summary>
- ///
- /// </summary>
- FrameLayout transferRow;
- /// <summary>
- ///
- /// </summary>
- Button btnTransferTitle;
- /// <summary>
- ///
- /// </summary>
- Button btnTrasferExplan;
- /// <summary>
- ///
- /// </summary>
- Button btnTrasferSkinIcon;
- #endregion
-
#endregion
/// <summary>
/// 鏇存柊浣忓畢鍚嶇О鐨勫洖璋冨嚱鏁�
@@ -320,7 +301,7 @@
#endregion
#region 杩囨埛
-
+ FrameLayout transferRow;
transferRow = new FrameLayout()
{
Y = administratorPermissionMigrationRow.Bottom,
@@ -329,7 +310,7 @@
};
bodyView.AddChidren(transferRow);
- btnTransferTitle = new Button()
+ var btnTransferTitle = new Button()
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(10),
@@ -342,7 +323,7 @@
};
transferRow.AddChidren(btnTransferTitle);
- btnTrasferExplan = new Button()
+ var btnTrasferExplan = new Button()
{
X = Application.GetRealWidth(16),
Y = btnTransferTitle.Bottom,
@@ -355,6 +336,7 @@
};
transferRow.AddChidren(btnTrasferExplan);
+ Button btnTrasferSkinIcon;
btnTrasferSkinIcon = new Button()
{
X = Application.GetRealWidth(343),
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
index 2d20372..c741f27 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
@@ -14,7 +14,6 @@
LoadEvent_SkipRoomsPage();
LoadEvent_EditResidencName();
LoadEvent_EditResidencAddress();
- //LoadEvent_SkipTransferConfirmPage();
}
/// <summary>
@@ -46,7 +45,7 @@
{
var responsePack = new HttpServerRequest().EditResidenceInfo(0, str);
- if (responsePack.Code == StateCode.SUCCESS)
+ if (responsePack.Code.ToUpper() == StateCode.SUCCESS)
{
Application.RunOnMainThread(() =>
{
@@ -82,7 +81,6 @@
btnResidenceName.MouseUpEventHandler = eventHandler;
btnEditResidenceNameIcon.MouseUpEventHandler = eventHandler;
}
-
/// <summary>
/// 鍔犺浇淇敼浣忓畢鍦板潃浜嬩欢
/// </summary>
@@ -208,24 +206,6 @@
//})
//{ IsBackground = true }.Start();
};
- }
-
- /// <summary>
- /// 璺宠浆杩囨埛椤甸潰
- /// </summary>
- void LoadEvent_SkipTransferConfirmPage()
- {
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
- var skipPage = new TransferConfirmPage();
- MainPage.BasePageView.AddChidren(skipPage);
- skipPage.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
-
- transferRow.MouseUpEventHandler = eventHandler;
- btnTrasferExplan.MouseUpEventHandler = eventHandler;
- btnTrasferSkinIcon.MouseUpEventHandler = eventHandler;
- btnTransferTitle.MouseUpEventHandler = eventHandler;
}
}
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
index 943470e..db68f7b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/RoomEditFunctionPage.cs
@@ -165,8 +165,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(582),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
BackgroundColor = CSS_Color.MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferConfirmPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferConfirmPage.cs
deleted file mode 100644
index 5f8b0e6..0000000
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/Transfer/TransferConfirmPage.cs
+++ /dev/null
@@ -1,101 +0,0 @@
-锘縰sing System;
-using Shared;
-using HDL_ON.UI.CSS;
-
-namespace HDL_ON.UI
-{
- /// <summary>
- /// 杩囨埛纭鎻愰啋鐣岄潰
- /// </summary>
- public class TransferConfirmPage : FrameLayout
- {
- /// <summary>
- ///
- /// </summary>
- FrameLayout bodyView;
-
- public TransferConfirmPage()
- {
- bodyView = this;
- }
-
- /// <summary>
- ///
- /// </summary>
- public void LoadPage()
- {
- BackgroundColor = CSS_Color.MainBackgroundColor;
-
- new TopViewDiv(bodyView, Language.StringByID(StringId.Transfer)).LoadTopView();
-
- #region 澶村儚
- FrameLayout headView = new FrameLayout()
- {
- Y = Application.GetRealHeight(72),
- Height = Application.GetRealHeight(132),
- };
- bodyView.AddChidren(headView);
-
-
- ImageView myHeadImage = new ImageView()
- {
- X = Application.GetRealWidth(48),
- Y = Application.GetRealHeight(96),
- Width = Application.GetRealWidth(84),
- Height = Application.GetRealWidth(84),
- Radius = (uint)Application.GetRealWidth(42),
- ImagePath = UserInfo.Current.headImagePagePath,
- Gravity = Gravity.CenterVertical,
- };
- headView.AddChidren(myHeadImage);
-
- ImageView transferImage = new ImageView()
- {
- X = Application.GetRealWidth(144),
- Y = Application.GetRealHeight(96),
- Width = Application.GetRealWidth(84),
- Height = Application.GetRealWidth(32),
- ImagePath = "PersonalCenter/Transfer.png",
- Gravity = Gravity.Center,
- };
- headView.AddChidren(transferImage);
-
- ImageView otherHeadImage = new ImageView()
- {
- X = Application.GetRealWidth(231),
- Y = Application.GetRealHeight(96),
- Width = Application.GetRealWidth(101),
- Height = Application.GetRealWidth(101),
- ImagePath = "PersonalCenter/Head.png",
- Gravity = Gravity.CenterVertical,
- };
- headView.AddChidren(otherHeadImage);
-
- #endregion
-
- var btnTip = new Button()
- {
- Y = headView.Bottom,
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(22),
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- Text = "鎮ㄧ殑浣忓畢灏嗚繃鎴风粰鍏朵粬HDL璐﹀彿",
- };
- bodyView.AddChidren(btnTip);
-
- //
- var btnConfirm = new ConfirmButton()
- {
- Y = Application.GetRealHeight(456),
- Text = "纭杩囨埛",
- };
- bodyView.AddChidren(btnConfirm);
-
- }
-
- }
-
-}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs
index 24ad65d..159a8a9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelSceneListPage.cs
@@ -84,8 +84,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(582),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
BackgroundColor = CSS_Color.MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs
index a10824a..2ecfb81 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/VoicePanelScenePage.cs
@@ -174,8 +174,8 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(582),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealWidth(44),
- Radius = (uint)Application.GetRealWidth(22),
+ Height = Application.GetRealHeight(44),
+ Radius = (uint)Application.GetRealHeight(22),
BackgroundColor = CSS_Color.MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
--
Gitblit v1.8.0