From 84136143f447c1dd256ce85bceed692bc21f6951 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 25 十一月 2022 09:50:55 +0800
Subject: [PATCH] 大华摄像头

---
 HDL-ON_Android/Properties/AndroidManifest.xml        |    2 +-
 HDL-ON_iOS/Resources/Language.ini                    |   19 +++++++++++++++++--
 HDL-ON_Android/Assets/Language.ini                   |    5 +++++
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs |    2 +-
 HDL_ON/Common/R.cs                                   |    5 ++++-
 HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs |    4 ++--
 6 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 11b1736..eb4c98f 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -567,6 +567,7 @@
 580=Are you sure to delete this combined dimming?
 581=
 582=Are you sure to delete this device?
+583=EZVIZ
 
 
 2532=Visitor Invitation Record
@@ -1798,6 +1799,7 @@
 580=纭畾鍒犻櫎璇ョ粍鍚堣皟鍏夊悧锛�
 581=
 582=纭畾鍒犻櫎璇ヨ澶囧悧?
+583=钀ょ煶鎽勫儚澶�
 
 
 2532=璁垮閭�璇疯褰�
@@ -3006,6 +3008,7 @@
 580=Are you sure to delete this combined dimming?
 581=
 582=Are you sure to delete this device?
+583=EZVIZ
 
 
 2532=Visitor Invitation Record
@@ -4222,6 +4225,7 @@
 580=Are you sure to delete this combined dimming?
 581=
 582=Are you sure to delete this device?
+583=EZVIZ
 
 
 
@@ -5424,6 +5428,7 @@
 580=Are you sure to delete this combined dimming?
 581=
 582=Are you sure to delete this device?
+583=EZVIZ
 
 
 1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 28e1a92..c72755c 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.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202211221">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.3" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202211251">
 	<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
 	<!--鍙嬬洘-->
 	<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 290b50b..eb4c98f 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -565,7 +565,9 @@
 578=Mechanical Arm
 579=Cancellation
 580=Are you sure to delete this combined dimming?
-
+581=
+582=Are you sure to delete this device?
+583=EZVIZ
 
 
 2532=Visitor Invitation Record
@@ -1795,7 +1797,9 @@
 578=鏈烘鎵�
 579=绔嬪嵆娉ㄩ攢
 580=纭畾鍒犻櫎璇ョ粍鍚堣皟鍏夊悧锛�
-
+581=
+582=纭畾鍒犻櫎璇ヨ澶囧悧?
+583=钀ょ煶鎽勫儚澶�
 
 
 2532=璁垮閭�璇疯褰�
@@ -3002,6 +3006,10 @@
 578=Mechanical Arm
 579=Cancellation
 580=Are you sure to delete this combined dimming?
+581=
+582=Are you sure to delete this device?
+583=EZVIZ
+
 
 2532=Visitor Invitation Record
 2533=Visitor management
@@ -4215,6 +4223,10 @@
 578=Mechanical Arm
 579=Cancellation
 580=Are you sure to delete this combined dimming?
+581=
+582=Are you sure to delete this device?
+583=EZVIZ
+
 
 
 2532=Visitor Invitation Record
@@ -5414,6 +5426,9 @@
 577=袟邪褌胁芯褉懈
 579=Cancellation
 580=Are you sure to delete this combined dimming?
+581=
+582=Are you sure to delete this device?
+583=EZVIZ
 
 
 1000=袙谢邪卸薪芯褋褌 胁 褋褌邪褟褌邪
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index 6bb7906..ea6da3e 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -4,7 +4,10 @@
 {
     public static class StringId
     {
-
+        /// <summary>
+        /// 钀ょ煶鎽勫儚澶�
+        /// </summary>
+        public const int EZVIZ = 583;
         /// <summary>
         /// 纭畾鍒犻櫎璇ヨ澶囧悧?
         /// </summary>
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 5b63ceb..04ca7f2 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -1070,7 +1070,7 @@
                         btnName.TextID = StringId.Panel;
                         break;
                     case ShowFunction.SecurityMonitoring:
-                        btnName.TextID = StringId.SecurityMonitoring;
+                        btnName.TextID = StringId.EZVIZ;
                         btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
                         {
                             HDLCommon.Current.Go2EZvizMonitor(bodyView);
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
index d179519..6669399 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
@@ -119,7 +119,7 @@
             var tempValuesView = new FrameLayout()
             {
                 X = Application.GetRealWidth(21),
-                Y = Application.GetRealWidth(17),
+                Y = Application.GetRealWidth(22),
                 Width = Application.GetRealWidth(130),
                 Height = Application.GetRealWidth(132),
             };
@@ -159,7 +159,7 @@
             var humiValuesView = new FrameLayout()
             {
                 X = Application.GetRealWidth(130+21),
-                Y = Application.GetRealWidth(17),
+                Y = Application.GetRealWidth(22),
                 Width = Application.GetRealWidth(130),
                 Height = Application.GetRealWidth(132),
             };

--
Gitblit v1.8.0