From f7d3739023f4d04a4ed2c30c13d9abf8da210da7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 25 七月 2022 13:58:49 +0800
Subject: [PATCH] 兼容俄语
---
HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs | 16 +-
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs | 6 +
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_iOS/Info.plist | 4
HDL-ON_iOS/Resources/Language.ini | 62 ++++++------
HDL-ON_Android/Assets/Language.ini | 63 ++++++------
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL_ON/Common/UserInfo.cs | 14 ++
HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs | 24 ++--
HDL_ON/UI/UI1-Login/LoginPage.cs | 11 +
HDL_ON/UI/UI0-Public/TopViewDiv.cs | 51 ++++++++++
SiriIntents/Server/HttpUtil.cs | 4
12 files changed, 169 insertions(+), 92 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 30811f4..c4deb26 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -546,6 +546,7 @@
558=Someone is sitting
+
2532=Visitor Invitation Record
2533=Visitor management
2534=Visitor Invitation
@@ -2395,13 +2396,13 @@
5=袩芯卸邪谢褍泄褋褌邪 胁胁械写懈褌械 褋胁芯褞 褍褔械褌薪褍褞 蟹邪锌懈褋褜
6=袩邪褉芯谢褜
7=袟邪斜褘谢懈
-8=袟邪褉械谐懈褋褌褉懈褉褍泄褌械褋褜
+8=袟邪褉械谐-褋褟
9=袩褉芯胁械褉芯褔薪褘泄 泻芯写 写谢褟 谢芯谐懈薪邪
10=袩芯卸邪谢褍泄褋褌邪 锌芯写芯卸写懈褌械
11=袟邪泻褉褘褌褜
12=袩芯谢褍褔懈褌褜 锌褉芯胁械褉芯褔薪褘泄 泻芯写
13=袩邪褉芯谢褜 写谢褟 谢芯谐懈薪邪
-14=袪械谐懈褋褌褉邪褑懈褟
+14=袟邪褉械谐-褋褟
15=袧芯屑械褉 褌械谢械褎芯薪邪
16=袩芯卸邪谢褍泄褋褌邪 胁胁械写懈褌械 锌邪褉芯谢褜
17=袩芯卸邪谢褍泄褋褌邪 胁胁械写懈褌械 锌邪褉芯谢褜 锌芯胁褌芯褉薪芯
@@ -2492,8 +2493,8 @@
102=袨褌胁褟蟹邪薪芯
103=校写邪谢懈褌褜 泻芯屑薪邪褌褍 懈谢懈 薪械褌?
104=袙褉械屑褟 锌械褉械褏芯写邪
-105=孝械屑锌械褉邪褌褍褉邪 胁 锌芯屑械褖械薪懈懈
-106=袣芯薪写懈褑懈芯薪懈褉芯胁邪薪懈械
+105=孝械泻. 褌械屑锌-褉邪
+106=袣芯薪写-械
107=袙懈写械芯写芯屑芯褎芯薪
108=袛邪褌褔懈泻
109=袦芯薪懈褌芯褉 斜械蟹芯锌邪褋薪芯褋褌懈
@@ -2504,13 +2505,13 @@
114=袦芯薪懈褌芯褉懈薪谐 褝薪械褉谐芯锌芯褌褉械斜谢械薪懈褟
115=袘褘褌芯胁褘械 锌褉懈斜芯褉褘
116=小屑邪褉褌 蟹邪屑芯泻
-117=袩芯写芯谐褉械胁 锌芯谢邪
+117=孝械锌谢褘泄 锌芯谢
118=袨褌泻褉褘褌褜
119=袨褏谢邪卸写械薪懈械
120=袨褌芯锌谢械薪懈械
-121=袨褋褍褕械薪懈械 胁芯蟹写褍褏邪
+121=袨褋褍褕械薪懈械
122=袗胁褌芯
-123=袩芯写邪褔邪 袙芯蟹写褍褏邪
+123=袨斜写褍胁
124=袙褘褋芯泻邪褟
125=小褉械写薪褟褟
126=袧懈蟹泻邪褟
@@ -2588,7 +2589,7 @@
198=袨褌谢懈褔薪芯
199=袦芯褉芯蟹薪芯
200=啸芯谢芯写薪芯
-201=锌褉芯褏谢邪写薪芯
+201=袩褉芯褏谢邪写薪芯
202=袣芯屑褎芯褉褌薪芯
203=孝械锌谢芯
204=袞邪褉泻芯
@@ -2608,7 +2609,7 @@
218=袙谢邪卸薪芯褋褌褜
219=袛懈邪锌邪蟹芯薪
220=校褉芯胁械薪褜
-221=袟薪邪褔械薪懈械 褑胁械褌邪
+221=笑胁械褌
222=校谢褜褌褉邪写懈褋锌械褉褋薪邪褟 锌褘谢褜
223=袦械谢泻芯写懈褋锌械褉褋薪邪褟 锌褘谢褜
224=楔褍屑
@@ -2695,13 +2696,13 @@
305=袧芯屑械褉 褌械谢械褎芯薪邪
306=袗写褉械褋 褝谢械泻褌褉芯薪薪芯泄 锌芯褔褌褘
307=袩芯谢褍褔械薪褘 薪芯胁褘械 写邪薪薪褘械, 胁褘 褍胁械褉械薪褘, 褔褌芯 懈褏 薪褍卸薪芯 锌械褉械锌懈褋邪褌褜?
-308=袗胁褌芯屑邪褌懈蟹邪褑懈褟
+308=袗胁褌芯屑-褟
309=小芯蟹写邪褌褜 褋褑械薪褍
310=袛芯斜邪胁懈褌褜 褋褑械薪褍
311=袘邪蟹芯胁邪褟 泻芯薪褎懈谐褍褉邪褑懈褟
312=袠屑褟
313=袪械谐懈芯薪
-314=袟邪胁械褉褕懈褌褜
+314=袩褉懈屑械薪懈褌褜
315=袩芯谢薪褘泄 胁懈写 薪邪 褉械蟹懈写械薪褑懈褞
316=袙褘斜褉邪褌褜
317=校卸械 写芯斜邪胁谢械薪芯
@@ -2746,7 +2747,7 @@
356=袧芯屑械褉 胁械褉褋懈懈
357=协褌邪 褎褍薪泻褑懈褟 薪械写芯褋褌褍锌薪邪!
358=孝械谢械褎芯薪:
-359=协谢械泻褌褉芯薪薪邪褟 锌芯褔褌邪:
+359=协谢. 锌芯褔褌邪
360=小褑械薪邪 锌邪薪械谢懈 褍锌褉邪胁谢械薪懈褟
361=袧械 写芯斜邪胁谢械薪芯
362=袙褘斜褉邪褌褜 胁褋械
@@ -2843,8 +2844,8 @@
471=小袙效 写邪褌褔懈泻
472=袧邪褉褍卸薪褘泄
473=袣邪褔邪薪懈械
-474=袣邪褔邪薪懈械 胁胁械褉褏 懈 胁薪懈蟹
-475=袩芯胁芯褉芯褌 胁谢械胁芯 懈 胁锌褉邪胁芯
+474=袩芯 胁械褉褌懈泻邪谢懈
+475=袩芯 谐芯褉懈蟹芯薪褌邪谢懈
476=袛芯斜邪胁懈褌褜 褉械蟹懈写械薪褑懈褞
477=袣邪褔邪薪懈械
478=校蟹芯褉
@@ -2880,7 +2881,7 @@
508=肖芯褉屑邪谢褜写械谐懈写
509=袩芯卸邪谢褍泄褋褌邪, 胁胁械写懈褌械 薪邪蟹胁邪薪懈械 芯褏褉邪薪薪芯泄 褎褍薪泻褑懈懈.
510=袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 褑械谢褜 锌芯褋褌邪薪芯胁泻懈.
-511=袣芯屑斜懈薪懈褉芯胁邪薪薪芯械 写懈屑屑懈褉芯胁邪薪懈械
+511=袣芯屑斜. 写懈屑屑懈褉芯胁邪薪懈械
512=袨褌锌褉邪胁泻邪 褋芯芯斜褖械薪懈泄 薪械 胁泻谢褞褔械薪邪, 锌芯卸邪谢褍泄褋褌邪, 锌械褉械泄写懈褌械 胁 薪邪褋褌褉芯泄泻懈.
513=袩芯卸邪谢褍泄褋褌邪, 胁胁械写懈褌械 泻芯写 褋芯锌褉褟卸械薪懈褟
514=袠薪褎芯褉屑邪褑懈褟 芯 屑械褋褌芯锌芯谢芯卸械薪懈懈 褕谢褞蟹邪 薪械 薪邪褋褌褉芯械薪邪
@@ -3308,11 +3309,11 @@
7000=小芯蟹写邪褌褜 邪胁褌芯屑邪褌懈蟹邪褑懈褞
-7001=袪械写邪泻褌懈褉芯胁邪褌褜 邪胁褌芯屑邪褌懈蟹邪褑懈褞
+7001=袪械写邪泻褌-褌褜 邪胁褌芯屑-褞
7002=袝褋谢懈
-7003=袣芯谐写邪 褝褌芯 芯写薪芯胁褉械屑械薪薪芯 褍写芯胁谢械褌胁芯褉褟械褌 褋谢械写褍褞褖懈屑 褍褋谢芯胁懈褟屑
-7004=袣芯谐写邪 褝褌芯 褍写芯胁谢械褌胁芯褉褟械褌 芯写薪芯屑褍 懈蟹 褋谢械写褍褞褖懈褏 褍褋谢芯胁懈泄
-7005=袩褉芯写芯谢卸懈褌褜 胁褘锌芯谢薪械薪懈械
+7003=袣芯谐写邪 芯写薪芯胁褉械屑械薪薪芯 褍写芯胁谢械褌胁芯褉褟械褌 胁褋械屑 褍褋谢芯胁懈褟屑
+7004=袣芯谐写邪 褍写芯胁谢械褌胁芯褉褟械褌 褏芯褌褜 芯写薪芯屑褍 懈蟹 褍褋谢芯胁懈泄
+7005=孝芯
7006=小谢械写褍褞褖械械 写械泄褋褌胁懈械
7007=小锌芯褋芯斜 芯斜褉邪斜芯褌泻懈
7008=袙褘锌芯谢薪懈褌褜 芯写懈薪 褉邪蟹
@@ -3331,18 +3332,18 @@
7021=袦懈薪褍褌邪
7022=小械泻褍薪写邪
7023=袨褌屑械薪邪
-7024=校胁械褉械薪褘
+7024=小芯谐谢.
7025=*协褌芯 写芯谢卸薪芯 胁褘锌芯谢薪懈褌褜 蟹邪写邪薪薪褍褞 胁邪屑懈 邪胁褌芯屑邪褌懈蟹邪褑懈褞 芯写懈薪 褉邪蟹 胁 褌械褔械薪懈械 蟹邪写邪薪薪芯谐芯 胁邪屑懈 写懈邪锌邪蟹芯薪邪 胁褉械屑械薪懈.
7026=袙褉械屑褟 薪邪褔邪谢邪
7027=袙褉械屑褟 芯泻芯薪褔邪薪懈褟
7028=肖褍薪泻褑懈褟
7029=袙褘斜械褉懈褌械 褎褍薪泻褑懈芯薪邪谢褜薪芯械 褍褋谢芯胁懈械
-7030=袙械褋褜 褉械谐懈芯薪
-7031=袙褋械 褎褍薪泻褑懈懈
+7030=袙械褋褜 芯斜褗械泻褌
+7031=袙褋械 褎-懈懈
7032=袙泻谢.
7033=袙褘泻谢
7034=袩械褉械泻谢褞褔邪褌械谢褜
-7035=袟邪胁械褉褕械薪芯
+7035=袩褉懈屑械薪懈褌褜
7036=袛芯斜邪胁懈褌褜 胁褘锌芯谢薪械薪懈械
7037=袩芯薪械写械谢褜薪懈泻
7038=袙褌芯褉薪懈泻
@@ -3356,7 +3357,7 @@
7046=袧邪蟹胁邪薪懈械
7047=袠蟹屑械薪懈褌褜 薪邪蟹胁邪薪懈械
7048=袧邪蟹胁邪薪懈械 邪胁褌芯屑邪褌懈蟹邪褑懈懈 褍卸械 褋褍褖械褋褌胁褍械褌.
-7049=校写邪谢懈褟褌褜 邪胁褌芯屑邪褌懈蟹邪褑懈褞 懈谢懈 薪械褌?
+7049=校写邪谢懈褌褜 邪胁褌芯屑-褞 懈谢懈 薪械褌?
7050=袛芯斜邪胁懈褌褜 褋褑械薪褍
7051=袟邪写械褉卸泻邪
7052=袧械 褍写邪谢芯褋褜 褋芯褏褉邪薪懈褌褜, 锌芯卸邪谢褍泄褋褌邪, 锌芯锌褉芯斜褍泄褌械 械褖械 褉邪蟹.
@@ -3374,9 +3375,9 @@
7064=袛械薪褜
7065=袧芯褔褜
7066=携 褍褕械谢
-7067=袨褋薪芯胁薪芯泄
+7067=袧芯褉屑邪
7068=袙褉械屑褟
-7069=袗胁褌芯屑邪褌懈蟹邪褑懈褟 薪械 薪邪褋褌褉芯械薪邪 , 锌芯卸邪谢褍泄褋褌邪, 锌褉芯写芯谢卸邪泄褌械 薪邪褋褌褉芯泄泻褍.
+7069=袗胁褌芯屑邪褌懈蟹邪褑懈褟 薪械 薪邪褋褌褉芯械薪邪. 袧邪褋褌褉芯泄褌械.
7070=袟写械褋褜 薪懈褔械谐芯 薪械褌.
7071=袙褉械屑褟 薪邪褔邪谢邪 薪械 斜褘谢芯 褍褋褌邪薪芯胁谢械薪芯, 锌芯卸邪谢褍泄褋褌邪, 褍褋褌邪薪芯胁懈褌械.
7072=袙褉械屑褟 芯泻芯薪褔邪薪懈褟 薪械 褍褋褌邪薪芯胁谢械薪芯, 锌芯卸邪谢褍泄褋褌邪, 褍褋褌邪薪芯胁懈褌械.
@@ -3475,12 +3476,12 @@
9006=袣芯写 锌芯写褌胁械褉卸写械薪懈褟 屑芯卸械褌 斜褘褌褜 芯褌锌褉邪胁谢械薪 锌芯蟹卸械, 锌芯卸邪谢褍泄褋褌邪, 锌芯写芯卸写懈褌械.
9007=袩芯卸邪谢褍泄褋褌邪, 锌芯写芯卸写懈褌械.
9008=袧邪蟹邪写
-9009=袩芯谢褜蟹芯胁邪褌械谢褜, 泻芯褌芯褉褘泄 薪械 褏芯褔械褌, 褔褌芯斜褘 械谐芯 薪邪蟹褘胁邪谢懈
+9009=袗薪芯薪懈屑
9010=袧芯胁褘泄 锌邪褉芯谢褜
9011=袙胁械写懈褌械 薪芯胁褘泄 锌邪褉芯谢褜 褋薪芯胁邪
-9012=小芯谐谢邪褋懈褌褜褋褟
-9013=小芯谐谢邪褕械薪懈械 芯斜 芯斜褋谢褍卸懈胁邪薪懈懈
-9014=袩褉邪胁懈谢邪 蟹邪褖懈褌褘 懈薪褎芯褉屑邪褑懈懈 锌芯谢褜蟹芯胁邪褌械谢褟
+9012=小芯谐谢-褋褟
+9013=小芯谐谢.芯斜 芯斜褋谢.
+9014=袩褉. 蟹邪褖.懈薪褎.
9015=懈
9016=袩芯卸邪谢褍泄褋褌邪, 锌褉芯褔褌懈褌械 懈 褋芯谐谢邪褋懈褌械褋褜 褋 袩芯谢褜蟹芯胁邪褌械谢褜褋泻懈屑 小芯谐谢邪褕械薪懈械屑 芯斜 芯斜褋谢褍卸懈胁邪薪懈懈 懈 袩褉邪胁懈谢邪屑懈 蟹邪褖懈褌褘 锌芯谢褜蟹芯胁邪褌械谢褜褋泻芯泄 懈薪褎芯褉屑邪褑懈懈.
9017=袙褘 褍胁械褉械薪褘, 褔褌芯 褏芯褌懈褌械 胁褘泄褌懈 懈蟹 褋懈褋褌械屑褘?
@@ -4086,7 +4087,7 @@
521=Power (W)
522=Refresh
523=Delay alarm
-524=Bypass
+524=Bypasss
525=Enable
526=Cancel account
527=Homekit support notes
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index f5e40f7..b353484 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.5.9" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202207222">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.5.9" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202207251">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index 400f0f0..076ab47 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.5.902207221</string>
+ <string>1.5.902207251</string>
<key>CFBundleVersion</key>
- <string>1.5.907221</string>
+ <string>1.5.907251</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 175b5fe..c4deb26 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -2396,13 +2396,13 @@
5=袩芯卸邪谢褍泄褋褌邪 胁胁械写懈褌械 褋胁芯褞 褍褔械褌薪褍褞 蟹邪锌懈褋褜
6=袩邪褉芯谢褜
7=袟邪斜褘谢懈
-8=袟邪褉械谐懈褋褌褉懈褉褍泄褌械褋褜
+8=袟邪褉械谐-褋褟
9=袩褉芯胁械褉芯褔薪褘泄 泻芯写 写谢褟 谢芯谐懈薪邪
10=袩芯卸邪谢褍泄褋褌邪 锌芯写芯卸写懈褌械
11=袟邪泻褉褘褌褜
12=袩芯谢褍褔懈褌褜 锌褉芯胁械褉芯褔薪褘泄 泻芯写
13=袩邪褉芯谢褜 写谢褟 谢芯谐懈薪邪
-14=袪械谐懈褋褌褉邪褑懈褟
+14=袟邪褉械谐-褋褟
15=袧芯屑械褉 褌械谢械褎芯薪邪
16=袩芯卸邪谢褍泄褋褌邪 胁胁械写懈褌械 锌邪褉芯谢褜
17=袩芯卸邪谢褍泄褋褌邪 胁胁械写懈褌械 锌邪褉芯谢褜 锌芯胁褌芯褉薪芯
@@ -2493,8 +2493,8 @@
102=袨褌胁褟蟹邪薪芯
103=校写邪谢懈褌褜 泻芯屑薪邪褌褍 懈谢懈 薪械褌?
104=袙褉械屑褟 锌械褉械褏芯写邪
-105=孝械屑锌械褉邪褌褍褉邪 胁 锌芯屑械褖械薪懈懈
-106=袣芯薪写懈褑懈芯薪懈褉芯胁邪薪懈械
+105=孝械泻. 褌械屑锌-褉邪
+106=袣芯薪写-械
107=袙懈写械芯写芯屑芯褎芯薪
108=袛邪褌褔懈泻
109=袦芯薪懈褌芯褉 斜械蟹芯锌邪褋薪芯褋褌懈
@@ -2505,13 +2505,13 @@
114=袦芯薪懈褌芯褉懈薪谐 褝薪械褉谐芯锌芯褌褉械斜谢械薪懈褟
115=袘褘褌芯胁褘械 锌褉懈斜芯褉褘
116=小屑邪褉褌 蟹邪屑芯泻
-117=袩芯写芯谐褉械胁 锌芯谢邪
+117=孝械锌谢褘泄 锌芯谢
118=袨褌泻褉褘褌褜
119=袨褏谢邪卸写械薪懈械
120=袨褌芯锌谢械薪懈械
-121=袨褋褍褕械薪懈械 胁芯蟹写褍褏邪
+121=袨褋褍褕械薪懈械
122=袗胁褌芯
-123=袩芯写邪褔邪 袙芯蟹写褍褏邪
+123=袨斜写褍胁
124=袙褘褋芯泻邪褟
125=小褉械写薪褟褟
126=袧懈蟹泻邪褟
@@ -2589,7 +2589,7 @@
198=袨褌谢懈褔薪芯
199=袦芯褉芯蟹薪芯
200=啸芯谢芯写薪芯
-201=锌褉芯褏谢邪写薪芯
+201=袩褉芯褏谢邪写薪芯
202=袣芯屑褎芯褉褌薪芯
203=孝械锌谢芯
204=袞邪褉泻芯
@@ -2609,7 +2609,7 @@
218=袙谢邪卸薪芯褋褌褜
219=袛懈邪锌邪蟹芯薪
220=校褉芯胁械薪褜
-221=袟薪邪褔械薪懈械 褑胁械褌邪
+221=笑胁械褌
222=校谢褜褌褉邪写懈褋锌械褉褋薪邪褟 锌褘谢褜
223=袦械谢泻芯写懈褋锌械褉褋薪邪褟 锌褘谢褜
224=楔褍屑
@@ -2696,13 +2696,13 @@
305=袧芯屑械褉 褌械谢械褎芯薪邪
306=袗写褉械褋 褝谢械泻褌褉芯薪薪芯泄 锌芯褔褌褘
307=袩芯谢褍褔械薪褘 薪芯胁褘械 写邪薪薪褘械, 胁褘 褍胁械褉械薪褘, 褔褌芯 懈褏 薪褍卸薪芯 锌械褉械锌懈褋邪褌褜?
-308=袗胁褌芯屑邪褌懈蟹邪褑懈褟
+308=袗胁褌芯屑-褟
309=小芯蟹写邪褌褜 褋褑械薪褍
310=袛芯斜邪胁懈褌褜 褋褑械薪褍
311=袘邪蟹芯胁邪褟 泻芯薪褎懈谐褍褉邪褑懈褟
312=袠屑褟
313=袪械谐懈芯薪
-314=袟邪胁械褉褕懈褌褜
+314=袩褉懈屑械薪懈褌褜
315=袩芯谢薪褘泄 胁懈写 薪邪 褉械蟹懈写械薪褑懈褞
316=袙褘斜褉邪褌褜
317=校卸械 写芯斜邪胁谢械薪芯
@@ -2747,7 +2747,7 @@
356=袧芯屑械褉 胁械褉褋懈懈
357=协褌邪 褎褍薪泻褑懈褟 薪械写芯褋褌褍锌薪邪!
358=孝械谢械褎芯薪:
-359=协谢械泻褌褉芯薪薪邪褟 锌芯褔褌邪:
+359=协谢. 锌芯褔褌邪
360=小褑械薪邪 锌邪薪械谢懈 褍锌褉邪胁谢械薪懈褟
361=袧械 写芯斜邪胁谢械薪芯
362=袙褘斜褉邪褌褜 胁褋械
@@ -2844,8 +2844,8 @@
471=小袙效 写邪褌褔懈泻
472=袧邪褉褍卸薪褘泄
473=袣邪褔邪薪懈械
-474=袣邪褔邪薪懈械 胁胁械褉褏 懈 胁薪懈蟹
-475=袩芯胁芯褉芯褌 胁谢械胁芯 懈 胁锌褉邪胁芯
+474=袩芯 胁械褉褌懈泻邪谢懈
+475=袩芯 谐芯褉懈蟹芯薪褌邪谢懈
476=袛芯斜邪胁懈褌褜 褉械蟹懈写械薪褑懈褞
477=袣邪褔邪薪懈械
478=校蟹芯褉
@@ -2881,7 +2881,7 @@
508=肖芯褉屑邪谢褜写械谐懈写
509=袩芯卸邪谢褍泄褋褌邪, 胁胁械写懈褌械 薪邪蟹胁邪薪懈械 芯褏褉邪薪薪芯泄 褎褍薪泻褑懈懈.
510=袩芯卸邪谢褍泄褋褌邪, 胁褘斜械褉懈褌械 褑械谢褜 锌芯褋褌邪薪芯胁泻懈.
-511=袣芯屑斜懈薪懈褉芯胁邪薪薪芯械 写懈屑屑懈褉芯胁邪薪懈械
+511=袣芯屑斜. 写懈屑屑懈褉芯胁邪薪懈械
512=袨褌锌褉邪胁泻邪 褋芯芯斜褖械薪懈泄 薪械 胁泻谢褞褔械薪邪, 锌芯卸邪谢褍泄褋褌邪, 锌械褉械泄写懈褌械 胁 薪邪褋褌褉芯泄泻懈.
513=袩芯卸邪谢褍泄褋褌邪, 胁胁械写懈褌械 泻芯写 褋芯锌褉褟卸械薪懈褟
514=袠薪褎芯褉屑邪褑懈褟 芯 屑械褋褌芯锌芯谢芯卸械薪懈懈 褕谢褞蟹邪 薪械 薪邪褋褌褉芯械薪邪
@@ -3309,11 +3309,11 @@
7000=小芯蟹写邪褌褜 邪胁褌芯屑邪褌懈蟹邪褑懈褞
-7001=袪械写邪泻褌懈褉芯胁邪褌褜 邪胁褌芯屑邪褌懈蟹邪褑懈褞
+7001=袪械写邪泻褌-褌褜 邪胁褌芯屑-褞
7002=袝褋谢懈
-7003=袣芯谐写邪 褝褌芯 芯写薪芯胁褉械屑械薪薪芯 褍写芯胁谢械褌胁芯褉褟械褌 褋谢械写褍褞褖懈屑 褍褋谢芯胁懈褟屑
-7004=袣芯谐写邪 褝褌芯 褍写芯胁谢械褌胁芯褉褟械褌 芯写薪芯屑褍 懈蟹 褋谢械写褍褞褖懈褏 褍褋谢芯胁懈泄
-7005=袩褉芯写芯谢卸懈褌褜 胁褘锌芯谢薪械薪懈械
+7003=袣芯谐写邪 芯写薪芯胁褉械屑械薪薪芯 褍写芯胁谢械褌胁芯褉褟械褌 胁褋械屑 褍褋谢芯胁懈褟屑
+7004=袣芯谐写邪 褍写芯胁谢械褌胁芯褉褟械褌 褏芯褌褜 芯写薪芯屑褍 懈蟹 褍褋谢芯胁懈泄
+7005=孝芯
7006=小谢械写褍褞褖械械 写械泄褋褌胁懈械
7007=小锌芯褋芯斜 芯斜褉邪斜芯褌泻懈
7008=袙褘锌芯谢薪懈褌褜 芯写懈薪 褉邪蟹
@@ -3332,18 +3332,18 @@
7021=袦懈薪褍褌邪
7022=小械泻褍薪写邪
7023=袨褌屑械薪邪
-7024=校胁械褉械薪褘
+7024=小芯谐谢.
7025=*协褌芯 写芯谢卸薪芯 胁褘锌芯谢薪懈褌褜 蟹邪写邪薪薪褍褞 胁邪屑懈 邪胁褌芯屑邪褌懈蟹邪褑懈褞 芯写懈薪 褉邪蟹 胁 褌械褔械薪懈械 蟹邪写邪薪薪芯谐芯 胁邪屑懈 写懈邪锌邪蟹芯薪邪 胁褉械屑械薪懈.
7026=袙褉械屑褟 薪邪褔邪谢邪
7027=袙褉械屑褟 芯泻芯薪褔邪薪懈褟
7028=肖褍薪泻褑懈褟
7029=袙褘斜械褉懈褌械 褎褍薪泻褑懈芯薪邪谢褜薪芯械 褍褋谢芯胁懈械
-7030=袙械褋褜 褉械谐懈芯薪
-7031=袙褋械 褎褍薪泻褑懈懈
+7030=袙械褋褜 芯斜褗械泻褌
+7031=袙褋械 褎-懈懈
7032=袙泻谢.
7033=袙褘泻谢
7034=袩械褉械泻谢褞褔邪褌械谢褜
-7035=袟邪胁械褉褕械薪芯
+7035=袩褉懈屑械薪懈褌褜
7036=袛芯斜邪胁懈褌褜 胁褘锌芯谢薪械薪懈械
7037=袩芯薪械写械谢褜薪懈泻
7038=袙褌芯褉薪懈泻
@@ -3357,7 +3357,7 @@
7046=袧邪蟹胁邪薪懈械
7047=袠蟹屑械薪懈褌褜 薪邪蟹胁邪薪懈械
7048=袧邪蟹胁邪薪懈械 邪胁褌芯屑邪褌懈蟹邪褑懈懈 褍卸械 褋褍褖械褋褌胁褍械褌.
-7049=校写邪谢懈褟褌褜 邪胁褌芯屑邪褌懈蟹邪褑懈褞 懈谢懈 薪械褌?
+7049=校写邪谢懈褌褜 邪胁褌芯屑-褞 懈谢懈 薪械褌?
7050=袛芯斜邪胁懈褌褜 褋褑械薪褍
7051=袟邪写械褉卸泻邪
7052=袧械 褍写邪谢芯褋褜 褋芯褏褉邪薪懈褌褜, 锌芯卸邪谢褍泄褋褌邪, 锌芯锌褉芯斜褍泄褌械 械褖械 褉邪蟹.
@@ -3375,9 +3375,9 @@
7064=袛械薪褜
7065=袧芯褔褜
7066=携 褍褕械谢
-7067=袨褋薪芯胁薪芯泄
+7067=袧芯褉屑邪
7068=袙褉械屑褟
-7069=袗胁褌芯屑邪褌懈蟹邪褑懈褟 薪械 薪邪褋褌褉芯械薪邪 , 锌芯卸邪谢褍泄褋褌邪, 锌褉芯写芯谢卸邪泄褌械 薪邪褋褌褉芯泄泻褍.
+7069=袗胁褌芯屑邪褌懈蟹邪褑懈褟 薪械 薪邪褋褌褉芯械薪邪. 袧邪褋褌褉芯泄褌械.
7070=袟写械褋褜 薪懈褔械谐芯 薪械褌.
7071=袙褉械屑褟 薪邪褔邪谢邪 薪械 斜褘谢芯 褍褋褌邪薪芯胁谢械薪芯, 锌芯卸邪谢褍泄褋褌邪, 褍褋褌邪薪芯胁懈褌械.
7072=袙褉械屑褟 芯泻芯薪褔邪薪懈褟 薪械 褍褋褌邪薪芯胁谢械薪芯, 锌芯卸邪谢褍泄褋褌邪, 褍褋褌邪薪芯胁懈褌械.
@@ -3476,12 +3476,12 @@
9006=袣芯写 锌芯写褌胁械褉卸写械薪懈褟 屑芯卸械褌 斜褘褌褜 芯褌锌褉邪胁谢械薪 锌芯蟹卸械, 锌芯卸邪谢褍泄褋褌邪, 锌芯写芯卸写懈褌械.
9007=袩芯卸邪谢褍泄褋褌邪, 锌芯写芯卸写懈褌械.
9008=袧邪蟹邪写
-9009=袩芯谢褜蟹芯胁邪褌械谢褜, 泻芯褌芯褉褘泄 薪械 褏芯褔械褌, 褔褌芯斜褘 械谐芯 薪邪蟹褘胁邪谢懈
+9009=袗薪芯薪懈屑
9010=袧芯胁褘泄 锌邪褉芯谢褜
9011=袙胁械写懈褌械 薪芯胁褘泄 锌邪褉芯谢褜 褋薪芯胁邪
-9012=小芯谐谢邪褋懈褌褜褋褟
-9013=小芯谐谢邪褕械薪懈械 芯斜 芯斜褋谢褍卸懈胁邪薪懈懈
-9014=袩褉邪胁懈谢邪 蟹邪褖懈褌褘 懈薪褎芯褉屑邪褑懈懈 锌芯谢褜蟹芯胁邪褌械谢褟
+9012=小芯谐谢-褋褟
+9013=小芯谐谢.芯斜 芯斜褋谢.
+9014=袩褉. 蟹邪褖.懈薪褎.
9015=懈
9016=袩芯卸邪谢褍泄褋褌邪, 锌褉芯褔褌懈褌械 懈 褋芯谐谢邪褋懈褌械褋褜 褋 袩芯谢褜蟹芯胁邪褌械谢褜褋泻懈屑 小芯谐谢邪褕械薪懈械屑 芯斜 芯斜褋谢褍卸懈胁邪薪懈懈 懈 袩褉邪胁懈谢邪屑懈 蟹邪褖懈褌褘 锌芯谢褜蟹芯胁邪褌械谢褜褋泻芯泄 懈薪褎芯褉屑邪褑懈懈.
9017=袙褘 褍胁械褉械薪褘, 褔褌芯 褏芯褌懈褌械 胁褘泄褌懈 懈蟹 褋懈褋褌械屑褘?
@@ -4087,7 +4087,7 @@
521=Power (W)
522=Refresh
523=Delay alarm
-524=Bypass
+524=Bypasss
525=Enable
526=Cancel account
527=Homekit support notes
diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index cecd374..230e3b9 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/HDL_ON/Common/UserInfo.cs
@@ -40,6 +40,20 @@
headImagePagePath = "LoginIcon/2.png",
};
}
+ else if(Language.CurrentLanguage == "russian")
+ {
+ m_Current = new UserInfo()
+ {
+ ID = "1234567890",
+ userName = "袩褉芯斜薪褘泄 邪泻泻邪褍薪褌",
+ AccountString = "袩褉芯斜薪褘泄 邪泻泻邪褍薪褌",
+ userMobileInfo = "袩褉芯斜薪褘泄 邪泻泻邪褍薪褌",
+ userEmailInfo = "袩褉芯斜薪褘泄 邪泻泻邪褍薪褌",
+ language = "russian",
+ areaCode = "86",
+ headImagePagePath = "LoginIcon/2.png",
+ };
+ }
else
{
m_Current = new UserInfo()
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 015e50c..fef52b7 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";//mmmm
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/UI/UI0-Public/TopViewDiv.cs b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
index c85c12c..e20fdc3 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDiv.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDiv.cs
@@ -330,6 +330,57 @@
}
/// <summary>
+ /// 鍚慺ramelayout娣诲姞椤堕儴鍖哄煙,娣诲姞绗笁鏂瑰钩鍙�
+ /// </summary>
+ /// <param name="frame"></param>
+ /// <param name="tilte"></param>
+ public void LoadTopView_Add3tyIot(string type, Action<string, string> callBack)
+ {
+ LoadTopView();
+
+ var btnAddIcon = new Button()
+ {
+ X = Application.GetRealWidth(337),
+ Y = Application.GetRealHeight(29),
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ UnSelectedImagePath = "Public/AddIcon.png",
+ };
+ contentView.AddChidren(btnAddIcon);
+
+ btnAddIcon.MouseUpEventHandler += (sender, e) =>
+ {
+ if (type == "floors")
+ {
+ Action<string> callBackAction = (floorName) =>
+ {
+ callBack("add", floorName);
+ };
+ string newFloorName = "1F";
+ for (int i = 0; i < SpatialInfo.CurrentSpatial.FloorList.Count + 1;)
+ {
+ newFloorName = ++i + "F";
+ if (null == SpatialInfo.CurrentSpatial.FloorList.Find((obj) => obj.roomName == newFloorName))
+ {
+ break;
+ }
+ }
+ var fs = new List<string>();
+ foreach (var f in SpatialInfo.CurrentSpatial.FloorList)
+ {
+ fs.Add(f.roomName);
+ }
+ new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors, newFloorName, callBackAction, StringId.FloorNameCannotBeEmpty,
+ StringId.AddFloorFailed_FloorAlreadyExist, fs);
+ }
+ else
+ {
+ callBack("", "");
+ }
+ };
+ }
+
+ /// <summary>
/// 妤煎眰绠＄悊椤堕儴鏍�
/// </summary>
public void LoadTopView_FloorTopView(Action<string> callBack, Action action)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 0892b6e..7f8e495 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -541,9 +541,16 @@
};
bodyView.AddChidren(btnDomeLogin);
- if(Language.CurrentLanguage!= "Chinese")
+ if (Language.CurrentLanguage != "Chinese")
{
- btnDomeLogin.Text = "Tourist experience";
+ if (Language.CurrentLanguage == "russian")
+ {
+ btnDomeLogin.Text = "袚芯褋褌械胁芯泄 褉械卸懈屑";
+ }
+ else
+ {
+ btnDomeLogin.Text = "Tourist experience";
+ }
}
btnDomeLogin.MouseUpEventHandler = (sender, e) => {
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
index 4d894c0..b9406c7 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs
@@ -22,7 +22,11 @@
public void LoadPage()
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();//.LoadTopView_AddIcon("3ty",action);
+ Action<string,string> action = (str1,str2) => {
+
+ };
+
+ new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView();//.LoadTopView_AddIcon("3ty",action);//.LoadTopView();//
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
index 97304ad..d8f0ce3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPageBLL.cs
@@ -248,14 +248,14 @@
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
- if (btnSwitch.IsSelected)
- {
- d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
- }
- else
- {
- function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
- }
+ //if (btnSwitch.IsSelected)
+ //{
+ // d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
+ //}
+ //else
+ //{
+ // function.lastBrightness = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Brightness));
+ //}
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
index c724edb..1feca67 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPageBLL.cs
@@ -179,18 +179,18 @@
function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, function.trait_on_off.curValue.ToString());
- if (btnSwitch.IsSelected)
- {
- if(function.lastBrightness == 0)
- {
- function.lastBrightness = 100;
- }
- d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
- }
- else
- {
- function.lastBrightness = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.Brightness));
- }
+ //if (btnSwitch.IsSelected)
+ //{
+ // if(function.lastBrightness == 0)
+ // {
+ // function.lastBrightness = 100;
+ // }
+ // d.Add(FunctionAttributeKey.Brightness, function.lastBrightness.ToString());
+ //}
+ //else
+ //{
+ // function.lastBrightness = Convert.ToInt32( function.GetAttrState(FunctionAttributeKey.Brightness));
+ //}
Control.Ins.SendWriteCommand(function, d);
})
{ IsBackground = true }.Start();
diff --git a/SiriIntents/Server/HttpUtil.cs b/SiriIntents/Server/HttpUtil.cs
index 56a78a0..f61de04 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";//mmmm
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
--
Gitblit v1.8.0