Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

PDF Office/App.xaml.cs

@@ -61,6 +61,10 @@ using PDF_Office.Views.Dialog.ServiceDialog;
 using System.Diagnostics;
 using System.Resources;
 using System.Reflection;
+using Microsoft.AppCenter;
+using System.Globalization;
+using Microsoft.AppCenter.Analytics;
+using Microsoft.AppCenter.Crashes;
 
 namespace PDF_Office
 {
@@ -138,8 +142,8 @@ namespace PDF_Office
         public App()
         {
 #if !DEBUG
-        //接入Appcenter后台数据检测
-        string appkey = "b099dccc-1ca5-4ea1-a2fa-afd4a6e1f8bb"
+            //接入Appcenter后台数据检测 PDF Reader Pro Test
+            string appkey = "395433ac-97b6-4e28-803e-3d377bdef875";
         AppCenter.Start(appkey, typeof(Analytics), typeof(Crashes));
         var countryCode = RegionInfo.CurrentRegion.TwoLetterISORegionName;//上传国家信息
         AppCenter.SetCountryCode(countryCode);

PDF Office/CustomControl/AlertsMessage.xaml

@@ -69,31 +69,31 @@
                     Grid.Column="2"
                     Height="28"
                     Margin="0,0,0,0"
-                    BorderThickness="0"
                     Click="CancelBtn_Click"
                     Content="Cancel"
                     FontSize="14"
-                    FontWeight="SemiBold" />
+                    FontWeight="SemiBold"
+                    Style="{StaticResource btn.sec}" />
                 <Button
                     x:Name="MiddleCancelBtn"
                     Grid.Column="1"
                     Height="28"
                     Margin="8,0,8,0"
-                    BorderThickness="0"
                     Click="MiddleCancelBtn_Click"
                     Content="Do not Save"
                     FontSize="14"
-                    FontWeight="SemiBold" />
+                    FontWeight="SemiBold"
+                    Style="{StaticResource btn.sec}" />
                 <Button
                     x:Name="OkBtn"
                     Grid.Column="0"
                     Height="28"
                     Margin="8,0,0,0"
-                    BorderThickness="0"
                     Click="OkBtn_Click"
                     Content="Save"
                     FontSize="14"
-                    FontWeight="SemiBold" />
+                    FontWeight="SemiBold"
+                    Style="{StaticResource Btn.cta}" />
             </Grid>
         </Grid>
     </Border>

PDF Office/Helper/PDFToolsHelper.cs

@@ -175,22 +175,22 @@ namespace PDF_Office.Helper
             var imageToPDF = new PDFToolsInit();
             imageToPDF.SetFnType(PDFFnType.ImageToPDF);
             imageToPDF.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/image.png");
-            imageToPDF.SetContent("图片转PDF", "Batch convert, compress, secure, watermark PDFs.");
+            imageToPDF.SetContent("Image To PDF", "Batch convert, compress, secure, watermark PDFs.");
             //合并
             var merge = new PDFToolsInit();
             merge.SetFnType(PDFFnType.Merge);
             merge.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/merge.png");
-            merge.SetContent("合并", "Batch convert, compress, secure, watermark PDFs.");
+            merge.SetContent("Merge", "Batch convert, compress, secure, watermark PDFs.");
             //压缩
             var compress = new PDFToolsInit();
             compress.SetFnType(PDFFnType.Compress);
             compress.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/compress.png");
-            compress.SetContent("压缩", "Batch convert, compress, secure, watermark PDFs.");
+            compress.SetContent("Compress", "Batch convert, compress, secure, watermark PDFs.");
             //安全
             var security = new PDFToolsInit();
             security.SetFnType(PDFFnType.Security);
             security.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/security.png");
-            security.SetContent("安全", "Batch convert, compress, secure, watermark PDFs.");
+            security.SetContent("Security", "Batch convert, compress, secure, watermark PDFs.");
             //文件对比
             var compareDoc = new PDFToolsInit();
             compareDoc.SetFnType(PDFFnType.CompareDoc);
@@ -200,22 +200,22 @@ namespace PDF_Office.Helper
             var pDFToPPT = new PDFToolsInit();
             pDFToPPT.SetFnType(PDFFnType.PDFToPPT);
             pDFToPPT.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/pdf-to-ppt.png");
-            pDFToPPT.SetContent("PDF转PPT", "Batch convert, compress, secure, watermark PDFs.");
+            pDFToPPT.SetContent("To PPt", "Batch convert, compress, secure, watermark PDFs.");
             //PDF转Excel
             var pDFToExcel = new PDFToolsInit();
             pDFToExcel.SetFnType(PDFFnType.PDFToExcel);
             pDFToExcel.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/pdf-to-excel.png");
-            pDFToExcel.SetContent("PDF转Excel", "Batch convert, compress, secure, watermark PDFs.");
+            pDFToExcel.SetContent("To Excel", "Batch convert, compress, secure, watermark PDFs.");
             //PDF转Word
             var pDFToWord = new PDFToolsInit();
             pDFToWord.SetFnType(PDFFnType.PDFToWord);
             pDFToWord.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/pdf-to-word.png");
-            pDFToWord.SetContent("PDF转Word", "Batch convert, compress, secure, watermark PDFs.");
+            pDFToWord.SetContent("To Word", "Batch convert, compress, secure, watermark PDFs.");
             //PDF转图片
             var pDFToImage = new PDFToolsInit();
             pDFToImage.SetFnType(PDFFnType.PDFToImage);
             pDFToImage.SetImagePath(@"pack://application:,,,/Resources/HomeIcon/PDFTools/pdf-to-image.png");
-            pDFToImage.SetContent("PDF转图片", "Batch convert, compress, secure, watermark PDFs.");
+            pDFToImage.SetContent("To Image", "Batch convert, compress, secure, watermark PDFs.");
             //水印
             var waterMark = new PDFToolsInit();
             waterMark.SetFnType(PDFFnType.WaterMark);

PDF Office/Helper/ServiceHelper.cs

@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using System.Management;
 using System.Net;
+using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -138,6 +139,84 @@ namespace PDF_Office.Helper
             catch { return ""; }
         }
 
+        /// <summary>
+        /// 操作系统生成的UUID，用于获取虚拟机用户的设备识别码
+        /// </summary>
+        /// <returns></returns>
+        public static string GetUUID()
+        {
+            string systemId = null;
+            using (ManagementObjectSearcher mos = new ManagementObjectSearcher("select * from Win32_ComputerSystemProduct"))
+            {
+                foreach (var item in mos.Get())
+                {
+                    systemId = item["UUID"].ToString();
+                }
+            }
+            return systemId;
+
+        }
+
+        /// <summary>
+        /// 主板编号
+        /// </summary>
+        /// <returns></returns>
+        public static string GetBoardId()
+        {
+            var st = string.Empty;
+            var mos = new ManagementObjectSearcher("Select * from Win32_BaseBoard");
+            foreach (var o in mos.Get())
+            {
+                var mo = (ManagementObject)o;
+                st = mo["SerialNumber"].ToString();
+            }
+            return st;
+        }
+
+        /// <summary>
+        /// 获取设备唯一ID
+        /// </summary>
+        /// <returns></returns>
+        public static string GetDeviceSerialNumber()
+        {
+            StringBuilder DeviceBuilder = new StringBuilder();
+            bool IsVirtual = false;
+            string boardId = GetBoardId();
+            string uuid = GetUUID();
+
+            //判断是否是虚拟机用户
+            if (boardId.ToLower() == "" || boardId.ToLower() == "none")
+            {
+                if (string.IsNullOrEmpty(uuid) || uuid.ToLower() == "none")
+                    return string.Empty;
+                else
+                    IsVirtual = true;
+            }
+            //真实机器用户 用主板id作为唯一识别码
+            if (!IsVirtual)
+            {
+                DeviceBuilder.Append(boardId);
+            }
+            else
+            {
+                DeviceBuilder.Append(uuid);
+            }
+
+            MD5 md5 = MD5.Create();
+            List<byte> charbytes = new List<byte>();
+            foreach (char code in DeviceBuilder.ToString().ToArray())
+            {
+                charbytes.Add((byte)code);
+            }
+            byte[] md5Array = md5.ComputeHash(charbytes.ToArray());
+            DeviceBuilder = new StringBuilder();
+            foreach (var code in md5Array)
+            {
+                DeviceBuilder.Append(code.ToString("X2"));
+            }
+            return DeviceBuilder.ToString();
+        }
+
 
         //超时同步为20秒
         public static String GetUser()

PDF Office/Model/SettingsDialog/AnnotateModel.cs

@@ -177,7 +177,7 @@ namespace PDF_Office.Model.SettingsDialog
 
         private void InitFromSettings()
         {
-            var annote = Settings.Default.AppProperties.Annotate;
+            var annote = new AnnotatePropertyClass();
             this.HighLightColor = annote.HighLightColor;
             this.UnderLineColor = annote.UnderLineColor;
             this.StrikethroughColor = annote.StrikethroughColor;

PDF Office/Model/SettingsDialog/DescriptionModel.cs

@@ -159,7 +159,8 @@ namespace PDF_Office.Model.SettingsDialog
         /// </summary>
         private void InitFromSettings()
         {
-            var description = Settings.Default.AppProperties.Description;
+            //var description = Settings.Default.AppProperties.Description;
+            var description = new DescriptionPropertyClass();
             this.OpenUnClosedFileWhenOpen = description.OpenUnClosedFileWhenOpen;
             this.RecoveryViewWhenOpen = description.RecoveryViewWhenOpen;
             this.FileCountInRecentFiles = description.FileCountInRecentFiles;

PDF Office/Model/SettingsDialog/InitialVIewModel.cs

@@ -175,7 +175,7 @@ namespace PDF_Office.Model.SettingsDialog
 
         private void InitFromSettings()
         {
-            var view = Settings.Default.AppProperties.InitialVIew;
+            var view = new InitialVIewPropertyClass();
             this.PageView = view.PageView;
             this.ZoomMode = view.ZoomMode;
             this.NotShowBOTA = view.NotShowBOTA;

PDF Office/PDF Office.csproj

@@ -64,6 +64,44 @@
     <TranslationReport Condition="'$(Configuration)' == 'Release'">true</TranslationReport>
     <SuppressPseudoWarning Condition="'$(Configuration)' == 'Debug'">true</SuppressPseudoWarning>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>embedded</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>embedded</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ComDocumentAIKit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -2207,33 +2245,6 @@
     <Content Include="source\AnalysisWord\Res\word\_rels\document.xml.rels">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="x64\models\DA_image_enhance_magic_color_1.0.0.model">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\models\DA_Ocr_Classification_1.0.0.model">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\models\DA_Ocr_Detection_chinese_1.0.0.model">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\models\DA_Ocr_Detection_english_1.0.0.model">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\models\DA_Ocr_Recognition_chinese_1.0.0.model">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\models\DA_Ocr_Recognition_chinese_cht_1.0.0.model">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\models\DA_Ocr_Recognition_english_1.0.0.model">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\models\DA_Ocr_Recognition_japan_1.0.0.model">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\models\DA_Ocr_Recognition_korean_1.0.0.model">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Resource Include="Resources\BOTA\Annotation\Arrow.png" />
     <Resource Include="Resources\BOTA\Annotation\Bookmark.png" />
     <Resource Include="Resources\BOTA\Annotation\Circle.png" />

PDF Office/PDF Office.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.1.32328.378
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.32901.82
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PDF Office", "PDF Office.csproj", "{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -13,17 +13,37 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Debug|x64.ActiveCfg = Debug|x64
+		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Debug|x64.Build.0 = Debug|x64
+		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Debug|x86.ActiveCfg = Debug|x86
+		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Debug|x86.Build.0 = Debug|x86
 		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Release|x64.ActiveCfg = Release|x64
+		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Release|x64.Build.0 = Release|x64
+		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Release|x86.ActiveCfg = Release|x86
+		{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}.Release|x86.Build.0 = Release|x86
 		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Debug|x64.ActiveCfg = Debug|x64
+		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Debug|x64.Build.0 = Debug|x64
+		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Debug|x86.ActiveCfg = Debug|x86
+		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Debug|x86.Build.0 = Debug|x86
 		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Release|x64.ActiveCfg = Release|x64
+		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Release|x64.Build.0 = Release|x64
+		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Release|x86.ActiveCfg = Release|x86
+		{BEE73AAE-9A2C-446B-B64D-3A8F042C985D}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

PDF Office/ViewModels/BOTA/BOTAContentViewModel.cs

@@ -112,9 +112,12 @@ namespace PDF_Office.ViewModels.BOTA
             regions.RequestNavigate(BOTAContentRegionName, viewNameByTabItem[currentBar], param);
 
             var info =  SettingHelper.GetFileInfo(pdfViewer.Document.FilePath);
-            info.BOTASelectedTab = currentBar;
-            info.BOTASelectedInex = SelectedIndex;
-            SettingHelper.SetFileInfo(info);
+            if (info != null)
+            {
+                info.BOTASelectedTab = currentBar;
+                info.BOTASelectedInex = SelectedIndex;
+                SettingHelper.SetFileInfo(info);
+            }
         }
 
         #region Navigate

PDF Office/ViewModels/HomePanel/PDFTools/QuickToolsContentViewModel.cs

@@ -444,11 +444,11 @@ namespace PDF_Office.ViewModels.HomePanel.PDFTools
                   var item = menu.Items[0] as MenuItem;
                     if(_isExpendTools)
                     {
-                        item.Header = "收缩";
+                        item.Header = "Collapse";
                     }
                     else
                     {
-                        item.Header = "展开";
+                        item.Header = "Expand";
                     }
 
                     item.Command = ExpendCommand;

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -234,7 +234,11 @@ namespace PDF_Office.ViewModels
             OpenRegisterCommand = new DelegateCommand(OpenRegister);
             OpenLoginCommand = new DelegateCommand(OpenLogin);
             OpenUserCommand = new DelegateCommand(OpenUser);
-            CloseAllTabCommand = new DelegateCommand(() => { closeAllTabItem(); });
+            CloseAllTabCommand = new DelegateCommand(() => { if (closeAllTabItem())
+                {
+                    App.Current.MainWindow.Close();
+                }
+            });
 
             //第一次打开时需要自动加载Home页
             if (App.IsFirstOpen)

PDFSettings/PDFSettings.csproj

@@ -31,6 +31,42 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>7.3</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ComPDFKit.Desk, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>