no message

ZhiJi/Classes/Care/Controller/ZJBaseCareViewController.m

@@ -305,28 +305,28 @@
 //消息按钮点击
 - (void)xiaoXiButtonClick{
     NSLog(@"消息按钮");
-//    if (![ZJUserInfoManager shared].isLogin) {
-////        [MBProgressHUD showMessage:@"请先进行登录"];
-//        ZJOauthLoginConfig * config = [[ZJOauthLoginConfig alloc] initWithCurrentVC:self];
-//        [config loginVerify:^(id _Nonnull model) {
-//            if ([model isKindOfClass:[ZJMineUserInfoModel class]] ) {
-//                NSLog(@"success");
-//                [self getHasNewMsg];
-//                [self getFriendList];
-//            }
-//        }];
-//        return;
-//    }
-//    [MobClick event:@"home_message_click"];
-//    ZJXiaoXiViewController *vc = [[ZJXiaoXiViewController alloc] init];
-//    [self.navigationController pushViewController:vc animated:YES];
-    
-    ZJLocationRemindSelectController * location = [[UIStoryboard storyboardWithName:@"Location" bundle:nil] instantiateViewControllerWithIdentifier:@"ZJLocationRemindSelectController"];
-     location.title = @"选择地点";
-     location.commitAddressClosure = ^(ZJFriendLocationRemindModel * _Nonnull model) {
-         
-     };
-     [self.navigationController pushViewController:location animated:YES];
+    if (![ZJUserInfoManager shared].isLogin) {
+//        [MBProgressHUD showMessage:@"请先进行登录"];
+        ZJOauthLoginConfig * config = [[ZJOauthLoginConfig alloc] initWithCurrentVC:self];
+        [config loginVerify:^(id _Nonnull model) {
+            if ([model isKindOfClass:[ZJMineUserInfoModel class]] ) {
+                NSLog(@"success");
+                [self getHasNewMsg];
+                [self getFriendList];
+            }
+        }];
+        return;
+    }
+    [MobClick event:@"home_message_click"];
+    ZJXiaoXiViewController *vc = [[ZJXiaoXiViewController alloc] init];
+    [self.navigationController pushViewController:vc animated:YES];
+    
+//    ZJLocationRemindSelectController * location = [[UIStoryboard storyboardWithName:@"Location" bundle:nil] instantiateViewControllerWithIdentifier:@"ZJLocationRemindSelectController"];
+//     location.title = @"选择地点";
+//     location.commitAddressClosure = ^(ZJFriendLocationRemindModel * _Nonnull model) {
+//
+//     };
+//     [self.navigationController pushViewController:location animated:YES];
 }
 
 //紧急按钮点击

ZhiJi/Classes/Main/Base/BaseTabBarViewController.m

@@ -62,7 +62,7 @@
                                                                      index:DYTTabBarIndexHome
                                                             viewController:[[ZJCareStyle2ViewController alloc] init]];
 
-    BaseNavigationViewController *iHospNav = [self baseNavigationWithTtitle:kLocalizedString(@"tabbar_mine")
+    BaseNavigationViewController *iHospNav = [self baseNavigationWithTtitle:kLocalizedString(@"tabbar_map")
                                                                       image:[UIImage imageNamed:@"tabbar_1"]
                                                               selectedImage:[UIImage imageNamed:@"tabbar_1_selected"]
                                                                       index:DYTTabBarIndexIHOSP