liyijie 2 years ago
parent
commit
69c25f85f2

+ 3 - 3
PDF Office/SDKLisence.xml

@@ -1,7 +1,7 @@
 <Lisences
-	devKey = "BK8BcXWm+YbGRpEONe43pEJXhshAiAwWoBQgwlEUnxFBkCVal4AYW01RnbuwHCdkktvy9sAYs/SUflLR+KOMayg6z2TE2G3OhIXf95sN8k1sk947zrPGeHPtHx7gMaurYrscLDAumvtymhg4rMTg7XFKfBtchlAi0bE+wPTsqa8="
-  devSecret = "mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4iYSXB8erGstkUyaynN7k8ocNCYAAzc9CPxiym2TlqeSUWpLOaOv47bs7x+UqfQzn9hrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBwyVLBY93oKLBB8UJg4t07605BGbaBKUlDopA0iGq1HSnRAJhqHxGgIZ+m3BxAFwgabp2OdkT7I9klGmA/4KertEmsKlSJ3WFqmDWhwfT73yCYDNQpuarUAQxiS1PJu8kUw=="
-  userKey = "iBPRM/Tz8b6Z1G2GQt52X7hiNCGfVYXztnPjalgrgARvqfKV6lFNH8QeScTzBRYI8GGFpwelfgh790Kd9JmL7V4adI1jCiFHUT2DLT7QucxY5Nkgys2aJItQS482Ck2G2Xf8gNgojxYxRt65o/MEzkj93foj8qIdfHagXsSorSs="
+	devKey = "sTHSivIW4YnZQavIYDLVw4vaFcN5DQTUtRGrVyv5p9aeaHX3GirG/MBxl6Wy9TJbNOwR4CU6LPjHmGe3Po3OtBCPqIRheam9+LomScw3AvoUTHFlG1134e2J4enF43WJQ6PyOnjwZqsG1kUdlBPNztkoPzDAE2pQKgZWf6V2i34="
+    devSecret = "mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4gQurxTxGuBlGAhs0P1mD3X3bHT+AHfcLiymaqE4DY7kTFHoPs9I3tl5ErS+BHdzHRhrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBw1367/WkJ00tM7U7tttD6cfaiHpW8pgW2aur3AxuQIBBLuJD5gcmNxTYW3KA32JLG8alfyXjKFVS3gka9bngvwfZ7GuNXybjKlmz1tnN6iVHpnbSj+xOHhWEperY4HHrSg=="
+	userKey = "iBPRM/Tz8b6Z1G2GQt52X7hiNCGfVYXztnPjalgrgARvqfKV6lFNH8QeScTzBRYI8GGFpwelfgh790Kd9JmL7V4adI1jCiFHUT2DLT7QucxY5Nkgys2aJItQS482Ck2G2Xf8gNgojxYxRt65o/MEzkj93foj8qIdfHagXsSorSs="
 	userSecret="mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4ivEHOmPIqbfhpDnKKj+7Ymj2rXQvfZRmke06HMV+3tt064G64WjPW8+EbGCNZaAh1hrp9sGpqfp0B228KI+IMTu4aGVjtYuk+Uxs/kosIBw1FKJi6HYB+DuugQyaqI2prfej861QnJrU4s2T/npZK/"
 	ConverterDevKey="ErjZKxcU3SPvUohGZo0CBgy0XdkAsZqUYqCTbfn1AYsCQ6mxCucx61UPqLT7MDQ0n+5/oKnWY9SSk8Xv5pJtYYHD87HRdYNG+QNCaoPGHulyfVxGllmzU71U7WjflfZBFvhg/UQOFiz3OsAVKz4k2YkXPzQgNaS3glym42PVpj4="
 	ConverterDevSecret="mG0c3O3Mzeu5dkZJW3gpqq9uA7o7EGQveSC38Q8TK4iYfqdItiFUaR9LVjsPTUXicGXjRTJz0NHg67bO82qMNdkuY0NReKpg+S1SkS2QdEScM/fgvvcctF5rcqYAH1dpMv7C2jvq4o0q6sQtN3jR47j9bjclgv4TJTahQMmvDDLtOGD99YkYWB6rt/zU8htEYkwcNWVMyYvggPV2rTFvfawopGIC034QzjthmhwwX90="

+ 17 - 0
PDF Office/ViewModels/Dialog/ToolsDialogs/CompressDialogs/CompressDialogViewModel.cs

@@ -12,6 +12,9 @@ using DialogResult = Prism.Services.Dialogs.DialogResult;
 using MessageBox = System.Windows.Forms.MessageBox;
 using PDF_Office.Helper;
 using ComPDFKitViewer.PdfViewer;
+using PDF_Office.Model.Dialog.HomePageToolsDialogs.HomePageBatchProcessing;
+using System.Linq;
+using System.Collections.Generic;
 
 namespace PDF_Office.ViewModels.Dialog.ToolsDialogs.CompressDialogs
 {
@@ -75,6 +78,8 @@ namespace PDF_Office.ViewModels.Dialog.ToolsDialogs.CompressDialogs
         public DelegateCommand CompressCommand { get; set; }
 
         public DelegateCommand ConfirmCompressCommand { get; set; }
+
+        public DelegateCommand BatchCompressCommand { get; set; }
         #endregion
 
         public CompressDialogViewModel(IDialogService dialogService)
@@ -85,6 +90,8 @@ namespace PDF_Office.ViewModels.Dialog.ToolsDialogs.CompressDialogs
             MicroQualityCommand = new DelegateCommand(MicroQuality);
             CompressCommand = new DelegateCommand(Compress);
             ConfirmCompressCommand = new DelegateCommand(ConfirmCompress);
+            BatchCompressCommand = new DelegateCommand(BatchCompress);
+
             dialogs = dialogService;
         }
 
@@ -127,6 +134,16 @@ namespace PDF_Office.ViewModels.Dialog.ToolsDialogs.CompressDialogs
             RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
         }
 
+        private void BatchCompress() {
+
+            DialogParameters compresspdf = new DialogParameters();
+            compresspdf.Add(ParameterNames.BatchProcessing_Name, "1");
+            HomePageBatchProcessingDialogModel.FilePaths =new List<string> { pdfviewer.Document.FilePath.ToString() } ;
+            HomePageBatchProcessingDialogModel.BatchProcessingIndex = 1;
+            compresspdf.Add(ParameterNames.FilePath, new string[] { pdfviewer.Document.FilePath.ToString() });
+            dialogs.ShowDialog(DialogNames.HomePageBatchProcessingDialog, compresspdf, e => { });
+        }
+
         private int GetIndex(int pageindex)
         {
             Trace.WriteLine(pageindex);

File diff suppressed because it is too large
+ 1 - 1
PDF Office/ViewModels/HomePanel/PDFTools/QuickToolsContentViewModel.cs


+ 1 - 1
PDF Office/Views/Dialog/ToolsDialogs/CompressDialogs/CompressDialog.xaml

@@ -67,7 +67,7 @@
         </Border>
         <Grid Grid.Row="2" Width="568"  VerticalAlignment="Center">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
-                <Button Background="WhiteSmoke" Width="100" Height="25" Margin="10,0,0,0">
+                <Button Background="WhiteSmoke" Width="100" Height="25" Margin="10,0,0,0" Command="{Binding BatchCompressCommand}">
                     <Border>
                         <TextBlock Text="批量处理" ></TextBlock>
                     </Border>