Skip to content

GMPhobos
GMPhobos
Commit 77bb3bf4 authored by 汪洋's avatar 汪洋
Browse files
Options

去除GMKit的依赖

parents 69bb9a3b 1efb9b76
Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 40 deletions
.gitignore
View file @ 77bb3bf4
......@@ -2,7 +2,7 @@
.DS_Store
# Xcode
Example/Pods
Pods/
build/
*.pbxuser
!default.pbxuser
......
Example/Podfile.lock
View file @ 77bb3bf4
PODS:
- GMCache (0.1.1):
- TMCache (~> 2.1.0)
- GMPhobos (0.2.26):
- GMPhobos (0.3.2):
- GMCache (~> 0.1.1)
- TMCache (2.1.0)
......@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
GMPhobos: 613c57b5b302f8238db03a6090b9022524abc710
GMPhobos: de44f32d6768d15eb6664f6236bb5fb72ac3e580
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
PODFILE CHECKSUM: 281ed5ce2f0e8e2e49cc13b1e4726e6686ac6095
COCOAPODS: 1.1.1
COCOAPODS: 1.2.0
Example/Pods/Local Podspecs/GMPhobos.podspec.json
View file @ 77bb3bf4
{
"name": "GMPhobos",
"version": "0.2.26",
"version": "0.3.2",
"summary": "GM statistic data sdk",
"description": "GM event track sdk.",
"homepage": "http://git.gengmei.cc/gengmeiios/GMPhobos",
......@@ -10,7 +10,7 @@
},
"source": {
"git": "git@git.gengmei.cc:gengmeiios/GMPhobos.git",
"tag": "0.2.26"
"tag": "0.3.2"
},
"platforms": {
"ios": "8.0"
......
Example/Pods/Manifest.lock
View file @ 77bb3bf4
PODS:
- GMCache (0.1.1):
- TMCache (~> 2.1.0)
- GMPhobos (0.2.26):
- GMPhobos (0.3.2):
- GMCache (~> 0.1.1)
- TMCache (2.1.0)
......@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
GMCache: 73855b613b9d7e34f4f37ad425e8b8153b760c04
GMPhobos: 613c57b5b302f8238db03a6090b9022524abc710
GMPhobos: de44f32d6768d15eb6664f6236bb5fb72ac3e580
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
PODFILE CHECKSUM: 281ed5ce2f0e8e2e49cc13b1e4726e6686ac6095
COCOAPODS: 1.1.1
COCOAPODS: 1.2.0
Example/Pods/Target Support Files/GMCache/GMCache-prefix.pch
View file @ 77bb3bf4
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
Example/Pods/Target Support Files/GMCache/GMCache-umbrella.h
View file @ 77bb3bf4
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#import "WMCacheService.h"
......
Example/Pods/Target Support Files/GMCache/GMCache.xcconfig
View file @ 77bb3bf4
......@@ -5,5 +5,6 @@ HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Publi
PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/GMCache
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
Example/Pods/Target Support Files/GMPhobos/GMPhobos-prefix.pch
View file @ 77bb3bf4
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
Example/Pods/Target Support Files/GMPhobos/GMPhobos-umbrella.h
View file @ 77bb3bf4
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#import "Phobos.h"
......
Example/Pods/Target Support Files/GMPhobos/GMPhobos.xcconfig
View file @ 77bb3bf4
......@@ -6,5 +6,6 @@ OTHER_LDFLAGS = -l"z"
PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/../..
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
Example/Pods/Target Support Files/GMPhobos/Info.plist
View file @ 77bb3bf4
......@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.2.26</string>
<string>0.3.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
......
Example/Pods/Target Support Files/Pods-GMPhobos_Example/Pods-GMPhobos_Example-frameworks.sh
View file @ 77bb3bf4
......@@ -59,8 +59,13 @@ code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\""
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
code_sign_cmd="$code_sign_cmd &"
fi
echo "$code_sign_cmd"
eval "$code_sign_cmd"
fi
}
......@@ -93,3 +98,6 @@ if [[ "$CONFIGURATION" == "Release" ]]; then
install_framework "$BUILT_PRODUCTS_DIR/GMPhobos/GMPhobos.framework"
install_framework "$BUILT_PRODUCTS_DIR/TMCache/TMCache.framework"
fi
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
wait
fi
Example/Pods/Target Support Files/Pods-GMPhobos_Example/Pods-GMPhobos_Example-resources.sh
View file @ 77bb3bf4
......@@ -18,6 +18,9 @@ case "${TARGETED_DEVICE_FAMILY}" in
2)
TARGET_DEVICE_ARGS="--target-device ipad"
;;
3)
TARGET_DEVICE_ARGS="--target-device tv"
;;
*)
TARGET_DEVICE_ARGS="--target-device mac"
;;
......
Example/Pods/Target Support Files/Pods-GMPhobos_Example/Pods-GMPhobos_Example-umbrella.h
View file @ 77bb3bf4
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
......
Example/Pods/Target Support Files/Pods-GMPhobos_Example/Pods-GMPhobos_Example.debug.xcconfig
View file @ 77bb3bf4
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/GMCache" "$PODS_CONFIGURATION_BUILD_DIR/GMPhobos" "$PODS_CONFIGURATION_BUILD_DIR/TMCache"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
Example/Pods/Target Support Files/Pods-GMPhobos_Example/Pods-GMPhobos_Example.release.xcconfig
View file @ 77bb3bf4
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/GMCache" "$PODS_CONFIGURATION_BUILD_DIR/GMPhobos" "$PODS_CONFIGURATION_BUILD_DIR/TMCache"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
Example/Pods/Target Support Files/Pods-GMPhobos_Tests/Pods-GMPhobos_Tests-frameworks.sh
View file @ 77bb3bf4
......@@ -59,8 +59,13 @@ code_sign_if_enabled() {
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
# Use the current code_sign_identitiy
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\""
/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1"
local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
code_sign_cmd="$code_sign_cmd &"
fi
echo "$code_sign_cmd"
eval "$code_sign_cmd"
fi
}
......@@ -82,3 +87,6 @@ strip_invalid_archs() {
fi
}
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
wait
fi
Example/Pods/Target Support Files/Pods-GMPhobos_Tests/Pods-GMPhobos_Tests-resources.sh
View file @ 77bb3bf4
......@@ -18,6 +18,9 @@ case "${TARGETED_DEVICE_FAMILY}" in
2)
TARGET_DEVICE_ARGS="--target-device ipad"
;;
3)
TARGET_DEVICE_ARGS="--target-device tv"
;;
*)
TARGET_DEVICE_ARGS="--target-device mac"
;;
......
Example/Pods/Target Support Files/Pods-GMPhobos_Tests/Pods-GMPhobos_Tests-umbrella.h
View file @ 77bb3bf4
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
......
Example/Pods/Target Support Files/Pods-GMPhobos_Tests/Pods-GMPhobos_Tests.debug.xcconfig
View file @ 77bb3bf4
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/GMCache" "$PODS_CONFIGURATION_BUILD_DIR/GMPhobos" "$PODS_CONFIGURATION_BUILD_DIR/TMCache"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
Example/Pods/Target Support Files/Pods-GMPhobos_Tests/Pods-GMPhobos_Tests.release.xcconfig
View file @ 77bb3bf4
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/GMCache" "$PODS_CONFIGURATION_BUILD_DIR/GMPhobos" "$PODS_CONFIGURATION_BUILD_DIR/TMCache"
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
Example/Pods/Target Support Files/TMCache/TMCache-prefix.pch
View file @ 77bb3bf4
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
Example/Pods/Target Support Files/TMCache/TMCache-umbrella.h
View file @ 77bb3bf4
#ifdef __OBJC__
#import <UIKit/UIKit.h>
#else
#ifndef FOUNDATION_EXPORT
#if defined(__cplusplus)
#define FOUNDATION_EXPORT extern "C"
#else
#define FOUNDATION_EXPORT extern
#endif
#endif
#endif
#import "TMCache.h"
......
Example/Pods/Target Support Files/TMCache/TMCache.xcconfig
View file @ 77bb3bf4
......@@ -5,5 +5,6 @@ OTHER_LDFLAGS = -framework "Foundation" -weak_framework "UIKit"
PODS_BUILD_DIR = $BUILD_DIR
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
PODS_ROOT = ${SRCROOT}
PODS_TARGET_SRCROOT = ${PODS_ROOT}/TMCache
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
SKIP_INSTALL = YES
GMPhobos.podspec
View file @ 77bb3bf4
......@@ -8,7 +8,7 @@
Pod::Spec.new do |s|
s.name = "GMPhobos"
s.version = "0.2.26"
s.version = "0.3.2"
s.summary = "GM statistic data sdk"
s.description = <<-DESC
......
Pod/Classes/Phobos.h
View file @ 77bb3bf4
......@@ -71,6 +71,11 @@
@property (strong, nonatomic) CLLocation *gps;
/**
* 记录用户类型
*/
@property (strong, nonatomic) NSMutableDictionary *userType;
#pragma mark - 事件采集
/**
......
Pod/Classes/Phobos.m
View file @ 77bb3bf4
......@@ -12,7 +12,6 @@
#import "PhobosUtil.h"
#import "PhobosConfig.h"
#import "UIResponder+PhobosPV.h"
//#import "UIDevice+Resolutions.h"
#import "PhobosUtil.h"
static Phobos *sharedClient = nil;
......@@ -52,6 +51,7 @@ static NSString *sdkVersion = @"110";
_userId = 0;
_netStatus = @"";
_currentCityId = @"";
_userType = [[NSMutableDictionary alloc] initWithCapacity:0];
_appVersion = [PhobosUtil getAppVersion];
[self setupNotification];
[self handleSessionStart];
......@@ -67,6 +67,25 @@ static NSString *sdkVersion = @"110";
}
}
- (void)setUserType:(NSMutableDictionary *)userType {
if (userType == nil && userType.count == 0) {
return;
}
NSArray *newKeys = userType.allKeys;
NSArray *oldKeys = _userType.allKeys;
for (NSString *newKey in newKeys) {
if ([oldKeys containsObject:newKey]) {
NSString *newValue = [[userType objectForKey:newKey] stringValue];
NSString *oldValue = [[_userType objectForKey:newKey] stringValue];
if (![newValue isEqualToString:oldValue]) {
[_userType setObject:[userType objectForKey:newKey] forKey:newKey];
}
} else {
[_userType setObject:[userType objectForKey:newKey] forKey:newKey];
}
}
}
- (void)handleEventAfterInit{
WMCacheService *cache = [WMCacheService sharedInstance];
......@@ -321,6 +340,7 @@ static NSString *sdkVersion = @"110";
self.appName, @"name",
self.appVersion, @"version",
self.channelId,@"channel",
_userType,@"user_type",
self.currentCityId,@"current_city_id", nil];
[dict setObject:eventId forKey:@"type"];
[dict setObject:appParams forKey:@"app"];
......
fastlane/README.md
View file @ 77bb3bf4
fastlane documentation
================
# Installation
Make sure you have the latest version of the Xcode command line tools installed:
```
sudo gem install fastlane
xcode-select --install
```
## Choose your installation method:
<table width="100%" >
<tr>
<th width="33%"><a href="http://brew.sh">Homebrew</a></td>
<th width="33%">Installer Script</td>
<th width="33%">Rubygems</td>
</tr>
<tr>
<td width="33%" align="center">macOS</td>
<td width="33%" align="center">macOS</td>
<td width="33%" align="center">macOS or Linux with Ruby 2.0.0 or above</td>
</tr>
<tr>
<td width="33%"><code>brew cask install fastlane</code></td>
<td width="33%"><a href="https://download.fastlane.tools/fastlane.zip">Download the zip file</a>. Then double click on the <code>install</code> script (or run it in a terminal window).</td>
<td width="33%"><code>sudo gem install fastlane -NV</code></td>
</tr>
</table>
# Available Actions
## iOS
### ios do_deliver_app
......@@ -16,14 +39,24 @@ Deploy a new version to the App Store
fastlane ios do_release_lib
```
Release new private pod version
### ios do_monkey_test
### ios do_publish_beta
```
fastlane ios do_publish_beta
```
Publish a beta version
### ios do_publish_test
```
fastlane ios do_publish_test
```
Publish a test version
### ios do_automation_test
```
fastlane ios do_monkey_test
fastlane ios do_automation_test
```
UI automation test
----
This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
More information about fastlane can be found on [https://fastlane.tools](https://fastlane.tools).
The documentation of fastlane can be found on [GitHub](https://github.com/fastlane/fastlane/tree/master/fastlane).
More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
fastlane/report.xml
View file @ 77bb3bf4
......@@ -3,77 +3,79 @@
<testsuite name="fastlane.lanes">
<testcase classname="fastlane.lanes" name="0: Verifying required fastlane version" time="0.000549">
<testcase classname="fastlane.lanes" name="00: Verifying required fastlane version" time="0.000503">
</testcase>
<testcase classname="fastlane.lanes" name="1: default_platform" time="0.000218">
<testcase classname="fastlane.lanes" name="01: default_platform" time="0.000231">
</testcase>
<testcase classname="fastlane.lanes" name="2: import_from_git" time="0.57752">
<testcase classname="fastlane.lanes" name="02: import_from_git" time="0.525561">
</testcase>
<testcase classname="fastlane.lanes" name="3: hipchat" time="0.059906">
<testcase classname="fastlane.lanes" name="03: hipchat" time="0.058962">
</testcase>
<testcase classname="fastlane.lanes" name="4: git_pull" time="2.794053">
<testcase classname="fastlane.lanes" name="04: git_pull" time="0.811058">
</testcase>
<testcase classname="fastlane.lanes" name="5: ensure_git_branch" time="0.008524">
<testcase classname="fastlane.lanes" name="05: ensure_git_branch" time="0.008128">
</testcase>
<testcase classname="fastlane.lanes" name="6: pod_install" time="20.927821">
<testcase classname="fastlane.lanes" name="06: pod_install" time="20.371176">
</testcase>
<testcase classname="fastlane.lanes" name="7: pod_lib_lint" time="32.338374">
<testcase classname="fastlane.lanes" name="07: pod_lib_lint" time="36.984906">
</testcase>
<testcase classname="fastlane.lanes" name="8: version_bump_podspec" time="0.001252">
<testcase classname="fastlane.lanes" name="08: version_bump_podspec" time="0.001369">
</testcase>
<testcase classname="fastlane.lanes" name="9: git_commit_all" time="0.051558">
<testcase classname="fastlane.lanes" name="09: git_commit_all" time="0.219974">
</testcase>
<testcase classname="fastlane.lanes" name="10: add_git_tag" time="0.012094">
<testcase classname="fastlane.lanes" name="10: add_git_tag" time="0.012419">
</testcase>
<testcase classname="fastlane.lanes" name="11: push_to_git_remote" time="0.976185">
<testcase classname="fastlane.lanes" name="11: push_to_git_remote" time="0.88362">
</testcase>
<testcase classname="fastlane.lanes" name="12: pod_push" time="33.98508">
<testcase classname="fastlane.lanes" name="12: pod_push" time="27.225363">
</testcase>
<testcase classname="fastlane.lanes" name="13: pod_repo_update" time="1.200025">
<testcase classname="fastlane.lanes" name="13: pod_repo_update" time="1.125242">
</testcase>
<testcase classname="fastlane.lanes" name="14: hipchat" time="0.057796">
<testcase classname="fastlane.lanes" name="14: hipchat" time="0.054368">
</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