From 274fc6c3ffb856ca0b5ad268ea7b0226d174ad59 Mon Sep 17 00:00:00 2001
From: wu736139669 <wu736139669@736139669@qq.com>
Date: Mon, 29 Jun 2015 09:44:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E8=AF=BB=E6=95=88=E6=9E=9C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xcdebugger/Breakpoints_v2.xcbkptlist      | 36 ++++++-------------
 .../Login/LoginViewController.m               |  2 +-
 .../ViewControllers/Main/MainViewController.m |  4 +--
 .../My/BlackListViewController.m              | 34 ++++++++++--------
 .../My/MyRelateViewController.m               |  1 +
 .../ViewControllers/My/SetUpViewController.m  | 12 +++++--
 6 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 05de35f..565074d 100644
--- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -170,11 +170,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Ash_AWord/ViewControllers/My/MyRelateViewController.m"
-            timestampString = "457159946.984524"
+            timestampString = "457235046.920164"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "152"
-            endingLineNumber = "152"
+            startingLineNumber = "153"
+            endingLineNumber = "153"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
             <Locations>
@@ -218,11 +218,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Ash_AWord/ViewControllers/My/MyRelateViewController.m"
-            timestampString = "457159946.984524"
+            timestampString = "457235046.920164"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "153"
-            endingLineNumber = "153"
+            startingLineNumber = "154"
+            endingLineNumber = "154"
             landmarkName = "-tableView:didSelectRowAtIndexPath:"
             landmarkType = "5">
          </BreakpointContent>
@@ -490,27 +490,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Ash_AWord/ViewControllers/My/BlackListViewController.m"
-            timestampString = "457185217.350383"
+            timestampString = "457234100.985171"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "59"
-            endingLineNumber = "59"
-            landmarkName = "-loadData"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Ash_AWord/ViewControllers/My/BlackListViewController.m"
-            timestampString = "457185217.350383"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "62"
-            endingLineNumber = "62"
+            startingLineNumber = "80"
+            endingLineNumber = "80"
             landmarkName = "-loadData"
             landmarkType = "5">
          </BreakpointContent>
@@ -566,7 +550,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
-            shouldBeEnabled = "Yes"
+            shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Ash_AWord/ViewControllers/My/SetUpViewController.m"
diff --git a/Ash_AWord/ViewControllers/Login/LoginViewController.m b/Ash_AWord/ViewControllers/Login/LoginViewController.m
index 7c0557d..5233ce0 100644
--- a/Ash_AWord/ViewControllers/Login/LoginViewController.m
+++ b/Ash_AWord/ViewControllers/Login/LoginViewController.m
@@ -91,7 +91,7 @@
         
         if (response.responseCode == UMSResponseCodeSuccess) {
             
-            UMSocialAccountEntity *snsAccount = [[UMSocialAccountManager socialAccountDictionary] valueForKey:UMShareToSina];
+//            UMSocialAccountEntity *snsAccount = [[UMSocialAccountManager socialAccountDictionary] valueForKey:UMShareToSina];
             
             [[UMSocialDataService defaultDataService] requestSnsInformation:UMShareToSina  completion:^(UMSocialResponseEntity *response){
                 if (response.data) {
diff --git a/Ash_AWord/ViewControllers/Main/MainViewController.m b/Ash_AWord/ViewControllers/Main/MainViewController.m
index bbbaa5b..9872e64 100644
--- a/Ash_AWord/ViewControllers/Main/MainViewController.m
+++ b/Ash_AWord/ViewControllers/Main/MainViewController.m
@@ -507,7 +507,7 @@ static NSString *kMessageType = @"MessageType";
 - (void)jumpToChatList
 {
     if ([self.navigationController.topViewController isKindOfClass:[ChatMainViewController class]]) {
-        ChatMainViewController *chatController = (ChatMainViewController *)self.navigationController.topViewController;
+//        ChatMainViewController *chatController = (ChatMainViewController *)self.navigationController.topViewController;
 //        [chatController hideImagePicker];
     }
     else if(_myNav)
@@ -542,7 +542,7 @@ static NSString *kMessageType = @"MessageType";
     if (userInfo)
     {
         if ([self.navigationController.topViewController isKindOfClass:[ChatMainViewController class]]) {
-            ChatMainViewController *chatController = (ChatMainViewController *)self.navigationController.topViewController;
+//            ChatMainViewController *chatController = (ChatMainViewController *)self.navigationController.topViewController;
 //            [chatController hideImagePicker];
         }
         
diff --git a/Ash_AWord/ViewControllers/My/BlackListViewController.m b/Ash_AWord/ViewControllers/My/BlackListViewController.m
index 86afd34..ef97fc8 100644
--- a/Ash_AWord/ViewControllers/My/BlackListViewController.m
+++ b/Ash_AWord/ViewControllers/My/BlackListViewController.m
@@ -56,22 +56,28 @@
             for (NSString* userid  in dataArr) {
                 [uidArr addObject:userid];
             }
-            PropertyEntity* pro = [UserViewModel requireUserListWithUid:uidArr];
-            [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
-                
-                if ([viewModel success]) {
-                    _userArr = [NSMutableArray arrayWithArray:[(UserViewModel*)viewModel userBaseInfoArr]];
-                }
-                
+            if(uidArr.count > 0){
+                PropertyEntity* pro = [UserViewModel requireUserListWithUid:uidArr];
+                [RequireEngine requireWithProperty:pro completionBlock:^(id viewModel) {
+                    
+                    if ([viewModel success]) {
+                        _userArr = [NSMutableArray arrayWithArray:[(UserViewModel*)viewModel userBaseInfoArr]];
+                    }
+                    
+                    [self.tableView reloadData];
+                    [self headerEndRefreshing];
+                } failedBlock:^(NSError *error) {
+                    [MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:1.0];
+                    
+                    [self.tableView reloadData];
+                    [self headerEndRefreshing];
+                }];
+  
+            }else{
                 [self.tableView reloadData];
                 [self headerEndRefreshing];
-            } failedBlock:^(NSError *error) {
-                [MBProgressHUD errorHudWithView:self.view label:kNetworkErrorTips hidesAfter:1.0];
-                
-                [self.tableView reloadData];
-                [self headerEndRefreshing];
-            }];
-
+            }
+          
 
         }
     } onQueue:nil];
diff --git a/Ash_AWord/ViewControllers/My/MyRelateViewController.m b/Ash_AWord/ViewControllers/My/MyRelateViewController.m
index b0e853b..e7d91c8 100644
--- a/Ash_AWord/ViewControllers/My/MyRelateViewController.m
+++ b/Ash_AWord/ViewControllers/My/MyRelateViewController.m
@@ -41,6 +41,7 @@
 #pragma mark 标记已读
 -(void)readAll
 {
+    [self.tableView.header beginRefreshing];
     [RequireEngine requireWithProperty:[CommentViewModel requireReadAllComment] completionBlock:^(id viewModel) {
         if ([viewModel success]) {
             [self headerBeginRefreshing];
diff --git a/Ash_AWord/ViewControllers/My/SetUpViewController.m b/Ash_AWord/ViewControllers/My/SetUpViewController.m
index 5b925e5..b1488a0 100644
--- a/Ash_AWord/ViewControllers/My/SetUpViewController.m
+++ b/Ash_AWord/ViewControllers/My/SetUpViewController.m
@@ -205,9 +205,15 @@
 #pragma mark 跳到App Store评价
 -(void)goBlackList
 {
-    BlackListViewController* blackListViewController = [[BlackListViewController alloc] init];
-    blackListViewController.hidesBottomBarWhenPushed = YES;
-    [self.navigationController pushViewController:blackListViewController animated:YES];
+    if (![AWordUser sharedInstance].isLogin)
+    {
+        [LoginViewController presentLoginViewControllerInView:self success:nil];
+    }else{
+        BlackListViewController* blackListViewController = [[BlackListViewController alloc] init];
+        blackListViewController.hidesBottomBarWhenPushed = YES;
+        [self.navigationController pushViewController:blackListViewController animated:YES];
+    }
+    
 }
 -(void)goMessageSet
 {