Merge commit '83c5d16e' into xiezhaolin

galaxy/galaxy/Applegate(JPush).swift

@@ -95,7 +95,6 @@ extension AppDelegate: JPUSHRegisterDelegate {
         completionHandler()
         
         // 转换到消息tab
-        
         YHLoginManager.shared.needJumpToMsgTabFlag = true
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.25, execute: {
             goTabBarBy(tabType: .message)

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

@@ -66,9 +66,14 @@ private extension YHHomePageViewController {
     }
     
     func getData() {
-        self.homeHeaderView.homeBannerView.dataArr = [YHBannerModel.localDefaultItem()]
+        homeHeaderView.homeBannerView.dataArr = [YHBannerModel.localDefaultItem()]
+        loadFirstData()
+        getHomeBannerData()
+        
+    }
+    
+    func getHomeBannerData() {
         DispatchQueue.global().async {
-            self.loadFirstData()
             self.viewModel.getHomeBanner(0) {[weak self] success, error in
                 guard let self = self else { return }
                 DispatchQueue.main.async {
@@ -76,41 +81,43 @@ private extension YHHomePageViewController {
                 }
             }
         }
-        
     }
     
     func loadMoreData() {
-        viewModel.getHomeNewsList(firstPageFlag : false) {[weak self] success, error in
-            guard let self = self else { return }
-            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()
-                }
-            })
+        DispatchQueue.global().async {
+            self.viewModel.getHomeNewsList(firstPageFlag : false) {[weak self] success, error in
+                guard let self = self else { return }
+                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()
+                    }
+                })
+            }
         }
     }
     
     func loadFirstData() {
-        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()
-            }
-            
-            DispatchQueue.main.async {
-                CATransaction.setDisableActions(true)
-                self.homeCollectView.reloadData()
-                CATransaction.commit()
+        DispatchQueue.global().async {
+            self.viewModel.getHomeNewsList(firstPageFlag : true) {[weak self] success, error in
+                guard let self = self else { return }
+                
+                
+                DispatchQueue.main.async {
+                    self.homeCollectView.es.stopPullToRefresh()
+                    if self.viewModel.hasMoreForHomeNews == false {
+                        self.homeCollectView.es.noticeNoMoreData()
+                    }
+                    
+                    CATransaction.setDisableActions(true)
+                    self.homeCollectView.reloadData()
+                    CATransaction.commit()
+                }
             }
-            
-            
         }
     }
     

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

@@ -68,17 +68,34 @@ class YHMyPermissionSettingVC: YHBaseViewController {
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
             make.bottom.equalToSuperview().offset(-k_Height_TabBar)
         }
+        NotificationCenter.default.addObserver(self, selector: #selector(updateNetWorkStatus), name: .reachabilityChanged, object: nil)
+            
+    }
+    
+    @objc func updateNetWorkStatus() {
+        for item in items {
+            if item.type == .network {
+                DispatchQueue.main.async {
+                    item.enableStatus = YHNetworkStatusManager.shared.isNetWorkOK
+                    self.tableView.reloadData()
+                }
+            }
+        }
     }
     
     func requestPermission() {
+        
+        updateNetWorkStatus()
         // 获取相册权限
         requestPhotoLibraryPermission {
             [weak self] grant in
             guard let self = self else { return }
             for item in items {
                 if item.type == .photo {
-                    item.enableStatus = grant
-                    self.tableView.reloadData()
+                    DispatchQueue.main.async {
+                        item.enableStatus = grant
+                        self.tableView.reloadData()
+                    }
                 }
             }
         }
@@ -89,8 +106,10 @@ class YHMyPermissionSettingVC: YHBaseViewController {
             guard let self = self else { return }
             for item in items {
                 if item.type == .camera {
-                    item.enableStatus = grant
-                    self.tableView.reloadData()
+                    DispatchQueue.main.async {
+                        item.enableStatus = grant
+                        self.tableView.reloadData()
+                    }
                 }
             }
         }
@@ -167,6 +186,7 @@ extension YHMyPermissionSettingVC: UITableViewDelegate, UITableViewDataSource {
             
         let url = URL(string: UIApplication.openSettingsURLString)
         if let url = url, UIApplication .shared.canOpenURL(url) {
+            printLog("settingUrl:\(url)")
             UIApplication .shared.open(url, options: [:], completionHandler: {
                 (success) in
             })