Skip to content

GMPhobos
GMPhobos
Commit 759845fe authored by yueming lu's avatar yueming lu
Browse files
Options

Merge branch 'master' into lym/phobos 

* master: (23 commits)
  Bump version to 2.1.6
  Bump version to 2.1.5
  无效的小改
  修改bug
  Bump version to 2.1.5
  修改bug
  Bump version to 2.1.4
  修改isFirst 避免冲突
  Bump version to 2.1.3
  修改isFirst 问题
  Bump version to 2.1.2
  修改is_first赋值位置
  Bump version to 2.1.1
  modify phobos isfirst 类型
  Bump version to 2.1.0
  暂提
  修改is_first逻辑
  Bump version to 2.0.9
  修改类型转换
  暂提
  ...

# Conflicts:
#	Example/GMPhobos/GMViewController.m
#	Example/Podfile.lock
parents 7e3b36f1 b69e3137
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 31 deletions
Example/GMPhobos/GMViewController.m
View file @ 759845fe
......@@ -145,6 +145,7 @@ NSString *const MockCityId = @"beijing";
[dict setObject:@(0) forKey:@"is_push"];
NSString *name = [NSString stringWithFormat:@"page_view-%d", index];
[Phobos track:name attributes:dict];
}
- (void)sdk {
......
Example/Podfile.lock
View file @ 759845fe
......@@ -4,7 +4,7 @@ PODS:
- FMDB/standard (2.7.5)
- GMCache (1.0.1):
- TMCache (= 2.1.0)
- GMPhobos (2.0.7):
- GMPhobos (2.1.6):
- FMDB
- GMCache
- MJExtension
......@@ -29,7 +29,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
GMCache: b78d8e46db864405e91d226ce640cc80d966c611
GMPhobos: eee96b9eb4c381183e01ae71f1df2deefb0ec0b1
GMPhobos: 362953ef30431bd6a5bb4d96acdf9b9f55cedf32
MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
......
GMPhobos.podspec
View file @ 759845fe
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = "GMPhobos"
s.version = "2.0.7"
s.version = "2.1.6"
s.summary = "GM statistic data sdk"
s.description = <<-DESC
......
GMPhobos/Classes/Exposure/GMExposureManager.m
View file @ 759845fe
......@@ -333,7 +333,6 @@
pageCtrl.down_loading_times = 0;
pageCtrl.up_slide_times = 0;
pageCtrl.down_slide_times = 0;
pageCtrl.extra_param = [NSDictionary dictionary];
NSString *pageName = [GMExposureManager exposureKeyForPage:pageCtrl];
......
GMPhobos/Classes/NewPhobos.m
View file @ 759845fe
......@@ -257,6 +257,9 @@ static NewPhobos *_sharedClient;
- (void)onPVEnd:(UIResponder<PhobosPVProtocol> *)page {
if (![PhobosUtil isNonEmpty:page.pageName] || !page.needLogPV) {
if (!page.isFirstEntry) {
page.isFirstEntry = YES;
}
return;
}
// 业务层更新
......@@ -279,7 +282,11 @@ static NewPhobos *_sharedClient;
[dict setObject:PhobosSafeString(page.messageId) forKey:@"message_id"];
[dict setObject:PhobosSafeString(page.inTimeMillis) forKey:@"in_time_millis"];
[dict setObject:PhobosSafeString([PhobosUtil currentMMTime]) forKey:@"out_time_millis"];
//首次进来为1，再次进入的时候都为0
[dict setObject:page.isFirstEntry ? @(0):@(1) forKey:@"is_first"];
if (!page.isFirstEntry) {
page.isFirstEntry = YES;
}
if (page.inTime.length > 0) {
// 页面显示时间为空时不记录页面pv事件
[NewPhobos track:@"page_view" attributes:dict];
......
GMPhobos/Classes/OldPhobos.m
View file @ 759845fe
......@@ -341,6 +341,9 @@ static OldPhobos *sharedClient = nil;
- (void)onPVEnd:(UIResponder<PhobosPVProtocol> *)page {
if (![PhobosUtil isNonEmpty:page.pageName] || !page.needLogPV) {
if (!page.isFirstEntry) {
page.isFirstEntry = YES;
}
return;
}
// 业务层更新
......@@ -363,7 +366,11 @@ static OldPhobos *sharedClient = nil;
[dict setObject:PhobosSafeString(page.messageId) forKey:@"message_id"];
[dict setObject:PhobosSafeString(page.inTimeMillis) forKey:@"in_time_millis"];
[dict setObject:PhobosSafeString([PhobosUtil currentMMTime]) forKey:@"out_time_millis"];
//首次进来为1，再次进入的时候都为0
[dict setObject:page.isFirstEntry ? @(0):@(1) forKey:@"is_first"];
if (!page.isFirstEntry) {
page.isFirstEntry = YES;
}
if (page.inTime.length > 0) {
// 页面显示时间为空时不记录页面pv事件
[OldPhobos track:@"page_view" attributes:dict];
......
GMPhobos/Classes/Phobos.m
View file @ 759845fe
......@@ -136,7 +136,7 @@ static BOOL isGray = NO;
*/
- (void)onPVEnd:(UIResponder<PhobosPVProtocol> *)page {
[_rePhobos onPVEnd:page];
[_oldPhobos onPVEnd:page];
[_oldPhobos onPVEnd:page];
}
/**
......
GMPhobos/Classes/PhobosPVProtocol.h
View file @ 759845fe
......@@ -89,6 +89,11 @@ typedef void(^PhobosUpdatePVBlock)(void);
获取上一个页面链路的page_name link by 7.20.0 如果有此页面有page_name则添加 ， 没有添加""
*/
@property (nonatomic, strong) NSArray *referrerLink;
/**
是否是第一次来到这个页面，在viewDidLoad赋值为1
在即将消失的方法赋值为0 (是否是首次上报)
*/
@property (nonatomic, assign) BOOL isFirstEntry;
/// 业务层更新PVStart信息
@property (nonatomic, copy) PhobosUpdatePVBlock updatePVStartBlock;
......
GMPhobos/Classes/UIResponder+PhobosPV.m
View file @ 759845fe
......@@ -94,7 +94,7 @@
*/
- (void)initReferrerTabName {
// 只有是controller的情况下才自动获取
if ([self isKindOfClass:[UIViewController class]]) {
if ([self.referrerTabName isEqualToString:@""] && [self isKindOfClass:[UIViewController class]]) {
// 分present与navigation两种情况
UIViewController *me = (UIViewController *)self;
if (me.presentingViewController != nil) {
......@@ -254,6 +254,15 @@
objc_setAssociatedObject(self, @selector(updatePVStartBlock), updatePVStartBlock, OBJC_ASSOCIATION_COPY_NONATOMIC);
}
- (void)setIsFirstEntry:(BOOL)isFirstEntry {
objc_setAssociatedObject(self, @selector(isFirstEntry), @(isFirstEntry), OBJC_ASSOCIATION_ASSIGN);
}
-(BOOL)isFirstEntry {
NSNumber *num = objc_getAssociatedObject(self, _cmd);
return [num boolValue];
}
- (PhobosUpdatePVBlock)updatePVStartBlock {
PhobosUpdatePVBlock updatePVBlock = objc_getAssociatedObject(self, @selector(updatePVStartBlock));
return updatePVBlock;
......
fastlane/README.md
View file @ 759845fe
......@@ -12,7 +12,7 @@ Install _fastlane_ using
```
[sudo] gem install fastlane -NV
```
or alternatively using `brew cask install fastlane`
or alternatively using `brew install fastlane`
# Available Actions
## iOS
......
fastlane/report.xml
View file @ 759845fe
......@@ -5,57 +5,44 @@
<testcase classname="fastlane.lanes" name="00: Verifying fastlane version" time="0.00891">
<testcase classname="fastlane.lanes" name="0: Verifying fastlane version" time="0.01987">
</testcase>
<testcase classname="fastlane.lanes" name="01: default_platform" time="0.001263">
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.005539">
</testcase>
<testcase classname="fastlane.lanes" name="02: git_pull" time="1.22629">
<testcase classname="fastlane.lanes" name="2: git_pull" time="1.628833">
</testcase>
<testcase classname="fastlane.lanes" name="03: pod_repo_update" time="1.785333">
<testcase classname="fastlane.lanes" name="3: pod_repo_update" time="2.621">
</testcase>
<testcase classname="fastlane.lanes" name="04: pod_lib_lint" time="34.634979">
<testcase classname="fastlane.lanes" name="4: pod_lib_lint" time="9.539578">
</testcase>
<testcase classname="fastlane.lanes" name="05: version_bump_podspec" time="0.002126">
<testcase classname="fastlane.lanes" name="5: version_bump_podspec" time="0.007658">
</testcase>
<testcase classname="fastlane.lanes" name="06: git_commit_all" time="0.020202">
<testcase classname="fastlane.lanes" name="6: git_commit_all" time="0.035696">
</testcase>
<testcase classname="fastlane.lanes" name="07: add_git_tag" time="0.012076">
<testcase classname="fastlane.lanes" name="7: add_git_tag" time="0.014729">
</testcase>
<testcase classname="fastlane.lanes" name="08: push_to_git_remote" time="1.006393">
</testcase>
<testcase classname="fastlane.lanes" name="09: pod_push" time="9.815923">
</testcase>
<testcase classname="fastlane.lanes" name="10: pod_repo_update" time="1.440818">
<failure message="/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/actions/actions_helper.rb:48:in `execute_action'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/runner.rb:255:in `block in execute_action'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/runner.rb:229:in `chdir'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/runner.rb:229:in `execute_action'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/runner.rb:157:in `trigger_action_by_name'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/fast_file.rb:159:in `method_missing'&#10;Fastfile:55:in `block (2 levels) in parsing_binding'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/lane.rb:33:in `call'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/runner.rb:49:in `block in execute'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/runner.rb:45:in `chdir'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/runner.rb:45:in `execute'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/lane_manager.rb:47:in `cruise_lane'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/command_line_handler.rb:36:in `handle'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/commands_generator.rb:108:in `block (2 levels) in run'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/commander-fastlane-4.4.6/lib/commander/command.rb:178:in `call'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/commander-fastlane-4.4.6/lib/commander/command.rb:153:in `run'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/commander-fastlane-4.4.6/lib/commander/runner.rb:476:in `run_active_command'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane_core/lib/fastlane_core/ui/fastlane_runner.rb:76:in `run!'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/commander-fastlane-4.4.6/lib/commander/delegates.rb:15:in `run!'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/commands_generator.rb:352:in `run'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/commands_generator.rb:41:in `start'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/fastlane/lib/fastlane/cli_tools_distributor.rb:119:in `take_off'&#10;/Users/gm/.rvm/rubies/ruby-2.6.0-preview2/lib/ruby/gems/2.6.0/gems/fastlane-2.153.1/bin/fastlane:23:in `&lt;top (required)&gt;'&#10;/Users/gm/.rvm/gems/ruby-2.6.0-preview2/bin/fastlane:23:in `load'&#10;/Users/gm/.rvm/gems/ruby-2.6.0-preview2/bin/fastlane:23:in `&lt;main&gt;'&#10;&#10;Exit status of command 'git tag -am 2.1.5\ \(fastlane\) 2.1.5' was 128 instead of 0.&#10;fatal: tag '2.1.5' already exists&#10;" />
</testcase>
......
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