// 版本更新

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -10,6 +10,8 @@ import UIKit
 import ESPullToRefresh
 import GKNavigationBarSwift
 
+let kShowAlertOfLatestVersion =  "show_alert_latest_version"
+
 class YHHomePageViewController: YHBaseViewController {
     lazy var viewModel : YHHomePageViewModel = {
         let viewModel = YHHomePageViewModel()
@@ -41,6 +43,7 @@ class YHHomePageViewController: YHBaseViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        showNewVersionAlertView()
     }
     
     lazy var searchView: YHHomeSearchView = {
@@ -265,3 +268,35 @@ extension YHHomePageViewController : UITabBarControllerDelegate {
         return true
     }
 }
+
+extension YHHomePageViewController {
+    
+    func showNewVersionAlertView() {
+        if let configModel = YHConfigManager.shared.reqVM.configModel {
+            
+            var isShow = false
+            if let alertLatestVersion = UserDefaults.standard.object(forKey: kShowAlertOfLatestVersion) as? String {
+                if !configModel.max_version.isEmpty, configModel.max_version != alertLatestVersion  {
+                    isShow = true
+                }
+            } else {
+                isShow = true
+            }
+            
+            if isShow {
+                let alertView = YHFindAppNewVersionView.alertView(version: configModel.max_version).callBack(updateBlock: {
+                    UserDefaults.standard.set(configModel.max_version, forKey: kShowAlertOfLatestVersion)
+                    UserDefaults.standard.synchronize()
+                    
+                }, dismissBlock: {
+                    UserDefaults.standard.set(configModel.max_version, forKey: kShowAlertOfLatestVersion)
+                    UserDefaults.standard.synchronize()
+                })
+
+                let arr = configModel.suggest_updating_msg.components(separatedBy: "$")
+                alertView.updateContentArray(arr)
+                alertView.show()
+            }
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHConfigModel.swift

@@ -10,11 +10,14 @@ import UIKit
 import SmartCodable
 
 class YHConfigModel : SmartCodable {
-    var oss_server : String = ""
-    var start_up_url : String = ""
-    var article_h5_url : String = ""
-    var min_version_num : Int = 0
-    var countdown : Int = 0
+    var start_up_url: String = ""
+    var min_version: String = ""
+    var max_version: String = ""
+    var countdown: Int = 0
+    var oss_server: String = ""
+    var article_h5_url: String = ""
+    var suggest_updating: Bool = false
+    var suggest_updating_msg: String = ""
     
     required init() {
     }

galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/V/YHFindAppNewVersionView.swift

@@ -7,8 +7,14 @@
 //
 //
 /*  【Usage】
-     YHFindAppNewVersionView.alertView().show()
-     view.updateContentArray(["1、阿斯顿发发。 2、阿打发打发是的发生富士达"])
+ let alertView = YHFindAppNewVersionView.alertView(version: "1.0.0").callBack {
+     
+ } dismissBlock: {
+     
+ }
+ alertView.updateContentArray(["1、阿斯顿发发。 2、阿打发打发是的发生富士达"])
+ alertView.show()
+ 
  */
 
 
@@ -59,6 +65,9 @@ class YHUpdateContentItemView: UIView {
 
 class YHFindAppNewVersionView: UIView {
 
+    var updateBlock: (()->())?
+    var dismissBlock: (()->())?
+    
     // 底层蒙版
     lazy var blackMaskView: UIView = {
         let view = UIView()
@@ -145,11 +154,18 @@ class YHFindAppNewVersionView: UIView {
         createUI()
     }
     
-    static func alertView() -> YHFindAppNewVersionView {
+    static func alertView(version:String?) -> YHFindAppNewVersionView {
         let alertView = YHFindAppNewVersionView(frame:UIScreen.main.bounds)
+        alertView.versionLabel.text = version
         return alertView
     }
     
+    func callBack(updateBlock:(()->())?, dismissBlock:(()->())?) ->YHFindAppNewVersionView  {
+        self.updateBlock = updateBlock
+        self.dismissBlock = dismissBlock
+        return self
+    }
+    
     func updateContentArray(_ arr: [String]) {
         updateContentView.removeSubviews()
         updateContentView.snp.remakeConstraints { make in
@@ -253,7 +269,6 @@ class YHFindAppNewVersionView: UIView {
             make.top.equalTo(whiteContentView.snp.bottom).offset(20)
             make.centerX.equalTo(whiteContentView)
         }
-
     }
     
     @objc func show() {
@@ -265,10 +280,12 @@ class YHFindAppNewVersionView: UIView {
     
     @objc func dismiss() {
         YHLoginManager.shared.isShowVersionUpdate = false
+        self.dismissBlock?()
         self.removeFromSuperview()
     }
     
     @objc func didClickUpdateBtn() {
+        self.updateBlock?()
         YHAppVersionManager.goToAppStore()
     }
 }

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -11,7 +11,7 @@ class YHAllApiName {
     //接口 模块名 Common
     struct Common {
         //首页配置接口
-        static let homeConfigApi = "infoflow/app/config"
+        static let homeConfigApi = "super-app/config/app"
         //获取首页展示的资讯
         static let consult = "infoflow/home/consult"
         //获取首页展示的banner

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -87,9 +87,9 @@ class YHNetRequest: NSObject {
         requestHeader.add(name:"appid",value:"1")
         let dateStr = String(Date().timeIntervalSince1970)
         requestHeader.add(name:"timestamp",value:dateStr)
-        requestHeader.add(name:"appPlatform",value:"iOS")
+        requestHeader.add(name:"app_platform",value:"iOS")
         let version = UIDevice.appVersion()
-        requestHeader.add(name:"appVersion",value:version)
+        requestHeader.add(name:"app_version",value:version)
         
         requestHeader.add(name:"pass",value:"")
         let appkey = "958364f87222c200a72414f492bf0e26"