Merge branch 'master' of https://git.yishihui.com/iOS/BFFramework

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointEditerController.swift

@@ -1122,7 +1122,11 @@ class PQStuckPointEditerController: PQBaseViewController {
 
         let beginTime = Date()
         dealParameter(model: currentCreateStickersModel)
-
+        if finallyStuckPoints.count < 2 {
+            cShowHUB(superView: nil, msg: "音乐出错，请重新选择音乐")
+            self.navigationController?.popViewController(animated: true)
+            return
+        }
         // 更新裁剪时间条的的ui数据
         stuckPointCuttingView.videoDuration = max(CGFloat(finallyUserAudioTime), CGFloat(finallyStuckPoints.last!))
         let counn = (stuckPointMusicData?.rhythmSdata[0].pointTimes.count)! - 2

BFFramework/Classes/Stuckpoint/Controller/PQStuckPointPublicController.swift

@@ -1486,9 +1486,9 @@ extension PQStuckPointPublicController {
 //        emptyRemindView.isHidden = true
         emptyRemindView.emptyData = emptyData
         emptyRemindView.backgroundColor = PQBFConfig.shared.styleBackGroundColor
-        emptyRemindView.fullRefreshBloc = {[weak self] _, _ in
-            if emptyRemindView.refreshBtn.currentAttributedTitle?.string == "立即重试" {
-                emptyRemindView.isHidden = true
+        emptyRemindView.fullRefreshBloc = {[weak self, weak emptyRemindView] _, _ in
+            if emptyRemindView?.refreshBtn.currentAttributedTitle?.string == "立即重试" {
+                emptyRemindView?.isHidden = true
                 // 重试逻辑
                 if let message = msg{
                     if message.contains("token") {