其他-解决冲突问题项，调整viewcontent逻辑，补充顶部菜单栏按钮图片

PDF Office/Helper/Model/DialogNames.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PDF_Office.Model
-{
-    /// <summary>
-    /// 记录弹窗的名称
-    /// </summary>
-    public static class DialogNames
-    {
-        /// <summary>
-        /// 文档解密弹窗 需要传参PDFDocument对象
-        /// </summary>
-        public static string VerifyPassWordDialog = "PassWordDialog";
-
-        /// <summary>
-        /// 全屏模式弹窗
-        /// </summary>
-        public static string FullScreenDialog = "FullScreenDialog";
-
-        /// <summary>
-        /// 解压缩弹窗
-        /// </summary>
-        public static string CompressDialog = "CompressDialog";
-
-        /// <summary>
-        /// 解压缩弹窗
-        /// </summary>
-        public static string SetPasswordDialog = "SetPasswordDialog";
-
-        /// <summary>
-        /// 解压缩弹窗
-        /// </summary>
-        public static string CheckPasswordDialog = "CheckPasswordDialog";
-
-        /// <summary>
-        /// 解压缩弹窗
-        /// </summary>
-        public static string CancelPasswordDialog = "CancelPasswordDialog";
-    }
-}

PDF Office/Helper/Model/PDFTool/ToolItem.cs

@@ -1,21 +0,0 @@
-using Prism.Mvvm;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PDF_Office.Model.PDFTool
-{
-    public class ToolItem : BindableBase
-    {
-        public int Id { get; set; }
-        public string Image { get; set; }
-        public string NameInfo { get; set; }
-        public string Name { get; set; }
-        public ToolItem()
-        {
-
-        }
-    }
-}

PDF Office/Helper/Model/PageEdit/PageEditItem.cs

@@ -1,133 +0,0 @@
-using Prism.Commands;
-using Prism.Mvvm;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Media.Imaging;
-
-namespace PDF_Office.Model.PageEdit
-{
-    public class PageEditItem:BindableBase
-    {
-
-        private int pageNumber;
-        /// <summary>
-        /// 页码
-        /// </summary>
-        public int PageNumber
-        {
-            get { return pageNumber; }
-            set
-            {
-                SetProperty(ref pageNumber, value);
-            }
-        }
-
-
-        private string pageSize = "";
-        /// <summary>
-        /// 页面尺寸
-        /// </summary>
-        public string PageSize
-        {
-            get { return pageSize; }
-            set
-            {
-                SetProperty(ref pageSize, value);
-            }
-        }
-
-        private BitmapSource image;
-        /// <summary>
-        /// 页面缩略图
-        /// </summary>
-        public BitmapSource Image
-        {
-            get { return image; }
-            set
-            {
-                SetProperty(ref image, value);
-            }
-        }
-
-        private bool showPageSize = false;
-        /// <summary>
-        /// 是否显示页码尺寸
-        /// </summary>
-        public bool ShowPageSize
-        {
-            get { return showPageSize; }
-            set
-            {
-                SetProperty(ref showPageSize, value);
-            }
-        }
-
-        private bool haveBookMark = false;
-        /// <summary>
-        /// 该页是否有书签标记
-        /// </summary>
-        public bool HaveBookMark
-        {
-            get { return haveBookMark; }
-            set
-            {
-                SetProperty(ref haveBookMark, value);
-            }
-        }
-
-        private Visibility visible = Visibility.Visible;
-        /// <summary>
-        /// 是否显示
-        /// </summary>
-        public Visibility Visible
-        {
-            get { return visible; }
-            set
-            {
-                SetProperty(ref visible, value);
-            }
-        }
-
-        private bool selected = false; 
-        /// <summary>
-        /// 是否选中
-        /// </summary>
-        public bool Selected
-        {
-            get { return selected; }
-            set
-            {
-                SetProperty(ref selected, value);
-            }
-        }
-
-
-        private Size itemSize = new Size(208, 294);
-        /// <summary>
-        /// 控件大小
-        /// 直接修改Listbox 容器的项大小，会导致间距有问题，所有采用动态绑定大小的方式来实现Item大小更新
-        /// </summary>
-        public Size ItemSize
-        {
-            get { return itemSize; }
-            set
-            {
-                SetProperty(ref itemSize, value);
-            }
-        }
-
-        /// <summary>
-        /// 此次打开中是否已经获取图片，避免重复拿图
-        /// </summary>
-        public bool IsGetImage = false;
-
-        /// <summary>
-        /// 是否是竖直的图
-        /// </summary>
-        public bool isVertical = true;
-    }
-}

PDF Office/Helper/Model/ParameterNames.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PDF_Office.Model
-{
-    /// <summary>
-    /// 记录常用的参数的Key名称，防止String写错
-    /// </summary>
-    public static class ParameterNames
-    {
-        public static string PDFViewer = "PDFViewer";
-
-        public static string FilePath = "FilePath";
-
-        public static string PassWord = "PassWord";
-
-        public static string PDFDocument = "PDFDocument";
-
-        public static string AddTab = "AddTab";
-
-        public static string MainViewModel = "MainViewModel";
-
-        public static string ViewContentViewModel = "ViewContentViewModel";
-    }
-}

PDF Office/Helper/Model/RegionNames.cs

@@ -1,16 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PDF_Office.Model
-{
-    public static class RegionNames
-    {
-        /// <summary>
-        /// 最外层的Region名称
-        /// </summary>
-        public static string MainRegion = "MainRegion";
-    }
-}

PDF Office/PDF Office.csproj

@@ -1,4 +1,3 @@
-
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props" Condition="Exists('packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props')" />
@@ -68,539 +67,21 @@
     <Reference Include="DryIoc, Version=4.7.7.0, Culture=neutral, PublicKeyToken=dfbf2bd50fcf7768, processorArchitecture=MSIL">
       <HintPath>packages\DryIoc.dll.4.7.7\lib\net45\DryIoc.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Xaml.Behaviors.Wpf.1.1.31\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
-    </Reference>
-    <Reference Include="Prism, Version=8.1.97.5141, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
-      <HintPath>packages\Prism.Core.8.1.97\lib\net461\Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Prism.DryIoc.Wpf, Version=8.1.97.5141, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
-      <HintPath>packages\Prism.DryIoc.8.1.97\lib\net461\Prism.DryIoc.Wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="Prism.Wpf, Version=8.1.97.5141, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
-      <HintPath>packages\Prism.Wpf.8.1.97\lib\net461\Prism.Wpf.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="VirtualizingWrapPanel, Version=1.5.7.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>packages\VirtualizingWrapPanel.1.5.7\lib\net452\VirtualizingWrapPanel.dll</HintPath>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="CustomControl\AlertsMessage.xaml.cs">
-      <DependentUpon>AlertsMessage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="CustomControl\CustomIconToggleBtn.cs" />
-    <Compile Include="CustomControl\DialogContent.cs" />
-    <Compile Include="CustomControl\IconAndTextTabItem.cs" />
-    <Compile Include="CustomControl\ListBoxItemToolBar.cs" />
-    <Compile Include="CustomControl\MessageBoxEx.cs" />
-    <Compile Include="CustomControl\SystemControl\CustomCommandAction .cs" />
-    <Compile Include="CustomControl\SystemControl\RoutedEventTrigger.cs" />
-    <Compile Include="CustomControl\ToastControl.xaml.cs">
-      <DependentUpon>ToastControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="DataConvert\FileFormatToIconConvert.cs" />
-    <Compile Include="EventAggregators\PageEditNotifyEvent.cs" />
-    <Compile Include="EventAggregators\PageEditRefreshEvent.cs" />
-    <Compile Include="Helper\SettingHelper.cs" />
-    <Compile Include="Helper\ToolMethod.cs" />
-    <Compile Include="Model\DialogNames.cs" />
-    <Compile Include="CustomControl\SystemControl\InterTabClient.cs" />
-    <Compile Include="CustomControl\LoadingControl.xaml.cs">
-      <DependentUpon>LoadingControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Model\PageEdit\ExtractModel.cs" />
-    <Compile Include="Model\PageEdit\PageEditItem.cs" />
-    <Compile Include="Model\ParameterNames.cs" />
-    <Compile Include="Model\PDFTool\ToolItem.cs" />
-    <Compile Include="Model\RegionNames.cs" />
-    <Compile Include="CustomControl\SystemControl\TabablzRegionBehavior.cs" />
-    <Compile Include="DataConvert\BoolToVisible.cs" />
-    <Compile Include="DataConvert\VisibleToBoolConvert.cs" />
-    <Compile Include="EventAggregators\DragablzWindowEvent.cs" />
-    <Compile Include="EventAggregators\OpenFileEvent.cs" />
-    <Compile Include="Helper\CommomEvent.cs" />
-    <Compile Include="Helper\CommonHelper.cs" />
-    <Compile Include="ViewModels\BOTA\BOTAContentViewModel.cs" />
-    <Compile Include="ViewModels\BottomToolContentViewModel.cs" />
-    <Compile Include="ViewModels\Dialog\FullScreenWindowViewModel.cs" />
-    <Compile Include="ViewModels\Dialog\PageEditDialogs\ExtractDialogViewModel.cs" />
-    <Compile Include="ViewModels\Dialog\PageEditDialogs\InsertDialogViewModel.cs" />
-    <Compile Include="ViewModels\Dialog\PageEditDialogs\SplitDialogViewModel.cs" />
-    <Compile Include="ViewModels\Dialog\VerifyPassWordDialogViewModel.cs" />
-    <Compile Include="ViewModels\HomePanel\HomeCloudContentViewModel.cs" />
-    <Compile Include="ViewModels\HomePanel\HomeGuidContentViewModel.cs" />
-    <Compile Include="ViewModels\HomePanel\HomeToolsContentViewModel.cs" />
-    <Compile Include="ViewModels\MainContentViewModel.cs" />
-    <Compile Include="ViewModels\PageEdit\PageEditContentViewModel.cs" />
-    <Compile Include="Views\BOTA\BOTAContent.xaml.cs">
-      <DependentUpon>BOTAContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\BottomToolContent.xaml.cs">
-      <DependentUpon>BottomToolContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\FullScreenWindow.xaml.cs">
-      <DependentUpon>FullScreenWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\PageEditDialogs\ExtractDialog.xaml.cs">
-      <DependentUpon>ExtractDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\PageEditDialogs\InsertDialog.xaml.cs">
-      <DependentUpon>InsertDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\PageEditDialogs\SplitDialog.xaml.cs">
-      <DependentUpon>SplitDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\Dialog\VerifyPassWordDialog.xaml.cs">
-      <DependentUpon>VerifyPassWordDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\CloudDocs\CloudDiskContent.xaml.cs">
-      <DependentUpon>CloudDiskContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\CloudDocs\CloudFilesContent.xaml.cs">
-      <DependentUpon>CloudFilesContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\HomeCloudContent.xaml.cs">
-      <DependentUpon>HomeCloudContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\HomeGuidContent.xaml.cs">
-      <DependentUpon>HomeGuidContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\PDFTools\PDFToolItem.xaml.cs">
-      <DependentUpon>PDFToolItem.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\HomeToolsContent.xaml.cs">
-      <DependentUpon>HomeToolsContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\PDFTools\PDFTools.cs" />
-    <Compile Include="Views\HomePanel\PDFTools\PDFToolsContent.xaml.cs">
-      <DependentUpon>PDFToolsContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\PDFTools\QuickToolsContent.xaml.cs">
-      <DependentUpon>QuickToolsContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\PromotionContent.xaml.cs">
-      <DependentUpon>PromotionContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\RecentFiles\DocItemControl.xaml.cs">
-      <DependentUpon>DocItemControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\RecentFiles\DocItemListViewControl.xaml.cs">
-      <DependentUpon>DocItemListViewControl.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomePanel\RecentFiles\RecentFilesView.xaml.cs">
-      <DependentUpon>RecentFilesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MainContent.xaml.cs">
-      <DependentUpon>MainContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\PageEdit\PageEditContent.xaml.cs">
-      <DependentUpon>PageEditContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ViewContent.xaml.cs">
-      <DependentUpon>ViewContent.xaml</DependentUpon>
-    </Compile>
-    <Page Include="CustomControl\AlertsMessage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="CustomControl\LoadingControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CustomControl\ToastControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Styles\ComboxStyle.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\CustomBtnStyle.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Styles\CustomListItemStyle.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\ExpanderStyle.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Styles\ListBoxStyle.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Styles\ListViewStyle.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Styles\TabControlStyle.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\WindowsStyle.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\BOTA\BOTAContent.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\BottomToolContent.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Dialog\FullScreenWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\Dialog\PageEditDialogs\ExtractDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Dialog\PageEditDialogs\InsertDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Dialog\PageEditDialogs\SplitDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\Dialog\VerifyPassWordDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\HomeContent.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\HomePanel\CloudDocs\CloudDiskContent.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\HomePanel\CloudDocs\CloudFilesContent.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\HomePanel\HomeCloudContent.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\HomePanel\HomeGuidContent.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\HomePanel\PDFTools\PDFToolItem.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\HomePanel\HomeToolsContent.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\HomePanel\PDFTools\PDFToolsContent.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\HomePanel\PDFTools\QuickToolsContent.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\HomePanel\PromotionContent.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\HomePanel\RecentFiles\DocItemControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\HomePanel\RecentFiles\DocItemListViewControl.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\HomePanel\RecentFiles\RecentFilesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\MainContent.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ViewModels\HomeContentViewModel.cs" />
-    <Compile Include="ViewModels\MainWindowViewModel.cs" />
-    <Compile Include="ViewModels\ViewContentViewModel.cs" />
-    <Compile Include="Views\HomeContent.xaml.cs">
-      <DependentUpon>HomeContent.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Views\PageEdit\PageEditContent.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\ViewContent.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Views\Dialog\Convertor\" />
-    <Folder Include="Views\Edit\" />
-    <Folder Include="Views\FillAndSign\" />
-    <Folder Include="Views\Forms\" />
-    <Folder Include="Views\Scan\" />
-    <Folder Include="Views\Tools\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="ComOCRKit.Desk.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ComPDFKit.Desk.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ComPDFKit.Viewer.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="ComPDFKit_Conversion.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="DotNetSpeech.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Dragablz.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Resource Include="StyleAndTemplateList.txt" />
-    <Resource Include="Resources\QuickToolIcon\Batch.png" />
-    <Resource Include="Resources\HomeIcon\file_addition.png" />
-    <Resource Include="Resources\HomeIcon\folderOpen.png" />
-    <Resource Include="Resources\PromotionIcon\Android.png" />
-    <Resource Include="Resources\PromotionIcon\ComPDFKit.png" />
-    <Resource Include="Resources\PromotionIcon\ComVideoKit.png" />
-    <Resource Include="Resources\PromotionIcon\FilmageEditor.png" />
-    <Resource Include="Resources\PromotionIcon\FilmageScreen.png" />
-    <Resource Include="Resources\PromotionIcon\FreePDFTemplates.png" />
-    <Resource Include="Resources\PromotionIcon\IPhoneiPad.png" />
-    <Resource Include="Resources\PromotionIcon\SignFlow.png" />
-    <Resource Include="Resources\PromotionIcon\Windows.png" />
-    <Resource Include="Resources\FilesType\ic_propertybar_file_pdf_lock.png" />
-    <Resource Include="Resources\FilesType\ic_propertybar_file_png_Large.png" />
-    <Content Include="SystemService\PreviewHandler.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="SystemService\PreviewHandlerx86.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="SystemService\TechPDFKitBase.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="SystemService\ThumbnailProvider.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="SystemService\ThumbnailProviderx86.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\ComPDFKit.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\CPDFConverterNative.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\libhpdf.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\libpng16.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\TechPDFKit.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\TechPdfToOffice.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\vcruntime140.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\zlib1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\ComPDFKit.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\CPDFConverterNative.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\libhpdf.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\libpng16.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\TechPDFKit.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\TechPDFToOffice.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\vcruntime140.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\zlib1.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PDFSettings\PDFSettings.csproj">
-      <Project>{bee73aae-9a2c-446b-b64d-3a8f042c985d}</Project>
-      <Name>PDFSettings</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
-    </PropertyGroup>
-  </Target>
-=======
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props" Condition="Exists('packages\Xamarin.Forms.5.0.0.2012\build\Xamarin.Forms.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F3A2111D-9EAF-4ECE-9A92-B7F21D429DCD}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>PDF_Office</RootNamespace>
-    <AssemblyName>PDF Office</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>embedded</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="ComOCRKit.Desk, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\ComOCRKit.Desk.dll</HintPath>
-    </Reference>
-    <Reference Include="ComPDFKit.Desk, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\ComPDFKit.Desk.dll</HintPath>
-    </Reference>
-    <Reference Include="ComPDFKit.Viewer, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\ComPDFKit.Viewer.dll</HintPath>
-    </Reference>
-    <Reference Include="ComPDFKit_Conversion, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\ComPDFKit_Conversion.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetSpeech, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-      <HintPath>.\DotNetSpeech.dll</HintPath>
+    <Reference Include="Microsoft.AppCenter, Version=0.0.0.0, Culture=neutral, PublicKeyToken=8a600e2fee7ba272, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.AppCenter.4.5.0\lib\net461\Microsoft.AppCenter.dll</HintPath>
     </Reference>
-    <Reference Include="Dragablz, Version=0.0.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\Dragablz.dll</HintPath>
+    <Reference Include="Microsoft.AppCenter.Analytics, Version=0.0.0.0, Culture=neutral, PublicKeyToken=8a600e2fee7ba272, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.AppCenter.Analytics.4.5.0\lib\net461\Microsoft.AppCenter.Analytics.dll</HintPath>
     </Reference>
-    <Reference Include="DryIoc, Version=4.7.7.0, Culture=neutral, PublicKeyToken=dfbf2bd50fcf7768, processorArchitecture=MSIL">
-      <HintPath>packages\DryIoc.dll.4.7.7\lib\net45\DryIoc.dll</HintPath>
+    <Reference Include="Microsoft.AppCenter.Crashes, Version=0.0.0.0, Culture=neutral, PublicKeyToken=8a600e2fee7ba272, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.AppCenter.Crashes.4.5.0\lib\net461\Microsoft.AppCenter.Crashes.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.Xaml.Behaviors.Wpf.1.1.31\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="Prism, Version=8.1.97.5141, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
       <HintPath>packages\Prism.Core.8.1.97\lib\net461\Prism.dll</HintPath>
     </Reference>
@@ -610,9 +91,37 @@
     <Reference Include="Prism.Wpf, Version=8.1.97.5141, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
       <HintPath>packages\Prism.Wpf.8.1.97\lib\net461\Prism.Wpf.dll</HintPath>
     </Reference>
+    <Reference Include="SQLitePCLRaw.batteries_v2, Version=2.0.2.669, Culture=neutral, PublicKeyToken=8226ea5df37bcae9, processorArchitecture=MSIL">
+      <HintPath>packages\SQLitePCLRaw.bundle_green.2.0.2\lib\net461\SQLitePCLRaw.batteries_v2.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.core, Version=2.0.2.669, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
+      <HintPath>packages\SQLitePCLRaw.core.2.0.2\lib\netstandard2.0\SQLitePCLRaw.core.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.nativelibrary, Version=2.0.2.669, Culture=neutral, PublicKeyToken=502ed628492ab262, processorArchitecture=MSIL">
+      <HintPath>packages\SQLitePCLRaw.bundle_green.2.0.2\lib\net461\SQLitePCLRaw.nativelibrary.dll</HintPath>
+    </Reference>
+    <Reference Include="SQLitePCLRaw.provider.dynamic_cdecl, Version=2.0.2.669, Culture=neutral, PublicKeyToken=b68184102cba0b3b, processorArchitecture=MSIL">
+      <HintPath>packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.2\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
     </Reference>
@@ -639,7 +148,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="CustomControl\AlertsMessage.xaml.cs">
+      <DependentUpon>AlertsMessage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="CustomControl\CustomIconToggleBtn.cs" />
+    <Compile Include="CustomControl\DialogContent.cs" />
     <Compile Include="CustomControl\IconAndTextTabItem.cs" />
     <Compile Include="CustomControl\ListBoxItemToolBar.cs" />
     <Compile Include="CustomControl\MessageBoxEx.cs" />
@@ -648,9 +161,12 @@
     <Compile Include="CustomControl\ToastControl.xaml.cs">
       <DependentUpon>ToastControl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DataConvert\FileFormatToIconConvert.cs" />
     <Compile Include="EventAggregators\PageEditNotifyEvent.cs" />
     <Compile Include="EventAggregators\PageEditRefreshEvent.cs" />
+    <Compile Include="Helper\PasswordBoxHelper.cs" />
     <Compile Include="Helper\SettingHelper.cs" />
+    <Compile Include="Helper\ToolMethod.cs" />
     <Compile Include="Model\DialogNames.cs" />
     <Compile Include="CustomControl\SystemControl\InterTabClient.cs" />
     <Compile Include="CustomControl\LoadingControl.xaml.cs">
@@ -660,6 +176,7 @@
     <Compile Include="Model\Dialog\ToolsDialogs\SaftyDialogs\CheckPasswordDialogModel.cs" />
     <Compile Include="Model\Dialog\ToolsDialogs\SaftyDialogs\DeleteSafetySettintgsModel.cs" />
     <Compile Include="Model\Dialog\ToolsDialogs\SaftyDialogs\SetPasswordDialogModel.cs" />
+    <Compile Include="Model\PageEdit\ExtractModel.cs" />
     <Compile Include="Model\PageEdit\PageEditItem.cs" />
     <Compile Include="Model\ParameterNames.cs" />
     <Compile Include="Model\PDFTool\ToolItem.cs" />
@@ -673,6 +190,7 @@
     <Compile Include="Helper\CommonHelper.cs" />
     <Compile Include="ViewModels\BOTA\BOTAContentViewModel.cs" />
     <Compile Include="ViewModels\BottomToolContentViewModel.cs" />
+    <Compile Include="ViewModels\Dialog\ExtractDialogViewModel.cs" />
     <Compile Include="ViewModels\Dialog\FullScreenWindowViewModel.cs" />
     <Compile Include="ViewModels\Dialog\PageEditDialogs\ExtractDialogViewModel.cs" />
     <Compile Include="ViewModels\Dialog\PageEditDialogs\InsertDialogViewModel.cs" />
@@ -707,6 +225,9 @@
     <Compile Include="Views\Dialog\PageEditDialogs\SplitDialog.xaml.cs">
       <DependentUpon>SplitDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Dialog\PrinterDialog.xaml.cs">
+      <DependentUpon>PrinterDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Dialog\ToolsDialogs\CompressDialogs\CompressDialog.xaml.cs">
       <DependentUpon>CompressDialog.xaml</DependentUpon>
     </Compile>
@@ -725,6 +246,12 @@
     <Compile Include="Views\Dialog\VerifyPassWordDialog.xaml.cs">
       <DependentUpon>VerifyPassWordDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\HomePanel\CloudDocs\CloudDiskContent.xaml.cs">
+      <DependentUpon>CloudDiskContent.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\HomePanel\CloudDocs\CloudFilesContent.xaml.cs">
+      <DependentUpon>CloudFilesContent.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\HomePanel\HomeCloudContent.xaml.cs">
       <DependentUpon>HomeCloudContent.xaml</DependentUpon>
     </Compile>
@@ -737,6 +264,7 @@
     <Compile Include="Views\HomePanel\HomeToolsContent.xaml.cs">
       <DependentUpon>HomeToolsContent.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\HomePanel\PDFTools\PDFTools.cs" />
     <Compile Include="Views\HomePanel\PDFTools\PDFToolsContent.xaml.cs">
       <DependentUpon>PDFToolsContent.xaml</DependentUpon>
     </Compile>
@@ -767,6 +295,10 @@
     <Compile Include="Views\ViewContent.xaml.cs">
       <DependentUpon>ViewContent.xaml</DependentUpon>
     </Compile>
+    <Page Include="CustomControl\AlertsMessage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="CustomControl\LoadingControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -807,6 +339,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\WindowsStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\BOTA\BOTAContent.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -831,6 +371,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\Dialog\PrinterDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\Dialog\ToolsDialogs\CompressDialogs\CompressDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -859,6 +403,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\HomePanel\CloudDocs\CloudDiskContent.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\HomePanel\CloudDocs\CloudFilesContent.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\HomePanel\HomeCloudContent.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1077,6 +629,7 @@
     <PropertyGroup>
       <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
+    <Error Condition="!Exists('packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets'))" />
   </Target>
->>>>>>> practice
+  <Import Project="packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets" Condition="Exists('packages\SQLitePCLRaw.lib.e_sqlite3.2.0.2\build\net461\SQLitePCLRaw.lib.e_sqlite3.targets')" />
 </Project>

PDF Office/ViewModels/Dialog/InsertDialogViewModel.cs

@@ -1,16 +0,0 @@
-using Prism.Commands;
-using Prism.Mvvm;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace PDF_Office.ViewModels.Dialog
-{
-    public class InsertDialogViewModel : BindableBase
-    {
-        public InsertDialogViewModel()
-        {
-
-        }
-    }
-}

PDF Office/ViewModels/Dialog/PrinterDialogViewModel.cs

@@ -1,16 +0,0 @@
-using Prism.Commands;
-using Prism.Mvvm;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace PDF_Office.ViewModels.Dialog
-{
-    public class PrinterDialogViewModel : BindableBase
-    {
-        public PrinterDialogViewModel()
-        {
-
-        }
-    }
-}

PDF Office/ViewModels/Dialog/SplitDialogViewModel.cs

@@ -1,16 +0,0 @@
-using Prism.Commands;
-using Prism.Mvvm;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace PDF_Office.ViewModels.Dialog
-{
-    public class SplitDialogViewModel : BindableBase
-    {
-        public SplitDialogViewModel()
-        {
-
-        }
-    }
-}

PDF Office/ViewModels/ViewContentViewModel.cs

@@ -68,7 +68,7 @@ namespace PDF_Office.ViewModels
             }
         }
 
-        private Visibility toolContentVisible = Visibility.Visible;
+        private Visibility toolContentVisible = Visibility.Collapsed;
         /// <summary>
         /// 控制Content的显示 用于显示水印、贝茨码、密文等功能模块
         /// 留意：显示前需要先注入内容、设置好行和跨行数
@@ -95,9 +95,9 @@ namespace PDF_Office.ViewModels
             }
         }
 
-        private Visibility toolsbarContentVisible = Visibility.Visible;
+        private Visibility toolsbarContentVisible = Visibility.Collapsed;
         /// <summary>
-        /// 控制Content的显示
+        /// 控制ToolsBarContent的显示
         /// 留意：显示前需要先注入内容、设置好行和跨行数
         /// </summary>
         public Visibility ToolsBarContentVisible
@@ -170,12 +170,25 @@ namespace PDF_Office.ViewModels
         {
             dictionary.Add("TabItemPageEdit", ToolContentRegionName);
             dictionary.Add("TabItemTool", ToolsBarContentRegionName);
+            //其他工具菜单栏共用一个ToolsBarContentRegionName
+            dictionary.Add("TabItemAnnotation", ToolsBarContentRegionName);
+            dictionary.Add("TabItemConvert", ToolsBarContentRegionName);
+            dictionary.Add("TabItemScan", ToolsBarContentRegionName);
+            dictionary.Add("TabItemEdit", ToolsBarContentRegionName);
+            dictionary.Add("TabItemForm", ToolsBarContentRegionName);
+            dictionary.Add("TabItemFill", ToolsBarContentRegionName);
         }
 
         private void InitialbarContentByTabItem(ref Dictionary<string, string> dictionary)
         {
             dictionary.Add("TabItemPageEdit", "PageEditContent");
             dictionary.Add("TabItemTool", "ToolsBarContent");
+            dictionary.Add("TabItemAnnotation", "");
+            dictionary.Add("TabItemConvert", "");
+            dictionary.Add("TabItemScan", "");
+            dictionary.Add("TabItemEdit", "");
+            dictionary.Add("TabItemForm", "");
+            dictionary.Add("TabItemFill", "");
         }
 
         private void LoadControl()
@@ -210,20 +223,15 @@ namespace PDF_Office.ViewModels
                 currentBar = item.Name;
                 if (previousBar != currentBar)
                 {
-                    currentBar = item.Name;
-                    if (previousBar != currentBar)
-                    {
-                        if (previousBar != "" && (currentBar == "TabItemPageEdit" || currentBar == "TabItemTool"))
+                        if(currentBar== "TabItemPageEdit")//如果是页面编辑则进入页面编辑模式
                         {
-                            ExitToolMode();
+                            EnterToolMode(barContentByTabItem[currentBar]);
                         }
-                        if ((currentBar == "TabItemPageEdit" || currentBar == "TabItemTool"))
+                        else//其余情况直接导航至对应的工具栏即可，不需要清空之前的content,region里是单例模式
                         {
                             EnterSelectedBar(currentBar);
                         }
                         previousBar = currentBar;
-
-                    }
                 }
 
             }
@@ -304,22 +312,38 @@ namespace PDF_Office.ViewModels
         /// 显示前添加内容到Region
         /// </summary>
         /// <param name="isPageEdit"></param>
-        private void ShowContent(string currentBar)
+        private void ShowContent(string currentBar,bool isToolMode=false)
         {
-            //显示页面编辑
-            if (currentBar == "TabItemPageEdit")
+            //显示页面编辑或其他工具
+            if (currentBar == "TabItemPageEdit"||isToolMode)
             {
-                if (GridToolRow != 1)
+                if (currentBar == "TabItemPageEdit")//进入页面编辑
                 {
-                    GridToolRow = 1;
-                }
+                    if (GridToolRow != 1)
+                    {
+                        GridToolRow = 1;
+                    }
 
-                if (GridToolRowSpan != 3)
+                    if (GridToolRowSpan != 3)
+                    {
+                        GridToolRowSpan = 3;
+                    }
+                }
+                else//进入水印等其他工具模式
                 {
-                    GridToolRowSpan = 3;
+                    if (GridToolRow != 0)
+                    {
+                        GridToolRow = 0;
+                    }
+
+                    if (GridToolRowSpan != 4)
+                    {
+                        GridToolRowSpan = 4;
+                    }
                 }
+                //ToolContent的visible跟toolsbarContent 的visible是互斥的
                 ToolContentVisible = Visibility.Visible;
-                ToolContentVisible = Visibility.Visible;
+                ToolsBarContentVisible = Visibility.Collapsed;
             }
             else
             {
@@ -327,6 +351,7 @@ namespace PDF_Office.ViewModels
                 {
                     GridToolRow = 1;
                 }
+                ToolContentVisible = Visibility.Collapsed;
                 ToolsBarContentVisible = Visibility.Visible;
             }
         }
@@ -351,7 +376,7 @@ namespace PDF_Office.ViewModels
                 param = valuePairs;
             }
             region.RequestNavigate(ToolContentRegionName, targetToolMode, param);
-            ShowContent(currentBar);
+            ShowContent(currentBar,true);
 
             IsLoading = Visibility.Collapsed;
         }
@@ -368,12 +393,9 @@ namespace PDF_Office.ViewModels
         /// <summary>
         /// 退出工具(水印、密文等)编辑模式，隐藏ToolContent
         /// </summary>
-
-
         public void ExitToolMode()
         {
             ToolContentVisible = Visibility.Collapsed;
-            ToolsBarContentVisible = Visibility.Collapsed;
         }
         #endregion
     }

PDF Office/Views/Dialog/ExtractDialog.xaml

@@ -1,27 +0,0 @@
-<UserControl x:Class="PDF_Office.Views.Dialog.ExtractDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:prism="http://prismlibrary.com/"             
-             prism:ViewModelLocator.AutoWireViewModel="True"
-              d:DesignHeight="404"
-             d:DesignWidth="480"
-             mc:Ignorable="d">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="50"></RowDefinition>
-            <RowDefinition Height="*"></RowDefinition>
-            <RowDefinition Height="63"></RowDefinition>
-        </Grid.RowDefinitions>
-        <TextBlock Grid.Row="0" Text="提取" FontSize="20" FontWeight="ExtraBlack" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="20,0,0,0" Height="28" Width="120"/>
-        <Border Grid.Row="1" BorderBrush="Gray" BorderThickness="0,1,0,1" VerticalAlignment="Center" Height="291">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="1*"/>
-                    <ColumnDefinition Width="1*"/>
-                </Grid.ColumnDefinitions>
-            </Grid>
-        </Border>
-    </Grid>
-</UserControl>

PDF Office/Views/Dialog/ExtractDialog.xaml.cs

@@ -1,15 +0,0 @@
-using System.Windows.Controls;
-
-namespace PDF_Office.Views.Dialog
-{
-    /// <summary>
-    /// Interaction logic for ExtractDialog
-    /// </summary>
-    public partial class ExtractDialog : UserControl
-    {
-        public ExtractDialog()
-        {
-            InitializeComponent();
-        }
-    }
-}

PDF Office/Views/Dialog/InsertDialog.xaml

@@ -1,27 +0,0 @@
-<UserControl x:Class="PDF_Office.Views.Dialog.InsertDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:prism="http://prismlibrary.com/"             
-             prism:ViewModelLocator.AutoWireViewModel="True"
-             d:DesignHeight="441"
-             d:DesignWidth="480"
-             mc:Ignorable="d">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="48"></RowDefinition>
-            <RowDefinition Height="*"></RowDefinition>
-            <RowDefinition Height="64"></RowDefinition>
-        </Grid.RowDefinitions>
-        <TextBlock Grid.Row="0" Text="插入" FontSize="20" FontWeight="ExtraBlack" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="20,0,0,0" Height="28" Width="120"/>
-        <Border Grid.Row="1" BorderBrush="Gray" BorderThickness="0,1,0,1" VerticalAlignment="Center" Height="329">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="3*"/>
-                    <ColumnDefinition Width="4*"/>
-                </Grid.ColumnDefinitions>
-            </Grid>
-        </Border>
-    </Grid>
-</UserControl>

PDF Office/Views/Dialog/InsertDialog.xaml.cs

@@ -1,15 +0,0 @@
-using System.Windows.Controls;
-
-namespace PDF_Office.Views.Dialog
-{
-    /// <summary>
-    /// Interaction logic for InsertDialog
-    /// </summary>
-    public partial class InsertDialog : UserControl
-    {
-        public InsertDialog()
-        {
-            InitializeComponent();
-        }
-    }
-}

PDF Office/Views/Dialog/SplitDialog.xaml

@@ -1,27 +0,0 @@
-<UserControl x:Class="PDF_Office.Views.Dialog.SplitDialog"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:prism="http://prismlibrary.com/"             
-             prism:ViewModelLocator.AutoWireViewModel="True"
-              d:DesignHeight="471"
-             d:DesignWidth="583"
-             mc:Ignorable="d">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="48"></RowDefinition>
-            <RowDefinition Height="*"></RowDefinition>
-            <RowDefinition Height="64"></RowDefinition>
-        </Grid.RowDefinitions>
-        <TextBlock Grid.Row="0" Text="拆分" FontSize="20" FontWeight="ExtraBlack" VerticalAlignment="Center" HorizontalAlignment="Left"  Margin="20,0,0,0" Height="28" Width="120"/>
-        <Border Grid.Row="1" BorderBrush="Gray" BorderThickness="0,1,0,1" VerticalAlignment="Center" Height="359">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="193"/>
-                    <ColumnDefinition Width="366"/>
-                </Grid.ColumnDefinitions>
-            </Grid>
-        </Border>
-    </Grid>
-</UserControl>

PDF Office/Views/Dialog/SplitDialog.xaml.cs

@@ -1,15 +0,0 @@
-using System.Windows.Controls;
-
-namespace PDF_Office.Views.Dialog
-{
-    /// <summary>
-    /// Interaction logic for SplitDialog
-    /// </summary>
-    public partial class SplitDialog : UserControl
-    {
-        public SplitDialog()
-        {
-            InitializeComponent();
-        }
-    }
-}

PDF Office/packages.config

@@ -1,10 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="DryIoc.dll" version="4.7.7" targetFramework="net462" />
+  <package id="Microsoft.AppCenter" version="4.5.0" targetFramework="net462" />
+  <package id="Microsoft.AppCenter.Analytics" version="4.5.0" targetFramework="net462" />
+  <package id="Microsoft.AppCenter.Crashes" version="4.5.0" targetFramework="net462" />
   <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.31" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
   <package id="Prism.Core" version="8.1.97" targetFramework="net462" />
   <package id="Prism.DryIoc" version="8.1.97" targetFramework="net462" />
   <package id="Prism.Wpf" version="8.1.97" targetFramework="net462" />
+  <package id="SQLitePCLRaw.bundle_green" version="2.0.2" targetFramework="net462" />
+  <package id="SQLitePCLRaw.core" version="2.0.2" targetFramework="net462" />
+  <package id="SQLitePCLRaw.lib.e_sqlite3" version="2.0.2" targetFramework="net462" />
+  <package id="SQLitePCLRaw.provider.dynamic_cdecl" version="2.0.2" targetFramework="net462" />
+  <package id="System.Buffers" version="4.4.0" targetFramework="net462" />
+  <package id="System.Memory" version="4.5.3" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
   <package id="VirtualizingWrapPanel" version="1.5.7" targetFramework="net462" />
 </packages>