|
@@ -12,6 +12,7 @@ using PDF_Master.CustomControl;
|
|
|
using System.Net.Mime;
|
|
|
using System.Threading;
|
|
|
using System.Windows.Threading;
|
|
|
+using ImTools;
|
|
|
|
|
|
namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
{
|
|
@@ -84,7 +85,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
/// <summary>
|
|
|
/// 取消进度条
|
|
|
/// </summary>
|
|
|
- private async void TaskMethod()
|
|
|
+ private async void TaskMethod()
|
|
|
{
|
|
|
await System.Threading.Tasks.Task.Run(() =>
|
|
|
{
|
|
@@ -117,6 +118,26 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
if (App.mainWindowViewModel.Value == App.mainWindowViewModel.MaxValue) { App.mainWindowViewModel.IsProcessVisible = System.Windows.Visibility.Collapsed; }
|
|
|
}
|
|
|
|
|
|
+ /// <summary>
|
|
|
+ /// 转档限制转页面前10页
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="converterDialogsModel"></param>
|
|
|
+ private void limitationConvert(ConverterDialogsModel converterDialogsModel)
|
|
|
+ {
|
|
|
+ if (!ServiceHelper.IAPBeforeFunction())
|
|
|
+ {
|
|
|
+ if (converterDialogsModel.PageIndexLists.Contains(10))
|
|
|
+ {
|
|
|
+ converterDialogsModel.PageIndexLists.RemoveRange(converterDialogsModel.PageIndexLists.IndexOf(10), converterDialogsModel.PageIndexLists.Count - converterDialogsModel.PageIndexLists.IndexOf(10));
|
|
|
+
|
|
|
+ }
|
|
|
+ else if (converterDialogsModel.PageIndexLists.Contains(11))
|
|
|
+ {
|
|
|
+ converterDialogsModel.PageIndexLists.RemoveRange(converterDialogsModel.PageIndexLists.IndexOf(11), converterDialogsModel.PageIndexLists.Count - converterDialogsModel.PageIndexLists.IndexOf(11));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
public async void OnOpened(Prism.Services.Dialogs.DialogResult e)
|
|
|
{
|
|
|
if (e.Result == Prism.Services.Dialogs.ButtonResult.Cancel || e.Result == Prism.Services.Dialogs.ButtonResult.None) { return; }
|
|
@@ -138,10 +159,11 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
if (ConverterCSVModel != null)
|
|
|
{
|
|
|
App.mainWindowViewModel.MaxValue = ConverterCSVModel.PageIndexLists.Count();
|
|
|
-
|
|
|
+ limitationConvert(ConverterCSVModel);
|
|
|
for (int i = 0; ConverterCSVModel.PageIndexLists.Count > i; i++)
|
|
|
{
|
|
|
ConverterCSVModel.PageIndexLists[i] = ConverterCSVModel.PageIndexLists[i] + 1;
|
|
|
+
|
|
|
}
|
|
|
result = await ConverterHelper.CSVConvert(ConverterCSVModel.InputPath, ConverterCSVModel.OutputPath, GetProgress, ConverterCSVModel.PageIndexLists, ConverterCSVModel.Pawssword, ConverterCSVModel.csvOptions, ConverterCSVModel.IsCustomFileName);
|
|
|
|
|
@@ -153,6 +175,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
if (ConverterExcelModel != null)
|
|
|
{
|
|
|
App.mainWindowViewModel.MaxValue = ConverterExcelModel.PageIndexLists.Count();
|
|
|
+ limitationConvert(ConverterExcelModel);
|
|
|
for (int i = 0; ConverterExcelModel.PageIndexLists.Count > i; i++)
|
|
|
{
|
|
|
ConverterExcelModel.PageIndexLists[i] = ConverterExcelModel.PageIndexLists[i] + 1;
|
|
@@ -166,6 +189,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
if (ConverterHTMLModel != null)
|
|
|
{
|
|
|
App.mainWindowViewModel.MaxValue = ConverterHTMLModel.PageIndexLists.Count();
|
|
|
+ limitationConvert(ConverterHTMLModel);
|
|
|
for (int i = 0; ConverterHTMLModel.PageIndexLists.Count > i; i++)
|
|
|
{
|
|
|
ConverterHTMLModel.PageIndexLists[i] = ConverterHTMLModel.PageIndexLists[i] + 1;
|
|
@@ -179,6 +203,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
if (ConverterImgModel != null)
|
|
|
{
|
|
|
App.mainWindowViewModel.MaxValue = ConverterImgModel.PageIndexLists.Count();
|
|
|
+ limitationConvert(ConverterImgModel);
|
|
|
for (int i = 0; ConverterImgModel.PageIndexLists.Count > i; i++)
|
|
|
{
|
|
|
ConverterImgModel.PageIndexLists[i] = ConverterImgModel.PageIndexLists[i] + 1;
|
|
@@ -192,6 +217,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
if (ConverterPPTModel != null)
|
|
|
{
|
|
|
App.mainWindowViewModel.MaxValue = ConverterPPTModel.PageIndexLists.Count();
|
|
|
+ limitationConvert(ConverterPPTModel);
|
|
|
for (int i = 0; ConverterPPTModel.PageIndexLists.Count > i; i++)
|
|
|
{
|
|
|
ConverterPPTModel.PageIndexLists[i] = ConverterPPTModel.PageIndexLists[i] + 1;
|
|
@@ -206,6 +232,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
if (ConverterRTFModel != null)
|
|
|
{
|
|
|
App.mainWindowViewModel.MaxValue = ConverterRTFModel.PageIndexLists.Count();
|
|
|
+ limitationConvert(ConverterRTFModel);
|
|
|
for (int i = 0; ConverterRTFModel.PageIndexLists.Count > i; i++)
|
|
|
{
|
|
|
ConverterRTFModel.PageIndexLists[i] = ConverterRTFModel.PageIndexLists[i] + 1;
|
|
@@ -219,6 +246,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
if (ConverterTextModel != null)
|
|
|
{
|
|
|
App.mainWindowViewModel.MaxValue = ConverterTextModel.PageIndexLists.Count();
|
|
|
+ limitationConvert(ConverterTextModel);
|
|
|
for (int i = 0; ConverterTextModel.PageIndexLists.Count > i; i++)
|
|
|
{
|
|
|
ConverterTextModel.PageIndexLists[i] = ConverterTextModel.PageIndexLists[i] + 1;
|
|
@@ -232,6 +260,7 @@ namespace PDF_Master.Model.Dialog.ConverterDialogs
|
|
|
if (ConverterWordModel != null)
|
|
|
{
|
|
|
App.mainWindowViewModel.MaxValue = ConverterWordModel.PageIndexLists.Count();
|
|
|
+ limitationConvert(ConverterWordModel);
|
|
|
for (int i = 0; ConverterWordModel.PageIndexLists.Count > i; i++)
|
|
|
{
|
|
|
ConverterWordModel.PageIndexLists[i] = ConverterWordModel.PageIndexLists[i] + 1;
|