Skip to content

Commit c5c4766

Browse files
committed
Fix Bundle Problem
1 parent 1ad8a82 commit c5c4766

4 files changed

Lines changed: 12 additions & 8 deletions

File tree

JDAVKit/JDVideoKit/JDVideoKit.swift

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public protocol JDVideoKitDelegate {
2525
func FinalOutput(final video:AVAsset,url:URL)
2626
}
2727

28-
extension JDVideoKitDelegate
28+
public extension JDVideoKitDelegate
2929
{
3030
func willPresent(cameraViewController vc:JDProcessingViewController,forkit:JDVideoKit)->JDProcessingViewController
3131
{
@@ -60,17 +60,20 @@ public class JDVideoKit:NSObject
6060

6161
public func getProperVC()->UIViewController
6262
{
63+
let processingBundle = Bundle(for:JDProcessingViewController.classForCoder())
64+
let presentingBundle = Bundle(for:JDPresentingViewController.classForCoder())
65+
6366
if let sourcevideo = delegate.videoResource(forkit: self)
6467
{
6568
//Skip to Editng
6669
if let url = sourcevideo as? URL
6770
{
6871
let video = VideoOrigin(mediaType: nil, mediaUrl: url, referenceURL: nil)
69-
targetVC = JDPresentingViewController(nibName: "JDPresentingViewController", bundle: nil,video: video)
72+
targetVC = JDPresentingViewController(nibName: "JDPresentingViewController", bundle: presentingBundle,video: video)
7073
}
7174
else if let assets = sourcevideo as? AVAsset
7275
{
73-
targetVC = JDPresentingViewController(nibName: "JDPresentingViewController", bundle: nil, video: assets)
76+
targetVC = JDPresentingViewController(nibName: "JDPresentingViewController", bundle: presentingBundle, video: assets)
7477
}
7578
else
7679
{
@@ -90,7 +93,8 @@ public class JDVideoKit:NSObject
9093
else
9194
{
9295
//User don't have Video Source, go to JDProcessingVC First
93-
let jdprocessingVC = JDProcessingViewController(nibName: "JDProcessingViewController", bundle: nil)
96+
97+
let jdprocessingVC = JDProcessingViewController(nibName: "JDProcessingViewController", bundle: processingBundle)
9498
let processingVC = delegate.willPresent(cameraViewController: jdprocessingVC, forkit: self)
9599
processingVC.delegate = self
96100
targetVC = processingVC
@@ -105,7 +109,8 @@ extension JDVideoKit:JDProcessingViewControllerDlegate
105109
func VideoHasBeenSelect(video: VideoOrigin,processingVC:UIViewController)->JDPresentingViewController?
106110
{
107111
//Edting?
108-
let editingVC = JDPresentingViewController(nibName: "JDPresentingViewController", bundle: nil,video: video)
112+
let presentingBundle = Bundle(for:JDPresentingViewController.classForCoder())
113+
let editingVC = JDPresentingViewController(nibName: "JDPresentingViewController", bundle: presentingBundle,video: video)
109114
if let presentingVC = self.delegate.willPresent(edtingViewController: editingVC, lastVC: processingVC, forkit: self)
110115
{
111116
presentingVC.delegate = self

JDAVKit/ViewController.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ extension ViewController:JDVideoKitDelegate
2929

3030
}
3131
}
32-
33-
32+
3433
func ConvertType(forVideo resource: Any, forkit: JDVideoKit) -> videoProcessType {
3534
return .Boom
3635
}

JDVideoKit.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'JDVideoKit'
3-
s.version = '1.5.0'
3+
s.version = '1.6.0'
44
s.summary = 'You can easily transfer your video into Three common video type.'
55

66
s.description = <<-DESC

0 commit comments

Comments
 (0)