| 
					
				 | 
			
			
				@@ -89,6 +89,8 @@ class PQStuckPointPublicController: PQBaseViewController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private var endMovieLocalURL: URL? 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 保存相册的合成视频地址 水印+片尾 MP4 地址 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private var saveMovieLocalURL: URL? 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    private var isSaveingLocalVideo = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //---------------------------- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -956,7 +958,7 @@ extension PQStuckPointPublicController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             /// fp2-1-2 - 保存视频到相册 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             saveStuckPointVideo() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//            cShowHUB(superView: nil, msg: "您尚未打开相册权限,请到设置页打开相册权限") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cShowHUB(superView: nil, msg: "您尚未打开相册权限,请到设置页打开相册权限") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -967,6 +969,7 @@ extension PQStuckPointPublicController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				          
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if(saveMovieLocalURL == nil){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             BFLog(message: "保存相册的视频导出地址无效!!!") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cShowHUB(superView: nil, msg: "保存相册的视频导出地址无效") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             saveVideoTipsLabel.text = "视频保存失败" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             saveRetryBtn.isHidden = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             saveVideoTipsBgView.isHidden = false 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -979,8 +982,10 @@ extension PQStuckPointPublicController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if authStatus == .authorized { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             let photoLibrary = PHPhotoLibrary.shared() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             photoLibrary.performChanges({ [weak self] in 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                self?.isSaveingLocalVideo = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 PHAssetChangeRequest.creationRequestForAssetFromVideo(atFileURL: (self?.saveMovieLocalURL)!) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }) { [weak self] isFinished, _ in 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                self?.isSaveingLocalVideo = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 DispatchQueue.main.async { [weak self] in 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     if self?.view != nil { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         if isFinished { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1003,7 +1008,7 @@ extension PQStuckPointPublicController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-//                cShowHUB(superView: nil, msg: "您尚未打开相册权限,请到设置页打开相册权限") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            cShowHUB(superView: nil, msg: "您尚未打开相册权限,请到设置页打开相册权限") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1321,9 +1326,8 @@ extension PQStuckPointPublicController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             bottomOprationBgView.isHidden = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //add by ak 发布成功后如果带片尾的视频还没有生成成功时,出提示 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            saveVideoTipsBgView.isHidden = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             self.saveRetryBtn.isHidden = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if(saveMovieLocalURL == nil){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(saveMovieLocalURL == nil && self.isSaveingLocalVideo){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 saveVideoTipsLabel.text = "视频保存中..." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 self.saveVideoTipsLabel.text = "视频已保存到相册" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1331,6 +1335,9 @@ extension PQStuckPointPublicController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     self?.saveVideoTipsBgView.isHidden = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if self.isSaveingLocalVideo{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                saveVideoTipsBgView.isHidden = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				              
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1444,9 +1451,10 @@ extension PQStuckPointPublicController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // 发送通知 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             postNotification(name: cFinishedPublishedNotiKey) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         case 97: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // 视频保存重试 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             saveRetryBtn.isHidden = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             saveVideoTipsLabel.text = "视频保存中..." 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            self.saveStuckPointVideo() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            saveStuckPointVideo() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         default: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             break 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 |