修改埋点device数据

Example/Podfile.lock

 PODS:
   - GMCache (0.2.3):
     - TMCache (= 2.1.0)
-  - GMKit (0.8.4):
-    - GMKit/Category (= 0.8.4)
-    - GMKit/Color (= 0.8.4)
-    - GMKit/Constant (= 0.8.4)
-    - GMKit/FDFullscreenPopGesture (= 0.8.4)
-    - GMKit/Kit (= 0.8.4)
-    - GMKit/Protocol (= 0.8.4)
+  - GMKit (1.1.3):
+    - GMKit/Category (= 1.1.3)
+    - GMKit/Color (= 1.1.3)
+    - GMKit/Constant (= 1.1.3)
+    - GMKit/FDFullscreenPopGesture (= 1.1.3)
+    - GMKit/Kit (= 1.1.3)
+    - GMKit/Protocol (= 1.1.3)
     - Masonry (= 1.1.0)
     - SDWebImage (= 3.7.6)
-  - GMKit/Category (0.8.4):
-    - GMKit/Color (= 0.8.4)
-    - GMKit/Constant (= 0.8.4)
-    - GMKit/Protocol (= 0.8.4)
+  - GMKit/Category (1.1.3):
+    - GMKit/Color (= 1.1.3)
+    - GMKit/Constant (= 1.1.3)
+    - GMKit/Protocol (= 1.1.3)
     - Masonry (= 1.1.0)
     - SDWebImage (= 3.7.6)
-  - GMKit/Color (0.8.4):
+  - GMKit/Color (1.1.3):
     - Masonry (= 1.1.0)
     - SDWebImage (= 3.7.6)
-  - GMKit/Constant (0.8.4):
+  - GMKit/Constant (1.1.3):
     - Masonry (= 1.1.0)
     - SDWebImage (= 3.7.6)
-  - GMKit/FDFullscreenPopGesture (0.8.4):
+  - GMKit/FDFullscreenPopGesture (1.1.3):
     - Masonry (= 1.1.0)
     - SDWebImage (= 3.7.6)
-  - GMKit/Kit (0.8.4):
-    - GMKit/Category (= 0.8.4)
-    - GMKit/Color (= 0.8.4)
-    - GMKit/Constant (= 0.8.4)
-    - GMKit/Protocol (= 0.8.4)
+  - GMKit/Kit (1.1.3):
+    - GMKit/Category (= 1.1.3)
+    - GMKit/Color (= 1.1.3)
+    - GMKit/Constant (= 1.1.3)
+    - GMKit/Protocol (= 1.1.3)
     - Masonry (= 1.1.0)
     - SDWebImage (= 3.7.6)
-  - GMKit/Protocol (0.8.4):
+  - GMKit/Protocol (1.1.3):
     - Masonry (= 1.1.0)
     - SDWebImage (= 3.7.6)
-  - GMPhobos (1.2.1):
+  - GMPhobos (1.2.3):
     - GMCache (= 0.2.3)
-    - GMKit
+    - GMKit (= 1.1.3)
   - Masonry (1.1.0)
   - SDWebImage (3.7.6):
     - SDWebImage/Core (= 3.7.6)
@@ -62,8 +62,8 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   GMCache: 09a3029c96fe130e3a21faef70b3d9d2ce92d639
-  GMKit: a30da06b84e5c4a357d427c70d1b5ec672a1f6a1
-  GMPhobos: e172fa58e6f2051649bbaf3552f6860b3dc99ad0
+  GMKit: 35f788243cceeddf3e13c5226b3ea0b5e08e2117
+  GMPhobos: 01cc63ee852d13a1fb8a9bea3608e60bcd5af5b8
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed

GMPhobos.podspec

@@ -25,7 +25,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, '8.0'
   s.source_files = 'GMPhobos/Classes/*.{h,m}'
   s.dependency 'GMCache', '0.2.3'
-  s.dependency 'GMKit'
+  s.dependency 'GMKit', '1.1.3'
   s.library   = 'z'
 
 end

GMPhobos/Classes/Phobos.h

@@ -45,6 +45,18 @@ typedef NS_ENUM (NSInteger, PhobosSigningType) {
  网络状态 wifi=1, mobile=0, 不连通=-1
  */
 @property (nonatomic, copy) NSString *netStatus;
+/**
+ //没有网络连接
+ public static final String NETWORN_NONE = "none";
+ //wifi连接
+ public static final String NETWORN_WIFI = "wifi";
+ //手机网络数据连接类型
+ public static final String NETWORN_2G = "2G";
+ public static final String NETWORN_3G = "3G";
+ public static final String NETWORN_4G = "4G";
+ public static final String NETWORN_MOBILE = "other";
+ */
+@property (nonatomic, copy) NSString *networkStatus;
 
 /**
  *  @brief 设置是否打印sdk的log信息,默认不开启

GMPhobos/Classes/Phobos.m

@@ -404,9 +404,10 @@ static NSString *sdkVersion = @"110";
                                              @(self.gps.coordinate.latitude),@"lat",
                                              @(self.gps.coordinate.longitude),@"lng",
                                              _netStatus,@"is_WiFi",
-                                             [UIDevice platform],@"model",
-                                             [UIDevice currentDevice].systemVersion,@"sys_version",
                                              [PhobosUtil getIPAddress:YES],@"ip",nil];
+        [deviceParams setValue:_networkStatus forKey:@"net_type"];
+        [deviceParams setValue:[UIDevice platform] forKey:@"model"];
+        [deviceParams setValue:[UIDevice currentDevice].systemVersion forKey:@"sys_version"];
         NSMutableDictionary *appParams   = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                                             _greyType, @"grey_type",
                                             self.appName, @"name",