【订阅】比较表折扣根据Appstore返回金额判断

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItem.swift

@@ -127,7 +127,7 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
             
             if data["type"] as! Int == 1 {
                 self.describeLabel.isHidden = false
-                self.iconImageView.isHidden = false
+                self.iconImageView.isHidden = true
                 
                 self.subtitleLabel.textColor = NSColor(hex: "#252629")
                 self.doneContentView.backgroundColor(NSColor(hex: "#FF852E"))
@@ -136,13 +136,6 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
                 self.doneButton.font = NSFont.SFProTextSemibold(16)
                 self.describeLabel.stringValue = "Save 50% for the first year, auto-renew at $79.9. Billed yearly."
                 
-                if KMLightMemberManager.manager.purchaseState == .trialExpired ||
-                    KMLightMemberManager.manager.purchaseState == .subscriptionExpired {
-                    self.iconImageView.isHidden = true
-                } else {
-                    self.iconImageView.isHidden = false
-                }
-                
                 self.updatePrice()
                 
             } else {
@@ -194,6 +187,12 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
 //                attributedString.addAttribute(NSAttributedString.Key.strikethroughStyle, value: NSNumber(value: NSUnderlineStyle.single.rawValue), range: range)
                 attributedString.addAttribute(NSAttributedString.Key.paragraphStyle, value: paragraphStyle, range: NSRange(location: 0, length: describeString.length))
                 self.describeLabel.attributedStringValue = attributedString
+                
+                if price != originPrice {
+                    self.iconImageView.isHidden = false
+                } else {
+                    self.iconImageView.isHidden = true
+                }
             }
         }
     }

PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/View/KMSubscribeWaterMarkView.swift

@@ -169,13 +169,14 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
         self.restoreButton.isHidden = true
 //        self.textView.isHidden = true
 #endif
-        if KMLightMemberManager.manager.purchaseState == .trialExpired ||
-            KMLightMemberManager.manager.purchaseState == .subscriptionExpired {
-            self.discountImageView.isHidden = true
-        } else {
-            self.discountImageView.isHidden = false
-        }
-            
+        self.discountImageView.isHidden = true
+        
+//        if KMLightMemberManager.manager.purchaseState == .trialExpired ||
+//            KMLightMemberManager.manager.purchaseState == .subscriptionExpired {
+//            self.discountImageView.isHidden = true
+//        } else {
+//            self.discountImageView.isHidden = false
+//        }
     }
     
     func updatePrice() {
@@ -192,6 +193,12 @@ class KMSubscribeWaterMarkView: KMBaseXibView {
                 let price: String = product.introductoryPrice?.price.description ?? "39.9"
                 let originPrice: String = product.price.description ?? "79.9"
                 self.subscribeLabel.stringValue = "\(currencyCode)\(price) / year"
+                
+                if price != originPrice {
+                    self.discountImageView.isHidden = false
+                } else {
+                    self.discountImageView.isHidden = true
+                }
             }
         }
     }