| HDL-ON_Android/Assets/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL-ON_iOS/Resources/Language.ini | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI0-Stan/Controls/MessageControls/ShowMsgControl.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddThirdPartyDeviceMenuListPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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=编辑自动化 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=添加红外遥控 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) { 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; }); }); }; }
@@ -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) =>
