From f58a0928df594adb6c9bff6dbc4cb3c37babd104 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 12 四月 2023 10:01:27 +0800
Subject: [PATCH] Merge branch 'Dev-Wxr' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage.cs | 3
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 9
HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs | 4
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 17
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs | 44
HDL-ON_Android/Assets/Language.ini | 75 ++
HDL_ON/UI/UI2/UserPage.cs | 6
HDL-ON_iOS/LaunchScreen.storyboard | 12
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 44
HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json | 770 ++++++++++++----------
HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs | 6
HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs | 11
HDL-ON_Android/HDL-ON_Android.csproj | 3
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs | 28
HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs | 8
HDL-ON_Android/SplashActivity.cs | 3
HDL-ON_iOS/Info.plist | 12
HDL-ON_iOS/Resources/Language.ini | 81 ++
HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json | 350 +++++----
HDL_ON/Common/HDLCommon.cs | 31
HDL_ON/DAL/DriverLayer/Control.cs | 60 +
HDL_ON/UI/MainPage.cs | 18
HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs | 6
HDL-ON_iOS/Resources/LaunchScreen.xib | 65 +
SiriIntents/Server/HttpUtil.cs | 4
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_AuthorizedPage.cs | 6
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 13
HDL_ON/Entity/DB_ResidenceData.cs | 5
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs | 6
HDL_ON/UI/UI2/2-Classification/FunctionPage.cs | 6
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL-ON_Android/Scan.cs | 9
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs | 40 -
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs | 2
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs | 22
HDL_ON/Common/R.cs | 56 +
HDL_ON/DAL/Server/HttpServerRequest.cs | 3
HDL_ON/DAL/DriverLayer/Control_TcpClient.cs | 85 +-
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs | 20
40 files changed, 1,155 insertions(+), 794 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index d5ce5d0..8293603 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -586,6 +586,20 @@
599=Please input name
600=Add combined dimming
601=Please select two or more devices
+602=My Home
+603= In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604= 'On Pro Face Information Collection Protocol'
+605= If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
@@ -1841,6 +1855,21 @@
599=璇疯緭鍏ョ粍鍚嶇О
600=娣诲姞缁勫悎璋冨厜
601=璇烽�夋嫨涓や釜浠ヤ笂鐨勮澶�
+602=鎴戠殑瀹跺涵
+603= 涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�
+604= 銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�
+605= 鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙ｅ苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�
+606=璐︽埛缁戝畾鎴愬姛锛屾偍鍙互缁х画瀹屾垚璁惧鍏宠仈鎿嶄綔
+607=涓婁竴椤�
+608=涓嬩竴椤�
+609=*鍙瀵硅鍙互鑷姩璇嗗埆闂ㄥ彛鍙枒浜哄憳锛屽苟鍙戣捣寰樺緤鎶ヨ璁板綍
+610=鏃犳硶缁戝畾璇ヨ澶囷紝璇蜂粠娌充笢娓犻亾璐拱璇ョ被鍨嬩骇鍝�
+611=鍔犺浇鏇村
+612=浜鸿劯淇℃伅閲囬泦鍗忚
+613=鎾ゅ洖鎺堟潈
+614=鍏充簬璐﹀彿缁戝畾鐨勫０鏄�
+615=鎾ら攢鎺堟潈鍚庯紝璇ュ搧鐗屽叧鑱斿湪On Pro涓殑璁惧灏嗗叏閮ㄨ瑙ｇ粦锛岀浉鍏充娇鐢ㄤ俊鎭悎璁惧鍊间篃灏嗗け鏁�
+
@@ -3095,7 +3124,20 @@
599=Please input name
600=Add combined dimming
601=Please select two or more devices
-
+602=My Home
+603= In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604= 'On Pro Face Information Collection Protocol'
+605= If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
2532=Visitor Invitation Record
@@ -4344,6 +4386,22 @@
599=Please input name
600=Add combined dimming
601=Please select two or more devices
+602=My Home
+603= In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604= 'On Pro Face Information Collection Protocol'
+605= If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+
+
2532=Visitor Invitation Record
@@ -5580,6 +5638,21 @@
599=Please input name
600=Add combined dimming
601=Please select two or more devices
+602=My Home
+603= In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604= 'On Pro Face Information Collection Protocol'
+605= If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+
2532=Visitor Invitation Record
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 18901d3..9ef0e2b 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -782,6 +782,9 @@
<PackageReference Include="Square.OkHttp3">
<Version>3.14.4</Version>
</PackageReference>
+ <PackageReference Include="Bugly">
+ <Version>4.3.1</Version>
+ </PackageReference>
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Language.ini" />
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index f451081..77c6da9 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202304111">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202304071">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_Android/Scan.cs b/HDL-ON_Android/Scan.cs
index 5748cf2..ea1bf16 100644
--- a/HDL-ON_Android/Scan.cs
+++ b/HDL-ON_Android/Scan.cs
@@ -36,15 +36,6 @@
public void OpenScan(Action<string> action)
{
resultAction = action;
- //string cancel = "鍙栨秷";
- //string flashText = "";
- //string titleText = "浜岀淮鐮佹壂鎻�";
- //if (Language.CurrentLanguage != "Chinese")
- //{
- // cancel = "Cancel";
- // flashText = "";
- // titleText = "Scan";
- //}
((BaseActivity)Shared.Application.Activity).SetCamera(async (obj) =>
{
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index c6ae1b6..7b9abca 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -109,6 +109,9 @@
//#endif
JPushInterface.Init(this);
+ Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
+
+
BaseActivity.OnCreateActoin += (activity, application) =>
{
diff --git a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
index 1502cbc..7a43594 100644
--- a/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,246 +1,274 @@
{
- "images": [
+ "images" : [
{
- "filename": "40x40.png",
- "size": "20x20",
- "scale": "2x",
- "idiom": "iphone"
+ "filename" : "40x40.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "20x20"
},
{
- "filename": "60x60.png",
- "size": "20x20",
- "scale": "3x",
- "idiom": "iphone"
+ "filename" : "60x60.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "20x20"
},
{
- "filename": "58x58.png",
- "size": "29x29",
- "scale": "2x",
- "idiom": "iphone"
+ "filename" : "58x58.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "29x29"
},
{
- "filename": "87x87.png",
- "size": "29x29",
- "scale": "3x",
- "idiom": "iphone"
+ "filename" : "87x87.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "29x29"
},
{
- "filename": "80x80.png",
- "size": "40x40",
- "scale": "2x",
- "idiom": "iphone"
+ "filename" : "80x80.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "40x40"
},
{
- "filename": "120x120.png",
- "size": "40x40",
- "scale": "3x",
- "idiom": "iphone"
+ "filename" : "120x120.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "40x40"
},
{
- "filename": "120x120-1.png",
- "size": "60x60",
- "scale": "2x",
- "idiom": "iphone"
+ "filename" : "120x120-1.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "60x60"
},
{
- "filename": "180.png",
- "size": "60x60",
- "scale": "3x",
- "idiom": "iphone"
+ "filename" : "180.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "60x60"
},
{
- "filename": "20x20.png",
- "size": "20x20",
- "scale": "1x",
- "idiom": "ipad"
+ "filename" : "20x20.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "20x20"
},
{
- "filename": "40x40-1.png",
- "size": "20x20",
- "scale": "2x",
- "idiom": "ipad"
+ "filename" : "40x40-1.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "20x20"
},
{
- "filename": "29x29.png",
- "size": "29x29",
- "scale": "1x",
- "idiom": "ipad"
+ "filename" : "29x29.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "29x29"
},
{
- "filename": "58x58-1.png",
- "size": "29x29",
- "scale": "2x",
- "idiom": "ipad"
+ "filename" : "58x58-1.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "29x29"
},
{
- "filename": "40x40-2.png",
- "size": "40x40",
- "scale": "1x",
- "idiom": "ipad"
+ "filename" : "40x40-2.png",
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "40x40"
},
{
- "filename": "80x80-1.png",
- "size": "40x40",
- "scale": "2x",
- "idiom": "ipad"
+ "filename" : "80x80-1.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "40x40"
},
{
- "size": "83.5x83.5",
- "scale": "2x",
- "idiom": "ipad"
+ "idiom" : "ipad",
+ "scale" : "1x",
+ "size" : "76x76"
},
{
- "size": "76x76",
- "scale": "1x",
- "idiom": "ipad"
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "76x76"
},
{
- "size": "76x76",
- "scale": "2x",
- "idiom": "ipad"
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "83.5x83.5"
},
{
- "filename": "1024.png",
- "size": "1024x1024",
- "scale": "1x",
- "idiom": "ios-marketing"
+ "filename" : "1024.png",
+ "idiom" : "ios-marketing",
+ "scale" : "1x",
+ "size" : "1024x1024"
},
{
- "size": "60x60",
- "scale": "2x",
- "idiom": "car"
+ "idiom" : "car",
+ "scale" : "2x",
+ "size" : "60x60"
},
{
- "size": "60x60",
- "scale": "3x",
- "idiom": "car"
+ "idiom" : "car",
+ "scale" : "3x",
+ "size" : "60x60"
},
{
- "role": "notificationCenter",
- "size": "24x24",
- "subtype": "38mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "notificationCenter",
+ "scale" : "2x",
+ "size" : "24x24",
+ "subtype" : "38mm"
},
{
- "role": "notificationCenter",
- "size": "27.5x27.5",
- "subtype": "42mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "notificationCenter",
+ "scale" : "2x",
+ "size" : "27.5x27.5",
+ "subtype" : "42mm"
},
{
- "role": "companionSettings",
- "size": "29x29",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "companionSettings",
+ "scale" : "2x",
+ "size" : "29x29"
},
{
- "role": "companionSettings",
- "size": "29x29",
- "scale": "3x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "companionSettings",
+ "scale" : "3x",
+ "size" : "29x29"
},
{
- "role": "appLauncher",
- "size": "40x40",
- "subtype": "38mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "notificationCenter",
+ "scale" : "2x",
+ "size" : "33x33",
+ "subtype" : "45mm"
},
{
- "role": "appLauncher",
- "size": "44x44",
- "subtype": "40mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "40x40",
+ "subtype" : "38mm"
},
{
- "role": "appLauncher",
- "size": "50x50",
- "subtype": "44mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "44x44",
+ "subtype" : "40mm"
},
{
- "role": "quickLook",
- "size": "86x86",
- "subtype": "38mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "46x46",
+ "subtype" : "41mm"
},
{
- "role": "quickLook",
- "size": "98x98",
- "subtype": "42mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "50x50",
+ "subtype" : "44mm"
},
{
- "role": "quickLook",
- "size": "108x108",
- "subtype": "44mm",
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "51x51",
+ "subtype" : "45mm"
},
{
- "size": "1024x1024",
- "scale": "1x",
- "idiom": "watch-marketing"
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "86x86",
+ "subtype" : "38mm"
},
{
- "size": "16x16",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "98x98",
+ "subtype" : "42mm"
},
{
- "size": "16x16",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "108x108",
+ "subtype" : "44mm"
},
{
- "size": "32x32",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "117x117",
+ "subtype" : "45mm"
},
{
- "size": "32x32",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "watch-marketing",
+ "scale" : "1x",
+ "size" : "1024x1024"
},
{
- "size": "128x128",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "16x16"
},
{
- "size": "128x128",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "16x16"
},
{
- "size": "256x256",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "32x32"
},
{
- "size": "256x256",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "32x32"
},
{
- "size": "512x512",
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "128x128"
},
{
- "size": "512x512",
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "128x128"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "256x256"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "256x256"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "1x",
+ "size" : "512x512"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "2x",
+ "size" : "512x512"
}
],
- "info": {
- "version": 1,
- "author": "xcode"
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
}
-}
\ No newline at end of file
+}
diff --git a/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json b/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json
index 8254cff..15497d0 100644
--- a/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json
+++ b/HDL-ON_iOS/Assets.xcassets/device_bg.imageset/Contents.json
@@ -1,528 +1,608 @@
{
- "images": [
+ "images" : [
{
- "idiom": "universal"
+ "idiom" : "universal"
},
{
- "scale": "1x",
- "idiom": "universal"
- },
- {
- "filename": "device_bg.png",
- "scale": "2x",
- "idiom": "universal"
- },
- {
- "scale": "3x",
- "idiom": "universal"
- },
- {
- "idiom": "iphone"
- },
- {
- "scale": "1x",
- "idiom": "iphone"
- },
- {
- "scale": "2x",
- "idiom": "iphone"
- },
- {
- "subtype": "retina4",
- "scale": "2x",
- "idiom": "iphone"
- },
- {
- "scale": "3x",
- "idiom": "iphone"
- },
- {
- "idiom": "ipad"
- },
- {
- "scale": "1x",
- "idiom": "ipad"
- },
- {
- "scale": "2x",
- "idiom": "ipad"
- },
- {
- "idiom": "watch"
- },
- {
- "scale": "2x",
- "idiom": "watch"
- },
- {
- "screenWidth": "{130,145}",
- "scale": "2x",
- "idiom": "watch"
- },
- {
- "screenWidth": "{146,165}",
- "scale": "2x",
- "idiom": "watch"
- },
- {
- "idiom": "mac"
- },
- {
- "scale": "1x",
- "idiom": "mac"
- },
- {
- "scale": "2x",
- "idiom": "mac"
- },
- {
- "idiom": "car"
- },
- {
- "scale": "2x",
- "idiom": "car"
- },
- {
- "scale": "3x",
- "idiom": "car"
- },
- {
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "idiom": "universal"
+ "idiom" : "universal"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "1x",
- "idiom": "universal"
+ "idiom" : "universal"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "2x",
- "idiom": "universal"
+ "idiom" : "universal",
+ "scale" : "1x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "3x",
- "idiom": "universal"
+ "idiom" : "universal",
+ "scale" : "1x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "iphone"
+ "idiom" : "universal",
+ "scale" : "1x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "1x",
- "idiom": "iphone"
+ "filename" : "device_bg.png",
+ "idiom" : "universal",
+ "scale" : "2x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "iphone"
+ "idiom" : "universal",
+ "scale" : "2x"
},
{
- "subtype": "retina4",
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "2x",
- "idiom": "iphone"
+ "idiom" : "universal",
+ "scale" : "2x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "3x",
- "idiom": "iphone"
+ "idiom" : "universal",
+ "scale" : "3x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "idiom": "ipad"
+ "idiom" : "universal",
+ "scale" : "3x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "1x",
- "idiom": "ipad"
+ "idiom" : "universal",
+ "scale" : "3x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "2x",
- "idiom": "ipad"
+ "idiom" : "iphone"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "idiom": "watch"
+ "idiom" : "iphone"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "iphone"
},
{
- "screenWidth": "{130,145}",
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "iphone",
+ "scale" : "1x"
},
{
- "screenWidth": "{146,165}",
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "iphone",
+ "scale" : "1x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "mac"
+ "idiom" : "iphone",
+ "scale" : "1x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "iphone",
+ "scale" : "2x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "iphone",
+ "scale" : "2x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "car"
+ "idiom" : "iphone",
+ "scale" : "2x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "dark"
- }
- ],
- "scale": "2x",
- "idiom": "car"
+ "idiom" : "iphone",
+ "scale" : "3x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "dark"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "3x",
- "idiom": "car"
+ "idiom" : "iphone",
+ "scale" : "3x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "universal"
+ "idiom" : "iphone",
+ "scale" : "3x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "scale": "1x",
- "idiom": "universal"
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "universal"
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "3x",
- "idiom": "universal"
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "subtype" : "retina4"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "idiom": "iphone"
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "1x",
- "idiom": "iphone"
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "2x",
- "idiom": "iphone"
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "subtype" : "retina4"
},
{
- "subtype": "retina4",
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "scale": "2x",
- "idiom": "iphone"
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "3x",
- "idiom": "iphone"
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "subtype" : "retina4"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "ipad"
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "subtype" : "retina4"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "scale": "1x",
- "idiom": "ipad"
+ "idiom" : "ipad"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "ipad"
+ "idiom" : "ipad"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "idiom": "watch"
+ "idiom" : "ipad"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "ipad",
+ "scale" : "1x"
},
{
- "screenWidth": "{130,145}",
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "ipad",
+ "scale" : "1x"
},
{
- "screenWidth": "{146,165}",
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "2x",
- "idiom": "watch"
+ "idiom" : "ipad",
+ "scale" : "1x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "idiom": "mac"
+ "idiom" : "ipad",
+ "scale" : "2x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "1x",
- "idiom": "mac"
+ "idiom" : "ipad",
+ "scale" : "2x"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "2x",
- "idiom": "mac"
+ "idiom" : "ipad",
+ "scale" : "2x"
},
{
- "appearances": [
- {
- "appearance": "luminosity",
- "value": "light"
- }
- ],
- "idiom": "car"
+ "idiom" : "car"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "light"
}
],
- "scale": "2x",
- "idiom": "car"
+ "idiom" : "car"
},
{
- "appearances": [
+ "appearances" : [
{
- "appearance": "luminosity",
- "value": "light"
+ "appearance" : "luminosity",
+ "value" : "dark"
}
],
- "scale": "3x",
- "idiom": "car"
+ "idiom" : "car"
+ },
+ {
+ "idiom" : "car",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "car",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "watch"
+ },
+ {
+ "idiom" : "watch",
+ "screen-width" : "<=145"
+ },
+ {
+ "idiom" : "watch",
+ "screen-width" : ">161"
+ },
+ {
+ "idiom" : "watch",
+ "screen-width" : ">145"
+ },
+ {
+ "idiom" : "watch",
+ "screen-width" : ">183"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : "<=145"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">161"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">145"
+ },
+ {
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">183"
+ },
+ {
+ "idiom" : "mac"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "mac"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "mac"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "mac",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "mac",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "mac",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "mac",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "mac",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "watch"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "watch"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : "<=145"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : "<=145"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">145"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "watch",
+ "scale" : "2x",
+ "screen-width" : ">145"
}
],
- "info": {
- "version": 1,
- "author": "xcode"
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
}
-}
\ No newline at end of file
+}
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 511589d..cae58df 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -42,7 +42,7 @@
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
- <string>12.2</string>
+ <string>12.0</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
@@ -89,8 +89,6 @@
</dict>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
- <key>XSLaunchImageAssets</key>
- <string>Assets.xcassets/LaunchImage.launchimage</string>
<key>CFBundleName</key>
<string>On Pro</string>
<key>XSAppIconAssets</key>
@@ -100,9 +98,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.6.602303301</string>
+ <string>1.7</string>
<key>CFBundleVersion</key>
- <string>1.6.603301</string>
+ <string>1.7</string>
<key>NSAppleMusicUsageDescription</key>
<string>App needs to access your music library to connect to an external player to play music.</string>
<key>NSLocationAlwaysUsageDescription</key>
@@ -145,6 +143,8 @@
<key>NSLocationWhenInUseUsageDescription</key>
<string>EZ video will be use</string>
<key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
+ <string>Main</string>
+ <key>XSLaunchImageAssets</key>
+ <string>Assets.xcassets/LaunchImage.launchimage</string>
</dict>
</plist>
diff --git a/HDL-ON_iOS/LaunchScreen.storyboard b/HDL-ON_iOS/LaunchScreen.storyboard
index c0e5c52..888a9ea 100644
--- a/HDL-ON_iOS/LaunchScreen.storyboard
+++ b/HDL-ON_iOS/LaunchScreen.storyboard
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@@ -18,12 +18,18 @@
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gAz-Vf-lRO">
+ <rect key="frame" x="111" y="366" width="176" height="139"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+ </imageView>
+ </subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
- <point key="canvasLocation" x="53" y="375"/>
+ <point key="canvasLocation" x="52.173913043478265" y="375"/>
</scene>
</scenes>
</document>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index d5ce5d0..d071d03 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -586,6 +586,20 @@
599=Please input name
600=Add combined dimming
601=Please select two or more devices
+602=My Home
+603= In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604= 'On Pro Face Information Collection Protocol'
+605= If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
@@ -1135,6 +1149,9 @@
8511=User Education
8512=Serial number
8513=Model
+
+
+
@@ -1841,6 +1858,21 @@
599=璇疯緭鍏ョ粍鍚嶇О
600=娣诲姞缁勫悎璋冨厜
601=璇烽�夋嫨涓や釜浠ヤ笂鐨勮澶�
+602=鎴戠殑瀹跺涵
+603= 涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�
+604= 銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�
+605= 鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙ｅ苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�
+606=璐︽埛缁戝畾鎴愬姛锛屾偍鍙互缁х画瀹屾垚璁惧鍏宠仈鎿嶄綔
+607=涓婁竴椤�
+608=涓嬩竴椤�
+609=*鍙瀵硅鍙互鑷姩璇嗗埆闂ㄥ彛鍙枒浜哄憳锛屽苟鍙戣捣寰樺緤鎶ヨ璁板綍
+610=鏃犳硶缁戝畾璇ヨ澶囷紝璇蜂粠娌充笢娓犻亾璐拱璇ョ被鍨嬩骇鍝�
+611=鍔犺浇鏇村
+612=浜鸿劯淇℃伅閲囬泦鍗忚
+613=鎾ゅ洖鎺堟潈
+614=鍏充簬璐﹀彿缁戝畾鐨勫０鏄�
+615=鎾ら攢鎺堟潈鍚庯紝璇ュ搧鐗屽叧鑱斿湪On Pro涓殑璁惧灏嗗叏閮ㄨ瑙ｇ粦锛岀浉鍏充娇鐢ㄤ俊鎭悎璁惧鍊间篃灏嗗け鏁�
+
@@ -2393,6 +2425,9 @@
8511=鐢ㄦ埛浜哄憳
8512=搴忓垪鍙�
8513=鍨嬪彿
+
+
+
@@ -3095,7 +3130,20 @@
599=Please input name
600=Add combined dimming
601=Please select two or more devices
-
+602=My Home
+603= In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604= 'On Pro Face Information Collection Protocol'
+605= If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
2532=Visitor Invitation Record
@@ -4344,6 +4392,22 @@
599=Please input name
600=Add combined dimming
601=Please select two or more devices
+602=My Home
+603= In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604= 'On Pro Face Information Collection Protocol'
+605= If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+
+
2532=Visitor Invitation Record
@@ -5580,6 +5644,21 @@
599=Please input name
600=Add combined dimming
601=Please select two or more devices
+602=My Home
+603= In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully
+604= 'On Pro Face Information Collection Protocol'
+605= If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.
+606=Account binding is successful.You can continue to complete the device association operation
+607=Previous page
+608=Next page
+609=*The smart entrance machine can automatically identify suspicious personnel at the entrance and initiate a wandering alarm record
+610=Unable to bind this device. Please purchase this type of product from HDL
+611=Load more
+612=Facial Information Collection Protocol
+613=Revoke Authorization
+614=Statement on account binding
+615=After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid
+
2532=Visitor Invitation Record
diff --git a/HDL-ON_iOS/Resources/LaunchScreen.xib b/HDL-ON_iOS/Resources/LaunchScreen.xib
index 9131928..c3ef5db 100644
--- a/HDL-ON_iOS/Resources/LaunchScreen.xib
+++ b/HDL-ON_iOS/Resources/LaunchScreen.xib
@@ -1,43 +1,48 @@
-锘�<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
+ <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207" />
- <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1" />
+ <deployment identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
- <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" />
- <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder" />
+ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
- <rect key="frame" x="0.0" y="0.0" width="480" height="480" />
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
+ <rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright (c) 2017 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
- minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
- <rect key="frame" x="20" y="439" width="441" height="21" />
- <fontDescription key="fontDescription" type="system" pointSize="17" />
- <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
- <nil key="highlightedColor" />
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text=" Copyright (c) 2017 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+ <rect key="frame" x="20" y="439" width="441" height="21"/>
+ <fontDescription key="fontDescription" type="system" pointSize="17"/>
+ <color key="textColor" systemColor="darkTextColor"/>
+ <nil key="highlightedColor"/>
</label>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="HDL_ON_iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
- minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
- <rect key="frame" x="20" y="140" width="441" height="43" />
- <fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
- <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
- <nil key="highlightedColor" />
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="HDL_ON_iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
+ <rect key="frame" x="20" y="140" width="441" height="43"/>
+ <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+ <color key="textColor" systemColor="darkTextColor"/>
+ <nil key="highlightedColor"/>
</label>
</subviews>
- <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
- <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC" />
- <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk" />
- <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l" />
- <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0" />
- <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9" />
- <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g" />
+ <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC"/>
+ <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk"/>
+ <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l"/>
+ <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0"/>
+ <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
+ <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g"/>
</constraints>
- <nil key="simulatedStatusBarMetrics" />
- <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics" />
- <point key="canvasLocation" x="548" y="455" />
+ <nil key="simulatedStatusBarMetrics"/>
+ <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+ <point key="canvasLocation" x="548" y="455"/>
</view>
</objects>
+ <resources>
+ <systemColor name="darkTextColor">
+ <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </systemColor>
+ </resources>
</document>
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 800c3d2..d81fca1 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -433,6 +433,16 @@
/// </summary>
public void CheckLogout()
{
+#if __IOS__
+ try{
+ HDL_ON_iOS.AppDelegate.rootViewController.PopToRootViewController(false);
+ }catch(Exception ex){
+ MainPage.Log($"鍥炲埌璺熺被澶辫触:{ex.Message}");
+ }
+#else
+ //Application.Activity.StartActivity()
+#endif
+
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
switch (UserInfo.Current.AccountString)
{
@@ -447,7 +457,13 @@
//璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
- Logout();
+ try
+ {
+ Logout();
+ }catch (Exception ex)
+ {
+ MainPage.Log($"鎸や笅绾垮紓甯�:{ex.Message}");
+ }
}
/// <summary>
@@ -470,8 +486,10 @@
UserInfo.Current.LastTime = DateTime.MinValue;
UserInfo.Current.SaveUserInfo();
DB_ResidenceData.Instance.EixtAccount();
+ MainPage.Log("閫�鍑鸿处鍙锋竻绌烘暟鎹�");
//4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
HDLLinphone.Current.LogoutAllAccount();
+ MainPage.Log("娉ㄩ攢HDLSIP璐﹀彿鐧诲綍");
#if __IOS__
//5.鍏ㄨ閫氱櫥鍑�
@@ -492,6 +510,7 @@
{
if (waitPage != null)
{
+ waitPage.Hide();
waitPage.RemoveFromParent();
waitPage = null;
}
@@ -582,9 +601,9 @@
}
- #endregion
+#endregion
- #region 鈻� 甯哥敤鏂规硶_______________________
+#region 鈻� 甯哥敤鏂规硶_______________________
/// <summary>
/// 璁剧疆涓嬪垝绾挎寜閽姸鎬�
/// 缁熶竴灏佽璁剧疆鏂规硶
@@ -659,9 +678,9 @@
Control.Ins.SearchLoaclGateway();
}
}
- #endregion
+#endregion
- #region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
+#region 璺宠浆鎵撳紑钀ょ煶浜戞柟娉�
/// <summary>
/// 鑾峰彇瀛愯处鍙穞oken骞惰烦杞澶囧垪琛ㄩ〉闈�
@@ -782,6 +801,6 @@
{ IsBackground = true }.Start();
}
- #endregion
+#endregion
}
}
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index beaacdf..f9c1c13 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,6 +5,62 @@
public static class StringId
{
/// <summary>
+ /// 鎾ら攢鎺堟潈鍚庯紝璇ュ搧鐗屽叧鑱斿湪On Pro涓殑璁惧灏嗗叏閮ㄨ瑙ｇ粦锛岀浉鍏充娇鐢ㄤ俊鎭悎璁惧鍊间篃灏嗗け鏁�
+ /// </summary>
+ public const int RevokeAuthorizationTip = 615;
+ /// <summary>
+ /// 鍏充簬璐﹀彿缁戝畾鐨勫０鏄�
+ /// </summary>
+ public const int AboutBindAcountTip = 614;
+ /// <summary>
+ /// 纭畾鎾ゅ洖鎺堟潈
+ /// </summary>
+ public const int ConfirmRevocationOfAuthorization = 613;
+ /// <summary>
+ /// 浜鸿劯閲囬泦鍗忚
+ /// </summary>
+ public const int GetFaceProtocol = 612;
+ /// <summary>
+ /// 鍔犺浇鏇村
+ /// </summary>
+ public const int LoadMore = 611;
+ /// <summary>
+ /// 鏃犳硶缁戝畾璇ヨ澶囷紝璇蜂粠娌充笢娓犻亾璐拱璇ョ被鍨嬩骇鍝�
+ /// </summary>
+ public const int UnableToBindThisDeviceTip = 610;
+ /// <summary>
+ /// "*鍙瀵硅鍙互鑷姩璇嗗埆闂ㄥ彛鍙枒浜哄憳锛屽苟鍙戣捣寰樺緤鎶ヨ璁板綍
+ /// </summary>
+ public const int SmartDoorstepMachineAlarmPrompt = 609;
+ /// <summary>
+ /// 涓婁竴椤�
+ /// </summary>
+ public const int NextPage = 608;
+ /// <summary>
+ /// 涓婁竴椤�
+ /// </summary>
+ public const int PreviousPage = 607;
+ /// <summary>
+ /// 璐︽埛缁戝畾鎴愬姛锛屾偍鍙互缁х画瀹屾垚璁惧鍏宠仈鎿嶄綔
+ /// </summary>
+ public const int BindIotAccountTip = 606;
+ /// <summary>
+ /// 鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙ｅ苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�
+ /// </summary>
+ public const int FaceProTipText3 = 605;
+ /// <summary>
+ /// 銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�
+ /// </summary>
+ public const int FaceProTipText2 = 604;
+ /// <summary>
+ /// 涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�
+ /// </summary>
+ public const int FaceProTipText1 = 603;
+ /// <summary>
+ /// 鎴戠殑瀹跺涵
+ /// </summary>
+ public const int MyHome = 602;
+ /// <summary>
/// 璇烽�夋嫨2涓互涓婄殑璁惧
/// </summary>
public const int PlsSelectMoreData = 601;
diff --git a/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs b/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs
index 98e640b..46b3fd4 100644
--- a/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs
+++ b/HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs
@@ -90,6 +90,17 @@
}
}
/// <summary>
+ /// 鏈湴鎺у埗缇ゆ帶涓婚
+ /// </summary>
+ public string ControlGroupControlTopic
+ {
+ get
+ {
+ return $"/user/{Control.Ins.GatewayId}/custom/device/group/control/down";
+ }
+ }
+
+ /// <summary>
/// 鏈湴鎺у埗绾㈠璁惧鍔熻兘涓婚
/// </summary>
public string ControlIrFunctionTopic
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index eeb2431..656dcca 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -138,45 +138,51 @@
}
set
{
- if (_GatewayOnline_Cloud != value)
+ try
{
- _GatewayOnline_Cloud = value;
- if (GatewayOnline_Local)
+ if (_GatewayOnline_Cloud != value)
{
- return;
- }
- if (value)
- {
- if (DB_ResidenceData.Instance.HomeGateway == null)
+ _GatewayOnline_Cloud = value;
+ if (GatewayOnline_Local)
{
return;
}
- if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//杩滅▼鎯呭喌涓嬶紝缃戝叧鏈摼鎺ユ湇鍔″櫒涓嶈兘淇敼涓婚〉缃戝叧鐘舵��
+ if (value)
{
+ if (DB_ResidenceData.Instance.HomeGateway == null)
+ {
+ return;
+ }
+ if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//杩滅▼鎯呭喌涓嬶紝缃戝叧鏈摼鎺ユ湇鍔″櫒涓嶈兘淇敼涓婚〉缃戝叧鐘舵��
+ {
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(3000);
+ var pm = new DAL.Server.HttpServerRequest();
+ pm.GetGatewayInfo();
+ })
+ { IsBackground = true }.Start();
+ return;
+ }
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
+ MainPage.Log($"缃戝叧浜戠鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
new System.Threading.Thread(() =>
{
- System.Threading.Thread.Sleep(3000);
- var pm = new DAL.Server.HttpServerRequest();
- pm.GetGatewayInfo();
+ System.Threading.Thread.Sleep(1000);
+ FunctionList.List.ReadAllFunctionStatus();
})
- { IsBackground = true }.Start();
- return;
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
}
- //淇敼涓婚〉杩炴帴鐘舵��
- HomePage.LoadEvent_CheckLinkStatus();
- MainPage.Log($"缃戝叧浜戠鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
- new System.Threading.Thread(() =>
+ else
{
- System.Threading.Thread.Sleep(1000);
- FunctionList.List.ReadAllFunctionStatus();
- })
- { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
+ }
}
- else
- {
- //淇敼涓婚〉杩炴帴鐘舵��
- HomePage.LoadEvent_CheckLinkStatus();
- }
+ }catch(Exception ex)
+ {
+ MainPage.Log($"Set GatewayCloudOnline Error:{ex.Message}");
}
}
}
diff --git a/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs b/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
index 251f039..2c53a79 100644
--- a/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
@@ -320,54 +320,59 @@
{
receiveThread = new Thread(() =>
{
- while (isConnected)
+ try
{
- if (_tcpClient == null)
+ while (isConnected)
{
- try
+ if (_tcpClient == null)
{
- receiveThread?.Abort();
- }
- catch { }
- finally
- {
- receiveThread = null;
- }
- return;
- }
- if (!_tcpClient.Connected)
- {
- MainPage.Log("tcp瀹㈡埛绔柇寮�浜嗚繛鎺�...");
- isConnected = false;
- return;
- }
- try
- {
- // 瀹氫箟涓�涓�2M鐨勭紦瀛樺尯锛�
- byte[] arrMsgRec = new byte[1024 * 1024 * 2];
- try
- {
- int size = _tcpClient.GetStream().Read(arrMsgRec, 0, arrMsgRec.Length);
- }
- catch (Exception ex)
- {
- isConnected = false;
- MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹寮傚父:{ex.Message}");
+ try
+ {
+ receiveThread?.Abort();
+ }
+ catch { }
+ finally
+ {
+ receiveThread = null;
+ }
return;
}
- var tcpDataString = System.Text.Encoding.UTF8.GetString(arrMsgRec, 0, arrMsgRec.Length);
-
-
- if (!string.IsNullOrEmpty(tcpDataString))
+ if (!_tcpClient.Connected)
{
- MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹");
- Control.Ins.ConvertReceiveData(arrMsgRec, null);
-
+ MainPage.Log("tcp瀹㈡埛绔柇寮�浜嗚繛鎺�...");
+ isConnected = false;
+ return;
}
- }
- catch (Exception) { }
- }
+ try
+ {
+ // 瀹氫箟涓�涓�2M鐨勭紦瀛樺尯锛�
+ byte[] arrMsgRec = new byte[1024 * 1024 * 2];
+ try
+ {
+ int size = _tcpClient.GetStream().Read(arrMsgRec, 0, arrMsgRec.Length);
+ }
+ catch (Exception ex)
+ {
+ isConnected = false;
+ MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹寮傚父:{ex.Message}");
+ return;
+ }
+ var tcpDataString = System.Text.Encoding.UTF8.GetString(arrMsgRec, 0, arrMsgRec.Length);
+
+ if (!string.IsNullOrEmpty(tcpDataString))
+ {
+ MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹");
+ Control.Ins.ConvertReceiveData(arrMsgRec, null);
+
+ }
+ }
+ catch (Exception) { }
+ }
+ }catch (Exception ex)
+ {
+ MainPage.Log($"tcp ReceiveMessage error :{ex.Message}");
+ }
});
//receiveThread.IsBackground = true;
receiveThread.Start();
diff --git a/HDL_ON/DAL/Server/HttpServerRequest.cs b/HDL_ON/DAL/Server/HttpServerRequest.cs
index e46d548..7c113da 100644
--- a/HDL_ON/DAL/Server/HttpServerRequest.cs
+++ b/HDL_ON/DAL/Server/HttpServerRequest.cs
@@ -3270,9 +3270,10 @@
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ //d.Add("gatewayId", DB_ResidenceData.Instance.HomeGateway.gatewayId);
d.Add("infos", groupControls);
var requestJson = HttpUtil.GetSignRequestJson(d);
- var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_AddGroupControl, requestJson);
+ var pack = HttpUtil.RequestHttpsPostFroHome(NewAPI.Api_Post_UpdateGroupControl, requestJson);
return pack;
}
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 211486b..62b4b3f 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -18,8 +18,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 52f4a76..13c9e3c 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -164,7 +164,14 @@
Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().LogoutAllLinphoneUser();
#else
- HDLLinphoneKit.Instance.Logout();
+ if (HDLLinphoneKit.Instance != null)
+ {
+ HDLLinphoneKit.Instance.Logout();
+ }
+ else
+ {
+
+ }
#endif
}
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 207a7dc..9c28a52 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -506,5 +506,10 @@
}
}
+ /// <summary>
+ /// 绗竴娆＄敵璇峰畾浣嶆潈闄愶紝鐢ㄦ埛鎷掔粷涔嬪悗锛屼笉鑳藉啀娆＄敵璇凤紙Android锛�
+ /// </summary>
+ public bool CheckGPS_IsFirst = true;
+
}
}
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index aaaf1c7..f7c57bd 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -211,7 +211,14 @@
/// </summary>
public static void GoLoginPage(UserInfo userInfo = null)
{
- BaseView.RemoveAll();
+ try
+ {
+ for (int i = 0; i < BaseView.ChildrenCount; i++)
+ {
+ BaseView.GetChildren(i).RemoveFromParent();
+ }
+ }
+ catch { }
BaseView.BackgroundColor = CSS_Color.BackgroundColor;
var fisrtView = new UI.UI1Login.LoginPage();
fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -226,7 +233,14 @@
/// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
public static void GoUserPage(bool downloadData, bool isFirstOpen = false, Action pageShowEvent = null)
{
- BaseView.RemoveAll();
+ try
+ {
+ for (int i = 0; i < BaseView.ChildrenCount; i++)
+ {
+ BaseView.GetChildren(i).RemoveFromParent();
+ }
+ }
+ catch { }
#region 鍚庨��浜嬩欢
BasePageView = new PageLayout();
BasePageView.ScrollEnabled = false;
diff --git a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
index 0fe6cc6..12a85bf 100644
--- a/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
+++ b/HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs
@@ -22,6 +22,10 @@
//璺宠浆鍒板姛鑳戒俊鎭缃〉闈�
switch (function.spk)
{
+ case SPK.GroupControl:
+ var dialog = new GroupControlPage(FunctionList.List.groupControls.Find((obj) => obj.sid == function.sid));
+ dialog.ShowDialog();
+ break;
case SPK.AirSwitch:
var airSwitchPage = new AirSwitchPage(function);
MainPage.BasePageView.AddChidren(airSwitchPage);
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 631866a..8835c07 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -724,7 +724,8 @@
try
{
int index = 0;
- var list = FunctionList.List.GetDeviceFunctionList();
+ var list = new List<Function>();
+ list.AddRange(FunctionList.List.GetDeviceFunctionList());
list.AddRange(FunctionList.List.groupControls);//鍔犲叆缇ゆ帶
foreach (var function in list)
{
@@ -1024,6 +1025,7 @@
btnState.Text = function.lastState;
}
}
+
else
{
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
@@ -1221,9 +1223,16 @@
SelectedImagePath = "Public/SwitchOn.png",
};
view.AddChidren(btnSwitch);
-
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
- btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ if (function.spk == SPK.GroupControl)
+ {
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/lightswitch_white.png";
+ }
+ else
+ {
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
+ btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
+ }
LoadEvent_SwitchFunction(function, btnSwitch);
}
//鍙栨秷鏀惰棌浜嬩欢
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
index dee3d46..d6bf43f 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionPage.cs
@@ -317,12 +317,8 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "鍔犺浇鏇村",
+ TextID = StringId.LoadMore,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnAppend.Text = "Load more";
- }
functionListView.AddChidren(btnAppend);
btnAppend.MouseUpEventHandler = (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 3c04eec..f19a9d6 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘�
+using System;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -88,6 +89,9 @@
{
continue;
}
+#if DEBUG
+ //throw new ArgumentNullException();
+#endif
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
@@ -127,22 +131,32 @@
functionListView.AddChidren(functionDiv);
}
}
- foreach (var scene in room.GetRoomScenes(false))
+ try
{
- functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- var sceneRow = new FrameLayout()
+ foreach (var scene in room.GetRoomScenes(false))
{
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(116),
- Radius = (uint)Application.GetMinRealAverage(12),
- BorderColor = 0x00FFFFFF,
- BorderWidth = 1,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = "Scene-" + scene.sid
- };
- functionListView.AddChidren(sceneRow);
- LoadSceneRow(sceneRow, scene);
+ if (scene == null)
+ {
+ continue;
+ }
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+ var sceneRow = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(116),
+ Radius = (uint)Application.GetMinRealAverage(12),
+ BorderColor = 0x00FFFFFF,
+ BorderWidth = 1,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Tag = "Scene-" + scene.sid
+ };
+ functionListView.AddChidren(sceneRow);
+ LoadSceneRow(sceneRow, scene);
+ }
+ }catch (Exception ex)
+ {
+ MainPage.Log($"RoomPage LoadPage Error:{ex.Message}");
}
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
index 9db9698..dc82ca1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs
@@ -252,24 +252,14 @@
var bindResult = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(msg);
if (bindResult != null)
{
+ string tipTitle = Language.StringByID(StringId.Tip);
if (bindResult.Code == "147021") {
- string tipTitle = "鎻愮ず";
- string tipMsg = "鏃犳硶缁戝畾璇ヨ澶囷紝璇蜂粠娌充笢娓犻亾璐拱璇ョ被鍨嬩骇鍝�";
- if (Language.CurrentLanguage != "Chinese")
- {
- tipTitle = "Tip";
- tipMsg = "Unable to bind this device. Please purchase this type of product from HDL";
- }
+ string tipMsg = Language.StringByID(StringId.UnableToBindThisDeviceTip);
new PublicAssmebly().TipMsg(tipTitle, tipMsg);
}
else
{
- string tipTitle = "鎻愮ず";
string tipMsg = $"{bindResult.message}({bindResult.Code})";
- if (Language.CurrentLanguage != "Chinese")
- {
- tipTitle = "Tip";
- }
new PublicAssmebly().TipMsg(tipTitle, tipMsg);
}
}
@@ -341,25 +331,15 @@
var bindResult = Newtonsoft.Json.JsonConvert.DeserializeObject<ResponsePackNew>(msg);
if (bindResult != null)
{
+ string tipTitle = Language.StringByID(StringId.Tip);
if (bindResult.Code == "147021")
{
- string tipTitle = "鎻愮ず";
- string tipMsg = "鏃犳硶缁戝畾璇ヨ澶囷紝璇蜂粠娌充笢娓犻亾璐拱璇ョ被鍨嬩骇鍝�";
- if (Language.CurrentLanguage != "Chinese")
- {
- tipTitle = "Tip";
- tipMsg = "Unable to bind this device. Please purchase this type of product from HDL";
- }
+ string tipMsg = Language.StringByID(StringId.UnableToBindThisDeviceTip);
new PublicAssmebly().TipMsg(tipTitle, tipMsg);
}
else
{
- string tipTitle = "鎻愮ず";
string tipMsg = $"{bindResult.message}({bindResult.Code})";
- if (Language.CurrentLanguage != "Chinese")
- {
- tipTitle = "Tip";
- }
new PublicAssmebly().TipMsg(tipTitle, tipMsg);
}
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_AuthorizedPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_AuthorizedPage.cs
index 809444b..b736d08 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_AuthorizedPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_AuthorizedPage.cs
@@ -79,14 +79,10 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
Padding = new Padding(0, Application.GetRealWidth(16), 0, Application.GetRealWidth(16)),
- Text = "璐︽埛缁戝畾鎴愬姛锛屾偍鍙互缁х画瀹屾垚璁惧鍏宠仈鎿嶄綔",
+ TextID = StringId.BindIotAccountTip,
IsMoreLines = true,
};
contentView.AddChidren(btnMsg);
- if(Language.CurrentLanguage != "Chinese")
- {
- btnMsg.Text = "Account binding is successful.You can continue to complete the device association operation";
- }
Button btnLine = new Button()
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
index 0a77c44..7fe2ade 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs
@@ -59,13 +59,9 @@
TextSize = 21,
TextAlignment = TextAlignment.CenterLeft,
IsBold = true,
- Text = "鍏充簬璐﹀彿缁戝畾鐨勫０鏄�"
+ TextID = StringId.AboutBindAcountTip,
};
contentView.AddChidren(btnTipTitle);
- if (Language.CurrentLanguage != "Chinese")
- {
- btnTipTitle.Text = "Statement on account binding";
- }
var btnTipText = new Button()
{
@@ -142,15 +138,10 @@
BackgroundColor= CSS_Color.MainColor,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = "鍚屾剰鎺堟潈",
+ TextID = StringId.Agree,
Radius = (uint)Application.GetRealHeight(22)
};
optionView.AddChidren(btnComfirm);
- if (Language.CurrentLanguage != "Chinese")
- {
- btnComfirm.Text = "Consent authorization";
- }
-
if (!brand_Iot.hasAuthorization)
{
@@ -177,11 +168,7 @@
}
else
{
- btnComfirm.Text = "瑙ｉ櫎鎺堟潈";
- if (Language.CurrentLanguage != "Chinese")
- {
- btnComfirm.Text = "Cancel authorization";
- }
+ btnComfirm.TextID = StringId.Cancel;
btnComfirm.MouseUpEventHandler = (sender, e) =>
{
Dialog dialog = new Dialog()
@@ -210,14 +197,10 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
Padding = new Padding(0,Application.GetRealWidth(16),0,Application.GetRealWidth(16)),
- Text = "鎾ら攢鎺堟潈鍚庯紝璇ュ搧鐗屽叧鑱斿湪On Pro涓殑璁惧灏嗗叏閮ㄨ瑙ｇ粦锛岀浉鍏充娇鐢ㄤ俊鎭悎璁惧鍊间篃灏嗗け鏁�",
+ TextID = StringId.RevokeAuthorizationTip,
IsMoreLines = true,
};
contentView2.AddChidren(btnMsg);
- if (Language.CurrentLanguage != "Chinese")
- {
- btnMsg.Text = "After the authorization is revoked, all the devices associated with the brand in on Pro will be unbound, and the relevant use information and device value will also become invalid";
- }
Button btnLine = new Button()
{
@@ -236,12 +219,8 @@
TextSize = CSS_FontSize.SubheadingFontSize,
SelectedTextColor = CSS_Color.MainBackgroundColor,
SelectedBackgroundColor = CSS_Color.MainColor,
- Text = "纭畾鎾ゅ洖鎺堟潈",
+ TextID = StringId.ConfirmRevocationOfAuthorization,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnConfirm.Text = "Confirm to withdraw authorization";
- }
btnConfirm.SetCornerWithSameRadius(Application.GetMinRealAverage(10), HDLUtils.RectCornerBottomLeft);
btnConfirm.SetCornerWithSameRadius(Application.GetMinRealAverage(10), HDLUtils.RectCornerBottomRight);
contentView2.AddChidren(btnConfirm);
@@ -280,14 +259,7 @@
}
else
{
- if (Language.CurrentLanguage != "Chinese")
- {
- new Alert("", "Operation failed", "").Show();
- }
- else
- {
- new Alert("", "鎿嶄綔澶辫触", "").Show();
- }
+ new Alert("", Language.StringByID(StringId.OperationFailed), "").Show();
}
}
catch { }
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
index b64cdd0..c915db0 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -383,6 +383,22 @@
this.RemoveFromParent();
return;
}
+ groupControl.sids.Clear();
+ foreach (var light in groupControlLightList)
+ {
+ try
+ {
+ var gc = new GroupControlFunction();
+ gc.sid = light.sid;
+ gc.spk = light.spk;
+ groupControl.sids.Add(gc);
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"鏂板缇ゆ帶杞崲鏁版嵁寮傚父:{ex.Message}");
+ }
+ }
+
var pack = Common.ApiUtlis.Ins.HttpRequest.EditGroupControl(new List<GroupControl>() { groupControl });
if (pack != null)
{
@@ -564,12 +580,8 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "鍔犺浇鏇村",
+ TextID = StringId.LoadMore,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnAppend.Text = "Load more";
- }
functionListView.AddChidren(btnAppend);
btnAppend.MouseUpEventHandler = (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
index 1c25db0..4591f0b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/GroupControl.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using HDL_ON.Common;
using HDL_ON.DAL.Server;
+using HDL_ON.DriverLayer;
using Shared;
namespace HDL_ON.Entity
@@ -123,22 +124,41 @@
{
try
{
- var controlValues = new Dictionary<string, object>();
- foreach(var p in pairs)
+
+ if (DriverLayer.Control.Ins.GatewayOnline_Local)
{
- controlValues.Add("key", p.Key);
- controlValues.Add("value", p.Value);
- }
- var pack = ApiUtlis.Ins.HttpRequest.ControlGroupControl(userDeviceGroupControlId, controlValues);
- if (pack != null)
- {
- if (pack.Code == StateCode.SUCCESS)
+ var controlValues = new Dictionary<string, string>();
+ foreach (var p in pairs)
{
- //DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl.
+ controlValues.Add("key", p.Key);
+ controlValues.Add("value", p.Value.ToString());
}
- else
+ var functionControlDataObj = GetGatewayAlinkControlData(controlValues);
+ var functionControlDataJson = Newtonsoft.Json.JsonConvert.SerializeObject(functionControlDataObj);
+ var sendBytes = DriverLayer.Control.Ins.ConvertSendBodyData(CommunicationTopic.ct.ControlFunctionTopic, functionControlDataJson);
+ new Control_Udp().SendLocalHdlLinkData(sendBytes, functionControlDataObj.id, 3);
+ MainPage.Log($"鏈湴閫氳 鍙戦�丠DL-Link鏁版嵁:{functionControlDataJson}");
+ }
+ else
+ {
+
+ var controlValues = new Dictionary<string, object>();
+ foreach (var p in pairs)
{
- MainPage.Log($"缇ゆ帶鎺у埗澶辫触,Code: {pack.Code}");
+ controlValues.Add("key", p.Key);
+ controlValues.Add("value", p.Value);
+ }
+ var pack = ApiUtlis.Ins.HttpRequest.ControlGroupControl(userDeviceGroupControlId, controlValues);
+ if (pack != null)
+ {
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ //DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl.
+ }
+ else
+ {
+ MainPage.Log($"缇ゆ帶鎺у埗澶辫触,Code: {pack.Code}");
+ }
}
}
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
index bc53c1a..7c88b59 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/AddMemberScanPage.cs
@@ -190,13 +190,9 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = " 涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�",
+ TextID =StringId.FaceProTipText1,
IsMoreLines = true,
};
- if(Language.CurrentLanguage != "Chinese")
- {
- btnMsg.Text = " In order to protect your personal privacy rights, we hereby notify you and apply for explicit consent authorization. Please read it carefully";
- }
contentView.AddChidren(btnMsg);
Button btnMsg1 = new Button()
@@ -208,13 +204,9 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = " 銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�",
+ TextID = StringId.FaceProTipText2,
IsMoreLines = true,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnMsg1.Text = " 'On Pro Face Information Collection Protocol'";
- }
contentView.AddChidren(btnMsg1);
@@ -227,13 +219,9 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = " 鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙ｅ苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�",
+ TextID = StringId.FaceProTipText3,
IsMoreLines = true,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnMsg2.Text = " If you agree to this agreement, please click the [Agree] button to indicate that you have understood and agreed to the face information collection agreement.";
- }
contentView.AddChidren(btnMsg2);
Button btnLine2 = new Button()
@@ -289,7 +277,7 @@
{
url = "https://developer.hdlcontrol.com/Face information collection protocol.html";
}
- new WebViewDialog().LoadPage("浜鸿劯淇℃伅閲囬泦鍗忚", url);
+ new WebViewDialog().LoadPage(Language.StringByID(StringId.GetFaceProtocol), url);
dialog.Close();
};
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index e503084..be1fc7d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -304,15 +304,12 @@
Width = Application.GetRealWidth(374 / 2),
Height = Application.GetRealHeight(50) - 1,
BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
- Text = "涓婁竴椤�",
+ TextID = StringId.PreviousPage,
TextAlignment = TextAlignment.Center,
TextColor = CSS.CSS_Color.TextualColor,
TextSize = CSS.CSS_FontSize.TextFontSize,
};
- if(Language.CurrentLanguage != "Chinese")
- {
- btnPre.Text = "Previous";
- }
+
bottomOptionView.AddChidren(btnPre);
btnPre.MouseUpEventHandler = (sender33, e33) => {
if (pageIndex < 1)
@@ -330,15 +327,11 @@
Width = Application.GetRealWidth(374 / 2),
Height = Application.GetRealHeight(50) - 1,
BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
- Text = "涓嬩竴椤�",
+ TextID = StringId.NextPage,
TextAlignment = TextAlignment.Center,
TextColor = CSS.CSS_Color.TextualColor,
TextSize = CSS.CSS_FontSize.TextFontSize,
};
- if(Language.CurrentLanguage != "Chinese")
- {
- btnNext.Text = "Next";
- }
bottomOptionView.AddChidren(btnNext);
btnNext.MouseUpEventHandler = (sender33, e33) => {
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
index f566630..97c577b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs
@@ -597,7 +597,7 @@
var btnTitleText2 = new Button()
{
X = btnCollection.Right,
- Text = "鎴戠殑瀹跺涵",
+ TextID = StringId.MyHome,
TextSize = 16,
TextColor = 0xFF242424,
TextAlignment = TextAlignment.CenterLeft,
@@ -605,10 +605,6 @@
Height = Application.GetRealHeight(54),
};
subTitleView.AddChidren(btnTitleText2);
- if(Language.CurrentLanguage != "Chinese")
- {
- btnTitleText2.Text = "My Home";
- }
int subFunctionCount = 0;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index 77c25b5..d0d0372 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -57,7 +57,7 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(backAction);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView();
contentView = new VerticalScrolViewLayout()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage.cs
index 9b0088a..b25118e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage.cs
@@ -151,9 +151,6 @@
TextID = StringId.OFF,
TextSize = CSS_FontSize.TextFontSize,
Radius = (uint)Application.GetRealWidth(5),
- IsSelected = true,
- //BorderWidth = 1,
- //BorderColor = 0x00000000
};
view.AddChidren(btnClose);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
index c908e90..0f8600b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs
@@ -264,12 +264,8 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "鍔犺浇鏇村",
+ TextID = StringId.LoadMore,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnAppend.Text = "Load more";
- }
functionListView.AddChidren(btnAppend);
btnAppend.MouseUpEventHandler = (sender, e) =>
{
@@ -440,7 +436,7 @@
}
else
{
- var removeTemp = functions.Find((obj) => obj.deviceId == function.deviceId);
+ var removeTemp = functions.Find((obj) => obj.sid == function.deviceId);
if (removeTemp != null)
{
functions.Remove(removeTemp);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs b/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
index 625812c..3652c6a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/OrderFunctionPage.cs
@@ -175,12 +175,8 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "鍔犺浇鏇村",
+ TextID = StringId.LoadMore,
};
- if (Language.CurrentLanguage != "Chinese")
- {
- btnAppend.Text = "Load more";
- }
functionListView.AddChidren(btnAppend);
btnAppend.MouseUpEventHandler = (sender, e) =>
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs
index d6b5a5e..b9af8de 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/WanderingAlarmPage.cs
@@ -31,12 +31,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = "*鍙瀵硅鍙互鑷姩璇嗗埆闂ㄥ彛鍙枒浜哄憳锛屽苟鍙戣捣寰樺緤鎶ヨ璁板綍"
+ TextID =StringId.SmartDoorstepMachineAlarmPrompt,
};
- if(Language.CurrentLanguage != "Chinese")
- {
- btnTipMsg.Text = "*Visual intercom can automatically identify suspicious persons at the door and initiate wandering alarm records";
- }
bodyView.AddChidren(btnTipMsg);
contentView = new VerticalScrolViewLayout()
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index b2fd6b5..78690ae 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -132,7 +132,11 @@
//寮�鍚畾浣嶆湇鍔�
try
{
- Shared.Application.StartGPSLocationService();
+ if (DB_ResidenceData.Instance.CheckGPS_IsFirst)
+ {
+ DB_ResidenceData.Instance.CheckGPS_IsFirst = false;
+ Shared.Application.StartGPSLocationService();
+ }
}catch(Exception ex)
{
MainPage.Log("寮�鍚畾浣嶆湇鍔″紓甯�:" + ex.Message);
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 8d4483c..dc7aca0 100644
--- a/SiriIntents/Server/HttpUtil.cs
+++ b/SiriIntents/Server/HttpUtil.cs
@@ -16,8 +16,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
const string APP_KEY = "HDL-HOME-APP-TEST";
const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";
//public const string GlobalRequestHttpsHost = "http://59.41.255.150:7777";//mmmm
--
Gitblit v1.8.0