Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

liushiyu
2 parents ea1c2109 64ddccb1
Showing 3 changed files with 39 additions and 24 deletions
metaCode/Classes/Config/CNLiveConfigManager.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -55,4 +55,14 @@ extension Notification.Name {
         //认证身份失败通知
         public static let StandAuthNotificationUnSuccess = Notification.Name("StandAuthNotificationUnSuccess")
     }
+    struct NetworkStatus {
+        //无网状态通知
+        public static let CNLiveNetworkStatusNotificationNotReachable = Notification.Name("CNLiveNetworkStatusNotificationNotReachable")
+        //网络未知状态通知
+        public static let CNLiveNetworkStatusNotificationUnknown = Notification.Name("CNLiveNetworkStatusNotificationUnknown")
+        //蜂窝数据状态通知
+        public static let CNLiveNetworkStatusNotificationReachableViaWWAN = Notification.Name("CNLiveNetworkStatusNotificationReachableViaWWAN")
+        //WIFI状态通知
+        public static let CNLiveNetworkStatusNotificationReachableViaWiFi = Notification.Name("CNLiveNetworkStatusNotificationReachableViaWiFi")
+    }
 }
@@ -184,10 +184,11 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.setupUI()
-        /// 通知名
-        let notificationName = "CNLiveNetworkStatusNotification"
-        /// 自定义通知
-        NotificationCenter.default.addObserver(self, selector: #selector(networkStatusNotificationAction), name: NSNotification.Name(rawValue: notificationName), object: nil)
+        /// 网络通知
+        NotificationCenter.default.addObserver(self, selector: #selector(networkStatusNotificationActionNotReachable), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationNotReachable, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(networkStatusNotificationActionUnknown), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationUnknown, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(networkStatusNotificationActionReachableViaWWAN), name:Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWWAN, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(networkStatusNotificationActionReachableViaWiFi), name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWiFi, object: nil)
 //        self.tabBarController?.tabBar.top = self.tabBarY + KSreenHeight
@@ -233,23 +234,27 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
     // MARK: -事件
+    
     //无网时刷新
     @objc func errorFreshButtonAction(){
         self.getUserIdentityApi()
     }
-    /// 接受到通知后的方法回调
-    @objc private func networkStatusNotificationAction(noti: Notification) {
-        let netStatus:String = noti.object as! String
-        switch netStatus {
-//        case "notReachable"://暂时不处理
-            
-        case "reachableViaWWAN":
-            self.getUserIdentityApi()
-        case "reachableViaWiFi":
-            self.getUserIdentityApi()
-        default:
-            break
-        }
+    
+    /// 网络变为无网
+    @objc func networkStatusNotificationActionNotReachable(){
+        print("11")
+    }
+    /// 网络变为未知
+    @objc func networkStatusNotificationActionUnknown(){
+        print("11")
+    }
+    /// 网络变为蜂窝
+    @objc func networkStatusNotificationActionReachableViaWWAN(){
+        self.getUserIdentityApi()
+    }
+    /// 网络变为WIFI
+    @objc func networkStatusNotificationActionReachableViaWiFi(){
+        self.getUserIdentityApi()
     }
     // MARK: -添加约束
@@ -19,17 +19,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Override point for customization after application launch.
         CNLiveNetworking.networkStatus { status in
-            if(status == .notReachable || status == .unknown){
-                /// 发送简单数据
-                NotificationCenter.default.post(name: NSNotification.Name.init(rawValue: "CNLiveNetworkStatusNotification"), object: "notReachable")
+            if(status == .notReachable){
+                NotificationCenter.default.post(name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationNotReachable, object: nil)
+            }
+            if(status == .unknown){
+                NotificationCenter.default.post(name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationUnknown, object: nil)
             }
             if status == .reachableViaWWAN {
-                /// 发送简单数据
-                NotificationCenter.default.post(name: NSNotification.Name.init(rawValue: "CNLiveNetworkStatusNotification"), object: "reachableViaWWAN")
+                NotificationCenter.default.post(name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWWAN, object: nil)
             }
             if status == .reachableViaWiFi {
-                /// 发送简单数据
-                NotificationCenter.default.post(name: NSNotification.Name.init(rawValue: "CNLiveNetworkStatusNotification"), object: "reachableViaWiFi")
+                NotificationCenter.default.post(name: Notification.Name.NetworkStatus.CNLiveNetworkStatusNotificationReachableViaWiFi, object: nil)
             }
         }