x

Author: lintianzhi

QiniuSDK/Http/QNStats.h

@@ -22,7 +22,7 @@
 #if TARGET_OS_IPHONE
 @property (nonatomic, readonly) QNReachability *wifiReach;
 @property (nonatomic, readonly) CTTelephonyNetworkInfo *telephonyInfo;
-@property (atomic, readonly) NetworkStatus reachabilityStatus;
+@property (atomic, readonly) QNNetworkStatus reachabilityStatus;
 #endif
 
 @property (nonatomic,retain) NSTimer *pushTimer;

QiniuSDK/Http/QNStats.m

@@ -136,7 +136,7 @@ - (instancetype) initWithPushInterval: (int) interval
 	 usingBlock:^(NSNotification *note) {
 	         _reachabilityStatus = _wifiReach.currentReachabilityStatus;
 
-	         if (_reachabilityStatus != NotReachable) {
+	         if (_reachabilityStatus != QNNotReachable) {
 	                 [self getOutIp];
 		 }
 	 }];
@@ -203,7 +203,7 @@ - (void) pushStats {
 	@synchronized(self) {
 
 #if TARGET_OS_IPHONE
-		if (_reachabilityStatus == NotReachable) {
+		if (_reachabilityStatus == QNNotReachable) {
 			return;
 		}
 #endif
@@ -278,9 +278,9 @@ - (NSString *) getSIP {
 
 - (NSString *) getNetType {
 #if TARGET_OS_IPHONE
-	if (_reachabilityStatus == ReachableViaWiFi) {
+	if (_reachabilityStatus == QNReachableViaWiFi) {
 		return @"wifi";
-	} else if (_reachabilityStatus == ReachableViaWWAN) {
+	} else if (_reachabilityStatus == QNReachableViaWWAN) {
 		return @"wan";
 	}
 #elif TARGET_OS_MAC

QiniuSDK/QNReachability/QNReachability.h

@@ -1,35 +1,35 @@
 /*
- Copyright (c) 2011, Tony Million.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- 1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- 
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE. 
+   Copyright (c) 2011, Tony Million.
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+   LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+   CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+   SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+   INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+   CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+   POSSIBILITY OF SUCH DAMAGE.
  */
 
 #import <Foundation/Foundation.h>
 #import <SystemConfiguration/SystemConfiguration.h>
 
 
-/** 
+/**
  * Create NS_ENUM macro if it does not exist on the targeted version of iOS or OS X.
  *
  * @see http://nshipster.com/ns_enum-ns_options/
@@ -38,15 +38,16 @@
 #define NS_ENUM(_type, _name) enum _name : _type _name; enum _name : _type
 #endif
 
-extern NSString *const kQNReachabilityChangedNotification;
 
-typedef NS_ENUM(NSInteger, NetworkStatus) {
-    // Apple NetworkStatus Compatible Names.
-    NotReachable = 0,
-    ReachableViaWiFi = 2,
-    ReachableViaWWAN = 1
+typedef NS_ENUM (NSInteger, QNNetworkStatus) {
+	// Apple NetworkStatus Compatible Names.
+	QNNotReachable = 0,
+	QNReachableViaWiFi = 2,
+	QNReachableViaWWAN = 1
 };
 
+extern NSString *const kQNReachabilityChangedNotification;
+
 @class QNReachability;
 
 typedef void (^NetworkReachable)(QNReachability * reachability);
@@ -55,8 +56,8 @@ typedef void (^NetworkUnreachable)(QNReachability * reachability);
 
 @interface QNReachability : NSObject
 
-@property (nonatomic, copy) NetworkReachable    reachableBlock;
-@property (nonatomic, copy) NetworkUnreachable  unreachableBlock;
+@property (nonatomic, copy) NetworkReachable reachableBlock;
+@property (nonatomic, copy) NetworkUnreachable unreachableBlock;
 
 @property (nonatomic, assign) BOOL reachableOnWWAN;
 
@@ -87,7 +88,7 @@ typedef void (^NetworkUnreachable)(QNReachability * reachability);
 // Is user intervention required?
 -(BOOL)isInterventionRequired;
 
--(NetworkStatus)currentReachabilityStatus;
+-(QNNetworkStatus)currentReachabilityStatus;
 -(SCNetworkReachabilityFlags)reachabilityFlags;
 -(NSString*)currentReachabilityString;
 -(NSString*)currentReachabilityFlags;

QiniuSDK/QNReachability/QNReachability.m

@@ -382,19 +382,19 @@ -(BOOL)isInterventionRequired
 
 #pragma mark - reachability status stuff
 
--(NetworkStatus)currentReachabilityStatus
+-(QNNetworkStatus)currentReachabilityStatus
 {
     if([self isReachable])
     {
         if([self isReachableViaWiFi])
-            return ReachableViaWiFi;
+            return QNReachableViaWiFi;
 
 #if	TARGET_OS_IPHONE
-        return ReachableViaWWAN;
+        return QNReachableViaWWAN;
 #endif
     }
 
-    return NotReachable;
+    return QNNotReachable;
 }
 
 -(SCNetworkReachabilityFlags)reachabilityFlags
@@ -411,14 +411,14 @@ -(SCNetworkReachabilityFlags)reachabilityFlags
 
 -(NSString*)currentReachabilityString
 {
-	NetworkStatus temp = [self currentReachabilityStatus];
+	QNNetworkStatus temp = [self currentReachabilityStatus];
 
-	if(temp == ReachableViaWWAN)
+	if(temp == QNReachableViaWWAN)
 	{
         // Updated for the fact that we have CDMA phones now!
 		return NSLocalizedString(@"Cellular", @"");
 	}
-	if (temp == ReachableViaWiFi) 
+	if (temp == QNReachableViaWiFi)
 	{
 		return NSLocalizedString(@"WiFi", @"");
 	}