【订阅】比较表内容填充

PDF Office/PDF Master.xcodeproj/xcuserdata/lizhe.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -4321,7 +4321,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1693"
             endingLineNumber = "1693"
-            landmarkName = "pdfListViewMenuItemsEditing(at:for:menuItems:)"
+            landmarkName = "pdfListViewMenuValidate(_:menuItem:isTakesEffect:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -4369,6 +4369,21 @@
                   endingLineNumber = "1696"
                   offsetFromSymbolStart = "36">
                </Location>
+               <Location
+                  uuid = "E7F4D56E-1C39-4024-BBA5-68C70086BBFF - 8a2a75e0da61f7de"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMMainViewController.pdfListViewMenuValidate(_: Swift.Optional&lt;__C.CPDFListView&gt;, menuItem: Swift.Optional&lt;__C.NSMenuItem&gt;, isTakesEffect: Swift.Optional&lt;Swift.UnsafeMutablePointer&lt;ObjectiveC.ObjCBool&gt;&gt;) -&gt; Swift.Bool"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1693"
+                  endingLineNumber = "1693"
+                  offsetFromSymbolStart = "2100">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -4978,7 +4993,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1505"
             endingLineNumber = "1505"
-            landmarkName = "pdfListViewKeyDownIsContinue(_:theEvent:)"
+            landmarkName = "pdfViewEditingAddImageArea(_:add:add:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -5056,6 +5071,21 @@
                   endingLineNumber = "1505"
                   offsetFromSymbolStart = "120">
                </Location>
+               <Location
+                  uuid = "2237DD70-B8BE-49EA-A4CE-79A8782755B0 - 1580cd90c578d76a"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (__C.NSModalResponse) -&gt; () in PDF_Master.KMMainViewController.pdfViewEditingAddImageArea(_: Swift.Optional&lt;__C.CPDFView&gt;, add: Swift.Optional&lt;__C.CPDFPage&gt;, add: __C.CGRect) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1505"
+                  endingLineNumber = "1505"
+                  offsetFromSymbolStart = "1180">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -6677,7 +6707,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1534"
             endingLineNumber = "1534"
-            landmarkName = "pdfListViewKeyDownIsContinue(_:theEvent:)"
+            landmarkName = "pdfViewEditingAddImageArea(_:add:add:)"
             landmarkType = "7">
             <Locations>
                <Location
@@ -6740,6 +6770,21 @@
                   endingLineNumber = "1535"
                   offsetFromSymbolStart = "2824">
                </Location>
+               <Location
+                  uuid = "62BC6468-594C-4A01-ADDD-BBD0C1BEAB50 - 1580cd90c578d348"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "closure #1 (__C.NSModalResponse) -&gt; () in PDF_Master.KMMainViewController.pdfViewEditingAddImageArea(_: Swift.Optional&lt;__C.CPDFView&gt;, add: Swift.Optional&lt;__C.CPDFPage&gt;, add: __C.CGRect) -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/PDFWindowController/ViewController/KMMainViewController.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "1535"
+                  endingLineNumber = "1535"
+                  offsetFromSymbolStart = "2804">
+               </Location>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
@@ -8818,7 +8863,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "1297"
             endingLineNumber = "1297"
-            landmarkName = "pdfViewEditingAreaDidChanged(_:)"
+            landmarkName = "pdfViewDocumentDidLoaded(_:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -8841,16 +8886,64 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            uuid = "09EB2F92-239D-4678-AE7E-D3BA675EF977"
+            uuid = "2AF3A3CE-0BCE-4807-A97D-14AAED63AE2C"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/KMComparativeView.swift"
+            filePath = "PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItemItem.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "104"
-            endingLineNumber = "104"
-            landmarkName = "updateLanguage()"
+            startingLineNumber = "26"
+            endingLineNumber = "26"
+            landmarkName = "reloadData()"
+            landmarkType = "7">
+            <Locations>
+               <Location
+                  uuid = "2AF3A3CE-0BCE-4807-A97D-14AAED63AE2C - adfddfbe2fd8f26f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMComparativeViewCollectionItemItem.reloadData() -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItemItem.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "26"
+                  endingLineNumber = "26"
+                  offsetFromSymbolStart = "244">
+               </Location>
+               <Location
+                  uuid = "2AF3A3CE-0BCE-4807-A97D-14AAED63AE2C - adfddfbe2fd8f26f"
+                  shouldBeEnabled = "Yes"
+                  ignoreCount = "0"
+                  continueAfterRunningActions = "No"
+                  symbolName = "PDF_Master.KMComparativeViewCollectionItemItem.reloadData() -&gt; ()"
+                  moduleName = "PDF Master"
+                  usesParentBreakpointCondition = "Yes"
+                  urlString = "file:///Volumes/Data/Company/kdan/Projects/PDF%20Office/PDF%20Office/PDF%20Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItemItem.swift"
+                  startingColumnNumber = "9223372036854775807"
+                  endingColumnNumber = "9223372036854775807"
+                  startingLineNumber = "26"
+                  endingLineNumber = "26"
+                  offsetFromSymbolStart = "396">
+               </Location>
+            </Locations>
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "BEDD2C7C-D0DC-4C6B-BF71-909548E57F54"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItem.swift"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "109"
+            endingLineNumber = "109"
+            landmarkName = "collectionView(_:itemForRepresentedObjectAt:)"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/KMComparativeTableViewController.swift

@@ -83,6 +83,7 @@ class KMComparativeTableViewController: NSWindowController {
         }
         
         window.beginSheet(controller.window!)
+
         comparativeController = controller
         comparativeMainWindow = window
         return controller
@@ -97,41 +98,41 @@ class KMComparativeTableViewController: NSWindowController {
     
     func setup() {
         self.window?.contentView?.backgroundColor(NSColor(hex: "FFFFFF"))
-        self.comparativeTableView.closeAction = { view in
-            print("关闭")
-            comparativeMainWindow?.endSheet(view.window!)
-            view.window?.close()
-            comparativeController = nil
-            comparativeMainWindow = nil
-        }
-        
-        self.comparativeTableView.signUpAction = { [weak self] view in
-            print("注册")
-            guard let callBack = self?.signUpAction else { return }
-
-            callBack(self!)
-        }
-
-        self.comparativeTableView.loginAction = { [weak self] view in
-            print("登录")
-            guard let callBack = self?.loginAction else { return }
-
-            callBack(self!)
-        }
-        
-        self.comparativeTableView.subscriptionAction = { [weak self] view in
-            print("订阅")
-            guard let callBack = self?.subscriptionAction else { return }
-
-            callBack(self!)
-        }
-        
-        self.comparativeTableView.restoreAction = { [weak self] view in
-            print("订阅")
-            guard let callBack = self?.restoreAction else { return }
-
-            callBack(self!)
-        }
+//        self.comparativeTableView.closeAction = { view in
+//            print("关闭")
+//            comparativeMainWindow?.endSheet(view.window!)
+//            view.window?.close()
+//            comparativeController = nil
+//            comparativeMainWindow = nil
+//        }
+//
+//        self.comparativeTableView.signUpAction = { [weak self] view in
+//            print("注册")
+//            guard let callBack = self?.signUpAction else { return }
+//
+//            callBack(self!)
+//        }
+//
+//        self.comparativeTableView.loginAction = { [weak self] view in
+//            print("登录")
+//            guard let callBack = self?.loginAction else { return }
+//
+//            callBack(self!)
+//        }
+//
+//        self.comparativeTableView.subscriptionAction = { [weak self] view in
+//            print("订阅")
+//            guard let callBack = self?.subscriptionAction else { return }
+//
+//            callBack(self!)
+//        }
+//
+//        self.comparativeTableView.restoreAction = { [weak self] view in
+//            print("订阅")
+//            guard let callBack = self?.restoreAction else { return }
+//
+//            callBack(self!)
+//        }
         
         self.comparativeView.closeAction = { view in
             print("关闭")

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/KMComparativeTableViewController.xib

@@ -8,44 +8,36 @@
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="KMComparativeTableViewController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
-                <outlet property="comparativeTableView" destination="ZQ8-GZ-j0l" id="oQc-Q6-1rj"/>
                 <outlet property="comparativeView" destination="hxs-Ao-ieK" id="Wgu-UR-72C"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="F0z-JX-Cv5">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="196" y="240" width="836" height="680"/>
+            <rect key="contentRect" x="196" y="240" width="807" height="659"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <view key="contentView" id="se5-gp-TjO">
-                <rect key="frame" x="0.0" y="0.0" width="836" height="680"/>
+                <rect key="frame" x="0.0" y="0.0" width="807" height="659"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="hxs-Ao-ieK" customClass="KMComparativeView" customModule="PDF_Master" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="836" height="680"/>
-                    </customView>
-                    <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZQ8-GZ-j0l" customClass="KMComparativeTableView" customModule="PDF_Master" customModuleProvider="target">
-                        <rect key="frame" x="0.0" y="0.0" width="836" height="680"/>
+                        <rect key="frame" x="0.0" y="0.0" width="807" height="659"/>
                     </customView>
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="hxs-Ao-ieK" secondAttribute="bottom" id="3E0-v6-OGb"/>
                     <constraint firstAttribute="trailing" secondItem="hxs-Ao-ieK" secondAttribute="trailing" id="AsJ-g3-3jA"/>
-                    <constraint firstAttribute="bottom" secondItem="ZQ8-GZ-j0l" secondAttribute="bottom" id="CqO-bm-keA"/>
-                    <constraint firstAttribute="trailing" secondItem="ZQ8-GZ-j0l" secondAttribute="trailing" id="WHq-dO-KGE"/>
                     <constraint firstItem="hxs-Ao-ieK" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="ipm-qC-f1C"/>
                     <constraint firstItem="hxs-Ao-ieK" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="k3t-b3-Yh5"/>
-                    <constraint firstItem="ZQ8-GZ-j0l" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" id="uho-lT-dMQ"/>
-                    <constraint firstItem="ZQ8-GZ-j0l" firstAttribute="leading" secondItem="se5-gp-TjO" secondAttribute="leading" id="yXm-AP-GnM"/>
                 </constraints>
             </view>
             <connections>
                 <outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
             </connections>
-            <point key="canvasLocation" x="224" y="-15.5"/>
+            <point key="canvasLocation" x="-609" y="12"/>
         </window>
     </objects>
 </document>

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeTableView.xib

@@ -20,19 +20,19 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="836" height="680"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+        <customView misplaced="YES" id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="836" height="659"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="63a-JO-IUQ">
-                    <rect key="frame" x="0.0" y="506" width="836" height="174"/>
+                    <rect key="frame" x="0.0" y="485" width="836" height="174"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="174" id="1gV-NR-Wce"/>
                     </constraints>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="background_comparative_top_Rectangle" id="HV7-RO-QX5"/>
                 </imageView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="6CF-gV-7MZ">
-                    <rect key="frame" x="0.0" y="652" width="836" height="28"/>
+                    <rect key="frame" x="0.0" y="631" width="836" height="28"/>
                     <subviews>
                         <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="kR4-GT-aNn" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                             <rect key="frame" x="8" y="8" width="12" height="12"/>
@@ -70,7 +70,7 @@
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="250-TH-Pzl" customClass="KMComparativeOutlineView" customModule="PDF_Master" customModuleProvider="target">
-                    <rect key="frame" x="24" y="120" width="788" height="518"/>
+                    <rect key="frame" x="24" y="120" width="788" height="497"/>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="uVY-kS-Rql">
                     <rect key="frame" x="0.0" y="0.0" width="836" height="120"/>
@@ -183,7 +183,7 @@
                 <constraint firstAttribute="bottom" secondItem="uVY-kS-Rql" secondAttribute="bottom" id="qh9-Pu-H47"/>
                 <constraint firstItem="6CF-gV-7MZ" firstAttribute="leading" secondItem="c22-O7-iKe" secondAttribute="leading" id="xT0-4X-aRa"/>
             </constraints>
-            <point key="canvasLocation" x="139" y="154"/>
+            <point key="canvasLocation" x="63" y="98"/>
         </customView>
     </objects>
     <resources>

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

@@ -10,6 +10,7 @@ import Cocoa
 typealias KMComparativeViewCloseAction = (_ view: KMComparativeView) -> Void
 
 class KMComparativeView: KMBaseXibView {
+    @IBOutlet weak var topView: NSView!
     @IBOutlet weak var collectionContentView: NSView!
     @IBOutlet weak var collectionView: NSCollectionView!
     @IBOutlet weak var closeButton: NSButton!
@@ -62,7 +63,7 @@ class KMComparativeView: KMBaseXibView {
                 ["title": "Using the AI function",
                  "state": true]
             ],
-            "buttonTitle": "Sign Up For Free"
+            "buttonTitle": "Subscribe Now"
         ]
     ]
     
@@ -98,6 +99,7 @@ class KMComparativeView: KMBaseXibView {
         self.imageView.backgroundColor(NSColor(hex: "#FFFFFF"))
         
         self.contentView.addSubview(self.imageView, positioned: .below, relativeTo: self.collectionContentView)
+        self.contentView.addSubview(self.imageView, positioned: .below, relativeTo: self.topView)
     }
     
     override func updateLanguage() {
@@ -135,7 +137,7 @@ extension KMComparativeView: NSCollectionViewDataSource {
     public func collectionView(_ collectionView: NSCollectionView, itemForRepresentedObjectAt indexPath: IndexPath) -> NSCollectionViewItem {
 //        let data = self.dataArray[indexPath.item]
         let view = collectionView.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMComparativeViewCollectionItem"), for: indexPath) as! KMComparativeViewCollectionItem
-        view.data = self.dataArray[indexPath.item] as! [String : Any]
+        view.data = self.dataArray[indexPath.section] as! [String : Any]
         return view
     }
 }
@@ -158,17 +160,21 @@ extension KMComparativeView: NSCollectionViewDelegateFlowLayout {
         return NSSize(width: 348, height: 467)
     }
     
-    public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
-        return 30
-    }
+//    public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
+//        return 30
+//    }
     
     public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, insetForSectionAt section: Int) -> NSEdgeInsets {
-        return NSEdgeInsets(top: 0, left: 0, bottom: 0, right: 30)
+        if section == 0 {
+            return NSEdgeInsets(top: 0, left: 0, bottom: 0, right: 30)
+        } else {
+            return NSEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
+        }
     }
 
-    public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {
-        return 30
-    }
+//    public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {
+//        return 30
+//    }
 }
 
 //MARK: Action

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/KMComparativeView.xib

@@ -16,16 +16,24 @@
                 <outlet property="restoreButton" destination="BFl-PZ-fp3" id="hG2-in-77d"/>
                 <outlet property="textView" destination="63A-Ab-bi6" id="uOM-WN-xPL"/>
                 <outlet property="titleLabel" destination="MnS-Io-H7L" id="S60-8o-pk7"/>
+                <outlet property="topView" destination="fSi-Nh-UBK" id="Cui-Cv-WgW"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="c22-O7-iKe">
-            <rect key="frame" x="0.0" y="0.0" width="807" height="639"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <rect key="frame" x="0.0" y="0.0" width="807" height="659"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
+                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Rwo-sa-TEc">
+                    <rect key="frame" x="0.0" y="465" width="807" height="194"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="194" id="sy7-2v-Bmz"/>
+                    </constraints>
+                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="background_comparative_Badge" id="kcu-Za-GN1"/>
+                </imageView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="fSi-Nh-UBK">
-                    <rect key="frame" x="0.0" y="611" width="807" height="28"/>
+                    <rect key="frame" x="0.0" y="631" width="807" height="28"/>
                     <subviews>
                         <box boxType="custom" borderWidth="0.0" cornerRadius="4" translatesAutoresizingMaskIntoConstraints="NO" id="IE1-YG-Yg7" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                             <rect key="frame" x="8" y="8" width="12" height="12"/>
@@ -62,7 +70,7 @@
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="yhM-ic-Qb1">
-                    <rect key="frame" x="0.0" y="0.0" width="807" height="611"/>
+                    <rect key="frame" x="0.0" y="0.0" width="807" height="631"/>
                     <subviews>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="cMm-TO-WQD">
                             <rect key="frame" x="40" y="20" width="727" height="40"/>
@@ -106,7 +114,7 @@
                             </constraints>
                         </customView>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="nXE-h3-HLH">
-                            <rect key="frame" x="0.0" y="561" width="807" height="32"/>
+                            <rect key="frame" x="0.0" y="581" width="807" height="32"/>
                             <subviews>
                                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="hbn-Vp-scG">
                                     <rect key="frame" x="40" y="-2" width="36" height="36"/>
@@ -146,17 +154,17 @@
                             </constraints>
                         </customView>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="tuB-UO-PhU">
-                            <rect key="frame" x="0.0" y="76" width="807" height="465"/>
+                            <rect key="frame" x="0.0" y="76" width="807" height="485"/>
                             <subviews>
-                                <scrollView wantsLayer="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ScA-aL-r0P">
-                                    <rect key="frame" x="40" y="0.0" width="727" height="465"/>
+                                <scrollView wantsLayer="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ScA-aL-r0P">
+                                    <rect key="frame" x="40" y="0.0" width="727" height="485"/>
                                     <clipView key="contentView" drawsBackground="NO" id="O9C-OM-ue0">
-                                        <rect key="frame" x="0.0" y="0.0" width="727" height="465"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="727" height="485"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <collectionView allowsEmptySelection="NO" id="tXY-fl-8XY">
-                                                <rect key="frame" x="0.0" y="0.0" width="727" height="158"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="727" height="485"/>
+                                                <autoresizingMask key="autoresizingMask" heightSizable="YES"/>
                                                 <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" scrollDirection="horizontal" id="cPd-fj-JkJ">
                                                     <size key="itemSize" width="50" height="50"/>
                                                 </collectionViewFlowLayout>
@@ -196,13 +204,6 @@
                         <constraint firstAttribute="bottom" secondItem="cMm-TO-WQD" secondAttribute="bottom" constant="20" id="yKQ-fN-Zha"/>
                     </constraints>
                 </customView>
-                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Rwo-sa-TEc">
-                    <rect key="frame" x="0.0" y="445" width="807" height="194"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="194" id="sy7-2v-Bmz"/>
-                    </constraints>
-                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="background_comparative_Badge" id="kcu-Za-GN1"/>
-                </imageView>
             </subviews>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="fSi-Nh-UBK" secondAttribute="trailing" id="7yD-IT-lHJ"/>

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

@@ -13,10 +13,11 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
     @IBOutlet weak var lineView: NSView!
     @IBOutlet weak var contentCollectionView: NSCollectionView!
     @IBOutlet weak var doneButton: NSButton!
-    
+    @IBOutlet weak var describeLabel: NSTextField!
+    @IBOutlet weak var iconImageView: NSImageView!
     var data: [String: Any] = [:] {
         didSet {
-            self.contentCollectionView.reloadData()
+            self.reloadData()
         }
     }
     
@@ -36,6 +37,9 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
         self.subtitleLabel.font = NSFont.SFProTextSemibold(32)
         self.subtitleLabel.textColor = NSColor(hex: "#616469")
         
+        self.describeLabel.font = NSFont.SFProTextRegular(14)
+        self.describeLabel.textColor = NSColor(hex: "#616469")
+        
         self.lineView.backgroundColor(NSColor(hex: "#ECECEC"))
         
         //设置代理
@@ -52,7 +56,31 @@ class KMComparativeViewCollectionItem: NSCollectionViewItem {
     }
     
     func reloadData() {
-
+        if data.count != 0 {
+            self.titleLabel.stringValue = NSLocalizedString(data["title"] as! String, comment: "")
+            self.subtitleLabel.stringValue = NSLocalizedString(data["subtitle"] as! String, comment: "")
+            self.doneButton.title = NSLocalizedString(data["buttonTitle"] as! String, comment: "")
+            self.describeLabel.stringValue = NSLocalizedString(data["describe"] as? String ?? "", comment: "")
+            
+            if data["type"] as! Int == 1 {
+                self.describeLabel.isHidden = false
+                self.iconImageView.isHidden = false
+                
+                self.doneButton.backgroundColor(NSColor(hex: "#FF852E"))
+                self.doneButton.border(NSColor(hex: "#FF852E"), 0, 20)
+                self.doneButton.contentTintColor = NSColor(hex: "#FFFFFF")
+                self.doneButton.font = NSFont.SFProTextSemibold(16)
+            } else {
+                self.describeLabel.isHidden = true
+                self.iconImageView.isHidden = true
+                
+                self.doneButton.backgroundColor(NSColor(hex: "#FFFFFF"))
+                self.doneButton.border(NSColor(hex: "#DFE1E5"), 1, 20)
+                self.doneButton.contentTintColor = NSColor(hex: "#252629")
+                self.doneButton.font = NSFont.SFProTextRegular(16)
+            }
+            self.contentCollectionView.reloadData()
+        }
     }
 }
 
@@ -65,7 +93,8 @@ extension KMComparativeViewCollectionItem {
 
 extension KMComparativeViewCollectionItem: NSCollectionViewDataSource {
     public func numberOfSections(in collectionView: NSCollectionView) -> Int {
-        return self.data.count
+        let array: [[String: Any]] = self.data["content"] as! [[String : Any]]
+        return array.count
     }
     
     public func collectionView(_ collectionView: NSCollectionView, numberOfItemsInSection section: Int) -> Int {
@@ -77,7 +106,7 @@ extension KMComparativeViewCollectionItem: NSCollectionViewDataSource {
 //        let data = self.dataArray[indexPath.item]
         let view = collectionView.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "KMComparativeViewCollectionItemItem"), for: indexPath) as! KMComparativeViewCollectionItemItem
         let array: [[String: Any]] = self.data["content"] as! [[String : Any]]
-        view.data = array[indexPath.item]
+        view.data = array[indexPath.section]
         return view
     }
 }
@@ -100,15 +129,20 @@ extension KMComparativeViewCollectionItem: NSCollectionViewDelegateFlowLayout {
         return NSSize(width: 279, height: 20)
     }
     
-    public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
-        return 0
-    }
+//    public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, minimumLineSpacingForSectionAt section: Int) -> CGFloat {
+//        return 12
+//    }
     
     public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, insetForSectionAt section: Int) -> NSEdgeInsets {
-        return NSEdgeInsets(top: 0, left: 0, bottom: 12, right: 0)
+        let array: [[String: Any]] = self.data["content"] as! [[String : Any]]
+        if section == array.count - 1 {
+            return NSEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
+        } else {
+            return NSEdgeInsets(top: 0, left: 0, bottom: 12, right: 0)
+        }
     }
 
-    public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {
-        return 0
-    }
+//    public func collectionView(_ collectionView: NSCollectionView, layout collectionViewLayout: NSCollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {
+//        return 12
+//    }
 }

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

@@ -9,7 +9,9 @@
         <customObject id="-2" userLabel="File's Owner" customClass="KMComparativeViewCollectionItem" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="contentCollectionView" destination="9Pp-ih-jEG" id="z5w-fy-VHk"/>
+                <outlet property="describeLabel" destination="3TK-IO-Uc2" id="KKA-ma-4Aj"/>
                 <outlet property="doneButton" destination="h7l-IT-ODA" id="jDf-XE-uTx"/>
+                <outlet property="iconImageView" destination="sHp-vc-P9l" id="LzG-we-xUT"/>
                 <outlet property="lineView" destination="hz2-8h-p3M" id="nww-hG-0H5"/>
                 <outlet property="subtitleLabel" destination="y61-y9-dAw" id="2IR-Co-cbj"/>
                 <outlet property="titleLabel" destination="Aal-EW-4N2" id="8XP-Ds-d4a"/>
@@ -19,11 +21,11 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="303" height="449"/>
+            <rect key="frame" x="0.0" y="0.0" width="348" height="467"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aal-EW-4N2">
-                    <rect key="frame" x="30" y="401" width="243" height="16"/>
+                    <rect key="frame" x="30" y="419" width="288" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Register Member" id="u25-eB-jIR">
                         <font key="font" usesAppearanceFont="YES"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -31,7 +33,7 @@
                     </textFieldCell>
                 </textField>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y61-y9-dAw">
-                    <rect key="frame" x="30" y="369" width="243" height="16"/>
+                    <rect key="frame" x="30" y="387" width="31" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Free" id="Nmm-Ii-aJs">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -39,16 +41,16 @@
                     </textFieldCell>
                 </textField>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="JU3-B0-lwD">
-                    <rect key="frame" x="32" y="126" width="239" height="180"/>
+                    <rect key="frame" x="32" y="144" width="284" height="180"/>
                     <subviews>
                         <scrollView wantsLayer="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2qF-pT-dP8">
-                            <rect key="frame" x="0.0" y="0.0" width="239" height="180"/>
+                            <rect key="frame" x="0.0" y="0.0" width="284" height="180"/>
                             <clipView key="contentView" drawsBackground="NO" id="3rY-ai-zIH">
-                                <rect key="frame" x="0.0" y="0.0" width="239" height="180"/>
+                                <rect key="frame" x="0.0" y="0.0" width="284" height="180"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
                                     <collectionView id="9Pp-ih-jEG">
-                                        <rect key="frame" x="0.0" y="0.0" width="239" height="158"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="284" height="180"/>
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES"/>
                                         <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" id="qH9-lA-K1b">
                                             <size key="itemSize" width="50" height="50"/>
@@ -59,11 +61,11 @@
                                 <color key="backgroundColor" red="0.96862745100000003" green="0.97254901959999995" blue="0.98039215690000003" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                             </clipView>
                             <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="mw6-lw-zx6">
-                                <rect key="frame" x="-100" y="-100" width="233" height="15"/>
+                                <rect key="frame" x="-100" y="-100" width="269" height="15"/>
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>
-                            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="OYB-Vn-iBU">
-                                <rect key="frame" x="-100" y="-100" width="15" height="143"/>
+                            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="OYB-Vn-iBU">
+                                <rect key="frame" x="-100" y="-100" width="15" height="180"/>
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>
                         </scrollView>
@@ -77,16 +79,16 @@
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="hz2-8h-p3M">
-                    <rect key="frame" x="32" y="326" width="239" height="1"/>
+                    <rect key="frame" x="32" y="344" width="284" height="1"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="1" id="lCq-vv-wv7"/>
                     </constraints>
                 </customView>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="BFX-df-wDy">
-                    <rect key="frame" x="32" y="54" width="239" height="40"/>
+                    <rect key="frame" x="32" y="72" width="284" height="40"/>
                     <subviews>
                         <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="h7l-IT-ODA">
-                            <rect key="frame" x="0.0" y="0.0" width="239" height="40"/>
+                            <rect key="frame" x="0.0" y="0.0" width="284" height="40"/>
                             <buttonCell key="cell" type="square" title="Sign Up For Free" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="mLU-cL-cIs">
                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                 <font key="font" metaFont="system"/>
@@ -104,25 +106,44 @@
                         <constraint firstItem="h7l-IT-ODA" firstAttribute="top" secondItem="BFX-df-wDy" secondAttribute="top" id="sy1-pD-i2U"/>
                     </constraints>
                 </customView>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3TK-IO-Uc2">
+                    <rect key="frame" x="30" y="367" width="288" height="16"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="tUs-FK-WKB">
+                        <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="sHp-vc-P9l">
+                    <rect key="frame" x="67" y="383" width="80" height="24"/>
+                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Badge" id="aiz-s6-Vnu"/>
+                </imageView>
             </subviews>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="y61-y9-dAw" secondAttribute="trailing" constant="32" id="40H-lE-x0y"/>
+                <constraint firstItem="3TK-IO-Uc2" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="32" id="2ov-ky-djW"/>
+                <constraint firstItem="sHp-vc-P9l" firstAttribute="leading" secondItem="y61-y9-dAw" secondAttribute="trailing" constant="8" id="BmZ-jv-VhC"/>
                 <constraint firstAttribute="trailing" secondItem="hz2-8h-p3M" secondAttribute="trailing" constant="32" id="DOy-GW-3OQ"/>
                 <constraint firstItem="Aal-EW-4N2" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="32" id="IJ3-VJ-Emz"/>
                 <constraint firstAttribute="trailing" secondItem="BFX-df-wDy" secondAttribute="trailing" constant="32" id="KAG-DU-qiH"/>
+                <constraint firstItem="3TK-IO-Uc2" firstAttribute="top" secondItem="y61-y9-dAw" secondAttribute="bottom" constant="4" id="LOW-rs-eQG"/>
                 <constraint firstAttribute="trailing" secondItem="JU3-B0-lwD" secondAttribute="trailing" constant="32" id="Lcg-Da-ur1"/>
                 <constraint firstAttribute="trailing" secondItem="Aal-EW-4N2" secondAttribute="trailing" constant="32" id="M6k-Zs-OeN"/>
+                <constraint firstItem="sHp-vc-P9l" firstAttribute="centerY" secondItem="y61-y9-dAw" secondAttribute="centerY" id="P2i-yi-eGm"/>
                 <constraint firstItem="Aal-EW-4N2" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="32" id="UUF-tu-jje"/>
                 <constraint firstItem="y61-y9-dAw" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="32" id="XgI-xM-8WU"/>
                 <constraint firstItem="BFX-df-wDy" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="32" id="act-gs-xBl"/>
                 <constraint firstItem="hz2-8h-p3M" firstAttribute="top" secondItem="y61-y9-dAw" secondAttribute="bottom" constant="42" id="cQa-Sy-L12"/>
                 <constraint firstItem="y61-y9-dAw" firstAttribute="top" secondItem="Aal-EW-4N2" secondAttribute="bottom" constant="16" id="fYz-ls-H9I"/>
                 <constraint firstItem="BFX-df-wDy" firstAttribute="top" secondItem="JU3-B0-lwD" secondAttribute="bottom" constant="32" id="iVM-h9-3gW"/>
+                <constraint firstAttribute="trailing" secondItem="3TK-IO-Uc2" secondAttribute="trailing" constant="32" id="l9l-rM-6KK"/>
                 <constraint firstItem="JU3-B0-lwD" firstAttribute="top" secondItem="hz2-8h-p3M" secondAttribute="bottom" constant="20" id="mk3-nP-iYQ"/>
                 <constraint firstItem="hz2-8h-p3M" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="32" id="uN3-zv-arS"/>
                 <constraint firstItem="JU3-B0-lwD" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="32" id="wYj-HX-NA2"/>
             </constraints>
-            <point key="canvasLocation" x="-50.5" y="16.5"/>
+            <point key="canvasLocation" x="-51" y="16.5"/>
         </customView>
     </objects>
+    <resources>
+        <image name="Badge" width="80" height="24"/>
+    </resources>
 </document>

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

@@ -23,7 +23,8 @@ class KMComparativeViewCollectionItemItem: NSCollectionViewItem {
     
     func reloadData() {
         if data.count != 0 {
-            if data["state"].debugDescription == "0" {
+            let state: Bool = data["state"] as? Bool ?? false
+            if state == false {
                 self.iconImageView.image = NSImage(named: "tips 1")
             } else {
                 self.iconImageView.image = NSImage(named: "tips")

PDF Office/PDF Master/Class/KMLightMember/Controller/ComparativeTable/View/KMComparativeView/View/KMComparativeViewCollectionItemItem.xib

@@ -16,11 +16,11 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="391" height="41"/>
+            <rect key="frame" x="0.0" y="0.0" width="282" height="43"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="nge-K8-16k">
-                    <rect key="frame" x="0.0" y="13" width="16" height="16"/>
+                    <rect key="frame" x="0.0" y="14" width="16" height="16"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="16" id="0QS-mA-sq8"/>
                         <constraint firstAttribute="height" constant="16" id="Cgv-RJ-y6k"/>
@@ -28,7 +28,7 @@
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="2Ns-FZ-peU"/>
                 </imageView>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="77S-IT-dI0">
-                    <rect key="frame" x="22" y="13" width="37" height="16"/>
+                    <rect key="frame" x="22" y="14" width="246" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="6Xk-Wh-SL6">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -37,12 +37,13 @@
                 </textField>
             </subviews>
             <constraints>
+                <constraint firstAttribute="trailing" secondItem="77S-IT-dI0" secondAttribute="trailing" constant="16" id="3b9-75-SyX"/>
                 <constraint firstItem="nge-K8-16k" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="Ceq-9s-k9T"/>
                 <constraint firstItem="77S-IT-dI0" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="gIs-hi-VkU"/>
                 <constraint firstItem="nge-K8-16k" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="jEN-N8-daK"/>
                 <constraint firstItem="77S-IT-dI0" firstAttribute="leading" secondItem="nge-K8-16k" secondAttribute="trailing" constant="8" id="rev-ow-42d"/>
             </constraints>
-            <point key="canvasLocation" x="61.5" y="235.5"/>
+            <point key="canvasLocation" x="44" y="236.5"/>
         </customView>
     </objects>
 </document>

PDF Office/PDF Master/Class/KMLightMember/Controller/Login&Register/View/KMLightNoNetworkView.xib

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