【会员系统】修复未登录时，使用转档功能需要先登录

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

@@ -1025,25 +1025,52 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
                 alert.addButton(withTitle: NSLocalizedString("Got it", comment: ""))
                 alert.runModal()
             } else {
-                KMProductCompareWC.shared.orientation = false
-                let winC = KMProductCompareWC.shared
-                if convertType == .Word || convertType == .AdvancedWord {
-                    winC.kEventName = "Reading_PDFtoWord_BuyNow"
-                } else if convertType == .Excel {
-                    winC.kEventName = "Reading_PDFtoExcel_BuyNow"
-                } else if convertType == .PPT {
-                    winC.kEventName = "Reading_PDFtoPPT_BuyNow"
-                } else if convertType == .RTF {
-                    winC.kEventName = "Reading_PDFtoRTF_BuyNow"
-                } else if convertType == .CSV {
-                    winC.kEventName = "Reading_PDFtoCSV_BuyNow"
-                } else if convertType == .Text {
-                    winC.kEventName = "Reading_PDFtoText_BuyNow"
-                }
-                if convertType == .JPEG || convertType == .JPG || convertType == .PNG || convertType == .GIF || convertType == .TIFF || convertType == .TGA || convertType == .BMP || convertType == .JP2 {
-                    winC.kEventName = "Reading_PDFtoImage_BuyNow"
+                if KMMemberInfo.shared.isLogin {
+                    KMProductCompareWC.shared.orientation = false
+                    let winC = KMProductCompareWC.shared
+                    if convertType == .Word || convertType == .AdvancedWord {
+                        winC.kEventName = "Reading_PDFtoWord_BuyNow"
+                    } else if convertType == .Excel {
+                        winC.kEventName = "Reading_PDFtoExcel_BuyNow"
+                    } else if convertType == .PPT {
+                        winC.kEventName = "Reading_PDFtoPPT_BuyNow"
+                    } else if convertType == .RTF {
+                        winC.kEventName = "Reading_PDFtoRTF_BuyNow"
+                    } else if convertType == .CSV {
+                        winC.kEventName = "Reading_PDFtoCSV_BuyNow"
+                    } else if convertType == .Text {
+                        winC.kEventName = "Reading_PDFtoText_BuyNow"
+                    }
+                    if convertType == .JPEG || convertType == .JPG || convertType == .PNG || convertType == .GIF || convertType == .TIFF || convertType == .TGA || convertType == .BMP || convertType == .JP2 {
+                        winC.kEventName = "Reading_PDFtoImage_BuyNow"
+                    }
+                    winC.showWindow(nil)
+                } else {
+                    KMLoginWindowsController.shared.openWindow() { [weak self] success in
+                        guard let self = self else { return }
+                        if success {
+                            KMProductCompareWC.shared.orientation = false
+                            let winC = KMProductCompareWC.shared
+                            if self.convertType == .Word || convertType == .AdvancedWord {
+                                winC.kEventName = "Reading_PDFtoWord_BuyNow"
+                            } else if self.convertType == .Excel {
+                                winC.kEventName = "Reading_PDFtoExcel_BuyNow"
+                            } else if self.convertType == .PPT {
+                                winC.kEventName = "Reading_PDFtoPPT_BuyNow"
+                            } else if self.convertType == .RTF {
+                                winC.kEventName = "Reading_PDFtoRTF_BuyNow"
+                            } else if self.convertType == .CSV {
+                                winC.kEventName = "Reading_PDFtoCSV_BuyNow"
+                            } else if self.convertType == .Text {
+                                winC.kEventName = "Reading_PDFtoText_BuyNow"
+                            }
+                            if self.convertType == .JPEG || self.convertType == .JPG || self.convertType == .PNG || self.convertType == .GIF || self.convertType == .TIFF || self.convertType == .TGA || self.convertType == .BMP || self.convertType == .JP2 {
+                                winC.kEventName = "Reading_PDFtoImage_BuyNow"
+                            }
+                            winC.showWindow(nil)
+                        }
+                    }
                 }
-                winC.showWindow(nil)
             }
         }
 #else

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

@@ -54,8 +54,8 @@
                                 <rect key="frame" x="0.0" y="326" width="279" height="24"/>
                                 <subviews>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BPG-eq-njN">
-                                        <rect key="frame" x="-2" y="4" width="37" height="16"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="23V-cH-HsX">
+                                        <rect key="frame" x="-2" y="4" width="52" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Sign Up" id="23V-cH-HsX">
                                             <font key="font" usesAppearanceFont="YES"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -76,7 +76,7 @@
                                     <subviews>
                                         <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Lob-YZ-RnN">
                                             <rect key="frame" x="6" y="6" width="265" height="14"/>
-                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="11111" id="pGk-LP-wDS">
+                                            <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Please enter Email" id="pGk-LP-wDS">
                                                 <font key="font" metaFont="smallSystem"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -111,16 +111,16 @@
                                         </connections>
                                     </button>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mrO-6N-8Nu">
-                                        <rect key="frame" x="16" y="4" width="37" height="16"/>
-                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="deH-Gf-v4Z">
+                                        <rect key="frame" x="16" y="4" width="91" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Stay logged in" id="deH-Gf-v4Z">
                                             <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 translatesAutoresizingMaskIntoConstraints="NO" id="88J-bh-zlh">
-                                        <rect key="frame" x="234" y="4" width="45" height="16"/>
-                                        <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="3dl-zm-3mP">
+                                        <rect key="frame" x="167" y="4" width="112" height="16"/>
+                                        <buttonCell key="cell" type="bevel" title="Forget Password?" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="3dl-zm-3mP">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
@@ -147,7 +147,7 @@
                                     <subviews>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="lP8-at-uhr">
                                             <rect key="frame" x="0.0" y="0.0" width="279" height="32"/>
-                                            <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="QaA-05-5Ij">
+                                            <buttonCell key="cell" type="bevel" title="Sign Up" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="QaA-05-5Ij">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
@@ -171,9 +171,10 @@
                                 <rect key="frame" x="0.0" y="0.0" width="279" height="66"/>
                                 <subviews>
                                     <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nTy-dc-ic8">
-                                        <rect key="frame" x="16" y="50" width="265" height="16"/>
-                                        <textFieldCell key="cell" title="Label" id="eQy-xd-X9I">
+                                        <rect key="frame" x="16" y="2" width="265" height="64"/>
+                                        <textFieldCell key="cell" id="eQy-xd-X9I">
                                             <font key="font" metaFont="system"/>
+                                            <string key="title">I have read and agree to the User Agreement and Privacy Policy, and an account will be automatically created after I log in to an unregistered email address</string>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -209,7 +210,7 @@
                                     <subviews>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="YK0-m7-FCm">
                                             <rect key="frame" x="0.0" y="0.0" width="140" height="28"/>
-                                            <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="TR5-7V-IZH">
+                                            <buttonCell key="cell" type="bevel" title="Verification code" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="TR5-7V-IZH">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="systemBold" size="14"/>
                                             </buttonCell>
@@ -219,7 +220,7 @@
                                         </button>
                                         <button translatesAutoresizingMaskIntoConstraints="NO" id="hI0-Ez-r1t">
                                             <rect key="frame" x="140" y="0.0" width="139" height="28"/>
-                                            <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="3Nj-KL-9F9">
+                                            <buttonCell key="cell" type="bevel" title="Password" bezelStyle="rounded" alignment="center" imageScaling="proportionallyDown" inset="2" id="3Nj-KL-9F9">
                                                 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="systemBold" size="14"/>
                                             </buttonCell>
@@ -285,13 +286,13 @@
                                             <rect key="frame" x="0.0" y="0.0" width="277" height="26"/>
                                             <subviews>
                                                 <box boxType="custom" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="JUe-bQ-uSN">
-                                                    <rect key="frame" x="0.0" y="0.0" width="226" height="26"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="228" height="26"/>
                                                     <view key="contentView" id="LsV-oy-6JL">
-                                                        <rect key="frame" x="1" y="1" width="224" height="24"/>
+                                                        <rect key="frame" x="1" y="1" width="226" height="24"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Q4E-Ah-Yxy">
-                                                                <rect key="frame" x="6" y="5" width="212" height="14"/>
+                                                                <rect key="frame" x="6" y="5" width="214" height="14"/>
                                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="7p1-b6-AOB">
                                                                     <font key="font" metaFont="smallSystem"/>
                                                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -309,14 +310,14 @@
                                                     </constraints>
                                                 </box>
                                                 <box boxType="custom" borderWidth="0.0" cornerRadius="1" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="YTg-zc-9kj" customClass="KMBox" customModule="PDF_Reader_Pro" customModuleProvider="target">
-                                                    <rect key="frame" x="226" y="0.0" width="51" height="26"/>
+                                                    <rect key="frame" x="228" y="0.0" width="49" height="26"/>
                                                     <view key="contentView" id="zmY-cn-OGB">
-                                                        <rect key="frame" x="0.0" y="0.0" width="51" height="26"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="49" height="26"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9CR-yj-hV6">
-                                                                <rect key="frame" x="6" y="6" width="39" height="15"/>
-                                                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Label" id="fPD-Vb-cyJ">
+                                                                <rect key="frame" x="6" y="6" width="37" height="15"/>
+                                                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Send" id="fPD-Vb-cyJ">
                                                                     <font key="font" metaFont="cellTitle"/>
                                                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -409,7 +410,7 @@
                             </box>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fa7-or-CZ6">
                                 <rect key="frame" x="-2" y="212" width="283" height="16"/>
-                                <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="AU7-am-n4v">
+                                <textFieldCell key="cell" lineBreakMode="clipping" id="AU7-am-n4v">
                                     <font key="font" usesAppearanceFont="YES"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -417,7 +418,7 @@
                             </textField>
                             <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WaO-uv-Tcx">
                                 <rect key="frame" x="-2" y="164" width="283" height="16"/>
-                                <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="tnz-ZO-Lot">
+                                <textFieldCell key="cell" lineBreakMode="clipping" id="tnz-ZO-Lot">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>