Merge branch 'develop_avatar' into develop

b32dc80b · AvatarC · ce77d8f6 · 885ad112 · b32dc80b · b32dc80b
Commit b32dc80b authored Dec 29, 2015 by AvatarC
18 changed files
--- a/Podfile
+++ b/Podfile
@@ -6,3 +6,4 @@ pod 'SDWebImage'
 pod 'MBProgressHUD'
 pod 'MJRefresh'
 pod 'RATreeView'
+pod 'JPushSDK', '~> 1.8.2'
\ No newline at end of file
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -20,6 +20,7 @@ PODS:
  - AFNetworking/UIKit (2.5.4):
    - AFNetworking/NSURLConnection
    - AFNetworking/NSURLSession
+  - JPushSDK (1.8.2)
  - MBProgressHUD (0.9.1)
  - MJRefresh (2.2.0)
  - RATreeView (1.0.3)
@@ -29,6 +30,7 @@ PODS:

 DEPENDENCIES:
  - AFNetworking (~> 2.0)
+  - JPushSDK (~> 1.8.2)
  - MBProgressHUD
  - MJRefresh
  - RATreeView
@@ -36,9 +38,10 @@ DEPENDENCIES:

 SPEC CHECKSUMS:
  AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
+  JPushSDK: c68dd04c595a5c93aa003f212974010790410d8e
  MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad
  MJRefresh: 65a2bf14abb6feeaed8696aa1551f70e15ab0a08
  RATreeView: abb5e11bb2f955c7f58b1295d2b0eab1de7c2920
  SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29

-COCOAPODS: 0.38.2
+COCOAPODS: 0.39.0
--- a/Pods/Manifest.lock
+++ b/Pods/Manifest.lock
@@ -20,6 +20,7 @@ PODS:
  - AFNetworking/UIKit (2.5.4):
    - AFNetworking/NSURLConnection
    - AFNetworking/NSURLSession
+  - JPushSDK (1.8.2)
  - MBProgressHUD (0.9.1)
  - MJRefresh (2.2.0)
  - RATreeView (1.0.3)
@@ -29,6 +30,7 @@ PODS:

 DEPENDENCIES:
  - AFNetworking (~> 2.0)
+  - JPushSDK (~> 1.8.2)
  - MBProgressHUD
  - MJRefresh
  - RATreeView
@@ -36,9 +38,10 @@ DEPENDENCIES:

 SPEC CHECKSUMS:
  AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
+  JPushSDK: c68dd04c595a5c93aa003f212974010790410d8e
  MBProgressHUD: c47f2c166c126cf2ce36498d80f33e754d4e93ad
  MJRefresh: 65a2bf14abb6feeaed8696aa1551f70e15ab0a08
  RATreeView: abb5e11bb2f955c7f58b1295d2b0eab1de7c2920
  SDWebImage: 71b7cdc1d1721d6a82ed62889030225f2c249e29

-COCOAPODS: 0.38.2
+COCOAPODS: 0.39.0
--- a/Pods/Pods.xcodeproj/project.pbxproj
+++ b/Pods/Pods.xcodeproj/project.pbxproj
--- a/Pods/Target Support Files/AFNetworking/AFNetworking-Private.xcconfig
+++ b/Pods/Target Support Files/AFNetworking/AFNetworking-Private.xcconfig
-#include "AFNetworking.xcconfig"
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/AFNetworking" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RATreeView" "${PODS_ROOT}/Headers/Public/SDWebImage"
-OTHER_LDFLAGS = ${AFNETWORKING_OTHER_LDFLAGS}
-PODS_ROOT = ${SRCROOT}
-SKIP_INSTALL = YES
\ No newline at end of file
--- a/Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig
+++ b/Pods/Target Support Files/AFNetworking/AFNetworking.xcconfig
-AFNETWORKING_OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
\ No newline at end of file
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/AFNetworking" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/JPushSDK" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RATreeView" "${PODS_ROOT}/Headers/Public/SDWebImage"
+OTHER_LDFLAGS = -framework "CoreGraphics" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
\ No newline at end of file
--- a/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
+++ b/Pods/Target Support Files/Pods/Pods-acknowledgements.markdown
@@ -24,6 +24,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.


+## JPushSDK
+
+LICENSE Copyright 2010 - 2014 JPush.cn, Inc. All rights reserved.
+
 ## MBProgressHUD

 Copyright (c) 2009-2015 Matej Bukovinski

--- a/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
+++ b/Pods/Target Support Files/Pods/Pods-acknowledgements.plist
@@ -39,6 +39,14 @@ THE SOFTWARE.
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>
 		</dict>
+		<dict>
+			<key>FooterText</key>
+			<string>LICENSE Copyright 2010 - 2014 JPush.cn, Inc. All rights reserved.</string>
+			<key>Title</key>
+			<string>JPushSDK</string>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+		</dict>
 		<dict>
 			<key>FooterText</key>
 			<string>Copyright (c) 2009-2015 Matej Bukovinski

--- a/Pods/Target Support Files/Pods/Pods-resources.sh
+++ b/Pods/Target Support Files/Pods/Pods-resources.sh
@@ -66,7 +66,7 @@ fi

 mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
-if [[ "${ACTION}" == "install" ]]; then
+if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
  mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
  rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
 fi

--- a/Pods/Target Support Files/Pods/Pods.debug.xcconfig
+++ b/Pods/Target Support Files/Pods/Pods.debug.xcconfig
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RATreeView" "${PODS_ROOT}/Headers/Public/SDWebImage"
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/RATreeView" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage"
-OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"MBProgressHUD" -l"MJRefresh" -l"RATreeView" -l"SDWebImage" -framework "CoreGraphics" -framework "ImageIO" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/JPushSDK" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RATreeView" "${PODS_ROOT}/Headers/Public/SDWebImage"
+LIBRARY_SEARCH_PATHS = $(PODS_ROOT)/JPushSDK/lib
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/JPushSDK" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/RATreeView" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"MBProgressHUD" -l"MJRefresh" -l"RATreeView" -l"SDWebImage" -l"z" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "Foundation" -framework "ImageIO" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration" -framework "UIKit"
 PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
--- a/Pods/Target Support Files/Pods/Pods.release.xcconfig
+++ b/Pods/Target Support Files/Pods/Pods.release.xcconfig
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RATreeView" "${PODS_ROOT}/Headers/Public/SDWebImage"
-OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/RATreeView" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage"
-OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"MBProgressHUD" -l"MJRefresh" -l"RATreeView" -l"SDWebImage" -framework "CoreGraphics" -framework "ImageIO" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration"
+HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/JPushSDK" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RATreeView" "${PODS_ROOT}/Headers/Public/SDWebImage"
+LIBRARY_SEARCH_PATHS = $(PODS_ROOT)/JPushSDK/lib
+OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/AFNetworking" -isystem "${PODS_ROOT}/Headers/Public/JPushSDK" -isystem "${PODS_ROOT}/Headers/Public/MBProgressHUD" -isystem "${PODS_ROOT}/Headers/Public/MJRefresh" -isystem "${PODS_ROOT}/Headers/Public/RATreeView" -isystem "${PODS_ROOT}/Headers/Public/SDWebImage"
+OTHER_LDFLAGS = $(inherited) -ObjC -l"AFNetworking" -l"MBProgressHUD" -l"MJRefresh" -l"RATreeView" -l"SDWebImage" -l"z" -framework "CFNetwork" -framework "CoreFoundation" -framework "CoreGraphics" -framework "CoreTelephony" -framework "Foundation" -framework "ImageIO" -framework "MobileCoreServices" -framework "Security" -framework "SystemConfiguration" -framework "UIKit"
 PODS_ROOT = ${SRCROOT}/Pods
\ No newline at end of file
--- a/Pods/Target Support Files/SDWebImage/SDWebImage-Private.xcconfig
+++ b/Pods/Target Support Files/SDWebImage/SDWebImage-Private.xcconfig
-#include "SDWebImage.xcconfig"
-GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
-HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/SDWebImage" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RATreeView" "${PODS_ROOT}/Headers/Public/SDWebImage"
-OTHER_LDFLAGS = ${SDWEBIMAGE_OTHER_LDFLAGS}
-PODS_ROOT = ${SRCROOT}
-SKIP_INSTALL = YES
\ No newline at end of file
--- a/Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig
+++ b/Pods/Target Support Files/SDWebImage/SDWebImage.xcconfig
-SDWEBIMAGE_OTHER_LDFLAGS = -framework "ImageIO"
\ No newline at end of file
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
+HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/SDWebImage" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/AFNetworking" "${PODS_ROOT}/Headers/Public/JPushSDK" "${PODS_ROOT}/Headers/Public/MBProgressHUD" "${PODS_ROOT}/Headers/Public/MJRefresh" "${PODS_ROOT}/Headers/Public/RATreeView" "${PODS_ROOT}/Headers/Public/SDWebImage"
+OTHER_LDFLAGS = -framework "ImageIO"
+PODS_ROOT = ${SRCROOT}
+SKIP_INSTALL = YES
\ No newline at end of file
--- a/redstar.xcodeproj/project.pbxproj
+++ b/redstar.xcodeproj/project.pbxproj
--- a/redstar/Classes/AppDelegate/AppDelegate.m
+++ b/redstar/Classes/AppDelegate/AppDelegate.m
@@ -9,6 +9,7 @@
 #import "AppDelegate.h"
 #import "LoginViewController.h"
 #import "RootTabBarController.h"
+ #import "APService.h"
 @interface AppDelegate ()

 @end
@@ -29,6 +30,34 @@
    self.window.rootViewController = loginVC;
    
    
+    // Required
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_7_1
+    if ([[UIDevice currentDevice].systemVersion floatValue] >= 8.0) {
+        //categories
+        [APService
+         registerForRemoteNotificationTypes:(UIUserNotificationTypeBadge |
+                                             UIUserNotificationTypeSound |
+                                             UIUserNotificationTypeAlert)
+         categories:nil];
+    } else {
+        //categories nil
+        [APService
+         registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
+                                             UIRemoteNotificationTypeSound |
+                                             UIRemoteNotificationTypeAlert)
+#else
+         //categories nil
+         categories:nil];
+        [APService
+         registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge |
+                                             UIRemoteNotificationTypeSound |
+                                             UIRemoteNotificationTypeAlert)
+#endif
+         // Required
+         categories:nil];
+    }
+    [APService setupWithOption:launchOptions];
+    
    return YES;
 }

@@ -46,6 +75,25 @@
    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
 }

+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+    
+   NSLog(@"%@", [NSString stringWithFormat:@"Device Token: %@", deviceToken]);
+    [APService registerDeviceToken:deviceToken];
+}
+- (void)application:(UIApplication *)application
+didReceiveRemoteNotification:(NSDictionary *)userInfo {
+    // Required
+    [APService handleRemoteNotification:userInfo];
+}
+- (void)application:(UIApplication *)application
+didReceiveRemoteNotification:(NSDictionary *)userInfo
+fetchCompletionHandler:(void(^)(UIBackgroundFetchResult))completionHandler {
+    // IOS 7 Support Required
+    [APService handleRemoteNotification:userInfo];
+    completionHandler(UIBackgroundFetchResultNewData);
+}
+
+
 - (void)applicationDidBecomeActive:(UIApplication *)application {
    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
 }

--- a/redstar/Classes/Module/Login/ViewController/LoginViewController.m
+++ b/redstar/Classes/Module/Login/ViewController/LoginViewController.m
@@ -15,7 +15,7 @@
 #import <AFNetworking.h>
 #import "CommonFunc.h"
 #import "HttpClient.h"
-
+#import "APService.h"
 #import <MBProgressHUD.h>

 #define kUsernameTableViewCell @"usernameTableViewCell"
@@ -238,6 +238,15 @@
            [[NSUserDefaults standardUserDefaults] setObject:user_uuid forKey:@"user_uuid"];
            [[NSUserDefaults standardUserDefaults] setObject:permissions forKey:@"permissions"];
            [[NSUserDefaults standardUserDefaults] setObject:authenticode forKey:@"authenticode"];
+            
+//            //极光别名
+            NSSet *setTags = [NSSet setWithArray:@[@""]];
+            [APService setTags:setTags alias:user_uuid callbackSelector:nil object:nil];
+//            [APService setTags:setTags
+//                         alias:user_uuid
+//              callbackSelector:nil object:nil];
+            
+
            // 进入RootTabBar
            self.rootTBC = [[RootTabBarController alloc] init];
            [MBProgressHUD hideHUDForView:window animated:YES];

--- a/redstar/Info.plist
+++ b/redstar/Info.plist
@@ -2,11 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleLocalizations</key>
-	<array>
-		<string>en</string>
-		<string>zh_CN</string>
-	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -15,16 +10,21 @@
 	<string>com.gomore.redstar</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>en</string>
+		<string>zh_CN</string>
+	</array>
 	<key>CFBundleName</key>
 	<string>红星管理在线</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>1.1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -41,8 +41,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>

--- a/redstar/PushConfig.plist
+++ b/redstar/PushConfig.plist
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>APS_FOR_PRODUCTION</key>
+	<string>1</string>
+	<key>APP_KEY</key>
+	<string>47ae203f29656900123efbb3</string>
+	<key>CHANNEL</key>
+	<string></string>
+</dict>
+</plist>