diff --git a/Podfile b/Podfile index 388856b4..b417c4a6 100644 --- a/Podfile +++ b/Podfile @@ -18,7 +18,7 @@ def pods pod 'MZFayeClient', :path => '../CatchLib-iOS/MZFayeClient/' pod 'RealmSwift' pod 'MonkeyKing', '~> 0.0.2' -# pod 'JPush' + pod 'JPush' pod 'Fabric' pod 'Crashlytics' end diff --git a/Podfile.lock b/Podfile.lock index 556eb9ec..134147c7 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -11,6 +11,7 @@ PODS: - Fabric/Base (= 1.5.5) - Fabric/Base (1.5.5) - FXBlurView (1.6.4) + - JPush (1.8.7) - KeyboardMan (0.5) - Kingfisher (1.7.1) - MonkeyKing (0.0.2) @@ -37,6 +38,7 @@ DEPENDENCIES: - DeviceGuru - Fabric - FXBlurView + - JPush - KeyboardMan - Kingfisher - MonkeyKing (~> 0.0.2) @@ -61,6 +63,7 @@ SPEC CHECKSUMS: DeviceGuru: 6703820f7058693781c0048184eb4c3594b602cc Fabric: 190bf1a6eb65f7500de1347d027d2e59a7e53db1 FXBlurView: db786c2561cb49a09ae98407f52460096ab8a44f + JPush: 303c8e7c82ef1420906926a23c7f397c88eac387 KeyboardMan: ae716dfb1252ebcd1f68a2b659e91a970110e799 Kingfisher: c65d078cfc202639f2b6ddd49f09f742cef8781a MonkeyKing: 9be24307843a80f4cd3eca66adc12c67aefb83bb diff --git a/Yep.xcodeproj/project.pbxproj b/Yep.xcodeproj/project.pbxproj index bca185aa..848ebec1 100644 --- a/Yep.xcodeproj/project.pbxproj +++ b/Yep.xcodeproj/project.pbxproj @@ -275,8 +275,6 @@ 6A5632931BC911CB00397B53 /* DiscoverNormalUserCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A5632911BC911CB00397B53 /* DiscoverNormalUserCell.swift */; }; 6A5632941BC911CB00397B53 /* DiscoverNormalUserCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6A5632921BC911CB00397B53 /* DiscoverNormalUserCell.xib */; }; 6A5632971BC9559100397B53 /* DiscoverFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A5632961BC9559100397B53 /* DiscoverFlowLayout.swift */; }; - 6A56EC1C1BDFDB4D000706D1 /* libPushSDK-1.8.8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A56EC1B1BDFDB4D000706D1 /* libPushSDK-1.8.8.a */; }; - 6A56EC1E1BDFDB89000706D1 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A56EC1D1BDFDB89000706D1 /* libz.tbd */; }; 6A649A9B1BB259CB00EE4FB5 /* YepSoundEffect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A649A9A1BB259CB00EE4FB5 /* YepSoundEffect.swift */; }; 6A8215051BCBE5170011F36C /* MiniCardSkillLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A8215041BCBE5170011F36C /* MiniCardSkillLayout.swift */; }; 6A8215081BCBE8F10011F36C /* DiscoverSkillCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A8215061BCBE8F10011F36C /* DiscoverSkillCell.swift */; }; @@ -584,9 +582,6 @@ 6A5632911BC911CB00397B53 /* DiscoverNormalUserCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DiscoverNormalUserCell.swift; path = Views/Cells/DiscoverNormalUser/DiscoverNormalUserCell.swift; sourceTree = ""; }; 6A5632921BC911CB00397B53 /* DiscoverNormalUserCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = DiscoverNormalUserCell.xib; path = Views/Cells/DiscoverNormalUser/DiscoverNormalUserCell.xib; sourceTree = ""; }; 6A5632961BC9559100397B53 /* DiscoverFlowLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DiscoverFlowLayout.swift; path = ViewControllers/Discover/DiscoverFlowLayout.swift; sourceTree = ""; }; - 6A56EC1A1BDFDB4D000706D1 /* APService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APService.h; sourceTree = ""; }; - 6A56EC1B1BDFDB4D000706D1 /* libPushSDK-1.8.8.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libPushSDK-1.8.8.a"; sourceTree = ""; }; - 6A56EC1D1BDFDB89000706D1 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 6A649A9A1BB259CB00EE4FB5 /* YepSoundEffect.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = YepSoundEffect.swift; path = Helpers/YepSoundEffect.swift; sourceTree = ""; }; 6A8215041BCBE5170011F36C /* MiniCardSkillLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MiniCardSkillLayout.swift; path = Views/Cells/DiscoverCardUser/MiniCardSkillLayout.swift; sourceTree = ""; }; 6A8215061BCBE8F10011F36C /* DiscoverSkillCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DiscoverSkillCell.swift; path = Views/Cells/DiscoverSkill/DiscoverSkillCell.swift; sourceTree = ""; }; @@ -614,12 +609,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 6A56EC1E1BDFDB89000706D1 /* libz.tbd in Frameworks */, 0AD7EA681AC3ED3600617758 /* Foundation.framework in Frameworks */, 0AAFCFF91AC8CA5B00EB0EF8 /* MobileCoreServices.framework in Frameworks */, 0AD7EA6C1AC3ED4300617758 /* Security.framework in Frameworks */, 0AD7EA6A1AC3ED3D00617758 /* UIKit.framework in Frameworks */, - 6A56EC1C1BDFDB4D000706D1 /* libPushSDK-1.8.8.a in Frameworks */, 0AD7EA661AC3ED3000617758 /* CoreGraphics.framework in Frameworks */, 0AD7EA641AC3ED2A00617758 /* SystemConfiguration.framework in Frameworks */, 0AD7EA621AC3ED2100617758 /* CoreTelephony.framework in Frameworks */, @@ -807,8 +800,6 @@ 0AD7EA751AC3EE9B00617758 /* JPush */ = { isa = PBXGroup; children = ( - 6A56EC1A1BDFDB4D000706D1 /* APService.h */, - 6A56EC1B1BDFDB4D000706D1 /* libPushSDK-1.8.8.a */, 0AD7EA761AC3EEB000617758 /* PushConfig.plist */, ); name = JPush; @@ -1974,7 +1965,6 @@ 67B708B60AAD1DEA82A6A682 /* Frameworks */ = { isa = PBXGroup; children = ( - 6A56EC1D1BDFDB89000706D1 /* libz.tbd */, 0AAFCFF81AC8CA5B00EB0EF8 /* MobileCoreServices.framework */, 0AD7EA6B1AC3ED4300617758 /* Security.framework */, 0AD7EA691AC3ED3D00617758 /* UIKit.framework */, @@ -2675,7 +2665,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Yep", @@ -2708,7 +2698,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_BITCODE = YES; + ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Yep", diff --git a/Yep/APService.h b/Yep/APService.h deleted file mode 100644 index ae2e6d7b..00000000 --- a/Yep/APService.h +++ /dev/null @@ -1,175 +0,0 @@ -// -// APService.h -// APService -// -// Created by JPush on 12-8-15. -// Copyright (c) 2012年 HXHG. All rights reserved. -// Version: 1.8.8 - -@class CLRegion; -@class UILocalNotification; - -extern NSString *const kJPFNetworkDidSetupNotification; // 建立连接 -extern NSString *const kJPFNetworkDidCloseNotification; // 关闭连接 -extern NSString *const kJPFNetworkDidRegisterNotification; // 注册成功 -extern NSString *const kJPFNetworkDidLoginNotification; // 登录成功 -extern NSString *const - kJPFNetworkDidReceiveMessageNotification; // 收到消息(非APNS) -extern NSString *const kJPFServiceErrorNotification; // 错误提示 - -@class CLLocation; -@interface APService : NSObject - -#pragma - mark 基本功能 -// 以下四个接口是必须调用的 -+ (void)setupWithOption:(NSDictionary *)launchingOption; // 初始化 -+ (void)registerForRemoteNotificationTypes:(NSUInteger)types - categories:(NSSet *)categories; // 注册APNS类型 -+ (void)registerDeviceToken:(NSData *)deviceToken; // 向服务器上报Device Token -+ (void)handleRemoteNotification:(NSDictionary *) - remoteInfo; // 处理收到的APNS消息，向服务器上报收到APNS消息 - -// 下面的接口是可选的 -// 设置标签和(或)别名（若参数为nil，则忽略；若是空对象，则清空；详情请参考文档：http://docs.jpush.cn/pages/viewpage.action?pageId=3309913） -+ (void)setTags:(NSSet *)tags - alias:(NSString *)alias - callbackSelector:(SEL)cbSelector - target:(id)theTarget; -+ (void)setTags:(NSSet *)tags - alias:(NSString *)alias - callbackSelector:(SEL)cbSelector - object:(id)theTarget; -+ (void)setTags:(NSSet *)tags - callbackSelector:(SEL)cbSelector - object:(id)theTarget; -+ (void)setAlias:(NSString *)alias - callbackSelector:(SEL)cbSelector - object:(id)theTarget; -// 用于过滤出正确可用的tags，如果总数量超出最大限制则返回最大数量的靠前的可用tags -+ (NSSet *)filterValidTags:(NSSet *)tags; - -#pragma - mark 上报日志 -/** - * 记录页面停留时间功能。 - * startLogPageView和stopLogPageView为自动计算停留时间 - * beginLogPageView为手动自己输入停留时间 - * - * @param pageName 页面名称 - * @param seconds 页面停留时间 - */ -+ (void)startLogPageView:(NSString *)pageName; -+ (void)stopLogPageView:(NSString *)pageName; -+ (void)beginLogPageView:(NSString *)pageName duration:(int)seconds; - -/** - * 开启Crash日志收集, 默认是关闭状态. -*/ -+ (void)crashLogON; - -/** - * 地理位置设置 - * 为了更精确的统计用户地理位置，可以调用此方法传入经纬度信息 - * 需要链接 CoreLocation.framework 并且 #import - * @param latitude 纬度. - * @param longitude 经度. - * @param location 直接传递CLLocation *型的地理信息 - */ -+ (void)setLatitude:(double)latitude longitude:(double)longitude; -+ (void)setLocation:(CLLocation *)location; - -#pragma - mark 本地通知 -/** -* 本地推送，最多支持64个 -* @param fireDate 本地推送触发的时间 -* @param alertBody 本地推送需要显示的内容 -* @param badge 角标的数字。如果不需要改变角标传-1 -* @param alertAction 弹框的按钮显示的内容（IOS 8默认为"打开",其他默认为"启动"） -* @param notificationKey 本地推送标示符 -* @param userInfo 自定义参数，可以用来标识推送和增加附加信息 -* @param soundName 自定义通知声音，设置为nil为默认声音 - -* IOS8新参数 -* @param region 自定义参数 -* @param regionTriggersOnce 自定义参数 -* @param category 自定义参数 -*/ -+ (UILocalNotification *)setLocalNotification:(NSDate *)fireDate - alertBody:(NSString *)alertBody - badge:(int)badge - alertAction:(NSString *)alertAction - identifierKey:(NSString *)notificationKey - userInfo:(NSDictionary *)userInfo - soundName:(NSString *)soundName; - -+ (UILocalNotification *)setLocalNotification:(NSDate *)fireDate - alertBody:(NSString *)alertBody - badge:(int)badge - alertAction:(NSString *)alertAction - identifierKey:(NSString *)notificationKey - userInfo:(NSDictionary *)userInfo - soundName:(NSString *)soundName - region:(CLRegion *)region - regionTriggersOnce:(BOOL)regionTriggersOnce - category:(NSString *)category - NS_AVAILABLE_IOS(8_0); - -/** -* 本地推送在前台推送。默认App在前台运行时不会进行弹窗，在程序接收通知调用此接口可实现指定的推送弹窗。 -* @param notification 本地推送对象 -* @param notificationKey 需要前台显示的本地推送通知的标示符 -*/ -+ (void)showLocalNotificationAtFront:(UILocalNotification *)notification - identifierKey:(NSString *)notificationKey; -/** -* 删除本地推送 -* @param notificationKey 本地推送标示符 -* @param myUILocalNotification 本地推送对象 -*/ -+ (void)deleteLocalNotificationWithIdentifierKey:(NSString *)notificationKey; -+ (void)deleteLocalNotification:(UILocalNotification *)localNotification; - -/** -* 获取指定通知 -* @param notificationKey 本地推送标示符 -* @return 本地推送对象数组,[array count]为0时表示没找到 -*/ -+ (NSArray *)findLocalNotificationWithIdentifier:(NSString *)notificationKey; - -/** -* 清除所有本地推送对象 -*/ -+ (void)clearAllLocalNotifications; - -#pragma - mark 设置Badge -/** - * set setBadge - * @param value 设置JPush服务器的badge的值 - * 本地仍须调用UIApplication:setApplicationIconBadgeNumber函数,来设置脚标 - */ -+ (BOOL)setBadge:(NSInteger)value; -/** - * set setBadge - * @param value 清除JPush服务器对badge值的设定. - * 本地仍须调用UIApplication:setApplicationIconBadgeNumber函数,来设置脚标 - */ - -+ (void)resetBadge; - -/** - * get RegistrationID - */ -+ (NSString *)registrationID; - -#pragma - mark 打印日志信息配置 -/** - * setDebugMode获取更多的Log信息 - * 开发过程中建议开启DebugMode - * - * setLogOFF关闭除了错误信息外的所有Log - * 发布时建议开启LogOFF用于节省性能开销 - * - * 默认为不开启DebugLog,只显示基本的信息 - */ -+ (void)setDebugMode; -+ (void)setLogOFF; -@end diff --git a/Yep/libPushSDK-1.8.8.a b/Yep/libPushSDK-1.8.8.a deleted file mode 100644 index ef566f98..00000000 Binary files a/Yep/libPushSDK-1.8.8.a and /dev/null differ