add some infomation details

maruipp · Mar 5, 2013 · e974add · e974add
1 parent 631756c
commit e974add
Show file tree

Hide file tree

Showing 8 changed files with 118 additions and 0 deletions.
diff --git a/client-ios/AppDelegate.h b/client-ios/AppDelegate.h
@@ -10,6 +10,9 @@
 
 @interface AppDelegate : UIResponder <UIApplicationDelegate> {
     UIWindow *_window;
+    NSString *_deviceToken;
 }
 
+@property (nonatomic,retain) NSString *deviceToken;
+
 @end
diff --git a/client-ios/AppDelegate.m b/client-ios/AppDelegate.m
@@ -29,6 +29,8 @@
 
 @implementation AppDelegate
 
+@synthesize deviceToken = _deviceToken;
+
 - (void)dealloc {
     [_window release];
 
@@ -102,6 +104,8 @@ - (void)applicationWillTerminate:(UIApplication *)application {
 }
 
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
+    _deviceToken = [[NSString stringWithFormat:@"%@",deviceToken] retain];
+
     [APService registerDeviceToken:deviceToken];
 }
 

diff --git a/client-ios/PushTalk.xcodeproj/project.pbxproj b/client-ios/PushTalk.xcodeproj/project.pbxproj
@@ -41,6 +41,7 @@
 		5A8EBB6516898B2D00797022 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A8EBB6416898B2D00797022 /* CFNetwork.framework */; };
 		5A8EBB6716898B3A00797022 /* TelephonyUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A8EBB6616898B3A00797022 /* TelephonyUI.framework */; };
 		5A8EBB6916898B4F00797022 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A8EBB6816898B4F00797022 /* CoreTelephony.framework */; };
+		5AAE28D216E5DDF3002A3127 /* InfoDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AAE28D116E5DDF3002A3127 /* InfoDetailViewController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -105,6 +106,8 @@
 		5A8EBB6416898B2D00797022 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
 		5A8EBB6616898B3A00797022 /* TelephonyUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TelephonyUI.framework; path = System/Library/PrivateFrameworks/TelephonyUI.framework; sourceTree = SDKROOT; };
 		5A8EBB6816898B4F00797022 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
+		5AAE28D016E5DDF3002A3127 /* InfoDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InfoDetailViewController.h; sourceTree = "<group>"; };
+		5AAE28D116E5DDF3002A3127 /* InfoDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InfoDetailViewController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -203,6 +206,8 @@
 			children = (
 				5A631A381689A1EB00770B5A /* JPushViewController.h */,
 				5A631A391689A1EB00770B5A /* JPushViewController.m */,
+				5AAE28D016E5DDF3002A3127 /* InfoDetailViewController.h */,
+				5AAE28D116E5DDF3002A3127 /* InfoDetailViewController.m */,
 			);
 			path = UI;
 			sourceTree = "<group>";
@@ -345,6 +350,7 @@
 				5A631A571689A1EB00770B5A /* SBJsonUTF8Stream.m in Sources */,
 				5A631A581689A1EB00770B5A /* SBJsonWriter.m in Sources */,
 				5A631A591689A1EB00770B5A /* JPushViewController.m in Sources */,
+				5AAE28D216E5DDF3002A3127 /* InfoDetailViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/...eproj/project.xcworkspace/xcuserdata/ryanliang.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/ryanliang.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/client-ios/UI/InfoDetailViewController.h b/client-ios/UI/InfoDetailViewController.h
@@ -0,0 +1,20 @@
+//
+//  InfoDetailViewController.h
+//  PushTalk
+//
+//  Created by yuanqiang on 13-3-5.
+//  Copyright (c) 2013年 Jpush. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface InfoDetailViewController : UIViewController {
+    UILabel *_infoLabel;
+    UILabel *_tokenLabel;
+    UILabel *_udidLabel;
+    NSString *_info;
+}
+
+-(id)initWithInfo:(NSString *)info;
+
+@end
diff --git a/client-ios/UI/InfoDetailViewController.m b/client-ios/UI/InfoDetailViewController.m
@@ -0,0 +1,70 @@
+//
+//  InfoDetailViewController.m
+//  PushTalk
+//
+//  Created by yuanqiang on 13-3-5.
+//  Copyright (c) 2013年 Jpush. All rights reserved.
+//
+
+#import "InfoDetailViewController.h"
+#import "AppDelegate.h"
+
+@implementation InfoDetailViewController
+
+- (id)initWithInfo:(NSString *)info {
+    self = [super init];
+
+    if (self) {
+        _info = [info retain];
+    }
+
+    return self;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    [self.view setBackgroundColor:[UIColor blackColor]];
+
+    _infoLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 40, 320, 100)];
+    [_infoLabel setBackgroundColor:[UIColor clearColor]];
+    [_infoLabel setTextColor:[UIColor colorWithRed:0.5 green:0.65 blue:0.75 alpha:1]];
+    [_infoLabel setFont:[UIFont boldSystemFontOfSize:20]];
+    [_infoLabel setTextAlignment:UITextAlignmentCenter];
+    [_infoLabel setNumberOfLines:0];
+    [_infoLabel setText:_info];
+    [self.view addSubview:_infoLabel];
+
+    _tokenLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 150, 320, 32*3)];
+    [_tokenLabel setBackgroundColor:[UIColor clearColor]];
+    [_tokenLabel setTextColor:[UIColor colorWithRed:0.5 green:0.7 blue:0.75 alpha:1]];
+    [_tokenLabel setFont:[UIFont systemFontOfSize:14]];
+    [_tokenLabel setTextAlignment:UITextAlignmentCenter];
+    [_tokenLabel setNumberOfLines:3];
+
+    AppDelegate *app = (AppDelegate *)[[UIApplication sharedApplication] delegate];
+    NSString *deviceToken = [app deviceToken];
+
+    [_tokenLabel setText:[NSString stringWithFormat:@"Device Token: %@", deviceToken]];
+    [self.view addSubview:_tokenLabel]; 
+
+    _udidLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 290, 320, 24)];
+    [_udidLabel setBackgroundColor:[UIColor clearColor]];
+    [_udidLabel setTextColor:[UIColor colorWithRed:0.5 green:0.7 blue:0.75 alpha:1]];
+    [_udidLabel setFont:[UIFont systemFontOfSize:18]];
+    [_udidLabel setTextAlignment:UITextAlignmentCenter];
+    [_udidLabel setText:[NSString stringWithFormat:@"UDID: %@", [APService openUDID]]];
+    [self.view addSubview:_udidLabel];
+}
+
+- (void)dealloc {
+    [_tokenLabel release];
+    [_infoLabel release];
+    [_udidLabel release];
+    [_info release];
+
+    [super dealloc];
+}
+
+
+
+@end
diff --git a/client-ios/UI/JPushViewController.h b/client-ios/UI/JPushViewController.h
@@ -11,6 +11,8 @@
 @interface JPushViewController : UIViewController <UIWebViewDelegate> {
     UIWebView *_webView;
     UIBarButtonItem *_leftButton;
+    UIBarButtonItem *_rightButton;
+    NSString *_info;
 }
 
 @end
diff --git a/client-ios/UI/JPushViewController.m b/client-ios/UI/JPushViewController.m
@@ -12,6 +12,7 @@
 #import "NSString+Digest.h"
 #import "APMessage.h"
 #import "SBJson.h"
+#import "InfoDetailViewController.h"
 
 @interface APService (Privates)
 + (APService *)sharedService;
@@ -49,8 +50,10 @@ - (void)loadWebView {
         APLogTrace();
 
         _leftButton = [[UIBarButtonItem alloc] initWithTitle:@"返回" style:UIBarButtonItemStyleDone target:self action:@selector(goBack)];
+        _rightButton = [[UIBarButtonItem alloc] initWithTitle:@"信息" style:UIBarButtonItemStyleBordered target:self action:@selector(infoDetail)];
         [_leftButton setEnabled:NO];
         self.navigationItem.leftBarButtonItem = _leftButton;
+        self.navigationItem.rightBarButtonItem = _rightButton;
 
         UIView *view = [self view];
         [self setTitle:@"推聊"];
@@ -73,6 +76,12 @@ - (void)goBack {
     [_webView goBack];
 }
 
+- (void)infoDetail {
+    InfoDetailViewController *viewController = [[InfoDetailViewController alloc] initWithInfo:_info];
+    [[self navigationController] pushViewController:viewController animated:YES];
+    [viewController release];
+}
+
 - (void)viewDidLoad
 {
     [super viewDidLoad];
@@ -153,19 +162,23 @@ - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error {
 
 - (void)networkDidSetup:(NSNotification *)notification {
     APLog(@"%s", __PRETTY_FUNCTION__);
+    _info = @"已连接";
 }
 
 - (void)networkDidClose:(NSNotification *)notification {
     APLog(@"%s", __PRETTY_FUNCTION__);
+    _info = @"未连接。。。";
 }
 
 - (void)networkDidRegister:(NSNotification *)notification {
     APLog(@"%s", __PRETTY_FUNCTION__);
+    _info = @"已注册";
     [self loadWebView];
 }
 
 - (void)networkDidLogin:(NSNotification *)notification {
     APLog(@"%s", __PRETTY_FUNCTION__);
+    _info = @"已登录";
     [self loadWebView];
 }