添加webViewUA

liushiyu
1 parent 42b1cd93
Showing 11 changed files with 73 additions and 22 deletions
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Main/HomePage/Controller/CNWebViewController.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInputFeedBackViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineEarnListViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInputViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Info.plist
@@ -67,6 +67,8 @@ class CNLiveEnvironmentManager: NSObject{
     var img_token_url: String
     /// 网家家电商域名请求
     var base_mjj_shop_url: String
+    /// 元码webViewUA设置
+    var base_web_UA: String = "yuanma"
  
     ///当前环境
     var currentEnvironment: CNLiveEnvironment
@@ -27,7 +27,16 @@ class CNWebViewController:CNLiveBaseViewController ,WKNavigationDelegate{
             _url = newValue!
             if (_url != ""){
                 let webUrl: URL! = URL.init(string: _url!)
-                webView.load(URLRequest.init(url:webUrl))
+                webView.evaluateJavaScript("navigator.userAgent") { [self] result, error in
+                    let userAgent = result as! String
+                    if error == nil && userAgent.count > 0 {
+                        if !userAgent.contains(CNLiveEnvironmentManager.shared.base_web_UA) {
+                            let newUserAgent = userAgent + CNLiveEnvironmentManager.shared.base_web_UA
+                            webView.customUserAgent = newUserAgent
+                        }
+                    }
+                    webView.load(URLRequest.init(url:webUrl))
+                }
             }
         }
     }
@@ -8,6 +8,7 @@
 import Foundation
 import UIKit
 import SnapKit
+import APButton
  
 class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
  
@@ -52,12 +53,13 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
         return veriText
     }()
  
-    lazy var loginButton: UIButton = {
-        let loginButton = UIButton(type: .custom)
+    lazy var loginButton: APButton = {
+        let loginButton = APButton()
         loginButton.setTitle("登  录", for: .normal)
         loginButton.setTitleColor(.white, for: .normal)
         loginButton.titleLabel?.font = BoldFont_16_Fit
         loginButton.layer.cornerRadius = 20
+        loginButton.activityIndicator.color = .white
         loginButton.layer.masksToBounds = true
         loginButton.addTarget(self, action: #selector(sendLoginActionMothod), for: .touchUpInside)
         return loginButton
@@ -283,7 +285,9 @@ extension CNLiveLoginViewController {
             return
         }
         view.endEditing(true)
-        CNLiveLoginViewModel.requestLoginAction(userName: phoneText.text ?? "", countryCode: country, verCode: veriText.text ?? "") {
+        loginButton.startAnimating()
+        CNLiveLoginViewModel.requestLoginAction(userName: phoneText.text ?? "", countryCode: country, verCode: veriText.text ?? "") { [self] in
+            loginButton.stopAnimating()
             let window = UIApplication.shared.delegate?.window
             window??.rootViewController = CNLiveBaseTabBarViewController.init()
         }
@@ -7,7 +7,7 @@
  
 import Foundation
 import HXPHPicker
-
+import APButton
 enum InputFeedBackType {
     case problem
     case product
@@ -100,13 +100,14 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
         return mobileField
     }()
  
-    lazy var sendButton: UIButton = {
-        let sendButton = UIButton(type: .custom)
+    lazy var sendButton: APButton = {
+        let sendButton = APButton()
         sendButton.setTitle("提  交", for: .normal)
         sendButton.setTitleColor(.white, for: .normal)
         sendButton.titleLabel?.font = BoldFont_16_Fit
         sendButton.layer.cornerRadius = 20
         sendButton.layer.masksToBounds = true
+        sendButton.activityIndicator.color = .white
         sendButton.addTarget(self, action: #selector(sendInfoActionMothod), for: .touchUpInside)
         return sendButton
     }()
@@ -212,9 +213,11 @@ class CNLiveInputFeedBackViewController: CNLiveBaseViewController, UITextViewDel
     }
  
     @objc func sendInfoActionMothod() {
-        CNLiveMineViewModel.requestFeedBack(text: p_textView.text ?? "", contactWay: UserInfoManager.shared.userInfo.mobile, images: imageUrlArray) { type, result in
+        sendButton.startAnimating()
+        CNLiveMineViewModel.requestFeedBack(text: p_textView.text ?? "", contactWay: UserInfoManager.shared.userInfo.mobile, images: imageUrlArray) { [self] type, result in
             if result {
                 showMessage(message: "内容提交成功")
+                sendButton.stopAnimating()
                 self.navigationController?.popViewController(animated: true)
             }
         }
@@ -99,6 +99,7 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         }
         if _show_type == .info || _show_type == .add {
             showLoading(message: "")
+            NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
         }
         loadData()
         addRefreshView()
@@ -110,6 +111,10 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         }
     }
  
+    deinit {
+        NotificationCenter.default.removeObserver(self, name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
+    }
+    
     private func loadData() {
         if _show_type == .add {
             CNLiveMineViewModel.requestAuthStandList(page: self.pageNum) { [weak self] result, respStatue in
@@ -184,13 +189,18 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
                 self!.pageNum = 1
                 self!.loadData()
             })
-            tableView.mj_footer = MJRefreshFooter.init(refreshingBlock: {[weak self] in
+            tableView.mj_footer = MJRefreshBackNormalFooter.init(refreshingBlock: {[weak self] in
                 self!.pageNum += 1
                 self!.loadData()
             })
         }
     }
  
+    @objc func StandAuthNotificationSuccessAction() {
+        self.pageNum = 1
+        loadData()
+    }
+    
  
     @objc func noteSetAction() {}
     @objc func backCopyAction() {}
@@ -59,11 +59,13 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi
             self.pageNum = 1
         }
         if _show_type == .balance {
-            CNLiveMineViewModel.requestWithTradRecord(page: page) { result, respStatue in
+            CNLiveMineViewModel.requestWithTradRecord(page: page) { [self] result, respStatue in
                 if respStatue == .success {
                     let listModel = result as! MineTradingRecordBaseModel
                     self.network_type = .success
-                    self.dataArray.removeAllObjects()
+                    if pageNum == 1 {
+                        self.dataArray.removeAllObjects()
+                    }
                     self.dataArray.addObjects(from: listModel.list)
                     self.tableView.reloadData()
                     self.tableView.mj_header?.endRefreshing()
@@ -71,6 +73,10 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi
                     if self.dataArray.count > 0 {
                         self.addRefreshView()
                     }
+                    if listModel.lasePage {
+                        self.tableView.mj_footer?.endRefreshing()
+                        self.tableView.mj_footer?.endRefreshingWithNoMoreData()
+                    }
                 }else if (respStatue == .noNetwork) {
                     self.network_type = .noNetwork
                     self.tableView.reloadEmptyDataSet()
@@ -128,7 +134,7 @@ class CNLiveMineEarnListViewController: CNLiveBaseViewController, JXPagingViewLi
     }
  
     private func addRefreshView() {
-        let footerView = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+        let footerView = MJRefreshBackNormalFooter.init(refreshingBlock: {[weak self] in
             self!.pageNum += 1
             self!.loadDataWithTradRecord(page: self!.pageNum) {result,respStatue in }
         })
@@ -8,7 +8,7 @@
 import Foundation
 import EmptyDataSet_Swift
 import HXPHPicker
-
+import APButton
 typealias resultUploadImageBlock = (_ url: String) -> Void
 class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate, PhotoPickerControllerDelegate{
  
@@ -36,14 +36,15 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
         return tipLabel
     }()
  
-    lazy var sendButton: UIButton = {
-        let sendButton = UIButton(type: .custom)
+    lazy var sendButton: APButton = {
+        let sendButton = APButton()
         sendButton.setTitle("添加身份", for: .normal)
         sendButton.setTitleColor(.white, for: .normal)
         sendButton.titleLabel?.font = BoldFont_16_Fit
         sendButton.layer.cornerRadius = 20
         sendButton.layer.masksToBounds = true
         sendButton.isHidden = true
+        sendButton.activityIndicator.color = .white
         sendButton.addTarget(self, action: #selector(sendInfoActionMothod), for: .touchUpInside)
         return sendButton
     }()
@@ -133,9 +134,11 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
             if (self.tempCell != nil) {
                 self.tempCell._infoModel?.value = url
             }
+            sendButton.startAnimating()
             CNLiveMineViewModel.requestsPOSTAuthInfo(identityId: "\(_listModel.id)", infos: self.dataArray) { [self] result, respStatue in
                 if respStatue == .success {
                     showMessage(message: "上传成功")
+                    sendButton.stopAnimating()
                     DispatchQueue.main.asyncAfter(deadline: .now()+1) { [self] in
                         self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(listModel: _listModel,show_type: .result_success), animated: true)
                     }
@@ -68,7 +68,10 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         tableView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(StandAuthNotificationSuccessAction), name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
     }
+
  
     public func loadDataWithPoint() {
         CNLiveMineViewModel.requestWithCheckIn { [weak self] result, respStatue in
@@ -90,8 +93,13 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
       return .lightContent
     }
  
+    
+    @objc func StandAuthNotificationSuccessAction() {
+        tableView.reloadData()
+    }
+    
     deinit {
-        
+        NotificationCenter.default.removeObserver(self, name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
     }
 }
  
@@ -587,13 +587,15 @@ class MineBodyFourViewCell: UITableViewCell {
  
     }
  
+    var _listModel: MineTaskCheckListModel!
     func setupWithData(listModel: MineTaskCheckListModel) {
+        _listModel = listModel
         iconView.kf.indicatorType = .activity
         iconView.kf.setImage(with: URL(string: listModel.icon ?? "") , placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSizeMake(50, 50)))
         nameLabel.text = listModel.title ?? ""
         descLabel.text = "积分值+\(listModel.score ?? "")"
-        if listModel.taskId!.contains("check_in") {
-            if listModel.status!.contains("false") {
+        if _listModel.taskId!.contains("check_in") {
+            if _listModel.status!.contains("true") {
                 shareBtn.setTitle("去签到", for: .normal)
             }else{
                 shareBtn.titleEdgeInsets = UIEdgeInsets.zero
@@ -617,6 +619,7 @@ class MineBodyFourViewCell: UITableViewCell {
         CNLiveMineViewModel.requestWithCheckInAction { [self] result, respStatue in
             sender.stopAnimating()
             showMessage(message: "签到成功")
+            _listModel.status = "false"
             shareBtn.titleEdgeInsets = UIEdgeInsets.zero
             shareBtn.imageEdgeInsets = UIEdgeInsets.zero
             shareBtn.setTitleColor(HexColor("#999999"), for: .normal)
@@ -557,7 +557,6 @@ class CNLiveMineViewModel: NSObject {
             timeCount = timeCount - 1
             // 时间到了取消时间源
             if timeCount <= 0 {
-                
                 codeTimer.cancel()
                 // 返回主线程处理一些事件，更新UI等等
                 DispatchQueue.main.async {
@@ -673,8 +672,10 @@ class CNLiveMineViewModel: NSObject {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "targetId")
         param.setValue("0", forKey: "type")//0全部(默认) 1收入 2支出
-        param.setValue("\((timeStamp * 1000) - 30*24*60*60)", forKey: "startTime")//"1600569015000"
-        param.setValue("\((timeStamp * 1000))", forKey: "endTime")//"1603074615000"
+//        param.setValue("\((timeStamp * 1000) - 30*24*60*60)", forKey: "startTime")//"1600569015000"
+//        param.setValue("\((timeStamp * 1000))", forKey: "endTime")//"1603074615000"
+        param.setValue("1600569015000", forKey: "startTime")
+        param.setValue("1603074615000", forKey: "endTime")
         param.setValue("10", forKey: "pageSize")
         param.setValue("\(page)", forKey: "pageNo")
         let custom_param = NSMutableDictionary()
@@ -2,11 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>zh_CN</string>
 	<key>CFBundleAllowMixedLocalizations</key>
 	<true/>
 	<key>CFBundleLocalizations</key>
 	<array>
-		<string>zh</string>
+		<string>zh_CN</string>
 	</array>
 	<key>NSAppTransportSecurity</key>
 	<dict>