远程广告默认配置

PDF Office/Helper/ADServiceHelper.cs

@@ -19,12 +19,25 @@ namespace PDF_Master.Helper
     //本辅助类不使用viewmodel,因为同时在PDFreaderPro上使用
     public static class ADServiceHelper
     {
-        public static bool IsUpdate=false;
+       
         public static string RequestHost = "http://test-store.kdan.cn:3019";
         public static string AdUrl = "/api/advertise-new";
-        public static string ImageUrl;
+   
+
         public static String GetAD(string appname)
         {
+            string FileNameMac = App.CachePath.ADFilePath + "\\" + "Mac" + ".png";
+            string FileNameiPad = App.CachePath.ADFilePath + "\\" + "iPad" + ".png";
+            string FileNameAndroid = App.CachePath.ADFilePath + "\\" + "Android" + ".png";
+            string FileNameComPDFKit = App.CachePath.ADFilePath + "\\" + "ComPDFKit" + ".png";
+            string FileNameComVideoKit = App.CachePath.ADFilePath + "\\" + "ComVideoKit" + ".png";
+            string FileNameSignFlow = App.CachePath.ADFilePath + "\\" + "SignFlow" + ".png";
+            string FileNameFilmageEditor = App.CachePath.ADFilePath + "\\" + "FilmageEditor" + ".png";
+            string FileNameFilmageScreen = App.CachePath.ADFilePath + "\\" + "FilmageScreen" + ".png";
+            string FileNameFreePDFTemplates = App.CachePath.ADFilePath + "\\" + "FreePDFTemplates" + ".png";
+            string FileNameBlackFriday = App.CachePath.ADFilePath + "\\" + "advertisement" + ".png";
+
+          
 
             HttpWebResponse response = null;
             ServicePointManager.DefaultConnectionLimit = 200;
@@ -96,7 +109,6 @@ namespace PDF_Master.Helper
                         Settings.Default.ADDate.RecommondPDFPro_Macimageen = RecommondPDFPro[0]["image"]["en"].ToString();
                         Settings.Default.ADDate.RecommondPDFPro_Macimagezh_CN = RecommondPDFPro[0]["image"]["zh_CN"].ToString();
                         Settings.Default.ADDate.RecommondPDFPro_Macimagezh_TW = RecommondPDFPro[0]["image"]["zh_TW"].ToString();
-                        string FileNameMac = App.CachePath.ADFilePath + "\\" + "Mac" + ".png";
                         if (RecommondPDFPro[0]["version"].ToString() != Settings.Default.ADDate.RecommondPDFPro_Macversion|| File.Exists(FileNameMac) == false)
                         {
                             Settings.Default.ADDate.RecommondPDFPro_Macversion = RecommondPDFPro[0]["version"].ToString();
@@ -128,7 +140,6 @@ namespace PDF_Master.Helper
                         Settings.Default.ADDate.RecommondPDFPro_iPadimageen = RecommondPDFPro[1]["image"]["en"].ToString();
                         Settings.Default.ADDate.RecommondPDFPro_iPadimagezh_CN = RecommondPDFPro[1]["image"]["zh_CN"].ToString();
                         Settings.Default.ADDate.RecommondPDFPro_iPadimagezh_TW = RecommondPDFPro[1]["image"]["zh_TW"].ToString();
-                        string FileNameiPad = App.CachePath.ADFilePath + "\\" + "iPad" + ".png";
                         if (RecommondPDFPro[1]["version"].ToString() != Settings.Default.ADDate.RecommondPDFPro_iPadversion|| File.Exists(FileNameiPad) == false)
                         {
                             Settings.Default.ADDate.RecommondPDFPro_iPadversion = RecommondPDFPro[1]["version"].ToString();
@@ -160,7 +171,6 @@ namespace PDF_Master.Helper
                         Settings.Default.ADDate.RecommondPDFPro_Androidimageen = RecommondPDFPro[2]["image"]["en"].ToString();
                         Settings.Default.ADDate.RecommondPDFPro_Androidimagezh_CN = RecommondPDFPro[2]["image"]["zh_CN"].ToString();
                         Settings.Default.ADDate.RecommondPDFPro_Androidimagezh_TW = RecommondPDFPro[2]["image"]["zh_TW"].ToString();
-                        string FileNameAndroid = App.CachePath.ADFilePath + "\\" + "Android" + ".png";
                         if (RecommondPDFPro[2]["version"].ToString() != Settings.Default.ADDate.RecommondPDFPro_Androidversion|| File.Exists(FileNameAndroid) == false)
                         {
                             Settings.Default.ADDate.RecommondPDFPro_Androidversion = RecommondPDFPro[2]["version"].ToString();
@@ -200,7 +210,6 @@ namespace PDF_Master.Helper
                         Settings.Default.ADDate.RecommondOther_ComPDFKitimageen = RecommondOther[0]["image"]["en"].ToString();
                         Settings.Default.ADDate.RecommondOther_ComPDFKitimagezh_CN = RecommondOther[0]["image"]["zh_CN"].ToString();
                         Settings.Default.ADDate.RecommondOther_ComPDFKitimagezh_TW = RecommondOther[0]["image"]["zh_TW"].ToString();
-                        string FileNameComPDFKit = App.CachePath.ADFilePath + "\\" + "ComPDFKit" + ".png";
                         if (RecommondOther[0]["version"].ToString() != Settings.Default.ADDate.RecommondOther_ComPDFKitversion|| File.Exists(FileNameComPDFKit) ==false)
                         {
                             Settings.Default.ADDate.RecommondOther_ComPDFKitversion = RecommondOther[0]["version"].ToString();
@@ -231,7 +240,6 @@ namespace PDF_Master.Helper
                         Settings.Default.ADDate.RecommondOther_ComVideoKitimageen = RecommondOther[1]["image"]["en"].ToString();
                         Settings.Default.ADDate.RecommondOther_ComVideoKitimagezh_CN = RecommondOther[1]["image"]["zh_CN"].ToString();
                         Settings.Default.ADDate.RecommondOther_ComVideoKitimagezh_TW = RecommondOther[1]["image"]["zh_TW"].ToString();
-                        string FileNameComVideoKit = App.CachePath.ADFilePath + "\\" + "ComVideoKit" + ".png";
                         if (RecommondOther[1]["version"].ToString() != Settings.Default.ADDate.RecommondOther_ComVideoKitversion|| File.Exists(FileNameComVideoKit) == false)
                         {
                             Settings.Default.ADDate.RecommondOther_ComVideoKitversion = RecommondOther[1]["version"].ToString();                         
@@ -262,7 +270,6 @@ namespace PDF_Master.Helper
                         Settings.Default.ADDate.RecommondOther_SignFlowimageen = RecommondOther[2]["image"]["en"].ToString();
                         Settings.Default.ADDate.RecommondOther_SignFlowimagezh_CN = RecommondOther[2]["image"]["zh_CN"].ToString();
                         Settings.Default.ADDate.RecommondOther_SignFlowimagezh_TW = RecommondOther[2]["image"]["zh_TW"].ToString();
-                        string FileNameSignFlow = App.CachePath.ADFilePath + "\\" + "SignFlow" + ".png";
                         if (RecommondOther[2]["version"].ToString() != Settings.Default.ADDate.RecommondOther_SignFlowversion|| File.Exists(FileNameSignFlow) == false)
                         {
                             Settings.Default.ADDate.RecommondOther_SignFlowversion = RecommondOther[2]["version"].ToString();
@@ -293,7 +300,6 @@ namespace PDF_Master.Helper
                         Settings.Default.ADDate.RecommondOther_FilmageEditorimageen = RecommondOther[3]["image"]["en"].ToString();
                         Settings.Default.ADDate.RecommondOther_FilmageEditorimagezh_CN = RecommondOther[3]["image"]["zh_CN"].ToString();
                         Settings.Default.ADDate.RecommondOther_FilmageEditorimagezh_TW = RecommondOther[3]["image"]["zh_TW"].ToString();
-                        string FileNameFilmageEditor = App.CachePath.ADFilePath + "\\" + "FilmageEditor" + ".png";
                         if (RecommondOther[3]["version"].ToString() != Settings.Default.ADDate.RecommondOther_FilmageEditorversion|| File.Exists(FileNameFilmageEditor) == false)
                         {
                             Settings.Default.ADDate.RecommondOther_FilmageEditorversion = RecommondOther[3]["version"].ToString();
@@ -324,7 +330,6 @@ namespace PDF_Master.Helper
                         Settings.Default.ADDate.RecommondOther_FilmageScreenimageen = RecommondOther[4]["image"]["en"].ToString();
                         Settings.Default.ADDate.RecommondOther_FilmageScreenimagezh_CN = RecommondOther[4]["image"]["zh_CN"].ToString();
                         Settings.Default.ADDate.RecommondOther_FilmageScreenimagezh_TW = RecommondOther[4]["image"]["zh_TW"].ToString();
-                        string FileNameFilmageScreen = App.CachePath.ADFilePath + "\\" + "FilmageScreen" + ".png";
                         if (RecommondOther[4]["version"].ToString() != Settings.Default.ADDate.RecommondOther_FilmageScreenversion|| File.Exists(FileNameFilmageScreen) == false)
                         {
                             Settings.Default.ADDate.RecommondOther_FilmageScreenversion = RecommondOther[4]["version"].ToString();
@@ -355,7 +360,6 @@ namespace PDF_Master.Helper
                         Settings.Default.ADDate.RecommondOther_FreePDFTemplatesimageen = RecommondOther[5]["image"]["en"].ToString();
                         Settings.Default.ADDate.RecommondOther_FreePDFTemplatesimagezh_CN = RecommondOther[5]["image"]["zh_CN"].ToString();
                         Settings.Default.ADDate.RecommondOther_FreePDFTemplatesimagezh_TW = RecommondOther[5]["image"]["zh_TW"].ToString();
-                        string FileNameFreePDFTemplates = App.CachePath.ADFilePath + "\\" + "FreePDFTemplates" + ".png";
                         if (RecommondOther[5]["version"].ToString() != Settings.Default.ADDate.RecommondOther_FreePDFTemplatesversion|| File.Exists(FileNameFreePDFTemplates) == false)
                         {
                             Settings.Default.ADDate.RecommondOther_FreePDFTemplatesversion = RecommondOther[5]["version"].ToString();
@@ -389,7 +393,6 @@ namespace PDF_Master.Helper
                         Settings.Default.ADDate.advertisement_BlackFridayimageen = advertisement[0]["image"]["en"].ToString();
                         Settings.Default.ADDate.advertisement_BlackFridayimagezh_CN = advertisement[0]["image"]["zh_CN"].ToString();
                         Settings.Default.ADDate.advertisement_BlackFridayimagezh_TW = advertisement[0]["image"]["zh_TW"].ToString();
-                        string FileNameBlackFriday = App.CachePath.ADFilePath + "\\" + "advertisement" + ".png";
                         if (advertisement[0]["version"].ToString() != Settings.Default.ADDate.advertisement_BlackFridayversion|| File.Exists(FileNameBlackFriday) == false)
                         {
                             if (File.Exists(FileNameBlackFriday) == true)

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

@@ -1,4 +1,5 @@
-using PDF_Master.Properties;
+using PDF_Master.Helper;
+using PDF_Master.Properties;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -61,18 +62,37 @@ namespace PDF_Master.Views.HomePanel
             {
                 Text_PDFPro.Text = Settings.Default.ADDate.RecommondContentPDFPro_nameen;
                 Text_Others.Text = Settings.Default.ADDate.RecommondContentOther_nameen;
-                PDFProPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "Mac" + ".png", Settings.Default.ADDate.RecommondPDFPro_Macnameen, Mac));
-                PDFProPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "iPad" + ".png", Settings.Default.ADDate.RecommondPDFPro_iPadnameen, iPad));
-                PDFProPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "Android" + ".png", Settings.Default.ADDate.RecommondPDFPro_Androidnameen, Android));
-                PDFProListview.ItemsSource = PDFProPromotion;
-
-                OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "ComPDFKit" + ".png", Settings.Default.ADDate.RecommondOther_ComPDFKitnameen, ComPDFKit));
-                OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "ComVideoKit" + ".png", Settings.Default.ADDate.RecommondOther_ComVideoKitnameen, ComVideoKit));
-                OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "SignFlow" + ".png", Settings.Default.ADDate.RecommondOther_SignFlownameen, SignFlow));
-                OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "FilmageEditor" + ".png", Settings.Default.ADDate.RecommondOther_FilmageEditornameen, FilmageEditor));
-                OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "FilmageScreen" + ".png", Settings.Default.ADDate.RecommondOther_FilmageScreennameen, FilmageScreen));
-                OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "FreePDFTemplates" + ".png", Settings.Default.ADDate.RecommondOther_FreePDFTemplatesnameen, FreePDFTemplates));
-                OthersListview.ItemsSource = OthersPromotion;
+                if (ServiceHelper.IsConnectInternet() == false)
+                {
+                    PDFProPromotion.Add(new PromotionBanner("pack://application:,,,/Resources/PromotionIcon/Mac.png", Settings.Default.ADDate.RecommondPDFPro_Macnameen, Mac));
+                    PDFProPromotion.Add(new PromotionBanner("pack://application:,,,/Resources/PromotionIcon/IPhoneiPad.png", Settings.Default.ADDate.RecommondPDFPro_iPadnameen, iPad));
+                    PDFProPromotion.Add(new PromotionBanner("pack://application:,,,/Resources/PromotionIcon/Android.png", Settings.Default.ADDate.RecommondPDFPro_Androidnameen, Android));
+                    PDFProListview.ItemsSource = PDFProPromotion;
+
+                    OthersPromotion.Add(new PromotionBanner("pack://application:,,,/Resources/PromotionIcon/ComPDFKit.png", Settings.Default.ADDate.RecommondOther_ComPDFKitnameen, ComPDFKit));
+                    //OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "ComVideoKit" + ".png", Settings.Default.ADDate.RecommondOther_ComVideoKitnameen, ComVideoKit));
+                    OthersPromotion.Add(new PromotionBanner("pack://application:,,,/Resources/PromotionIcon/SignFlow.png", Settings.Default.ADDate.RecommondOther_SignFlownameen, SignFlow));
+                    OthersPromotion.Add(new PromotionBanner("pack://application:,,,/Resources/PromotionIcon/FilmageEditor.png", Settings.Default.ADDate.RecommondOther_FilmageEditornameen, FilmageEditor));
+                    OthersPromotion.Add(new PromotionBanner("pack://application:,,,/Resources/PromotionIcon/FilmageScreen.png", Settings.Default.ADDate.RecommondOther_FilmageScreennameen, FilmageScreen));
+                    OthersPromotion.Add(new PromotionBanner("pack://application:,,,/Resources/PromotionIcon/FreePDFTemplates.png", Settings.Default.ADDate.RecommondOther_FreePDFTemplatesnameen, FreePDFTemplates));
+                    OthersListview.ItemsSource = OthersPromotion;
+                }
+                else
+                {
+                    PDFProPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "Mac" + ".png", Settings.Default.ADDate.RecommondPDFPro_Macnameen, Mac));
+                    PDFProPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "iPad" + ".png", Settings.Default.ADDate.RecommondPDFPro_iPadnameen, iPad));
+                    PDFProPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "Android" + ".png", Settings.Default.ADDate.RecommondPDFPro_Androidnameen, Android));
+                    PDFProListview.ItemsSource = PDFProPromotion;
+
+                    OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "ComPDFKit" + ".png", Settings.Default.ADDate.RecommondOther_ComPDFKitnameen, ComPDFKit));
+                    //OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "ComVideoKit" + ".png", Settings.Default.ADDate.RecommondOther_ComVideoKitnameen, ComVideoKit));
+                    OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "SignFlow" + ".png", Settings.Default.ADDate.RecommondOther_SignFlownameen, SignFlow));
+                    OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "FilmageEditor" + ".png", Settings.Default.ADDate.RecommondOther_FilmageEditornameen, FilmageEditor));
+                    OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "FilmageScreen" + ".png", Settings.Default.ADDate.RecommondOther_FilmageScreennameen, FilmageScreen));
+                    OthersPromotion.Add(new PromotionBanner(App.CachePath.ADFilePath + "\\" + "FreePDFTemplates" + ".png", Settings.Default.ADDate.RecommondOther_FreePDFTemplatesnameen, FreePDFTemplates));
+                    OthersListview.ItemsSource = OthersPromotion;
+                }
+               
             }
            catch { };
 

PDFSettings/ADDate.cs

@@ -7,10 +7,9 @@ using System.Threading.Tasks;
 namespace PDFSettings
 {
    public class ADDate
-    {
-
-        #region RecommondContentPDFPro
-        //RecommondContentPDFPro表头
+    {   
+    #region RecommondContentPDFPro
+    //RecommondContentPDFPro表头
         public string RecommondContentPDFPro_version { get; set; }
         public string RecommondContentPDFPro_nameen { get; set; }
         public string RecommondContentPDFPro_namezh_CN { get; set; }
@@ -30,12 +29,12 @@ namespace PDFSettings
         public string RecommondPDFPro_Mactooltipen { get; set; }
         public string RecommondPDFPro_Mactooltipzh_CN { get; set; }
         public string RecommondPDFPro_Mactooltipzh_TW { get; set; }
-        public string RecommondPDFPro_MaclinkURLen { get; set; }
+        public string RecommondPDFPro_MaclinkURLen { get; set; } 
         public string RecommondPDFPro_MaclinkURLzh_CN { get; set; }
         public string RecommondPDFPro_MaclinkURLzh_TW { get; set; }
         public string RecommondPDFPro_Macimagenormal { get; set; }
         public string RecommondPDFPro_Macimagehover { get; set; }
-        public string RecommondPDFPro_Macimageen { get; set; }
+        public string RecommondPDFPro_Macimageen { get; set; } = "pack://application:,,,/Resources/PromotionIcon/Mac.png";
         public string RecommondPDFPro_Macimagezh_CN { get; set; }
         public string RecommondPDFPro_Macimagezh_TW { get; set; }
 
@@ -59,7 +58,7 @@ namespace PDFSettings
         public string RecommondPDFPro_iPadlinkURLzh_TW { get; set; }
         public string RecommondPDFPro_iPadimagenormal { get; set; }
         public string RecommondPDFPro_iPadimagehover { get; set; }
-        public string RecommondPDFPro_iPadimageen { get; set; }
+        public string RecommondPDFPro_iPadimageen { get; set; } = "pack://application:,,,/Resources/PromotionIcon/IPhoneiPad.png";
         public string RecommondPDFPro_iPadimagezh_CN { get; set; }
         public string RecommondPDFPro_iPadimagezh_TW { get; set; }
 
@@ -83,7 +82,7 @@ namespace PDFSettings
         public string RecommondPDFPro_AndroidlinkURLzh_TW { get; set; }
         public string RecommondPDFPro_Androidimagenormal { get; set; }
         public string RecommondPDFPro_Androidimagehover { get; set; }
-        public string RecommondPDFPro_Androidimageen { get; set; }
+        public string RecommondPDFPro_Androidimageen { get; set; } = "pack://application:,,,/Resources/PromotionIcon/Android.png";
         public string RecommondPDFPro_Androidimagezh_CN { get; set; }
         public string RecommondPDFPro_Androidimagezh_TW { get; set; }
 
@@ -116,7 +115,7 @@ namespace PDFSettings
         public string RecommondOther_ComPDFKitlinkURLzh_TW { get; set; }
         public string RecommondOther_ComPDFKitimagenormal { get; set; }
         public string RecommondOther_ComPDFKitimagehover { get; set; }
-        public string RecommondOther_ComPDFKitimageen { get; set; }
+        public string RecommondOther_ComPDFKitimageen { get; set; }="pack://application:,,,/Resources/PromotionIcon/ComPDFKit.png";
         public string RecommondOther_ComPDFKitimagezh_CN { get; set; }
         public string RecommondOther_ComPDFKitimagezh_TW { get; set; }
 
@@ -140,7 +139,7 @@ namespace PDFSettings
         public string RecommondOther_ComVideoKitlinkURLzh_TW { get; set; }
         public string RecommondOther_ComVideoKitimagenormal { get; set; }
         public string RecommondOther_ComVideoKitimagehover { get; set; }
-        public string RecommondOther_ComVideoKitimageen { get; set; }
+        public string RecommondOther_ComVideoKitimageen { get; set; } = "pack://application:,,,/Resources/PromotionIcon/ComVideoKit.png";
         public string RecommondOther_ComVideoKitimagezh_CN { get; set; }
         public string RecommondOther_ComVideoKitimagezh_TW { get; set; }
 
@@ -166,7 +165,7 @@ namespace PDFSettings
         public string RecommondOther_SignFlowlinkURLzh_TW { get; set; }
         public string RecommondOther_SignFlowimagenormal { get; set; }
         public string RecommondOther_SignFlowimagehover { get; set; }
-        public string RecommondOther_SignFlowimageen { get; set; }
+        public string RecommondOther_SignFlowimageen { get; set; } = "pack://application:,,,/Resources/PromotionIcon/SignFLow.png";
         public string RecommondOther_SignFlowimagezh_CN { get; set; }
         public string RecommondOther_SignFlowimagezh_TW { get; set; }
 
@@ -190,7 +189,7 @@ namespace PDFSettings
         public string RecommondOther_FilmageEditorlinkURLzh_TW { get; set; }
         public string RecommondOther_FilmageEditorimagenormal { get; set; }
         public string RecommondOther_FilmageEditorimagehover { get; set; }
-        public string RecommondOther_FilmageEditorimageen { get; set; }
+        public string RecommondOther_FilmageEditorimageen { get; set; } = "pack://application:,,,/Resources/PromotionIcon/FilmageEditor.png";
         public string RecommondOther_FilmageEditorimagezh_CN { get; set; }
         public string RecommondOther_FilmageEditorimagezh_TW { get; set; }
 
@@ -213,7 +212,7 @@ namespace PDFSettings
         public string RecommondOther_FilmageScreenlinkURLzh_TW { get; set; }
         public string RecommondOther_FilmageScreenimagenormal { get; set; }
         public string RecommondOther_FilmageScreenimagehover { get; set; }
-        public string RecommondOther_FilmageScreenimageen { get; set; }
+        public string RecommondOther_FilmageScreenimageen { get; set; } = "pack://application:,,,/Resources/PromotionIcon/FilmageScreen.png";
         public string RecommondOther_FilmageScreenimagezh_CN { get; set; }
         public string RecommondOther_FilmageScreenimagezh_TW { get; set; }
 
@@ -236,7 +235,7 @@ namespace PDFSettings
         public string RecommondOther_FreePDFTemplateslinkURLzh_TW { get; set; }
         public string RecommondOther_FreePDFTemplatesimagenormal { get; set; }
         public string RecommondOther_FreePDFTemplatesimagehover { get; set; }
-        public string RecommondOther_FreePDFTemplatesimageen { get; set; }
+        public string RecommondOther_FreePDFTemplatesimageen { get; set; } = "pack://application:,,,/Resources/PromotionIcon/FreePDFTemplates.png";
         public string RecommondOther_FreePDFTemplatesimagezh_CN { get; set; }
         public string RecommondOther_FreePDFTemplatesimagezh_TW { get; set; }
         #endregion