Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
GMPhobos
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
GMPhobos
Commits
479fe535
Commit
479fe535
authored
Dec 26, 2016
by
汪洋
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'wanjun/add_wifi' into 'master'
添加通用参数netStatus See merge request
!5
parents
3a872963
d77f5243
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
Podfile
Example/Podfile
+0
-1
Phobos.h
Pod/Classes/Phobos.h
+4
-5
Phobos.m
Pod/Classes/Phobos.m
+3
-1
UIViewController+Phobos.h
Pod/Classes/UIViewController+Phobos.h
+1
-1
No files found.
Example/Podfile
View file @
479fe535
...
...
@@ -6,7 +6,6 @@ use_frameworks!
target
'GMPhobos_Example'
do
pod
'GMPhobos'
,
:path
=>
'../'
target
'GMPhobos_Tests'
do
inherit!
:search_paths
end
...
...
Pod/Classes/Phobos.h
View file @
479fe535
...
...
@@ -12,6 +12,10 @@
@property
(
strong
,
nonatomic
)
UINavigationController
*
selectedNavigationController
;
/**
网络状态
*/
@property
(
nonatomic
,
copy
)
NSString
*
netStatus
;
/**
* @brief 开启Phobos统计,默认以BATCH方式发送log.
...
...
@@ -25,11 +29,6 @@
*/
+
(
Phobos
*
)
clientWithAppName
:(
NSString
*
)
appName
channelId
:(
NSString
*
)
channelId
;
+
(
instancetype
)
sharedClient
;
+
(
void
)
setSharedClient
:(
Phobos
*
)
client
;
/**
* @brief 设置是否打印sdk的log信息,默认不开启
*
...
...
Pod/Classes/Phobos.m
View file @
479fe535
...
...
@@ -56,6 +56,7 @@ static NSString *sdkVersion = @"110";
_userId
=
0
;
_lat
=
@""
;
_lng
=
@""
;
_netStatus
=
@""
;
_currentCityId
=
@""
;
_appVersion
=
[
self
getAppVersion
];
[
self
setupNotification
];
...
...
@@ -335,7 +336,8 @@ static NSString *sdkVersion = @"110";
@"ios"
,
@"device_type"
,
@"Apple"
,
@"manufacturer"
,
_lat
,
@"lat"
,
_lng
,
@"lng"
,
nil
];
_lng
,
@"lng"
,
_netStatus
,
@"is_WiFi"
,
nil
];
NSMutableDictionary
*
appParams
=
[
NSMutableDictionary
dictionaryWithObjectsAndKeys
:
self
.
appName
,
@"name"
,
self
.
appVersion
,
@"version"
,
...
...
Pod/Classes/UIViewController+Phobos.h
View file @
479fe535
...
...
@@ -44,7 +44,7 @@
@property
(
nonatomic
,
copy
,
nonnull
)
NSString
*
inTime
;
/**
<#Description#>
hu
*/
@property
(
nonatomic
,
copy
,
nonnull
)
NSString
*
referrerId
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment