更新版本到 5.1

Author: chao

Jvedio-WPF/Jvedio/App.xaml.cs

@@ -1,4 +1,5 @@
 using Jvedio.Core.Logs;
+using SuperControls.Style;
 using SuperControls.Style.Windows;
 using System;
 using System.Text;
@@ -23,7 +24,7 @@ protected override void OnStartup(StartupEventArgs e)
             ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, "Jvedio", out createNew);
             if (!createNew)
             {
-                MessageBox.Show("Jvedio 运行中！");
+                new MsgBox(null, $"Jvedio {LangManager.GetValueByKey("Running")}").ShowDialog();
                 App.Current.Shutdown();
                 Environment.Exit(0);
             }

Jvedio-WPF/Jvedio/Core/Config/ConfigManager.cs

@@ -13,7 +13,7 @@ namespace Jvedio
 {
     public static class ConfigManager
     {
-        public const string ReleaseDate = "2022-01-04";
+        public const string ReleaseDate = "2022-01-08";
         public static StartUp StartUp = StartUp.createInstance();
         public static Core.WindowConfig.Main Main = Core.WindowConfig.Main.createInstance();
         public static Filter Filter = Core.WindowConfig.Filter.createInstance();

Jvedio-WPF/Jvedio/Core/Exceptions/DllLoadFailedException.cs

@@ -9,7 +9,8 @@ public DllLoadFailedException() : base(LangManager.GetValueByKey("DllLoadFailed"
         {
         }
 
-        public DllLoadFailedException(string path) : base($"{LangManager.GetValueByKey("DllLoadFailed")} => {path}")
+        public DllLoadFailedException(string path, string reason) :
+            base($"{LangManager.GetValueByKey("DllLoadFailed")} => {path}, reason: {reason}")
         {
         }
     }

Jvedio-WPF/Jvedio/Core/Plugins/Plugin.cs

@@ -1,4 +1,5 @@
 using Jvedio.Core.Exceptions;
+using SuperControls.Style;
 using SuperUtils.Reflections;
 using System;
 using System.Collections.Generic;
@@ -29,7 +30,8 @@ public Plugin(string dllPath, string methodName, object[] @params)
 
         public async Task<object> InvokeAsyncMethod()
         {
-            if (!File.Exists(DllPath)) throw new DllLoadFailedException(DllPath);
+            if (!File.Exists(DllPath))
+                throw new DllLoadFailedException(DllPath, LangManager.GetValueByKey("Message_FileNotExist"));
             Type classType = null;
             object instance = null;
             try
@@ -38,14 +40,16 @@ public async Task<object> InvokeAsyncMethod()
                 classType = getPublicType(dll.GetTypes());
                 instance = ReflectionHelper.TryCreateInstance(classType, new object[] { Params[1], Params[2] });
             }
-            catch (Exception)
+            catch (Exception ex)
             {
-                throw new DllLoadFailedException(DllPath);
+                throw new DllLoadFailedException(DllPath, ex.Message);
             }
 
-            if (classType == null || instance == null) throw new DllLoadFailedException(DllPath);
+            if (classType == null || instance == null)
+                throw new DllLoadFailedException(DllPath, "classType == null || instance == null");
             MethodInfo methodInfo = classType.GetMethod(MethodName);
-            if (methodInfo == null) throw new DllLoadFailedException(DllPath);
+            if (methodInfo == null)
+                throw new DllLoadFailedException(DllPath, "MethodInfo Null");
             try
             {
                 return await (Task<Dictionary<string, object>>)methodInfo.

Jvedio-WPF/Jvedio/Jvedio.csproj

@@ -760,9 +760,7 @@
     <Content Include="Reference\SuperControls.Style.dll" />
     <Content Include="Reference\SuperUtils.dll" />
     <Content Include="Reference\UsnOperation.dll" />
-    <Resource Include="Resources\Jvedio.ico">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Resource>
+    <Resource Include="Resources\Jvedio.ico" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Reference\MediaInfo.dll" />
@@ -802,8 +800,6 @@ XCOPY  "$(ProjectDir)Reference\CommonNet.dll"  "$(ProjectDir)bin\Debug\plugins\c
 
 XCOPY  "$(ProjectDir)Reference\HtmlAgilityPack.dll"  "$(ProjectDir)bin\Debug\plugins\crawlers"    /E /Y /i
 
-XCOPY  "$(ProjectDir)bin\Release"  "$(SolutionDir)Release\public\File"    /E /Y /i
-
 XCOPY  "$(ProjectDir)Data\config.ini"  "$(ProjectDir)bin\Release"   /Y /i
 
 mkdir "$(ProjectDir)bin\Release\plugins\crawlers"

Jvedio-WPF/Jvedio/Properties/AssemblyInfo.cs

@@ -48,5 +48,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 // 通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0.0")]
-[assembly: AssemblyFileVersion("5.0.0.0")]
+[assembly: AssemblyVersion("5.1.0.0")]
+[assembly: AssemblyFileVersion("5.1.0.0")]

Jvedio-WPF/Jvedio/Reference/SuperControls.Style.dll

@@ -105,6 +105,18 @@ public string LoadingText
                 RaisePropertyChanged();
             }
         }
+        private string _Version;
+
+        public string Version
+        {
+            get { return _Version; }
+
+            set
+            {
+                _Version = value;
+                RaisePropertyChanged();
+            }
+        }
         private bool _Restoring = false;
 
         public bool Restoring
@@ -123,6 +135,8 @@ public bool Restoring
         public VieModel_StartUp()
         {
             ReadFromDataBase();
+            string local = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+            Version = local.Substring(0, local.Length - ".0.0".Length);
         }
 
         public void ReadFromDataBase()

Jvedio-WPF/Jvedio/ViewModels/VieModel_StartUp.cs

@@ -369,10 +369,11 @@
                                 Margin="0,30,0,0"
                                 Source="/Resources/Picture/logo.png" />
                             <TextBlock
+                                Margin="10"
                                 HorizontalAlignment="Center"
                                 FontSize="15"
                                 Foreground="{DynamicResource Control.Disabled.Background}"
-                                Text="5.0.0.0" />
+                                Text="{Binding Version, FallbackValue=5.0}" />
                             <RadioButton
                                 Margin="0,20,0,0"
                                 HorizontalAlignment="Stretch"

Jvedio-WPF/Jvedio/WindowStartUp.xaml

@@ -4995,6 +4995,7 @@
                                                                 <TextBlock
                                                                     Margin="5"
                                                                     FontSize="10"
+                                                                    Foreground="{DynamicResource Window.Sub.Foreground}"
                                                                     Style="{StaticResource BaseTextBlock}"
                                                                     Text="{Binding CreateTime}"
                                                                     TextAlignment="Left" />
@@ -5016,7 +5017,14 @@
                                                             </Grid>
                                                             <StackPanel Margin="5" Orientation="Horizontal">
                                                                 <TextBlock Text="{Binding StatusText}" />
-                                                                <TextBlock Foreground="Red" Text="{Binding Message, StringFormat='   {0} '}" />
+                                                                <TextBlock
+                                                                    Width="250"
+                                                                    VerticalAlignment="Center"
+                                                                    Foreground="Red"
+                                                                    Text="{Binding Message, StringFormat='    {0} '}"
+                                                                    TextTrimming="WordEllipsis"
+                                                                    TextWrapping="NoWrap"
+                                                                    ToolTip="{Binding Message}" />
 
                                                             </StackPanel>