支持了在MSIX运行模式下也能调用explorer打开指定的目录

f-shake · f-shake · commit 96cc6dace836 · 2022-02-12T15:05:53.000+08:00
diff --git a/EGIS.Projections/EGIS.Projections.csproj b/EGIS.Projections/EGIS.Projections.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
diff --git a/EGIS.ShapeFileLib/EGIS.ShapeFileLib.csproj b/EGIS.ShapeFileLib/EGIS.ShapeFileLib.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
     <SignAssembly>true</SignAssembly>
     <DelaySign>false</DelaySign>
diff --git a/MapBoard.Package/MapBoard.Package.wapproj b/MapBoard.Package/MapBoard.Package.wapproj
@@ -67,34 +67,34 @@
     <AppxPackageDir>D:\临时\20181208-地图画板\Generation\Package\</AppxPackageDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Auto</AppxBundle>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
diff --git a/MapBoard.UI/MapBoard.UI.csproj b/MapBoard.UI/MapBoard.UI.csproj
@@ -94,6 +94,7 @@
     <PackageReference Include="CsvHelper">
       <Version>27.2.1</Version>
     </PackageReference>
+    <PackageReference Include="DesktopBridge.Helpers" Version="1.2.2" />
     <PackageReference Include="Esri.ArcGISRuntime.WPF" Version="100.13.0" />
     <PackageReference Include="gong-wpf-dragdrop" Version="3.0.0" />
     <PackageReference Include="log4net" Version="2.0.14" />
diff --git a/MapBoard.UI/UI/GpxToolbox/GpxBrowseWindow.xaml.cs b/MapBoard.UI/UI/GpxToolbox/GpxBrowseWindow.xaml.cs
@@ -211,7 +211,7 @@ private async Task StopRecordAsync()
             ResizeMode = ResizeMode.CanResize;
             if (await CommonDialog.ShowYesNoDialogAsync("是否打开目录？") == true)
             {
-                Process.Start("explorer.exe", GetRecordPath());
+                IOUtility.OpenFolder(GetRecordPath());
             }
         }
 
diff --git a/MapBoard.UI/UI/IOUtility.cs b/MapBoard.UI/UI/IOUtility.cs
@@ -406,7 +406,7 @@ public static void OpenFileOrFolder(string path)
         {
             new Process()
             {
-                StartInfo = new ProcessStartInfo(Path.GetFullPath(path))
+                StartInfo = new ProcessStartInfo(GetRealPath(path))
                 {
                     UseShellExecute = true
                 }
@@ -415,7 +415,7 @@ public static void OpenFileOrFolder(string path)
 
         public static void OpenFolder(string path)
         {
-            var p = '"' + Path.GetFullPath(path) + '"';
+            var p = '"' + GetRealPath(path) + '"';
             if (Directory.Exists(path))
             {
                 new Process()
@@ -437,6 +437,27 @@ public static void OpenFolder(string path)
                 }.Start();
             }
         }
+
+        /// <summary>
+        /// 在MSIX下运行时，程序数据目录的位置被重定向。在程序内访问时不需要修改，但通过外部程序调用时，需要获取真实的路径。
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static string GetRealPath(string path)
+        {
+            path = Path.GetFullPath(path);
+            var helper = new DesktopBridge.Helpers();
+            if (helper.IsRunningAsUwp())
+            {
+                string virtualAppData = Windows.Storage.ApplicationData.Current.LocalCacheFolder.Path;
+                string local = new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)).Parent.FullName;
+                if (path.Contains(local))
+                {
+                    path = path.Replace(local, virtualAppData);
+                }
+            }
+            return path;
+        }
     }
 
     public enum ImportMapType
diff --git a/MapBoard.UI/UI/MainWindow.xaml.cs b/MapBoard.UI/UI/MainWindow.xaml.cs
@@ -605,7 +605,7 @@ private void ImportButton_Click(SplitButton sender, SplitButtonClickEventArgs ar
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private async void OpenFolderButtonClick(object sender, RoutedEventArgs e)
+        private void OpenFolderButtonClick(object sender, RoutedEventArgs e)
         {
             string path = ((sender as FrameworkElement).Tag as string) switch
             {
@@ -615,14 +615,7 @@ private async void OpenFolderButtonClick(object sender, RoutedEventArgs e)
                 "4" => Parameters.BackupPath,
                 _ => throw new ArgumentOutOfRangeException()
             };
-            if (Directory.Exists(path))
-            {
-                IOUtility.OpenFileOrFolder(path);
-            }
-            else
-            {
-                await CommonDialog.ShowErrorDialogAsync("目录不存在");
-            }
+            IOUtility.OpenFileOrFolder(path);
         }
 
         private void OpenFolderButtonClick(SplitButton sender, SplitButtonClickEventArgs args)
diff --git a/MapBoard.UI/UI/TileDownloader/TileDownloaderWindow.xaml.cs b/MapBoard.UI/UI/TileDownloader/TileDownloaderWindow.xaml.cs
@@ -595,7 +595,7 @@ private async void OpenFolderButtonClick(object sender, RoutedEventArgs e)
                 {
                     Directory.CreateDirectory(Config.Tile_DownloadFolder);
                 }
-                Process.Start("explorer.exe", Config.Tile_DownloadFolder);
+                IOUtility.OpenFolder(Config.Tile_DownloadFolder);
             }
             catch (Exception ex)
             {

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ private async Task StopRecordAsync()`
`211`	`211`	`ResizeMode = ResizeMode.CanResize;`
`212`	`212`	`if (await CommonDialog.ShowYesNoDialogAsync("是否打开目录？") == true)`
`213`	`213`	`{`
`214`		`- Process.Start("explorer.exe", GetRecordPath());`
	`214`	`+ IOUtility.OpenFolder(GetRecordPath());`
`215`	`215`	`}`
`216`	`216`	`}`
`217`	`217`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ public static void OpenFileOrFolder(string path)`
`406`	`406`	`{`
`407`	`407`	`new Process()`
`408`	`408`	`{`
`409`		`- StartInfo = new ProcessStartInfo(Path.GetFullPath(path))`
	`409`	`+ StartInfo = new ProcessStartInfo(GetRealPath(path))`
`410`	`410`	`{`
`411`	`411`	`UseShellExecute = true`
`412`	`412`	`}`
`@@ -415,7 +415,7 @@ public static void OpenFileOrFolder(string path)`
`415`	`415`
`416`	`416`	`public static void OpenFolder(string path)`
`417`	`417`	`{`
`418`		`- var p = '"' + Path.GetFullPath(path) + '"';`
	`418`	`+ var p = '"' + GetRealPath(path) + '"';`
`419`	`419`	`if (Directory.Exists(path))`
`420`	`420`	`{`
`421`	`421`	`new Process()`
`@@ -437,6 +437,27 @@ public static void OpenFolder(string path)`
`437`	`437`	`}.Start();`
`438`	`438`	`}`
`439`	`439`	`}`
	`440`	`+`
	`441`	`+ /// <summary>`
	`442`	`+ /// 在MSIX下运行时，程序数据目录的位置被重定向。在程序内访问时不需要修改，但通过外部程序调用时，需要获取真实的路径。`
	`443`	`+ /// </summary>`
	`444`	`+ /// <param name="path"></param>`
	`445`	`+ /// <returns></returns>`
	`446`	`+ public static string GetRealPath(string path)`
	`447`	`+ {`
	`448`	`+ path = Path.GetFullPath(path);`
	`449`	`+ var helper = new DesktopBridge.Helpers();`
	`450`	`+ if (helper.IsRunningAsUwp())`
	`451`	`+ {`
	`452`	`+ string virtualAppData = Windows.Storage.ApplicationData.Current.LocalCacheFolder.Path;`
	`453`	`+ string local = new DirectoryInfo(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)).Parent.FullName;`
	`454`	`+ if (path.Contains(local))`
	`455`	`+ {`
	`456`	`+ path = path.Replace(local, virtualAppData);`
	`457`	`+ }`
	`458`	`+ }`
	`459`	`+ return path;`
	`460`	`+ }`
`440`	`461`	`}`
`441`	`462`
`442`	`463`	`public enum ImportMapType`
Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@ private async void OpenFolderButtonClick(object sender, RoutedEventArgs e)`
`595`	`595`	`{`
`596`	`596`	`Directory.CreateDirectory(Config.Tile_DownloadFolder);`
`597`	`597`	`}`
`598`		`- Process.Start("explorer.exe", Config.Tile_DownloadFolder);`
	`598`	`+ IOUtility.OpenFolder(Config.Tile_DownloadFolder);`
`599`	`599`	`}`
`600`	`600`	`catch (Exception ex)`
`601`	`601`	`{`