修复生成视频UI 上的细节

AIEmoji/Business2/DIYVideo/TSAIDiyVideoVC.swift

@@ -34,7 +34,8 @@ class TSAIDiyVideoVC: TSBaseVC {
         dataSource.isTitleColorGradientEnabled = true
         dataSource.isItemSpacingAverageEnabled = false
         dataSource.itemSpacing = 0
-        dataSource.itemWidth = (k_ScreenWidth-36)/2.0
+        dataSource.itemWidth = itemWidth//(k_ScreenWidth-36)/2.0
+        dataSource.itemWidthIncrement = 0
         dataSource.titles = ["Image to Video".localized,"Text to Video".localized]
         dataSource.titleNormalColor = .white.withAlphaComponent(0.8)
         dataSource.titleSelectedColor = "#111111".uiColor
@@ -43,25 +44,26 @@ class TSAIDiyVideoVC: TSBaseVC {
         return dataSource
     }()
     
+    lazy var itemWidth:CGFloat = (UIScreen.main.bounds.size.width-32)/2.0
     //配置指示器
     lazy var indicator: JXSegmentedIndicatorBackgroundView = {
         let indicator = JXSegmentedIndicatorBackgroundView()
-        indicator.indicatorWidth = JXSegmentedViewAutomaticDimension
+        indicator.indicatorWidth = itemWidth-4
+        indicator.indicatorWidthIncrement = 0
         indicator.indicatorHeight = 36
         indicator.indicatorColor = .themeColor
-        indicator.cornerRadius = 18
+        indicator.indicatorCornerRadius = 18
+        indicator.indicatorPosition = .center
         return indicator
     }()
     
 
     lazy var segmentedView: JXSegmentedView = {
-        let segmentedView = JXSegmentedView(frame: CGRect(x: 16, y: 8, width: UIScreen.main.bounds.size.width-32, height: 40.0))
+        let segmentedView = JXSegmentedView(frame: CGRect(x: 16, y:  8, width: UIScreen.main.bounds.size.width-32, height: 40.0))
         segmentedView.delegate = self
         segmentedView.indicators = [indicator]
         segmentedView.dataSource = segmentedDataSource
         segmentedView.backgroundColor = segmentedBgColor
-//        segmentedView.contentEdgeInsetLeft = 2
-//        segmentedView.contentEdgeInsetRight = 2
         segmentedView.listContainer = listContainerView
         segmentedView.cornerRadius = 20
         return segmentedView

AIEmoji/Business2/DisCover/TSPTPUploadImageVC/TSPTPUploadImageVC.swift

@@ -56,6 +56,7 @@ class TSPTPUploadImageVC: TSBaseVC {
         
         if viewModel.style == .videoV2 ||  viewModel.style == .photoLive{
             kMainAsync {
+                self.uploadView.addVideoPlayLogic()
                 self.uploadView.uploadVideoView.setVideoName(name: self.itemModel.imageNamed)
                 self.uploadView.upLoadImage = self.uploadView.upLoadImage
             }

AIEmoji/Business2/DisCover/TSPTPUploadImageVC/View/TSUploadImageView.swift

@@ -6,7 +6,7 @@
 //
 
 class TSUploadImageView: TSBaseView {
-    
+
     var clickBgViewBlock:(()->Void)?
     var clickDeleteBlock:(()->Void)?
     var upLoadImage:UIImage? = nil {
@@ -16,15 +16,20 @@ class TSUploadImageView: TSBaseView {
                 uploadImageView.isHidden = false
                 deleteBtn.isHidden = false
                 uploadImageView.image = image
-        
-                uploadVideoView.pause()
             }else {
                 upLoadView.isHidden = false
                 uploadImageView.isHidden = true
                 deleteBtn.isHidden = true
                 uploadImageView.image = nil
-                
-                uploadVideoView.play()
+            }
+            
+            
+            if isShowVideo {
+                if upLoadImage == nil {
+                    uploadVideoView.play()
+                }else{
+                    uploadVideoView.pause()
+                }
             }
         }
     }
@@ -136,7 +141,7 @@ class TSUploadImageView: TSBaseView {
         }
     }
     
-    
+    var isShowVideo:Bool = false
     lazy var uploadVideoView: TSUploadVideoView = {
         let uploadVideoView = TSUploadVideoView()
         uploadVideoView.clickUploadPhotoBlock = { [weak self]  in
@@ -147,8 +152,22 @@ class TSUploadImageView: TSBaseView {
         return uploadVideoView
     }()
     
-    
+
     deinit {
         dePrint("TSUploadImageView deinit")
     }
 }
+
+
+extension TSUploadImageView {
+    func addVideoPlayLogic()  {
+        if uploadVideoView.superview == nil {
+            uploadImageBgView.addSubview(uploadVideoView)
+            uploadVideoView.snp.makeConstraints { make in
+                make.edges.equalToSuperview()
+            }
+        }
+        self.isShowVideo = true
+    }
+    
+}