合并bfframework 接口变化

MusicVideoPlus.xcodeproj/project.pbxproj

@@ -174,28 +174,11 @@
 			isa = PBXGroup;
 			children = (
 				2D1EC136266B4F3300CBACE4 /* Utils */,
-				41CA6E3A266782C900874B19 /* Vendors */,
-				41CA6E3B266782C900874B19 /* Enums */,
 				41CA6E3D266782C900874B19 /* Modules */,
-				41CA6E5C266782C900874B19 /* Categorys */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
 		};
-		41CA6E3A266782C900874B19 /* Vendors */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Vendors;
-			sourceTree = "<group>";
-		};
-		41CA6E3B266782C900874B19 /* Enums */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Enums;
-			sourceTree = "<group>";
-		};
 		41CA6E3D266782C900874B19 /* Modules */ = {
 			isa = PBXGroup;
 			children = (
@@ -438,13 +421,6 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
-		41CA6E5C266782C900874B19 /* Categorys */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Categorys;
-			sourceTree = "<group>";
-		};
 		6308E2A5050F07FDED653CB8 /* Pods */ = {
 			isa = PBXGroup;
 			children = (

MusicVideoPlus.xcworkspace/contents.xcworkspacedata

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:MusicVideoPlus.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
-</Workspace>

MusicVideoPlus.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

MusicVideoPlus/Classes/Modules/Base/Controllers/MVBaseController.swift

@@ -24,9 +24,9 @@ public class MVBaseController: UIViewController, UIGestureRecognizerDelegate {
 
     public lazy var manager: NetworkReachabilityManager? = {
         let manager = NetworkReachabilityManager(host: "www.baidu.com")
-        manager?.listener = { status in
-            if status == .reachable(.wwan) || status == .reachable(.ethernetOrWiFi) {}
-        }
+//        manager?.startListening(onUpdatePerforming: { status in
+//            if status == .reachable(.cellular) || status == .reachable(.ethernetOrWiFi) {}
+//        })
         return manager
     }()
 

MusicVideoPlus/Classes/Modules/Home/Controllers/MVHomeController.swift

@@ -231,9 +231,8 @@ class MVHomeController: MVBaseController {
         // 请求用户状态
         getUserInfo()
         // 网络监听有网后取一次数据
-        manager?.startListening()
-        manager?.listener = { [weak self] status in
-            if status == .reachable(.wwan) || status == .reachable(.ethernetOrWiFi) {
+        manager?.startListening(onUpdatePerforming: { [weak self] status in
+            if status == .reachable(.cellular) || status == .reachable(.ethernetOrWiFi) {
                 BFLog(message: "来网了")
                 self?.showNetworkError(isHidden: true)
 
@@ -655,7 +654,7 @@ extension MVHomeController: MVBannerDataSource, MVBannerDelegate {
     }
 
     func pageControl(currentPage page: Int) {
-        BFLog(message: "page is \(page)")
+        BFLog(1, message: "page is \(page)")
         playVideo(page: page)
     }
 }

MusicVideoPlus/Classes/Modules/Home/ViewModels/MVHomeViewModel.swift

@@ -29,7 +29,7 @@ class MVHomeViewModel: NSObject {
         
         var url: String = PQENVUtil.shared.longvideoapi
         url = url + "rhythmapp/homepage/getAllVideos"
-        SWNetRequest.postRequestData(url: url, parames: nil) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: url, parames: nil, commonParams: commonParams()) { response, _, error, _ in
             DispatchQueue.global().async {
                 
                 let end: TimeInterval = Date().timeIntervalSince1970

MusicVideoPlus/Classes/Modules/Login/ViewModels/PQMineViewModel.swift

@@ -26,7 +26,7 @@ class PQMineViewModel: NSObject {
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     class func wechatLogin(unionid: String, openId: String, nickName: String, avatarUrl: String, completeHander: @escaping completeHander) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + login, parames: ["unionid": unionid, "openId": openId, "nickName": nickName, "avatarUrl": avatarUrl]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + login, parames: ["unionid": unionid, "openId": openId, "nickName": nickName, "avatarUrl": avatarUrl], commonParams: commonParams()) { response, _, error, _ in
             if error == nil {
                 let userInfo: [String: Any] = response as! [String: Any]
                 // 处理用户登录信息
@@ -54,7 +54,7 @@ class PQMineViewModel: NSObject {
         } else {
             url = PQENVUtil.shared.longvideoapi + phoneRegisterUrl
         }
-        SWNetRequest.postRequestData(url: url, parames: ["account": phone, "passwd": password]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: url, parames: ["account": phone, "passwd": password], commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)
           
@@ -76,7 +76,7 @@ class PQMineViewModel: NSObject {
     /// 退出登录
     /// - Returns: description
    public class func quitLogin(completeHander: @escaping completeHander) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + logoutUrl, parames: nil) { _, _, _, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + logoutUrl, parames: nil) { _, _, _, _ in
             // 取消别名绑定
 
             BFLoginUserInfo.shared.resetData(isClear: true)
@@ -90,7 +90,7 @@ class PQMineViewModel: NSObject {
     ///   - token: token
     /// - Returns: <#description#>b
     class func appleLogin(token: String, completeHander: @escaping completeHander) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + appleLoginUrl, parames: ["token": token]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + appleLoginUrl, parames: ["token": token], commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)
                 return
@@ -128,7 +128,7 @@ class PQMineViewModel: NSObject {
             completeHander(nil, "未登录")
             return
         }
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + userStatusUrl, parames: nil) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + userStatusUrl, parames: nil, commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(nil, error?.msg)
                 return
@@ -148,7 +148,7 @@ class PQMineViewModel: NSObject {
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     class func sendIndetifyCode(phoneNumber: String, completeHander: @escaping (_ isSuccess: Bool, _ msg: String?, _ codeId: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + sendIndetifyCodeUrl, parames: ["uid": BFLoginUserInfo.shared.uid, "phoneNumber": phoneNumber]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + sendIndetifyCodeUrl, parames: ["uid": BFLoginUserInfo.shared.uid, "phoneNumber": phoneNumber], commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(false, error?.msg, nil)
                 return
@@ -170,7 +170,7 @@ class PQMineViewModel: NSObject {
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     class func checkIndetifyCode(phoneNumber _: String, codeId: String, indetifyCode: String, completeHander: @escaping (_ isSuccess: Bool, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + checkIndetifyCodeUrl, parames: ["uid": BFLoginUserInfo.shared.uid, "indetifyCode": indetifyCode, "codeId": codeId]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + checkIndetifyCodeUrl, parames: ["uid": BFLoginUserInfo.shared.uid, "indetifyCode": indetifyCode, "codeId": codeId], commonParams: commonParams()) { response, _, error, _ in
             if error != nil {
                 completeHander(false, error?.msg)
                 return
@@ -189,7 +189,7 @@ class PQMineViewModel: NSObject {
     ///   - completeHander: <#completeHander description#>
     /// - Returns: <#description#>
     class func updatePhone(phoneNumber: String, completeHander: @escaping (_ isSuccess: Bool, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + updatePhoneUrl, parames: ["phoneNum": phoneNumber]) { _, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + updatePhoneUrl, parames: ["phoneNum": phoneNumber], commonParams: commonParams()) { _, _, error, _ in
             if error != nil {
                 completeHander(false, error?.msg)
                 return

MusicVideoPlus/Classes/Modules/Mine/ViewModel/MVMineViewModel.swift

@@ -15,7 +15,7 @@ class MVMineViewModel: NSObject {
     ///   - pageSize: 一页多少
     ///   - completeHander: <#completeHander description#>
     class func userVideoListData(pageNum: Int = 1, pageSize: Int = 20, completeHander: @escaping (_ videoLists: [PQVideoListModel]?, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + userVideoListUrl, parames: ["pageNum": pageNum, "pageSize": pageSize]) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + userVideoListUrl, parames: ["pageNum": pageNum, "pageSize": pageSize], commonParams: commonParams()) { response, _, error, _ in
             if response is NSNull || response == nil {
                 completeHander(nil, error?.msg)
             } else {
@@ -40,7 +40,7 @@ class MVMineViewModel: NSObject {
     /// 获取用户信息
     /// - Parameter completeHander: <#completeHander description#>
     class func userInfoData(completeHander: @escaping (_ videoCount: Int?, _ avatarUrl: String?, _ nickName: String?, _ msg: String?) -> Void) {
-        SWNetRequest.postRequestData(url: PQENVUtil.shared.longvideoapi + userInfoUrl, parames: nil) { response, _, error, _ in
+        BFNetRequestAdaptor.postRequestData(url: PQENVUtil.shared.longvideoapi + userInfoUrl, parames: nil, commonParams: commonParams()) { response, _, error, _ in
             if response is NSNull || response == nil {
                 completeHander(nil, nil, nil, error?.msg ?? "加载失败")
             } else {