Koala/Koala/FX/Base/BaseViewController.swift

@@ -60,9 +60,6 @@ class BaseViewController: UIViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        
-        // 随时检查socket是否处于链接状态
-        //OperationalSymbolSocketManager.shared().checkSymbolLinkStatus()
     }
     
     func createNavigationBar() {

Koala/Koala/FX/Macro/PublicMethod.swift

@@ -1434,6 +1434,25 @@ func getHomePageUrl() -> String {
     }
 }
 
+// 获取活动链接
+
+func getActivityCenterUrlByTab(tab : String) -> String {
+    var url = ACTIVITYCENTER+"?tab="+tab
+           
+           switch GlobalSingle.sharedInstance.currentLan {
+           case .EnglishLanguage:
+               url = url+"&language=en"
+           case .TraditionalLanguage:
+               url = url+"&language=zh-TW"
+           case .ChineseLanguage:
+               url = url+"&language=zh-CN"
+           default:
+               url = url+"&language=en"
+           }
+    
+    return url
+}
+
 // 获取推送语言包语言
 func getLanguageForNotifiction() -> String {
     switch GlobalSingle.sharedInstance.currentLan {

Koala/Koala/Modular/Deal/V/Deal/DealProDataCell.swift

@@ -181,11 +181,10 @@ extension DealProDataCell {
     func updatePrice(vm: DealViewModel) {
         self.VM = vm
         let model = vm.selectSymbolModel
-        let color = exchangeColorAndImage(increase: conerData(model.increase, .MyFloat).1!).0
         
         let price = precisionString(with: model.newPrice, precision: model.digits)
         
-        let difference: Double = conerData(model.newPrice, .MyDouble).2! - conerData(model.open, .MyDouble).2!
+        let difference: Double = conerData(model.newPrice, .MyDouble).2! - conerData(model.close, .MyDouble).2!
         var digits = model.digits
         if Double(digits) ?? 0 == 0 {
             if showThreeDigitPrecision(model.market) {
@@ -197,14 +196,17 @@ extension DealProDataCell {
         
         let differenceStr = precisionString(with: "\(difference)", precision: digits)
         
-        let increase = conerData(model.increase as Any, .MyFloat).1!
+        let increase = (difference/conerData(model.close, .MyDouble).2!) * 100
         var increaseStr = "0%"
         if increase > 0 {
-            increaseStr = "+" + precisionString(with: model.increase, precision: digits) + "%"
+            increaseStr = "+" + precisionString(with: "\(increase)", precision: digits) + "%"
         } else {
-            increaseStr = precisionString(with: model.increase, precision: digits) + "%"
+            increaseStr = precisionString(with: "\(increase)", precision: digits) + "%"
         }
         
+        let color = exchangeColorAndImage(increase: Float(increase)).0
+        model.increase = "\(increase)"
+        
         self.value2Lab.text = String(format: "%@  %@  %@", price, differenceStr, increaseStr)
         self.value2Lab.textColor = color
     }

Koala/Koala/Modular/Deal/V/Deal/DealSimDataCell.swift

@@ -149,6 +149,11 @@ class DealSimDataCell: BaseTableViewCell {
     }
     
     func updateCellPrice(vm: DealViewModel) {
+        
+        let difference: Double = conerData(vm.selectSymbolModel.newPrice, .MyDouble).2! - conerData(vm.selectSymbolModel.close, .MyDouble).2!
+        let increase = (difference/conerData(vm.selectSymbolModel.close, .MyDouble).2!) * 100
+        vm.selectSymbolModel.increase = "\(increase)"
+        
         if vm.selectSymbolModel.digits.count > 0 {
             self.priceLab.text = precisionString(with: vm.selectSymbolModel.newPrice, precision: vm.selectSymbolModel.digits)
             if conerData(vm.selectSymbolModel.increase, .MyFloat).1! > 0 {

Koala/Koala/Modular/Deal/V/Deal/DealView.swift

@@ -1482,6 +1482,7 @@ extension DealView: UITableViewDelegate, SkeletonTableViewDataSource {
                     // 配置当前选中的股票
                     self.VM?.selectSymbolModel = model.productBean
                     self.VM?.server = accountModel.server
+                    self.VM?.netGetDealProduct()
                     
                     pop.dismissAlert()
                     tableView.setContentOffset(CGPoint.zero, animated: true)

Koala/Koala/Modular/JDAssets/V/JDFuncLimitResultPopView.swift

@@ -278,7 +278,7 @@ extension JDFuncLimitResultPopView {
                 
                 let formatString = switchLanguage("您的账号存在异常，暂时无法使用该功能，您已提交编号为%@的验证资料，因“%@”的原因未能通过审核，请通过以下链接重新提交资料，谢谢！")
                 
-                detailLabel.text = String(format: formatString, model.ordernum ?? "", reason ?? "")
+                detailLabel.text = String(format: formatString, model.ordernum ?? "", reason)
                 self.detailButton.setTitle(switchLanguage("重新提交资料"), for: .normal)
             }
        

Koala/Koala/Modular/JDMine/VC/JDMineViewController.swift

@@ -292,20 +292,7 @@ extension JDMineViewController: UITableViewDelegate {
             } else if indexPath.row == 3 {
                 let vc = BaseWebViewController()
                 
-                var url = ACTIVITYCENTER+"?tab=1"
-                
-                switch GlobalSingle.sharedInstance.currentLan {
-                case .EnglishLanguage:
-                    url = ACTIVITYCENTER+"?tab=1&language=en"
-                case .TraditionalLanguage:
-                    url = ACTIVITYCENTER+"?tab=1&language=zh-TW"
-                case .ChineseLanguage:
-                    url = ACTIVITYCENTER+"?tab=1&language=zh-CN"
-                default:
-                    url = ACTIVITYCENTER+"?tab=1&language=en"
-                }
-                
-                vc.url = url
+                vc.url = getActivityCenterUrlByTab(tab: "1") 
                 vc.myNavigationBar.title_Label.text = switchLanguage("活动中心")
                 
                 let navBtn: UIButton = {
@@ -411,20 +398,7 @@ extension JDMineViewController: UITableViewDelegate {
     @objc func activityBtnAction() {
         let vc = BaseWebViewController()
         
-        var url = ACTIVITYCENTER+"?tab=2"
-        
-        switch GlobalSingle.sharedInstance.currentLan {
-        case .EnglishLanguage:
-            url = ACTIVITYCENTER+"?tab=2&language=en"
-        case .TraditionalLanguage:
-            url = ACTIVITYCENTER+"?tab=2&language=zh-TW"
-        case .ChineseLanguage:
-            url = ACTIVITYCENTER+"?tab=2&language=zh-CN"
-        default:
-            url = ACTIVITYCENTER+"?tab=2"
-        }
-        
-        vc.url = url
+        vc.url = getActivityCenterUrlByTab(tab: "2")
         vc.myNavigationBar.title_Label.text = switchLanguage("往期活动")
         
         currentVc()?.navigationController?.pushViewController(vc, animated: true)

Koala/Koala/Modular/MarketDetail/C/MarketAuoteViewController.swift

@@ -58,6 +58,14 @@ class MarketAuoteViewController: BaseViewController {
                 return
             }
             
+            // 异常账户限制交易
+            if OperationalUserInfoData.getUserInfoDataModel().group == "9999" {
+                let pop = JDFuncLimitPopView()
+                pop.showPopupView(title: "", detail: "") { _ in }
+                
+                return
+            }
+            
             let symbolModel = self.symbolModel
             let dealVC = DealViewController()
             dealVC.viewModel.updateSymbols(symbol: symbolModel)
@@ -113,6 +121,14 @@ class MarketAuoteViewController: BaseViewController {
                 return
             }
             
+            // 异常账户限制交易
+            if OperationalUserInfoData.getUserInfoDataModel().group == "9999" {
+                let pop = JDFuncLimitPopView()
+                pop.showPopupView(title: "", detail: "") { _ in }
+                
+                return
+            }
+            
             let symbolModel = self.symbolModel
             let dealVC = DealViewController()
             dealVC.viewModel.updateSymbols(symbol: symbolModel)
@@ -153,6 +169,11 @@ class MarketAuoteViewController: BaseViewController {
         OperationalUserInfoData.refreshUserInfoComplete {
         }
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        OperationalSymbolSocketManager.shared().skipSymbolDisconnect = true
+    }
 }
 
 extension MarketAuoteViewController: JXSegmentedListContainerViewListDelegate {

Koala/Koala/Other/TimerManager.swift

@@ -28,9 +28,10 @@ class SocketTimerManager {
     }
     
     @objc func detectionSocket() {
-        // 开启子线程
-        DispatchQueue.global().async {
-            //OperationalSymbolSocketManager.shared().checkSymbolLinkStatus()
+        if(PriceCalibrator.shareCalibrator.subscribles.count > 0){
+            if(OperationalSymbolSocketManager.shared().symbolConnectCommand.value == true){
+                OperationalSymbolSocketManager.shared().checkSymbolLinkStatus()
+            }
         }
     }
 }