Merge commit 'fb476550' into xiezhaolin

galaxy/galaxy/Applegate(JPush).swift

@@ -62,11 +62,11 @@ extension AppDelegate: JPUSHRegisterDelegate {
     }
     
     //后台进前台
-    func applicationDidEnterBackground(_ application: UIApplication) {
-        //销毁通知红点
-//        UIApplication.shared.applicationIconBadgeNumber = 0
-//        JPUSHService.setBadge(0)
-        UNUserNotificationCenter.current().removeAllPendingNotificationRequests()
+    func applicationWillEnterForeground(_ application: UIApplication) {
+        DispatchQueue.main.async {
+            // 请求消息页面通知权限通知
+            NotificationCenter.default.post(name: YhConstant.YhNotification.didReqeustNotifyPermissionNotification, object: nil)
+        }
     }
     
     func jpushNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: ((Int) -> Void)) {
@@ -77,6 +77,13 @@ extension AppDelegate: JPUSHRegisterDelegate {
         }
        // 需要执行这个方法，选择是否提醒用户，有Badge、Sound、Alert三种类型可以选择设置
        completionHandler(Int(UNNotificationPresentationOptions.alert.rawValue))
+       // 显示通知时需要刷新消息列表和消息未读总数
+        DispatchQueue.main.async {
+            // 请求消息未读总数通知
+            NotificationCenter.default.post(name: YhConstant.YhNotification.didRequestUnreadMsgTotalCountNotification, object: nil)
+            // 请求消息列表通知
+            NotificationCenter.default.post(name: YhConstant.YhNotification.didRequestUnreadMsgListNotification, object: nil)
+        }
     }
         
     func jpushNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: (() -> Void)) {

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

@@ -55,9 +55,8 @@ class YHHomePageViewController: YHBaseViewController {
         return view
     }()
     
-
-    var tapTimestamp : CFAbsoluteTime = -10.0
     
+    var tapTimestamp : CFAbsoluteTime = -10.0
 }
 
 private extension YHHomePageViewController {
@@ -68,24 +67,31 @@ private extension YHHomePageViewController {
     
     func getData() {
         self.homeHeaderView.homeBannerView.dataArr = [YHBannerModel.localDefaultItem()]
-        loadFirstData()
-        
-        viewModel.getHomeBanner(0) {[weak self] success, error in
-            guard let self = self else { return }
-            self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? [YHBannerModel.localDefaultItem()]
+        DispatchQueue.global().async {
+            self.loadFirstData()
+            self.viewModel.getHomeBanner(0) {[weak self] success, error in
+                guard let self = self else { return }
+                DispatchQueue.main.async {
+                    self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? [YHBannerModel.localDefaultItem()]
+                }
+            }
         }
+        
     }
     
     func loadMoreData() {
         viewModel.getHomeNewsList(firstPageFlag : false) {[weak self] success, error in
             guard let self = self else { return }
-            homeCollectView.es.stopLoadingMore()
-            
-            if self.viewModel.hasMoreForHomeNews == false {
-                homeCollectView.es.noticeNoMoreData()
-            }
-            self.homeCollectView.reloadItems(at: [IndexPath(index: 0)])
-
+            DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.35, execute: {
+                CATransaction.setDisableActions(true)
+                self.homeCollectView.reloadData()
+                CATransaction.commit()
+                
+                self.homeCollectView.es.stopLoadingMore()
+                if self.viewModel.hasMoreForHomeNews == false {
+                    self.homeCollectView.es.noticeNoMoreData()
+                }
+            })
         }
     }
     
@@ -93,11 +99,18 @@ private extension YHHomePageViewController {
         viewModel.getHomeNewsList(firstPageFlag : true) {[weak self] success, error in
             guard let self = self else { return }
             homeCollectView.es.stopPullToRefresh()
-
+            
             if self.viewModel.hasMoreForHomeNews == false {
                 homeCollectView.es.noticeNoMoreData()
             }
-            self.homeCollectView.reloadItems(at: [IndexPath(index: 0)])
+            
+            DispatchQueue.main.async {
+                CATransaction.setDisableActions(true)
+                self.homeCollectView.reloadData()
+                CATransaction.commit()
+            }
+            
+            
         }
     }
     
@@ -136,6 +149,8 @@ private extension YHHomePageViewController {
         r.origin.y = r.origin.y - YHHomeHeadView.viewH
         tmpHeadView.frame = r
         
+        homeCollectView.showsHorizontalScrollIndicator = false
+        homeCollectView.showsVerticalScrollIndicator = false
         homeCollectView.es.addInfiniteScrolling {
             self.loadMoreData()
         }
@@ -218,7 +233,7 @@ extension YHHomePageViewController : UITabBarControllerDelegate {
             UIApplication.shared.applicationIconBadgeNumber = 0
         }
     }
-
+    
     
     func tabBarController(_ tabBarController: UITabBarController, shouldSelect viewController: UIViewController) -> Bool {
         guard let index = tabBarController.viewControllers?.firstIndex(of: viewController) else {

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

@@ -71,6 +71,8 @@ class YHHomeListModel: YHBaseModel {
             imageHeight = width * imageSize.height/imageSize.width
             if imageHeight > 280 {
                 imageHeight = 280
+            } else if imageHeight < 140 {
+                imageHeight = 140
             }
         }
         

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerCollectionViewCell.swift

@@ -27,6 +27,7 @@ class YHHomeBannerCollectionViewCell: FSPagerViewCell {
         let imagV : UIImageView = UIImageView()
         imagV.contentMode = .scaleAspectFill
         imagV.clipsToBounds = true
+        imagV.image = UIImage(named: "global_default_image")
         return imagV
     }()
     
@@ -86,9 +87,9 @@ private extension YHHomeBannerCollectionViewCell {
             effectV.isHidden = false
             
             if let url = URL(string: model.img_url) {
-//                bannerImagV.kf.setImage(with: url)
                 bannerImagV.kf.setImage(with: url, placeholder: UIImage(named: "global_default_image"))
-
+            } else {
+                bannerImagV.image = UIImage(named: "global_default_image")
             }
             bannerTitleLable.text = model.name
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCustomNavigationBar.swift

@@ -56,6 +56,7 @@ class YHCustomNavigationBar: UIView {
     
     private lazy var rightButton: UIButton = {
         let btn = UIButton()
+        btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
         btn.addTarget(self, action: #selector(didRightButtonClicked), for: .touchUpInside)
         return btn
     }()

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -37,6 +37,10 @@ class YHMessageDetailListVC: YHBaseViewController {
             [weak self] in
             guard let self = self else { return }
             YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {
+                if self.msgArr.count <= 0 {
+                    YHHUD.flash(message: "暂无消息~")
+                    return
+                }
                 self.markAllMsgsRead()
             }
         }
@@ -198,6 +202,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
         if 0 <= indexPath.row && indexPath.row < msgArr.count {
             let item = msgArr[indexPath.row]
             cell.updateModel(item)
+            cell.updateBottomBtn(type: self.type)
         }
         return cell
     }
@@ -207,7 +212,40 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-       
+        
+        if 0 <= indexPath.row && indexPath.row < msgArr.count {
+            let item = msgArr[indexPath.row]
+            printLog("order_id: \(item.orderId)")
+            
+            if self.type == YHMessageType.infoFill.rawValue { // 资料填写
+                if let orderId = Int(item.orderId), orderId > 0 {
+                    let vc = YHInformationPerfectListVC()
+                    vc.orderId = orderId
+                    navigationController?.pushViewController(vc)
+                }
+                
+            } else if self.type == YHMessageType.cerUpload.rawValue { // 证件上传
+                if let orderId = Int(item.orderId), orderId > 0 {
+                    let vc = YHMineCertificateEntryViewController()
+                    vc.orderId = orderId
+                    navigationController?.pushViewController(vc)
+                }
+                
+            } else if self.type == YHMessageType.draft.rawValue { // 文书定稿
+                if let orderId = Int(item.orderId), orderId > 0 {
+                    let vc = YHMyDocumentsListViewController()
+                    vc.orderId = orderId
+                    navigationController?.pushViewController(vc)
+                }
+                
+            } else if self.type == YHMessageType.fileSign.rawValue { // 文件签字
+                if let orderId = Int(item.orderId), orderId > 0 {
+                    let vc = YHMySignatureListViewController()
+                    vc.orderId = orderId
+                    navigationController?.pushViewController(vc)
+                }
+            }
+        }
     }
 
     private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
@@ -242,10 +280,11 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
     
     // 累计出现在屏幕上的未读消息集合
     func addUpAppearUnreadMessages() {
-        guard let visibleIndexPaths = tableView.indexPathsForVisibleRows else { return }
-        for indexPath in visibleIndexPaths {
-            if 0 <= indexPath.row && indexPath.row < msgArr.count {
-                let msgItem = msgArr[indexPath.row]
+        
+        let visibleCells = tableView.visibleCells as! [YHDetailMessageCell]
+        if visibleCells.count <= 0 { return }
+        for cell in visibleCells {
+            if let msgItem = cell.model {
                 if !msgItem.isRead {
                     if !visiblemsgIdSet.contains(msgItem.id) {
                         visiblemsgIdSet.insert(msgItem.id)
@@ -254,6 +293,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
                 }
             }
         }
+        printLog("visiblemsgIdSet:/n \(visiblemsgIdSet)")
     }
 }
 

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift

@@ -15,11 +15,11 @@ class YHMessageListVC: YHBaseViewController {
         let model = YHMsgViewModel()
         return model
     }()
-    
+    var isNotifyEnabled = false
     lazy var tableView: UITableView = {
         
         let tableView = UITableView(frame:.zero, style:.grouped)
-        tableView.sectionHeaderHeight = 42.0
+        tableView.estimatedSectionHeaderHeight = 1.0
         tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
         tableView.separatorStyle = .none
@@ -49,6 +49,10 @@ class YHMessageListVC: YHBaseViewController {
             bar.rightBtnClick = {
                 [weak self] in
                 guard let self = self else { return }
+                if self.msgArr.count <= 0 {
+                    YHHUD.flash(message: "暂无消息~")
+                    return
+                }
                 YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {
                     self.markAllMsgsRead()
                 }
@@ -92,12 +96,13 @@ class YHMessageListVC: YHBaseViewController {
         super.viewWillAppear(animated)
         YHLoginManager.shared.needJumpToMsgTabFlag = false
         getUnreadMsgList()
+        checkNotificationPermisson()
         NotificationCenter.default.post(name: YhConstant.YhNotification.didRequestUnreadMsgTotalCountNotification, object: nil)
-
+        
     }
     
     func setupUI() {
-        
+        addObservers()
         gk_navigationBar.isHidden = true
         view.backgroundColor = .white
         view.addSubview(navBar)
@@ -112,22 +117,29 @@ class YHMessageListVC: YHBaseViewController {
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
             make.bottom.equalToSuperview().offset(-k_Height_TabBar)
         }
-        
+    }
+    
+    func addObservers() {
         NotificationCenter.default.addObserver(self, selector: #selector(loginSuccess), name: YhConstant.YhNotification.didLoginSuccessNotifiction, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(logoutSuccess), name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
-        
+        NotificationCenter.default.addObserver(self, selector: #selector(getUnreadMsgList), name: YhConstant.YhNotification.didRequestUnreadMsgListNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(getUnreadMsgList), name: YhConstant.YhNotification.didRequestUnreadMsgListNotification, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(checkNotificationPermisson), name: YhConstant.YhNotification.didReqeustNotifyPermissionNotification, object: nil)
+    }
+    
+    deinit {
+        NotificationCenter.default.removeObserver(self)
     }
     
     @objc func loginSuccess() {
         printLog("登录成功，进行相应的 UI刷新操作")
-        
     }
     
     @objc func logoutSuccess() {
         
     }
     
-    func getUnreadMsgList() {
+    @objc func getUnreadMsgList() {
         self.viewModel.getUnreadMsgList {
             [weak self] success, error in
             guard let self = self else { return }
@@ -182,6 +194,42 @@ class YHMessageListVC: YHBaseViewController {
             }
         }
     }
+    
+    @objc func checkNotificationPermisson() {
+        checkNotificationAuthorizationStatus {
+            [weak self] granted in
+            guard let self = self else { return }
+            DispatchQueue.main.async {
+                self.isNotifyEnabled = granted
+                self.tableView.reloadData()
+            }
+        }
+    }
+    
+    func checkNotificationAuthorizationStatus(_ callBack:((Bool)->())?) {
+        UNUserNotificationCenter.current().getNotificationSettings { settings in
+            var enableStatus = false
+            switch settings.authorizationStatus {
+            case .authorized:
+                print("通知已授权")
+                enableStatus = true
+            case .denied:
+                print("通知被拒绝")
+                enableStatus = false
+            case .notDetermined:
+                print("通知权限尚未确定")
+                enableStatus = false
+            case .provisional:
+                print("通知以临时方式授权")
+                enableStatus = false
+            case .ephemeral:
+                enableStatus = false
+            @unknown default:
+                break
+            }
+            callBack?(enableStatus)
+        }
+    }
 }
 
 extension YHMessageListVC {
@@ -202,6 +250,10 @@ extension YHMessageListVC {
 
 extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
 
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         return msgArr.count
     }
@@ -232,7 +284,10 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
     }
 
     private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
-        return 42.0
+        if !isNotifyEnabled {
+            return 42.0
+        }
+        return 1.0
     }
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
@@ -246,6 +301,10 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
+        if isNotifyEnabled {
+            return UIView()
+        }
+        
         let view = UIView()
         view.backgroundColor = UIColor(hex: 0x3570DC, alpha: 0.06)
         
@@ -269,10 +328,11 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
             make.right.equalTo(enableBtn.snp.left).offset(-20)
             make.centerY.equalToSuperview()
         }
+        
         enableBtn.snp.makeConstraints { make in
-            make.size.equalTo(CGSize(width: 26, height: 18))
+            make.size.equalTo(CGSize(width: 26, height: 42.0))
             make.right.equalToSuperview().offset(-20)
-            make.centerY.equalToSuperview()
+            make.top.bottom.equalToSuperview()
         }
         return view
     }

galaxy/galaxy/Classes/Modules/Message(消息)/M/YHMsgListModel.swift

@@ -31,6 +31,7 @@ class YHMessageInfoModel: SmartCodable {
         case unreadCount = "unread_count"
         case lastMessage = "last_message"
         case lastMessageTime = "last_message_time"
+        case type = "type"
     }
     
     func getTitle() -> String {
@@ -62,18 +63,21 @@ class YHMsgListModel: SmartCodable {
 }
 
 class YHDetailMessageModel: SmartCodable {
+    
     var id: String = ""
     var title: String = ""
     var content: String = ""
     var time: Int = 0
     var isRead: Bool = false
-    var orderId: Int = 0
+    var orderId: String = ""
     
     required init() {
         
     }
     
     enum CodingKeys: String, CodingKey {
+        case id, title, content, time
+        case isRead = "is_read"
         case orderId = "order_id"
     }
 }

galaxy/galaxy/Classes/Modules/Message(消息)/V/YHDetailMessageCell.swift

@@ -21,6 +21,7 @@ class YHDetailMessageCell: UITableViewCell {
     var bottomBtn:UIButton!
     var lineView:UIView!
     var timeLabel:UILabel!
+    var model:YHDetailMessageModel?
 
     required init?(coder: NSCoder) {
         super.init(coder: coder)
@@ -32,12 +33,28 @@ class YHDetailMessageCell: UITableViewCell {
     }
     
     func updateModel(_ model: YHDetailMessageModel) {
+        self.model = model
         titleLabel.text = model.title
         detailLabel.text = model.content
         unreadPointView.isHidden = model.isRead
         timeLabel.text = formatTimestamp(Double(model.time))
     }
     
+    func updateBottomBtn(type:Int) {
+        if type == YHMessageType.infoFill.rawValue {
+            bottomBtn.setTitle("去填写".local, for: .normal)
+
+        } else if type == YHMessageType.cerUpload.rawValue {
+            bottomBtn.setTitle("去上传".local, for: .normal)
+
+        } else if type == YHMessageType.draft.rawValue {
+            bottomBtn.setTitle("去定稿".local, for: .normal)
+
+        } else if type == YHMessageType.fileSign.rawValue {
+            bottomBtn.setTitle("去签字".local, for: .normal)
+        }
+    }
+    
     func formatTimestamp(_ timestamp: TimeInterval) -> String {
         let currentDate = Date()
         let calendar = Calendar.current
@@ -104,6 +121,7 @@ class YHDetailMessageCell: UITableViewCell {
         whiteView.addSubview(lineView)
 
         bottomBtn = UIButton()
+        bottomBtn.isUserInteractionEnabled = false
         bottomBtn.setTitle("去填写".local, for: .normal)
         bottomBtn.setTitleColor(UIColor(hex: 0x3570DC), for: .normal)
         bottomBtn.titleLabel?.font = .PFSC_R(ofSize: 14)

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyNotifySettingVC.swift

@@ -32,6 +32,22 @@ class YHMyNotifySettingVC: YHBaseViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        checkNotifyPermission()
+    }
+    
+    func setupUI() {
+        gk_navTitle = "通知设置".local
+        view.backgroundColor = .white
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.bottom.equalToSuperview().offset(-k_Height_TabBar)
+        }
+        NotificationCenter.default.addObserver(self, selector: #selector(checkNotifyPermission), name: YhConstant.YhNotification.didReqeustNotifyPermissionNotification, object: nil)
+    }
+    
+    @objc func checkNotifyPermission() {
         checkNotificationAuthorizationStatus {
             [weak self] granted in
             guard let self = self else { return }
@@ -46,17 +62,6 @@ class YHMyNotifySettingVC: YHBaseViewController {
         }
     }
     
-    func setupUI() {
-        gk_navTitle = "通知设置".local
-        view.backgroundColor = .white
-        view.addSubview(tableView)
-        tableView.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
-            make.bottom.equalToSuperview().offset(-k_Height_TabBar)
-        }
-    }
-    
     func checkNotificationAuthorizationStatus(_ callBack:((Bool)->())?) {
         UNUserNotificationCenter.current().getNotificationSettings { settings in
             var enableStatus = false

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyPermissionSettingVC.swift

@@ -137,6 +137,10 @@ class YHMyPermissionSettingVC: YHBaseViewController {
             completion(false)
         }
     }
+    
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
 }
 
 extension YHMyPermissionSettingVC: UITableViewDelegate, UITableViewDataSource {

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -202,5 +202,11 @@ extension YhConstant {
         
         // 请求消息未读总数通知
         public static let didRequestUnreadMsgTotalCountNotification = Notification.Name(rawValue: "com.yinhe.msgPage.unreadMsgTotal")
+        
+        // 请求消息未读列表通知
+        public static let didRequestUnreadMsgListNotification = Notification.Name(rawValue: "com.yinhe.msgPage.unreadList")
+        
+        // 请求通知权限通知
+        public static let didReqeustNotifyPermissionNotification = Notification.Name(rawValue: "com.yinhe.msgPage.notifyPermission")
     }
 }