修复bug列表

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSPublicModels/Login/FUSSettingInitDataModel.h

@@ -123,6 +123,9 @@ NS_ASSUME_NONNULL_BEGIN
 /// 直播评分显示时间区间（月数）
 @property (nonatomic, assign) NSInteger liveAssessTimeRange;
 
+/// 直播奖励網頁地址
+@property (nonatomic, copy) NSString *liveRewardTaskUrl;
+
 @end
 
 NS_ASSUME_NONNULL_END

Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>74</integer>
+			<integer>73</integer>
 		</dict>
 		<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>77</integer>
+			<integer>74</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>73</integer>
+			<integer>72</integer>
 		</dict>
 		<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>72</integer>
+			<integer>76</integer>
 		</dict>
 	</dict>
 </dict>

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/LiveRecords/Controller/FUSLiveRecordsController.swift

@@ -36,6 +36,10 @@ import RxCocoa
         makeUI()
         bindViewModel()
     }
+    public override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        FUSLoadingView.fus_dismissProgressView()
+    }
 
     func makeUI() {
         

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FUSVideoEndView/FUSVideoEndLiveScoreSheetView.swift

@@ -10,18 +10,21 @@ import SJAttributesStringMaker
 
 class FUSVideoEndLiveScoreSheetView: FUSBaseView {
     
-    static public func fus_create(liveAssessModel: FUSLiveEndLiveAssesModel,liveGasStationData: FUSLiveGasStationDataModel? = nil, showOn: UIView? = nil) {
+    static public func fus_create(liveAssessModel: FUSLiveEndLiveAssesModel,liveGasStationData: FUSLiveGasStationDataModel? = nil, showOn: UIView? = nil, clickHandle:((_ btnType: FFVideoEndLiveScoreBlankButton.FFLiveScoreBlankType) -> Void)? = nil) {
         guard let showOnView = ((showOn != nil) ? showOn : UIViewController.fus_top()?.view) else { return }
         
         let view = FUSVideoEndLiveScoreSheetView(frame: showOnView.bounds)
         view.liveAssessModel = liveAssessModel;
         view.liveGasStationData = liveGasStationData
+        view.clickHandle = clickHandle
         view.fus_reloadData()
         showOnView.addSubview(view)
         
         view.fus_showWithAnimation()
     }
     
+    
+    public var clickHandle: ((_ btnType: FFVideoEndLiveScoreBlankButton.FFLiveScoreBlankType) -> Void)?
     /// 数据
     public var liveAssessModel: FUSLiveEndLiveAssesModel = .init()
     /// 右上角的奖励记录
@@ -148,8 +151,9 @@ class FUSVideoEndLiveScoreSheetView: FUSBaseView {
         
         self.rewardsRecordBtn.rx.tap.subscribe(onNext: {[weak self] in
             guard let liveGasStationData = self?.liveGasStationData else { return }
+            guard let liveAssessModel = self?.liveAssessModel else { return }
             let vc = FUSWKWebViewController()
-            vc.webUrlString = liveGasStationData.jumpUrl
+            vc.webUrlString = liveGasStationData.jumpUrl + "?statdate=\(liveAssessModel.statdate)"
             UIViewController.fus_top().navigationController?.pushViewController(vc, animated: true)
         }).disposed(by: disposeBag)
     }
@@ -206,6 +210,10 @@ extension FUSVideoEndLiveScoreSheetView {
                 FUSDialogView.fus_showDialog(msg)
             }
         }
+        else {
+            // 其他的就挂起给外面
+            self.clickHandle?(type)
+        }
     }
     
     func fus_showWithAnimation(){

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FUSVideoEndView/FUSVideoEndV2View.swift

@@ -247,7 +247,13 @@ extension FUSVideoEndV2View: UITableViewDelegate, UITableViewDataSource {
 //            })
             break
         case .liveScore:
-            FUSVideoEndLiveScoreSheetView.fus_create(liveAssessModel: self.model.liveAssess, showOn: self)
+            FUSVideoEndLiveScoreSheetView.fus_create(liveAssessModel: self.model.liveAssess, showOn: self) { btnType in
+                if btnType == .popular{
+                    let webVC = FUSWKWebViewController()
+                    webVC.webUrlString = self.model.popularData.jumpUrl
+                    UIViewController.fus_top().navigationController?.pushViewController(webVC, animated: true)
+                }
+            }
             
         case .allPopularity:
             let webVC = FUSWKWebViewController()

Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,12 +7,12 @@
 		<key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>75</integer>
+			<integer>78</integer>
 		</dict>
 		<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>76</integer>
+			<integer>77</integer>
 		</dict>
 	</dict>
 </dict>

Pods/Pods.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -389,6 +389,11 @@
 			<key>orderHint</key>
 			<integer>60</integer>
 		</dict>
+		<key>SSZipArchive.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>75</integer>
+		</dict>
 		<key>SnapKit-SnapKit_Privacy.xcscheme</key>
 		<dict>
 			<key>isShown</key>