From fab43407e01474cc4f7b1d0f4b5e43ce1a038ce4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 三月 2021 16:51:14 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into temp-wxr
---
HDL-ON_iOS/Resources/Language.ini | 86 ++++++++++++++++-
HDL-ON_Android/Assets/Language.ini | 145 ++++++++++++++++++++++++++++-
HDL_ON/UI/UI0-Stan/Controls/MessageControls/ShowMsgControl.cs | 7 +
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs | 13 ++
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddThirdPartyDeviceMenuListPage.cs | 2
5 files changed, 242 insertions(+), 11 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index a6f0ed0..a042891 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -417,9 +417,86 @@
432=Other platform equipment is supported by third party service provider
433=Water valve
434=Time switch
+435=Remote control
-1002=Anion
-
+1000=Indoor Humidity
+1001=V-chip
+1002=Anion
+1003=Sterilization
+1004=Humidification
+1005=Filter Element Reset
+1006=Lighting
+1007=Automatic
+1008=Manual
+1009=Strong
+1010=Sleep
+1011=Timing
+1012=Wind Speed
+1013=Gear
+1014=Please confirm whether the filter element has been reset and operate the equipment according to the instruction manual for the filter element life to be timed again
+1015=Low Gear
+1016=Mid Gear
+1017=High Gear
+1018=Timing Setting
+1019=Hour
+1020=Filter Element Time锛�
+1021=Air Cleaner
+1022=Current wind speed
+1023=Cancel Timing
+1024=Floor Sweeping Robot
+1025=Suction
+1026=1st Gear
+1027=2nd Gear
+1028=3rd Gear
+1029=Charge
+1030=Voice
+1031=Mute
+1032=Cleaning Mode
+1033=Consumables Management
+1034=History
+1035=Automatic
+1036=Random
+1037=Wall
+1038=Spiral
+1039=Total Clean Area
+1040=Total Clean Time
+1041=Remaining life of side brush
+1042=Residual life of roller brush
+1043=Remaining life of filter screen
+1044=Reset edge brush
+1045=Reset roll brush
+1046=Reset screen
+1047=Confirm to Reset edge brush?
+1048=Confirm to Reset roll brush?
+1049=Confirm to Reset screen?
+1050=Add Device
+1051=Mini Intelligent Remote Control
+1052=Add Infrared Remote Control
+1053=Press the infrared remote control button{0}for 10 seconds and the indicator light{0}flashes blue quickly
+1054=Please make sure your Bluetooth{0}is on and searchable
+1055=Next Step
+1056=Device searching...
+1057=No infrared remote control found
+1058=1.Please check whether the device is{0} powered on normally{0}2.Please check whether the Bluetooth{0} function is turned on normally{0}3.Please check whether the indicator{0} light is flashing blue
+1059=Search Again
+1060=Connect WiFi
+1061=At present,it only supports 2.4G WiFi network{0}and does not support WiFi names{0}with Chinese characters
+1062=Password
+1063=Connecting...
+1064=Please make infrared remote control{0}as close as possible to WiFi router
+1065=Network Link
+1066=Upload to cloud
+1067=Connect success
+1068=1.Please check whether the device is{0} powered on normally{0}2.Please turn on the Bluetooth function{0}3.Press the button for 10s and the indicator{0} light will be on
+1069=Add Fail
+1070=Add Success
+1071=You can start using the infrared{0}remote control!
+1072=Start using
+1073=Please turn on Bluetooth
+1074=Location information(GBS) unavailable
+1075=Network unavailable
+1076=Select infrared remote control
+
5000=Music
5001=Group
5002=Setting
@@ -1100,6 +1177,7 @@
432=鍏朵粬骞冲彴璁惧鍧囩敱绗笁鏂规湇鍔″晢鎻愪緵鏀寔
433=姘撮榾
434=瀹氭椂寮�鍏�
+435=閬ユ帶鍣�
1000=瀹ゅ唴婀垮害
@@ -1149,9 +1227,9 @@
1044=閲嶇疆杈瑰埛
1045=閲嶇疆婊氬埛
1046=閲嶇疆婊ょ綉
-1047=鏄惁閲嶇疆杈瑰埛
-1048=鏄惁閲嶇疆婊氬埛
-1049=鏄惁閲嶇疆婊ょ綉
+1047=鏄惁閲嶇疆杈瑰埛?
+1048=鏄惁閲嶇疆婊氬埛?
+1049=鏄惁閲嶇疆婊ょ綉?
1050=娣诲姞璁惧
1051=mini鏅鸿兘閬ユ帶鍣�
1052=娣诲姞绾㈠閬ユ帶
@@ -1307,6 +1385,63 @@
6076=缂栬緫淇℃伅
+6015=鍦ㄧ嚎
+6016=绂荤嚎
+6017=鐗堟湰鍙�
+6018=璇疯緭鍏ラ仴鎺у櫒鍚嶇О
+6019=鎻愮ず锛氶仴鎺у櫒鍒涘缓鍚庡彲鍦ㄥ姛鑳�-鐢靛櫒鍒嗙被{\r\n}鏌ユ壘浣跨敤
+6020=鎺ㄨ崘鎸夐敭
+6021=璇疯緭鍏ユ寜閿悕绉�
+6022=涓嬩竴姝�
+6023=鐢垫簮
+6024=闊抽噺+
+6025=闊抽噺-
+6026=棰戦亾+
+6027=棰戦亾-
+6028=涓�
+6029=涓�
+6030=宸�
+6031=鍙�
+6032=闈欓煶
+6034=纭
+6035=鎾斁
+6037=閫�鍑�
+6038=鑿滃崟
+6039=鏆傚仠
+6040=杩斿洖
+6041=鍋滄
+6042=涓婚〉
+6043=蹇繘
+6044=蹇��
+6045=瀹氭椂
+6046=澶嶅埗閬ユ帶鍔熻兘
+6047=瀵瑰噯閬ユ帶鍣ㄤ腑蹇冩寜涓嬬浉鍚屾寜閿�
+6048=鏅鸿兘閬ユ帶鍣�
+6049=娣诲姞鎸夐敭
+6050=*闀挎寜鍙繘琛岃嚜瀹氫箟鎺掑簭
+6051=瀹屾垚
+6052=娣诲姞鎴愬姛
+6053=鍙埌鍒嗙被-鍔熻兘-鐢靛櫒鎿嶄綔浣跨敤
+6054=鎵�灞炲垎绫�
+6055=閬ユ帶鍣ㄥ悕绉�
+6056=鎵�灞炲尯鍩�
+6057=缁х画娣诲姞
+6058=鐢靛櫒
+6059=娣诲姞澶辫触
+6060=閲嶈瘯
+6061=鍖归厤閬ユ帶鍣�
+6062=璇风偣鍑讳互涓嬫寜閽�
+6063=纭璁惧鏄惁鏈夊搷搴�
+6064=鎺у埗澶辫触
+6065=鎺у埗鎴愬姛
+6066=鐢垫簮寮�
+6067=妯″紡鍒跺喎
+6068=椋庨�熶腑椋�
+6069=娓╁害26鈩�
+6070=鍒犻櫎璁惧
+6071=淇敼鍚嶅瓧
+6072=纭鍒犻櫎
+6073=鍙栨秷
7000=鏂板缓鑷姩鍖�
7001=缂栬緫鑷姩鍖�
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index c84cc7d..765e310 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -420,8 +420,84 @@
434=Time switch
435=Remote control
-1002=Anion
-
+1000=Indoor Humidity
+1001=V-chip
+1002=Anion
+1003=Sterilization
+1004=Humidification
+1005=Filter Element Reset
+1006=Lighting
+1007=Automatic
+1008=Manual
+1009=Strong
+1010=Sleep
+1011=Timing
+1012=Wind Speed
+1013=Gear
+1014=Please confirm whether the filter element has been reset and operate the equipment according to the instruction manual for the filter element life to be timed again
+1015=Low Gear
+1016=Mid Gear
+1017=High Gear
+1018=Timing Setting
+1019=Hour
+1020=Filter Element Time锛�
+1021=Air Cleaner
+1022=Current wind speed
+1023=Cancel Timing
+1024=Floor Sweeping Robot
+1025=Suction
+1026=1st Gear
+1027=2nd Gear
+1028=3rd Gear
+1029=Charge
+1030=Voice
+1031=Mute
+1032=Cleaning Mode
+1033=Consumables Management
+1034=History
+1035=Automatic
+1036=Random
+1037=Wall
+1038=Spiral
+1039=Total Clean Area
+1040=Total Clean Time
+1041=Remaining life of side brush
+1042=Residual life of roller brush
+1043=Remaining life of filter screen
+1044=Reset edge brush
+1045=Reset roll brush
+1046=Reset screen
+1047=Confirm to Reset edge brush?
+1048=Confirm to Reset roll brush?
+1049=Confirm to Reset screen?
+1050=Add Device
+1051=Mini Intelligent Remote Control
+1052=Add Infrared Remote Control
+1053=Press the infrared remote control button{0}for 10 seconds and the indicator light{0}flashes blue quickly
+1054=Please make sure your Bluetooth{0}is on and searchable
+1055=Next Step
+1056=Device searching...
+1057=No infrared remote control found
+1058=1.Please check whether the device is{0} powered on normally{0}2.Please check whether the Bluetooth{0} function is turned on normally{0}3.Please check whether the indicator{0} light is flashing blue
+1059=Search Again
+1060=Connect WiFi
+1061=At present,it only supports 2.4G WiFi network{0}and does not support WiFi names{0}with Chinese characters
+1062=Password
+1063=Connecting...
+1064=Please make infrared remote control{0}as close as possible to WiFi router
+1065=Network Link
+1066=Upload to cloud
+1067=Connect success
+1068=1.Please check whether the device is{0} powered on normally{0}2.Please turn on the Bluetooth function{0}3.Press the button for 10s and the indicator{0} light will be on
+1069=Add Fail
+1070=Add Success
+1071=You can start using the infrared{0}remote control!
+1072=Start using
+1073=Please turn on Bluetooth
+1074=Location information(GBS) unavailable
+1075=Network unavailable
+1076=Select infrared remote control
+
5000=Music
5001=Group
5002=Setting
@@ -1152,9 +1228,9 @@
1044=閲嶇疆杈瑰埛
1045=閲嶇疆婊氬埛
1046=閲嶇疆婊ょ綉
-1047=鏄惁閲嶇疆杈瑰埛
-1048=鏄惁閲嶇疆婊氬埛
-1049=鏄惁閲嶇疆婊ょ綉
+1047=鏄惁閲嶇疆杈瑰埛?
+1048=鏄惁閲嶇疆婊氬埛?
+1049=鏄惁閲嶇疆婊ょ綉?
1050=娣诲姞璁惧
1051=mini鏅鸿兘閬ユ帶鍣�
1052=娣诲姞绾㈠閬ユ帶
diff --git a/HDL_ON/UI/UI0-Stan/Controls/MessageControls/ShowMsgControl.cs b/HDL_ON/UI/UI0-Stan/Controls/MessageControls/ShowMsgControl.cs
index 521bfb9..3081f6f 100644
--- a/HDL_ON/UI/UI0-Stan/Controls/MessageControls/ShowMsgControl.cs
+++ b/HDL_ON/UI/UI0-Stan/Controls/MessageControls/ShowMsgControl.cs
@@ -120,6 +120,13 @@
btnTemp.Text = msgText.Replace("\r\n", string.Empty);
//鑾峰彇杩欎釜鏄剧ず鐨勫唴瀹圭殑楂樺害
int rowCount = btnTemp.GetRealRowCountByText();
+ //鍐嶇湅鐪嬪畠鍘熸潵鎸夋崲琛岀鍒嗗壊涓哄嚑琛�
+ var myArry = msgText.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
+ //鐪嬬湅璋佺殑琛屾暟澶�,灏辩敤璋佺殑
+ if (myArry.Length > rowCount)
+ {
+ rowCount = myArry.Length;
+ }
int contentHeight = rowCount * Application.GetRealHeight(18);
if (rowCount <= 2)
{
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
index 6a725c7..3d66b86 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
@@ -209,6 +209,19 @@
bodyFrameLayout.AddChidren(btnUse);
btnUse.ButtonClickEvent += (sender, e) =>
{
+ //鍏虫帀鐣岄潰
+ this.CloseForm();
+ HdlFormLogic.Current.CloseFormByFormName("AddThirdPartyDeviceMenuListPage");
+ HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ var page = new UI2.PersonalCenter.PirDevice.PirMain();
+ MainPage.BasePageView.AddChidren(page);
+ page.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ });
+ });
};
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddThirdPartyDeviceMenuListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddThirdPartyDeviceMenuListPage.cs
index 38eb89b..58b0c30 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddThirdPartyDeviceMenuListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddThirdPartyDeviceMenuListPage.cs
@@ -74,7 +74,7 @@
var rowMini = new RowLayoutControl();
listView.AddChidren(rowMini);
rowMini.frameTable.AddLeftIcon(32, "PersonalCenter/AddDevice/MiniRemoteControlMenuIcon.png");
- var btnMiniView = rowMini.frameTable.AddLeftCaption(Language.StringByID(StringId.MiniIntelligentRemoteControl), 200);
+ var btnMiniView = rowMini.frameTable.AddLeftCaption(Language.StringByID(StringId.MiniIntelligentRemoteControl), 250);
btnMiniView.TextColor = CSS.CSS_Color.FirstLevelTitleColor;
rowMini.frameTable.AddRightArrow();
rowMini.frameTable.ButtonClickEvent += (sender, e) =>
--
Gitblit v1.8.0