Merge branch 'jql/optimize' into 'master'

埋点库升级

See merge request !48

Example/GMPhobos.xcodeproj/xcshareddata/xcschemes/GMPhobos-Example.xcscheme

@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "6003F589195388D20070C39A"
+            BuildableName = "GMPhobos_Example.app"
+            BlueprintName = "GMPhobos_Example"
+            ReferencedContainer = "container:GMPhobos.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -54,17 +63,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "6003F589195388D20070C39A"
-            BuildableName = "GMPhobos_Example.app"
-            BlueprintName = "GMPhobos_Example"
-            ReferencedContainer = "container:GMPhobos.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -86,8 +84,6 @@
             ReferencedContainer = "container:GMPhobos.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Example/GMPhobos/GMAppDelegate.m

@@ -7,11 +7,15 @@
 //
 
 #import "GMAppDelegate.h"
+#import <Phobos.h>
 
 @implementation GMAppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    Phobos.sharedClient.getTopController = ^UIViewController * _Nonnull{
+        return [UIViewController new];
+    };
     // Override point for customization after application launch.
     return YES;
 }

Example/GMPhobos/GMPhobos_Example-Bridging-Header.h

+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

Example/GMPhobos/GMViewController.m

@@ -9,6 +9,8 @@
 #import "GMViewController.h"
 #import <GMPhobos/Phobos.h>
 #import <GMCache/GMCache.h>
+#import "GMPhobos_Example-Swift.h"
+
 //@import GMCache;
 @import GMPhobos.PhobosUtil;
 @import GMPhobos.Phobos;
@@ -33,41 +35,56 @@ NSString      *const MockCityId       = @"beijing";
 #ifdef POD_CONFIGURATION_APP_STORE
     NSString *url = @"http://log.gmei.com/log/collect";
 #else
-    NSString *url = @"http://log.test.gengmei.cc/log/collect";
+    NSString *url = @"http://log.test.igengmei.com/log/collect";
 #endif
-    [GMCache removeObjectAtDocumentPathWithkey:PhobosCacheKey];
-    [Phobos clientWithAppName:MockAppName channelId:MockChannelId];
+//    [[NSUserDefaults standardUserDefaults] setBool:YES forKey:PhobosGray];
+    Phobos *client = [Phobos clientWithAppName:MockAppName channelId:MockChannelId];
+    [Phobos setSharedClient:client];
     Phobos.sharedClient.serverAPI = url;
     [Phobos.sharedClient setLogEnabled:NO]; // 调试打Log模式，看情况开启
     Phobos.sharedClient.signingType = PhobosSigningTypeDebug;
     Phobos.sharedClient.userId = @"";
+    Phobos.sharedClient.getTopController = ^UIViewController * _Nonnull{
+        return self;
+    };
     
-//    NSString *inDate = [PhobosUtil currentTime];
-//    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-//    [dict setObject:[PhobosUtil currentTime] forKey:@"out"];
-//    [dict setObject:inDate forKey:@"in"];
-//    [dict setObject:@"test" forKey:@"page_name"];
-//    [dict setObject:@"" forKey:@"business_id"];
-//    [dict setObject:@"" forKey:@"referrer"];
-//    [dict setObject:@(0) forKey:@"fake"];
-//    [dict setObject:@"" forKey:@"referrer_id"];
-//    [dict setObject:@"" forKey:@"extra_param"];
-//    [dict setObject:@"" forKey:@"referrer_tab_name"];
-//    [dict setObject:@(0) forKey:@"is_push"];
+    NSString *inDate = [PhobosUtil currentTime];
+    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
+    [dict setObject:[PhobosUtil currentTime] forKey:@"out"];
+    [dict setObject:inDate forKey:@"in"];
+    [dict setObject:@"test" forKey:@"page_name"];
+    [dict setObject:@"" forKey:@"business_id"];
+    [dict setObject:@"" forKey:@"referrer"];
+    [dict setObject:@(0) forKey:@"fake"];
+    [dict setObject:@"" forKey:@"referrer_id"];
+    [dict setObject:@"" forKey:@"extra_param"];
+    [dict setObject:@"" forKey:@"referrer_tab_name"];
+    [dict setObject:@(0) forKey:@"is_push"];
 //    [Phobos track:@"page_view" attributes:dict];
 //    NSArray *array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
-//    
+//
 //    [Phobos track:@"page_view" attributes:dict];
 //    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
-//    
-//    [dict setObject:[PhobosUtil currentTime] forKey:@"in"];
-//    [dict setObject:[PhobosUtil currentTime] forKey:@"out"];
-//    [Phobos track:@"page_view" attributes:dict];
+    
+    [dict setObject:[PhobosUtil currentTime] forKey:@"in"];
+    [dict setObject:[PhobosUtil currentTime] forKey:@"out"];
+    [Phobos track:@"page_view" attributes:dict sendNow:YES];
 //    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
-//    
-//    [Phobos track:@"test" attributes:dict];
+    
+    [Phobos track:@"test" attributes:dict sendNow:YES];
+    [Phobos track:@"test2" attributes:dict sendNow:YES];
+    [Phobos track:@"test3" attributes:dict sendNow:YES];
+    [Phobos track:@"test4" attributes:dict sendNow:YES];
+    [Phobos track:@"test3" attributes:dict sendNow:YES];
+    [Phobos track:@"test4" attributes:dict sendNow:YES];
+    [Phobos track:@"test3" attributes:dict sendNow:YES];
+    [Phobos track:@"test4" attributes:dict sendNow:YES];
 //    array = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
-//    
+}
+
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
+    swiftVC *vc = [swiftVC new];
+    [self presentViewController:vc animated:YES completion:nil];
 }
 
 - (void)didReceiveMemoryWarning

Example/GMPhobos/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -84,6 +84,11 @@
       "idiom" : "ipad",
       "size" : "83.5x83.5",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {

Example/GMPhobos/Main.storyboard

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="whP-gf-Uak">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="whP-gf-Uak">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--View Controller-->
@@ -14,9 +16,9 @@
                         <viewControllerLayoutGuide type="bottom" id="Mvr-aV-6Um"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="TpU-gO-2f1">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="tc2-Qw-aMS" userLabel="First Responder" sceneMemberID="firstResponder"/>

Example/GMPhobos/swiftVC.swift

+//
+//  swiftVC.swift
+//  GMPhobos_Example
+//
+//  Created by Locus on 2020/3/6.
+//  Copyright © 2020 licong. All rights reserved.
+//
+
+import Foundation
+import GMPhobos
+
+class swiftVC: UIViewController {
+    override func viewDidLoad() {
+        let attr = Dictionary<String, Any>.init()
+        Phobos.track("swift", attributes: attr, sendNow: true)
+    }
+}

Example/Podfile.lock

 PODS:
-  - GMCache (0.2.3):
+  - GMCache (1.0.1):
     - TMCache (= 2.1.0)
-  - GMKit (1.1.3):
-    - GMKit/Category (= 1.1.3)
-    - GMKit/Color (= 1.1.3)
-    - GMKit/Constant (= 1.1.3)
-    - GMKit/FDFullscreenPopGesture (= 1.1.3)
-    - GMKit/Kit (= 1.1.3)
-    - GMKit/Protocol (= 1.1.3)
-    - Masonry (= 1.1.0)
-    - SDWebImage (= 3.7.6)
-  - GMKit/Category (1.1.3):
-    - GMKit/Color (= 1.1.3)
-    - GMKit/Constant (= 1.1.3)
-    - GMKit/Protocol (= 1.1.3)
-    - Masonry (= 1.1.0)
-    - SDWebImage (= 3.7.6)
-  - GMKit/Color (1.1.3):
-    - Masonry (= 1.1.0)
-    - SDWebImage (= 3.7.6)
-  - GMKit/Constant (1.1.3):
-    - Masonry (= 1.1.0)
-    - SDWebImage (= 3.7.6)
-  - GMKit/FDFullscreenPopGesture (1.1.3):
-    - Masonry (= 1.1.0)
-    - SDWebImage (= 3.7.6)
-  - GMKit/Kit (1.1.3):
-    - GMKit/Category (= 1.1.3)
-    - GMKit/Color (= 1.1.3)
-    - GMKit/Constant (= 1.1.3)
-    - GMKit/Protocol (= 1.1.3)
-    - Masonry (= 1.1.0)
-    - SDWebImage (= 3.7.6)
-  - GMKit/Protocol (1.1.3):
-    - Masonry (= 1.1.0)
-    - SDWebImage (= 3.7.6)
-  - GMPhobos (1.3.6):
+  - GMPhobos (2.0.0):
     - GMCache
-    - GMKit
-  - Masonry (1.1.0)
-  - SDWebImage (3.7.6):
-    - SDWebImage/Core (= 3.7.6)
-  - SDWebImage/Core (3.7.6)
+    - MagicalRecord
+    - MJExtension
+  - MagicalRecord (2.3.2):
+    - MagicalRecord/Core (= 2.3.2)
+  - MagicalRecord/Core (2.3.2)
+  - MJExtension (3.2.1)
   - TMCache (2.1.0)
 
 DEPENDENCIES:
@@ -50,10 +17,9 @@ DEPENDENCIES:
 SPEC REPOS:
   "git@git.wanmeizhensuo.com:gengmeiios/GMSpecs.git":
     - GMCache
-    - GMKit
   https://github.com/CocoaPods/Specs.git:
-    - Masonry
-    - SDWebImage
+    - MagicalRecord
+    - MJExtension
     - TMCache
 
 EXTERNAL SOURCES:
@@ -61,11 +27,10 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  GMCache: 09a3029c96fe130e3a21faef70b3d9d2ce92d639
-  GMKit: 35f788243cceeddf3e13c5226b3ea0b5e08e2117
-  GMPhobos: 6623102d634ce5485e8d3e474da8bdce5891f419
-  Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
-  SDWebImage: c325cf02c30337336b95beff20a13df489ec0ec9
+  GMCache: b78d8e46db864405e91d226ce640cc80d966c611
+  GMPhobos: 3cad92cfa28da2b719ccef040a8fb4e33012b1ad
+  MagicalRecord: 53bed74b4323b930992a725be713e53b37d19755
+  MJExtension: 635f2c663dcb1bf76fa4b715b2570a5710aec545
   TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
 
 PODFILE CHECKSUM: ea0fac2144ac80baf8f21576cde49526c19991ad

GMPhobos.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "GMPhobos"
-  s.version          = "1.3.6"
+  s.version          = "2.0.0"
   s.summary          = "GM statistic data sdk"
 
   s.description      = <<-DESC
@@ -25,7 +25,9 @@ Pod::Spec.new do |s|
   s.platform     = :ios, '8.0'
   s.source_files = 'GMPhobos/Classes/*.{h,m}'
   s.dependency 'GMCache'
-  s.dependency 'GMKit'
+  s.dependency 'MJExtension'
+  s.dependency 'MagicalRecord'
   s.library   = 'z'
+  s.resource  = 'GMPhobos/*.xcdatamodeld'
 
 end

GMPhobos/Classes/NewPhobos.h

+//
+//  Phobos.h
+//  GengmeiDoctor
+//  Data Statistic Client For Mars
+//  Created by Thierry on 16/1/26.
+//  Copyright © 2016年 wanmeizhensuo. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "PhobosPVProtocol.h"
+#import "PhobosConfig.h"
+#import <CoreLocation/CLLocation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface NewPhobos : NSObject
+
+/**
+ *  @brief 开启Phobos统计,默认以BATCH方式发送log.
+ *
+ *  @param appName  通常由数据端与客户端一起确认的区分不同app的名字
+ *  @param channelId 发布渠道
+ *
+ *  @return Phobos实例
+ *
+ *  @since 0.0.1
+ */
++ (NewPhobos *)clientWithAppName:(NSString *)appName channelId:(NSString *)channelId;
+
++ (instancetype) alloc __attribute__((deprecated));
+- (instancetype) init __attribute__((deprecated));
++ (instancetype) new __attribute__((deprecated));
+
+#pragma mark - SDK配置
+
++ (instancetype)sharedClient;
+
+/** 用于Phobos库从old更新到new使用，在全量之后删除相关逻辑 */
+@property (nonatomic, assign) BOOL isGray;
+
+// Phobos在处理业务端传递来的参数时会检查是否某个value为空，如果为空会调用这个block以通知业务层，业务层可以上报这个异常，以助解决问题
+@property(nonatomic, copy) void (^captureNullExpection) (NSString *eventId, NSDictionary *info);
+
+/**
+ 网络状态 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信息,默认不开启
+ *
+ *  @since 0.0.1
+ */
+@property (assign, nonatomic) BOOL logEnabled;
+
+/**
+ *  @brief 设置当前登录用户的ID，如果没有默认为@""
+ *
+ *
+ *  @since 0.0.2
+ */
+@property (strong, nonatomic) NSString *userId;
+
+/*!
+ *  @author zhaiguojun, 16-05-31
+ *
+ *  @brief 用户当前的城市id
+ *
+ *
+ *  @since 0.2.7
+ */
+@property (strong, nonatomic) NSString *currentCityId;
+
+@property (strong, nonatomic) CLLocation *gps;
+
+/**
+ * 记录用户类型
+ */
+@property (strong, nonatomic) NSMutableDictionary *userType;
+
+/**
+ 数据接收的服务器API
+ */
+@property (copy, nonatomic) NSString *serverAPI;
+
+/**
+ 当前APP请求接口的 APIHOST（GMServerDomains.apiHost 主要用于flutter AppDelegate 中初始化需要传值
+ */
+@property (nonatomic, copy) NSString *apiHost;
+
+/**
+ 当前APP请求接口的 cookie(主要用于flutter) 获取到cookie 的时候穿过来 或者cookie 有变化的时候传过来
+ */
+@property (nonatomic, copy) NSString *cookie;
+
+/**
+ 灰度组, since 7.7.65
+ */
+@property (nonatomic, copy) NSString *greyType;
+
+/**
+ 包的类型：APPSTORE、RELEASE、DEBUG
+ */
+@property (nonatomic, assign) PhobosSigningType signingType;
+
+/**
+ 从主项目获取当前显示的controller
+ */
+@property (nonatomic, copy) UIViewController * (^getTopController) (void);
+
+#pragma mark - 事件采集
+
+/** 点击事件采集 */
++ (void)onClickButtonWithAttributes:(NSDictionary *)attributes;
++ (void)onClickButtonWithAttributes:(NSDictionary *)attributes sendNow:(BOOL)sendNow;
+
+/**
+ *  @brief 自定义事件,数量统计.
+ *
+ *  @param eventId 事件Id
+ *  @attributes 参数
+ *  @sendNow 是否实时发送，默认为NO
+ *
+ *  @since 0.0.1
+ */
++ (void)track:(NSString *)eventName attributes:(NSDictionary *)attributes;
++ (void)track:(NSString *)eventName attributes:(NSDictionary *)attributes sendNow:(BOOL)sendNow;
++ (void)track:(NSString *)eventName;
+
+/**
+ *  @brief 自定义事件,数量统计  7730 精准曝光/数据链路.
+ *
+ *  @param eventId 事件Id
+ *  @attributes 参数
+ *  @sendNow 是否实时发送，默认为NO
+ *  @currentAPI 当前传过来的API
+ *  @
+ */
++ (void)track:(NSString *)eventName attributes:(NSDictionary *)attributes currentAPI:(NSString *)currentAPI;
++ (void)track:(NSString *)eventName attributes:(NSDictionary *)attributes sendNow:(BOOL)sendNow currentAPI:(NSString *)currentAPI;
++ (void)track:(NSString *)eventName currentAPI:(NSString *)currentAPI;
+
+/**
+ *  @brief PV事件开始。当controller viewWillAppear时调用
+ */
+- (void)onPVStart:(UIResponder<PhobosPVProtocol> *)page;
+/**
+ *  @brief PV事件结束。当controller viewWillDisAppear时调用
+ */
+- (void)onPVEnd:(UIResponder<PhobosPVProtocol> *)page;
+
+@end
+
+@interface NewPhobos (UtilTest)
+
+/** 获取所有非立即发送埋点数量 */
++ (NSUInteger)fetchToBeSendPhobosDataCount;
+
+/** 获取待发送埋点数据 */
++ (NSArray *)fetchToBeSendPhobosData;
+
+/** 清除待发送埋点数据缓存 */
++ (void)removeAllPhobosData;
+
+
+@end
+NS_ASSUME_NONNULL_END

GMPhobos/Classes/OldPhobos.h

+//
+//  Phobos.h
+//  GengmeiDoctor
+//  Data Statistic Client For Mars
+//  Created by Thierry on 16/1/26.
+//  Copyright © 2016年 wanmeizhensuo. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "PhobosPVProtocol.h"
+#import <CoreLocation/CLLocation.h>
+#import "PhobosConfig.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface OldPhobos : NSObject
+
+/**
+ *  @brief 开启Phobos统计,默认以BATCH方式发送log.
+ *
+ *  @param appName  通常由数据端与客户端一起确认的区分不同app的名字
+ *  @param channelId 发布渠道
+ *
+ *  @return Phobos实例
+ *
+ *  @since 0.0.1
+ */
++ (OldPhobos *)clientWithAppName:(NSString *)appName channelId:(NSString *)channelId;
+
++ (instancetype)sharedClient;
+
++ (void)setSharedClient:(OldPhobos *)client;
+
+
+#pragma mark - SDK配置
+
+// Phobos在处理业务端传递来的参数时会检查是否某个value为空，如果为空会调用这个block以通知业务层，业务层可以上报这个异常，以助解决问题
+@property(nonatomic, copy) void (^captureNullExpection) (NSString *eventId, NSDictionary *info);
+
+/**
+ 网络状态 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信息,默认不开启
+ *
+ *  @since 0.0.1
+ */
+@property (assign, nonatomic) BOOL logEnabled;
+
+/**
+ *  @brief 设置当前登录用户的ID，如果没有默认为@""
+ *
+ *
+ *  @since 0.0.2
+ */
+@property (strong, nonatomic) NSString *userId;
+
+/*!
+ *  @author zhaiguojun, 16-05-31
+ *
+ *  @brief 用户当前的城市id
+ *
+ *
+ *  @since 0.2.7
+ */
+@property (strong, nonatomic) NSString *currentCityId;
+
+@property (strong, nonatomic) CLLocation *gps;
+
+/**
+ * 记录用户类型
+ */
+@property (strong, nonatomic) NSMutableDictionary *userType;
+
+/**
+ 数据接收的服务器API
+ */
+@property (copy, nonatomic) NSString *serverAPI;
+
+/**
+ 当前APP请求接口的 APIHOST（GMServerDomains.apiHost 主要用于flutter AppDelegate 中初始化需要传值
+ */
+@property (nonatomic, copy) NSString *apiHost;
+
+/**
+ 当前APP请求接口的 cookie(主要用于flutter) 获取到cookie 的时候穿过来 或者cookie 有变化的时候传过来
+ */
+@property (nonatomic, copy) NSString *cookie;
+
+/**
+ 灰度组, since 7.7.65
+ */
+@property (nonatomic, copy) NSString *greyType;
+
+/**
+ 包的类型：APPSTORE、RELEASE、DEBUG
+ */
+@property (nonatomic, assign) PhobosSigningType signingType;
+
+/**
+ 从主项目获取当前显示的controller
+ */
+@property (nonatomic, copy) UIViewController * (^getTopController) (void);
+
+#pragma mark - 事件采集
+
+/**
+ *  @brief 自定义事件,数量统计.
+ *
+ *  @param eventId 事件Id
+ *  @attributes 参数
+ *  @sendNow 是否实时发送，默认为NO
+ *
+ *  @since 0.0.1
+ */
++ (void)track:(NSString *)eventId attributes:(NSDictionary *)attributes;
++ (void)track:(NSString *)eventId attributes:(NSDictionary *)attributes sendNow:(BOOL)sendNow;
++ (void)track:(NSString *)eventId;
+
+/**
+ *  @brief 自定义事件,数量统计  7730 精准曝光.
+ *
+ *  @param eventId 事件Id
+ *  @attributes 参数
+ *  @sendNow 是否实时发送，默认为NO
+ *  @currentAPI 当前传过来的API
+ *  @
+ */
++ (void)track:(NSString *)eventId attributes:(NSDictionary *)attributes currentAPI:(NSString *)currentAPI;
++ (void)track:(NSString *)eventId attributes:(NSDictionary *)attributes sendNow:(BOOL)sendNow currentAPI:(NSString *)currentAPI;
++ (void)track:(NSString *)eventId currentAPI:(NSString *)currentAPI;
+
+/**
+ *  @author 翟国钧, 16-02-03 16:02:30
+ *
+ *  @brief H5调用的埋点方法
+ *
+ *  @param jsonString h5传过来的参数
+ *
+ *  @since 0.0.1
+ */
++ (void)trackJsEvent:(NSString *)jsonString;
+
+/**
+ *  @brief PV事件开始。当controller viewWillAppear时调用
+ */
+- (void)onPVStart:(UIResponder<PhobosPVProtocol> *)page;
+/**
+ *  @brief PV事件结束。当controller viewWillDisAppear时调用
+ */
+- (void)onPVEnd:(UIResponder<PhobosPVProtocol> *)page;
+
+/**
+ *  @author 翟国钧, 16-03-08 11:03:45
+ *
+ *  @brief 有些事件需要模拟pv事件，统一用该方法处理，in out 时间相同.点击一次即触发
+ *
+ *  @param pageName 控件所在VC的pageName
+ *  @param bid      业务id
+ *  @param referer  上个月面的pagename
+ *
+ *  @since 5.9.1
+ */
+- (void)simulativePV:(NSString *)pageName businessId:(NSString *)bid referer:(NSString *)referer;
+
+@end
+NS_ASSUME_NONNULL_END

GMPhobos/Classes/Phobos.h

@@ -8,17 +8,11 @@
 
 #import <Foundation/Foundation.h>
 #import "PhobosPVProtocol.h"
+#import "PhobosConfig.h"
 #import <CoreLocation/CLLocation.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef NS_ENUM (NSInteger, PhobosSigningType) {
-    PhobosSigningTypeUndefined = 0,
-    PhobosSigningTypeAppStore,
-    PhobosSigningTypeRelease,
-    PhobosSigningTypeDebug
-};
-
 @interface Phobos : NSObject
 
 /**
@@ -124,6 +118,10 @@ typedef NS_ENUM (NSInteger, PhobosSigningType) {
 
 #pragma mark - 事件采集
 
+/** 点击事件采集 */
++ (void)onClickButtonWithAttributes:(NSDictionary *)attributes;
++ (void)onClickButtonWithAttributes:(NSDictionary *)attributes sendNow:(BOOL)sendNow;
+
 /**
  *  @brief 自定义事件,数量统计.
  *
@@ -149,18 +147,6 @@ typedef NS_ENUM (NSInteger, PhobosSigningType) {
 + (void)track:(NSString *)eventId attributes:(NSDictionary *)attributes currentAPI:(NSString *)currentAPI;
 + (void)track:(NSString *)eventId attributes:(NSDictionary *)attributes sendNow:(BOOL)sendNow currentAPI:(NSString *)currentAPI;
 + (void)track:(NSString *)eventId currentAPI:(NSString *)currentAPI;
-
-/**
- *  @author 翟国钧, 16-02-03 16:02:30
- *
- *  @brief H5调用的埋点方法
- *
- *  @param jsonString h5传过来的参数
- *
- *  @since 0.0.1
- */
-+ (void)trackJsEvent:(NSString *)jsonString;
-
 /**
  *  @brief PV事件开始。当controller viewWillAppear时调用
  */
@@ -169,19 +155,19 @@ typedef NS_ENUM (NSInteger, PhobosSigningType) {
  *  @brief PV事件结束。当controller viewWillDisAppear时调用
  */
 - (void)onPVEnd:(UIResponder<PhobosPVProtocol> *)page;
+@end
 
-/**
- *  @author 翟国钧, 16-03-08 11:03:45
- *
- *  @brief 有些事件需要模拟pv事件，统一用该方法处理，in out 时间相同.点击一次即触发
- *
- *  @param pageName 控件所在VC的pageName
- *  @param bid      业务id
- *  @param referer  上个月面的pagename
- *
- *  @since 5.9.1
- */
-- (void)simulativePV:(NSString *)pageName businessId:(NSString *)bid referer:(NSString *)referer;
+
+@interface Phobos (UtilTest)
+
+/** 获取待发送埋点数量 */
++ (NSUInteger)fetchToBeSendPhobosDataCount;
+
+/** 获取待发送埋点数据 */
++ (NSArray *)fetchToBeSendPhobosData;
+
+/** 清除待发送埋点数据缓存 */
++ (void)removeAllPhobosData;
 
 @end
 NS_ASSUME_NONNULL_END

GMPhobos/Classes/PhobosConfig.h

@@ -9,18 +9,28 @@
 #ifndef PhobosConfig_h
 #define PhobosConfig_h
 
+typedef NS_ENUM (NSInteger, PhobosSigningType) {
+    PhobosSigningTypeUndefined = 0,
+    PhobosSigningTypeAppStore,
+    PhobosSigningTypeRelease,
+    PhobosSigningTypeDebug
+};
+
+
 #ifdef DEBUG
 #define phobosLog(...) NSLog(@"[Phobos] %@",__VA_ARGS__)
 #else
 #define phobosLog(...)
 #endif
 
-#define PhobosHaveOpenApp     @"PhobosHaveOpenApp"        //是否打开过APP
+#define PhobosGray            @"PhobosGray"
+
 #define PhobosBeginTime       @"PhobosBeginTime"          //记录APP打开|从后台启动时的时间戳
 #define PhobosEndTime         @"PhobosEndTime"            //记录APP退出|退到后台时的时间戳
-#define PhobosCacheKey        @"PhobosCacheKey"           //存放持久化埋点数据的key
-#define PhobosTempCacheKey    @"PhobosTempCacheKey"       //临时存放待发送埋点数据的key
+#define PhobosCacheKey        @"PhobosCacheKey"           //old 存放持久化埋点数据的key
+#define PhobosTempCacheKey    @"PhobosTempCacheKey"       //old 临时存放待发送埋点数据的key
 
 #define PhobosShardCount      50                          //收集数据分段发送的个数
+#define PhobosMaxSendCount    100                         // 最大发送数量
 
 #endif /* PhobosConfig_h */

GMPhobos/Classes/PhobosDataManager.h

+//
+//  PhobosDataManager.h
+//  GMCache
+//
+//  Created by Locus on 2020/1/21.
+//
+
+#import <Foundation/Foundation.h>
+#import <MagicalRecord/MagicalRecord.h>
+#import "PhobosSendDataEntity+CoreDataClass.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(NSInteger, PhobosDataSendStatus) {
+    PhobosDataSendStatusToBeSend       = 1, // 待发送数据
+    PhobosDataSendStatusSending        = 2, // 发送中数据
+    PhobosDataSendStatusFinish         = 3, // 发送完成数据
+    PhobosDataSendStatusError          = 4, // 发送失败数据
+};
+
+@interface PhobosDataManager : NSObject
+
+/** 获取待发送数据，包含待发送数据和发送失败数据 */
++ (NSArray<PhobosSendDataEntity *> *)fetchToBeSendDataEntities;
++ (NSArray<PhobosSendDataEntity *> *)fetchDataEntitiesWithPredicate:(NSPredicate *)searchFilter;
++ (NSUInteger)fetchCountOfToBeSendEntities;
++ (NSUInteger)fetchCountOfEntitiesWithPredicate:(NSPredicate *)searchFilter;
+
++ (void)insertData:(NSDictionary *)data sendAPI:(NSString *)sendAPI;
+
++ (void)updateDataEntities:(NSArray<PhobosSendDataEntity *> *)entities sendStatus:(PhobosDataSendStatus)sendStatus;
+
++ (void)deleteDataEntities:(NSArray<PhobosSendDataEntity *> *)entities;
++ (void)deleteAllEntities;
+
+@end
+
+NS_ASSUME_NONNULL_END

GMPhobos/Classes/PhobosDataManager.m

+//
+//  PhobosDataManager.m
+//  GMCache
+//
+//  Created by Locus on 2020/1/21.
+//
+
+#import "PhobosDataManager.h"
+#import "PhobosSendManager.h"
+#import "PhobosConfig.h"
+#import "PhobosUtil.h"
+#import <MJExtension/MJExtension.h>
+#import <mach/mach_time.h>
+
+@implementation PhobosDataManager
+
+static NSManagedObjectContext *Phobos_defaultContext;
+
++ (void)initialize {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        Phobos_defaultContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSMainQueueConcurrencyType];
+        NSBundle *bundle = [NSBundle bundleForClass:[self class]];
+        NSURL *modelURL = [bundle URLForResource:@"GMPhobosData" withExtension:@"momd"];
+        NSManagedObjectModel *model = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
+        
+        // 创建持久化存储调度器
+        NSPersistentStoreCoordinator *coordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:model];
+        
+        // 创建并关联SQLite数据库文件，如果已经存在则不会重复创建
+        NSString *dataPath = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).lastObject;
+        dataPath = [dataPath stringByAppendingFormat:@"/%@.sqlite",@"GMPhobos"];
+        
+        [coordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:[NSURL fileURLWithPath:dataPath] options:nil error:nil];
+        
+        Phobos_defaultContext.persistentStoreCoordinator = coordinator;
+        
+        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"status = %d", PhobosDataSendStatusSending];
+        NSArray<PhobosSendDataEntity *> *entities = [self fetchDataEntitiesWithPredicate:predicate];
+        [self updateDataEntities:entities sendStatus:PhobosDataSendStatusError];
+    });
+}
+
++ (NSArray<PhobosSendDataEntity *> *)fetchToBeSendDataEntities {
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"status = %d or status = %d", PhobosDataSendStatusToBeSend, PhobosDataSendStatusError];
+    return [self fetchDataEntitiesWithPredicate:predicate];
+}
+
++ (NSArray<PhobosSendDataEntity *> *)fetchDataEntitiesWithPredicate:(NSPredicate *)searchFilter {
+    return [PhobosSendDataEntity MR_findAllWithPredicate:searchFilter inContext:Phobos_defaultContext];
+}
+
++ (NSUInteger)fetchCountOfToBeSendEntities {
+    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"status = %d or status = %d", PhobosDataSendStatusToBeSend, PhobosDataSendStatusError];
+    return [self fetchCountOfEntitiesWithPredicate:predicate];
+}
+
++ (NSUInteger)fetchCountOfEntitiesWithPredicate:(NSPredicate *)searchFilter {
+    return [[PhobosSendDataEntity MR_numberOfEntitiesWithPredicate:searchFilter inContext:Phobos_defaultContext] integerValue];
+}
+
++ (void)insertData:(NSDictionary *)data sendAPI:(NSString *)sendAPI {
+    if (!sendAPI || [sendAPI isEqualToString:@""] || !data) {
+        return;
+    }
+    PhobosSendDataEntity *entity = [PhobosSendDataEntity MR_createEntityInContext:Phobos_defaultContext];
+    entity.data = [data mj_JSONData];
+    entity.api = sendAPI;
+    entity.status = PhobosDataSendStatusToBeSend;
+    entity.id = mach_absolute_time();
+    [Phobos_defaultContext MR_saveOnlySelfWithCompletion:nil];
+}
+
++ (void)updateDataEntities:(NSArray<PhobosSendDataEntity *> *)entities sendStatus:(PhobosDataSendStatus)sendStatus {
+    if (entities.count > 0) {
+        [entities enumerateObjectsUsingBlock:^(PhobosSendDataEntity *obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            obj.status = sendStatus;
+        }];
+        [Phobos_defaultContext MR_saveOnlySelfWithCompletion:nil];
+    }
+}
+
++ (void)deleteDataEntities:(NSArray<PhobosSendDataEntity *> *)entities {
+    if (entities.count > 0) {
+        [entities enumerateObjectsUsingBlock:^(PhobosSendDataEntity *obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            [obj MR_deleteEntityInContext:Phobos_defaultContext];
+        }];
+        [Phobos_defaultContext MR_saveOnlySelfWithCompletion:nil];
+    }
+}
+
++ (void)deleteAllEntities {
+    [PhobosSendDataEntity MR_truncateAllInContext:Phobos_defaultContext];
+    [Phobos_defaultContext MR_saveOnlySelfWithCompletion:nil];
+}
+
+@end

GMPhobos/Classes/PhobosPVProtocol.h

@@ -8,10 +8,10 @@
 
 #import <Foundation/Foundation.h>
 NS_ASSUME_NONNULL_BEGIN
-typedef void(^PhobosUpdatePVBlock)(void);
-
 @protocol PhobosPVProtocol <NSObject>
 
+typedef void(^PhobosUpdatePVBlock)(void);
+
 /**
  *  @author 翟国钧, 16-02-24 17:02:22
  *

GMPhobos/Classes/PhobosSendDataEntity+CoreDataClass.h

+//
+//  PhobosSendDataEntity+CoreDataClass.h
+//  GMPhobos
+//
+//  Created by Locus on 2020/3/9.
+//
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PhobosSendDataEntity : NSManagedObject
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "PhobosSendDataEntity+CoreDataProperties.h"

GMPhobos/Classes/PhobosSendDataEntity+CoreDataClass.m

+//
+//  PhobosSendDataEntity+CoreDataClass.m
+//  GMPhobos
+//
+//  Created by Locus on 2020/3/9.
+//
+//
+
+#import "PhobosSendDataEntity+CoreDataClass.h"
+
+@implementation PhobosSendDataEntity
+
+@end

GMPhobos/Classes/PhobosSendDataEntity+CoreDataProperties.h

+//
+//  PhobosSendDataEntity+CoreDataProperties.h
+//  GMPhobos
+//
+//  Created by Locus on 2020/3/9.
+//
+//
+
+#import "PhobosSendDataEntity+CoreDataClass.h"
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PhobosSendDataEntity (CoreDataProperties)
+
++ (NSFetchRequest<PhobosSendDataEntity *> *)fetchRequest;
+
+@property (nonatomic) int64_t id;
+@property (nullable, nonatomic, retain) NSData *data;
+@property (nullable, nonatomic, copy) NSString *api;
+@property (nonatomic) int16_t status;
+
+@end
+
+NS_ASSUME_NONNULL_END

GMPhobos/Classes/PhobosSendDataEntity+CoreDataProperties.m

+//
+//  PhobosSendDataEntity+CoreDataProperties.m
+//  GMPhobos
+//
+//  Created by Locus on 2020/3/9.
+//
+//
+
+#import "PhobosSendDataEntity+CoreDataProperties.h"
+
+@implementation PhobosSendDataEntity (CoreDataProperties)
+
++ (NSFetchRequest<PhobosSendDataEntity *> *)fetchRequest {
+	return [NSFetchRequest fetchRequestWithEntityName:@"PhobosSendDataEntity"];
+}
+
+@dynamic id;
+@dynamic data;
+@dynamic api;
+@dynamic status;
+
+@end

GMPhobos/Classes/PhobosSendManager.h

+//
+//  PhobosSendManager.h
+//  GMPhobos
+//
+//  Created by Locus on 2020/3/3.
+//
+
+#import <Foundation/Foundation.h>
+#import "PhobosDataManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PhobosSendManager : NSObject
+
++ (void)sendDataWithEntities:(NSArray<PhobosSendDataEntity *> *)needSendData completion:(nullable void(^)(NSArray<PhobosSendDataEntity *> *finishEntities, NSInteger code))completion;
+
+
+@end
+
+NS_ASSUME_NONNULL_END

GMPhobos/Classes/PhobosSendManager.m

+//
+//  PhobosSendManager.m
+//  GMPhobos
+//
+//  Created by Locus on 2020/3/3.
+//
+
+#import "PhobosSendManager.h"
+#import <GMCache/GMCache.h>
+#import <MJExtension/MJExtension.h>
+#import "PhobosConfig.h"
+#import "Phobos.h"
+#import "PhobosUtil.h"
+
+#ifdef APPSTORE
+#define GMExactExposureApi @"https://log.igengmei.com/log/precise_exposure"
+#else
+#define GMExactExposureApi @"http://log.test.igengmei.com/log/precise_exposure"
+#endif
+
+@implementation PhobosSendManager
+
++ (void)initialize {
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        [self disposeOldData];
+    });
+}
+
+// TODO: 全量以后，一定时间需要清除下面逻辑
++ (void)disposeOldData {
+    NSMutableArray *total = [NSMutableArray new];
+    NSArray *normalDataArray = [GMCache fetchObjectAtDocumentPathWithkey:PhobosTempCacheKey];
+    NSArray *immiDataArray = [GMCache fetchObjectAtDocumentPathWithkey:PhobosCacheKey];
+    [total addObjectsFromArray:normalDataArray];
+    [total addObjectsFromArray:immiDataArray];
+    if (total.count > 0) {
+        [self sendDataArray:total currentAPI:Phobos.sharedClient.serverAPI success:^(NSInteger code) {
+            if (code == 200) {
+                [GMCache removeObjectAtDocumentPathWithkey:PhobosCacheKey];
+                [GMCache removeObjectAtDocumentPathWithkey:PhobosTempCacheKey];
+            }
+        }];
+    }
+    NSString *exposureAPI = GMExactExposureApi;
+    NSArray *exposureArray = [GMCache fetchObjectAtDocumentPathWithkey:[PhobosUtil MD5String:exposureAPI]];
+    if (exposureArray.count > 0) {
+        [self sendDataArray:exposureArray currentAPI:exposureAPI success:^(NSInteger code) {
+            if (code = 200) {
+                [GMCache removeObjectAtDocumentPathWithkey:[PhobosUtil MD5String:exposureAPI]];
+            }
+        }];
+    }
+}
+
++ (void)sendDataWithEntities:(NSArray<PhobosSendDataEntity *> *)sendDataEntities completion:(void (^)(NSArray<PhobosSendDataEntity *> * _Nonnull, NSInteger))completion {
+    if (sendDataEntities.count == 0) {
+        return;
+    } else if (sendDataEntities.count > PhobosMaxSendCount) {
+        NSMutableArray *temp = [NSMutableArray arrayWithCapacity:PhobosMaxSendCount];
+        [sendDataEntities enumerateObjectsUsingBlock:^(PhobosSendDataEntity * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            if (temp.count >= PhobosMaxSendCount) {
+                [self sendDataWithEntities:temp completion:completion];
+                [temp removeAllObjects];
+            }
+            [temp addObject:obj];
+        }];
+        return;
+    }
+    NSMutableDictionary *sendDataMap = [NSMutableDictionary new];
+    [sendDataEntities enumerateObjectsUsingBlock:^(PhobosSendDataEntity *obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        NSMutableArray *sendData = sendDataMap[obj.api] ?: [NSMutableArray new];
+        [sendData addObject:obj];
+        [sendDataMap setValue:sendData forKey:obj.api];
+    }];
+    
+    [sendDataMap enumerateKeysAndObjectsUsingBlock:^(NSString *api, NSArray<PhobosSendDataEntity *> *entities, BOOL * _Nonnull stop) {
+        // TODO: 如果数据量过大，
+        NSMutableArray *sendDatas = [NSMutableArray new];
+        [entities enumerateObjectsUsingBlock:^(PhobosSendDataEntity *obj, NSUInteger idx, BOOL * _Nonnull stop) {
+            [sendDatas addObject:[obj.data mj_JSONObject]];
+        }];
+        
+        if (sendDatas.count > 0) {
+            [self sendDataArray:sendDatas currentAPI:api success:^(NSInteger code) {
+                if (completion) {
+                    completion(entities, code);
+                }
+            }];
+        }
+    }];
+}
+
++ (void)sendDataArray:(NSArray *)dataArray currentAPI:(NSString *)currentAPI success:(SendDataSuccessBlock)success {
+    NSData *JSON = [PhobosUtil encodeJSON:dataArray];
+    NSData *compressedData = [PhobosUtil compressData:JSON];
+    [PhobosUtil sendData:compressedData currentAPI:currentAPI success:^(NSInteger code) {
+        if (success) {
+            success(code);
+        }
+    }];
+}
+
+@end

GMPhobos/Classes/PhobosUtil.h

@@ -53,6 +53,8 @@ typedef void (^SendDataSuccessBlock)(NSInteger code);
 + (BOOL)isNonEmpty:(NSString *)string;
 + (NSData *)encodeJSON:(id)obj;
 + (NSString *)deviceId;
+/** 获取手机型号 */
++ (NSString *)platform;
 /**
  * 获取IP地址
  */

GMPhobos/Classes/PhobosUtil.m

@@ -116,16 +116,17 @@
 
 + (void)sendData:(NSData *)data success:(SendDataSuccessBlock)success {
     @try {
-         NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:[Phobos sharedClient].serverAPI]];
+         NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:Phobos.sharedClient.serverAPI]];
         [request setValue:@"gzip" forHTTPHeaderField:@"Content-Encoding"];
         request.HTTPBody = data;
         request.HTTPMethod = @"POST";
         // sendAsynchronousRequest 在iOS9以后y被废除了
         NSURLSession *session = [NSURLSession sharedSession];
         NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
-            if (!error) {
-                //没有错误，返回正确；
-                if (success) {
+            if (success) {
+                if (error) {
+                    success(error.code);
+                } else {
                     success(200);
                 }
             }
@@ -146,9 +147,10 @@
         // sendAsynchronousRequest 在iOS9以后y被废除了
         NSURLSession *session = [NSURLSession sharedSession];
         NSURLSessionDataTask *dataTask = [session dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
-            if (!error) {
-                //没有错误，返回正确；
-                if (success) {
+            if (success) {
+                if (error) {
+                    success(error.code);
+                } else {
                     success(200);
                 }
             }
@@ -357,6 +359,14 @@
     return [NSString stringWithFormat:@"%ld", (long)count];
 }
 
+/** 获取手机型号 */
++ (NSString *)platform {
+    struct utsname systemInfo;
+    uname(&systemInfo);
+    NSString *platform = [NSString stringWithCString:systemInfo.machine encoding:NSUTF8StringEncoding];
+    return platform;
+}
+
 /***
  * 网卡地址
  **/

GMPhobos/Classes/UIResponder+PhobosPV.h

@@ -30,5 +30,4 @@
  */
 - (void)initReferrerTabName;
 
-
 @end

GMPhobos/Classes/UIResponder+PhobosPV.m

@@ -261,6 +261,4 @@
     PhobosUpdatePVBlock updatePVBlock = objc_getAssociatedObject(self, @selector(updatePVEndBlock));
     return updatePVBlock;
 }
-
-
 @end

GMPhobos/GMPhobosData.xcdatamodeld/GMPhobosData.xcdatamodel/contents

+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="15702" systemVersion="19C57" minimumToolsVersion="Automatic" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="">
+    <entity name="PhobosSendDataEntity" representedClassName="PhobosSendDataEntity" syncable="YES">
+        <attribute name="api" optional="YES" attributeType="String"/>
+        <attribute name="data" optional="YES" attributeType="Binary"/>
+        <attribute name="id" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="status" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
+    </entity>
+    <elements>
+        <element name="PhobosSendDataEntity" positionX="-54" positionY="-9" width="128" height="103"/>
+    </elements>
+</model>
\ No newline at end of file