浏览代码

Merge branch 'master' of https://git.yishihui.com/iOS/Introduce
合并代码

jsonwang 3 年之前
父节点
当前提交
14047ed07c
共有 2 个文件被更改,包括 16 次插入0 次删除
  1. 14 0
      Introduce/Record/INPhotoVideosController.swift
  2. 2 0
      Introduce/Record/INVideoExportController.swift

+ 14 - 0
Introduce/Record/INPhotoVideosController.swift

@@ -111,6 +111,20 @@ class INPhotoVideosController: BFBaseViewController {
         vc.selectedMaterialHandle = { [weak self] _, selectedPhotoData, _, _ in
             self?.chosedAsset = selectedPhotoData
         }
+        vc.detailMaterialHandle = { [weak self] _, currentMaterialData in
+            let detailVc: BFMaterialDetailController = BFMaterialDetailController()
+            detailVc.isStuckPoint = true
+            detailVc.materialDetailClickHandle = { [weak self] isMaterialSelected, materialData in
+                if isMaterialSelected != materialData?.isSelected {
+                    self?.photoMaterialVc.updateMaterials(isSelected:!(isMaterialSelected ?? false), materialData: materialData)
+                }
+            }
+            if !(currentMaterialData?.isSelected ?? false) {
+                currentMaterialData?.selectedIndex = (self?.chosedAsset?.count ?? 0) + 1
+            }
+            detailVc.materialData = currentMaterialData
+            self?.navigationController?.pushViewController(detailVc, animated: true)
+        }
         vc.emptyRefreshHandle = {[weak self] msgType in
             if msgType == .image {
                 self?.btnClick(sender: self?.choseLocalVideoBtn)

+ 2 - 0
Introduce/Record/INVideoExportController.swift

@@ -73,7 +73,9 @@ class INVideoExportController: BFBaseViewController {
     lazy var completeBtn: UIButton = {
         let btn = UIButton()
         btn.setTitle("完成", for: .normal)
+//        btn.setTitleColor(.white, for: .normal)
         btn.setTitleColor(UIColor.hexColor(hexadecimal: "#B1B1B1"), for: .normal)
+        btn.setTitleColor(.gray, for: .disabled)
         btn.addTarget(self, action: #selector(completeAction), for: .touchUpInside)
         return btn
     }()