【会员系统】补充APPstore比较表头价格处理

PDF Office/PDF Master/Class/Purchase/IAPProductsManager.m

@@ -407,7 +407,7 @@ NSString * const KMMemberInfoChangeNotification = @"KMMemberInfoChangeNotificati
         self.fourDevicesAllAccessPackNew12months_lite = [[[IAPProduct alloc] init] autorelease];
         self.fourDevicesAllAccessPackNew12months_lite.productIdentifier = KM4DevicesAllAccessPack12Months_Free;
         self.fourDevicesAllAccessPackNew12months_lite.priceNumber = @(99.99);
-        self.fourDevicesAllAccessPackNew12months_lite.offersPriceNumber = @(59.99);
+        self.fourDevicesAllAccessPackNew12months_lite.offersPriceNumber = @(69.99);
         self.fourDevicesAllAccessPackNew12months_lite.isOffers = isOffers;
         self.fourDevicesAllAccessPackNew12months_lite.mouthNumber = 12;
         

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

@@ -18,6 +18,7 @@
                 <outlet property="advancedPlanPurchaseLblBtn" destination="JRG-Tt-bke" id="gp7-56-gTK"/>
                 <outlet property="advancedPlanPurchaseSubLabel" destination="oie-PG-6He" id="54z-yg-Umo"/>
                 <outlet property="advancedPlanPurchaseSubLabel2" destination="0HH-bq-tk2" id="SRH-PL-6QB"/>
+                <outlet property="advancedPurchaseOriPriceLbl" destination="3VL-nh-gaY" id="3wQ-lI-5Gq"/>
                 <outlet property="backgroundImage1" destination="mhT-uZ-2vj" id="J5Z-rm-pk3"/>
                 <outlet property="backgroundImage3" destination="Y18-DK-FWw" id="3wh-VW-Aud"/>
                 <outlet property="billedTopConst" destination="TWZ-mS-ih1" id="yMT-KX-19C"/>
@@ -45,6 +46,7 @@
                 <outlet property="permanentPurchaseLabel" destination="okn-VX-xhH" id="MHC-gj-C4i"/>
                 <outlet property="permanentPurchaseLbl" destination="w8I-Fc-Axv" id="ilg-lV-lCb"/>
                 <outlet property="permanentPurchaseLblBtn" destination="5cy-wO-SqL" id="miQ-hL-2lK"/>
+                <outlet property="permanentPurchaseOriPriceLbl" destination="bDg-XE-hsR" id="N91-ze-Ohx"/>
                 <outlet property="permanentPurchaseSubLabel" destination="CHT-d8-7WR" id="RsF-HN-anj"/>
                 <outlet property="permanentPurchaseSubLabel2" destination="ctO-mu-ddI" id="msi-hr-4xG"/>
                 <outlet property="platformsView1" destination="kyQ-Jn-2Ny" id="2l9-dt-Enr"/>
@@ -70,6 +72,7 @@
                 <outlet property="standardPlanPurchaseLblBtn" destination="ZEN-97-7fT" id="aGr-R1-F0z"/>
                 <outlet property="standardPlanPurchaseSubLabel" destination="u1v-EM-8Bp" id="Eu4-yf-FCl"/>
                 <outlet property="standardPlanPurchaseSubLabel2" destination="Z2t-T7-CMh" id="S0p-hw-fCQ"/>
+                <outlet property="standardPurchaseOriPriceLbl" destination="6Pe-0P-Poq" id="Cf0-xP-xfh"/>
                 <outlet property="switchBox" destination="tpD-w8-ls0" id="DIZ-e4-SsX"/>
                 <outlet property="switchBtn" destination="85I-Ew-NJK" id="3IJ-re-jWC"/>
                 <outlet property="switchCircleLeftConst" destination="zfa-w6-GDp" id="5Fi-Qt-Plo"/>
@@ -110,7 +113,7 @@
         <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="documentWindow" titlebarAppearsTransparent="YES" id="7jy-UC-R98">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
             <rect key="contentRect" x="77" y="40" width="970" height="660"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1800" height="1125"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <view key="contentView" wantsLayer="YES" misplaced="YES" id="BHT-Ss-56B">
                 <rect key="frame" x="0.0" y="0.0" width="970" height="660"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -1593,7 +1596,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                     <rect key="frame" x="5" y="64" width="289" height="126"/>
                     <subviews>
                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cgF-jQ-Q0K">
-                            <rect key="frame" x="93" y="39" width="103" height="19"/>
+                            <rect key="frame" x="93" y="51" width="103" height="19"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="USD $59.99" id="H9D-N9-VLY">
                                 <font key="font" metaFont="systemBold" size="16"/>
                                 <color key="textColor" red="0.0" green="0.53333333329999999" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1617,10 +1620,10 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                             </textFieldCell>
                         </textField>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="06E-ch-V27">
-                            <rect key="frame" x="0.0" y="62" width="289" height="64"/>
+                            <rect key="frame" x="0.0" y="74" width="289" height="52"/>
                             <subviews>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yl6-4d-E04">
-                                    <rect key="frame" x="-2" y="15" width="293" height="34"/>
+                                    <rect key="frame" x="-2" y="9" width="293" height="34"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="PDF Reader Pro Standard
Annual Plan" id="6oh-fB-yXw">
                                         <font key="font" metaFont="systemSemibold" size="14"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1635,13 +1638,23 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                                 <constraint firstItem="yl6-4d-E04" firstAttribute="centerY" secondItem="06E-ch-V27" secondAttribute="centerY" id="jz0-hF-OoW"/>
                             </constraints>
                         </customView>
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6Pe-0P-Poq">
+                            <rect key="frame" x="126" y="35" width="37" height="16"/>
+                            <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="bRZ-GN-WxX">
+                                <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>
                     </subviews>
                     <constraints>
                         <constraint firstAttribute="bottom" secondItem="Z2t-T7-CMh" secondAttribute="bottom" id="4Or-03-2cT"/>
                         <constraint firstItem="06E-ch-V27" firstAttribute="top" secondItem="YaA-Bf-f9V" secondAttribute="top" id="5lH-kn-eSS"/>
                         <constraint firstItem="cgF-jQ-Q0K" firstAttribute="centerX" secondItem="YaA-Bf-f9V" secondAttribute="centerX" id="9s0-1y-Bm6"/>
+                        <constraint firstItem="6Pe-0P-Poq" firstAttribute="top" secondItem="cgF-jQ-Q0K" secondAttribute="bottom" id="Cen-et-929"/>
                         <constraint firstItem="cgF-jQ-Q0K" firstAttribute="top" secondItem="06E-ch-V27" secondAttribute="bottom" constant="4" id="JcW-HC-hL5"/>
-                        <constraint firstItem="u1v-EM-8Bp" firstAttribute="top" secondItem="cgF-jQ-Q0K" secondAttribute="bottom" constant="4" id="Ovy-Hj-Ev1"/>
+                        <constraint firstItem="u1v-EM-8Bp" firstAttribute="top" secondItem="cgF-jQ-Q0K" secondAttribute="bottom" constant="16" id="Ovy-Hj-Ev1"/>
+                        <constraint firstItem="6Pe-0P-Poq" firstAttribute="centerX" secondItem="cgF-jQ-Q0K" secondAttribute="centerX" id="Pjd-Vx-a3c"/>
                         <constraint firstAttribute="trailing" secondItem="06E-ch-V27" secondAttribute="trailing" id="cKP-VM-kgc"/>
                         <constraint firstItem="06E-ch-V27" firstAttribute="leading" secondItem="YaA-Bf-f9V" secondAttribute="leading" id="ng0-7R-1P2"/>
                         <constraint firstItem="Z2t-T7-CMh" firstAttribute="centerX" secondItem="YaA-Bf-f9V" secondAttribute="centerX" id="rfY-a5-7tX"/>
@@ -1720,7 +1733,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                     <rect key="frame" x="5" y="64" width="289" height="126"/>
                     <subviews>
                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ABz-rY-vFD">
-                            <rect key="frame" x="93" y="39" width="103" height="19"/>
+                            <rect key="frame" x="93" y="51" width="103" height="19"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="USD $59.99" id="C5d-NE-YDk">
                                 <font key="font" metaFont="systemBold" size="16"/>
                                 <color key="textColor" red="0.0" green="0.53333333329999999" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1744,10 +1757,10 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                             </textFieldCell>
                         </textField>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="OLo-E3-D6L">
-                            <rect key="frame" x="0.0" y="62" width="289" height="64"/>
+                            <rect key="frame" x="0.0" y="74" width="289" height="52"/>
                             <subviews>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ll7-An-0YH">
-                                    <rect key="frame" x="-2" y="15" width="293" height="34"/>
+                                    <rect key="frame" x="-2" y="9" width="293" height="34"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="PDF Reader Pro Advanced
Annual Plan" id="nN2-mJ-xpd">
                                         <font key="font" metaFont="systemSemibold" size="14"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1762,17 +1775,27 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                                 <constraint firstItem="Ll7-An-0YH" firstAttribute="centerY" secondItem="OLo-E3-D6L" secondAttribute="centerY" id="wkM-UL-LQF"/>
                             </constraints>
                         </customView>
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3VL-nh-gaY">
+                            <rect key="frame" x="126" y="35" width="37" height="16"/>
+                            <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="aXQ-1H-rcW">
+                                <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>
                     </subviews>
                     <constraints>
                         <constraint firstItem="OLo-E3-D6L" firstAttribute="top" secondItem="5lC-K6-aWW" secondAttribute="top" id="4uM-56-PGN"/>
                         <constraint firstItem="oie-PG-6He" firstAttribute="centerX" secondItem="5lC-K6-aWW" secondAttribute="centerX" id="F3X-QR-GG6"/>
-                        <constraint firstItem="oie-PG-6He" firstAttribute="top" secondItem="ABz-rY-vFD" secondAttribute="bottom" constant="4" id="Mtq-Kq-LxB"/>
+                        <constraint firstItem="oie-PG-6He" firstAttribute="top" secondItem="ABz-rY-vFD" secondAttribute="bottom" constant="16" id="Mtq-Kq-LxB"/>
                         <constraint firstItem="0HH-bq-tk2" firstAttribute="top" secondItem="oie-PG-6He" secondAttribute="bottom" constant="4" id="Rlo-MH-klG"/>
                         <constraint firstItem="ABz-rY-vFD" firstAttribute="centerX" secondItem="5lC-K6-aWW" secondAttribute="centerX" id="ULd-tv-JoN"/>
+                        <constraint firstItem="3VL-nh-gaY" firstAttribute="top" secondItem="ABz-rY-vFD" secondAttribute="bottom" id="VJj-dT-gIq"/>
                         <constraint firstItem="0HH-bq-tk2" firstAttribute="centerX" secondItem="5lC-K6-aWW" secondAttribute="centerX" id="WEc-zD-vMV"/>
                         <constraint firstItem="ABz-rY-vFD" firstAttribute="top" secondItem="OLo-E3-D6L" secondAttribute="bottom" constant="4" id="gnh-rp-Cem"/>
                         <constraint firstItem="OLo-E3-D6L" firstAttribute="leading" secondItem="5lC-K6-aWW" secondAttribute="leading" id="ja7-qa-m6K"/>
                         <constraint firstAttribute="bottom" secondItem="0HH-bq-tk2" secondAttribute="bottom" id="rJu-mV-Cp0"/>
+                        <constraint firstItem="3VL-nh-gaY" firstAttribute="centerX" secondItem="ABz-rY-vFD" secondAttribute="centerX" id="w04-ca-3Ig"/>
                         <constraint firstAttribute="trailing" secondItem="OLo-E3-D6L" secondAttribute="trailing" id="wHv-u5-eTc"/>
                     </constraints>
                 </customView>
@@ -1797,7 +1820,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                 <constraint firstItem="Y18-DK-FWw" firstAttribute="top" secondItem="fce-hX-IV6" secondAttribute="top" id="wq9-Kr-SEO"/>
                 <constraint firstItem="DQR-1s-l8u" firstAttribute="trailing" secondItem="JRG-Tt-bke" secondAttribute="trailing" constant="15" id="xWr-ZZ-4ra"/>
             </constraints>
-            <point key="canvasLocation" x="1390" y="731"/>
+            <point key="canvasLocation" x="1389.5" y="731"/>
         </customView>
         <customView id="XVZ-jI-UYX">
             <rect key="frame" x="0.0" y="0.0" width="299" height="202"/>
@@ -1847,7 +1870,7 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                     <rect key="frame" x="5" y="64" width="289" height="126"/>
                     <subviews>
                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="okn-VX-xhH">
-                            <rect key="frame" x="93" y="39" width="103" height="19"/>
+                            <rect key="frame" x="93" y="51" width="103" height="19"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="USD $59.99" id="cKO-QB-euV">
                                 <font key="font" metaFont="systemBold" size="16"/>
                                 <color key="textColor" red="0.0" green="0.53333333329999999" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1871,10 +1894,10 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                             </textFieldCell>
                         </textField>
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="9Wf-EF-Uhb">
-                            <rect key="frame" x="0.0" y="62" width="289" height="64"/>
+                            <rect key="frame" x="0.0" y="74" width="289" height="52"/>
                             <subviews>
                                 <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="snj-Zj-OvD">
-                                    <rect key="frame" x="-2" y="24" width="293" height="17"/>
+                                    <rect key="frame" x="-2" y="18" width="293" height="17"/>
                                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="PDF Reader Pro Permanent" id="buB-bu-9Qo">
                                         <font key="font" metaFont="systemSemibold" size="14"/>
                                         <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1889,16 +1912,26 @@ https://www.pdfreaderpro.com/privacy-policy</mutableString>
                                 <constraint firstItem="snj-Zj-OvD" firstAttribute="centerX" secondItem="9Wf-EF-Uhb" secondAttribute="centerX" id="mAc-Ay-Bti"/>
                             </constraints>
                         </customView>
+                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bDg-XE-hsR">
+                            <rect key="frame" x="126" y="35" width="37" height="16"/>
+                            <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="0fF-QS-bAz">
+                                <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>
                     </subviews>
                     <constraints>
+                        <constraint firstItem="bDg-XE-hsR" firstAttribute="top" secondItem="okn-VX-xhH" secondAttribute="bottom" id="4FN-xG-CZy"/>
                         <constraint firstItem="ctO-mu-ddI" firstAttribute="top" secondItem="CHT-d8-7WR" secondAttribute="bottom" constant="4" id="P3e-P5-yjl"/>
                         <constraint firstItem="okn-VX-xhH" firstAttribute="centerX" secondItem="C1f-JL-m0e" secondAttribute="centerX" id="a5e-Ak-EMB"/>
                         <constraint firstItem="okn-VX-xhH" firstAttribute="top" secondItem="9Wf-EF-Uhb" secondAttribute="bottom" constant="4" id="bPW-0P-B8Q"/>
                         <constraint firstAttribute="bottom" secondItem="ctO-mu-ddI" secondAttribute="bottom" id="cU7-Sc-Cbb"/>
                         <constraint firstItem="9Wf-EF-Uhb" firstAttribute="top" secondItem="C1f-JL-m0e" secondAttribute="top" id="jtJ-M4-6qQ"/>
-                        <constraint firstItem="CHT-d8-7WR" firstAttribute="top" secondItem="okn-VX-xhH" secondAttribute="bottom" constant="4" id="kbU-ad-U9f"/>
+                        <constraint firstItem="CHT-d8-7WR" firstAttribute="top" secondItem="okn-VX-xhH" secondAttribute="bottom" constant="16" id="kbU-ad-U9f"/>
                         <constraint firstAttribute="trailing" secondItem="9Wf-EF-Uhb" secondAttribute="trailing" id="l5R-h7-HlE"/>
                         <constraint firstItem="ctO-mu-ddI" firstAttribute="centerX" secondItem="C1f-JL-m0e" secondAttribute="centerX" id="ncO-cn-uYk"/>
+                        <constraint firstItem="bDg-XE-hsR" firstAttribute="centerX" secondItem="okn-VX-xhH" secondAttribute="centerX" id="sqV-oe-T5L"/>
                         <constraint firstItem="9Wf-EF-Uhb" firstAttribute="leading" secondItem="C1f-JL-m0e" secondAttribute="leading" id="vLy-tQ-QOc"/>
                         <constraint firstItem="CHT-d8-7WR" firstAttribute="centerX" secondItem="C1f-JL-m0e" secondAttribute="centerX" id="xlk-zg-B6h"/>
                     </constraints>