* [x] 工作记录列表页-编辑-图片有内容,但是会提示上传凭证

* [x] 工作记录列表页-授权地址为空 ,不显示定位icon * [x] 工作记录列表页-点击预览的图片和缩略图不一样

* [x] 工作记录列表页-编辑-图片有内容,但是会提示上传凭证
* [x] 工作记录列表页-授权地址为空 ,不显示定位icon * [x] 工作记录列表页-点击预览的图片和缩略图不一样
“张旭”
1 parent 35640030
Showing 3 changed files with 45 additions and 6 deletions
metaCode/Classes/Main/HomePage/Controller/DigitalAuth/工作相关页面/CNLiveVitaeAddWorkController.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeAddWorkSecCell.swift
metaCode/Classes/Main/HomePage/View/DigitalAuthViews/Vitae/Work/CNLiveVitaeWorkCell.swift
@@ -234,10 +234,38 @@ class CNLiveVitaeAddWorkController:CNLiveBaseViewController,UITableViewDataSourc
                 return 184+15
             }
         }else if indexPath.row == 1{
-            if self.secCell == nil{
-                return self.hangHeight+268+15
+            let lSpace:CGFloat = 15
+            let rSpace:CGFloat = 15
+            let addXRSpace:CGFloat = rSpace - 17*0.5
+            let addXSpace:CGFloat = lSpace - 17*0.5
+            let column = 3
+            var widthHeight:CGFloat = 0.0
+            let totalSpace = 15 + addXRSpace + addXSpace * CGFloat(column - 1)
+            widthHeight = (KSreenWidth - 30 - totalSpace) / Double(column)
+            if self.workAwardType == .work && self.isFirstEdit{
+                if self.seleArr?.count ?? 0 <= 1{
+                    self.hangHeight = 15+248+widthHeight+20
+                    return self.hangHeight
+                }else{
+                    let hang:Int = ((self.seleArr?.count ?? 0)-2)/3+2
+                    self.hangHeight = CGFloat(15+248+hang*Int(widthHeight)+(hang-1)*Int(addXSpace)+20)
+                    return self.hangHeight
+                }
+            }else if self.workAwardType == .award && self.isFirstEdit{
+                if self.seleArr?.count ?? 0 <= 1{
+                    self.hangHeight = 15+248+widthHeight+20
+                    return self.hangHeight
+                }else{
+                    let hang:Int = ((self.seleArr?.count ?? 0)-2)/3+2
+                    self.hangHeight = CGFloat(15+248+hang*Int(widthHeight)+(hang-1)*Int(addXSpace)+20)
+                    return self.hangHeight
+                }
             }else{
-                return self.hangHeight
+                if self.secCell == nil{
+                    return self.hangHeight//return self.hangHeight+268+15
+                }else{
+                    return self.hangHeight
+                }
             }
         }else if indexPath.row == 2{
             return 123+15
@@ -245,7 +245,7 @@ class CNLiveVitaeAddWorkSecCell:UITableViewCell, UITextViewDelegate{
             }
         }
         self.selectUploadImageView?.networkImageArr = tempImgArr
-        self.selectUploadImageView?.networkVideoUrl = tempVideoUrl
+        self.selectUploadImageView?.setNetworkVideoUrl(networkVideoUrl: tempVideoUrl, networkVideoImageUrl: "")
     }
  
     func textViewDidEndEditing(_ textView: UITextView) {
@@ -24,7 +24,8 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         var list: [HeroBrowserViewModuleBaseProtocol] = []
         return list
     }()
-    
+    var editImageUrls = [String]()
+    var editVideoUrl = ""
     var vitaeWorkPreviewVideoPhotoBlock:VitaeWorkPreviewVideoPhotoBlock?
     var vitaeWorkCellChangedBlock:vitaeWorkCellChangedBlockActionBlock?
     var vitaeWorkListBlock:VitaeWorkListBlock?
@@ -326,6 +327,8 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             }
         }
  
+        self.editImageUrls.removeAll()
+        self.editVideoUrl = ""
         let imgArr =  model.imgs.components(separatedBy: ",")
         if imgArr.count > 0{
             for i in 0..<imgArr.count {
@@ -346,6 +349,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
  
                 if imgUrl.contains("vitae_video_"){
                     //是视频
+                    self.editVideoUrl = imgUrl
                     let thumbailImgUrl = "http://wjjtest.ys2.cnliveimg.com/802/mateCode/img/vitae_photo_0/2024/08/02/3977195366.jpg"
                     let vm = HeroBrowserVideoViewModule(thumbailImgUrl: thumbailImgUrl, videoUrl: imgUrl, provider: HeroNetworkImageProvider.shared, autoPlay: true)
                     self.images.append(vm)
@@ -361,6 +365,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
                     imgView.addSubview(playBtn)
                 }else if imgUrl.contains("vitae_photo_"){
                     //是图片
+                    self.editImageUrls.append(imgUrl)
                     self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
                     imgView.kf.setImage(with: URL(string: imgUrl))
                 }else{
@@ -427,6 +432,8 @@ class CNLiveVitaeWorkCell: UITableViewCell{
             }
         }
  
+        self.editImageUrls.removeAll()
+        self.editVideoUrl = ""
         let imgArr =  model.imgs.components(separatedBy: ",")
         if imgArr.count > 0{
             for i in 0..<imgArr.count {
@@ -435,7 +442,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
                 let imgLeftGap:Float = 15
                 let lie = i%3
                 let hang = i/3
-                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang)), width: CGFloat(imgWH), height: CGFloat(imgWH)))//                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang))+self.jianjieLabel.bottom+10, width: CGFloat(imgWH), height: CGFloat(imgWH)))
+                let imgView = UIImageView(frame: CGRect(x: CGFloat(imgLeftGap+(imgGap+imgWH)*Float(lie)), y: CGFloat((imgWH+10)*Float(hang)), width: CGFloat(imgWH), height: CGFloat(imgWH)))
                 imgView.isUserInteractionEnabled = true
                 imgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(imgViewTapAciton)))
                 imgView.tag = 1000+i
@@ -447,6 +454,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
  
                 if imgUrl.contains("vitae_video_"){
                     //是视频
+                    self.editVideoUrl = imgUrl
                     let thumbailImgUrl = "http://wjjtest.ys2.cnliveimg.com/802/mateCode/img/vitae_photo_0/2024/08/02/3977195366.jpg"
                     let vm = HeroBrowserVideoViewModule(thumbailImgUrl: thumbailImgUrl, videoUrl: imgUrl, provider: HeroNetworkImageProvider.shared, autoPlay: true)
                     self.images.append(vm)
@@ -461,6 +469,7 @@ class CNLiveVitaeWorkCell: UITableViewCell{
                     playBtn.tag = 1000+i
                     imgView.addSubview(playBtn)
                 }else if imgUrl.contains("vitae_photo_"){
+                    self.editImageUrls.append(imgUrl)
                     //是图片
                     self.images.append(HeroBrowserNetworkImageViewModule(thumbailImgUrl: nil, originImgUrl: imgUrl))
                     imgView.kf.setImage(with: URL(string: imgUrl))
@@ -539,6 +548,8 @@ class CNLiveVitaeWorkCell: UITableViewCell{
         if self.awardModel != nil{
             vc.awardModel = self.awardModel
         }
+        vc.seleArr = self.editImageUrls
+        vc.seleVideoUrl = self.editVideoUrl
         navigationViewController().pushViewController(vc, animated: true)
     }
     @objc func deleteBtnAction(){