no message

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/Controller/AliyunEditViewController.m

@@ -1149,7 +1149,7 @@ AliyunIExporterCallback, AliyunIPlayerCallback, AliyunMusicPickViewControllerDel
 //    [self.navigationController pushViewController:vc animated:YES];
     
 //    self.volumnView = [PublishMusicVolumnView publishMusicVolumnView];
-    self.musicView = [PublishMusicChooseView publishMusicChooseView];
+    self.musicView = [PublishMusicChooseView publishMusicChooseViewWithAttachedView:self.view];
     
 }
 

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishMusicChooseView.swift

@@ -145,8 +145,9 @@ class PublishMusicChooseView: FWPopupView {
     
     
     /// 初始化View
-    @objc class func publishMusicChooseView() -> PublishMusicChooseView {
+    @objc class func publishMusicChooseView(attachedView:UIView) -> PublishMusicChooseView {
         let view = PublishMusicChooseView()
+        view.attachedView = attachedView
         let vProperty = FWPopupViewProperty()
         vProperty.popupCustomAlignment = .bottomCenter
         vProperty.popupViewEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 0)
@@ -165,7 +166,7 @@ class PublishMusicChooseView: FWPopupView {
         
         view.recommendButton.rx.tap.subscribe(onNext: {
             [weak view] (data) in
-            view?.hide()
+//            view?.hide()
             Mediator.push(PublishRouterModuleType.push)
             
         }).disposed(by: view.disposeBag)

RainbowPlanet/RainbowPlanet/Modules/PublishModule/PublishMusicAbout/PublishRecommendMusicController.swift

@@ -33,6 +33,15 @@ class PublishRecommendMusicController: BaseViewController {
             [weak self] in
             print("----点击了-提交")
             
+            let name = self?.nameTextView.text
+            let url  = self?.linkTextView.text
+            
+            if name == nil || name == "" {
+                SwiftProgressHUD.shared().showText("请填写歌曲名称")
+                return
+            }
+            
+            self?.communityUploadMusicApi(name!, url ?? "")
         }
         
         view.addSubview(cardBackView)
@@ -111,6 +120,7 @@ class PublishRecommendMusicController: BaseViewController {
     
 }
 
+// MARK: -
 extension PublishRecommendMusicController: UITextViewDelegate {
     func textViewDidChange(_ textView: UITextView) {
         if textView == nameTextView {
@@ -129,3 +139,16 @@ extension PublishRecommendMusicController: UITextViewDelegate {
     }
     
 }
+
+extension PublishRecommendMusicController {
+    /// 用户上传音乐
+    func communityUploadMusicApi(_ name: String, _ url: String) {
+        let userName = UserModel.shared().getModel()?.username ?? ""
+        let uid = UserModel.shared().getModel()?.uid ?? 0
+        
+        SwiftMoyaNetWorkServiceCommunity.shared().communityUploadMusicApi(name: name, username: userName, url: url, uid: uid) { (data) -> (Void) in
+            print("------data == \(data)")
+        }
+        
+    }
+}

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCommunity/SwiftMoyaNetWorkServiceCommunity.swift

@@ -182,6 +182,34 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         }
     }
     
+    /// 用户上传音乐
+    ///
+    /// - Parameters:
+    ///   - postId: 内容id
+    ///   - page: 分页
+    ///   - completion: 回调
+    func communityUploadMusicApi(name:String = "", username:String = "", url:String = "", uid:Int = 0, completion: @escaping apiCallBack) {
+        var parameters = Dictionary<String,Any>()
+        parameters.updateValue(name, forKey: "name")
+        parameters.updateValue(username, forKey: "username")
+        parameters.updateValue(url, forKey: "url")
+        parameters.updateValue(uid, forKey: "uid")
+        SwiftProgressHUD.shared().showWait()
+        
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceCommunityApi.communityUploadMusic(parameters: parameters))) { (rootModel) in
+            SwiftProgressHUD.shared().showText(rootModel.msg!)
+            if rootModel.code == 0 {                
+                completion("")
+            }
+        }
+        
+        
+//        SwiftMoyaNetWorkManager.shared.requestObject(CommunityPostCommentsModel.self,target: MultiTarget(SwiftMoyaServiceCommunityApi.communityPostComments(parameters: parameters))) {  (communityPostCommentsModel) in
+//            SwiftProgressHUD.shared().hide()
+//            completion(communityPostCommentsModel)
+//        }
+    }
+    
     // MARK: - 多关注页面feed流
     /// 多关注页面feed流
     ///

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCommunity/SwiftMoyaServiceCommunityApi.swift

@@ -85,6 +85,22 @@ public let kCommunityPostReplyApi = "/community/post/reply"
 ///// 评论&回复
 public let kCommunityPostCommentApi = "/community/post/comment"
 
+//// MARK: - 用户上传音乐
+///// 用户上传音乐
+public let kCommunityUploadMusicApi = "/community/music/upload"
+
+//// MARK: - 热门推荐音乐列表
+///// 热门推荐音乐列表
+public let kCommunityRecMusicListApi = "/community/musicList"
+
+//// MARK: - 获取音乐分类
+///// 获取音乐分类
+public let kCommunityGetMusicCategoryApi = "/community/category/list"
+
+//// MARK: - 获取分类下所有音乐
+///// 获取分类下所有音乐
+public let kCommunityCateMusicListApi = "/community/music"
+
 /// 社区
 ///
 /// - communityTopicCategory: 话题组列表
@@ -106,6 +122,7 @@ public let kCommunityPostCommentApi = "/community/post/comment"
 /// - communityPostComments : 评论列表
 /// - communityPostReply : 回复列表
 /// - communityPostComment : 评论&回复
+/// - communityUploadMusic : 用户上传音乐
 
 public enum SwiftMoyaServiceCommunityApi {
     case communityTopicCategory(parameters:Dictionary<String, Any>)
@@ -127,6 +144,7 @@ public enum SwiftMoyaServiceCommunityApi {
     case communityPostComments(parameters:Dictionary<String, Any>)
     case communityPostReply(parameters:Dictionary<String, Any>)
     case communityPostComment(parameters:Dictionary<String, Any>)
+    case communityUploadMusic(parameters:Dictionary<String, Any>)
 }
 
 extension SwiftMoyaServiceCommunityApi: TargetType {
@@ -151,7 +169,8 @@ extension SwiftMoyaServiceCommunityApi: TargetType {
              .communityPostDetail,
              .communityPostComments,
              .communityPostReply,
-             .communityPostComment
+             .communityPostComment,
+             .communityUploadMusic
             :
             return URL(string: kApiDataPrefix())!
         }
@@ -197,6 +216,8 @@ extension SwiftMoyaServiceCommunityApi: TargetType {
             return kCommunityPostReplyApi
         case .communityPostComment:
             return kCommunityPostCommentApi
+        case .communityUploadMusic:
+            return kCommunityUploadMusicApi
         }
     }
     
@@ -205,7 +226,8 @@ extension SwiftMoyaServiceCommunityApi: TargetType {
         case .communityMemberFollowTopic,
              .communityPublish,
              .communityMemberFollowTopicFollow,
-             .communityPostComment
+             .communityPostComment,
+             .communityUploadMusic
             :
             return .post
         case .communityTopicCategory,
@@ -252,7 +274,8 @@ extension SwiftMoyaServiceCommunityApi: TargetType {
              .communityPostDetail(var parameters),
              .communityPostComments(var parameters),
              .communityPostReply(var parameters),
-             .communityPostComment(var parameters)
+             .communityPostComment(var parameters),
+             .communityUploadMusic(var parameters)
             :
             let sign = SwiftSign.shared().sign(signType:.AccessToken, parameters: parameters)
             parameters.updateValue(sign, forKey: "sign")
@@ -293,7 +316,8 @@ extension SwiftMoyaServiceCommunityApi: TargetType {
              .communityPostDetail,
              .communityPostComments,
              .communityPostReply,
-             .communityPostComment
+             .communityPostComment,
+             .communityUploadMusic
             :
             return (headerParameters(headerType: .tokenHeader) as! [String : String])
         }