删除三方包NTwain，修复远程广告时区问题

PDF Office/PDF Master.csproj

@@ -205,9 +205,6 @@
     <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="NTwain, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\NTwain.3.7.2\lib\net462\NTwain.dll</HintPath>
-    </Reference>
     <Reference Include="office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>

PDF Office/ViewModels/Dialog/HomePageToolsDialogs/CreateFromScannerDialogsViewModel.cs

@@ -1,6 +1,4 @@
 using ComPDFKit.PDFDocument;
-using NTwain;
-using NTwain.Data;
 using PDF_Master.CustomControl;
 using PDF_Master.Helper;
 using PDF_Master.Model;
@@ -27,24 +25,18 @@ using WIA;
 
 namespace PDF_Master.ViewModels.Dialog.HomePageToolsDialogs
 {
-    
-
-
-
-
-
-
 
     //扫描仪设备
-    public class ScannerItem : BindableBase
+    public class ScannerItem
     {
-        public DataSource DataSourceItem { get; set; }
-        public ScannerItem(DataSource dataSource)
+        public Item DataSourceItem { get; set; }
+        public string ScannerName { get; set; }
+
+        public ScannerItem(Item dataSource)
         {
             DataSourceItem = dataSource;
-            ScannerName = dataSource.Name;
+            ScannerName = dataSource.Properties["Name"].ToString();
         }
-        public string ScannerName { get; set; }
     }
 
     public class CreateFromScannerDialogsViewModel : BindableBase, IDialogAware

PDF Office/Views/HomePanel/PromotionContent.xaml.cs

@@ -108,9 +108,11 @@ namespace PDF_Master.Views.HomePanel
                 ImgeActivity.Source = new BitmapImage(new Uri(App.CachePath.ADFilePath + "\\" + "advertisement" + ".png"));
                 DateTime targetstartTime = DateTimeOffset.FromUnixTimeMilliseconds(Settings.Default.ADDate.advertisement_BlackFridaystartTime).DateTime;
                 DateTime targetendTime = DateTimeOffset.FromUnixTimeMilliseconds(Settings.Default.ADDate.advertisement_BlackFridayendTime).DateTime;
-                DateTime localTime = DateTime.Now;
+                TimeZoneInfo chinaTimeZone = TimeZoneInfo.FindSystemTimeZoneById("China Standard Time");
+                DateTime beijingTime = TimeZoneInfo.ConvertTimeFromUtc(DateTime.UtcNow, chinaTimeZone);
 
-                if (localTime < targetendTime && localTime > targetstartTime)
+
+                if (beijingTime < targetendTime && beijingTime > targetstartTime)
                 {
                     ImgeActivity.Visibility = Visibility.Visible;
                 }

PDF Office/packages.config

@@ -17,7 +17,6 @@
   <package id="Microsoft.Office.Interop.Word" version="15.0.4797.1004" 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="NTwain" version="3.7.2" 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" />