add MessageCell

mszren · Dec 18, 2015 · 7b65065 · 7b65065
1 parent 0e51776
commit 7b65065
Show file tree

Hide file tree

Showing 73 changed files with 1,928 additions and 187 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Diary.xcodeproj/project.pbxproj b/Diary.xcodeproj/project.pbxproj
diff --git a/Diary.xcworkspace/xcuserdata/wo.xcuserdatad/UserInterfaceState.xcuserstate b/Diary.xcworkspace/xcuserdata/wo.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Diary.xcworkspace/xcuserdata/wo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Diary.xcworkspace/xcuserdata/wo.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -3,6 +3,14 @@
    type = "0"
    version = "2.0">
    <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.SwiftErrorBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No">
+         </BreakpointContent>
+      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
          <BreakpointContent

diff --git a/Diary/.DS_Store b/Diary/.DS_Store
diff --git a/Diary/Controllers/.DS_Store b/Diary/Controllers/.DS_Store
diff --git a/Diary/Controllers/Message/.DS_Store b/Diary/Controllers/Message/.DS_Store
diff --git a/Diary/Controllers/Message/AddFriendController.m b/Diary/Controllers/Message/AddFriendController.m
@@ -10,6 +10,7 @@
 #import "NearPersonController.h"
 #import "InviteController.h"
 #import "BaseNavigation.h"
+#import "ScanController.h"
 
 @interface AddFriendController ()
 
@@ -45,7 +46,12 @@ - (void)onTap:(UITapGestureRecognizer *)sender{
         case 100:
 
             break;
-        case 101:
+        case 101:{
+
+            ScanController *scanVc= [ScanController new];
+            scanVc.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:scanVc animated:YES];
+        }
 
             break;
         case 102:{

diff --git a/Diary/Controllers/Message/AddressBookController.h b/Diary/Controllers/Message/AddressBookController.h
diff --git a/Diary/Controllers/Message/AddressBookController.m b/Diary/Controllers/Message/AddressBookController.m
diff --git a/Diary/Controllers/Message/AdressBookController.m b/Diary/Controllers/Message/AdressBookController.m
@@ -11,6 +11,7 @@
 #import "FriendCell.h"
 #import "AddFriendController.h"
 #import "BaseNavigation.h"
+#import "ChatController.h"
 
 @interface AdressBookController () <UITableViewDataSource,UITableViewDelegate,DZNEmptyDataSetDelegate,DZNEmptyDataSetSource,UISearchBarDelegate>
 
@@ -84,6 +85,12 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     return friendCell;
 }
 
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    ChatController *chatVc = [ChatController new];
+    chatVc.hidesBottomBarWhenPushed = YES;
+    [self.navigationController pushViewController:chatVc animated:YES];
+}
+
 #pragma mark DZNEmptyDataSetDelegate,DZNEmptyDataSetSource
 -(NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView{
 

diff --git a/Diary/Controllers/Message/ChatController.h b/Diary/Controllers/Message/ChatController.h
@@ -0,0 +1,13 @@
+//
+//  ChatController.h
+//  Diary
+//
+//  Created by 我 on 15/12/17.
+//  Copyright © 2015年 Owen. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface ChatController : UIViewController
+
+@end