Commit 479fe535 authored by 汪洋's avatar 汪洋

Merge branch 'wanjun/add_wifi' into 'master'

添加通用参数netStatus



See merge request !5
parents 3a872963 d77f5243
...@@ -6,7 +6,6 @@ use_frameworks! ...@@ -6,7 +6,6 @@ use_frameworks!
target 'GMPhobos_Example' do target 'GMPhobos_Example' do
pod 'GMPhobos', :path => '../' pod 'GMPhobos', :path => '../'
target 'GMPhobos_Tests' do target 'GMPhobos_Tests' do
inherit! :search_paths inherit! :search_paths
end end
......
...@@ -12,6 +12,10 @@ ...@@ -12,6 +12,10 @@
@property (strong, nonatomic) UINavigationController *selectedNavigationController; @property (strong, nonatomic) UINavigationController *selectedNavigationController;
/**
网络状态
*/
@property (nonatomic, copy) NSString *netStatus;
/** /**
* @brief 开启Phobos统计,默认以BATCH方式发送log. * @brief 开启Phobos统计,默认以BATCH方式发送log.
...@@ -25,11 +29,6 @@ ...@@ -25,11 +29,6 @@
*/ */
+ (Phobos *)clientWithAppName:(NSString *)appName channelId:(NSString *)channelId; + (Phobos *)clientWithAppName:(NSString *)appName channelId:(NSString *)channelId;
+ (instancetype)sharedClient;
+ (void)setSharedClient:(Phobos *)client;
/** /**
* @brief 设置是否打印sdk的log信息,默认不开启 * @brief 设置是否打印sdk的log信息,默认不开启
* *
......
...@@ -56,6 +56,7 @@ static NSString *sdkVersion = @"110"; ...@@ -56,6 +56,7 @@ static NSString *sdkVersion = @"110";
_userId = 0; _userId = 0;
_lat = @""; _lat = @"";
_lng = @""; _lng = @"";
_netStatus = @"";
_currentCityId = @""; _currentCityId = @"";
_appVersion = [self getAppVersion]; _appVersion = [self getAppVersion];
[self setupNotification]; [self setupNotification];
...@@ -335,7 +336,8 @@ static NSString *sdkVersion = @"110"; ...@@ -335,7 +336,8 @@ static NSString *sdkVersion = @"110";
@"ios",@"device_type", @"ios",@"device_type",
@"Apple",@"manufacturer", @"Apple",@"manufacturer",
_lat,@"lat", _lat,@"lat",
_lng,@"lng",nil]; _lng,@"lng",
_netStatus,@"is_WiFi",nil];
NSMutableDictionary *appParams = [NSMutableDictionary dictionaryWithObjectsAndKeys: NSMutableDictionary *appParams = [NSMutableDictionary dictionaryWithObjectsAndKeys:
self.appName, @"name", self.appName, @"name",
self.appVersion, @"version", self.appVersion, @"version",
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
@property (nonatomic, copy, nonnull) NSString *inTime; @property (nonatomic, copy, nonnull) NSString *inTime;
/** /**
<#Description#> hu
*/ */
@property (nonatomic, copy, nonnull) NSString *referrerId; @property (nonatomic, copy, nonnull) NSString *referrerId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment