From 553d47e277f537eaf85865a8b808a88ae9dce5eb Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 30 十月 2023 10:18:24 +0800
Subject: [PATCH] 2.3版本
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL-ON_Android/SplashActivity.cs | 24 ++++++------
HDL-ON_iOS/Resources/Language.ini | 29 ++++++++++++++
HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs | 2
HDL-ON_Android/Assets/Language.ini | 29 ++++++++++++++
HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs | 9 ++++
HDL-ON_iOS/AppDelegate.cs | 6 +-
7 files changed, 81 insertions(+), 20 deletions(-)
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index e0ca4ee..94d0558 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -7070,7 +7070,7 @@
123=袩褉懈锌谢懈胁 锌芯胁褨褌褉褟
124=袙懈褋芯泻邪
125=小械褉械写薪褟
-126 =袧懈蟹褜泻邪
+126=袧懈蟹褜泻邪
127=袪械卸懈屑懈
128=楔胁懈写泻褨褋褌褜 胁械薪褌懈谢褟褌芯褉邪
129=袙懈 胁锌械胁薪械薪褨, 褖芯 胁懈屑泻薪褍谢懈 胁褋褨 褎褍薪泻褑褨褩 胁 锌褉懈屑褨褖械薪薪褨?
@@ -8105,6 +8105,11 @@
7169=效邪褋 褌褉懈胁邪谢芯褋褌褨
7170=胁懈褟胁谢械薪薪褟 锌褉懈褋褍褌薪芯褋褌褨 谢褞写懈薪懈
7171=锌褉芯写芯胁卸懈褌懈
+7172=Rgb color plate
+7173=Illuminance
+7174=Exceed
+7175=Under
+7176=HV
8501=袙褨写械芯蟹邪屑芯泻 写胁械褉械泄
8502=袣褨谢褜泻褨褋褌褜 械谢械泻褌褉芯械薪械褉谐褨褩
@@ -8123,6 +8128,28 @@
+8701=Home theatre
+8702=Player
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 449a195..f522fe1 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="2.3.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202310221">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.3.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202310301">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="30" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--鍙嬬洘-->
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index 096e3b3..39e931d 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -85,10 +85,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
- else if (localeList.Language == "uk")
- {
- Language.CurrentLanguage = "Ukraine";
- }
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -222,10 +222,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
- else if (localeList.Language == "uk")
- {
- Language.CurrentLanguage = "Ukraine";
- }
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
@@ -274,10 +274,10 @@
{
Language.CurrentLanguage = "斜褗谢谐邪褉褋泻懈";
}
- else if (localeList.Language == "uk")
- {
- Language.CurrentLanguage = "Ukraine";
- }
+ //else if (localeList.Language == "uk")
+ //{
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
diff --git a/HDL-ON_iOS/AppDelegate.cs b/HDL-ON_iOS/AppDelegate.cs
index 5f5f13d..9e1a694 100644
--- a/HDL-ON_iOS/AppDelegate.cs
+++ b/HDL-ON_iOS/AppDelegate.cs
@@ -290,9 +290,9 @@
{
Language.CurrentLanguage = "Spanish";
}
- else if(NSLocale.PreferredLanguages[0].Contains("uk-")){
- Language.CurrentLanguage = "Ukraine";
- }
+ //else if(NSLocale.PreferredLanguages[0].Contains("uk-")){
+ // Language.CurrentLanguage = "Ukraine";
+ //}
else
{
Language.CurrentLanguage = "English";
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index e0ca4ee..94d0558 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -7070,7 +7070,7 @@
123=袩褉懈锌谢懈胁 锌芯胁褨褌褉褟
124=袙懈褋芯泻邪
125=小械褉械写薪褟
-126 =袧懈蟹褜泻邪
+126=袧懈蟹褜泻邪
127=袪械卸懈屑懈
128=楔胁懈写泻褨褋褌褜 胁械薪褌懈谢褟褌芯褉邪
129=袙懈 胁锌械胁薪械薪褨, 褖芯 胁懈屑泻薪褍谢懈 胁褋褨 褎褍薪泻褑褨褩 胁 锌褉懈屑褨褖械薪薪褨?
@@ -8105,6 +8105,11 @@
7169=效邪褋 褌褉懈胁邪谢芯褋褌褨
7170=胁懈褟胁谢械薪薪褟 锌褉懈褋褍褌薪芯褋褌褨 谢褞写懈薪懈
7171=锌褉芯写芯胁卸懈褌懈
+7172=Rgb color plate
+7173=Illuminance
+7174=Exceed
+7175=Under
+7176=HV
8501=袙褨写械芯蟹邪屑芯泻 写胁械褉械泄
8502=袣褨谢褜泻褨褋褌褜 械谢械泻褌褉芯械薪械褉谐褨褩
@@ -8123,6 +8128,28 @@
+8701=Home theatre
+8702=Player
+8703=Amplifier
+8704=Virtual remote control
+8705=Allmov
+8706=TIMING
+8707=Open
+8708=Off
+8709=Vocal tract
+8710=All around
+8711=Storehouse
+8712=Subtitle
+8713=Have already collected
+8714=A Collection for the Future
+8715=Synthesize
+8716=Video Introduction
+8717=Score
+8718=Play now
+8719=Conform action
+8720=Channel
+8721=Control
+
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs
index bffd42c..f9b6c67 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs
@@ -91,7 +91,7 @@
{
TextSize = LogicView.TextSize.text16,
Width = Application.GetRealWidth(50),
- Height = Application.GetRealHeight(22),
+ Height = Application.GetRealHeight(100),
TextColor = CSS.CSS_Color.textRedColor,
Gravity = Gravity.Center,
TextID = StringId.Del,
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs
index 19a4a02..a3a29a2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs
@@ -123,7 +123,14 @@
}
else
{
- s = value + " min";
+ if (Language.CurrentLanguage == "Ukraine")
+ {
+ s = value + " 褏胁";
+ }
+ else
+ {
+ s = value + " min";
+ }
}
}
//鏇存柊鍊約tateValue
--
Gitblit v1.8.0