【综合】解决冲突

PDF Office/PDF Master/Class/Appearance/KMAppearance.swift

@@ -674,22 +674,22 @@ let KMImageNameElsei = "KMImageNameElsei";
     // 236 242 251
     class func buttonSelectedColor() -> NSColor {
         if (!self.isSupportNewColor()) {
-            return NSColor(hex: "#EAF2FB")
+            return NSColor.km_init(hex: "#EAF2FB")
         }
         if let _color = NSColor(named: "KMButtonSelectedColor") {
             return _color
         }
-        return NSColor(hex: "#EAF2FB")
+        return NSColor.km_init(hex: "#EAF2FB")
     }
     
     class func buttonDisabledColor() -> NSColor {
         if (!self.isSupportNewColor()) {
-            return NSColor(hex: "#DADBDE")
+            return NSColor.km_init(hex: "#DADBDE")
         }
         if let _color = NSColor(named: "KMButtonDisabledColor") {
             return _color
         }
-        return NSColor(hex: "#DADBDE")
+        return NSColor.km_init(hex: "#DADBDE")
     }
     
     class func separatorLineColor() -> NSColor {

PDF Office/PDF Master/Class/Home/View/HomeContentView/QucikTools/View/KMQucikToolCollectionViewItem.swift

@@ -118,8 +118,8 @@ class KMQucikToolCollectionViewItem: NSCollectionViewItem {
             guard let model = self.model else { return }
             if downEntered {
                 if model != nil {
-                    if model?.type == .FileCompare {
-                        model?.isNew = false
+                    if model.type == .FileCompare {
+                        model.isNew = false
                         UserDefaults.standard.setValue(true, forKey: "QucikToolsModelFileCompareKey")
                         UserDefaults.standard.synchronize()
                     }

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.xib

@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<<<<<<< HEAD
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
-=======
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
->>>>>>> develop_PDFReaderProNew
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -19,12 +12,9 @@
                 <outlet property="allContentMenu" destination="CPK-uS-4AE" id="Iwv-Vn-2ol"/>
                 <outlet property="allContentMenu2" destination="vBM-XN-pKT" id="93t-Zm-dpB"/>
                 <outlet property="allContentMenu3" destination="yYm-Qc-Owk" id="DcX-Tq-7QJ"/>
-<<<<<<< HEAD
                 <outlet property="allPageButton" destination="i6b-xc-EnV" id="kcK-qQ-pQl"/>
                 <outlet property="autoCreateFolderBtn" destination="cZt-Q3-8Lg" id="f8O-hS-1az"/>
                 <outlet property="autoCreateGuideBtn" destination="Gap-26-ZYO" id="0p5-Jw-Zbf"/>
-=======
->>>>>>> develop_PDFReaderProNew
                 <outlet property="batchButton" destination="Qt9-t5-iOv" id="4Uk-ND-9cb"/>
                 <outlet property="buttonBottemOffset" destination="038-Ye-5oH" id="rJL-zQ-c99"/>
                 <outlet property="buttonTopOffset" destination="S2V-FH-ddg" id="2WI-tu-xGe"/>
@@ -317,7 +307,6 @@ Gw
                             <action selector="buttonClicked_Batch:" target="-2" id="gpQ-nf-WHJ"/>
                         </connections>
                     </button>
-<<<<<<< HEAD
                     <box title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="jUW-ZO-oLT">
                         <rect key="frame" x="367" y="46" width="316" height="167"/>
                         <view key="contentView" id="2NG-Rm-aku">
@@ -419,8 +408,6 @@ Gw
                             <action selector="sameFolderBtnGuide:" target="-2" id="qH4-PQ-zTU"/>
                         </connections>
                     </button>
-=======
->>>>>>> develop_PDFReaderProNew
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rXb-T4-yMb">
                         <rect key="frame" x="75" y="7" width="87" height="32"/>
                         <buttonCell key="cell" type="push" title="Upgrade" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PUQ-iR-bff">
@@ -808,12 +795,9 @@ Gw
                     <constraint firstItem="9e4-ci-JPQ" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="28f-42-Fmz"/>
                     <constraint firstAttribute="trailing" secondItem="RKf-EU-J3Q" secondAttribute="trailing" constant="50" id="5LO-k9-88a"/>
                     <constraint firstItem="UPM-vO-BAb" firstAttribute="leading" secondItem="9e4-ci-JPQ" secondAttribute="trailing" constant="16" id="BJP-lY-vqA"/>
-<<<<<<< HEAD
                     <constraint firstItem="jUW-ZO-oLT" firstAttribute="top" secondItem="3if-Xs-8Lv" secondAttribute="bottom" constant="125" id="BVR-t4-M1Y"/>
                     <constraint firstItem="jUW-ZO-oLT" firstAttribute="trailing" secondItem="aGQ-OF-WXB" secondAttribute="trailing" id="DZm-em-mgb"/>
                     <constraint firstItem="Gap-26-ZYO" firstAttribute="leading" secondItem="cZt-Q3-8Lg" secondAttribute="trailing" constant="5" id="FTu-o6-zwV"/>
-=======
->>>>>>> develop_PDFReaderProNew
                     <constraint firstItem="R2E-0y-EaA" firstAttribute="top" secondItem="3if-Xs-8Lv" secondAttribute="bottom" constant="25" id="Ge2-Ei-w2S"/>
                     <constraint firstAttribute="trailing" secondItem="Bpl-Ox-GVU" secondAttribute="trailing" constant="50" id="H46-uf-gXQ"/>
                     <constraint firstItem="hQ6-L6-IW2" firstAttribute="leading" secondItem="9e4-ci-JPQ" secondAttribute="trailing" constant="16" id="HHE-ga-88s"/>
@@ -832,13 +816,10 @@ Gw
                     <constraint firstItem="aGQ-OF-WXB" firstAttribute="top" secondItem="3if-Xs-8Lv" secondAttribute="bottom" constant="25" id="XBe-5E-DOQ"/>
                     <constraint firstItem="9e4-ci-JPQ" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="Xkp-aI-WHZ"/>
                     <constraint firstItem="R2E-0y-EaA" firstAttribute="trailing" secondItem="aGQ-OF-WXB" secondAttribute="trailing" id="b9n-uX-rA6"/>
-<<<<<<< HEAD
                     <constraint firstItem="Gap-26-ZYO" firstAttribute="centerY" secondItem="cZt-Q3-8Lg" secondAttribute="centerY" id="bcr-OO-TX5"/>
-=======
                     <constraint firstItem="Bpl-Ox-GVU" firstAttribute="leading" secondItem="9e4-ci-JPQ" secondAttribute="trailing" constant="5" id="c3Z-Em-Uw3"/>
                     <constraint firstItem="RKf-EU-J3Q" firstAttribute="trailing" secondItem="R2E-0y-EaA" secondAttribute="trailing" id="hnY-b4-w8H"/>
                     <constraint firstItem="Bpl-Ox-GVU" firstAttribute="top" secondItem="3if-Xs-8Lv" secondAttribute="bottom" constant="128" id="mnw-u6-WjY"/>
->>>>>>> develop_PDFReaderProNew
                     <constraint firstItem="Qt9-t5-iOv" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" constant="20" id="n3y-XG-Jvq"/>
                     <constraint firstItem="RKf-EU-J3Q" firstAttribute="leading" secondItem="R2E-0y-EaA" secondAttribute="leading" id="raI-au-pfs"/>
                     <constraint firstItem="RKf-EU-J3Q" firstAttribute="leading" secondItem="9e4-ci-JPQ" secondAttribute="trailing" constant="5" id="rch-oh-6Us"/>

PDF Office/PDF Master/Class/PDFTools/Merge/Controller/KMMergePopoverViewController.xib

@@ -6,11 +6,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-<<<<<<< HEAD
         <customObject id="-2" userLabel="File's Owner" customClass="KMMergePopoverViewController" customModule="LynxPDF_Editor" customModuleProvider="target">
-=======
-        <customObject id="-2" userLabel="File's Owner" customClass="KMMergePopoverViewController" customModule="PDF_Reader_Pro" customModuleProvider="target">
->>>>>>> develop_PDFReaderProNew
             <connections>
                 <outlet property="label" destination="8ON-RW-0EV" id="y6y-6f-K2k"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>

PDF Office/PDF Master/Class/PDFTools/PageEdit/Controller/KMPDFEditViewController.swift

@@ -1592,32 +1592,32 @@ class KMPDFEditViewController: KMPDFThumbViewBaseController {
         return pdfData as? Data
     }
     
-    @objc func item_insertFromScanner(sender: NSMenuItem?) {
-        if IAPProductsManager.default().isAvailableAllFunction() == false {
-            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
-            return
-        }
-        
-        let vc = KMDeviceBrowserWindowController.shared
-        vc.type = .scanner
-        vc.importScannerFileCallback = { [weak self](url: NSURL) -> Void in  
-//            self?.choosePositionWindow {[weak self] index in
-                /// 插入位置
-                if let imag = NSImage(contentsOfFile: url.path! ) {
-                    let index = (self?.getInsertIndex())! + 1
-                    let document = CPDFDocument()
-                    _ = document?.km_insertPage(imag.size, withImage: url.path! , at: 0)
-                    if let page: CPDFPage = (document?.page(at: 0)) {
-                        self?.insertPages(pages: [page], at: IndexSet(integer: index))
-                    }
-                    let ips: Set<IndexPath> = [IndexPath(item: index, section: 0)]
-                    self?.thumbnailView.collectionView.scrollToItems(at: ips, scrollPosition: .centeredVertically)
-                }
-//            }
-            vc.close()
-        }
-        vc.showWindow(NSApp.mainWindow)
-    }
+//    @objc func item_insertFromScanner(sender: NSMenuItem?) {
+//        if IAPProductsManager.default().isAvailableAllFunction() == false {
+//            KMPurchaseCompareWindowController.sharedInstance().showWindow(nil)
+//            return
+//        }
+//        
+//        let vc = KMDeviceBrowserWindowController.shared
+//        vc.type = .scanner
+//        vc.importScannerFileCallback = { [weak self](url: NSURL) -> Void in  
+////            self?.choosePositionWindow {[weak self] index in
+//                /// 插入位置
+//                if let imag = NSImage(contentsOfFile: url.path! ) {
+//                    let index = (self?.getInsertIndex())! + 1
+//                    let document = CPDFDocument()
+//                    _ = document?.km_insertPage(imag.size, withImage: url.path! , at: 0)
+//                    if let page: CPDFPage = (document?.page(at: 0)) {
+//                        self?.insertPages(pages: [page], at: IndexSet(integer: index))
+//                    }
+//                    let ips: Set<IndexPath> = [IndexPath(item: index, section: 0)]
+//                    self?.thumbnailView.collectionView.scrollToItems(at: ips, scrollPosition: .centeredVertically)
+//                }
+////            }
+//            vc.close()
+//        }
+//        vc.showWindow(NSApp.mainWindow)
+//    }
     
     func extractSelectPageItemAction() {
         if IAPProductsManager.default().isAvailableAllFunction() == false {

PDF Office/PDF Master/Class/PDFTools/PageEdit/View/KMPDFEditToolbar.swift

@@ -59,23 +59,23 @@ enum KMPageEditType: Int {
         }
     }
     
-    static var insert_fromImage: Int {
-        get {
-            return self.insert.rawValue + 1003
-        }
-    }
-    
-    static var insert_fromClipboard: Int {
-        get {
-            return self.insert.rawValue + 1004
-        }
-    }
-    
-    static var insert_fromScanner: Int {
-        get {
-            return self.insert.rawValue + 1005
-        }
-    }
+//    static var insert_fromImage: Int {
+//        get {
+//            return self.insert.rawValue + 1003
+//        }
+//    }
+//    
+//    static var insert_fromClipboard: Int {
+//        get {
+//            return self.insert.rawValue + 1004
+//        }
+//    }
+//    
+//    static var insert_fromScanner: Int {
+//        get {
+//            return self.insert.rawValue + 1005
+//        }
+//    }
     
     static var extract_selected_pages: Int {
         get {

PDF Office/PDF Master/Class/PDFTools/Redact/Controller/KMPDFRedactViewController.xib

@@ -22,15 +22,9 @@
                 <outlet property="redactTipLabel" destination="YU9-ht-l5r" id="Z1O-ZP-7Xa"/>
                 <outlet property="toolView" destination="2S1-Gb-ePE" id="QY0-Kq-JcW"/>
                 <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
-<<<<<<< HEAD
                 <outlet property="whiteRedactBox" destination="4bw-Lu-Iet" id="05Q-Df-KFg"/>
                 <outlet property="whiteRedactBtn" destination="4Gq-9K-EkC" id="hOn-WM-XXT"/>
                 <outlet property="whiteRedactLabel" destination="q7O-sY-YmJ" id="9yq-Km-YdR"/>
-=======
-                <outlet property="whiteOutBox" destination="ilD-02-AHW" id="GeI-cj-oYX"/>
-                <outlet property="whiteOutButton" destination="2kK-qf-LCr" id="C8E-nI-jaH"/>
-                <outlet property="whiteOutLabel" destination="GzX-GG-5zC" id="Whd-wP-ZUf"/>
->>>>>>> develop_PDFReaderProNew
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
@@ -148,113 +142,6 @@
                                 <constraint firstAttribute="height" constant="24" id="cDN-lX-Jb8"/>
                             </constraints>
                         </box>
-<<<<<<< HEAD
-=======
-                        <box boxType="custom" borderType="none" cornerRadius="4" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="ilD-02-AHW">
-                            <rect key="frame" x="389" y="8" width="81" height="24"/>
-                            <view key="contentView" id="NxZ-uq-kLH">
-                                <rect key="frame" x="0.0" y="0.0" width="81" height="24"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="nqh-33-2zD">
-                                        <rect key="frame" x="10" y="2" width="20" height="20"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="20" id="MC2-OR-b99"/>
-                                            <constraint firstAttribute="height" constant="20" id="hBV-0T-VJJ"/>
-                                        </constraints>
-                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="KMImageNameButtonRedactWhite" id="oP6-pp-sBC"/>
-                                    </imageView>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GzX-GG-5zC">
-                                        <rect key="frame" x="36" y="4" width="37" height="16"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="QUR-sW-y9x">
-                                            <font key="font" metaFont="system"/>
-                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2kK-qf-LCr" customClass="KMCustomButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="0.0" width="81" height="24"/>
-                                        <buttonCell key="cell" type="bevel" bezelStyle="regularSquare" alignment="center" state="on" imageScaling="proportionallyDown" inset="2" id="Xcm-64-c8X">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                    </button>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="GzX-GG-5zC" firstAttribute="centerY" secondItem="nqh-33-2zD" secondAttribute="centerY" id="DDp-WI-zMQ"/>
-                                    <constraint firstItem="GzX-GG-5zC" firstAttribute="leading" secondItem="nqh-33-2zD" secondAttribute="trailing" constant="8" id="Ivn-E7-xDD"/>
-                                    <constraint firstItem="2kK-qf-LCr" firstAttribute="top" secondItem="NxZ-uq-kLH" secondAttribute="top" id="Opf-Nv-Vwi"/>
-                                    <constraint firstAttribute="bottom" secondItem="2kK-qf-LCr" secondAttribute="bottom" id="Rbk-3j-3vO"/>
-                                    <constraint firstItem="2kK-qf-LCr" firstAttribute="leading" secondItem="NxZ-uq-kLH" secondAttribute="leading" id="bdu-63-Ci6"/>
-                                    <constraint firstAttribute="trailing" secondItem="2kK-qf-LCr" secondAttribute="trailing" id="js5-qs-4Ij"/>
-                                    <constraint firstItem="nqh-33-2zD" firstAttribute="centerY" secondItem="NxZ-uq-kLH" secondAttribute="centerY" id="kLT-X8-SnG"/>
-                                    <constraint firstItem="nqh-33-2zD" firstAttribute="leading" secondItem="NxZ-uq-kLH" secondAttribute="leading" constant="10" id="qgm-db-ESl"/>
-                                    <constraint firstAttribute="trailing" secondItem="GzX-GG-5zC" secondAttribute="trailing" constant="10" id="tP7-eB-yUT"/>
-                                </constraints>
-                            </view>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="24" id="MyR-VT-eI8"/>
-                            </constraints>
-                        </box>
-                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YU9-ht-l5r">
-                            <rect key="frame" x="14" y="12" width="60" height="17"/>
-                            <textFieldCell key="cell" lineBreakMode="clipping" title="Edit PDF" id="xwB-CI-KY9">
-                                <font key="font" metaFont="system" size="14"/>
-                                <color key="textColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                            </textFieldCell>
-                        </textField>
-                        <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="p57-Ip-T2T" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                            <rect key="frame" x="906" y="8" width="79" height="24"/>
-                            <view key="contentView" id="SkL-h8-Tpz">
-                                <rect key="frame" x="0.0" y="0.0" width="79" height="24"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jgL-Z5-PR3">
-                                        <rect key="frame" x="20" y="4" width="39" height="16"/>
-                                        <buttonCell key="cell" type="bevel" title="Apply" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="Avm-LZ-ePg">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="apply_button:" target="-2" id="e1M-4e-CN2"/>
-                                        </connections>
-                                    </button>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstAttribute="trailing" secondItem="jgL-Z5-PR3" secondAttribute="trailing" constant="20" id="O24-kg-iaR"/>
-                                    <constraint firstItem="jgL-Z5-PR3" firstAttribute="leading" secondItem="SkL-h8-Tpz" secondAttribute="leading" constant="20" id="YiZ-mR-yNH"/>
-                                    <constraint firstItem="jgL-Z5-PR3" firstAttribute="centerY" secondItem="SkL-h8-Tpz" secondAttribute="centerY" id="lxb-En-69V"/>
-                                </constraints>
-                            </view>
-                            <color key="fillColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </box>
-                        <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="dDh-hJ-cIA" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                            <rect key="frame" x="827" y="8" width="67" height="24"/>
-                            <view key="contentView" id="qpy-I2-8jU">
-                                <rect key="frame" x="0.0" y="0.0" width="67" height="24"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pup-Oa-y3G">
-                                        <rect key="frame" x="20" y="4" width="27" height="16"/>
-                                        <buttonCell key="cell" type="bevel" title="Exit" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="TcM-v9-HPa">
-                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                            <font key="font" metaFont="system"/>
-                                        </buttonCell>
-                                        <connections>
-                                            <action selector="exit_button:" target="-2" id="jp5-Zg-WXB"/>
-                                        </connections>
-                                    </button>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="pup-Oa-y3G" firstAttribute="leading" secondItem="qpy-I2-8jU" secondAttribute="leading" constant="20" id="3fF-7j-K5P"/>
-                                    <constraint firstItem="pup-Oa-y3G" firstAttribute="centerY" secondItem="qpy-I2-8jU" secondAttribute="centerY" id="VpB-D0-d0P"/>
-                                    <constraint firstAttribute="trailing" secondItem="pup-Oa-y3G" secondAttribute="trailing" constant="20" id="k6e-jp-K9d"/>
-                                </constraints>
-                            </view>
-                            <color key="fillColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </box>
->>>>>>> develop_PDFReaderProNew
                         <box boxType="custom" borderType="none" cornerRadius="4" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="iwX-y1-ea2">
                             <rect key="frame" x="575" y="8" width="81" height="24"/>
                             <view key="contentView" id="ZZF-jp-flc">
@@ -365,13 +252,7 @@
                         <constraint firstItem="p57-Ip-T2T" firstAttribute="top" secondItem="2S1-Gb-ePE" secondAttribute="top" constant="8" id="WR2-Qc-g35"/>
                         <constraint firstAttribute="height" constant="40" id="WUy-y7-LrA"/>
                         <constraint firstItem="YU9-ht-l5r" firstAttribute="leading" secondItem="2S1-Gb-ePE" secondAttribute="leading" constant="16" id="aT9-aj-pzQ"/>
-<<<<<<< HEAD
-                        <constraint firstItem="iwX-y1-ea2" firstAttribute="centerX" secondItem="2S1-Gb-ePE" secondAttribute="centerX" constant="46" id="bXp-VB-JyA"/>
-                        <constraint firstItem="aoK-i3-jUv" firstAttribute="leading" secondItem="4bw-Lu-Iet" secondAttribute="trailing" constant="12" id="cmn-X5-E28"/>
-=======
-                        <constraint firstItem="iwX-y1-ea2" firstAttribute="centerX" secondItem="2S1-Gb-ePE" secondAttribute="centerX" constant="115" id="bXp-VB-JyA"/>
-                        <constraint firstItem="ilD-02-AHW" firstAttribute="centerY" secondItem="2S1-Gb-ePE" secondAttribute="centerY" id="iHZ-bb-mu2"/>
->>>>>>> develop_PDFReaderProNew
+
                         <constraint firstItem="p57-Ip-T2T" firstAttribute="leading" secondItem="dDh-hJ-cIA" secondAttribute="trailing" constant="12" id="iIc-KL-0gR"/>
                         <constraint firstAttribute="bottom" secondItem="dDh-hJ-cIA" secondAttribute="bottom" constant="8" id="m6o-zI-Wdu"/>
                         <constraint firstAttribute="bottom" secondItem="p57-Ip-T2T" secondAttribute="bottom" constant="8" id="mtN-jR-bCV"/>

PDF Office/PDF Master/Class/PDFWindowController/MainWindowController/KMPresentationTopViewController.swift

@@ -104,7 +104,7 @@ public class KMPresentationTopViewController: NSViewController, KMDrawViewDelega
     private func updateViewColor() {
         let isDark = KMAppearance.isDarkMode()
         if isDark {
-            self.view.layer?.backgroundColor = NSColor(hex: "#464646").cgColor
+            self.view.layer?.backgroundColor = NSColor.km_init(hex: "#464646").cgColor
         } else {
             self.view.layer?.backgroundColor = NSColor.white.cgColor
         }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/Annotation/View/KMNoteFooterCellView.swift

@@ -136,7 +136,7 @@ class KMNoteFooterCellView: NSTableCellView, NibLoadable {
         self.commentBox.borderWidth = 0
         self.commentBox.moveCallback = { enter, theBox in
             if enter {
-                theBox.fillColor = NSColor(hex: "#477EDE").withAlphaComponent(0.1)
+                theBox.fillColor = NSColor.km_init(hex: "#477EDE").withAlphaComponent(0.1)
             } else {
                 theBox.fillColor = .clear
             }

PDF Office/PDF Master/Class/PDFWindowController/Side/LeftSide/BookMarks/View/KMBookMarkTableRowView.swift

@@ -103,7 +103,7 @@ extension KMBookMarkTableRowView {
         } else if self.model.hover {
             let isDark = KMAppearance.isDarkMode()
             if isDark {
-                self.box?.backgroundColor(NSColor(hex: "#56585A"))
+                self.box?.backgroundColor(NSColor.km_init(hex: "#56585A"))
             } else {
                 self.box?.backgroundColor(NSColor.km_init(hex: "#EDEEF0"))
             }

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/AnnotationProperty/KMGeneralAnnotationViewController.xib

@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<<<<<<< HEAD
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
-=======
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
-    <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
->>>>>>> develop_PDFReaderProNew
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -254,14 +247,7 @@
                                     </button>
                                     <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="AHs-kd-sAo" customClass="KMPopUpButton" customModule="PDFTech_Editor" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="65" width="449" height="24"/>
-<<<<<<< HEAD
                                         <popUpButtonCell key="cell" type="square" bezelStyle="shadowlessSquare" alignment="left" lineBreakMode="truncatingTail" inset="2" arrowPosition="noArrow" id="Vv5-1P-Y1g" customClass="KMPopUpButtonCell" customModule="PDFTech_Editor" customModuleProvider="target">
-=======
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="24" id="gdZ-Gv-m63"/>
-                                        </constraints>
-                                        <popUpButtonCell key="cell" type="square" bezelStyle="shadowlessSquare" alignment="left" lineBreakMode="truncatingTail" inset="2" arrowPosition="noArrow" id="Vv5-1P-Y1g" customClass="KMPopUpButtonCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
->>>>>>> develop_PDFReaderProNew
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" usesAppearanceFont="YES"/>
                                             <menu key="menu" id="fW2-Mn-ucz"/>
@@ -270,13 +256,8 @@
                                             <action selector="fontPopUpButtonAction:" target="-2" id="umX-SG-GYl"/>
                                         </connections>
                                     </popUpButton>
-<<<<<<< HEAD
                                     <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ddA-v5-KF1" customClass="KMComboBox" customModule="PDFTech_Editor" customModuleProvider="target">
                                         <rect key="frame" x="353" y="33" width="96" height="23"/>
-=======
-                                    <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ddA-v5-KF1" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="354" y="33" width="95" height="23"/>
->>>>>>> develop_PDFReaderProNew
                                         <constraints>
                                             <constraint firstAttribute="width" constant="92" id="oJG-Z9-pzj"/>
                                         </constraints>
@@ -427,13 +408,8 @@
                                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-<<<<<<< HEAD
                                                 <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Qzi-o3-DRu" customClass="KMComboBox" customModule="PDFTech_Editor" customModuleProvider="target">
                                                     <rect key="frame" x="376" y="-2" width="76" height="27"/>
-=======
-                                                <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Qzi-o3-DRu" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                    <rect key="frame" x="377" y="-4" width="75" height="30"/>
->>>>>>> develop_PDFReaderProNew
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="72" id="Agl-cI-DK9"/>
                                                         <constraint firstAttribute="height" constant="24" id="rOY-qg-B8b"/>
@@ -509,13 +485,8 @@
                                             <action selector="borderButtonAction:" target="-2" id="yhp-LA-40f"/>
                                         </connections>
                                     </button>
-<<<<<<< HEAD
                                     <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DvE-Q8-vIM" customClass="KMComboBox" customModule="PDFTech_Editor" customModuleProvider="target">
                                         <rect key="frame" x="376" y="65" width="73" height="23"/>
-=======
-                                    <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DvE-Q8-vIM" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="377" y="63" width="72" height="23"/>
->>>>>>> develop_PDFReaderProNew
                                         <constraints>
                                             <constraint firstAttribute="width" constant="69" id="RT6-4A-iQr"/>
                                         </constraints>
@@ -579,11 +550,7 @@
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         </view>
                                     </box>
-<<<<<<< HEAD
                                     <button tag="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oGT-YN-wXO" customClass="KMButton" customModule="PDFTech_Editor" customModuleProvider="target">
-=======
-                                    <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="oGT-YN-wXO" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
->>>>>>> develop_PDFReaderProNew
                                         <rect key="frame" x="153" y="0.0" width="143" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="24" id="YWr-iy-XVX"/>
@@ -603,11 +570,7 @@
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         </view>
                                     </box>
-<<<<<<< HEAD
                                     <button tag="2" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZjM-D6-rzr" customClass="KMButton" customModule="PDFTech_Editor" customModuleProvider="target">
-=======
-                                    <button verticalHuggingPriority="750" tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="ZjM-D6-rzr" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
->>>>>>> develop_PDFReaderProNew
                                         <rect key="frame" x="305" y="0.0" width="144" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="24" id="yrC-QK-pLc"/>
@@ -672,13 +635,8 @@
                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-<<<<<<< HEAD
                                     <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RfV-LZ-n4w" customClass="KMComboBox" customModule="PDFTech_Editor" customModuleProvider="target">
                                         <rect key="frame" x="376" y="2" width="73" height="23"/>
-=======
-                                    <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RfV-LZ-n4w" customClass="KMComboBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                        <rect key="frame" x="377" y="0.0" width="72" height="23"/>
->>>>>>> develop_PDFReaderProNew
                                         <constraints>
                                             <constraint firstAttribute="width" constant="69" id="8OG-pa-Aq1"/>
                                         </constraints>
@@ -1014,21 +972,14 @@
                                             <subviews>
                                                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3Ed-Ae-CMS">
                                                     <rect key="frame" x="28" y="0.0" width="50" height="56"/>
-<<<<<<< HEAD
                                                     <buttonCell key="cell" type="square" title="Button" bezelStyle="shadowlessSquare" image="KMImageNameUXIconPropertybarNoteAnnotationNor" imagePosition="above" alignment="center" scrollable="YES" lineBreakMode="clipping" imageScaling="proportionallyDown" inset="2" id="8we-yJ-WKl" customClass="KMNoteIconButtonCell" customModule="PDFTech_Editor" customModuleProvider="target">
                                                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                         <font key="font" metaFont="smallSystem"/>
                                                     </buttonCell>
-=======
->>>>>>> develop_PDFReaderProNew
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="50" id="OPO-Ry-2DB"/>
                                                         <constraint firstAttribute="height" constant="56" id="y9b-b7-L6i"/>
                                                     </constraints>
-                                                    <buttonCell key="cell" type="square" title="Button" bezelStyle="shadowlessSquare" image="KMImageNameUXIconPropertybarNoteAnnotationNor" imagePosition="above" alignment="center" scrollable="YES" lineBreakMode="clipping" imageScaling="proportionallyDown" inset="2" id="8we-yJ-WKl" customClass="KMNoteIconButtonCell" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                        <font key="font" metaFont="smallSystem"/>
-                                                    </buttonCell>
                                                     <connections>
                                                         <action selector="iconButtonAction:" target="-2" id="9w4-tQ-4B5"/>
                                                     </connections>

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditImagePropertyViewController.swift

@@ -425,7 +425,7 @@ class KMEditImagePropertyViewController: NSViewController {
 //    }
     
     func updateUI() {
-        let isDarkModel = KMAppearance.isDarkModel()
+        let isDarkModel = NSView.isDarkModel()
         if isDarkModel {
             self.backgroundView.backgroundColor(NSColor.km_init(hex: "#252526"))
             self.noBackgroundView.backgroundColor(NSColor.km_init(hex: "#252526"))

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/KMEditPDFTextPropertyViewController.swift

@@ -568,7 +568,7 @@ class KMEditPDFTextPropertyViewController: NSViewController {
 //    }
     
     func updateUI() {
-        let isDarkModel = KMAppearance.isDarkModel()
+        let isDarkModel = KMAppearance.isDarkMode()
         if isDarkModel {
             self.backgroundView.backgroundColor(NSColor.km_init(hex: "#252526"))
             

PDF Office/PDF Master/Class/PDFWindowController/Side/RightSide/EditPDF/View/AlignmentView/KMEditPropertyAlignmentView.swift

@@ -159,7 +159,7 @@ class KMEditPropertyAlignmentView: KMBaseXibView {
     }
     
     override func changeEffectiveAppearance() {
-        let isDarkModel = KMAdvertisementConfig.isDarkModel()
+        let isDarkModel = KMAppearance.isDarkMode()
         if isDarkModel {
             self.appearance = NSAppearance(named: .darkAqua)
         } else {
@@ -171,7 +171,7 @@ class KMEditPropertyAlignmentView: KMBaseXibView {
     override func updateUI() {
         super.updateUI()
         
-        let isDarkModel = KMAdvertisementConfig.isDarkModel()
+        let isDarkModel = KMAppearance.isDarkMode()
         if isDarkModel {
             for vcItem in [leftAreasVC, verticalCenterAreasVC, rightButtonAreasVC, horzontalAreasVC,
                            topAreasVC, horizontalCenterAreasVC, botoomAreasVC, verticalAreasVC] {

PDF Office/PDF Master/Class/Preference/Controller/Base.lproj/GeneralPreferences.xib

@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<<<<<<< HEAD
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment version="1070" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
-=======
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
-    <dependencies>
-        <deployment version="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
->>>>>>> develop_PDFReaderProNew
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>

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

@@ -669,17 +669,17 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
     self.saleBox.hidden = true;
     self.saleIv.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;
-                
-                [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Exposure" : @"PUW_7OffUpgrade"} platform:KMAnalyticsPlatformAppCenter];
-            }
-        }];
+//        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;
+//
+//                [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Exposure" : @"PUW_7OffUpgrade"} platform:KMAnalyticsPlatformAppCenter];
+//            }
+//        }];
     } else {
         self.saleBox.hidden = true;
     }
@@ -1050,10 +1050,10 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
             if (isSubscribed) {
                 return false;
             }
-            KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.StoreUserRecovery.content.firstObject;
-            if ([info.show boolValue] == false) { // 活动结束
-                return false;
-            }
+//            KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.StoreUserRecovery.content.firstObject;
+//            if ([info.show boolValue] == false) { // 活动结束
+//                return false;
+//            }
             return true;
         }
     }
@@ -1087,35 +1087,35 @@ static NSString *const KMPurchaseCompareCellIdentifier       = @"KMPurchaseCompa
         return;
     }
     
-    KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.StoreUserRecovery.content.firstObject;
-    NSURL *url = [NSURL URLWithString: [KMAdvertisementModelTransition transitionImagePathWithImage:info.image highlight: YES]];
+//    KMAdvertisementItemInfo *info = KMAdvertisementManager.manager.info.StoreUserRecovery.content.firstObject;
+//    NSURL *url = [NSURL URLWithString: [KMAdvertisementModelTransition transitionImagePathWithImage:info.image highlight: YES]];
     
-    __weak typeof(self) weakSelf = self;
-    [self addWaingView:self.window.contentView];
-    [KMAdvertisementImage imageWithURLWithUrl:url completion:^(NSImage *image) {
-        [weakSelf removeWaitingView:weakSelf.window.contentView];
-        if (image == nil) {
-            return;
-        }
-        
-        [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Exposure" : @"PUW_PromotionalOffer"} platform:KMAnalyticsPlatformAppCenter];
-        
-        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");
-                [weakSelf trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_PromotionalOffer_Subscribe"} platform:KMAnalyticsPlatformAppCenter];
-            } else if (idx == 1) {
-                [weakSelf trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_PromotionalOffer_Cancel"} platform:KMAnalyticsPlatformAppCenter];
-            }
-        };
-    }];
+//    __weak typeof(self) weakSelf = self;
+//    [self addWaingView:self.window.contentView];
+//    [KMAdvertisementImage imageWithURLWithUrl:url completion:^(NSImage *image) {
+//        [weakSelf removeWaitingView:weakSelf.window.contentView];
+//        if (image == nil) {
+//            return;
+//        }
+//
+//        [self trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Exposure" : @"PUW_PromotionalOffer"} platform:KMAnalyticsPlatformAppCenter];
+//
+//        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");
+//                [weakSelf trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_PromotionalOffer_Subscribe"} platform:KMAnalyticsPlatformAppCenter];
+//            } else if (idx == 1) {
+//                [weakSelf trackEvent_freeWithEventName:@"PromotionalOffer" params:@{@"PUW_Btn" : @"PUW_PromotionalOffer_Cancel"} platform:KMAnalyticsPlatformAppCenter];
+//            }
+//        };
+//    }];
 }
 
 - (IBAction)buttonItemClicked_Restore:(id)sender {

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.m

@@ -358,7 +358,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
         }
     };
     self.discountTipImage.hidden = YES;
-    [self updatePriceLabel];
+//    [self updatePriceLabel];
     
     self.aiSepLineView.wantsLayer = YES;
     self.aiInfoLbl1.font = self.aiInfoLbl2.font = self.aiInfoLbl3.font = self.aiInfoLbl4.font = [NSFont SFProTextRegularFont:14];
@@ -635,7 +635,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
     [self.window orderFront:nil];
     
     [self.buySwitch setState:NSControlStateValueOn];
-    [self updatePriceLabel];
+//    [self updatePriceLabel];
     [self updatePurchaseInformation];
 }
 
@@ -847,7 +847,7 @@ static NSString *const KMPurchaseCompareDMGCellIdentifier       = @"KMPurchaseCo
 
 - (IBAction)buySwitchAction:(NSSwitch *)sender {
     [self refreshParmanentVerInfo];
-    [self updatePriceLabel];
+//    [self updatePriceLabel];
 }
 
 #pragma mark - Noti

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseCompareDMGWindowController.xib

@@ -95,11 +95,7 @@
                                 </textFieldCell>
                             </textField>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="bSI-fT-0EN">
-<<<<<<< HEAD
                                 <rect key="frame" x="177" y="32" width="284" height="446"/>
-=======
-                                <rect key="frame" x="38" y="32" width="284" height="474"/>
->>>>>>> develop_PDFReaderProNew
                                 <subviews>
                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="wbK-Ex-3dw">
                                         <rect key="frame" x="0.0" y="0.0" width="284" height="474"/>
@@ -405,204 +401,8 @@
                                     <constraint firstAttribute="trailing" secondItem="wbK-Ex-3dw" secondAttribute="trailing" id="yMw-MG-7cq"/>
                                 </constraints>
                             </customView>
-<<<<<<< HEAD
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="sMr-Hu-FgQ">
                                 <rect key="frame" x="455" y="20" width="300" height="482"/>
-=======
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="Ybk-PR-oIW">
-                                <rect key="frame" x="612" y="32" width="284" height="474"/>
-                                <subviews>
-                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="lEW-YS-MTS">
-                                        <rect key="frame" x="0.0" y="0.0" width="284" height="474"/>
-                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="AIDMGBG" id="pL4-Kh-6Ho"/>
-                                    </imageView>
-                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="inx-bW-irf">
-                                        <rect key="frame" x="102" y="428" width="89" height="28"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="AI Tools" id="uog-PY-C6F">
-                                            <font key="font" metaFont="systemSemibold" size="24"/>
-                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                        </textFieldCell>
-                                    </textField>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="T25-j2-ubF">
-                                        <rect key="frame" x="26" y="405" width="240" height="1"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="240" id="Vnx-Zh-0C9"/>
-                                            <constraint firstAttribute="height" constant="1" id="ub1-L3-9oG"/>
-                                        </constraints>
-                                    </customView>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="bui-pk-dtA">
-                                        <rect key="frame" x="36" y="179" width="220" height="200"/>
-                                        <subviews>
-                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="W8R-HP-746">
-                                                <rect key="frame" x="0.0" y="180" width="20" height="20"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="20" id="HZS-1S-mZl"/>
-                                                    <constraint firstAttribute="width" constant="20" id="uwO-uH-vLz"/>
-                                                </constraints>
-                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vipAbleIcon" id="usA-3E-SLF"/>
-                                            </imageView>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dD0-C2-Lga">
-                                                <rect key="frame" x="30" y="184" width="88" height="16"/>
-                                                <textFieldCell key="cell" title="AI Summarize" id="3vB-Fw-N6B">
-                                                    <font key="font" metaFont="system"/>
-                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="U45-ZQ-2Qn">
-                                                <rect key="frame" x="0.0" y="152" width="20" height="20"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="20" id="mSz-G2-nWW"/>
-                                                    <constraint firstAttribute="width" constant="20" id="sVq-lQ-9tQ"/>
-                                                </constraints>
-                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vipAbleIcon" id="LzZ-iP-8em"/>
-                                            </imageView>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pdE-kf-rtu">
-                                                <rect key="frame" x="30" y="156" width="73" height="17"/>
-                                                <textFieldCell key="cell" title="View PDFs" id="83k-RN-53d">
-                                                    <font key="font" metaFont="system" size="14"/>
-                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CHm-kF-ZlH">
-                                                <rect key="frame" x="0.0" y="124" width="20" height="20"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="20" id="4cO-gE-hcN"/>
-                                                    <constraint firstAttribute="height" constant="20" id="V8J-xu-Suc"/>
-                                                </constraints>
-                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vipAbleIcon" id="csy-Zd-yX9"/>
-                                            </imageView>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zyJ-pN-yCh">
-                                                <rect key="frame" x="30" y="128" width="73" height="17"/>
-                                                <textFieldCell key="cell" title="View PDFs" id="LBd-dR-Ld1">
-                                                    <font key="font" metaFont="system" size="14"/>
-                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="f86-JN-t06">
-                                                <rect key="frame" x="0.0" y="96" width="20" height="20"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="20" id="VYJ-Yg-PbO"/>
-                                                    <constraint firstAttribute="width" constant="20" id="ydD-7N-ZMe"/>
-                                                </constraints>
-                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="vipAbleIcon" id="bdL-7C-DKn"/>
-                                            </imageView>
-                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1OY-mu-1YV">
-                                                <rect key="frame" x="30" y="100" width="73" height="17"/>
-                                                <textFieldCell key="cell" title="View PDFs" id="p6V-Sz-eSC">
-                                                    <font key="font" metaFont="system" size="14"/>
-                                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                                    <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                        </subviews>
-                                        <constraints>
-                                            <constraint firstItem="f86-JN-t06" firstAttribute="top" secondItem="CHm-kF-ZlH" secondAttribute="bottom" constant="8" id="2DR-PP-3DX"/>
-                                            <constraint firstItem="pdE-kf-rtu" firstAttribute="centerY" secondItem="U45-ZQ-2Qn" secondAttribute="centerY" constant="-2" id="4ST-Yp-Y1a"/>
-                                            <constraint firstItem="CHm-kF-ZlH" firstAttribute="top" secondItem="U45-ZQ-2Qn" secondAttribute="bottom" constant="8" id="6W2-iJ-zDv"/>
-                                            <constraint firstItem="W8R-HP-746" firstAttribute="top" secondItem="bui-pk-dtA" secondAttribute="top" id="AmQ-E3-kfx"/>
-                                            <constraint firstItem="U45-ZQ-2Qn" firstAttribute="leading" secondItem="bui-pk-dtA" secondAttribute="leading" id="Bed-Sb-Eku"/>
-                                            <constraint firstItem="pdE-kf-rtu" firstAttribute="leading" secondItem="U45-ZQ-2Qn" secondAttribute="trailing" constant="12" id="CdF-9W-GfZ"/>
-                                            <constraint firstItem="1OY-mu-1YV" firstAttribute="centerY" secondItem="f86-JN-t06" secondAttribute="centerY" constant="-2" id="Kgl-ro-65B"/>
-                                            <constraint firstItem="1OY-mu-1YV" firstAttribute="leading" secondItem="f86-JN-t06" secondAttribute="trailing" constant="12" id="KsM-Fk-Umv"/>
-                                            <constraint firstItem="CHm-kF-ZlH" firstAttribute="leading" secondItem="bui-pk-dtA" secondAttribute="leading" id="V2I-nL-7Kt"/>
-                                            <constraint firstItem="zyJ-pN-yCh" firstAttribute="leading" secondItem="CHm-kF-ZlH" secondAttribute="trailing" constant="12" id="WbQ-AC-sRc"/>
-                                            <constraint firstItem="dD0-C2-Lga" firstAttribute="leading" secondItem="W8R-HP-746" secondAttribute="trailing" constant="12" id="bfu-tV-gZo"/>
-                                            <constraint firstItem="U45-ZQ-2Qn" firstAttribute="top" secondItem="W8R-HP-746" secondAttribute="bottom" constant="8" id="eSh-UO-jzu"/>
-                                            <constraint firstItem="dD0-C2-Lga" firstAttribute="centerY" secondItem="W8R-HP-746" secondAttribute="centerY" constant="-2" id="hrB-Nt-lzx"/>
-                                            <constraint firstItem="f86-JN-t06" firstAttribute="leading" secondItem="bui-pk-dtA" secondAttribute="leading" id="iYr-Hl-0J6"/>
-                                            <constraint firstItem="W8R-HP-746" firstAttribute="leading" secondItem="bui-pk-dtA" secondAttribute="leading" id="l4c-4x-qmP"/>
-                                            <constraint firstItem="zyJ-pN-yCh" firstAttribute="centerY" secondItem="CHm-kF-ZlH" secondAttribute="centerY" constant="-2" id="q1L-OI-DgB"/>
-                                            <constraint firstAttribute="height" constant="200" id="ufi-Tu-DHZ"/>
-                                            <constraint firstAttribute="width" constant="220" id="yU9-f0-K9I"/>
-                                        </constraints>
-                                    </customView>
-                                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="gUN-ce-gQq">
-                                        <rect key="frame" x="41" y="44" width="211" height="95"/>
-                                        <subviews>
-                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="B03-f8-E1e">
-                                                <rect key="frame" x="0.0" y="0.0" width="211" height="95"/>
-                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="aiTipBtnA" id="Rkz-Xu-ZeO"/>
-                                            </imageView>
-                                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="IQZ-ot-29I">
-                                                <rect key="frame" x="43" y="8" width="103" height="24"/>
-                                                <subviews>
-                                                    <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4Pz-8D-ifN">
-                                                        <rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="height" constant="24" id="DqF-Fp-cOn"/>
-                                                            <constraint firstAttribute="width" constant="24" id="QyA-uA-CLc"/>
-                                                        </constraints>
-                                                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="aiIconA" id="bjw-7w-ecP"/>
-                                                    </imageView>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2yh-PK-SVp">
-                                                        <rect key="frame" x="26" y="4" width="79" height="16"/>
-                                                        <textFieldCell key="cell" lineBreakMode="clipping" title="My AI Credit" id="PkG-XP-GsP">
-                                                            <font key="font" metaFont="system"/>
-                                                            <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                                        </textFieldCell>
-                                                    </textField>
-                                                </subviews>
-                                                <constraints>
-                                                    <constraint firstItem="4Pz-8D-ifN" firstAttribute="leading" secondItem="IQZ-ot-29I" secondAttribute="leading" id="F4Z-kr-7Y7"/>
-                                                    <constraint firstItem="4Pz-8D-ifN" firstAttribute="top" secondItem="IQZ-ot-29I" secondAttribute="top" id="eef-cB-umx"/>
-                                                    <constraint firstAttribute="height" constant="24" id="gZN-bS-761"/>
-                                                    <constraint firstItem="2yh-PK-SVp" firstAttribute="centerY" secondItem="IQZ-ot-29I" secondAttribute="centerY" id="qhy-XV-7O3"/>
-                                                    <constraint firstAttribute="trailing" secondItem="2yh-PK-SVp" secondAttribute="trailing" id="xVs-fF-qic"/>
-                                                    <constraint firstItem="2yh-PK-SVp" firstAttribute="leading" secondItem="4Pz-8D-ifN" secondAttribute="trailing" constant="4" id="yoD-5i-Qgi"/>
-                                                </constraints>
-                                            </customView>
-                                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0S4-Y8-qlW" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                <rect key="frame" x="0.0" y="0.0" width="200" height="40"/>
-                                                <buttonCell key="cell" type="bevel" bezelStyle="rounded" imagePosition="overlaps" alignment="center" lineBreakMode="charWrapping" imageScaling="axesIndependently" inset="2" id="nfY-Ib-pyH">
-                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                    <font key="font" metaFont="smallSystem"/>
-                                                </buttonCell>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="40" id="gtc-cl-Yxg"/>
-                                                    <constraint firstAttribute="width" constant="200" id="rJW-IL-6Pp"/>
-                                                </constraints>
-                                                <connections>
-                                                    <action selector="aiPurchaseButtonClick:" target="-2" id="1LH-Br-IFZ"/>
-                                                </connections>
-                                            </button>
-                                        </subviews>
-                                        <constraints>
-                                            <constraint firstItem="B03-f8-E1e" firstAttribute="top" secondItem="gUN-ce-gQq" secondAttribute="top" id="0hi-Vz-NVc"/>
-                                            <constraint firstAttribute="height" constant="95" id="581-VB-XyJ"/>
-                                            <constraint firstItem="B03-f8-E1e" firstAttribute="leading" secondItem="gUN-ce-gQq" secondAttribute="leading" id="JWW-wM-tFT"/>
-                                            <constraint firstItem="IQZ-ot-29I" firstAttribute="centerX" secondItem="gUN-ce-gQq" secondAttribute="centerX" constant="-11" id="NXB-OR-Vrw"/>
-                                            <constraint firstAttribute="bottom" secondItem="B03-f8-E1e" secondAttribute="bottom" id="XkS-wr-kk5"/>
-                                            <constraint firstAttribute="trailing" secondItem="B03-f8-E1e" secondAttribute="trailing" id="atw-Q1-4ex"/>
-                                            <constraint firstItem="0S4-Y8-qlW" firstAttribute="leading" secondItem="gUN-ce-gQq" secondAttribute="leading" id="bHl-o4-10B"/>
-                                            <constraint firstAttribute="bottom" secondItem="IQZ-ot-29I" secondAttribute="bottom" constant="8" id="e8q-bq-1FD"/>
-                                            <constraint firstAttribute="width" constant="211" id="hcY-1c-E0h"/>
-                                            <constraint firstAttribute="bottom" secondItem="0S4-Y8-qlW" secondAttribute="bottom" id="tib-sU-I0a"/>
-                                        </constraints>
-                                    </customView>
-                                </subviews>
-                                <constraints>
-                                    <constraint firstItem="T25-j2-ubF" firstAttribute="centerX" secondItem="Ybk-PR-oIW" secondAttribute="centerX" constant="4" id="4oy-gQ-CMt"/>
-                                    <constraint firstItem="gUN-ce-gQq" firstAttribute="centerX" secondItem="Ybk-PR-oIW" secondAttribute="centerX" constant="4" id="7fU-a9-qad"/>
-                                    <constraint firstAttribute="trailing" secondItem="lEW-YS-MTS" secondAttribute="trailing" id="8uA-5U-lxT"/>
-                                    <constraint firstItem="T25-j2-ubF" firstAttribute="top" secondItem="inx-bW-irf" secondAttribute="bottom" constant="22" id="BFS-Qt-xdK"/>
-                                    <constraint firstAttribute="width" constant="284" id="BK1-GM-Uj7"/>
-                                    <constraint firstItem="bui-pk-dtA" firstAttribute="top" secondItem="Ybk-PR-oIW" secondAttribute="top" constant="95" id="JIa-I4-FVE"/>
-                                    <constraint firstItem="lEW-YS-MTS" firstAttribute="top" secondItem="Ybk-PR-oIW" secondAttribute="top" id="ZfM-mF-C3n"/>
-                                    <constraint firstAttribute="bottom" secondItem="lEW-YS-MTS" secondAttribute="bottom" id="bND-tX-Lw1"/>
-                                    <constraint firstItem="bui-pk-dtA" firstAttribute="centerX" secondItem="Ybk-PR-oIW" secondAttribute="centerX" constant="4" id="exn-mY-uvl"/>
-                                    <constraint firstItem="inx-bW-irf" firstAttribute="centerX" secondItem="Ybk-PR-oIW" secondAttribute="centerX" constant="4" id="vYE-cn-SYt"/>
-                                    <constraint firstItem="lEW-YS-MTS" firstAttribute="leading" secondItem="Ybk-PR-oIW" secondAttribute="leading" id="wmJ-yR-XlQ"/>
-                                    <constraint firstItem="inx-bW-irf" firstAttribute="top" secondItem="Ybk-PR-oIW" secondAttribute="top" constant="18" id="zt7-Mm-jJM"/>
-                                </constraints>
-                            </customView>
-                            <customView translatesAutoresizingMaskIntoConstraints="NO" id="sMr-Hu-FgQ">
-                                <rect key="frame" x="316" y="20" width="300" height="510"/>
->>>>>>> develop_PDFReaderProNew
                                 <subviews>
                                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sSv-3U-kFl">
                                         <rect key="frame" x="0.0" y="0.0" width="300" height="510"/>
@@ -678,13 +478,8 @@
                                                 <rect key="frame" x="101" y="224" width="20" height="20"/>
                                                 <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_Tooltip" id="g1R-8J-uDu"/>
                                             </imageView>
-<<<<<<< HEAD
                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="3mX-DM-Ssw" customClass="KMButton" customModule="PDFTech_Editor" customModuleProvider="target">
                                                 <rect key="frame" x="101" y="196" width="20" height="20"/>
-=======
-                                            <button translatesAutoresizingMaskIntoConstraints="NO" id="3mX-DM-Ssw" customClass="KMButton" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                <rect key="frame" x="101" y="224" width="20" height="20"/>
->>>>>>> develop_PDFReaderProNew
                                                 <buttonCell key="cell" type="roundRect" bezelStyle="roundedRect" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="kWd-ga-hI9">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="cellTitle"/>
@@ -1021,11 +816,7 @@
                                 </constraints>
                             </customView>
                             <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="KBo-MG-ErN">
-<<<<<<< HEAD
                                 <rect key="frame" x="686" y="340" width="86" height="100"/>
-=======
-                                <rect key="frame" x="547" y="368" width="86" height="100"/>
->>>>>>> develop_PDFReaderProNew
                                 <constraints>
                                     <constraint firstAttribute="height" constant="100" id="B54-g0-oZK"/>
                                     <constraint firstAttribute="width" constant="86" id="cHk-gb-ogD"/>
@@ -1054,13 +845,8 @@
                             <constraint firstItem="sMr-Hu-FgQ" firstAttribute="bottom" secondItem="bSI-fT-0EN" secondAttribute="bottom" constant="12" id="HY7-IA-dNE"/>
                             <constraint firstItem="18J-XT-ohA" firstAttribute="centerY" secondItem="fN4-jc-AVm" secondAttribute="centerY" id="HY7-so-eqU"/>
                             <constraint firstItem="sMr-Hu-FgQ" firstAttribute="trailing" secondItem="KBo-MG-ErN" secondAttribute="trailing" constant="-17" id="MYX-lm-hZ1"/>
-<<<<<<< HEAD
                             <constraint firstItem="18J-XT-ohA" firstAttribute="leading" secondItem="sMr-Hu-FgQ" secondAttribute="trailing" id="NGI-Eb-Jt7"/>
                             <constraint firstItem="PYw-CG-kOA" firstAttribute="top" secondItem="1YN-0h-Eql" secondAttribute="top" constant="48" id="SD8-5p-QbQ"/>
-=======
-                            <constraint firstItem="PYw-CG-kOA" firstAttribute="top" secondItem="1YN-0h-Eql" secondAttribute="top" constant="30" id="SD8-5p-QbQ"/>
-                            <constraint firstItem="Ybk-PR-oIW" firstAttribute="bottom" secondItem="bSI-fT-0EN" secondAttribute="bottom" id="UPA-9e-Hs2"/>
->>>>>>> develop_PDFReaderProNew
                             <constraint firstItem="sMr-Hu-FgQ" firstAttribute="leading" secondItem="bSI-fT-0EN" secondAttribute="trailing" constant="-6" id="XQO-bQ-yyI"/>
                             <constraint firstItem="fN4-jc-AVm" firstAttribute="leading" secondItem="1YN-0h-Eql" secondAttribute="leading" id="YVz-x9-1o4"/>
                             <constraint firstItem="18J-XT-ohA" firstAttribute="width" secondItem="fN4-jc-AVm" secondAttribute="width" id="jPh-Zj-SLn"/>

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.swift

@@ -1242,20 +1242,20 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     private func _getProductDatas(callback: @escaping (([String:Any]?, Any?)->Void)) {
 //    func getPriceUrl() {
         let urlString = kVerificationServer + "/api/product/get-price/v2"
-        KMAdvertisementRequestServer.requestServer.request(urlString: urlString, method: "GET", params: nil) { task, responseObject, error in
-            if (error == nil && responseObject != nil) {
-                let array = responseObject?["data"] as? NSDictionary
-                if array != nil {
-                    //解析数据
-                    let productsDict = array?.object(forKey: "data") as? NSDictionary
-                    callback(productsDict as? [String : Any], nil)
-                } else {
-                    callback([:], error.debugDescription)
-                }
-            } else {
-                callback(nil, error.debugDescription)
-            }
-        }
+//        KMAdvertisementRequestServer.requestServer.request(urlString: urlString, method: "GET", params: nil) { task, responseObject, error in
+//            if (error == nil && responseObject != nil) {
+//                let array = responseObject?["data"] as? NSDictionary
+//                if array != nil {
+//                    //解析数据
+//                    let productsDict = array?.object(forKey: "data") as? NSDictionary
+//                    callback(productsDict as? [String : Any], nil)
+//                } else {
+//                    callback([:], error.debugDescription)
+//                }
+//            } else {
+//                callback(nil, error.debugDescription)
+//            }
+//        }
     }
     
     // 获取优惠卷
@@ -1267,27 +1267,27 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
             "code" : discountId,
             "app_code" : app_code,
             "product_code" : productId]
-        KMAdvertisementRequestServer.requestServer.request(urlString: urlString, method: "GET", params: params) { task, responseObject, error in
-            if (error == nil && responseObject != nil) {
-                if let dataDict = responseObject?["data"] as? NSDictionary {
-                    if let swiftDict = dataDict as? [String: Any] {
-                        if swiftDict.keys.contains("price") || swiftDict.keys.contains("discount") {
-                            callback(dataDict as? [String : Any], nil)
-                        } else if swiftDict.keys.contains("coupon_provider") {
-                            if let couponDict = swiftDict["coupon_provider"] as? [String: Any] {
-                                callback(couponDict, nil)
-                            }
-                        }
-                    }
-                } else if let coupon_provider = responseObject?["coupon_provider"] as? NSDictionary {
-                    callback(coupon_provider as? [String : Any], nil)
-                } else {
-                    callback([:], error.debugDescription)
-                }
-            } else {
-                callback(nil, error.debugDescription)
-            }
-        }
+//        KMAdvertisementRequestServer.requestServer.request(urlString: urlString, method: "GET", params: params) { task, responseObject, error in
+//            if (error == nil && responseObject != nil) {
+//                if let dataDict = responseObject?["data"] as? NSDictionary {
+//                    if let swiftDict = dataDict as? [String: Any] {
+//                        if swiftDict.keys.contains("price") || swiftDict.keys.contains("discount") {
+//                            callback(dataDict as? [String : Any], nil)
+//                        } else if swiftDict.keys.contains("coupon_provider") {
+//                            if let couponDict = swiftDict["coupon_provider"] as? [String: Any] {
+//                                callback(couponDict, nil)
+//                            }
+//                        }
+//                    }
+//                } else if let coupon_provider = responseObject?["coupon_provider"] as? NSDictionary {
+//                    callback(coupon_provider as? [String : Any], nil)
+//                } else {
+//                    callback([:], error.debugDescription)
+//                }
+//            } else {
+//                callback(nil, error.debugDescription)
+//            }
+//        }
     }
     
     // 获取订单状态

PDF Office/PDF Master/Class/Purchase/DMG/Verification/VerificationManager/KMDMGProductsManager.swift

@@ -108,20 +108,20 @@ enum ProductType {
     
     private func _getProductDatas(callback: @escaping (([String:Any]?, Any?)->Void)) {
         let urlString = kVerificationServer + "/api/product/get-price/v2"
-        KMAdvertisementRequestServer.requestServer.request(urlString: urlString, method: "GET", params: nil) { task, responseObject, error in
-            if (error == nil && responseObject != nil) {
-                let array = responseObject?["data"] as? NSDictionary
-                if array != nil {
-                    //解析数据
-                    let productsDict = array?.object(forKey: "data") as? NSDictionary
-                    callback(productsDict as? [String : Any], nil)
-                } else {
-                    callback([:], error.debugDescription)
-                }
-            } else {
-                callback(nil, error.debugDescription)
-            }
-        }
+//        KMAdvertisementRequestServer.requestServer.request(urlString: urlString, method: "GET", params: nil) { task, responseObject, error in
+//            if (error == nil && responseObject != nil) {
+//                let array = responseObject?["data"] as? NSDictionary
+//                if array != nil {
+//                    //解析数据
+//                    let productsDict = array?.object(forKey: "data") as? NSDictionary
+//                    callback(productsDict as? [String : Any], nil)
+//                } else {
+//                    callback([:], error.debugDescription)
+//                }
+//            } else {
+//                callback(nil, error.debugDescription)
+//            }
+//        }
     }
 }
 #endif