2 Commit-ok 05f881a22a ... 95d324c6ad

Szerző SHA1 Üzenet Dátum
  niehaoyu 95d324c6ad Merge branch 'develop_PDFReaderPro_V4.7.0' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderPro_V4.7.0 4 napja
  niehaoyu 7773b55923 【会员系统】比较表远程配置调整, AI功能完善 4 napja

+ 17 - 0
PDF Office/PDF Master/Class/AIInfo/KMAIRequestServerManager.swift

@@ -300,6 +300,23 @@ class ResultWrapper: NSObject {
         let token: String = KMMemberInfo.shared.access_token
         if token == "" {
             complete(ResultWrapper(success: false, content: "unknown error"))
+            
+            if(KMMemberInfo.shared.isLogin == true) {
+                KMUserInfoViewController.refreshTokenUserInfo {[weak self] success, resDic in
+                    if(success == true) {
+                        
+                    } else {
+                        let code = resDic?.code ?? 200
+                        if(code == 304) {
+                            KMLoginWindowsController.shared.showWindow(nil)
+                        }
+                    }
+                }
+            } else {
+                KMLoginWindowsController.shared.showWindow(nil)
+            }
+            
+            return
         }
         
         let urlString = AIInfoConfig().memberAIActionURL + "/member-system-website/v1/translate/fileUpload"

+ 7 - 0
PDF Office/PDF Master/MemberCenter/WindowsController/KMProductCompareWC.swift

@@ -319,6 +319,9 @@ class KMProductCompareWC: NSWindowController {
             showDiscountToSaveWindow()
         }
         reloadDataContent()
+
+        showDiscount()
+
     }
 
     // MARK: - Private Methods
@@ -950,6 +953,10 @@ class KMProductCompareWC: NSWindowController {
                     configureDiscountView(discountYearly, with: item)
                 case 2:
                     configureDiscountView(discountPermanent, with: item)
+                case 3:
+                    configureDiscountView(discountPermanent2, with: item)
+                case 4:
+                    configureDiscountView(discountPermanent4, with: item)
                 default:
                     break
                 }

+ 3 - 3
PDF Office/PDF Master/MemberCenter/WindowsController/KMProductCompareWC.xib

@@ -102,7 +102,7 @@
         <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="documentWindow" titlebarAppearsTransparent="YES" id="7jy-UC-R98">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
             <rect key="contentRect" x="77" y="40" width="970" height="660"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
             <view key="contentView" wantsLayer="YES" misplaced="YES" id="BHT-Ss-56B">
                 <rect key="frame" x="0.0" y="0.0" width="970" height="660"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -1621,7 +1621,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                     </connections>
                 </button>
                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DQR-1s-l8u">
-                    <rect key="frame" x="253" y="36" width="46" height="47"/>
+                    <rect key="frame" x="178" y="36" width="47" height="47"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="47.119999999999997" id="4v3-zu-Z3K"/>
                         <constraint firstAttribute="width" constant="46.049999999999997" id="P2O-Kg-a7h"/>
@@ -1690,7 +1690,6 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                 </customView>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="DQR-1s-l8u" secondAttribute="trailing" id="19p-x7-bOw"/>
                 <constraint firstItem="SFA-A0-TRs" firstAttribute="top" secondItem="5lC-K6-aWW" secondAttribute="bottom" constant="8" id="1BI-cj-edg"/>
                 <constraint firstItem="SFA-A0-TRs" firstAttribute="centerX" secondItem="D71-TX-fVd" secondAttribute="centerX" id="7mx-Zo-GWI"/>
                 <constraint firstItem="Y18-DK-FWw" firstAttribute="leading" secondItem="fce-hX-IV6" secondAttribute="leading" id="961-gv-rLy"/>
@@ -1708,6 +1707,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                 <constraint firstItem="5lC-K6-aWW" firstAttribute="leading" secondItem="fce-hX-IV6" secondAttribute="leading" constant="4.75" id="hDG-RD-9E2"/>
                 <constraint firstItem="SFA-A0-TRs" firstAttribute="bottom" secondItem="JRG-Tt-bke" secondAttribute="bottom" id="l1K-zH-lpR"/>
                 <constraint firstItem="Y18-DK-FWw" firstAttribute="top" secondItem="fce-hX-IV6" secondAttribute="top" id="wq9-Kr-SEO"/>
+                <constraint firstItem="DQR-1s-l8u" firstAttribute="trailing" secondItem="JRG-Tt-bke" secondAttribute="trailing" constant="15" id="xWr-ZZ-4ra"/>
             </constraints>
             <point key="canvasLocation" x="1390" y="731"/>
         </customView>