1.update image load

BFFramework/Classes/PModels/editDarftModels/PQEditVisionTrackMaterialsModel.swift

@@ -147,10 +147,8 @@ public class PQEditVisionTrackMaterialsModel: PQEditBaseModel {
         materialDurationFit <- map["materialDurationFit"]
         materialSizeClip <- map["materialSizeClip"]
         materialPosition <- map["materialPosition"]
-//        netResUrl <- map["netResUrl"]
-//        netResCoverImageURL <- map["netResCoverImageURL"]
         locationPath <- map["locationPath"]
-
+        originalData <- map["originalData"]
         aptDuration <- map["aptDuration"]
         outSideVideoId <- map["outSideVideoId"]
         outSideChannel <- map["outSideChannel"]
@@ -309,7 +307,7 @@ public class PQEditVisionTrackMaterialsModel: PQEditBaseModel {
         temp.netResUrl = netResUrl
         temp.netResCoverImageURL = netResCoverImageURL
         temp.locationPath = locationPath
- 
+        temp.originalData = originalData
         return temp
     }
 }

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -995,14 +995,13 @@ class PQStuckPointEditerController: PQBaseViewController {
         if projectModel.sData?.sections.count == 0 {
             let section: PQEditSectionModel = PQEditSectionModel()
             selectedMetarialData?.forEach { model in
-
-                let json = model.toJSONString(prettyPrint: false)
-                if json == nil {
-                    BFLog(message: "数据转换有问题 跳转")
-                    return
-                }
-                let tempModel: PQEditVisionTrackMaterialsModel = Mapper<PQEditVisionTrackMaterialsModel>().map(JSONString: json!)!
-                section.sectionTimeline?.visionTrack?.visionTrackMaterials.append(tempModel)
+//                let json = model.toJSONString(prettyPrint: false)
+//                if json == nil {
+//                    BFLog(message: "数据转换有问题 跳转")
+//                    return
+//                }
+//                let tempModel: PQEditVisionTrackMaterialsModel = Mapper<PQEditVisionTrackMaterialsModel>().map(JSONString: json!)!
+                section.sectionTimeline?.visionTrack?.visionTrackMaterials.append(model)
             }
             projectModel.sData?.sections.append(section)
         }

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointMaterialController.swift

@@ -218,11 +218,11 @@ public class PQStuckPointMaterialController: PQBaseViewController {
         navHeadImageView?.addSubview(choseLocalVideoBtn)
         navHeadImageView?.addSubview(choseLocalImageBtn)
         navHeadImageView?.addSubview(choseLineView)
-//        view.insertSubview(materialHeadView, belowSubview: navHeadImageView!)
         view.addSubview(bottomRemindView)
         bottomRemindView.addSubview(confirmBtn)
         bottomRemindView.addSubview(bottomRemindLab)
-        photoMaterialVc.msgType = .video
+        addChild(photoMaterialVc)
+        view.insertSubview(photoMaterialVc.view, belowSubview: bottomRemindView)
         view.bringSubviewToFront(navHeadImageView!)
         view.insertSubview(materialListView, belowSubview: bottomRemindView)
         // 卡点音乐素材选择曝光上报
@@ -326,12 +326,7 @@ public class PQStuckPointMaterialController: PQBaseViewController {
             changeCollecBtn.setTitle(seletedData?.title ?? "全部", for: .normal)
             changeCollecBtn.imagePosition(at: PQButtonImageEdgeInsetsStyle.right, space: cDefaultMargin / 2)
             photoMaterialVc.assetCollection = seletedData?.assetCollection
-            photoMaterialVc.msgType = photoMaterialVc.msgType
         }
-//        photoMaterialVc.msgType = .video
-//        choseLocalAllBtn.isSelected = false
-//        choseLocalVideoBtn.isSelected = true
-//        choseLocalImageBtn.isSelected = false
     }
 
     /// 点击选择的回调