【会员系统】登录界面图片整理

PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/WelcomePDFReaderPro1.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Property 1=Default.pdf",
+      "filename" : "left.pdf",
       "idiom" : "universal"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Property 1=Default 1.pdf",
+      "filename" : "left 1.pdf",
       "idiom" : "universal"
     }
   ],

PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/WelcomePDFReaderPro2.imageset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Property 1=重置密码.pdf",
+      "filename" : "T240903161495-png 3.pdf",
       "idiom" : "universal"
     },
     {
@@ -11,7 +11,7 @@
           "value" : "dark"
         }
       ],
-      "filename" : "Property 1=重置密码 1.pdf",
+      "filename" : "T240903161495-png 4.pdf",
       "idiom" : "universal"
     }
   ],

PDF Office/PDF Master/MemberCenter/Assets/MemberCenter.xcassets/Image/WelcomeSubPDFReaderPro.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "filename" : "T240903161495-png 1-2.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "T240903161495-png 1-2 1.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PDF Office/PDF Master/MemberCenter/View/KMSignUpView.xib

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

PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -51,7 +51,6 @@
                 <outlet property="lockedBox" destination="NcD-bG-uzV" id="Amg-WY-VZq"/>
                 <outlet property="lockedImageView" destination="wcT-k3-31w" id="wHQ-RN-sc9"/>
                 <outlet property="lockedLabel" destination="Yp0-r5-Zyn" id="jNX-dC-Fjg"/>
-                <outlet property="lockedLabelWidthffset" destination="61O-vD-6p3" id="wUq-6P-hAR"/>
                 <outlet property="membershipLabel" destination="gGn-tS-WsW" id="1I5-50-bap"/>
                 <outlet property="number1ImageView" destination="5md-dc-o6U" id="NmQ-pX-esg"/>
                 <outlet property="number1Label" destination="3Lv-MN-obu" id="3vH-6p-wk7"/>
@@ -206,9 +205,6 @@
                                                         </imageView>
                                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Yp0-r5-Zyn">
                                                             <rect key="frame" x="26" y="4" width="37" height="16"/>
-                                                            <constraints>
-                                                                <constraint firstAttribute="width" constant="33" id="61O-vD-6p3"/>
-                                                            </constraints>
                                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="WB3-CE-yDh">
                                                                 <font key="font" metaFont="system"/>
                                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>

PDF Office/PDF Master/MemberCenter/WindowsController/KMLoginWindowsController.swift

@@ -15,7 +15,9 @@ class KMLoginWindowsController: NSWindowController {
     
     @IBOutlet weak var leftBox: NSBox!
     @IBOutlet weak var leftImageView: NSImageView!
-    
+    @IBOutlet weak var leftsubImageView: NSImageView!
+    @IBOutlet weak var leftsubLabel: NSTextField!
+
     @IBOutlet weak var rightBox: NSBox!
     
     var memberInfo: KMMemberInfo = KMMemberInfo.shared
@@ -40,6 +42,8 @@ class KMLoginWindowsController: NSWindowController {
 //        window?.styleMask.insert([.titled, .closable, .miniaturizable, .fullSizeContentView])
 //        window?.titleVisibility = .visible
         
+        leftsubLabel.stringValue = NSLocalizedString("Welcome to PDF Reader Pro", tableName: "MemberCenterLocalizable", comment: "")
+        
         initializeUI()
         
         NotificationCenter.default.addObserver(self, selector: #selector(loginSuccessNotification), name: NSNotification.Name(rawValue: "MemberCenterLoginSuccess"), object: nil)
@@ -54,25 +58,12 @@ class KMLoginWindowsController: NSWindowController {
         if memberInfo.isLogin {
             window?.close()
         } else {
-            leftImageView.image = NSImage(named: "WelcomePDFReaderPro1")
-            
             guard let parentView = self.window?.contentView else { return }
             signUpView = KMSignUpView(model: viewModel, superView: parentView)
             if(signUpView != nil) {
                 signUpView?.frame = rightBox.frame
                 rightBox.contentView = signUpView!
             }
-            //远程控制
-            if let loginContent = KMAdvertisementManager.manager.info.loginViewContent {
-                if loginContent.content?.isEmpty == false {
-                    let content = loginContent.content?.first
-                    let url = URL(string: KMAdvertisementModelTransition.transitionImagePath(image: content?.image, highlight: false))
-                    let _ = KMAdvertisementImage.imageWithURL(url: url) { [weak self] image in
-                        guard let self = self else { return }
-                        self.leftImageView.image = image
-                    }
-                }
-            }
             
             let signUpView = KMSignUpView()
             signUpView.frame = rightBox.frame
@@ -96,8 +87,27 @@ class KMLoginWindowsController: NSWindowController {
     
     // 刷新左侧视图
     private func refreshSplitView() -> Void {
+        leftImageView.image = NSImage(named: "WelcomePDFReaderPro1")
+        self.leftsubLabel.isHidden = false
+        self.leftsubImageView.isHidden = false
+
         if viewModel.screenType == .signUp {
-            
+            leftsubImageView.image = NSImage(named: "WelcomeSubPDFReaderPro")
+            //远程控制
+            if let loginContent = KMAdvertisementManager.manager.info.loginViewContent {
+                if loginContent.content?.isEmpty == false {
+                    let content = loginContent.content?.first
+                    let url = URL(string: KMAdvertisementModelTransition.transitionImagePath(image: content?.image, highlight: false))
+                    let _ = KMAdvertisementImage.imageWithURL(url: url) { [weak self] image in
+                        guard let self = self else { return }
+                        self.leftImageView.image = image
+                        self.leftsubLabel.isHidden = true
+                        self.leftsubImageView.isHidden = true
+                    }
+                }
+            }
+        } else {
+            leftsubImageView.image = NSImage(named: "WelcomeSub2PDFReaderPro")
         }
     }
     

PDF Office/PDF Master/MemberCenter/WindowsController/KMLoginWindowsController.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -10,6 +10,8 @@
             <connections>
                 <outlet property="leftBox" destination="YDG-OZ-oQi" id="Y58-nA-boC"/>
                 <outlet property="leftImageView" destination="Vcr-VH-8V2" id="uDJ-5Z-KL6"/>
+                <outlet property="leftsubImageView" destination="h79-lS-SGD" id="5be-q6-aK9"/>
+                <outlet property="leftsubLabel" destination="BvV-qI-3sJ" id="Bn0-3H-84N"/>
                 <outlet property="rightBox" destination="L5U-6O-P63" id="gYq-Xu-tHr"/>
                 <outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
             </connections>
@@ -19,7 +21,7 @@
         <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" fullSizeContentView="YES"/>
             <rect key="contentRect" x="196" y="240" width="661" height="443"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
             <value key="minSize" type="size" width="661" height="443"/>
             <value key="maxSize" type="size" width="661" height="443"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -36,6 +38,22 @@
                                     <rect key="frame" x="0.0" y="0.0" width="300" height="443"/>
                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="IaG-H6-8fu"/>
                                 </imageView>
+                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="h79-lS-SGD">
+                                    <rect key="frame" x="30" y="142" width="241" height="241"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="241" id="gE8-p7-T9k"/>
+                                        <constraint firstAttribute="width" constant="241" id="gHi-vd-vhR"/>
+                                    </constraints>
+                                    <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="Ccr-A7-BS8"/>
+                                </imageView>
+                                <textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="BvV-qI-3sJ">
+                                    <rect key="frame" x="28" y="71" width="245" height="56"/>
+                                    <textFieldCell key="cell" selectable="YES" alignment="center" title="Welcome to PDF Reader Pro" id="jOp-Gy-wXk">
+                                        <font key="font" metaFont="system" size="24"/>
+                                        <color key="textColor" red="0.027450980392156862" green="0.45098039215686275" blue="0.92941176470588238" alpha="0.84705882352941175" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
                                 <button translatesAutoresizingMaskIntoConstraints="NO" id="4Ss-Uv-N07">
                                     <rect key="frame" x="0.0" y="0.0" width="300" height="443"/>
                                     <buttonCell key="cell" type="bevel" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="1ve-Ab-F2H">
@@ -48,9 +66,15 @@
                                 </button>
                             </subviews>
                             <constraints>
+                                <constraint firstItem="BvV-qI-3sJ" firstAttribute="trailing" secondItem="h79-lS-SGD" secondAttribute="trailing" id="569-l2-ZAa"/>
+                                <constraint firstItem="BvV-qI-3sJ" firstAttribute="top" secondItem="h79-lS-SGD" secondAttribute="bottom" constant="15" id="7O4-G8-Cam"/>
+                                <constraint firstItem="BvV-qI-3sJ" firstAttribute="leading" secondItem="h79-lS-SGD" secondAttribute="leading" id="8QM-Ut-Au6"/>
+                                <constraint firstItem="h79-lS-SGD" firstAttribute="top" secondItem="jLg-6t-1HG" secondAttribute="top" constant="60" id="JVa-2k-duF"/>
                                 <constraint firstItem="Vcr-VH-8V2" firstAttribute="leading" secondItem="jLg-6t-1HG" secondAttribute="leading" id="QPr-HO-uyA"/>
                                 <constraint firstItem="Vcr-VH-8V2" firstAttribute="top" secondItem="jLg-6t-1HG" secondAttribute="top" id="S67-HU-1I1"/>
+                                <constraint firstItem="h79-lS-SGD" firstAttribute="centerX" secondItem="jLg-6t-1HG" secondAttribute="centerX" id="TLC-8n-4mf"/>
                                 <constraint firstAttribute="bottom" secondItem="4Ss-Uv-N07" secondAttribute="bottom" id="Zdu-5W-vKf"/>
+                                <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="BvV-qI-3sJ" secondAttribute="bottom" constant="20" id="bCu-AQ-UeG"/>
                                 <constraint firstAttribute="trailing" secondItem="4Ss-Uv-N07" secondAttribute="trailing" id="cWU-Lq-uvz"/>
                                 <constraint firstAttribute="bottom" secondItem="Vcr-VH-8V2" secondAttribute="bottom" id="eQ1-1d-18e"/>
                                 <constraint firstItem="4Ss-Uv-N07" firstAttribute="leading" secondItem="jLg-6t-1HG" secondAttribute="leading" id="g1b-UH-cAb"/>
@@ -61,6 +85,7 @@
                         <constraints>
                             <constraint firstAttribute="width" constant="300" id="gk9-9U-WMj"/>
                         </constraints>
+                        <font key="titleFont" metaFont="message" size="11"/>
                     </box>
                     <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="L5U-6O-P63">
                         <rect key="frame" x="300" y="0.0" width="361" height="443"/>
@@ -68,6 +93,7 @@
                             <rect key="frame" x="0.0" y="0.0" width="361" height="443"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         </view>
+                        <font key="titleFont" metaFont="message" size="11"/>
                     </box>
                 </subviews>
                 <constraints>