1

ReaderHive.xcodeproj/project.pbxproj

@@ -3100,7 +3100,7 @@
 				CODE_SIGN_ENTITLEMENTS = ReaderHive/ReaderHive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 9JR2Y32ZU3;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -3146,7 +3146,7 @@
 				CODE_SIGN_ENTITLEMENTS = ReaderHive/ReaderHive.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 9JR2Y32ZU3;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = ReaderHive/Source/Info.plist;

ReaderHive/Base/Networking/API/NRNovelAPI.swift

@@ -261,11 +261,12 @@ struct NRNovelAPI {
         }
     }
     
-    static func requestReadFinishRecommand(novelId: String) async -> NRNovelModel? {
+    static func requestReadFinishRecommand(novelId: String, isToast: Bool) async -> NRNovelModel? {
         
         await withCheckedContinuation { continuation in
             var param = NRNetwork.Parameters(path: "/novel/getRecommandOneDetails")
             param.method = .get
+            param.isToast = isToast
             param.parameters = [
                 "short_play_id" : novelId,
             ]

ReaderHive/Base/Networking/API/NRStoreAPI.swift

@@ -23,7 +23,7 @@ struct NRStoreAPI {
     static func requestPayTemplate(isLoding: Bool = false, isToast: Bool = true, completer: ((_ model: NRPayDateModel?) -> Void)?) {
         
         var param = NRNetwork.Parameters(path: "/paySettingsV4")
-        param.method = .get
+        param.method = .post
         param.isToast = isToast
         param.isLoding = isLoding
         param.parameters = [

ReaderHive/Base/Networking/NRUrlPath.swift

@@ -8,10 +8,10 @@
 import UIKit
 
 #if DEBUG
-let NRBaseURL = "https://api-novel-test.guyantv.com"
+//let NRBaseURL = "https://api-novel-test.guyantv.com"
-let NRBaseURLPrefix = ""
+//let NRBaseURLPrefix = ""
-//let NRBaseURL = "https://api-readerhive.readerhive.net"
+let NRBaseURL = "https://api-readerhive.readerhive.net"
-//let NRBaseURLPrefix = "/readerhive"
+let NRBaseURLPrefix = "/readerhive"
 #else
 let NRBaseURL = "https://api-readerhive.readerhive.net"
 let NRBaseURLPrefix = "/readerhive"

ReaderHive/Class/Novel/V/Reader/NRNovelReadFinishFooterView.swift

@@ -21,6 +21,8 @@ class NRNovelReadFinishFooterView: UIView {
         configuration.background.backgroundColor = .white
         configuration.image = UIImage(named: "refresh_icon_02")
         configuration.imagePadding = 8
+        configuration.contentInsets = .init(top: 0, leading: 10, bottom: 0, trailing: 10)
+        
         configuration.attributedTitle = AttributedString("reader_shuffle".localized, attributes: AttributeContainer([
             .font : UIFont.font(ofSize: 14, weight: .medium),
             .foregroundColor : UIColor.F_9710_D
@@ -71,8 +73,9 @@ extension NRNovelReadFinishFooterView {
             make.left.equalToSuperview().offset(16)
             make.top.equalToSuperview().offset(8)
             make.height.equalTo(48)
-            make.width.equalTo(120)
+//            make.width.equalTo(120)
-            make.bottom.equalTo(-(UIScreen.safeBottom + 10))
+            make.width.greaterThanOrEqualTo(120)
+//            make.bottom.equalTo(-(UIScreen.safeBottom + 10))
         }
         
         readButton.snp.makeConstraints { make in

ReaderHive/Class/Novel/V/Reader/NRNovelReadFinishHeaderView.swift

@@ -20,8 +20,15 @@ class NRNovelReadFinishHeaderView: UIView {
     
     var recommendNovelModel: NRNovelModel? {
         didSet {
-            self.recommendInfoView.novelModel = recommendNovelModel
+            if let model = self.recommendNovelModel {
-            self.recommendNovelNameLabel.text = recommendNovelModel?.chapterInfo?.name
+                self.recommendInfoView.isHidden = false
+                self.recommendNovelNameLabel.isHidden = false
+                self.recommendInfoView.novelModel = recommendNovelModel
+                self.recommendNovelNameLabel.text = recommendNovelModel?.chapterInfo?.name
+            } else {
+                self.recommendInfoView.isHidden = true
+                self.recommendNovelNameLabel.isHidden = true
+            }
         }
     }
     
@@ -73,6 +80,7 @@ class NRNovelReadFinishHeaderView: UIView {
     
     private lazy var recommendInfoView: NRNovelReadFinishInfoView = {
         let view = NRNovelReadFinishInfoView()
+        view.isHidden = true
         view.clickRefresh = { [weak self] in
             guard let self = self else { return }
             self.clickRefresh?()
@@ -82,6 +90,7 @@ class NRNovelReadFinishHeaderView: UIView {
     
     private lazy var recommendNovelNameLabel: UILabel = {
         let label = UILabel()
+        label.isHidden = true
         label.font = .font(ofSize: 16, weight: .semibold)
         label.textColor = .black
         return label

ReaderHive/Class/Novel/VC/Read/NRNovelReadFinishViewController.swift

@@ -86,7 +86,7 @@ class NRNovelReadFinishViewController: NRNovelReadBaseViewController {
         nr_setupUI()
         
         Task {
-            await requestDataArr()
+            await requestDataArr(isToast: false)
         }
     }
     
@@ -100,7 +100,7 @@ class NRNovelReadFinishViewController: NRNovelReadBaseViewController {
     
     private func handleRefresh() {
         Task {
-            guard await requestDataArr() else { return }
+            guard await requestDataArr(isToast: true) else { return }
             
             CATransaction.setCompletionBlock {
                 self.tableView.setContentOffset(.zero, animated: true)
@@ -118,7 +118,7 @@ extension NRNovelReadFinishViewController {
     
     private func nr_setupUI() {
         self.tableView.tableHeaderView = self.headerView
-        self.tableView.tableFooterView = self.footerView
+//        self.tableView.tableFooterView = self.footerView
         
         view.addSubview(backButton)
         view.addSubview(tableView)
@@ -181,14 +181,14 @@ extension NRNovelReadFinishViewController: UITableViewDelegate, UITableViewDataS
 
 extension NRNovelReadFinishViewController {
     
-    private func requestDataArr() async -> Bool {
+    private func requestDataArr(isToast: Bool) async -> Bool {
 //        guard let list = await NRNovelAPI.requestDetailRecommandData() else { return }
 //        self.dataArr = list
 //        self.collectionView.reloadData()
         
         guard let id = self.viewModel?.novelId else { return false }
         
-        guard let model = await NRNovelAPI.requestReadFinishRecommand(novelId: id) else { return false }
+        guard let model = await NRNovelAPI.requestReadFinishRecommand(novelId: id, isToast: isToast) else { return false }
         self.recommandNovelModel = model
         let chapterModel = model.chapterInfo
         chapterModel?.parserText(attributes: [
@@ -197,7 +197,7 @@ extension NRNovelReadFinishViewController {
         ])
         
         self.headerView.recommendNovelModel = model
-        
+        self.tableView.tableFooterView = self.footerView
         
         
         self.tableView.reloadData()

ReaderHive/Delegate/SceneDelegate.swift

@@ -20,7 +20,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         guard let windowScene = (scene as? UIWindowScene) else { return }
         NotificationCenter.default.addObserver(self, selector: #selector(networkStatusDidChangeNotification), name: NRNetworkReachableManager.networkStatusDidChangeNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(localizedDidChangeNotification), name: NRLocalizedManager.localizedDidChangeNotification, object: nil)
-//        sleep(1)
         
         NRTool.sceneDelegate = self
         NRTool.windowScene = windowScene