From 3e936e71f601160a1a30a3880f1e91c3d06afbb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Tue, 26 Nov 2024 09:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20vad=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98=20silero=5Fvad.onnx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VideoAnalysis/Components/Pages/Login.razor.cs  |  2 +-
 VideoAnalysis/Controllers/Dto/ApiDto.cs        |  3 ++-
 VideoAnalysis/appsettings.json                 |  6 +++++-
 .../AICore/SherpaOnnx/SenseVoice.cs            |  2 +-
 VideoAnalysisCore/Common/AppCommon.cs          | 18 ++++++++++++++++++
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/VideoAnalysis/Components/Pages/Login.razor.cs b/VideoAnalysis/Components/Pages/Login.razor.cs
index 49a8a11..52300e4 100644
--- a/VideoAnalysis/Components/Pages/Login.razor.cs
+++ b/VideoAnalysis/Components/Pages/Login.razor.cs
@@ -51,7 +51,7 @@ namespace Learn.VideoAnalysis.Components.Pages
                     NotificationType = NotificationType.Warning
                 });
             }
-            if (InputAccount == "admin" && InputPassword == "q1w2e3!@#")
+            if (InputAccount ==AppCommon.Config.Admin.Account && InputPassword == AppCommon.Config.Admin.Password)
             {
                 await session.SetAsync("Login", true);
                 NavigationManager.NavigateTo("/");
diff --git a/VideoAnalysis/Controllers/Dto/ApiDto.cs b/VideoAnalysis/Controllers/Dto/ApiDto.cs
index b1634d8..4994651 100644
--- a/VideoAnalysis/Controllers/Dto/ApiDto.cs
+++ b/VideoAnalysis/Controllers/Dto/ApiDto.cs
@@ -43,7 +43,8 @@ namespace Learn.VideoAnalysis.Controllers.Dto
         public TextValue(float v) 
         {
             var s = TimeSpan.FromSeconds((double)v);
-            Text = s.ToString(@"mm\:ss");
+            var td = new[] { s.Hours, s.Minutes, s.Seconds };
+            Text = string.Join(':', td.Where(s => s > 0));
             Value = v;
         }
         public TextValue(string t,object v)
diff --git a/VideoAnalysis/appsettings.json b/VideoAnalysis/appsettings.json
index c38de8d..67fc02a 100644
--- a/VideoAnalysis/appsettings.json
+++ b/VideoAnalysis/appsettings.json
@@ -7,7 +7,11 @@
   },
   "AllowedHosts": "*",
   "AppConfig": {
-    "ID": "APP0001",//程序唯一值
+    "ID": "APP0001", //程序唯一值
+    "Admin": {
+      "Account": "admin",
+      "Password": "q1w2e3!@#"
+    },
     "Redis": {
       "ConnectionString": "127.0.0.1:6379,password=Woshiren123,defaultDatabase=10"
     },
diff --git a/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs b/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs
index 4ed95e7..658ba69 100644
--- a/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs
+++ b/VideoAnalysisCore/AICore/SherpaOnnx/SenseVoice.cs
@@ -69,7 +69,7 @@ namespace VideoAnalysisCore.AICore.SherpaOnnx
             OR = new OfflineRecognizer(config);
 
             VADModelConfig = new VadModelConfig();
-            VADModelConfig.SileroVad.Model = Path.Combine(AppCommon.AIModelFile, "sherpa-onnx-sense-voice-24-07-17", "silero_VAD.onnx");
+            VADModelConfig.SileroVad.Model = Path.Combine(AppCommon.AIModelFile, "sherpa-onnx-sense-voice-24-07-17", "silero_vad.onnx");
             VADModelConfig.Debug = 0;
             //缓冲区大小
             VAD = new VoiceActivityDetector(VADModelConfig, 60);
diff --git a/VideoAnalysisCore/Common/AppCommon.cs b/VideoAnalysisCore/Common/AppCommon.cs
index f4406bc..f60d690 100644
--- a/VideoAnalysisCore/Common/AppCommon.cs
+++ b/VideoAnalysisCore/Common/AppCommon.cs
@@ -272,6 +272,20 @@ namespace VideoAnalysisCore.Common
 
     }
     /// <summary>
+    /// 管理界面Admin账号
+    /// </summary>
+    public class AdminConfig
+    {
+        /// <summary>
+        /// 账号
+        /// </summary>
+        public string Account { get; set; } = string.Empty;
+        /// <summary>
+        /// 密码
+        /// </summary>
+        public string Password { get; set; } = string.Empty;
+    }
+    /// <summary>
     /// redis配置
     /// </summary>
     public class RedisConfig
@@ -308,6 +322,10 @@ namespace VideoAnalysisCore.Common
         /// </summary>
         public string ID { get; set; } = string.Empty;
         /// <summary>
+        /// Admin
+        /// </summary>
+        public AdminConfig Admin { get; set; } = new AdminConfig();
+        /// <summary>
         /// redis
         /// </summary>
         public RedisConfig Redis { get; set; } = new RedisConfig();