From d3189eaa6be7c70ed5ac783efe68f43211a90d27 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:58:56 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://172.16.1.23:6688/r/~wxr/OnPro into Dev-Branch

---
 HDL-ON_Android/Assets/Language.ini |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 3288112..3d19285 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -617,7 +617,7 @@
 630=Colorful function
 631=Starting color
 632=End color
-633=Working hours
+633=Colorful cycle
 634=Recommen
 635=Current Color
 636=Color value number is 6 digits (composed of pure numbers/numbers+letters)
@@ -657,6 +657,13 @@
 670=After entering the detection range, the door lock will automatically recognize the face and unlock it
 671=Note: The distance for recognizing faces is affected by the trigger sensitivity, and the higher the sensitivity, the farther the recognition distance.
 672=Need to touch the door lock number button, wake up the door lock, recognize the face, and unlock it
+673=Door lock system volume
+674=Doorbell volume
+675=Low 
+676=Moderate  
+677=High 
+678=Current user data has been cleared, about to return to the previous page.
+
 
 
 
@@ -1947,7 +1954,7 @@
 630=鐐僵鍔熻兘
 631=璧峰棰滆壊
 632=缁撴潫棰滆壊
-633=宸ヤ綔鏃堕暱
+633=鐐僵鍛ㄦ湡
 634=鎺ㄨ崘
 635=褰撳墠棰滆壊
 636=鑹插�煎彿涓�6浣嶏紙鐢辩函鏁板瓧/鏁板瓧+瀛楁瘝缁勫悎锛�
@@ -1987,7 +1994,12 @@
 670=杩涘叆妫�娴嬭寖鍥村悗锛岄棬閿佸皢鑷姩璇嗗埆浜鸿劯骞跺紑閿�
 671=娉細璇嗗埆浜鸿劯鐨勮窛绂伙紝浼氬彈瑙﹀彂鐏垫晱搴﹀奖鍝嶏紝鐏垫晱搴﹁秺楂橈紝璇嗗埆璺濈瓒婅繙銆�
 672=闇�瑕佽Е鎽搁棬閿佹暟瀛楁寜閿紝鍞ら啋闂ㄩ攣鍚庤瘑鍒汉鑴稿苟寮�閿�
-
+673=闂ㄩ攣绯荤粺闊抽噺
+674=闂ㄩ搩闊抽噺
+675=浣�
+676=涓�
+677=楂�
+678=褰撳墠鐢ㄦ埛鏁版嵁宸叉竻绌猴紝鍗冲皢杩斿洖涓婁竴椤点��
 
 
 2532=璁垮閭�璇疯褰�
@@ -3276,7 +3288,7 @@
 630=Colorful function
 631=Starting color
 632=End color
-633=Working hours
+633=Colorful cycle
 634=Recommen
 635=Current Color
 636=Color value number is 6 digits (composed of pure numbers/numbers+letters)
@@ -3316,7 +3328,12 @@
 670=After entering the detection range, the door lock will automatically recognize the face and unlock it
 671=Note: The distance for recognizing faces is affected by the trigger sensitivity, and the higher the sensitivity, the farther the recognition distance.
 672=Need to touch the door lock number button, wake up the door lock, recognize the face, and unlock it
-
+673=Door lock system volume
+674=Doorbell volume
+675=Low 
+676=Moderate  
+677=High 
+678=Current user data has been cleared, about to return to the previous page.
 
 
 
@@ -4602,7 +4619,7 @@
 630=Colorful function
 631=Starting color
 632=End color
-633=Working hours
+633=Colorful cycle
 634=Recommen
 635=Current Color
 636=Color value number is 6 digits (composed of pure numbers/numbers+letters)
@@ -4642,6 +4659,13 @@
 670=After entering the detection range, the door lock will automatically recognize the face and unlock it
 671=Note: The distance for recognizing faces is affected by the trigger sensitivity, and the higher the sensitivity, the farther the recognition distance.
 672=Need to touch the door lock number button, wake up the door lock, recognize the face, and unlock it
+673=Door lock system volume
+674=Doorbell volume
+675=Low 
+676=Moderate  
+677=High 
+678=Current user data has been cleared, about to return to the previous page.
+
 
 
 
@@ -5915,7 +5939,7 @@
 630=Colorful function
 631=Starting color
 632=End color
-633=Working hours
+633=Colorful cycle
 634=Recommen
 635=Current Color
 636=Color value number is 6 digits (composed of pure numbers/numbers+letters)
@@ -5955,6 +5979,13 @@
 670=After entering the detection range, the door lock will automatically recognize the face and unlock it
 671=Note: The distance for recognizing faces is affected by the trigger sensitivity, and the higher the sensitivity, the farther the recognition distance.
 672=Need to touch the door lock number button, wake up the door lock, recognize the face, and unlock it
+673=Door lock system volume
+674=Doorbell volume
+675=Low 
+676=Moderate  
+677=High 
+678=Current user data has been cleared, about to return to the previous page.
+
 
 
 

--
Gitblit v1.8.0