Commit 2346ad04 by pierce

fixed sh相关的bug

parent ac02a10e
...@@ -77,12 +77,6 @@ typedef NS_ENUM(NSUInteger, FUSNavigationBackBtnStyle) { ...@@ -77,12 +77,6 @@ typedef NS_ENUM(NSUInteger, FUSNavigationBackBtnStyle) {
- (void)popViewController; - (void)popViewController;
/**
审核状态改变的通知
*/
- (void)fus_checkStateDidUpdate;
/// 显示loading /// 显示loading
- (void)fus_showLoadingView; - (void)fus_showLoadingView;
......
...@@ -65,23 +65,6 @@ ...@@ -65,23 +65,6 @@
} }
}]; }];
} }
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_checkStateDidUpdate) name:FUSConfig.sharedInstanced.devConfigs.appStatusUpdateNotificationKey object:nil];
}
- (void)fus_checkStateDidUpdate {
UISemanticContentAttribute semanticContentAttribute = [UIView appearance].semanticContentAttribute;
self.navigationController.view.semanticContentAttribute = semanticContentAttribute;
self.navigationController.navigationBar.semanticContentAttribute = semanticContentAttribute;
self.view.semanticContentAttribute = semanticContentAttribute;
for (UIView *view in self.view.subviews) {
view.semanticContentAttribute = semanticContentAttribute;
}
}
- (void)viewWillDisappear:(BOOL)animated{
[super viewWillDisappear:animated];
} }
- (void)setHiddenNavigationBar:(BOOL)hiddenNavigationBar{ - (void)setHiddenNavigationBar:(BOOL)hiddenNavigationBar{
......
...@@ -119,8 +119,9 @@ ...@@ -119,8 +119,9 @@
[self bringSubviewToFront:self.titleContainerView]; [self bringSubviewToFront:self.titleContainerView];
__weak typeof(self) weakSelf = self;
self.collectionView.mj_header = [FUSRefreshHeader headerWithRefreshingBlock:^{ self.collectionView.mj_header = [FUSRefreshHeader headerWithRefreshingBlock:^{
[self.viewModel fus_reloadData]; [weakSelf.viewModel fus_reloadData];
}]; }];
self.collectionView.mj_footer = [FUSRefreshAutoFooter footerWithRefreshingBlock:^{ self.collectionView.mj_footer = [FUSRefreshAutoFooter footerWithRefreshingBlock:^{
...@@ -131,6 +132,9 @@ ...@@ -131,6 +132,9 @@
-(void)fus_reagiestNotification{ -(void)fus_reagiestNotification{
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fu_followDidUpdate:) name:FUSLiveNotificationKeys.fus_FocusBaoFang_Refresh object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fu_followDidUpdate:) name:FUSLiveNotificationKeys.fus_FocusBaoFang_Refresh object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_appStateDidUpdate) name:FUSConfig.sharedInstanced.devConfigs.appStatusUpdateNotificationKey object:nil];
} }
- (void)layoutSubviews{ - (void)layoutSubviews{
...@@ -145,8 +149,8 @@ ...@@ -145,8 +149,8 @@
} }
} }
- (void)fus_viewWillShow{ - (void)fus_appStateDidUpdate {
[self.viewModel fus_reloadData];
} }
#pragma mark --- notification #pragma mark --- notification
......
...@@ -141,12 +141,6 @@ ...@@ -141,12 +141,6 @@
[self.view addSubview:_searchBar]; [self.view addSubview:_searchBar];
[self.view addSubview:_addressTableView]; [self.view addSubview:_addressTableView];
[self fus_setupLocalStrings];
}
- (void)fus_checkStateDidUpdate {
[super fus_checkStateDidUpdate];
[self fus_enableNavigationBackWithPopFunction:popToRootViewController withAnimated:YES]; [self fus_enableNavigationBackWithPopFunction:popToRootViewController withAnimated:YES];
[self fus_setupLocalStrings]; [self fus_setupLocalStrings];
} }
......
...@@ -210,25 +210,8 @@ ...@@ -210,25 +210,8 @@
[self.backBtn setImage:[UIImage fus_backImage] forState:UIControlStateNormal]; [self.backBtn setImage:[UIImage fus_backImage] forState:UIControlStateNormal];
self.areaRightImageView.image = UIImage.fus_rightArrowIcon; self.areaRightImageView.image = UIImage.fus_rightArrowIcon;
[self fus_checkStateDidUpdate];
}
- (void)fus_checkStateDidUpdate {
[super fus_checkStateDidUpdate];
[self fus_enableNavigationBackWithPopFunction:popToRootViewController withAnimated:YES]; [self fus_enableNavigationBackWithPopFunction:popToRootViewController withAnimated:YES];
[self fus_setupLocalStrings]; [self fus_setupLocalStrings];
UISemanticContentAttribute semanticContentAttribute = [UIView appearance].semanticContentAttribute;
for (UIView *view in self.inputAreaBgView.subviews) {
view.semanticContentAttribute = semanticContentAttribute;
}
self.phoneTextField.textAlignment = NSTextAlignmentLeft;
self.verifyTextField.textAlignment = NSTextAlignmentLeft;
self.passwordTextFieldOne.textAlignment = NSTextAlignmentLeft;
self.passwordTextFieldTwo.textAlignment = NSTextAlignmentLeft;
} }
- (void)fus_setupLocalStrings { - (void)fus_setupLocalStrings {
......
...@@ -153,21 +153,9 @@ ...@@ -153,21 +153,9 @@
[self.backBtn setImage:[UIImage fus_backImage] forState:UIControlStateNormal]; [self.backBtn setImage:[UIImage fus_backImage] forState:UIControlStateNormal];
self.areaRightImageView.image = UIImage.fus_rightArrowIcon; self.areaRightImageView.image = UIImage.fus_rightArrowIcon;
[self fus_setupLocalStrings]; [self fus_setupLocalStrings];
[self fus_checkStateDidUpdate];
}
- (void)fus_checkStateDidUpdate {
[super fus_checkStateDidUpdate];
[self fus_enableNavigationBackWithPopFunction:popToRootViewController withAnimated:YES]; [self fus_enableNavigationBackWithPopFunction:popToRootViewController withAnimated:YES];
[self fus_setupLocalStrings]; [self fus_setupLocalStrings];
UISemanticContentAttribute semanticContentAttribute = [UIView appearance].semanticContentAttribute;
self.areaBgView.semanticContentAttribute = semanticContentAttribute;
self.teleBgView.semanticContentAttribute = semanticContentAttribute;
self.phoneTextField.textAlignment = NSTextAlignmentLeft;
} }
- (void)fus_setupLocalStrings { - (void)fus_setupLocalStrings {
......
...@@ -199,23 +199,9 @@ ...@@ -199,23 +199,9 @@
[self.backBtn setImage:[UIImage fus_backImage] forState:UIControlStateNormal]; [self.backBtn setImage:[UIImage fus_backImage] forState:UIControlStateNormal];
self.areaRightImageView.image = UIImage.fus_rightArrowIcon; self.areaRightImageView.image = UIImage.fus_rightArrowIcon;
[self fus_setupLocalStrings];
[self fus_checkStateDidUpdate];
}
- (void)fus_checkStateDidUpdate {
[super fus_checkStateDidUpdate];
[self fus_enableNavigationBackWithPopFunction:popToRootViewController withAnimated:YES]; [self fus_enableNavigationBackWithPopFunction:popToRootViewController withAnimated:YES];
[self fus_setupLocalStrings]; [self fus_setupLocalStrings];
UISemanticContentAttribute semanticContentAttribute = [UIView appearance].semanticContentAttribute;
self.areaBgView.semanticContentAttribute = semanticContentAttribute;
self.codeBgView.semanticContentAttribute = semanticContentAttribute;
self.teleBgView.semanticContentAttribute = semanticContentAttribute;
self.phoneTextField.textAlignment = NSTextAlignmentLeft;
self.passwordTextField.textAlignment = NSTextAlignmentLeft;
} }
- (void)fus_setupLocalStrings { - (void)fus_setupLocalStrings {
......
...@@ -322,34 +322,11 @@ ...@@ -322,34 +322,11 @@
_registerBtnTopConstraint.constant = -_inviteCodeBgView.height + 18; _registerBtnTopConstraint.constant = -_inviteCodeBgView.height + 18;
_invitePeopleNameLabel.hidden = YES; _invitePeopleNameLabel.hidden = YES;
[self fus_setupLocalStrings];
[self.backBtn setImage:[UIImage fus_backImage] forState:UIControlStateNormal]; [self.backBtn setImage:[UIImage fus_backImage] forState:UIControlStateNormal];
self.areaRightImageView.image = UIImage.fus_rightArrowIcon; self.areaRightImageView.image = UIImage.fus_rightArrowIcon;
[self fus_checkStateDidUpdate];
}
- (void)fus_checkStateDidUpdate {
[super fus_checkStateDidUpdate];
[self fus_enableNavigationBackWithPopFunction:popToRootViewController withAnimated:YES]; [self fus_enableNavigationBackWithPopFunction:popToRootViewController withAnimated:YES];
[self fus_setupLocalStrings]; [self fus_setupLocalStrings];
UISemanticContentAttribute semanticContentAttribute = [UIView appearance].semanticContentAttribute;
self.areaBgView.semanticContentAttribute = semanticContentAttribute;
self.codeBgView.semanticContentAttribute = semanticContentAttribute;
self.teleBgView.semanticContentAttribute = semanticContentAttribute;
self.pswBgView.semanticContentAttribute = semanticContentAttribute;
self.codeBgView.semanticContentAttribute = semanticContentAttribute;
self.inviteCodeBgView.semanticContentAttribute = semanticContentAttribute;
self.registCodeView.semanticContentAttribute = semanticContentAttribute;
self.registCodeTextField.semanticContentAttribute = semanticContentAttribute;
self.phoneTextField.textAlignment = NSTextAlignmentLeft;
self.passwordTextField.textAlignment = NSTextAlignmentLeft;
self.codeTextField.textAlignment = NSTextAlignmentLeft;
self.inviteCodeTextField.textAlignment = NSTextAlignmentLeft;
self.registCodeTextField.textAlignment = NSTextAlignmentLeft;
} }
- (void)fus_setupLocalStrings { - (void)fus_setupLocalStrings {
......
...@@ -156,8 +156,6 @@ ...@@ -156,8 +156,6 @@
// 隐藏导航栏 // 隐藏导航栏
[self.navigationController setNavigationBarHidden:YES animated:YES]; [self.navigationController setNavigationBarHidden:YES animated:YES];
[self fus_checkStateDidUpdate];
[self.videoPlayer fus_resumePlayer]; [self.videoPlayer fus_resumePlayer];
} }
...@@ -358,12 +356,6 @@ ...@@ -358,12 +356,6 @@
[self.view addSubview:_skipBtn]; [self.view addSubview:_skipBtn];
} }
- (void)fus_checkStateDidUpdate {
[super fus_checkStateDidUpdate];
[self fus_setupProtocolLabel];
}
- (void)fus_setupProtocolLabel { - (void)fus_setupProtocolLabel {
_readmeLabel.text = [NSString fus_localString:@"当您注册时表示您已同意"]; _readmeLabel.text = [NSString fus_localString:@"当您注册时表示您已同意"];
......
...@@ -533,10 +533,10 @@ ...@@ -533,10 +533,10 @@
[self checkAppStatus]; [self checkAppStatus];
} }
}]; }];
// 请求sh状态
[self checkAppStatus];
[self fus_startAPPPages]; [self fus_startAPPPages];
// 请求sh状态
[self checkAppStatus];
return YES; return YES;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment