From f12c6140ca29072a3e557d201448c8b429532667 Mon Sep 17 00:00:00 2001 From: EyreFree Date: Thu, 15 Aug 2019 14:40:12 +0800 Subject: [PATCH] 0.2.0 --- EFFoundation.podspec | 2 +- EFFoundation/Classes/Reachability+.swift | 29 ++++++++++++-------- EFFoundation/Classes/UIViewController+.swift | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/EFFoundation.podspec b/EFFoundation.podspec index fdbdd21..a11251f 100644 --- a/EFFoundation.podspec +++ b/EFFoundation.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'EFFoundation' - s.version = '0.1.0' + s.version = '0.2.0' s.summary = 'EFFoundation.' s.description = <<-DESC diff --git a/EFFoundation/Classes/Reachability+.swift b/EFFoundation/Classes/Reachability+.swift index 19c94bb..bb10bcd 100644 --- a/EFFoundation/Classes/Reachability+.swift +++ b/EFFoundation/Classes/Reachability+.swift @@ -19,15 +19,22 @@ public enum NetworkType { case wwan4g case unknownTechnology(name: String) - var trackingId: String { + public var trackingId: String { switch self { - case .unknown: return "Unknown" - case .noConnection: return "No Connection" - case .wifi: return "WiFi" - case .wwan2g: return "2G" - case .wwan3g: return "3G" - case .wwan4g: return "4G" - case .unknownTechnology(let name): return "Unknown Technology: \"\(name)\"" + case .unknown: + return "Unknown" + case .noConnection: + return "No Connection" + case .wifi: + return "WiFi" + case .wwan2g: + return "2G" + case .wwan3g: + return "3G" + case .wwan4g: + return "4G" + case .unknownTechnology(let name): + return "Unknown Technology: \"\(name)\"" } } } @@ -44,14 +51,14 @@ public extension Reachability { case .wifi: return .wifi case .cellular: - return Reachability.getWWANNetworkType + return Reachability.wwanNetworkType } } catch { return .unknown } } - static var getWWANNetworkType: NetworkType { + static var wwanNetworkType: NetworkType { guard let currentRadioAccessTechnology = CTTelephonyNetworkInfo().currentRadioAccessTechnology else { return .unknown } switch currentRadioAccessTechnology { case CTRadioAccessTechnologyGPRS, @@ -73,7 +80,7 @@ public extension Reachability { } } - static var getIPAddresses: String? { + static var ipAddresses: String? { var addresses: [String] = [String]() var ifaddr : UnsafeMutablePointer? = nil diff --git a/EFFoundation/Classes/UIViewController+.swift b/EFFoundation/Classes/UIViewController+.swift index c594061..e506d6b 100644 --- a/EFFoundation/Classes/UIViewController+.swift +++ b/EFFoundation/Classes/UIViewController+.swift @@ -9,7 +9,7 @@ import Foundation public extension UIViewController { - var topView: UIView { + var zTopView: UIView { var recentVC = self while let parentVC = recentVC.parent { recentVC = parentVC