|
@@ -97,7 +97,7 @@ extension PublishUploadManager: AlivcShortVideoUploadManagerDelegate {
|
|
|
|
|
|
// 上传进度回调
|
|
|
func uploadManager(_ manager: AlivcShortVideoUploadManager!, updateProgress progress: CGFloat) {
|
|
|
- print("\n--------uploadProgress == \(progress)")
|
|
|
+ NXLLog("\n--------uploadProgress == \(progress)")
|
|
|
|
|
|
DispatchQueue.main.async(execute: {
|
|
|
// self.progressView.progress = Float(progress)
|
|
@@ -129,7 +129,7 @@ extension PublishUploadManager: AlivcShortVideoUploadManagerDelegate {
|
|
|
// 设置主图
|
|
|
self?.majorImageUrl = imgUrl as? String
|
|
|
|
|
|
- print("------视频上传成功,去发布")
|
|
|
+ NXLLog("------视频上传成功,去发布")
|
|
|
self?.progressView?.curUploadStatus = .success
|
|
|
self?.communityPublishApi()
|
|
|
}
|
|
@@ -143,6 +143,8 @@ extension PublishUploadManager {
|
|
|
// 设置图片上传参数
|
|
|
func setImagesPath(_ imageArr: Array<UIImage>) {
|
|
|
self.imageArr = imageArr
|
|
|
+ // 新发布时置空管理类内部的imageUrl数组
|
|
|
+ self.imageUrlArray = []
|
|
|
}
|
|
|
|
|
|
// 上传图片
|
|
@@ -151,7 +153,7 @@ extension PublishUploadManager {
|
|
|
|
|
|
var curTimes: Int = totalTimes
|
|
|
|
|
|
- print("-----StartUpload,totalTimes == \(totalTimes)")
|
|
|
+ NXLLog("-----StartUpload,totalTimes == \(totalTimes)")
|
|
|
SwiftMoyaNetWorkServiceConfig.shared().configUploadSingleImgWithoutHudApi(imageArray: [self.imageArr![totalTimes]]) {
|
|
|
[weak self] (imgUrl) -> (Void) in
|
|
|
let urlStr: String = imgUrl as! String
|
|
@@ -167,12 +169,12 @@ extension PublishUploadManager {
|
|
|
self?.majorImageUrl = urlStr
|
|
|
}
|
|
|
|
|
|
- print("-----FinishUpload,Times == \(curTimes)")
|
|
|
+ NXLLog("-----FinishUpload,Times == \(curTimes)")
|
|
|
curTimes += 1
|
|
|
// 更新进度
|
|
|
DispatchQueue.main.async {
|
|
|
- print("----\(Thread.current)")
|
|
|
- print("----uploadProgress == \(Float(curTimes)/Float((self?.imageArr!.count)!))")
|
|
|
+ NXLLog("----\(Thread.current)")
|
|
|
+ NXLLog("----uploadProgress == \(Float(curTimes)/Float((self?.imageArr!.count)!))")
|
|
|
|
|
|
self?.progressView?.uploadProgress = Float(curTimes/(self?.imageArr!.count)!)
|
|
|
|
|
@@ -181,7 +183,7 @@ extension PublishUploadManager {
|
|
|
if curTimes < self?.imageArr?.count ?? 0 {
|
|
|
self?.uploadAllImages(totalTimes: curTimes)
|
|
|
} else {
|
|
|
- print("------图片上传成功,去发布")
|
|
|
+ NXLLog("------图片上传成功,去发布")
|
|
|
self?.progressView?.curUploadStatus = .success
|
|
|
self?.communityPublishApi()
|
|
|
}
|
|
@@ -213,7 +215,7 @@ extension PublishUploadManager {
|
|
|
let topicJsonStr = JSON(selTopicIdArr).description
|
|
|
let imgsJsonStr = JSON(imageUrlArray).description
|
|
|
|
|
|
- print("----mediaType == \(typeStr)\n----pubTitle = \(pubTitle)\n----topicJsonStr == \(topicJsonStr)\n----imgsJsonStr == \(imgsJsonStr)")
|
|
|
+ NXLLog("----mediaType == \(typeStr)\n----pubTitle = \(pubTitle)\n----topicJsonStr == \(topicJsonStr)\n----imgsJsonStr == \(imgsJsonStr)")
|
|
|
|
|
|
SwiftMoyaNetWorkServiceCommunity.shared().communityPublishApi(type: typeStr, img: majorImageUrl ?? "", topic_ids: topicJsonStr, video: paraVideo, title: pubTitle, content: pubContent, location: locationStr, imgs: imgsJsonStr) {
|
|
|
[weak self] (communityPublishModel) -> (Void) in
|