Skip to content

GMPhobos
GMPhobos
Commit eb2a528b authored by 翟国钧's avatar 翟国钧
Browse files
Options

增加GPS信息和设备厂商信息

parent 512fe55b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 25 deletions
Example/GMPhobos.xcodeproj/project.pbxproj
View file @ eb2a528b
...@@ -316,7 +316,7 @@ ...@@ -316,7 +316,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
680392E325EDB9514EAD7BF6 /* [CP] Copy Pods Resources */ = { 680392E325EDB9514EAD7BF6 /* [CP] Copy Pods Resources */ = {
...@@ -361,7 +361,7 @@ ...@@ -361,7 +361,7 @@
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0; showEnvVarsInLog = 0;
}; };
B1BE839C8D7CB38052ED84D1 /* [CP] Copy Pods Resources */ = { B1BE839C8D7CB38052ED84D1 /* [CP] Copy Pods Resources */ = {
......
Example/Podfile.lock
View file @ eb2a528b
PODS: PODS:
- GMCache (0.1.0): - GMCache (0.1.0):
- TMCache (~> 2.1.0) - TMCache (~> 2.1.0)
- GMPhobos (0.2.15): - GMPhobos (0.2.16):
- GMCache (~> 0.1.0) - GMCache (~> 0.1.0)
- TMCache (2.1.0) - TMCache (2.1.0)
...@@ -14,9 +14,9 @@ EXTERNAL SOURCES: ...@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc
GMPhobos: 3975092a8be0811a8d3d2b02617102dd8234ce38 GMPhobos: f068380628d029dc01ae38657f851f4ef9fcc94e
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
PODFILE CHECKSUM: ab2b5ff1dcd8a35fd02cced6c06c7f9477b82d69 PODFILE CHECKSUM: ab2b5ff1dcd8a35fd02cced6c06c7f9477b82d69
COCOAPODS: 1.1.0.rc.2 COCOAPODS: 1.0.1
Example/Pods/Local Podspecs/GMPhobos.podspec.json
View file @ eb2a528b
{ {
"name": "GMPhobos", "name": "GMPhobos",
"version": "0.2.15", "version": "0.2.16",
"summary": "GM statistic data sdk", "summary": "GM statistic data sdk",
"description": "GM event track sdk.", "description": "GM event track sdk.",
"homepage": "http://git.gengmei.cc/gengmeiios/GMPhobos", "homepage": "http://git.gengmei.cc/gengmeiios/GMPhobos",
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
"licong": "licong@gmei.com" "licong": "licong@gmei.com"
}, },
"source": { "source": {
"git": "http://git.gengmei.cc/gengmeiios/GMPhobos.git", "git": "git@git.gengmei.cc:gengmeiios/GMPhobos.git",
"tag": "0.2.15" "tag": "0.2.16"
}, },
"platforms": { "platforms": {
"ios": "8.0" "ios": "8.0"
......
Example/Pods/Manifest.lock
View file @ eb2a528b
PODS: PODS:
- GMCache (0.1.0): - GMCache (0.1.0):
- TMCache (~> 2.1.0) - TMCache (~> 2.1.0)
- GMPhobos (0.2.15): - GMPhobos (0.2.16):
- GMCache (~> 0.1.0) - GMCache (~> 0.1.0)
- TMCache (2.1.0) - TMCache (2.1.0)
...@@ -14,9 +14,9 @@ EXTERNAL SOURCES: ...@@ -14,9 +14,9 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS: SPEC CHECKSUMS:
GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc GMCache: a7b06a2d8a5a1c7cf023055c631ba9a0cd7c39fc
GMPhobos: 3975092a8be0811a8d3d2b02617102dd8234ce38 GMPhobos: f068380628d029dc01ae38657f851f4ef9fcc94e
TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed
PODFILE CHECKSUM: ab2b5ff1dcd8a35fd02cced6c06c7f9477b82d69 PODFILE CHECKSUM: ab2b5ff1dcd8a35fd02cced6c06c7f9477b82d69
COCOAPODS: 1.1.0.rc.2 COCOAPODS: 1.0.1
Example/Pods/Pods.xcodeproj/project.pbxproj
View file @ eb2a528b
This diff is collapsed.
Example/Pods/Target Support Files/GMPhobos/Info.plist
View file @ eb2a528b
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>FMWK</string> <string>FMWK</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.2.15</string> <string>0.2.16</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
......
Example/Pods/Target Support Files/Pods-GMPhobos_Example/Pods-GMPhobos_Example-acknowledgements.plist
View file @ eb2a528b
...@@ -34,8 +34,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ...@@ -34,8 +34,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
</string> </string>
<key>License</key>
<string>MIT</string>
<key>Title</key> <key>Title</key>
<string>GMCache</string> <string>GMCache</string>
<key>Type</key> <key>Type</key>
...@@ -63,8 +61,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ...@@ -63,8 +61,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
</string> </string>
<key>License</key>
<string>MIT</string>
<key>Title</key> <key>Title</key>
<string>GMPhobos</string> <string>GMPhobos</string>
<key>Type</key> <key>Type</key>
...@@ -274,8 +270,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ...@@ -274,8 +270,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
</string> </string>
<key>License</key>
<string>Apache 2.0</string>
<key>Title</key> <key>Title</key>
<string>TMCache</string> <string>TMCache</string>
<key>Type</key> <key>Type</key>
......
Example/Pods/Target Support Files/Pods-GMPhobos_Example/Pods-GMPhobos_Example.debug.xcconfig
View file @ eb2a528b
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" 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 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' 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 @ eb2a528b
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" 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 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
Example/Pods/Target Support Files/Pods-GMPhobos_Tests/Pods-GMPhobos_Tests.debug.xcconfig
View file @ eb2a528b
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" 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 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' 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 @ eb2a528b
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" 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 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
......
Pod/Classes/Phobos.h
View file @ eb2a528b
...@@ -59,6 +59,8 @@ ...@@ -59,6 +59,8 @@
*/ */
- (void)setCurrentCityId:(NSString *)currentCityId; - (void)setCurrentCityId:(NSString *)currentCityId;
- (void)setGPS:(NSDictionary *)gps;
/** /**
* @brief 自定义事件,数量统计. * @brief 自定义事件,数量统计.
* *
......
Pod/Classes/Phobos.m
View file @ eb2a528b
...@@ -26,6 +26,8 @@ static NSString *sdkVersion = @"110"; ...@@ -26,6 +26,8 @@ static NSString *sdkVersion = @"110";
@property (assign, nonatomic) NSInteger userId; @property (assign, nonatomic) NSInteger userId;
@property (assign, nonatomic) BOOL logEnabled; @property (assign, nonatomic) BOOL logEnabled;
@property (strong, nonatomic) NSString *sessionId; @property (strong, nonatomic) NSString *sessionId;
@property (strong, nonatomic) NSString *lng;
@property (strong, nonatomic) NSString *lat;
@end @end
...@@ -51,6 +53,8 @@ static NSString *sdkVersion = @"110"; ...@@ -51,6 +53,8 @@ static NSString *sdkVersion = @"110";
_channelId = channelId; _channelId = channelId;
_logEnabled = NO; _logEnabled = NO;
_userId = 0; _userId = 0;
_lat = @"";
_lng = @"";
_currentCityId = @""; _currentCityId = @"";
_appVersion = [self getAppVersion]; _appVersion = [self getAppVersion];
[self setupNotification]; [self setupNotification];
...@@ -74,6 +78,17 @@ static NSString *sdkVersion = @"110"; ...@@ -74,6 +78,17 @@ static NSString *sdkVersion = @"110";
_currentCityId = currentCityId; _currentCityId = currentCityId;
} }
- (void)setGPS:(NSDictionary *)gps {
@try {
NSString *lng = gps[@"lng"];
NSString *lat = gps[@"lat"];
_lng = lng;
_lat = lat;
} @catch (NSException *exception) {
phobosLog(exception);
}
}
- (void)handleEventAfterInit{ - (void)handleEventAfterInit{
WMCacheService *cache = [WMCacheService sharedInstance]; WMCacheService *cache = [WMCacheService sharedInstance];
...@@ -314,7 +329,10 @@ static NSString *sdkVersion = @"110"; ...@@ -314,7 +329,10 @@ static NSString *sdkVersion = @"110";
NSMutableDictionary *deviceParams = [NSMutableDictionary dictionaryWithObjectsAndKeys: NSMutableDictionary *deviceParams = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString],@"device_id", [[[ASIdentifierManager sharedManager] advertisingIdentifier] UUIDString],@"device_id",
[[[UIDevice currentDevice] identifierForVendor] UUIDString],@"idfv", [[[UIDevice currentDevice] identifierForVendor] UUIDString],@"idfv",
@"ios",@"device_type",nil]; @"ios",@"device_type",
@"Apple",@"manufacturer",
_lat,@"lat",
_lng,@"lng",nil];
NSMutableDictionary *appParams = [NSMutableDictionary dictionaryWithObjectsAndKeys: NSMutableDictionary *appParams = [NSMutableDictionary dictionaryWithObjectsAndKeys:
self.appName, @"name", self.appName, @"name",
self.appVersion, @"version", self.appVersion, @"version",
...@@ -463,4 +481,4 @@ static NSString *sdkVersion = @"110"; ...@@ -463,4 +481,4 @@ static NSString *sdkVersion = @"110";
} }
} }
@end @end
\ No newline at end of file
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