【用户挽回】远程控制代码同步

PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift

@@ -239,6 +239,18 @@ import Cocoa
 
                 }
                 
+                if let item = data?.StoreUserRecovery?.content?.first {
+                    let url = URL(string: KMAdvertisementModelTransition.transitionImagePath(image: item.image, highlight: false))
+                    KMAdvertisementImage.imageWithURL(url: url) { image in
+                        // 预加载
+                    }
+                    
+                    let saleUrl = URL(string: KMAdvertisementModelTransition.transitionImagePath(image: item.saleImage, highlight: false))
+                    KMAdvertisementImage.imageWithURL(url: saleUrl) { image in
+                        // 预加载
+                    }
+                }
+                
                 if KMAdvertisementManager.manager.infoDict.allKeys.count > 0 {
                     if let adsInfo = KMAdvertisementManager.manager.infoDict["adsInfo"] {
                         let infoDict: NSDictionary = KMAdvertisementManager.manager.infoDict["adsInfo"] as! NSDictionary

PDF Office/PDF Master/Class/KMAdvertisement/Model/KMAdvertisementModel.swift

@@ -13,6 +13,7 @@
     public var remoteControl: KMAdvertisementRemoteControl?
     public var discountContent: KMAdvertisementItem?
     public var popWindowContent: KMAdvertisementItem?
+    public var StoreUserRecovery: KMAdvertisementItem?
 }
 
 @objcMembers public class KMAdvertisementContent: NSObject, Codable {
@@ -40,6 +41,7 @@
     var version: String? //版本号，唯一标识符
     var showCloseBtn: String? //是否显示关闭按钮，（左下角广告需要）
     var image: Image? //APP互推，常规状态下的图片
+    var saleImage: Image? // 订阅折扣图片
     var iconImage: String? //广告显示图片（自适应多语）
     var name: Language? //名称（自适应多语）
     var tooltip: Language? //提示语（自适应多语）

PDF Office/PDF Master/Class/Purchase/Appstore/KMPurchaseCompareWindowController.m

@@ -659,15 +659,19 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
 
     self.saleBox.hidden = true;
     self.saleIv.hidden = true;
-//    if ([self isShowSale]) {
-//        KMRecommondInfo *recoveryInfo = KMRecommondManager.manager.userRecoveryRecommond.recommondInfoArrM.firstObject;
-//        NSImage *image = recoveryInfo.saleImage;
-//        self.saleIv.image = image;
-//        self.saleBox.hidden = false;
-//        self.saleIv.hidden = false;
-//    } else {
-//        self.saleBox.hidden = true;
-//    }
+    if ([self isShowSale]) {
+        KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.StoreUserRecovery.content.firstObject;
+        NSURL *url = [NSURL URLWithString:[KMAdvertisementModelTransition transitionImagePathWithImage:info.saleImage highlight:true]];
+        [KMAdvertisementImage imageWithURLWithUrl:url completion:^(NSImage * _Nonnull image) {
+            if (image != nil) {
+                self.saleIv.image = image;
+                self.saleBox.hidden = false;
+                self.saleIv.hidden = false;
+            }
+        }];
+    } else {
+        self.saleBox.hidden = true;
+    }
     
     if ([IAPProductsManager defaultManager].isAvailableAllFunction) {
         self.value1PurchaseButton.enabled = NO;
@@ -1033,10 +1037,10 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
             if (isSubscribed) {
                 return false;
             }
-//            KMRecommondInfo *recoveryInfo = KMRecommondManager.manager.userRecoveryRecommond.recommondInfoArrM.firstObject;
-//            if (recoveryInfo.show == false) { // 活动结束
-//                return false;
-//            }
+            KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.StoreUserRecovery.content.firstObject;
+            if ([info.show boolValue] == false) { // 活动结束
+                return false;
+            }
             return true;
         }
     }
@@ -1057,34 +1061,34 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
 }
 
 - (void)showDiscountToSaveWindow {
-//    KMRecommondInfo *recoveryInfo = KMRecommondManager.manager.userRecoveryRecommond.recommondInfoArrM.firstObject;
-//    NSImage *image = recoveryInfo.image;
-//    if (image == nil) {
-//        return;
-//    }
-//
-//    if ([KMDiscountToSaveWindowController needShow] == false) {
-//        return;
-//    }
-//
-    KMDiscountToSaveWindowController *winC = [[KMDiscountToSaveWindowController alloc] initWithWindowNibName:@"KMDiscountToSaveWindowController"];
-    self.discountToSaveWinC = winC;
-    [self.window beginSheet:winC.window completionHandler:^(NSModalResponse returnCode) {
-
-    }];
-//
-//    winC.imgIv.image = image;
-//
+    if ([KMDiscountToSaveWindowController needShow] == false) {
+        return;
+    }
+    
+    KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.StoreUserRecovery.content.firstObject;
+    NSURL *url = [NSURL URLWithString: [KMAdvertisementModelTransition transitionImagePathWithImage:info.image highlight: YES]];
+    
     __weak typeof(self) weakSelf = self;
-    winC.itemClick = ^(NSInteger idx) {
-        [weakSelf.window endSheet:weakSelf.discountToSaveWinC.window];
-        weakSelf.discountToSaveWinC = nil;
-        if (idx == 2) { // 订阅
-////            NSLog(@"buttonItemClicked_Subscribe");
+    [self addWaingView:self.window.contentView];
+    [KMAdvertisementImage imageWithURLWithUrl:url completion:^(NSImage *image) {
+        [weakSelf removeWaitingView:weakSelf.window.contentView];
+        if (image == nil) {
+            return;
         }
-    };
-//
-//    [winC release];
+        
+        KMDiscountToSaveWindowController *winC = [[KMDiscountToSaveWindowController alloc] initWithWindowNibName:@"KMDiscountToSaveWindowController"];
+        weakSelf.discountToSaveWinC = winC;
+        [weakSelf.window beginSheet:winC.window completionHandler:^(NSModalResponse returnCode) { }];
+        
+        winC.imgIv.image = image;
+        winC.itemClick = ^(NSInteger idx) {
+            [weakSelf.window endSheet:weakSelf.discountToSaveWinC.window];
+            weakSelf.discountToSaveWinC = nil;
+            if (idx == 2) { // 订阅
+                ////            NSLog(@"buttonItemClicked_Subscribe");
+            }
+        };
+    }];
 }
 
 - (IBAction)buttonItemClicked_Restore:(id)sender {