加入混淆

BeeReel/BeeReel.entitlements

@@ -6,9 +6,9 @@
 	<string>development</string>
 	<key>com.apple.developer.associated-domains</key>
 	<array>
-		<string>applinks:beereel.go.link</string>
-		<string>applinks:jyev.adj.st</string>
 		<string>applinks:www.breeltv.com</string>
+		<string>applinks:jyev.adj.st</string>
+		<string>applinks:beereel.go.link</string>
 	</array>
 	<key>keychain-access-groups</key>
 	<array/>

BeeReel/Class/Base/Extension/UIColor+BRAdd.swift

@@ -226,4 +226,8 @@ extension UIColor {
     static func color495047(alpha: CGFloat = 1) -> UIColor {
         return UIColor(rgb: 0x495047, alpha: alpha)
     }
+    
+    static func color4FA122(alpha: CGFloat = 1) -> UIColor {
+        return UIColor(rgb: 0x4FA122, alpha: alpha)
+    }
 }

BeeReel/Class/Base/Network/API/BRVideoAPI.swift

@@ -167,6 +167,22 @@ class BRVideoAPI {
         }
     }
     
+    ///视频观看结束
+    static func requestViewingFinish(shortPlayId: String, videoId: String, activityId: String) {
+        var param = BRNetworkParameters(path: "/activeAfterWatchingVideo")
+        param.isLoding = false
+        param.isToast = false
+        param.parameters = [
+            "short_play_video_id" : videoId,
+            "short_play_id" : shortPlayId,
+            "activity_id" : activityId
+        ]
+        
+        BRNetwork.request(parameters: param) { (response: BRNetworkResponse<String>) in
+            
+        }
+    }
+    
     ///金币解锁视频
     static func requestCoinUnlockVideo(shortPlayId: String, videoId: String, completer: ((_ model: BRVideoUnlockModel?) -> Void)?) {
         

BeeReel/Class/Base/Network/Base/BRNetwork.swift

@@ -9,8 +9,6 @@ import Foundation
 import Moya
 import SmartCodable
 
-///获取数据成功
-let BRNetworkCodeSucceed = 200
 
 
 struct BRNetwork {
@@ -195,29 +193,4 @@ extension BRNetwork {
 }
 
 
-extension MoyaProvider {
-    
-    @discardableResult
-    func requestCustomJson(_ target: Target, callbackQueue: DispatchQueue? = nil, completion: Completion?) -> Cancellable {
-        return request(target, callbackQueue: callbackQueue) { (result) in
-            guard let completion = completion else {return}
-            completion(result)
-        }
-    }
-}
 
-let CustomApiTimeoutClosure = {(endpoint: Endpoint, closure: MoyaProvider<BRNetworkTarget>.RequestResultClosure) -> Void in
-    
-    if var urlRequest = try? endpoint.urlRequest() {
-        ///总是获取新数据
-        urlRequest.cachePolicy = .reloadIgnoringCacheData
-        urlRequest.timeoutInterval = 30
-        closure(.success(urlRequest))
-    } else {
-        closure(.failure(MoyaError.requestMapping(endpoint.url)))
-    }
-    
-    #if DEBUG ///
-    //print(try? endpoint.urlRequest() )
-    #endif
-}

BeeReel/Class/Class/Explore/Controller/BRExploreViewController.swift

@@ -66,6 +66,8 @@ class BRExploreViewController: BRPlayerListViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.edgesForExtendedLayout = .all
+        self.collectionView.br_onRefrsh = true
+        self.collectionView.br_refreshDelegate = self
         self.delegate = self
         self.dataSource = self
         
@@ -156,7 +158,7 @@ extension BRExploreViewController {
         
         let isFavorite = !(shortModel?.is_collect ?? false)
         
-        BRVideoAPI.requestFavorite(isFavorite: isFavorite, shortPlayId: shortPlayId, videoId: shortModel?.short_play_video_id) {
+        BRVideoAPI.requestFavorite(isFavorite: isFavorite, shortPlayId: shortPlayId, videoId: shortModel?.video_info?.short_play_video_id) {
             
         }
     }
@@ -204,6 +206,19 @@ extension BRExploreViewController: BRPlayerListViewControllerDelegate, BRPlayerL
     }
 }
 
+//MARK: BRPlayerCollectionViewDelegate
+extension BRExploreViewController: BRPlayerCollectionViewDelegate {
+    func br_loadNewData(collectionView: BRPlayerCollectionView) {
+        requestDataArr(page: 1) {
+            collectionView.endRefresh()
+        }
+    }
+    
+    func br_upwardsScrollEnd(collectionView: BRPlayerCollectionView) {
+        BRToast.show(text: "No More Data".localized)
+    }
+}
+
 
 extension BRExploreViewController {
     
@@ -217,7 +232,8 @@ extension BRExploreViewController {
                     self.clearData()
                     self.dataArr = list
                     self.reloadData { [weak self] in
-                        self?.play()
+                        self?.scrollToItem(indexPath: .init(row: 0, section: 0), animated: false)
+//                        self?.play()
                     }
                 } else {
                     self.addDataArr(dataArr: list)

BeeReel/Class/Class/Home/Controller/BRSpotlightViewViewController.swift

@@ -20,7 +20,7 @@ class BRSpotlightViewViewController: BRViewController, WMZPageProtocol {
         tableView.register(BRSpotlightHotMainCell.self, forCellReuseIdentifier: BRHomeModuleItem.ModuleKey.v3_recommand.rawValue)
         tableView.register(BRSpotlightTopMainCell.self, forCellReuseIdentifier: BRHomeModuleItem.ModuleKey.week_ranking.rawValue)
         tableView.register(BRSpotlightNewMainCell.self, forCellReuseIdentifier: BRHomeModuleItem.ModuleKey.new_recommand.rawValue)
-        tableView.register(BRSpotlightRecommandMainCell.self, forCellReuseIdentifier: BRHomeModuleItem.ModuleKey.cagetory_recommand.rawValue)
+        tableView.register(BRSpotlightRecommandMainCell.self, forCellReuseIdentifier: BRHomeModuleItem.ModuleKey.week_highest_recommend.rawValue)
         return tableView
     }()
 

BeeReel/Class/Class/Home/Model/BRCategoryModel.swift

@@ -0,0 +1,15 @@
+//
+//  BRCategoryModel.swift
+//  BeeReel
+//
+//  Created by 长沙鸿瑶 on 2025/7/31.
+//
+
+import UIKit
+import SmartCodable
+
+class BRCategoryModel: BRModel, SmartCodable {
+    
+    var id: String?
+    var name: String?
+}

BeeReel/Class/Class/Home/Model/BRHomeModuleItem.swift

@@ -20,6 +20,8 @@ class BRHomeModuleItem: BRModel, SmartCodable {
         case marquee = "marquee"
         
         case new_recommand = "new_recommand"
+        
+        case week_highest_recommend = "week_highest_recommend"
     }
     
     

BeeReel/Class/Class/Home/Model/BRShortModel.swift

@@ -43,6 +43,7 @@ class BRShortModel: BRModel, SmartCodable {
     var tag_type: TagType?
     var video_info: BRVideoInfoModel?
     var category: [String]?
+    var categoryList: [BRCategoryModel]?
     ///观看数
     var watch_total: Int?
     var current_episode: String?
@@ -55,7 +56,7 @@ class BRShortModel: BRModel, SmartCodable {
     static func mappingForKey() -> [SmartKeyTransformer]? {
         return [
             CodingKeys.br_description <--- ["description", "short_video_description"],
-            CodingKeys.name <--- ["short_video_title", "name"]
+            CodingKeys.name <--- ["short_video_title", "name"],
         ]
     }
 }

BeeReel/Class/Class/Home/View/PopularPicks/BRPopularPicksCell.swift

@@ -13,7 +13,7 @@ class BRPopularPicksCell: BRCollectionViewCell {
         didSet {
             coverImageView.br_setImage(url: model?.image_url)
             titleLabel.text = model?.name
-            categoryLabel.text = model?.category?.first
+            categoryLabel.text = model?.categoryList?.first?.name
             desLabel.text = model?.br_description
             
             hotView.setNeedsUpdateConfiguration()

BeeReel/Class/Class/Home/ViewModel/BRHomeViewModel.swift

@@ -20,8 +20,8 @@ class BRHomeViewModel {
             //新品
             var item3: BRHomeModuleItem?
             
-            ///其余分类数据
-            var item4List: [BRHomeModuleItem] = []
+            //for you
+            var item4: BRHomeModuleItem?
             
             homeOldDataArr.forEach {
                 if $0.module_key == .banner {
@@ -36,8 +36,9 @@ class BRHomeViewModel {
                 } else if $0.module_key == .new_recommand {
                     $0.title = "Fresh Stories".localized
                     item3 = $0
-                } else if $0.module_key == .cagetory_recommand {
-                    item4List.append($0)
+                } else if $0.module_key == .week_highest_recommend {
+                    $0.title = "For You".localized
+                    item4 = $0
                 }
                 
             }
@@ -54,7 +55,11 @@ class BRHomeViewModel {
                 spotlightDataArr.append(item)
             }
             
-            spotlightDataArr += item4List
+            if let item = item4 {
+                spotlightDataArr.append(item)
+            }
+            
+//            spotlightDataArr += item4List
             
         }
     }

BeeReel/Class/Class/Mine/Controller/BRFeedbackViewController.swift

@@ -0,0 +1,26 @@
+//
+//  BRFeedbackViewController.swift
+//  BeeReel
+//
+//  Created by 长沙鸿瑶 on 2025/7/31.
+//
+
+import UIKit
+
+class BRFeedbackViewController: BRAppWebViewController {
+
+    override func viewDidLoad() {
+        self.webUrl = kBRFeedBackHomeWebUrl
+        super.viewDidLoad()
+
+        self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: UIImage(named: "Vector 1"), style: .plain, target: self, action: #selector(handleRightButton))
+    }
+    
+
+    @objc private func handleRightButton() {
+        let vc = BRAppWebViewController()
+        vc.webUrl = kBRFeedBackListWebUrl
+        self.navigationController?.pushViewController(vc, animated: true)
+    }
+
+}