Browse Source

1.验证下载并且超级签名后保存到文件成功

huangxiaodong 1 year ago
parent
commit
355a57ff9a

+ 84 - 4
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -633,6 +633,30 @@
 		6B9714402BCD00CA00CE0096 /* ComontAlretType2ViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B97143D2BCD00C900CE0096 /* ComontAlretType2ViewController.h */; };
 		6B9714412BCD00CA00CE0096 /* ComontAlretType2ViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B97143D2BCD00C900CE0096 /* ComontAlretType2ViewController.h */; };
 		6B9714422BCD00CA00CE0096 /* ComontAlretType2ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B97143E2BCD00C900CE0096 /* ComontAlretType2ViewController.m */; };
+		6B9B7A342C2D34D6001879C3 /* mixDownloadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A322C2D34D6001879C3 /* mixDownloadManager.h */; };
+		6B9B7A352C2D34D6001879C3 /* mixDownloadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A332C2D34D6001879C3 /* mixDownloadManager.m */; };
+		6B9B7A362C2D34D6001879C3 /* mixDownloadManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A332C2D34D6001879C3 /* mixDownloadManager.m */; };
+		6B9B7A372C2D34D6001879C3 /* mixDownloadManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A322C2D34D6001879C3 /* mixDownloadManager.h */; };
+		6B9B7A3A2C2D37C7001879C3 /* mixDownloadCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A382C2D37C7001879C3 /* mixDownloadCacheManager.h */; };
+		6B9B7A3B2C2D37C7001879C3 /* mixDownloadCacheManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A392C2D37C7001879C3 /* mixDownloadCacheManager.m */; };
+		6B9B7A3C2C2D37C7001879C3 /* mixDownloadCacheManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A392C2D37C7001879C3 /* mixDownloadCacheManager.m */; };
+		6B9B7A3D2C2D37C7001879C3 /* mixDownloadCacheManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A382C2D37C7001879C3 /* mixDownloadCacheManager.h */; };
+		6B9B7A402C2D3F77001879C3 /* mixDownloadSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A3E2C2D3F77001879C3 /* mixDownloadSession.h */; };
+		6B9B7A412C2D3F77001879C3 /* mixDownloadSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A3F2C2D3F77001879C3 /* mixDownloadSession.m */; };
+		6B9B7A422C2D3F77001879C3 /* mixDownloadSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A3F2C2D3F77001879C3 /* mixDownloadSession.m */; };
+		6B9B7A432C2D3F77001879C3 /* mixDownloadSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A3E2C2D3F77001879C3 /* mixDownloadSession.h */; };
+		6B9B7A462C2D43DD001879C3 /* mixDownloadQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A442C2D43DD001879C3 /* mixDownloadQueue.h */; };
+		6B9B7A472C2D43DD001879C3 /* mixDownloadQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A452C2D43DD001879C3 /* mixDownloadQueue.m */; };
+		6B9B7A482C2D43DD001879C3 /* mixDownloadQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A452C2D43DD001879C3 /* mixDownloadQueue.m */; };
+		6B9B7A492C2D43DD001879C3 /* mixDownloadQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A442C2D43DD001879C3 /* mixDownloadQueue.h */; };
+		6B9B7A4C2C2D456E001879C3 /* mixDownloadOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A4A2C2D456E001879C3 /* mixDownloadOperation.h */; };
+		6B9B7A4D2C2D456E001879C3 /* mixDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A4B2C2D456E001879C3 /* mixDownloadOperation.m */; };
+		6B9B7A4E2C2D456E001879C3 /* mixDownloadOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A4B2C2D456E001879C3 /* mixDownloadOperation.m */; };
+		6B9B7A4F2C2D456E001879C3 /* mixDownloadOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A4A2C2D456E001879C3 /* mixDownloadOperation.h */; };
+		6B9B7A582C2D4E23001879C3 /* NSURLSession+mixDownloadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A562C2D4E23001879C3 /* NSURLSession+mixDownloadTask.h */; };
+		6B9B7A592C2D4E23001879C3 /* NSURLSession+mixDownloadTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A572C2D4E23001879C3 /* NSURLSession+mixDownloadTask.m */; };
+		6B9B7A5A2C2D4E23001879C3 /* NSURLSession+mixDownloadTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B9B7A572C2D4E23001879C3 /* NSURLSession+mixDownloadTask.m */; };
+		6B9B7A5B2C2D4E23001879C3 /* NSURLSession+mixDownloadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B9B7A562C2D4E23001879C3 /* NSURLSession+mixDownloadTask.h */; };
 		6BA08F082C0187DD00A2242D /* boxDownloadFileRecordCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BA08F062C0187DC00A2242D /* boxDownloadFileRecordCell.h */; };
 		6BA08F092C0187DD00A2242D /* boxDownloadFileRecordCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BA08F072C0187DC00A2242D /* boxDownloadFileRecordCell.m */; };
 		6BA08F0A2C0187DD00A2242D /* boxDownloadFileRecordCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BA08F062C0187DC00A2242D /* boxDownloadFileRecordCell.h */; };
@@ -1671,6 +1695,18 @@
 		6B9354AB2BF3879200AA8D31 /* shareRecordTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = shareRecordTableViewCell.m; sourceTree = "<group>"; };
 		6B97143D2BCD00C900CE0096 /* ComontAlretType2ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ComontAlretType2ViewController.h; sourceTree = "<group>"; };
 		6B97143E2BCD00C900CE0096 /* ComontAlretType2ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ComontAlretType2ViewController.m; sourceTree = "<group>"; };
+		6B9B7A322C2D34D6001879C3 /* mixDownloadManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mixDownloadManager.h; sourceTree = "<group>"; };
+		6B9B7A332C2D34D6001879C3 /* mixDownloadManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = mixDownloadManager.m; sourceTree = "<group>"; };
+		6B9B7A382C2D37C7001879C3 /* mixDownloadCacheManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mixDownloadCacheManager.h; sourceTree = "<group>"; };
+		6B9B7A392C2D37C7001879C3 /* mixDownloadCacheManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = mixDownloadCacheManager.m; sourceTree = "<group>"; };
+		6B9B7A3E2C2D3F77001879C3 /* mixDownloadSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mixDownloadSession.h; sourceTree = "<group>"; };
+		6B9B7A3F2C2D3F77001879C3 /* mixDownloadSession.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = mixDownloadSession.m; sourceTree = "<group>"; };
+		6B9B7A442C2D43DD001879C3 /* mixDownloadQueue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mixDownloadQueue.h; sourceTree = "<group>"; };
+		6B9B7A452C2D43DD001879C3 /* mixDownloadQueue.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = mixDownloadQueue.m; sourceTree = "<group>"; };
+		6B9B7A4A2C2D456E001879C3 /* mixDownloadOperation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mixDownloadOperation.h; sourceTree = "<group>"; };
+		6B9B7A4B2C2D456E001879C3 /* mixDownloadOperation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = mixDownloadOperation.m; sourceTree = "<group>"; };
+		6B9B7A562C2D4E23001879C3 /* NSURLSession+mixDownloadTask.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSURLSession+mixDownloadTask.h"; sourceTree = "<group>"; };
+		6B9B7A572C2D4E23001879C3 /* NSURLSession+mixDownloadTask.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSURLSession+mixDownloadTask.m"; sourceTree = "<group>"; };
 		6BA08F062C0187DC00A2242D /* boxDownloadFileRecordCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = boxDownloadFileRecordCell.h; sourceTree = "<group>"; };
 		6BA08F072C0187DC00A2242D /* boxDownloadFileRecordCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = boxDownloadFileRecordCell.m; sourceTree = "<group>"; };
 		6BA08F3B2C01D05B00A2242D /* CWFileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CWFileManager.h; sourceTree = "<group>"; };
@@ -2363,6 +2399,7 @@
 		6B05815D2AFCD0A900D37290 /* uploadFile */ = {
 			isa = PBXGroup;
 			children = (
+				6B9B7A312C2D1776001879C3 /* mixDownloadManager */,
 				6B6ABED72BFF3A6600480BAC /* receiveView */,
 				6B5D401C2B4AA70C000965CF /* downLoadFile */,
 				6B5D40172B4A70AB000965CF /* uploadFileView */,
@@ -2811,6 +2848,25 @@
 			path = model;
 			sourceTree = "<group>";
 		};
+		6B9B7A312C2D1776001879C3 /* mixDownloadManager */ = {
+			isa = PBXGroup;
+			children = (
+				6B9B7A322C2D34D6001879C3 /* mixDownloadManager.h */,
+				6B9B7A332C2D34D6001879C3 /* mixDownloadManager.m */,
+				6B9B7A3E2C2D3F77001879C3 /* mixDownloadSession.h */,
+				6B9B7A3F2C2D3F77001879C3 /* mixDownloadSession.m */,
+				6B9B7A442C2D43DD001879C3 /* mixDownloadQueue.h */,
+				6B9B7A452C2D43DD001879C3 /* mixDownloadQueue.m */,
+				6B9B7A4A2C2D456E001879C3 /* mixDownloadOperation.h */,
+				6B9B7A4B2C2D456E001879C3 /* mixDownloadOperation.m */,
+				6B9B7A382C2D37C7001879C3 /* mixDownloadCacheManager.h */,
+				6B9B7A392C2D37C7001879C3 /* mixDownloadCacheManager.m */,
+				6B9B7A562C2D4E23001879C3 /* NSURLSession+mixDownloadTask.h */,
+				6B9B7A572C2D4E23001879C3 /* NSURLSession+mixDownloadTask.m */,
+			);
+			path = mixDownloadManager;
+			sourceTree = "<group>";
+		};
 		6BA08F452C01D05B00A2242D /* CWUploadManage */ = {
 			isa = PBXGroup;
 			children = (
@@ -3340,6 +3396,7 @@
 				18FCE5332AD12FE00020F623 /* ConnectTestViewController.h in Headers */,
 				181E84F22A8F0A9B00292B96 /* HelpDownScrollView.h in Headers */,
 				6B6ABEE62BFF49C800480BAC /* receiveDownloadRecordTableView.h in Headers */,
+				6B9B7A342C2D34D6001879C3 /* mixDownloadManager.h in Headers */,
 				6B2170882B1444CC00656670 /* allVersionView.h in Headers */,
 				6B0D004C2BFE104B00F02719 /* queryOneShareModel.h in Headers */,
 				6B45C50C2B5FA80E007E6911 /* diskListBgView.h in Headers */,
@@ -3347,11 +3404,13 @@
 				6B2C1E5C2C070ADE00FDCF82 /* ZFFloatView.h in Headers */,
 				6B1FBD3A2B467A8000926382 /* backupsFilerecordTableView.h in Headers */,
 				6B2C1E782C070ADE00FDCF82 /* ZFLandscapeWindow.h in Headers */,
+				6B9B7A402C2D3F77001879C3 /* mixDownloadSession.h in Headers */,
 				6BF0F3D02AD391D8000AA133 /* connectDeviceManager.h in Headers */,
 				6B2C1E982C070ADE00FDCF82 /* ZFPlayerNotification.h in Headers */,
 				6B7EA7A42BF607FB002D5CC2 /* imageDetailsScrollViewController.h in Headers */,
 				6BFF26952AF9D8CC00FCB4F7 /* AuthCodeInputView.h in Headers */,
 				6B1CC2C62B677F3E00AD4217 /* extraMediaEventModel.h in Headers */,
+				6B9B7A4C2C2D456E001879C3 /* mixDownloadOperation.h in Headers */,
 				6B5B607A2B3E71B6009A2AE2 /* filePathCreatTableViewCell.h in Headers */,
 				18FCE5442AD136FF0020F623 /* ShortcutManager.h in Headers */,
 				6B2170A02B15D39900656670 /* privacyModeTipViewController.h in Headers */,
@@ -3368,6 +3427,7 @@
 				6BA08F472C01D05B00A2242D /* CWFileManager.h in Headers */,
 				6B05815B2AFC851E00D37290 /* mySetHeadView.h in Headers */,
 				6BF52CAD2AD82EA500A617DB /* PlayerControlButTipView.h in Headers */,
+				6B9B7A3A2C2D37C7001879C3 /* mixDownloadCacheManager.h in Headers */,
 				6B1FBD2A2B452B3800926382 /* backupsFileManager.h in Headers */,
 				6B5B60652B3D5FD8009A2AE2 /* fileTransfeSetViewController.h in Headers */,
 				6B4D23B12B33DDBC005B718A /* imageVersionRenewTipView.h in Headers */,
@@ -3441,6 +3501,7 @@
 				6B41C3522C09E55700DFDADC /* PlayerViewController+downloadNasFile.h in Headers */,
 				6B9354952BF33F2700AA8D31 /* editShareView.h in Headers */,
 				184C8AD52A949D5900F26650 /* AboutViewController.h in Headers */,
+				6B9B7A582C2D4E23001879C3 /* NSURLSession+mixDownloadTask.h in Headers */,
 				6B34DC672BF1FFB1002DD1EF /* imageCollectionViewCell.h in Headers */,
 				6B2C1E602C070ADE00FDCF82 /* ZFKVOController.h in Headers */,
 				6B0581A22AFCF50300D37290 /* AJPhotoListCell.h in Headers */,
@@ -3451,6 +3512,7 @@
 				6B1CC2CE2B6B6D6B00AD4217 /* commandSendCheckModel.h in Headers */,
 				6B0581602AFCD0DF00D37290 /* uploadImageOrVideoViewController.h in Headers */,
 				18F9CB092ABD7835003FF71A /* TipsQRCodeForChangeDeviceViewController.h in Headers */,
+				6B9B7A462C2D43DD001879C3 /* mixDownloadQueue.h in Headers */,
 				6B07AC2B2BF8D38F005C2B0E /* NASFileAudioModel.h in Headers */,
 				6B2C1E522C070ADE00FDCF82 /* ZFVolumeBrightnessView.h in Headers */,
 				6B5B60722B3D8098009A2AE2 /* fileTransferPathCheckTableViewCell.h in Headers */,
@@ -3561,6 +3623,7 @@
 				6BD506BB2B9576A4006E7CB0 /* ConnectTestViewController.h in Headers */,
 				6BD506BC2B9576A4006E7CB0 /* HelpDownScrollView.h in Headers */,
 				6B6ABEE82BFF49C800480BAC /* receiveDownloadRecordTableView.h in Headers */,
+				6B9B7A372C2D34D6001879C3 /* mixDownloadManager.h in Headers */,
 				6BD506BD2B9576A4006E7CB0 /* allVersionView.h in Headers */,
 				6B0D004D2BFE104B00F02719 /* queryOneShareModel.h in Headers */,
 				6BD506BE2B9576A4006E7CB0 /* diskListBgView.h in Headers */,
@@ -3568,11 +3631,13 @@
 				6B2C1E5D2C070ADE00FDCF82 /* ZFFloatView.h in Headers */,
 				6BD506C02B9576A4006E7CB0 /* backupsFilerecordTableView.h in Headers */,
 				6B2C1E792C070ADE00FDCF82 /* ZFLandscapeWindow.h in Headers */,
+				6B9B7A432C2D3F77001879C3 /* mixDownloadSession.h in Headers */,
 				6BD506C12B9576A4006E7CB0 /* connectDeviceManager.h in Headers */,
 				6B2C1E992C070ADE00FDCF82 /* ZFPlayerNotification.h in Headers */,
 				6B7EA7A62BF607FB002D5CC2 /* imageDetailsScrollViewController.h in Headers */,
 				6BD506C22B9576A4006E7CB0 /* AuthCodeInputView.h in Headers */,
 				6BD506C32B9576A4006E7CB0 /* extraMediaEventModel.h in Headers */,
+				6B9B7A4F2C2D456E001879C3 /* mixDownloadOperation.h in Headers */,
 				6BD506C42B9576A4006E7CB0 /* filePathCreatTableViewCell.h in Headers */,
 				6BD506C52B9576A4006E7CB0 /* ShortcutManager.h in Headers */,
 				6BD506C62B9576A4006E7CB0 /* privacyModeTipViewController.h in Headers */,
@@ -3589,6 +3654,7 @@
 				6BA08F482C01D05B00A2242D /* CWFileManager.h in Headers */,
 				6BD506CC2B9576A4006E7CB0 /* mySetHeadView.h in Headers */,
 				6BD506CD2B9576A4006E7CB0 /* PlayerControlButTipView.h in Headers */,
+				6B9B7A3D2C2D37C7001879C3 /* mixDownloadCacheManager.h in Headers */,
 				6BD506CE2B9576A4006E7CB0 /* backupsFileManager.h in Headers */,
 				6BD506CF2B9576A4006E7CB0 /* fileTransfeSetViewController.h in Headers */,
 				6BD506D02B9576A4006E7CB0 /* imageVersionRenewTipView.h in Headers */,
@@ -3662,6 +3728,7 @@
 				6B41C3552C09E55700DFDADC /* PlayerViewController+downloadNasFile.h in Headers */,
 				6B9354962BF33F2700AA8D31 /* editShareView.h in Headers */,
 				6BD506F22B9576A4006E7CB0 /* AboutViewController.h in Headers */,
+				6B9B7A5B2C2D4E23001879C3 /* NSURLSession+mixDownloadTask.h in Headers */,
 				6B34DC692BF1FFB1002DD1EF /* imageCollectionViewCell.h in Headers */,
 				6B2C1E612C070ADE00FDCF82 /* ZFKVOController.h in Headers */,
 				6BD506F32B9576A4006E7CB0 /* AJPhotoListCell.h in Headers */,
@@ -3672,6 +3739,7 @@
 				6BD506F52B9576A4006E7CB0 /* commandSendCheckModel.h in Headers */,
 				6BD506F62B9576A4006E7CB0 /* uploadImageOrVideoViewController.h in Headers */,
 				6BD506F72B9576A4006E7CB0 /* TipsQRCodeForChangeDeviceViewController.h in Headers */,
+				6B9B7A492C2D43DD001879C3 /* mixDownloadQueue.h in Headers */,
 				6B07AC2E2BF8D38F005C2B0E /* NASFileAudioModel.h in Headers */,
 				6B2C1E532C070ADE00FDCF82 /* ZFVolumeBrightnessView.h in Headers */,
 				6BD506F82B9576A4006E7CB0 /* fileTransferPathCheckTableViewCell.h in Headers */,
@@ -4153,6 +4221,7 @@
 				6B63179F2BFD8CA000FF4FB4 /* videoPlayByAVPlayerViewController.m in Sources */,
 				6BD507322B9576A4006E7CB0 /* PlayerViewController+upLoadFile.m in Sources */,
 				6BD507332B9576A4006E7CB0 /* Calculator.m in Sources */,
+				6B9B7A422C2D3F77001879C3 /* mixDownloadSession.m in Sources */,
 				6B93549D2BF369D000AA8D31 /* previewToUploadFileView.m in Sources */,
 				6BD507342B9576A4006E7CB0 /* HWWebViewController.m in Sources */,
 				6B8661DF2BBA578600B19846 /* HaveNoticeView.m in Sources */,
@@ -4166,6 +4235,7 @@
 				6B2C1E412C070ADE00FDCF82 /* ZFPortraitControlView.m in Sources */,
 				6BD5073B2B9576A4006E7CB0 /* customLaunchView.m in Sources */,
 				6BD5073C2B9576A4006E7CB0 /* HWSetViewController.m in Sources */,
+				6B9B7A482C2D43DD001879C3 /* mixDownloadQueue.m in Sources */,
 				6BD5073D2B9576A4006E7CB0 /* JSONValueTransformer.m in Sources */,
 				6BD5073E2B9576A4006E7CB0 /* AFAutoPurgingImageCache.m in Sources */,
 				6BD5073F2B9576A4006E7CB0 /* AuthCodeInputView.m in Sources */,
@@ -4212,6 +4282,7 @@
 				6BD5075B2B9576A4006E7CB0 /* couldphoneSysInfoModel.m in Sources */,
 				6B2C1E512C070ADE00FDCF82 /* ZFUtilities.m in Sources */,
 				6BD5075C2B9576A4006E7CB0 /* BGTool.m in Sources */,
+				6B9B7A3C2C2D37C7001879C3 /* mixDownloadCacheManager.m in Sources */,
 				6B34DC682BF1FFB1002DD1EF /* imageCollectionViewCell.m in Sources */,
 				6BD5075D2B9576A4006E7CB0 /* JSONModelClassProperty.m in Sources */,
 				6BD5075E2B9576A4006E7CB0 /* uploadFileManager.m in Sources */,
@@ -4255,6 +4326,7 @@
 				6BD5077A2B9576A4006E7CB0 /* SetPWDFirstViewController.m in Sources */,
 				6BD5077B2B9576A4006E7CB0 /* HWSearchBar.m in Sources */,
 				6BD5077C2B9576A4006E7CB0 /* HWFolderListCell.m in Sources */,
+				6B9B7A5A2C2D4E23001879C3 /* NSURLSession+mixDownloadTask.m in Sources */,
 				6BD5077D2B9576A4006E7CB0 /* RSA.m in Sources */,
 				6BD5077E2B9576A4006E7CB0 /* RSATool.m in Sources */,
 				6B5BE5822BFC81E300A1B9B3 /* NASFileAndFolderModel.m in Sources */,
@@ -4323,6 +4395,7 @@
 				6BD507A82B9576A4006E7CB0 /* uploadFileRecordBgScorllView.m in Sources */,
 				6BD507A92B9576A4006E7CB0 /* AboutViewController.m in Sources */,
 				6BD507AA2B9576A4006E7CB0 /* JSONModelArray.m in Sources */,
+				6B9B7A362C2D34D6001879C3 /* mixDownloadManager.m in Sources */,
 				6B4C0F692C0314BA0070EF2E /* DFPlayerLyricsTableview.m in Sources */,
 				6BD507AB2B9576A4006E7CB0 /* AFURLSessionManager.m in Sources */,
 				6BD507AC2B9576A4006E7CB0 /* GuideLastView.m in Sources */,
@@ -4351,6 +4424,7 @@
 				6BD507BF2B9576A4006E7CB0 /* MySetViewController.m in Sources */,
 				6BD507C02B9576A4006E7CB0 /* downloadFileBottomView.m in Sources */,
 				6BD507C12B9576A4006E7CB0 /* FLAnimatedImageView.m in Sources */,
+				6B9B7A4E2C2D456E001879C3 /* mixDownloadOperation.m in Sources */,
 				6BEA31772BB65606005167AA /* clearCacheAlretViewController.m in Sources */,
 				6BD507C22B9576A4006E7CB0 /* DeviceThirdIdModel.m in Sources */,
 				6B2C1E5F2C070ADE00FDCF82 /* ZFFloatView.m in Sources */,
@@ -4456,6 +4530,7 @@
 				6B63179C2BFD8CA000FF4FB4 /* videoPlayByAVPlayerViewController.m in Sources */,
 				6B1FBD332B455DBD00926382 /* PlayerViewController+upLoadFile.m in Sources */,
 				18E557212A3C5D75005CC84B /* Calculator.m in Sources */,
+				6B9B7A412C2D3F77001879C3 /* mixDownloadSession.m in Sources */,
 				6B93549A2BF369D000AA8D31 /* previewToUploadFileView.m in Sources */,
 				A003F6ED27D84D9C00715CBF /* HWWebViewController.m in Sources */,
 				6B8661DC2BBA578600B19846 /* HaveNoticeView.m in Sources */,
@@ -4469,6 +4544,7 @@
 				6B2C1E402C070ADE00FDCF82 /* ZFPortraitControlView.m in Sources */,
 				6BF52CA72AD7D3BE00A617DB /* customLaunchView.m in Sources */,
 				A031DD7A27EC713A00909527 /* HWSetViewController.m in Sources */,
+				6B9B7A472C2D43DD001879C3 /* mixDownloadQueue.m in Sources */,
 				183AE6022A89CE3C00B11CB0 /* JSONValueTransformer.m in Sources */,
 				183AE6522A8A2CF000B11CB0 /* AFAutoPurgingImageCache.m in Sources */,
 				6BFF26962AF9D8CC00FCB4F7 /* AuthCodeInputView.m in Sources */,
@@ -4515,6 +4591,7 @@
 				6B21708D2B14BDAA00656670 /* couldphoneSysInfoModel.m in Sources */,
 				6B2C1E502C070ADE00FDCF82 /* ZFUtilities.m in Sources */,
 				A08A94FE27E9A4E400C544BB /* BGTool.m in Sources */,
+				6B9B7A3B2C2D37C7001879C3 /* mixDownloadCacheManager.m in Sources */,
 				6B34DC662BF1FFB1002DD1EF /* imageCollectionViewCell.m in Sources */,
 				183AE6072A89CE3C00B11CB0 /* JSONModelClassProperty.m in Sources */,
 				6B0582862B0457C400D37290 /* uploadFileManager.m in Sources */,
@@ -4558,6 +4635,7 @@
 				186820262AB9B5BF005702A6 /* SetPWDFirstViewController.m in Sources */,
 				A003F6F827D8775A00715CBF /* HWSearchBar.m in Sources */,
 				A00221E027EB0EBF00E45F78 /* HWFolderListCell.m in Sources */,
+				6B9B7A592C2D4E23001879C3 /* NSURLSession+mixDownloadTask.m in Sources */,
 				A003F6D027D8425C00715CBF /* RSA.m in Sources */,
 				18BA24882AA5C57900BA01EE /* RSATool.m in Sources */,
 				6B5BE5802BFC81E300A1B9B3 /* NASFileAndFolderModel.m in Sources */,
@@ -4626,6 +4704,7 @@
 				6B72725C2B0E22D000C03F87 /* uploadFileRecordBgScorllView.m in Sources */,
 				184C8AD62A949D5900F26650 /* AboutViewController.m in Sources */,
 				183AE6062A89CE3C00B11CB0 /* JSONModelArray.m in Sources */,
+				6B9B7A352C2D34D6001879C3 /* mixDownloadManager.m in Sources */,
 				6B4C0F682C0314BA0070EF2E /* DFPlayerLyricsTableview.m in Sources */,
 				183AE6562A8A2CF000B11CB0 /* AFURLSessionManager.m in Sources */,
 				1868201A2AB94877005702A6 /* GuideLastView.m in Sources */,
@@ -4654,6 +4733,7 @@
 				18C475502A8E0DB5006129C0 /* MySetViewController.m in Sources */,
 				6B5D40342B4BE358000965CF /* downloadFileBottomView.m in Sources */,
 				A003F6C127D841FF00715CBF /* FLAnimatedImageView.m in Sources */,
+				6B9B7A4D2C2D456E001879C3 /* mixDownloadOperation.m in Sources */,
 				6BEA31762BB65606005167AA /* clearCacheAlretViewController.m in Sources */,
 				6BF0F3D62AD3937B000AA133 /* DeviceThirdIdModel.m in Sources */,
 				6B2C1E5E2C070ADE00FDCF82 /* ZFFloatView.m in Sources */,
@@ -5118,7 +5198,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 34;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5175,7 +5255,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.4.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -5199,7 +5279,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 34;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -5256,7 +5336,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.4.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

+ 3 - 3
创维盒子/双子星云手机/AppDelegate/AppDelegate.m

@@ -48,9 +48,9 @@
     [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent];
     
     //保护App,一般常见的问题不会导致闪退,增强App的健壮性,同时会将错误抛出来,根据每个App自身的日志渠道记录
-    [JJException configExceptionCategory:JJExceptionGuardAll];
-    [JJException startGuardException];
-    [JJException registerExceptionHandle:self];
+//    [JJException configExceptionCategory:JJExceptionGuardAll];
+//    [JJException startGuardException];
+//    [JJException registerExceptionHandle:self];
     
     //Default value:NO  no表示异常不退出 YES 表示退出  开发时应该设置为YES
     //JJException.exceptionWhenTerminate = YES;

+ 2 - 0
创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -49,6 +49,8 @@
 #import "cachesFileManager.h"
 #import "ComontAlretViewController.h"
 
+#import "MJExtension.h"
+
 #define globalBlock(block) dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), block)
 
 /**宏定义*/

+ 3 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/mixDownloadManager/mixDownloadManager.m

@@ -68,6 +68,9 @@
         if (fileInfo && [fileInfo[@"currentSize"] integerValue] == [fileInfo[@"totalSize"] integerValue]
             && [fileInfo[@"totalSize"] integerValue] != 0) {
             
+           mixDownloadOperation *operation = [mixDownloadOperation mj_objectWithKeyValues:fileInfo];
+           [[NSNotificationCenter defaultCenter] postNotificationName:mixDownloadTaskExeEnd object:nil userInfo:@{@"operation" : operation}];
+            
             dispatch_async(dispatch_get_main_queue(), ^{
                 !complete ? : complete(fileInfo,nil);
             });

+ 5 - 2
创维盒子/双子星云手机/Class/Set/uploadFile/mixDownloadManager/mixDownloadOperation.m

@@ -50,8 +50,11 @@ NSString * const mixDownloadCompleteNoti = @"mixDownloadCompleteNoti";
 //    NSString *md5FielName = [[url lastPathComponent] stringByDeletingPathExtension];
 //    // 获取后缀名
 //    NSArray *subString = [[url lastPathComponent] componentsSeparatedByString:@"."];
-//    // 拼接后缀名
-    self.fileName = [url lastPathComponent];
+    
+    // 拼接后缀名
+    NSString *urlFileName = [url lastPathComponent];
+    NSString * decodeUrlFileName= [urlFileName stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    self.fileName = decodeUrlFileName;
     
     // 创建文件储存路径
     if (![[NSFileManager defaultManager] fileExistsAtPath:[mixDownloadCacheManager getFullDirector]]) {

+ 8 - 8
创维盒子/双子星云手机/Class/Set/uploadFile/receiveView/boxDownloadFileRecordCell.m

@@ -10,7 +10,7 @@
 #import "cachesFileManager.h"
 #import <SDWebImage/SDWebImage.h>
 #import "downloadThumbnailManager.h"
-
+#import "mixDownloadManager.h"
 
 @interface boxDownloadFileRecordCell ()
 @property(nonatomic,strong) UIImageView *fileImageView;
@@ -35,7 +35,7 @@
     
     if (self)
     {
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadTaskDownloadingNoti:) name:kDownloadTaskDownloadingNoti object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadTaskDownloadingNoti:) name:mixDownloadTaskExeing object:nil];
         [self drawView];
     }
     
@@ -628,14 +628,14 @@
 //#pragma mark 下载通知
 - (void)downloadTaskDownloadingNoti:(NSNotification *)notification
 {
-    YCDownloadItem *item = notification.object;
-    if(!item)return;
+    mixDownloadOperation *model = notification.userInfo.allValues.firstObject;
+    if(!model)return;
     
-    if (item.downloadStatus != YCDownloadStatusDownloading) {
+    if (model.downloadState != DownloadStateDoing) {
         return;
     }
     mainBlock(^{
-        [self downloadItem:item downloadedSize:item.downloadedSize totalSize:item.fileSize];
+        [self downloadItem:model downloadedSize:model.currentSize totalSize:model.totalSize];
     });
 }
 
@@ -644,10 +644,10 @@
     //[self setDownloadStatus:item.downloadStatus];
 }
 
-- (void)downloadItem:(YCDownloadItem *)item downloadedSize:(int64_t)downloadedSize totalSize:(int64_t)totalSize {
+- (void)downloadItem:(mixDownloadOperation *)model downloadedSize:(int64_t)downloadedSize totalSize:(int64_t)totalSize {
     
     //解码
-    NSString * urlString = [item.downloadURL stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString * urlString = [model.url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     HLog(@"下载中:%lld --- %lld \n%@\n%@",downloadedSize,totalSize,urlString,_curShareFileDataModel.fileUrl);
     
     if(_curShareFileDataModel

+ 11 - 11
创维盒子/双子星云手机/Class/Set/uploadFile/receiveView/receiveDownloadRecordTableView.m

@@ -11,6 +11,7 @@
 #import "UIScrollView+EmptyDataSet.h"
 #import "uploadFileRecordTableViewHeadView.h"
 #import <YCDownloadSession.h>
+#import "mixDownloadManager.h"
 
 @interface receiveDownloadRecordTableView()<UITableViewDataSource,UITableViewDelegate,DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
 {
@@ -700,19 +701,18 @@
 #pragma mark 下载完成
 - (void)downloadTaskFinishedNoti:(NSNotification *)notification
 {
-   
-    YCDownloadItem *item = notification.object;
+    mixDownloadOperation *model = notification.object;
     KWeakSelf
-    if (item.downloadStatus == YCDownloadStatusFinished) {
+    if (model.downloadState == DownloadStateCompleted) {
         HLog(@"下载完成");
         mainBlock(^{
-            [weakSelf handldDownloadDoneDataBy:item];
+            [weakSelf handldDownloadDoneDataBy:model];
         });
     }
-    else if (item.downloadStatus == YCDownloadStatusFailed){
+    else if (model.downloadState == DownloadStateFailed){
         HLog(@"下载失败");
         mainBlock(^{
-            [weakSelf handldDownloadFailDataBy:item];
+            [weakSelf handldDownloadFailDataBy:model];
         });
     }
 }
@@ -843,15 +843,15 @@
 }
 
 #pragma mark 下载失败数据回调处理
-- (void)handldDownloadFailDataBy:(YCDownloadItem*)item
+- (void)handldDownloadFailDataBy:(mixDownloadOperation*)model
 {
-    NSString * urlString = [item.downloadURL stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString * urlString = [model.url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     for (ShareFileDataModel*dataModel in _downloadingArr) {
        
         //HLog(@"22222222 %@\n%@",urlString,dataModel.fileUrl);
         if([urlString isEqualToString:dataModel.fileUrl]){
             //dataModel.totalSize = model.totalSize;
-            dataModel.currentSize = item.downloadedSize;
+            dataModel.currentSize = model.currentSize;
             dataModel.downloadBoxStateType = downloadBoxStateFail;
             
             [_downloadfailArr insertObject:dataModel atIndex:0];
@@ -864,10 +864,10 @@
 }
 
 #pragma mark 下载完成数据回调处理
-- (void)handldDownloadDoneDataBy:(YCDownloadItem*)item
+- (void)handldDownloadDoneDataBy:(mixDownloadOperation*)model
 {
     //解码
-    NSString * urlString = [item.downloadURL stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString * urlString = [model.url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 
     for (ShareFileDataModel*dataModel in _downloadingArr) {
         HLog(@"22222222 %@\n%@",urlString,dataModel.fileUrl);

+ 3 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/boxDownloadFileManager.h

@@ -9,6 +9,9 @@
 #import "queryOneShareModel.h"
 #import "uploadFileManager.h"
 #import <YCDownloadSession.h>
+
+#import "mixDownloadManager.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 

+ 22 - 15
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/boxDownloadFileManager.m

@@ -28,7 +28,8 @@ static boxDownloadFileManager * cur_boxDownloadFileShareInstance = nil;
     if (self) {
         //[self initManager];
         //某一个YCDownloadItem下载成功通知
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadTaskFinishedNoti:) name:kDownloadTaskFinishedNoti object:nil];
+        //[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadTaskFinishedNoti:) name:mixDownloadTaskExeEnd object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadTaskFinishedNoti:) name:mixDownloadTaskExeEnd object:nil];
      
         [self initDownloadManagerFun];
     }
@@ -329,9 +330,15 @@ static boxDownloadFileManager * cur_boxDownloadFileShareInstance = nil;
             NSString *urlString = fileModel.fileUrl;
             NSString *requestURLEncodedString = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 
-            YCDownloadItem*item = [YCDownloadItem itemWithUrl:requestURLEncodedString fileId:fileModel.fileName];
-            //item.extraData = [VideoListInfoModel dateWithInfoModel:model];
-            [YCDownloadManager startDownloadWithItem:item];
+//            YCDownloadItem*item = [YCDownloadItem itemWithUrl:requestURLEncodedString fileId:fileModel.fileName];
+//            //item.extraData = [VideoListInfoModel dateWithInfoModel:model];
+//            [YCDownloadManager startDownloadWithItem:item];
+            
+            [mixDownloadManager shareManager].uid = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.sn;
+            
+            [[mixDownloadManager shareManager] downloadWithURL:[NSURL URLWithString:requestURLEncodedString] complete:^(NSDictionary * _Nonnull respose, NSError * _Nonnull error) {
+                HLog(@"download:%@",respose);
+            }];
         }
     }
 }
@@ -339,29 +346,29 @@ static boxDownloadFileManager * cur_boxDownloadFileShareInstance = nil;
 #pragma mark 下载完成
 - (void)downloadTaskFinishedNoti:(NSNotification *)notification
 {
-    YCDownloadItem *item = notification.object;
+    mixDownloadOperation *model = notification.userInfo.allValues.firstObject;
     
-    if(!item)return;
+    if(!model)return;
     
-    if (item.downloadStatus == YCDownloadStatusFinished) {
-        [self handldDownloadDoneDataBy:item];
+    if (model.downloadState == DownloadStateCompleted) {
+        [self handldDownloadDoneDataBy:model];
     }
-    else if (item.downloadStatus == YCDownloadStatusFailed){
-        [self handldDownloadFailDataBy:item];
+    else if (model.downloadState == DownloadStateFailed){
+        [self handldDownloadFailDataBy:model];
     }
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [[NSNotificationCenter defaultCenter] postNotificationName:nasDownloadTaskFinishedNotification object:item];
+        [[NSNotificationCenter defaultCenter] postNotificationName:nasDownloadTaskFinishedNotification object:model];
     });
 }
 
 
 
 #pragma mark 下载完成数据回调处理
-- (void)handldDownloadDoneDataBy:(YCDownloadItem*)item
+- (void)handldDownloadDoneDataBy:(mixDownloadOperation*)model
 {
     //解码
-    NSString * urlString = [item.downloadURL stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString * urlString = [model.url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 
     if(_databaseArr && _databaseArr.count == 3 ){
         NSMutableArray *ingArr = _databaseArr[0];
@@ -390,10 +397,10 @@ static boxDownloadFileManager * cur_boxDownloadFileShareInstance = nil;
 
 
 #pragma mark 下载失败数据回调处理
-- (void)handldDownloadFailDataBy:(YCDownloadItem*)item
+- (void)handldDownloadFailDataBy:(mixDownloadOperation*)model
 {
     //解码
-    NSString * urlString = [item.downloadURL stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString * urlString = [model.url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
 
     if(_databaseArr && _databaseArr.count == 3 ){
         NSMutableArray *ingArr = _databaseArr[0];

+ 58 - 40
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+downloadNasFile.m

@@ -11,53 +11,72 @@
 #pragma mark 下载完成
 - (void)downloadTaskFinishedNoti:(NSNotification *)notification
 {
-    curYCDownloadItem = notification.object;
+    curDownloadmodel = notification.object;
     KWeakSelf
-    if (curYCDownloadItem.downloadStatus == YCDownloadStatusFinished) {
+    if (curDownloadmodel.downloadState == DownloadStateCompleted) {
         mainBlock(^{
-            [weakSelf handldDownloadDoneToSaveBy:self->curYCDownloadItem];
+            [weakSelf handldDownloadDoneToSaveBy:self->curDownloadmodel];
         });
     }
 }
 
 #pragma mark 下载完后处理保持流程
-- (void)handldDownloadDoneToSaveBy:(YCDownloadItem*)item{
+- (void)handldDownloadDoneToSaveBy:(mixDownloadOperation*)model{
     //解码
-    NSString * urlString = [item.downloadURL stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString * urlString = [model.url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     NSArray *nameArr= [urlString componentsSeparatedByString:@"."];
-    NSString * pathStr= item.savePath;
+    NSString * pathStr= model.fullPath;
+    NSString * decodePathStr= [pathStr stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     
-    NSString *addFileName = @"";
-    if (![item.downloadURL containsString:@".quicktime"]
-        && [pathStr containsString:@".quicktime"])
-    {
-        addFileName = @".quicktime";
-    }
-    else if (![item.downloadURL containsString:@".octet-stream"]
-             && [pathStr containsString:@".octet-stream"])
-     {
-         addFileName = @".octet-stream";
-     }
+    HLog(@"%@\n%@\n%@",urlString,pathStr,[pathStr stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding])
     
-    if(addFileName.length >0)
-    {
-        //文件名被添加了 .quicktime
-        
+    if(![pathStr isEqualToString:decodePathStr]){
+        // 尝试移动(即重命名)文件
         NSError *error = nil;
         NSFileManager *fileManager = [NSFileManager defaultManager];
-        // 新文件名路径
-        NSString *newFilePath = [pathStr stringByReplacingOccurrencesOfString:addFileName withString:@""];
-        // 尝试移动(即重命名)文件
-        BOOL success = [fileManager moveItemAtPath:pathStr toPath:newFilePath error:&error];
-          
+        BOOL success = [fileManager moveItemAtPath:pathStr toPath:decodePathStr error:&error];
+
         if (success) {
-            pathStr = newFilePath;
             NSLog(@"文件重命名成功!");
         } else {
             NSLog(@"文件重命名失败: %@", error);
         }
+        
+        pathStr = decodePathStr;
     }
     
+    
+//    NSString *addFileName = @"";
+//    if (![item.downloadURL containsString:@".quicktime"]
+//        && [pathStr containsString:@".quicktime"])
+//    {
+//        addFileName = @".quicktime";
+//    }
+//    else if (![item.downloadURL containsString:@".octet-stream"]
+//             && [pathStr containsString:@".octet-stream"])
+//     {
+//         addFileName = @".octet-stream";
+//     }
+//    
+//    if(addFileName.length >0)
+//    {
+//        //文件名被添加了 .quicktime
+//        
+//        NSError *error = nil;
+//        NSFileManager *fileManager = [NSFileManager defaultManager];
+//        // 新文件名路径
+//        NSString *newFilePath = [pathStr stringByReplacingOccurrencesOfString:addFileName withString:@""];
+//        // 尝试移动(即重命名)文件
+//        BOOL success = [fileManager moveItemAtPath:pathStr toPath:newFilePath error:&error];
+//          
+//        if (success) {
+//            pathStr = newFilePath;
+//            NSLog(@"文件重命名成功!");
+//        } else {
+//            NSLog(@"文件重命名失败: %@", error);
+//        }
+//    }
+    
     HLog(@"%@,",pathStr);
     if (nameArr.count >= 2) {
         NSString *lastName = nameArr.lastObject;
@@ -95,10 +114,10 @@
              HLog(@"已将图片保存至相册");
              //
              [[NSFileManager defaultManager] removeItemAtPath:fullPath error:nil];
-             if(self->curYCDownloadItem){
-                 [YCDownloadManager stopDownloadWithItem:self->curYCDownloadItem];
-                 self->curYCDownloadItem = nil;
-             }
+//             if(self->curYCDownloadItem){
+//                 [YCDownloadManager stopDownloadWithItem:self->curYCDownloadItem];
+//                 self->curYCDownloadItem = nil;
+//             }
              
          } else {
              HLog(@"未能将图片保存至相册");
@@ -123,10 +142,10 @@
             HLog(@"已将视频保存至相册");
             //
             [[NSFileManager defaultManager] removeItemAtPath:pathStr error:nil];
-            if(self->curYCDownloadItem){
-                [YCDownloadManager stopDownloadWithItem:self->curYCDownloadItem];
-                self->curYCDownloadItem = nil;
-            }
+//            if(self->curYCDownloadItem){
+//                [YCDownloadManager stopDownloadWithItem:self->curYCDownloadItem];
+//                self->curYCDownloadItem = nil;
+//            }
         } else {
             HLog(@"未能将视频保存至相册");
             mainBlock(^{
@@ -141,7 +160,6 @@
 //下载音频 文件等
 - (void)loadOtherDataFinishedBy:(NSString*)fullPath
 {
-    
     NSString*filePath = fullPath;
     
     if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]){
@@ -184,10 +202,10 @@
                 
                 //
                 [[NSFileManager defaultManager] removeItemAtPath:pathStr error:nil];
-                if(self->curYCDownloadItem){
-                    [YCDownloadManager stopDownloadWithItem:self->curYCDownloadItem];
-                    self->curYCDownloadItem = nil;
-                }
+//                if(self->curYCDownloadItem){
+//                    [YCDownloadManager stopDownloadWithItem:self->curYCDownloadItem];
+//                    self->curYCDownloadItem = nil;
+//                }
                 
             }
         }];

+ 3 - 1
创维盒子/双子星云手机/CloudPlayer/PlayerViewController.h

@@ -31,6 +31,7 @@
 #import "addLogObject.h"
 #import "ComontAlretType2ViewController.h"
 #import <YCDownloadSession.h>
+#import "mixDownloadManager.h"
 
 @protocol PlayerViewControllerDelegate <NSObject>
 
@@ -69,7 +70,8 @@
     ComontAlretViewController *logoutAlertVC;
     
     //下载nas相关
-    YCDownloadItem *curYCDownloadItem;
+    //YCDownloadItem *curYCDownloadItem;
+    mixDownloadOperation* curDownloadmodel;
 }
 
 @property(copy,nonatomic)NSString * _Nullable internetVideoPort;