heavyrain2012 4 years ago
parent
commit
b7d558451d

+ 2 - 1
wfchat/WildFireChat/AppDelegate.m

@@ -241,7 +241,8 @@
             [[WFCCNetworkService sharedInstance] disconnect:YES clearSession:YES];
         } else if (status == kConnectionStatusLogout) {
             UIViewController *loginVC = [[WFCLoginViewController alloc] init];
-            self.window.rootViewController = loginVC;
+            UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:loginVC];
+            self.window.rootViewController = nav;
         } 
     });
 }

+ 0 - 1
wfchat/WildFireChat/Info.plist

@@ -50,7 +50,6 @@
 	<string>应用在发送图片消息时需要访问相册</string>
 	<key>UIBackgroundModes</key>
 	<array>
-		<string>audio</string>
 		<string>remote-notification</string>
 		<string>voip</string>
 	</array>

+ 3 - 3
wfchat/WildFireChat/Login/WFCLoginViewController.m

@@ -147,7 +147,7 @@ alpha:1.0]
     
     [self.view addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(resetKeyboard:)]];
     
-    self.privacyLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, self.view.bounds.size.height - 28 - kTabbarSafeBottomMargin, self.view.bounds.size.width-32, 28)];
+    self.privacyLabel = [[UILabel alloc] initWithFrame:CGRectMake(16, self.view.bounds.size.height - 40 - kTabbarSafeBottomMargin, self.view.bounds.size.width-32, 40)];
     self.privacyLabel.textAlignment = NSTextAlignmentCenter;
     NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:@"登录即代表你已同意《野火通用户协议》和《野火通隐私政策》" attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:10],
                                                                                                                      NSForegroundColorAttributeName : [UIColor darkGrayColor]}];
@@ -157,9 +157,9 @@ alpha:1.0]
                           NSForegroundColorAttributeName : [UIColor blueColor]} range:NSMakeRange(19, 9)];
     self.privacyLabel.attributedText = text ;
     __weak typeof(self)ws = self;
-    [self.privacyLabel yb_addAttributeTapActionWithRanges:@[NSStringFromRange(NSMakeRange(9, 8)), NSStringFromRange(NSMakeRange(18, 8))] tapClicked:^(UILabel *label, NSString *string, NSRange range, NSInteger index) {
+    [self.privacyLabel yb_addAttributeTapActionWithRanges:@[NSStringFromRange(NSMakeRange(9, 9)), NSStringFromRange(NSMakeRange(19, 9))] tapClicked:^(UILabel *label, NSString *string, NSRange range, NSInteger index) {
         WFCPrivacyViewController * pvc = [[WFCPrivacyViewController alloc] init];
-        pvc.isPrivacy = (range.location == 18);
+        pvc.isPrivacy = (range.location == 19);
         [ws.navigationController pushViewController:pvc animated:YES];
     }];