Skip to content

Commit

Permalink
Merged in 19AW/fix/BNFviewBorderRename (pull request wangjwchn#27)
Browse files Browse the repository at this point in the history 
19AW/fix/BNFviewBorderRename
  • Loading branch information
@nakagawavan @madoka3530
nakagawavan authored and madoka3530 committed May 15, 2019
2 parents 8118a7b + 09f1ab1 commit ff70c50
Show file tree
Hide file tree
Showing 31 changed files with 1,001 additions and 954 deletions.
0 19AW/BNF619Efficacy2.png → 19AW/BNF620Efficacy2.png
View file
File renamed without changes
0 19AW/BNF619Tech1.png → 19AW/BNF620Tech1.png
View file
File renamed without changes
0 19AW/BNF619Tech3.png → 19AW/BNF620Tech3.png
View file
File renamed without changes
184 changes: 92 additions & 92 deletions Share Beauty App.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion Share Beauty App/Controllers/Luxury/LuxuryProductViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
Expand Down
45 changes: 23 additions & 22 deletions Share Beauty App/Controllers/ProductDetailViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2633,6 +2633,7 @@ class ProductDetailViewController: UIViewController, NavigationControllerAnnotat
func didTapEfficacyResults(){
print("Efficacy")


//初期位置
if productId == 616 {
for i in 0...1{
Expand Down Expand Up @@ -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)

Expand All @@ -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)

Expand All @@ -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)

Expand Down
1 change: 1 addition & 0 deletions Share Beauty App/Database/data/ProductListData.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ class ProductListData: NSObject {
productIds += [66, 365, 292, 51, 32, 622, 524, 525]
}
}

return productIds
}

Expand Down
56 changes: 0 additions & 56 deletions Share Beauty App/Views/BNF/BNF618SecondEfficacyView.swift
View file

This file was deleted.

Loading

0 comments on commit ff70c50

Please sign in to comment.