Merged in fix/SBA_19AW-3 (pull request wangjwchn#29)

SBA_19AW-3 SFSLXコンテンツ実装
GroupVantageApps · May 15, 2019 · 33c33e4 · 33c33e4
2 parents 7ada22f + dbf3d91
commit 33c33e4
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 45 deletions.
diff --git a/19AW/LxEffectImageP2.mp4 b/19AW/LxEffectImageP2.mp4
diff --git a/Share Beauty App/Controllers/Luxury/LuxuryLegendaryEnmeiViewController.swift b/Share Beauty App/Controllers/Luxury/LuxuryLegendaryEnmeiViewController.swift
@@ -7,6 +7,7 @@ class LuxuryLegendaryEnmeiViewController: LXBaseViewController, LXProductBLSView
     @IBOutlet weak private var mVContent: UIView!
     @IBOutlet var ProBtn: UIButton!
 
+    @IBOutlet weak var LegendaryProductBtn: UILabel!
     @IBOutlet weak var LegendaryEnmeiBtn: UILabel!
     @IBOutlet var LLEBtn: UIButton!
 
@@ -28,17 +29,16 @@ class LuxuryLegendaryEnmeiViewController: LXBaseViewController, LXProductBLSView
     private static let outAppInfos = [Const.outAppInfoFoundation, Const.outAppInfoUltimune, Const.outAppInfoESSENTIAL, Const.outAppInfoUvInfo, Const.outAppInfoSoftener, Const.outAppInfoNavigator]
     private static let outAppFoundationInfos = [Const.outAppInfoFoundation, Const.outAppInfoUltimune, Const.outAppInfoESSENTIAL]
 
-    @IBOutlet var LECImage: UIImageView!
+    @IBOutlet weak var LECTitle: UILabel!
 
     override
     func viewDidLoad() {
         super.viewDidLoad()
 
+        LegendaryProductBtn.text = AppItemTable.getNameByItemId(itemId: 8445)
+        LECTitle.text = AppItemTable.getNameByItemId(itemId: 8446)
         LegendaryEnmeiBtn.text = AppItemTable.getNameByItemId(itemId: 8447)
 
-        let lecImage = UIImage(named: "page2_lead.png")
-        self.LECImage.image = lecImage
-
         mScrollV.delegate = self
         mHeaderView.delegate = self
         mNavigationView.delegate = self

diff --git a/Share Beauty App/LuxuryLegendaryEnmeiViewController.storyboard b/Share Beauty App/LuxuryLegendaryEnmeiViewController.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="ipad9_7" orientation="landscape">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -48,8 +48,8 @@
                                                             <action selector="tappedProduct:" destination="kdo-NC-5K0" eventType="touchUpInside" id="tdY-hR-RhK"/>
                                                         </connections>
                                                     </button>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Product" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B29-iX-Lfv">
-                                                        <rect key="frame" x="225" y="452" width="63.5" height="51"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B29-iX-Lfv">
+                                                        <rect key="frame" x="138" y="461" width="237" height="31"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                         <fontDescription key="fontDescription" name="ACaslonPro-Regular" family="Adobe Caslon Pro" pointSize="20"/>
                                                         <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -78,8 +78,8 @@
                                                             <action selector="showSubView:" destination="kdo-NC-5K0" eventType="touchUpInside" id="nGU-Mv-7RV"/>
                                                         </connections>
                                                     </button>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="                                                         " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QAV-sw-3hz">
-                                                        <rect key="frame" x="168" y="461" width="237" height="31"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="                                                         " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QAV-sw-3hz">
+                                                        <rect key="frame" x="138" y="461" width="237" height="31"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                         <fontDescription key="fontDescription" name="ACaslonPro-Regular" family="Adobe Caslon Pro" pointSize="20"/>
                                                         <nil key="highlightedColor"/>
@@ -126,21 +126,23 @@
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qt0-DS-D4E" userLabel="LECView">
                                 <rect key="frame" x="0.0" y="114" width="1024" height="117"/>
                                 <subviews>
-                                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="page2_lead.png" translatesAutoresizingMaskIntoConstraints="NO" id="fy6-Gk-fiW">
-                                        <rect key="frame" x="297" y="0.0" width="430" height="117"/>
-                                        <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fv0-NF-wWi">
+                                        <rect key="frame" x="262" y="0.0" width="500" height="117"/>
                                         <constraints>
-                                            <constraint firstAttribute="width" constant="430" id="6A6-4H-lv1"/>
-                                            <constraint firstAttribute="height" constant="117" id="XMp-ka-WL5"/>
+                                            <constraint firstAttribute="height" constant="117" id="1Wc-u6-ZJh"/>
+                                            <constraint firstAttribute="width" constant="500" id="8Mg-jH-amz"/>
                                         </constraints>
-                                    </imageView>
+                                        <fontDescription key="fontDescription" name="ACaslonPro-Regular" family="Adobe Caslon Pro" pointSize="42"/>
+                                        <color key="textColor" red="0.68235294117647061" green="0.58823529411764708" blue="0.22352941176470587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
                                 </subviews>
                                 <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
                                 <constraints>
-                                    <constraint firstItem="fy6-Gk-fiW" firstAttribute="leading" secondItem="qt0-DS-D4E" secondAttribute="leading" constant="297" id="0FM-Gr-dl7"/>
-                                    <constraint firstAttribute="bottom" secondItem="fy6-Gk-fiW" secondAttribute="bottom" id="Hhg-g3-jQN"/>
-                                    <constraint firstAttribute="trailing" secondItem="fy6-Gk-fiW" secondAttribute="trailing" constant="297" id="aaR-1e-5zU"/>
-                                    <constraint firstItem="fy6-Gk-fiW" firstAttribute="top" secondItem="qt0-DS-D4E" secondAttribute="top" id="dcx-Mf-tB5"/>
+                                    <constraint firstItem="Fv0-NF-wWi" firstAttribute="top" secondItem="qt0-DS-D4E" secondAttribute="top" id="AAP-Gm-F6y"/>
+                                    <constraint firstAttribute="bottom" secondItem="Fv0-NF-wWi" secondAttribute="bottom" id="BZB-ti-bAb"/>
+                                    <constraint firstItem="Fv0-NF-wWi" firstAttribute="leading" secondItem="qt0-DS-D4E" secondAttribute="leading" constant="262" id="RzV-qw-QFQ"/>
+                                    <constraint firstAttribute="trailing" secondItem="Fv0-NF-wWi" secondAttribute="trailing" constant="262" id="Tha-Gd-ooy"/>
                                 </constraints>
                             </view>
                         </subviews>
@@ -165,9 +167,10 @@
                         </constraints>
                     </view>
                     <connections>
-                        <outlet property="LECImage" destination="fy6-Gk-fiW" id="M2R-pc-dYo"/>
+                        <outlet property="LECTitle" destination="Fv0-NF-wWi" id="V55-4w-xwl"/>
                         <outlet property="LLEBtn" destination="gdZ-OM-cIZ" id="1Y0-VF-lus"/>
                         <outlet property="LegendaryEnmeiBtn" destination="QAV-sw-3hz" id="c5A-TM-aZR"/>
+                        <outlet property="LegendaryProductBtn" destination="B29-iX-Lfv" id="75A-45-ukG"/>
                         <outlet property="ProBtn" destination="x9T-ag-Oim" id="uAJ-Ul-NQi"/>
                         <outlet property="mHeaderView" destination="Gru-nb-TYE" id="gli-hl-TQx"/>
                         <outlet property="mNavigationView" destination="RQT-jL-lLe" id="Atk-IF-8eg"/>
@@ -182,7 +185,6 @@
     </scenes>
     <resources>
         <image name="p2_plant.png" width="1024" height="1029"/>
-        <image name="page2_lead.png" width="3144" height="914"/>
         <image name="page2_visual_1.png" width="1024" height="1029"/>
     </resources>
 </document>
diff --git a/Share Beauty App/Views/LX/LXLegendaryEnmeiComplexView.xib b/Share Beauty App/Views/LX/LXLegendaryEnmeiComplexView.xib
@@ -30,7 +30,7 @@
                             <state key="normal" title="Button" image="btn_next.png"/>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="                                                      " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1vw-ne-mMg">
-                            <rect key="frame" x="35" y="95" width="450" height="40"/>
+                            <rect key="frame" x="35" y="95" width="925" height="40"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" name="ACaslonPro-Regular" family="Adobe Caslon Pro" pointSize="40"/>
                             <color key="textColor" red="0.68235294120000001" green="0.58823529409999997" blue="0.22352941179999999" alpha="1" colorSpace="calibratedRGB"/>

diff --git a/Share Beauty App/Views/LX/LXTechGene2View.xib b/Share Beauty App/Views/LX/LXTechGene2View.xib
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="ipad10_5" orientation="landscape">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
         <array key="ACaslonPro-Regular.otf">
             <string>ACaslonPro-Regular</string>
         </array>
-        <array key="ACaslonPro-Semibold.otf">
-            <string>ACaslonPro-Semibold</string>
-        </array>
     </customFonts>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -33,10 +30,10 @@
                             <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="                                                      " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nyg-qR-p3j">
-                            <rect key="frame" x="269" y="51" width="423" height="44"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="                                                      " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nyg-qR-p3j">
+                            <rect key="frame" x="0.0" y="51" width="960" height="44"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="ACaslonPro-Semibold" family="Adobe Caslon Pro" pointSize="37"/>
+                            <fontDescription key="fontDescription" name="ACaslonPro-Regular" family="Adobe Caslon Pro" pointSize="37"/>
                             <color key="textColor" red="0.68235294120000001" green="0.58823529409999997" blue="0.22352941179999999" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
@@ -95,9 +92,9 @@
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="                                                                         " textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z4n-Qf-ayh">
-                            <rect key="frame" x="186" y="483" width="589" height="209"/>
+                            <rect key="frame" x="186" y="503" width="589" height="121"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" name="ACaslonPro-Semibold" family="Adobe Caslon Pro" pointSize="37"/>
+                            <fontDescription key="fontDescription" name="ACaslonPro-Regular" family="Adobe Caslon Pro" pointSize="37"/>
                             <color key="textColor" red="0.68235294120000001" green="0.58823529409999997" blue="0.22352941179999999" alpha="1" colorSpace="calibratedRGB"/>
                             <nil key="highlightedColor"/>
                         </label>