极光的更改

Podfile

@@ -8,7 +8,6 @@ pod 'SSKeychain', '~> 1.2.3'
 pod 'FMDB', '~> 2.5'
 pod 'Base64nl', '~> 1.2'
 pod 'Reveal-iOS-SDK', '~> 1.5.1'
-pod 'BaiduMapAPI', '~> 2.7.0'
+pod 'BaiduMapAPI', '~> 2.8.1'
 pod 'MJRefresh', '~> 2.2.0'
 pod 'IQKeyboardManager', '~> 3.2.3'
-pod 'JPushSDK', '~> 1.8.2'
\ No newline at end of file

Podfile.lock

+PODS:
+  - AFNetworking (2.5.4):
+    - AFNetworking/NSURLConnection (= 2.5.4)
+    - AFNetworking/NSURLSession (= 2.5.4)
+    - AFNetworking/Reachability (= 2.5.4)
+    - AFNetworking/Security (= 2.5.4)
+    - AFNetworking/Serialization (= 2.5.4)
+    - AFNetworking/UIKit (= 2.5.4)
+  - AFNetworking/NSURLConnection (2.5.4):
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+  - AFNetworking/NSURLSession (2.5.4):
+    - AFNetworking/Reachability
+    - AFNetworking/Security
+    - AFNetworking/Serialization
+  - AFNetworking/Reachability (2.5.4)
+  - AFNetworking/Security (2.5.4)
+  - AFNetworking/Serialization (2.5.4)
+  - AFNetworking/UIKit (2.5.4):
+    - AFNetworking/NSURLConnection
+    - AFNetworking/NSURLSession
+  - BaiduMapAPI (2.8.1):
+    - BaiduMapAPI/Default (= 2.8.1)
+  - BaiduMapAPI/Default (2.8.1):
+    - BaiduMapAPI/Universal
+  - BaiduMapAPI/Universal (2.8.1)
+  - Base64nl (1.2)
+  - FMDB (2.5):
+    - FMDB/standard (= 2.5)
+  - FMDB/common (2.5)
+  - FMDB/standard (2.5):
+    - FMDB/common
+  - IQKeyboardManager (3.2.4)
+  - MBProgressHUD (0.9.1)
+  - MJRefresh (2.2.1)
+  - Reveal-iOS-SDK (1.5.1)
+  - SDWebImage (3.7.3):
+    - SDWebImage/Core (= 3.7.3)
+  - SDWebImage/Core (3.7.3)
+  - SSKeychain (1.2.3)
+
+DEPENDENCIES:
+  - AFNetworking (~> 2.5.4)
+  - BaiduMapAPI (~> 2.8.1)
+  - Base64nl (~> 1.2)
+  - FMDB (~> 2.5)
+  - IQKeyboardManager (~> 3.2.3)
+  - MBProgressHUD (~> 0.9.1)
+  - MJRefresh (~> 2.2.0)
+  - Reveal-iOS-SDK (~> 1.5.1)
+  - SDWebImage (~> 3.7.2)
+  - SSKeychain (~> 1.2.3)
+
+SPEC CHECKSUMS:
+  AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
+  BaiduMapAPI: 2d03e12a51d5c6c49ece555c6bdda8562635cc02
+  Base64nl: a497bdcd1c01ea793d36b399016195a8713c0e95
+  FMDB: 96e8f1bcc1329e269330f99770ad4285d9003e52
+  IQKeyboardManager: 555b1231fefafb21b19278d7cca72986a27b748b
+  MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad
+  MJRefresh: c3fa0387e8e97a11a9666639d2f815607edd1c2f
+  Reveal-iOS-SDK: c9c55cad2729c85f6ced415f1b21857c9a2d8ef9
+  SDWebImage: 1d2b1a1efda1ade1b00b6f8498865f8ddedc8a84
+  SSKeychain: 3f42991739c6c60a9cf1bbd4dff6c0d3694bcf3d
+
+COCOAPODS: 0.39.0

XFFruit.xcodeproj/project.pbxproj

@@ -61,6 +61,7 @@
 		35321F671B97EF1100E5C670 /* GXFPopNewMaterialViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35321F661B97EF1100E5C670 /* GXFPopNewMaterialViewController.m */; };
 		35321F6A1B97EF3600E5C670 /* GXFPopNewProductViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35321F691B97EF3600E5C670 /* GXFPopNewProductViewController.m */; };
 		35321F6D1B98C66400E5C670 /* GXFButtonAndLineView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35321F6C1B98C66400E5C670 /* GXFButtonAndLineView.m */; };
+		3557F96B1BDF7E4A00078AF4 /* libPushSDK-1.8.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3557F96A1BDF7E4A00078AF4 /* libPushSDK-1.8.7.a */; };
 		358432EE1B993BAF007E73ED /* GXFProcessMaterialTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 358432ED1B993BAF007E73ED /* GXFProcessMaterialTableViewCell.m */; };
 		358432F11B993BD8007E73ED /* GXFProcessProductTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 358432F01B993BD8007E73ED /* GXFProcessProductTableViewCell.m */; };
 		358432F41B994EDD007E73ED /* GXFSeeProcessViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 358432F31B994EDD007E73ED /* GXFSeeProcessViewController.m */; };
@@ -550,6 +551,8 @@
 		35321F691B97EF3600E5C670 /* GXFPopNewProductViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = GXFPopNewProductViewController.m; path = ../Views/GXFPopNewProductViewController.m; sourceTree = "<group>"; };
 		35321F6B1B98C66400E5C670 /* GXFButtonAndLineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXFButtonAndLineView.h; sourceTree = "<group>"; };
 		35321F6C1B98C66400E5C670 /* GXFButtonAndLineView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFButtonAndLineView.m; sourceTree = "<group>"; };
+		3557F9691BDF7E4A00078AF4 /* APService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APService.h; sourceTree = "<group>"; };
+		3557F96A1BDF7E4A00078AF4 /* libPushSDK-1.8.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libPushSDK-1.8.7.a"; sourceTree = "<group>"; };
 		358432EC1B993BAF007E73ED /* GXFProcessMaterialTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXFProcessMaterialTableViewCell.h; sourceTree = "<group>"; };
 		358432ED1B993BAF007E73ED /* GXFProcessMaterialTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GXFProcessMaterialTableViewCell.m; sourceTree = "<group>"; };
 		358432EF1B993BD8007E73ED /* GXFProcessProductTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GXFProcessProductTableViewCell.h; sourceTree = "<group>"; };
@@ -1084,6 +1087,7 @@
 				35C3C0B61AE956390035AC8A /* CoreLocation.framework in Frameworks */,
 				35C3C0B41AE956300035AC8A /* QuartzCore.framework in Frameworks */,
 				35C3C0B21AE956290035AC8A /* OpenGLES.framework in Frameworks */,
+				3557F96B1BDF7E4A00078AF4 /* libPushSDK-1.8.7.a in Frameworks */,
 				35C3C0B01AE9561E0035AC8A /* SystemConfiguration.framework in Frameworks */,
 				35C3C0AE1AE9560E0035AC8A /* CoreGraphics.framework in Frameworks */,
 				35C3C0AC1AE956040035AC8A /* Security.framework in Frameworks */,
@@ -1196,6 +1200,23 @@
 			path = Views;
 			sourceTree = "<group>";
 		};
+		3557F9671BDF7E4A00078AF4 /* JiGuang */ = {
+			isa = PBXGroup;
+			children = (
+				3557F9681BDF7E4A00078AF4 /* lib */,
+			);
+			path = JiGuang;
+			sourceTree = "<group>";
+		};
+		3557F9681BDF7E4A00078AF4 /* lib */ = {
+			isa = PBXGroup;
+			children = (
+				3557F9691BDF7E4A00078AF4 /* APService.h */,
+				3557F96A1BDF7E4A00078AF4 /* libPushSDK-1.8.7.a */,
+			);
+			path = lib;
+			sourceTree = "<group>";
+		};
 		35C3C0BA1AE9587F0035AC8A /* Navigation */ = {
 			isa = PBXGroup;
 			children = (
@@ -2418,6 +2439,7 @@
 		C1FE50291ADD887400C18080 /* Vendors */ = {
 			isa = PBXGroup;
 			children = (
+				3557F9671BDF7E4A00078AF4 /* JiGuang */,
 				C1E9F5751B2E440A00BF1356 /* JTRecordView */,
 				C1E9F55B1B2E3B9200BF1356 /* ImagePreview */,
 				C123A9031B25CBAD003C0C36 /* ASStarRatingView */,
@@ -2524,6 +2546,7 @@
 				C1F696001AB870B400F9F5DD /* Frameworks */,
 				C1F696011AB870B400F9F5DD /* Resources */,
 				1454647E6246AB3D8AAE6FF2 /* Copy Pods Resources */,
+				D17DB74B89F4D8DFDFC2E29A /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -2663,6 +2686,21 @@
 			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;
 		};
+		D17DB74B89F4D8DFDFC2E29A /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

XFFruit/Vendors/JiGuang/lib/APService.h

+//
+//  APService.h
+//  APService
+//
+//  Created by JPush on 12-8-15.
+//  Copyright (c) 2012年 HXHG. All rights reserved.
+//  Version: 1.8.7
+
+@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 <CoreLocation/CoreLocation.h>
+ *  @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