Commit 3a85594e authored by Han Ruisong's avatar Han Ruisong
Browse files

升级到 v4.2.4

1.demo页面逻辑优化。
2.SDK上传功能逻辑优化。
3.DWPlayInfo新增取消网络请求方法。
4.修复了4.2.3版本在低版本Xcode编译报错的问题。
parent a229d88e
No preview for this file type
......@@ -9,6 +9,9 @@
/* Begin PBXBuildFile section */
0412FA8E2266C12600D8E6C1 /* DWPlayerSettingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0412FA8D2266C12600D8E6C1 /* DWPlayerSettingView.m */; };
0412FA912266D0D800D8E6C1 /* DWTableChooseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 0412FA902266D0D800D8E6C1 /* DWTableChooseModel.m */; };
04147A96237D4CA50091F810 /* vrlibraw.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04147A7A237D4CA40091F810 /* vrlibraw.bundle */; };
04147A97237D4CA50091F810 /* libCCSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04147A87237D4CA40091F810 /* libCCSDK.a */; };
04147A98237D4CA50091F810 /* DWResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04147A8F237D4CA40091F810 /* DWResource.bundle */; };
0425D5B122F2B269002C5195 /* DWUploadWaterMarkSettingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 0425D5B022F2B269002C5195 /* DWUploadWaterMarkSettingView.m */; };
043441FF225EF2BB003F7EC1 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 043441FE225EF2BB003F7EC1 /* CoreServices.framework */; };
04344215225F0EDE003F7EC1 /* DWTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 04344210225F0EDD003F7EC1 /* DWTools.m */; };
......@@ -96,9 +99,6 @@
047CE82722B8DBD500D87AAF /* DWExercisesFinishView.m in Sources */ = {isa = PBXBuildFile; fileRef = 047CE82122B8DBD400D87AAF /* DWExercisesFinishView.m */; };
047CE82822B8DBD500D87AAF /* DWExercisesAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = 047CE82222B8DBD400D87AAF /* DWExercisesAlertView.m */; };
047CE82922B8DBD500D87AAF /* DWExercisesQuestionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 047CE82322B8DBD400D87AAF /* DWExercisesQuestionView.m */; };
047ECCEC234F271E00131591 /* vrlibraw.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 047ECCD0234F271E00131591 /* vrlibraw.bundle */; };
047ECCED234F271E00131591 /* libCCSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 047ECCDD234F271E00131591 /* libCCSDK.a */; };
047ECCEE234F271E00131591 /* DWResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 047ECCE5234F271E00131591 /* DWResource.bundle */; };
0483317922B34ED7000E0BF9 /* icon_gif_save@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0483317722B34ED7000E0BF9 /* icon_gif_save@2x.png */; };
0483317A22B34ED7000E0BF9 /* icon_gif_save@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 0483317822B34ED7000E0BF9 /* icon_gif_save@3x.png */; };
048AD12822CDCE83008C8911 /* libxml2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 048AD12722CDCE83008C8911 /* libxml2.tbd */; };
......@@ -310,6 +310,40 @@
0412FA8D2266C12600D8E6C1 /* DWPlayerSettingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DWPlayerSettingView.m; sourceTree = "<group>"; };
0412FA8F2266D0D800D8E6C1 /* DWTableChooseModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DWTableChooseModel.h; sourceTree = "<group>"; };
0412FA902266D0D800D8E6C1 /* DWTableChooseModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DWTableChooseModel.m; sourceTree = "<group>"; };
04147A74237D4CA40091F810 /* DWExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWExt.h; sourceTree = "<group>"; };
04147A75237D4CA40091F810 /* DWVRHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVRHeader.h; sourceTree = "<group>"; };
04147A76237D4CA40091F810 /* DWDownloadSessionManager+File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DWDownloadSessionManager+File.h"; sourceTree = "<group>"; };
04147A77237D4CA40091F810 /* DWErrorCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWErrorCode.h; sourceTree = "<group>"; };
04147A78237D4CA40091F810 /* NSURLSession+DWCorrectedResumeData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURLSession+DWCorrectedResumeData.h"; sourceTree = "<group>"; };
04147A79237D4CA40091F810 /* DWAdInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWAdInfo.h; sourceTree = "<group>"; };
04147A7A237D4CA40091F810 /* vrlibraw.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = vrlibraw.bundle; sourceTree = "<group>"; };
04147A7B237D4CA40091F810 /* DWBatchDownloadUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWBatchDownloadUtility.h; sourceTree = "<group>"; };
04147A7C237D4CA40091F810 /* DWLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWLog.h; sourceTree = "<group>"; };
04147A7D237D4CA40091F810 /* DWVideoDataAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVideoDataAdapter.h; sourceTree = "<group>"; };
04147A7E237D4CA40091F810 /* DWGIFManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWGIFManager.h; sourceTree = "<group>"; };
04147A7F237D4CA40091F810 /* DWVodVideoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVodVideoModel.h; sourceTree = "<group>"; };
04147A80237D4CA40091F810 /* DWUPnPDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPDevice.h; sourceTree = "<group>"; };
04147A81237D4CA40091F810 /* DWSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWSDK.h; sourceTree = "<group>"; };
04147A82237D4CA40091F810 /* DWUPnPRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPRenderer.h; sourceTree = "<group>"; };
04147A83237D4CA40091F810 /* DWDownloadSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWDownloadSessionManager.h; sourceTree = "<group>"; };
04147A84237D4CA40091F810 /* DWDownloadUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWDownloadUtility.h; sourceTree = "<group>"; };
04147A85237D4CA40091F810 /* DWUPnPResponseDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPResponseDelegate.h; sourceTree = "<group>"; };
04147A86237D4CA40091F810 /* DWUPnPAVPositionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPAVPositionInfo.h; sourceTree = "<group>"; };
04147A87237D4CA40091F810 /* libCCSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libCCSDK.a; sourceTree = "<group>"; };
04147A88237D4CA40091F810 /* DWDownloadModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWDownloadModel.h; sourceTree = "<group>"; };
04147A89237D4CA40091F810 /* DWPlayerSkinView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWPlayerSkinView.h; sourceTree = "<group>"; };
04147A8A237D4CA40091F810 /* DWPlayerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWPlayerView.h; sourceTree = "<group>"; };
04147A8B237D4CA40091F810 /* DWUPnPSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPSubscription.h; sourceTree = "<group>"; };
04147A8C237D4CA40091F810 /* DWUPnPSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPSearch.h; sourceTree = "<group>"; };
04147A8D237D4CA40091F810 /* DWVRLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVRLibrary.h; sourceTree = "<group>"; };
04147A8E237D4CA40091F810 /* DWUploadModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUploadModel.h; sourceTree = "<group>"; };
04147A8F237D4CA40091F810 /* DWResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = DWResource.bundle; sourceTree = "<group>"; };
04147A90237D4CA40091F810 /* DWVodAdInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVodAdInfoModel.h; sourceTree = "<group>"; };
04147A91237D4CA40091F810 /* DWPlayInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWPlayInfo.h; sourceTree = "<group>"; };
04147A92237D4CA40091F810 /* DW360Program.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DW360Program.h; sourceTree = "<group>"; };
04147A93237D4CA40091F810 /* DW360Director.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DW360Director.h; sourceTree = "<group>"; };
04147A94237D4CA40091F810 /* DWVideoCompressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVideoCompressController.h; sourceTree = "<group>"; };
04147A95237D4CA40091F810 /* DWUploadSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUploadSessionManager.h; sourceTree = "<group>"; };
0425D5AF22F2B269002C5195 /* DWUploadWaterMarkSettingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DWUploadWaterMarkSettingView.h; sourceTree = "<group>"; };
0425D5B022F2B269002C5195 /* DWUploadWaterMarkSettingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DWUploadWaterMarkSettingView.m; sourceTree = "<group>"; };
043441FE225EF2BB003F7EC1 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
......@@ -472,40 +506,6 @@
047CE82322B8DBD400D87AAF /* DWExercisesQuestionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DWExercisesQuestionView.m; sourceTree = "<group>"; };
047CE82422B8DBD400D87AAF /* DWExercisesView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWExercisesView.h; sourceTree = "<group>"; };
047CE82522B8DBD400D87AAF /* DWExercisesFinishView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWExercisesFinishView.h; sourceTree = "<group>"; };
047ECCCA234F271E00131591 /* DWExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWExt.h; sourceTree = "<group>"; };
047ECCCB234F271E00131591 /* DWVRHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVRHeader.h; sourceTree = "<group>"; };
047ECCCC234F271E00131591 /* DWDownloadSessionManager+File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "DWDownloadSessionManager+File.h"; sourceTree = "<group>"; };
047ECCCD234F271E00131591 /* DWErrorCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWErrorCode.h; sourceTree = "<group>"; };
047ECCCE234F271E00131591 /* NSURLSession+DWCorrectedResumeData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURLSession+DWCorrectedResumeData.h"; sourceTree = "<group>"; };
047ECCCF234F271E00131591 /* DWAdInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWAdInfo.h; sourceTree = "<group>"; };
047ECCD0234F271E00131591 /* vrlibraw.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = vrlibraw.bundle; sourceTree = "<group>"; };
047ECCD1234F271E00131591 /* DWBatchDownloadUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWBatchDownloadUtility.h; sourceTree = "<group>"; };
047ECCD2234F271E00131591 /* DWLog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWLog.h; sourceTree = "<group>"; };
047ECCD3234F271E00131591 /* DWVideoDataAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVideoDataAdapter.h; sourceTree = "<group>"; };
047ECCD4234F271E00131591 /* DWGIFManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWGIFManager.h; sourceTree = "<group>"; };
047ECCD5234F271E00131591 /* DWVodVideoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVodVideoModel.h; sourceTree = "<group>"; };
047ECCD6234F271E00131591 /* DWUPnPDevice.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPDevice.h; sourceTree = "<group>"; };
047ECCD7234F271E00131591 /* DWSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWSDK.h; sourceTree = "<group>"; };
047ECCD8234F271E00131591 /* DWUPnPRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPRenderer.h; sourceTree = "<group>"; };
047ECCD9234F271E00131591 /* DWDownloadSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWDownloadSessionManager.h; sourceTree = "<group>"; };
047ECCDA234F271E00131591 /* DWDownloadUtility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWDownloadUtility.h; sourceTree = "<group>"; };
047ECCDB234F271E00131591 /* DWUPnPResponseDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPResponseDelegate.h; sourceTree = "<group>"; };
047ECCDC234F271E00131591 /* DWUPnPAVPositionInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPAVPositionInfo.h; sourceTree = "<group>"; };
047ECCDD234F271E00131591 /* libCCSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libCCSDK.a; sourceTree = "<group>"; };
047ECCDE234F271E00131591 /* DWDownloadModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWDownloadModel.h; sourceTree = "<group>"; };
047ECCDF234F271E00131591 /* DWPlayerSkinView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWPlayerSkinView.h; sourceTree = "<group>"; };
047ECCE0234F271E00131591 /* DWPlayerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWPlayerView.h; sourceTree = "<group>"; };
047ECCE1234F271E00131591 /* DWUPnPSubscription.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPSubscription.h; sourceTree = "<group>"; };
047ECCE2234F271E00131591 /* DWUPnPSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUPnPSearch.h; sourceTree = "<group>"; };
047ECCE3234F271E00131591 /* DWVRLibrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVRLibrary.h; sourceTree = "<group>"; };
047ECCE4234F271E00131591 /* DWUploadModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUploadModel.h; sourceTree = "<group>"; };
047ECCE5234F271E00131591 /* DWResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = DWResource.bundle; sourceTree = "<group>"; };
047ECCE6234F271E00131591 /* DWVodAdInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVodAdInfoModel.h; sourceTree = "<group>"; };
047ECCE7234F271E00131591 /* DWPlayInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWPlayInfo.h; sourceTree = "<group>"; };
047ECCE8234F271E00131591 /* DW360Program.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DW360Program.h; sourceTree = "<group>"; };
047ECCE9234F271E00131591 /* DW360Director.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DW360Director.h; sourceTree = "<group>"; };
047ECCEA234F271E00131591 /* DWVideoCompressController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWVideoCompressController.h; sourceTree = "<group>"; };
047ECCEB234F271E00131591 /* DWUploadSessionManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DWUploadSessionManager.h; sourceTree = "<group>"; };
0483317722B34ED7000E0BF9 /* icon_gif_save@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_gif_save@2x.png"; sourceTree = "<group>"; };
0483317822B34ED7000E0BF9 /* icon_gif_save@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_gif_save@3x.png"; sourceTree = "<group>"; };
048AD12722CDCE83008C8911 /* libxml2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxml2.tbd; path = usr/lib/libxml2.tbd; sourceTree = SDKROOT; };
......@@ -787,7 +787,7 @@
043441FF225EF2BB003F7EC1 /* CoreServices.framework in Frameworks */,
352CBDD91FD6980C00D24715 /* AudioToolbox.framework in Frameworks */,
352CBDD71FD697E800D24715 /* MediaPlayer.framework in Frameworks */,
047ECCED234F271E00131591 /* libCCSDK.a in Frameworks */,
04147A97237D4CA50091F810 /* libCCSDK.a in Frameworks */,
B88562A41DED1AC8008D1763 /* SystemConfiguration.framework in Frameworks */,
B57CC7C018E2E581001A1696 /* AVFoundation.framework in Frameworks */,
B57CC7BE18E2E575001A1696 /* CoreLocation.framework in Frameworks */,
......@@ -801,6 +801,47 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
04147A73237D4CA40091F810 /* SDK */ = {
isa = PBXGroup;
children = (
04147A74237D4CA40091F810 /* DWExt.h */,
04147A75237D4CA40091F810 /* DWVRHeader.h */,
04147A76237D4CA40091F810 /* DWDownloadSessionManager+File.h */,
04147A77237D4CA40091F810 /* DWErrorCode.h */,
04147A78237D4CA40091F810 /* NSURLSession+DWCorrectedResumeData.h */,
04147A79237D4CA40091F810 /* DWAdInfo.h */,
04147A7A237D4CA40091F810 /* vrlibraw.bundle */,
04147A7B237D4CA40091F810 /* DWBatchDownloadUtility.h */,
04147A7C237D4CA40091F810 /* DWLog.h */,
04147A7D237D4CA40091F810 /* DWVideoDataAdapter.h */,
04147A7E237D4CA40091F810 /* DWGIFManager.h */,
04147A7F237D4CA40091F810 /* DWVodVideoModel.h */,
04147A80237D4CA40091F810 /* DWUPnPDevice.h */,
04147A81237D4CA40091F810 /* DWSDK.h */,
04147A82237D4CA40091F810 /* DWUPnPRenderer.h */,
04147A83237D4CA40091F810 /* DWDownloadSessionManager.h */,
04147A84237D4CA40091F810 /* DWDownloadUtility.h */,
04147A85237D4CA40091F810 /* DWUPnPResponseDelegate.h */,
04147A86237D4CA40091F810 /* DWUPnPAVPositionInfo.h */,
04147A87237D4CA40091F810 /* libCCSDK.a */,
04147A88237D4CA40091F810 /* DWDownloadModel.h */,
04147A89237D4CA40091F810 /* DWPlayerSkinView.h */,
04147A8A237D4CA40091F810 /* DWPlayerView.h */,
04147A8B237D4CA40091F810 /* DWUPnPSubscription.h */,
04147A8C237D4CA40091F810 /* DWUPnPSearch.h */,
04147A8D237D4CA40091F810 /* DWVRLibrary.h */,
04147A8E237D4CA40091F810 /* DWUploadModel.h */,
04147A8F237D4CA40091F810 /* DWResource.bundle */,
04147A90237D4CA40091F810 /* DWVodAdInfoModel.h */,
04147A91237D4CA40091F810 /* DWPlayInfo.h */,
04147A92237D4CA40091F810 /* DW360Program.h */,
04147A93237D4CA40091F810 /* DW360Director.h */,
04147A94237D4CA40091F810 /* DWVideoCompressController.h */,
04147A95237D4CA40091F810 /* DWUploadSessionManager.h */,
);
path = SDK;
sourceTree = "<group>";
};
0434420D225F0EDD003F7EC1 /* Classes */ = {
isa = PBXGroup;
children = (
......@@ -1122,47 +1163,6 @@
path = Exercises;
sourceTree = "<group>";
};
047ECCC9234F271E00131591 /* SDK */ = {
isa = PBXGroup;
children = (
047ECCCA234F271E00131591 /* DWExt.h */,
047ECCCB234F271E00131591 /* DWVRHeader.h */,
047ECCCC234F271E00131591 /* DWDownloadSessionManager+File.h */,
047ECCCD234F271E00131591 /* DWErrorCode.h */,
047ECCCE234F271E00131591 /* NSURLSession+DWCorrectedResumeData.h */,
047ECCCF234F271E00131591 /* DWAdInfo.h */,
047ECCD0234F271E00131591 /* vrlibraw.bundle */,
047ECCD1234F271E00131591 /* DWBatchDownloadUtility.h */,
047ECCD2234F271E00131591 /* DWLog.h */,
047ECCD3234F271E00131591 /* DWVideoDataAdapter.h */,
047ECCD4234F271E00131591 /* DWGIFManager.h */,
047ECCD5234F271E00131591 /* DWVodVideoModel.h */,
047ECCD6234F271E00131591 /* DWUPnPDevice.h */,
047ECCD7234F271E00131591 /* DWSDK.h */,
047ECCD8234F271E00131591 /* DWUPnPRenderer.h */,
047ECCD9234F271E00131591 /* DWDownloadSessionManager.h */,
047ECCDA234F271E00131591 /* DWDownloadUtility.h */,
047ECCDB234F271E00131591 /* DWUPnPResponseDelegate.h */,
047ECCDC234F271E00131591 /* DWUPnPAVPositionInfo.h */,
047ECCDD234F271E00131591 /* libCCSDK.a */,
047ECCDE234F271E00131591 /* DWDownloadModel.h */,
047ECCDF234F271E00131591 /* DWPlayerSkinView.h */,
047ECCE0234F271E00131591 /* DWPlayerView.h */,
047ECCE1234F271E00131591 /* DWUPnPSubscription.h */,
047ECCE2234F271E00131591 /* DWUPnPSearch.h */,
047ECCE3234F271E00131591 /* DWVRLibrary.h */,
047ECCE4234F271E00131591 /* DWUploadModel.h */,
047ECCE5234F271E00131591 /* DWResource.bundle */,
047ECCE6234F271E00131591 /* DWVodAdInfoModel.h */,
047ECCE7234F271E00131591 /* DWPlayInfo.h */,
047ECCE8234F271E00131591 /* DW360Program.h */,
047ECCE9234F271E00131591 /* DW360Director.h */,
047ECCEA234F271E00131591 /* DWVideoCompressController.h */,
047ECCEB234F271E00131591 /* DWUploadSessionManager.h */,
);
path = SDK;
sourceTree = "<group>";
};
049FEF29225EEE9F00D944C5 /* Plugins */ = {
isa = PBXGroup;
children = (
......@@ -1530,7 +1530,7 @@
isa = PBXGroup;
children = (
044C66A122D46DAE0032396F /* Demo.entitlements */,
047ECCC9234F271E00131591 /* SDK */,
04147A73237D4CA40091F810 /* SDK */,
0434420D225F0EDD003F7EC1 /* Classes */,
B547EC5818E033FB00BC980C /* DWAppDelegate.h */,
B547EC5918E033FB00BC980C /* DWAppDelegate.m */,
......@@ -1669,7 +1669,7 @@
04FFA9F622647C84008C2713 /* icon_play_more@3x.png in Resources */,
04D60ED722719B9C0009C572 /* icon_play_vr_display_normal@2x.png in Resources */,
04FFA9EA22647579008C2713 /* icon_play_full@2x.png in Resources */,
047ECCEC234F271E00131591 /* vrlibraw.bundle in Resources */,
04147A96237D4CA50091F810 /* vrlibraw.bundle in Resources */,
04AB4A3B22B1F22A00BB9BF9 /* icon_exercises_answer_f_select@3x.png in Resources */,
04EB65DD226D9B6200FAB532 /* icon_setting_sound_low@2x.png in Resources */,
B547EC5418E033FB00BC980C /* InfoPlist.strings in Resources */,
......@@ -1712,7 +1712,7 @@
04FFA9F822647C84008C2713 /* icon_play_gif_normal@3x.png in Resources */,
04F0B79F22602D8F0097C3CB /* icon_return_black@2x.png in Resources */,
043D018722B76F1C008589DA /* icon_exercises_statistics_error@3x.png in Resources */,
047ECCEE234F271E00131591 /* DWResource.bundle in Resources */,
04147A98237D4CA50091F810 /* DWResource.bundle in Resources */,
04FFA9D622647579008C2713 /* icon_play_return@3x.png in Resources */,
04D7188B22D45BDC002D41BD /* icon_screen_horizontal@2x.png in Resources */,
04AB4A3922B1F22A00BB9BF9 /* icon_exercises_answer_g_select@3x.png in Resources */,
......
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "D493E4A5-FF32-4C5D-B61B-0D88D4BD1AD4"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/SDK/Upload/DWUploader.m"
timestampString = "586675223.9752491"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "649"
endingLineNumber = "649"
landmarkName = "-accessCheckUploadWithFirst:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/SDK/Upload/DWUploader.m"
timestampString = "586675223.976321"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "554"
endingLineNumber = "554"
landmarkName = "-accessUploadValidate"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
......@@ -92,8 +92,9 @@
-(void)reloadLoaclData
{
//请自行替换数据
NSArray * videos = @[];
NSArray * videos = @[];
for (int i = 0; i < videos.count; i++) {
DWVodModel * vodModel = [[DWVodModel alloc]init];
vodModel.videoId = [videos objectAtIndex:i];
......
......@@ -57,7 +57,7 @@
}
- (void)uploadAction:(UIBarButtonItem *)item
{
{
if (self.userIdTextField.text.length == 0) {
[@"请输入User ID" showAlert];
return;
......
......@@ -261,6 +261,7 @@ static NSString *const uploadsArray =@"uploadsArray";
if (!isCancel) {
DWUploadModel * uploadModel = [DWUploadSessionManager createUploadModelWithUserId:userId Apikey:apiKey VideoTitle:videoTitle VideoDescription:videoDescription VideoTag:videoTag VideoPath:weakself.videoPath CategoryId:nil NotifyURL:nil];
UIImage * image = [DWTools getThumbnailImage:self.videoPath time:0];
if (image) {
uploadModel.otherInfo = @{@"image":UIImagePNGRepresentation(image)};
......@@ -324,7 +325,7 @@ static NSString *const uploadsArray =@"uploadsArray";
[cell updateCellTotalBytesSent:totalBytesSent WithExpectedToSend:expectedToSend];
}
// NSLog(@"上传进度 totalBytesSent:%lld expectedToSend:%lld",totalBytesSent,expectedToSend);
// NSLog(@"上传进度 totalBytesSent:%lld expectedToSend:%lld progress:%lf",totalBytesSent,expectedToSend,uploadModel.progress);
}
//上传失败回调
......
......@@ -14,6 +14,9 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic,assign)CGFloat bufferValue;
//切换屏幕状态时,重置子视图frame
-(void)resetSubViewFrame;
@end
@interface DWPlayerSliderBufferView : UIView
......
......@@ -35,6 +35,10 @@
-(void)setBufferValue:(CGFloat)bufferValue
{
if (isnan(bufferValue)) {
bufferValue = 0;
}
_bufferValue = bufferValue;
if (self.bufferView) {
......@@ -50,6 +54,11 @@
}
}
-(void)resetSubViewFrame
{
self.bufferView.frame = CGRectMake(self.bufferView.frame.origin.x, self.bufferView.frame.origin.y, self.frame.size.width * self.bufferValue, self.bufferView.frame.size.height);
}
-(void)layoutSubviews
{
[super layoutSubviews];
......
......@@ -606,6 +606,9 @@ static const CGFloat gifSeconds = 0.25;
[self setNeedsLayout];
[self layoutIfNeeded];
//获取到真实位置后,重置进度条位置
[self.slider resetSubViewFrame];
}
//清理和隐藏页面控件
......@@ -793,7 +796,12 @@ static const CGFloat gifSeconds = 0.25;
[self.qualityButton setTitle:qualityModel.desp forState:UIControlStateNormal];
[self.playerView switchQuality:qualityModel withCustomId:nil];
[self play];
//如果播放加密视频时,SDK解密服务需要一定的时间启动,这里延迟执行play。
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self play];
});
// [self play];
}
-(void)showHudWithMessage:(NSString *)message
......@@ -3200,7 +3208,7 @@ static const CGFloat gifSeconds = 0.25;
if (!self.nextButton.hidden) {
nextButtonWidth = 30 + 5;
}
return w - 10 - 30 - nextButtonWidth - 5 - self.currentLabel.frame.size.width - 2.5 - self.lineLabel.frame.size.width - 2.5 - self.totalLabel.frame.size.width - 5 - rightWidth - 10 - 5;
}
......
......@@ -6,19 +6,38 @@ typedef void (^DWPlayInfoFinishBlock)(DWVodVideoModel * vodVideo);
@interface DWPlayInfo : NSObject
//请求超时时间,默认10s
@property (assign, nonatomic)NSTimeInterval timeoutSeconds;
//1为视频 2为音频 0为视频+音频 若不传该参数默认为视频
@property (nonatomic,copy)NSString *mediatype;
@property (nonatomic,copy)NSString *verificationCode;//授权验证码
//授权验证码
@property (nonatomic,copy)NSString *verificationCode;
//请求失败回调
@property (copy, nonatomic)DWErrorBlock errorBlock;
//请求完成回调
@property (copy, nonatomic)DWPlayInfoFinishBlock finishBlock;
/// 初始化方法
/// @param userId 账号id
/// @param videoId 视频id
/// @param key 账号key
- (id)initWithUserId:(NSString *)userId andVideoId:(NSString *)videoId key:(NSString *)key;
/// 初始化方法
/// @param userId 账号id
/// @param videoId 视频id
/// @param key 账号key
/// @param hlsSupport 获取播放地址时,若账号支持hls,填@"1"会返回m3u8下载地址。获取下载地址时,请填@"0"
- (id)initWithUserId:(NSString *)userId andVideoId:(NSString *)videoId key:(NSString *)key hlsSupport:(NSString *)hlsSupport;
/// 开始获取视频数据
- (void)start;
/// 取消获取视频数据,取消之后,不会调用errorBlock或finishBlock。
- (void)cancel;
@end
......@@ -26,5 +26,5 @@
#import "DWVodAdInfoModel.h"
//版本号
#define SDK_VERSION @"4.2.3"
#define SDK_VERSION @"4.2.4"
No preview for this file type
......@@ -82,11 +82,11 @@ blockquote > :first-child, li > :first-child { margin-top: 0px; }
.footnotes-area { color: rgb(136, 136, 136); margin-top: 0.714rem; padding-bottom: 0.143rem; white-space: normal; }
#write .footnote-line { white-space: pre-wrap; }
@media print {
body, html { border: 1px solid transparent; height: 99%; break-after: avoid-page; break-before: avoid-page; }
body, html { border: 1px solid transparent; height: 99%; break-after: avoid; break-before: avoid; }
#write { margin-top: 0px; padding-top: 0px; border-color: transparent !important; }
.typora-export * { -webkit-print-color-adjust: exact; }
html.blink-to-pdf { font-size: 13px; }
.typora-export #write { padding-left: 32px; padding-right: 32px; padding-bottom: 0px; break-after: avoid-page; }
.typora-export #write { padding-left: 32px; padding-right: 32px; padding-bottom: 0px; break-after: avoid; }
.typora-export #write::after { height: 0px; }
}
.footnote-line { margin-top: 0.714em; font-size: 0.7em; }
......@@ -313,13 +313,11 @@ table tr th {
font-weight: bold;
border: 1px solid #dfe2e5;
border-bottom: 0;
text-align: left;
margin: 0;
padding: 6px 13px;
}
table tr td {
border: 1px solid #dfe2e5;
text-align: left;
margin: 0;
padding: 6px 13px;
}
......@@ -489,10 +487,19 @@ header, .context-menu, .megamenu-content, footer{
border-color: #e5e5e5;
}
.ty-preferences .window-content {
background-color: #fafafa;
}
.ty-preferences .nav-group-item.active {
color: white;
background: #999;
}
.typora-export li, .typora-export p, .typora-export, .footnote-line {white-space: normal;}
</style>
</head>
<body class='typora-export' >
<div id='write' class = 'is-mac'><h1><a name="%E6%A6%82%E8%BF%B0" class="md-header-anchor"></a><span>概述</span></h1><h2><a name="sdk%E7%AE%80%E4%BB%8B" class="md-header-anchor"></a><span>SDK简介</span></h2><p><span>iOS点播SDK是适用于iOS平台的云点播SDK。使用此SDK可以与CC视频云服务进行对接,在iOS端使用CC视频的点播功能。</span></p><h2><a name="%E8%AE%BE%E5%A4%87%E5%8F%8A%E5%BC%80%E5%8F%91%E7%8E%AF%E5%A2%83" class="md-header-anchor"></a><span>设备及开发环境</span></h2><p><span>Xcode 集成开发环境。</span></p><p><span>iOS 运行环境:iOS 8.0 及以上系统,armv7、arm64、x86_64的CPU架构。</span></p><h2><a name="%E5%8A%9F%E8%83%BD%E7%89%B9%E6%80%A7" class="md-header-anchor"></a><span>功能特性</span></h2><figure><table><thead><tr><th><span>功能</span></th><th style='text-align:left;' ><span>描述</span></th></tr></thead><tbody><tr><td><span>播放功能</span></td><td style='text-align:left;' ><span>支持加密/非加密音视频在线和本地播放</span></td></tr><tr><td><span>广告功能</span></td><td style='text-align:left;' ><span>支持添加视频前贴广告和暂停广告</span></td></tr><tr><td><span>播放统计</span></td><td style='text-align:left;' ><span>支持用户实现播放的统计</span></td></tr><tr><td><span>视频打点</span></td><td style='text-align:left;' ><span>支持用户自定义视频打点功能</span></td></tr><tr><td><span>视频问答</span></td><td style='text-align:left;' ><span>支持用户自定义问答功能</span></td></tr><tr><td><span>视频字幕</span></td><td style='text-align:left;' ><span>支持从服务器获取字幕资源并显示</span></td></tr><tr><td><span>授权验证</span></td><td style='text-align:left;' ><span>支持设置视频是否允许预览</span></td></tr><tr><td><span>原片播放</span></td><td style='text-align:left;' ><span>支持视频上传之后,立即播放</span></td></tr><tr><td><span>访客信息收集</span></td><td style='text-align:left;' ><span>支持访客信息收集功能</span></td></tr><tr><td><span>课堂练习</span></td><td style='text-align:left;' ><span>支持课堂练习功能</span></td></tr><tr><td><span>播放器皮肤</span></td><td style='text-align:left;' ><span>支持带皮肤的播放页面</span></td></tr><tr><td><span>视频投屏</span></td><td style='text-align:left;' ><span>支持DLNA投屏</span></td></tr><tr><td><span>防录屏</span></td><td style='text-align:left;' ><span>支持视频防录屏功能</span></td></tr><tr><td><span>动态水印</span></td><td style='text-align:left;' ><span>支持上传视频时,添加动态水印</span></td></tr><tr><td><span>VR视频</span></td><td style='text-align:left;' ><span>支持VR视频播放</span></td></tr><tr><td><span>GIF录制</span></td><td style='text-align:left;' ><span>支持GIF录制功能</span></td></tr><tr><td><span>上传功能</span></td><td style='text-align:left;' ><span>支持音视频上传、断点上传,后台上传功能</span></td></tr><tr><td><span>下载功能</span></td><td style='text-align:left;' ><span>支持音视频上传、断点下载、批量下载,后台下载功能</span></td></tr></tbody></table></figure><p>&nbsp;</p></div>
<div id='write' class = 'is-mac'><h1><a name="概述" class="md-header-anchor"></a><span>概述</span></h1><h2><a name="sdk简介" class="md-header-anchor"></a><span>SDK简介</span></h2><p><span>iOS点播SDK是适用于iOS平台的云点播SDK。使用此SDK可以与CC视频云服务进行对接,在iOS端使用CC视频的点播功能。</span></p><h2><a name="设备及开发环境" class="md-header-anchor"></a><span>设备及开发环境</span></h2><p><span>Xcode 集成开发环境。</span></p><p><span>iOS 运行环境:iOS 8.0 及以上系统,armv7、arm64、x86_64的CPU架构。</span></p><h2><a name="功能特性" class="md-header-anchor"></a><span>功能特性</span></h2><figure><table><thead><tr><th><span>功能</span></th><th style='text-align:left;' ><span>描述</span></th></tr></thead><tbody><tr><td><span>播放功能</span></td><td style='text-align:left;' ><span>支持加密/非加密音视频在线和本地播放</span></td></tr><tr><td><span>广告功能</span></td><td style='text-align:left;' ><span>支持添加视频前贴广告和暂停广告</span></td></tr><tr><td><span>播放统计</span></td><td style='text-align:left;' ><span>支持用户实现播放的统计</span></td></tr><tr><td><span>视频打点</span></td><td style='text-align:left;' ><span>支持用户自定义视频打点功能</span></td></tr><tr><td><span>视频问答</span></td><td style='text-align:left;' ><span>支持用户自定义问答功能</span></td></tr><tr><td><span>视频字幕</span></td><td style='text-align:left;' ><span>支持从服务器获取字幕资源并显示</span></td></tr><tr><td><span>授权验证</span></td><td style='text-align:left;' ><span>支持设置视频是否允许预览</span></td></tr><tr><td><span>原片播放</span></td><td style='text-align:left;' ><span>支持视频上传之后,立即播放</span></td></tr><tr><td><span>访客信息收集</span></td><td style='text-align:left;' ><span>支持访客信息收集功能</span></td></tr><tr><td><span>课堂练习</span></td><td style='text-align:left;' ><span>支持课堂练习功能</span></td></tr><tr><td><span>播放器皮肤</span></td><td style='text-align:left;' ><span>支持带皮肤的播放页面</span></td></tr><tr><td><span>视频投屏</span></td><td style='text-align:left;' ><span>支持DLNA投屏</span></td></tr><tr><td><span>防录屏</span></td><td style='text-align:left;' ><span>支持视频防录屏功能</span></td></tr><tr><td><span>动态水印</span></td><td style='text-align:left;' ><span>支持上传视频时,添加动态水印</span></td></tr><tr><td><span>VR视频</span></td><td style='text-align:left;' ><span>支持VR视频播放</span></td></tr><tr><td><span>GIF录制</span></td><td style='text-align:left;' ><span>支持GIF录制功能</span></td></tr><tr><td><span>上传功能</span></td><td style='text-align:left;' ><span>支持音视频上传、断点上传,后台上传功能</span></td></tr><tr><td><span>下载功能</span></td><td style='text-align:left;' ><span>支持音视频上传、断点下载、批量下载,后台下载功能</span></td></tr></tbody></table></figure><p>&nbsp;</p></div>
</body>
</html>
\ No newline at end of file
......@@ -82,11 +82,11 @@ blockquote > :first-child, li > :first-child { margin-top: 0px; }
.footnotes-area { color: rgb(136, 136, 136); margin-top: 0.714rem; padding-bottom: 0.143rem; white-space: normal; }
#write .footnote-line { white-space: pre-wrap; }
@media print {
body, html { border: 1px solid transparent; height: 99%; break-after: avoid-page; break-before: avoid-page; }
body, html { border: 1px solid transparent; height: 99%; break-after: avoid; break-before: avoid; }
#write { margin-top: 0px; padding-top: 0px; border-color: transparent !important; }
.typora-export * { -webkit-print-color-adjust: exact; }
html.blink-to-pdf { font-size: 13px; }
.typora-export #write { padding-left: 32px; padding-right: 32px; padding-bottom: 0px; break-after: avoid-page; }
.typora-export #write { padding-left: 32px; padding-right: 32px; padding-bottom: 0px; break-after: avoid; }
.typora-export #write::after { height: 0px; }
}
.footnote-line { margin-top: 0.714em; font-size: 0.7em; }
......@@ -386,13 +386,11 @@ table tr th {
font-weight: bold;
border: 1px solid #dfe2e5;
border-bottom: 0;
text-align: left;
margin: 0;
padding: 6px 13px;
}
table tr td {
border: 1px solid #dfe2e5;
text-align: left;
margin: 0;
padding: 6px 13px;
}
......@@ -562,11 +560,20 @@ header, .context-menu, .megamenu-content, footer{
border-color: #e5e5e5;
}
.ty-preferences .window-content {
background-color: #fafafa;
}
.ty-preferences .nav-group-item.active {
color: white;
background: #999;
}
.typora-export li, .typora-export p, .typora-export, .footnote-line {white-space: normal;}
</style>
</head>
<body class='typora-export' >
<div id='write' class = 'is-mac'><h1><a name="%E9%9B%86%E6%88%90%E6%8C%87%E5%8D%97" class="md-header-anchor"></a><span>集成指南</span></h1><h2><a name="1.sdk%E9%9B%86%E6%88%90" class="md-header-anchor"></a><span>1.SDK集成</span></h2><h3><a name="1.1-%E6%96%B9%E6%B3%951:cocoapods%E5%AF%BC%E5%85%A5" class="md-header-anchor"></a><span>1.1 方法1:Cocoapods导入 </span></h3><p><span>执行 </span><code>pod search &#39;CCVodSDK&#39;</code></p><p><span>Podfile 文件中增加如下代码: