Update to Ver.5.0.0

zhuxb711 · Jul 1, 2020 · 2d20c98 · 2d20c98
1 parent 9665177
commit 2d20c98
Show file tree

Hide file tree

Showing 35 changed files with 705 additions and 496 deletions.
diff --git a/FullTrustProcess/StorageItemController.cs b/FullTrustProcess/StorageItemController.cs
@@ -14,6 +14,7 @@ public static class StorageItemController
         private static extern IntPtr _lopen(string lpPathName, int iReadWrite);
         [DllImport("kernel32.dll")]
         private static extern bool CloseHandle(IntPtr hObject);
+
         private const int OF_READWRITE = 2;
         private const int OF_SHARE_DENY_NONE = 0x40;
         private static readonly IntPtr HFILE_ERROR = new IntPtr(-1);

diff --git a/Package/Package.appxmanifest b/Package/Package.appxmanifest
@@ -12,7 +12,7 @@
   <Identity
     Name="36186RuoFan.USB"
     Publisher="CN=4FF1CB23-04BD-4F9C-A86A-B4A43196FE02"
-    Version="4.9.5.0" />
+    Version="5.0.0.0" />
 
   <Properties>
     <DisplayName>ms-resource:App_Display_Name</DisplayName>

diff --git a/RX_Explorer/Assets/UpdateLog-Chinese.txt b/RX_Explorer/Assets/UpdateLog-Chinese.txt
@@ -1,5 +1,5 @@
 *****
-###版本4.9.5.0更新
+###版本5.0.0.0更新
 
 >#####功能更新
 
@@ -9,6 +9,8 @@
 
 >>#####新增一张新的自带背景
 
+>>#####新增文件监控模块，现在可以检测文件改动
+
 >#####性能优化
 
 >>#####加快了哈希校验值计算的中止速度，现在可以更好的在计算完成前中止计算
@@ -19,6 +21,8 @@
 
 >>#####加快了图片滤镜处理速度
 
+>>#####提高了批量操作文件的速度
+
 >#####Bug修复
 
 >>#####解决了一些可能导致“回收站”崩溃的问题
@@ -33,6 +37,10 @@
 
 >>#####解决了查找系统默认打开方式失效的问题
 
+>>#####解决了转码模块失效的问题
+
+>>#####解决了当回收站已清空时仍然允许点击“清空”按钮的问题
+
 *****
 ###版本4.9.0.0更新
 

diff --git a/RX_Explorer/Assets/UpdateLog-English.txt b/RX_Explorer/Assets/UpdateLog-English.txt
@@ -1,5 +1,5 @@
 *****
-###What's new in Ver.4.9.5.0
+###What's new in Ver.5.0.0.0
 
 >#####Feature update
 
@@ -9,6 +9,8 @@
 
 >>#####Add a new own background
 
+>>#####New file monitoring module, can now detect file changes
+
 >#####Performance optimization
 
 >>#####Accelerate the suspension of the calculation of the hash check value, now it is better to suspend the calculation before the calculation is completed
@@ -19,6 +21,8 @@
 
 >>#####Speed up the processing of image filters
 
+>>#####Improved the speed of batch operation files
+
 >#####Bug fix
 
 >>#####Fixed some issues that may cause the "Recycle Bin" to crash
@@ -33,6 +37,10 @@
 
 >>#####Fixed an issue that the search system default opening method is invalid
 
+>>#####Fixed an issue that transcoding module failure
+
+>>#####Fixed an issue where the "Empty" button is still allowed to be clicked when the recycle bin has been emptied
+
 *****
 ###What's new in Ver.4.9.0.0
 

diff --git a/RX_Explorer/Assets/UpdateLog-French.txt b/RX_Explorer/Assets/UpdateLog-French.txt
@@ -1,5 +1,5 @@
 *****
-###Quoi de neuf dans la version 4.9.5.0
+###Quoi de neuf dans la version 5.0.0.0
 
 >#####Mise à jour des fonctionnalités
 
@@ -9,6 +9,8 @@
 
 >>#####Ajouter un nouveau fond
 
+>>#####Nouveau module de surveillance de fichiers, peut désormais détecter les modifications de fichiers
+
 >#####Optimisation des performances
 
 >>#####Accélérez la suspension du calcul de la valeur de contrôle de hachage, maintenant il est préférable de suspendre le calcul avant la fin du calcul
@@ -19,6 +21,8 @@
 
 >>#####Accélérez le traitement des filtres d'image
 
+>>#####Amélioration de la vitesse des fichiers d'opérations par lots
+
 >#####Correction d'un bug
 
 >>#####Correction de certains problèmes pouvant entraîner le blocage de la "Corbeille"
@@ -33,6 +37,10 @@
 
 >>#####Correction d'un problème selon lequel la méthode d'ouverture par défaut du système de recherche n'était pas valide
 
+>>#####Correction d'un problème qui provoquait une défaillance du module de transcodage
+
+>>#####Correction d'un problème où le bouton "Vide" est toujours autorisé à être cliqué lorsque la corbeille a été vidée
+
 *****
 ###Quoi de neuf dans la version 4.9.0.0
 

diff --git a/RX_Explorer/Class/FileSystemStorageItem.cs b/RX_Explorer/Class/FileSystemStorageItem.cs
@@ -180,19 +180,41 @@ public async Task Replace(string NewPath)
                 ModifiedTimeRaw = await File.GetModifiedTimeAsync().ConfigureAwait(true);
                 Thumbnail = await File.GetThumbnailBitmapAsync().ConfigureAwait(true) ?? new BitmapImage(new Uri("ms-appx:///Assets/DocIcon.png"));
             }
-            catch (FileNotFoundException)
+            catch
             {
-                StorageFolder Folder = await StorageFolder.GetFolderFromPathAsync(NewPath);
-                StorageItem = Folder;
-                StorageType = StorageItemTypes.Folder;
+                try
+                {
+                    StorageFolder Folder = await StorageFolder.GetFolderFromPathAsync(NewPath);
+                    StorageItem = Folder;
+                    StorageType = StorageItemTypes.Folder;
 
-                Thumbnail = new BitmapImage(new Uri("ms-appx:///Assets/FolderIcon.png"));
-                ModifiedTimeRaw = await Folder.GetModifiedTimeAsync().ConfigureAwait(true);
+                    Thumbnail = new BitmapImage(new Uri("ms-appx:///Assets/FolderIcon.png"));
+                    ModifiedTimeRaw = await Folder.GetModifiedTimeAsync().ConfigureAwait(true);
+                }
+                catch
+                {
+                    return;
+                }
+            }
+
+            await Update(false).ConfigureAwait(false);
+        }
+
+        public async Task Update(bool ReGenerateThumbnailAndSizeAndModifiedTime)
+        {
+            if (ReGenerateThumbnailAndSizeAndModifiedTime)
+            {
+                _ = await GetStorageItem().ConfigureAwait(true);
+                Thumbnail = await StorageItem.GetThumbnailBitmapAsync().ConfigureAwait(true);
+                ModifiedTimeRaw = await StorageItem.GetModifiedTimeAsync().ConfigureAwait(true);
+                SizeRaw = await StorageItem.GetSizeRawDataAsync().ConfigureAwait(true);
             }
 
-            OnPropertyChanged(nameof(this.Name));
+            OnPropertyChanged(nameof(Thumbnail));
+            OnPropertyChanged(nameof(Name));
             OnPropertyChanged(nameof(ModifiedTime));
             OnPropertyChanged(nameof(DisplayType));
+            OnPropertyChanged(nameof(Size));
         }
 
         /// <summary>

diff --git a/RX_Explorer/Class/FullTrustExcutorController.cs b/RX_Explorer/Class/FullTrustExcutorController.cs
@@ -474,6 +474,11 @@ public Task DeleteAsync(string Source, bool PermanentDelete)
 
         public async Task MoveAsync(IEnumerable<string> Source, string DestinationPath)
         {
+            if (Source == null)
+            {
+                throw new ArgumentNullException(nameof(Source), "Parameter could not be null");
+            }
+
             if (await TryConnectToFullTrustExutor().ConfigureAwait(true))
             {
                 List<KeyValuePair<string, string>> MessageList = new List<KeyValuePair<string, string>>();
@@ -495,10 +500,10 @@ public async Task MoveAsync(IEnumerable<string> Source, string DestinationPath)
                             {
                                 QueueContentDialog Dialog = new QueueContentDialog
                                 {
-                                    Title = "警告",
-                                    Content = $"目标文件夹已存在相同名称的文件夹: {ExistFolder.Name}",
-                                    PrimaryButtonText = "合并文件夹",
-                                    CloseButtonText = "保留副本"
+                                    Title = Globalization.GetString("Common_Dialog_WarningTitle"),
+                                    Content = $"{Globalization.GetString("QueueDialog_FolderRepeat_Content")} {ExistFolder.Name}",
+                                    PrimaryButtonText = Globalization.GetString("QueueDialog_FolderRepeat_PrimaryButton"),
+                                    CloseButtonText = Globalization.GetString("QueueDialog_FolderRepeat_CloseButton")
                                 };
 
                                 if (await Dialog.ShowAsync().ConfigureAwait(false) != ContentDialogResult.Primary)
@@ -598,6 +603,11 @@ public Task MoveAsync(IStorageItem Source, StorageFolder Destination)
 
         public async Task CopyAsync(IEnumerable<string> Source, string DestinationPath)
         {
+            if (Source == null)
+            {
+                throw new ArgumentNullException(nameof(Source), "Parameter could not be null");
+            }
+
             if (await TryConnectToFullTrustExutor().ConfigureAwait(true))
             {
                 List<KeyValuePair<string, string>> MessageList = new List<KeyValuePair<string, string>>();
@@ -619,10 +629,10 @@ public async Task CopyAsync(IEnumerable<string> Source, string DestinationPath)
                             {
                                 QueueContentDialog Dialog = new QueueContentDialog
                                 {
-                                    Title = "警告",
-                                    Content = $"目标文件夹已存在相同名称的文件夹: {ExistFolder.Name}",
-                                    PrimaryButtonText = "合并文件夹",
-                                    CloseButtonText = "保留副本"
+                                    Title = Globalization.GetString("Common_Dialog_WarningTitle"),
+                                    Content = $"{Globalization.GetString("QueueDialog_FolderRepeat_Content")} {ExistFolder.Name}",
+                                    PrimaryButtonText = Globalization.GetString("QueueDialog_FolderRepeat_PrimaryButton"),
+                                    CloseButtonText = Globalization.GetString("QueueDialog_FolderRepeat_CloseButton")
                                 };
 
                                 if (await Dialog.ShowAsync().ConfigureAwait(false) != ContentDialogResult.Primary)

diff --git a/RX_Explorer/Class/GeneralTransformer.cs b/RX_Explorer/Class/GeneralTransformer.cs
@@ -442,7 +442,7 @@ private static void SendUpdatableToastWithProgressForCropVideo(StorageFile Sourc
                         {
                             new AdaptiveText()
                             {
-                                Text = Globalization.GetString("Crop_Toast_Title")
+                                Text = $"{Globalization.GetString("Crop_Toast_Title")} {SourceFile.Name}"
                             },
 
                             new AdaptiveProgressBar()
@@ -552,7 +552,7 @@ private static void SendUpdatableToastWithProgressForTranscode(StorageFile Sourc
                         {
                             new AdaptiveText()
                             {
-                                Text = Globalization.GetString("Transcode_Toast_Title")
+                                Text = $"{Globalization.GetString("Transcode_Toast_Title")} {SourceFile.Name}"
                             },
 
                             new AdaptiveProgressBar()