Merge branch 'jql/phobos' into 'master'

修改埋点device数据

See merge request !38

Example/Podfile.lock

@@ -35,7 +35,7 @@ PODS:
   - GMKit/Protocol (1.1.3):
     - Masonry (= 1.1.0)
     - SDWebImage (= 3.7.6)
-  - GMPhobos (1.2.4):
+  - GMPhobos (1.2.6):
     - GMCache (= 0.2.3)
     - GMKit (= 1.1.3)
   - Masonry (1.1.0)
@@ -63,7 +63,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   GMCache: 09a3029c96fe130e3a21faef70b3d9d2ce92d639
   GMKit: 35f788243cceeddf3e13c5226b3ea0b5e08e2117
-  GMPhobos: b6c688bbd1a4f7ab352dc101a9ae89251d07dbc1
+  GMPhobos: d30e6cfb275bc5d4c8dba2d8907403e7d14863a1
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed

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",