|
@@ -37,14 +37,14 @@ class TSFusionImageVC: TSBaseVC{
|
|
|
lazy var photoPickerManager: TSPhotoPickerManager = TSPhotoPickerManager(viewController: self)
|
|
|
|
|
|
//###### UI ######
|
|
|
- lazy var cusStackView: TSCustomStackView = TSCustomStackView(axis: .vertical,spacing: 0)
|
|
|
-
|
|
|
- //##############################上传图片##############################
|
|
|
- lazy var imageStackView: TSCustomStackView = {
|
|
|
- let imageStackView = TSCustomStackView(axis: .horizontal,alignment: .center,spacing: 0.0)
|
|
|
- return imageStackView
|
|
|
+ lazy var cusStackView: UIStackView = {
|
|
|
+ let cusStackView = UIStackView()
|
|
|
+ cusStackView.axis = .vertical
|
|
|
+ cusStackView.distribution = .fill
|
|
|
+ cusStackView.alignment = .center
|
|
|
+ return cusStackView
|
|
|
}()
|
|
|
-
|
|
|
+
|
|
|
lazy var photo1UploadView: TSAISmallUploadView = {
|
|
|
let photo1UploadView = TSAISmallUploadView()
|
|
|
photo1UploadView.tag = 0
|
|
@@ -69,6 +69,33 @@ class TSFusionImageVC: TSBaseVC{
|
|
|
}
|
|
|
return photo2UploadView
|
|
|
}()
|
|
|
+
|
|
|
+
|
|
|
+ lazy var tipsView: UIView = {
|
|
|
+
|
|
|
+ let tipsView = UIView()
|
|
|
+ tipsView.backgroundColor = .white.withAlphaComponent(0.1)
|
|
|
+ let imageView = UIImageView.createImageView(image:.tips)
|
|
|
+ tipsView.addSubview(imageView)
|
|
|
+
|
|
|
+ let lab = UILabel.createLabel(text: "Choose photos with a clear and visible front face for the best effect".localized,font: .font(size: 14),textColor: .white.withAlphaComponent(0.7))
|
|
|
+ tipsView.addSubview(lab)
|
|
|
+
|
|
|
+ imageView.snp.makeConstraints { make in
|
|
|
+ make.width.height.equalTo(16)
|
|
|
+ make.leading.equalTo(8)
|
|
|
+ make.top.equalTo(12)
|
|
|
+ }
|
|
|
+
|
|
|
+ lab.snp.makeConstraints { make in
|
|
|
+ make.leading.equalTo(32)
|
|
|
+ make.trailing.equalTo(-8)
|
|
|
+ make.top.equalTo(12)
|
|
|
+ make.bottom.equalTo(-12)
|
|
|
+ }
|
|
|
+
|
|
|
+ return tipsView
|
|
|
+ }()
|
|
|
|
|
|
//##############################按钮##############################
|
|
|
lazy var submitBtn: UIButton = {
|
|
@@ -96,24 +123,51 @@ class TSFusionImageVC: TSBaseVC{
|
|
|
cusStackView.snp.makeConstraints { make in
|
|
|
make.top.equalTo(0)
|
|
|
make.leading.trailing.equalToSuperview()
|
|
|
- make.bottom.equalTo(submitBtn.snp.top).offset(-16)
|
|
|
}
|
|
|
+
|
|
|
+ setCusStackView()
|
|
|
+ let a = upLoadImages
|
|
|
+ upLoadImages = a
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ func setCusStackView(){
|
|
|
|
|
|
- let upImageW = (k_ScreenWidth - 32.0 - 10.0) / 2.0
|
|
|
+ let upImageW = (k_ScreenWidth - 32.0 - 15.0) / 2.0
|
|
|
let upImageH = photo1UploadView.viewH
|
|
|
+
|
|
|
+ let imageStackView = UIView()
|
|
|
+ cusStackView.addArrangedSubview(imageStackView)
|
|
|
+ imageStackView.snp.makeConstraints { make in
|
|
|
+ make.leading.equalTo(16)
|
|
|
+ make.trailing.equalTo(-16)
|
|
|
+ make.height.equalTo(upImageH)
|
|
|
+ make.top.equalTo(0)
|
|
|
+ }
|
|
|
|
|
|
- cusStackView.addSubviewToStack(imageStackView,length: upImageH)
|
|
|
- imageStackView.addSpacing(length: 16.0)
|
|
|
- imageStackView.addSubviewToStack(photo1UploadView,length: upImageW)
|
|
|
- imageStackView.addSpacing(length: 10.0)
|
|
|
- imageStackView.addSubviewToStack(photo2UploadView,length: upImageW)
|
|
|
- cusStackView.addSpacing(length: 24.0)
|
|
|
-
|
|
|
+ imageStackView.addSubview(photo1UploadView)
|
|
|
+ photo1UploadView.snp.makeConstraints { make in
|
|
|
+ make.leading.equalTo(0)
|
|
|
+ make.width.equalTo(upImageW)
|
|
|
+ make.height.equalTo(upImageH)
|
|
|
+ }
|
|
|
+
|
|
|
+ imageStackView.addSubview(photo2UploadView)
|
|
|
+ photo2UploadView.snp.makeConstraints { make in
|
|
|
+ make.trailing.equalTo(0)
|
|
|
+ make.width.equalTo(upImageW)
|
|
|
+ make.height.equalTo(upImageH)
|
|
|
+ }
|
|
|
+
|
|
|
+ cusStackView.addSpacing(length: 25.0)
|
|
|
|
|
|
- let a = upLoadImages
|
|
|
- upLoadImages = a
|
|
|
+ cusStackView.addArrangedSubview(tipsView)
|
|
|
+ tipsView.snp.remakeConstraints{ make in
|
|
|
+ make.leading.equalTo(16)
|
|
|
+ make.trailing.equalTo(-16)
|
|
|
+ make.bottom.equalToSuperview()
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
override func dealThings() {
|
|
|
Publishers.CombineLatest(
|
|
|
photo1UploadView.$upLoadImage,
|