Merge branch 'ajp/7.14.0_dev' into 'master'

1.2.9

See merge request !41

GMPhobos.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "GMPhobos"
-  s.version          = "1.2.9"
+  s.version          = "1.3.0"
   s.summary          = "GM statistic data sdk"
 
   s.description      = <<-DESC
@@ -24,8 +24,8 @@ 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',   '1.1.3'
+  s.dependency 'GMCache'
+  s.dependency 'GMKit'
   s.library   = 'z'
 
 end

GMPhobos/Classes/Phobos.h

@@ -10,6 +10,8 @@
 #import "PhobosPVProtocol.h"
 #import <CoreLocation/CLLocation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
 typedef NS_ENUM (NSInteger, PhobosSigningType) {
     PhobosSigningTypeUndefined = 0,
     PhobosSigningTypeAppStore,
@@ -182,3 +184,4 @@ typedef NS_ENUM (NSInteger, PhobosSigningType) {
 - (void)simulativePV:(NSString *)pageName businessId:(NSString *)bid referer:(NSString *)referer;
 
 @end
+NS_ASSUME_NONNULL_END

GMPhobos/Classes/Phobos.m

@@ -490,12 +490,13 @@ static NSString *sdkVersion = @"110";
                             phobosLog(@"两个埋点inTime 时间差------%f", (fabsl(objInTime - pageInTime)));
                             phobosLog(@"两个埋点outTime 时间差------%f", (fabsl(objOutTime - pageOutTime)));
                             checkTimeError = YES;
-                            phobosLog(@"%s____数据校验失败", __func__);
+                            phobosLog(@"%s____数据校验失败,PV埋点可能重复", __func__);
+                            /*
                             dispatch_async(dispatch_get_main_queue(), ^{
                                 NSString *stringTitle = [NSString stringWithFormat:@"%@ PV埋点可能重复", data];
                                 UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:stringTitle message:nil delegate:nil cancelButtonTitle:@"确定" otherButtonTitles:nil, nil];
                                 [alertView show];
-                            });
+                            });*/
                             break;
                         }
                     }

GMPhobos/Classes/PhobosPVProtocol.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
+NS_ASSUME_NONNULL_BEGIN
 @protocol PhobosPVProtocol <NSObject>
 
 /**
@@ -76,3 +76,4 @@
 @property (nonatomic, copy) NSString *isPush;
 
 @end
+NS_ASSUME_NONNULL_END

GMPhobos/Classes/PhobosUtil.h

@@ -38,8 +38,17 @@ typedef void (^SendDataSuccessBlock)(NSInteger code);
  *  @7735 精准曝光
  */
 + (void)sendData:(NSData *)data currentAPI:(NSString *)currentAPI success:(SendDataSuccessBlock)success;
-
+/**
+ *  @brief 获取当前时间的秒数
+ *  @since 0.0.1
+ */
 + (NSString *)currentTime;
+/**
+ 获取当前时间的毫秒数
+ @return v7.14.0
+ */
++ (NSString *)currentMMTime;
+
 + (NSString *)getAppVersion;
 + (BOOL)isNonEmpty:(NSString *)string;
 + (NSData *)encodeJSON:(id)obj;

GMPhobos/Classes/PhobosUtil.m

@@ -172,7 +172,7 @@
 
 
 /**
- *  @brief 获取当前时间的毫秒数
+ *  @brief 获取当前时间的秒数
  *  @since 0.0.1
  */
 + (NSString *)currentTime {
@@ -182,6 +182,18 @@
     return timeIntervalStr;
 }
 
+/**
+ 获取当前时间的毫秒数
+
+ @return v7.14.0
+ */
++ (NSString *)currentMMTime {
+    NSDate *date = [NSDate date];
+    NSTimeInterval interval = [date timeIntervalSince1970];
+    NSString *timeIntervalStr = [NSString stringWithFormat:@"%ld",(long)(interval*1000)];
+    return timeIntervalStr;
+}
+
 /**
  *  @brief 获取当前APP的版本号
  *

GMPhobos/Classes/UIResponder+PhobosPV.h

@@ -24,4 +24,6 @@
  此方法在onPvStart时调用，给referrerTabName赋值
  */
 - (void)initReferrerTabName;
+
+
 @end