Merged in madoka_igarashi/sba19aw/19AW/develop (pull request wangjwch…

…n#36)

19AW/develop

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

Share Beauty App/Controllers/Luxury/LuxuryProductViewController.swift

@@ -57,13 +57,16 @@ class LuxuryProductViewController: LXBaseViewController, LXProductBLSViewDelegat
  mUpperSteps = line.step
  mLowerSteps = mUpperSteps.flatMap {$0.lineStep}
  var beautyCsvId = 7
+
  print(mLowerSteps)
  for (i, step) in mLowerSteps.enumerated() {
  let baseV = self.view.viewWithTag(i + 10)! as UIView
  let stepLbl = baseV.viewWithTag(i + 60) as! UILabel
  let stepCsvId = i + 4
 
- if ((lxArr[String(stepCsvId)]?.data(using: String.Encoding.ascii, allowLossyConversion: false)) != nil) { 
+
+
+ if ((lxArr[String(stepCsvId)]?.data(using: String.Encoding.ascii, allowLossyConversion: false)) != nil) {
  stepLbl.text = lxArr[String(stepCsvId)]
  } else {
  let font: UIFont? = UIFont(name: "ACaslonPro-Regular", size: 20) 
@@ -72,6 +75,7 @@ class LuxuryProductViewController: LXBaseViewController, LXProductBLSViewDelegat
  stepLbl.attributedText = stepLblString
  }
  products = ProductListData(productIds: step.product).products
+
  for (index, product) in products.enumerated() {
  tmpProducts.append(product)
  if product.defaultDisplay == 1 {

Share Beauty App/Controllers/ProductDetailViewController.swift

@@ -2633,6 +2633,7 @@ class ProductDetailViewController: UIViewController, NavigationControllerAnnotat
  func didTapEfficacyResults(){
  print("Efficacy")
 
+
  //初期位置
  if productId == 616 {
  for i in 0...1{
@@ -2685,15 +2686,15 @@ class ProductDetailViewController: UIViewController, NavigationControllerAnnotat
  subview.removeFromSuperview()
  }
 
- let nib = UINib(nibName: "BNF618FirstTechView", bundle: nil)
+ let nib = UINib(nibName: "BNF619FirstTechView", bundle: nil)
  let views = nib.instantiate(withOwner: self, options: nil)
- guard let tech1 = views[0] as? BNF618FirstTechView else { return }
+ guard let tech1 = views[0] as? BNF619FirstTechView else { return }
  tech1.frame = CGRect(x: 0, y: 0, width: mVContent.frame.width, height: mVContent.frame.height)
  self.techScrollV.addSubview(tech1)
 
- let nib2 = UINib(nibName: "BNF618SecondTechView", bundle: nil)
+ let nib2 = UINib(nibName: "BNF619SecondTechView", bundle: nil)
  let views2 = nib2.instantiate(withOwner: self, options: nil)
- guard let tech2 = views2[0] as? BNF618SecondTechView else { return }
+ guard let tech2 = views2[0] as? BNF619SecondTechView else { return }
  tech2.frame = CGRect(x: 0, y: mVContent.frame.height, width: mVContent.frame.width, height: mVContent.frame.height)
  self.techScrollV.addSubview(tech2)
 
@@ -2709,9 +2710,9 @@ class ProductDetailViewController: UIViewController, NavigationControllerAnnotat
  } else if productId == 620 {
  self.techScrollV.contentSize = CGSize(width: self.mVContent.frame.width, height: (self.mVContent.height)*4)
 
- let nib = UINib(nibName: "BNF619FirstTechView", bundle: nil)
+ let nib = UINib(nibName: "BNF620FirstTechView", bundle: nil)
  let views = nib.instantiate(withOwner: self, options: nil)
- guard let tech1 = views[0] as? BNF619FirstTechView else { return }
+ guard let tech1 = views[0] as? BNF620FirstTechView else { return }
  tech1.frame = CGRect(x: 0, y: 0, width: mVContent.frame.width, height: mVContent.frame.height)
  self.techScrollV.addSubview(tech1)
 
@@ -2724,58 +2725,58 @@ class ProductDetailViewController: UIViewController, NavigationControllerAnnotat
  view2.mScrollView.removeConstraints(ar)
  self.techScrollV.addSubview(view2)
 
- let nib3 = UINib(nibName: "BNF619ThirdTechView", bundle: nil)
+ let nib3 = UINib(nibName: "BNF620ThirdTechView", bundle: nil)
  let views3 = nib3.instantiate(withOwner: self, options: nil)
- guard let view3 = views3[0] as? BNF619ThirdTechView else { return }
+ guard let view3 = views3[0] as? BNF620ThirdTechView else { return }
  view3.frame = CGRect(x: 0, y: mVContent.frame.height * 2, width: mVContent.frame.width, height: mVContent.frame.height)
  self.techScrollV.addSubview(view3)
 
- let nib4 = UINib(nibName: "BNF618SecondTechView", bundle: nil)
+ let nib4 = UINib(nibName: "BNF619SecondTechView", bundle: nil)
  let views4 = nib4.instantiate(withOwner: self, options: nil)
- guard let view4 = views4[0] as? BNF618SecondTechView else { return }
+ guard let view4 = views4[0] as? BNF619SecondTechView else { return }
  view4.frame = CGRect(x: 0, y: mVContent.frame.height * 3, width: mVContent.frame.width, height: mVContent.frame.height)
  self.techScrollV.addSubview(view4)
  }
  }
 
  func setEffency19AW(){
  if productId == 619 {
- let nib = UINib(nibName: "BNF618FirstEfficacyView", bundle: nil)
+ let nib = UINib(nibName: "BNF619FirstEfficacyView", bundle: nil)
  let views = nib.instantiate(withOwner: self, options: nil)
- guard let view1 = views[0] as? BNF618FirstEfficacyView else { return }
+ guard let view1 = views[0] as? BNF619FirstEfficacyView else { return }
  view1.frame = CGRect(x: 0, y: 0, width: mVContent.frame.width, height: mVContent.frame.height)
  self.efficacyScrollV.addSubview(view1)
 
 
- let nib2 = UINib(nibName: "BNF618SecondEfficacyView", bundle: nil)
+ let nib2 = UINib(nibName: "BNF619SecondEfficacyView", bundle: nil)
  let views2 = nib2.instantiate(withOwner: self, options: nil)
- guard let view2 = views2[0] as? BNF618SecondEfficacyView else { return }
+ guard let view2 = views2[0] as? BNF619SecondEfficacyView else { return }
  view2.frame = CGRect(x: 0, y: mVContent.frame.height, width: mVContent.frame.width, height: mVContent.frame.height)
  self.efficacyScrollV.addSubview(view2)
 
- let nib3 = UINib(nibName: "BNF618ThirdEfficacyView", bundle: nil)
+ let nib3 = UINib(nibName: "BNF619ThirdEfficacyView", bundle: nil)
  let views3 = nib3.instantiate(withOwner: self, options: nil)
- guard let view3 = views3[0] as? BNF618ThirdEfficacyView else { return }
+ guard let view3 = views3[0] as? BNF619ThirdEfficacyView else { return }
  view3.frame = CGRect(x: 0, y: mVContent.frame.height * 2, width: mVContent.frame.width, height: mVContent.frame.height)
  self.efficacyScrollV.addSubview(view3)
 
 
  } else if productId == 620 {
- let nib = UINib(nibName: "BNF619FirstEfficacyView", bundle: nil)
+ let nib = UINib(nibName: "BNF620FirstEfficacyView", bundle: nil)
  let views = nib.instantiate(withOwner: self, options: nil)
- guard let view1 = views[0] as? BNF619FirstEfficacyView else { return }
+ guard let view1 = views[0] as? BNF620FirstEfficacyView else { return }
  view1.frame = CGRect(x: 0, y: 0, width: mVContent.frame.width, height: mVContent.frame.height)
  self.efficacyScrollV.addSubview(view1)
 
- let nib2 = UINib(nibName: "BNF619SecondEfficacyView", bundle: nil)
+ let nib2 = UINib(nibName: "BNF620SecondEfficacyView", bundle: nil)
  let views2 = nib2.instantiate(withOwner: self, options: nil)
- guard let view2 = views2[0] as? BNF619SecondEfficacyView else { return }
+ guard let view2 = views2[0] as? BNF620SecondEfficacyView else { return }
  view2.frame = CGRect(x: 0, y: mVContent.frame.height, width: mVContent.frame.width, height: mVContent.frame.height)
  self.efficacyScrollV.addSubview(view2)
 
- let nib3 = UINib(nibName: "BNF619ThirdEfficacyView", bundle: nil)
+ let nib3 = UINib(nibName: "BNF620ThirdEfficacyView", bundle: nil)
  let views3 = nib3.instantiate(withOwner: self, options: nil)
- guard let view3 = views3[0] as? BNF619ThirdEfficacyView else { return }
+ guard let view3 = views3[0] as? BNF620ThirdEfficacyView else { return }
  view3.frame = CGRect(x: 0, y: mVContent.frame.height * 2, width: mVContent.frame.width, height: mVContent.frame.height)
  self.efficacyScrollV.addSubview(view3)
 

Share Beauty App/Database/data/ProductListData.swift

@@ -404,6 +404,7 @@ class ProductListData: NSObject {
  productIds += [66, 365, 292, 51, 32, 622, 524, 525]
  }
  }
+
  return productIds
  }
 

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>