Skip to content

pidan / FuSiLive

Go to a project
Commit 69a6410b by pierce
Options

UI修改

parent ddc3586e
Inline Side-by-side
Showing with 96 additions and 94 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/BaseVC/FUSBaseViewController.m
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
//} //}
- (UIStatusBarStyle)preferredStatusBarStyle { - (UIStatusBarStyle)preferredStatusBarStyle {
return UIStatusBarStyleDefault; return UIStatusBarStyleDarkContent;
} }
- (void)viewWillAppear:(BOOL)animated - (void)viewWillAppear:(BOOL)animated
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
// 显示状态栏 // 显示状态栏
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade]; [[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade];
// 设置状态栏为黑 // 设置状态栏为黑
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:NO]; [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
[self setNeedsStatusBarAppearanceUpdate]; [self setNeedsStatusBarAppearanceUpdate];
if (!self.hiddenNavigationBar) { if (!self.hiddenNavigationBar) {
......
FuSiLive/AppDelegate.m
...@@ -120,7 +120,7 @@ static dispatch_queue_t get_status_queue() { ...@@ -120,7 +120,7 @@ static dispatch_queue_t get_status_queue() {
[FUSConfig fus_setUpFusiLiveConfigs]; [FUSConfig fus_setUpFusiLiveConfigs];
[[UIApplication sharedApplication] setStatusBarHidden:NO animated:NO]; [[UIApplication sharedApplication] setStatusBarHidden:NO animated:NO];
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent; [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
[Sharetrace initWithDelegate:self appKey:SharetraceKey]; [Sharetrace initWithDelegate:self appKey:SharetraceKey];
group = dispatch_group_create(); group = dispatch_group_create();
......
FuSiLive/Classes/Foundation/Controller/FUSImagePicker/Controller/FUSAlbumViewController.m
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
{ {
[super viewDidAppear:animated]; [super viewDidAppear:animated];
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO]; [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
} }
......
FuSiLive/Classes/Foundation/Controller/FUSImagePicker/Controller/FUSImagePickerViewController.m
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
{ {
[super viewDidAppear:animated]; [super viewDidAppear:animated];
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO]; // [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
} }
#pragma mark - UI #pragma mark - UI
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
{ {
// self.navigationBar.barStyle = UIBarStyleBlack; // self.navigationBar.barStyle = UIBarStyleBlack;
// //
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES]; // [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:YES];
} }
// 取消按钮 // 取消按钮
......
FuSiLive/Classes/Foundation/Controller/FUSImagePicker/Controller/FUSPhotoViewController.m
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
[super viewDidAppear:animated]; [super viewDidAppear:animated];
// self.navigationController.delegate = self; // self.navigationController.delegate = self;
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO]; // [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
[self fus_setImageSelectIndex]; [self fus_setImageSelectIndex];
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
UIBarButtonItem *backBarItem = [[UIBarButtonItem alloc]initWithCustomView:backBtn]; UIBarButtonItem *backBarItem = [[UIBarButtonItem alloc]initWithCustomView:backBtn];
[self.navigationItem setLeftBarButtonItems:@[backBarItem] animated:YES]; [self.navigationItem setLeftBarButtonItems:@[backBarItem] animated:YES];
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:YES]; // [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:YES];
} }
......
FuSiLive/Classes/Foundation/Controller/FUSImagePicker/Controller/NEW_FUSFullImageViewController.m
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
self.bottomView.frame = CGRectMake(_bottomView.frame.origin.x, self.view.height - bottomHeight, _bottomView.frame.size.width, bottomHeight); self.bottomView.frame = CGRectMake(_bottomView.frame.origin.x, self.view.height - bottomHeight, _bottomView.frame.size.width, bottomHeight);
}]; }];
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO]; // [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
_isVisible = YES; _isVisible = YES;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSContributeCellTableViewCell.m
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
[self.contentView addSubview:self.onlineLabel]; [self.contentView addSubview:self.onlineLabel];
self.genderAndAgeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.genderAndAgeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.genderAndAgeBtn.titleLabel.font = [UIFont fus_themeFont:11]; self.genderAndAgeBtn.titleLabel.font = [UIFont fus_themeFont:9];
self.genderAndAgeBtn.layer.borderColor = [UIColor colorWithHex:@"#87878A"].CGColor; self.genderAndAgeBtn.layer.borderColor = [UIColor colorWithHex:@"#D6D6D7"].CGColor;
self.genderAndAgeBtn.layer.borderWidth = 0.5; self.genderAndAgeBtn.layer.borderWidth = 0.5;
self.genderAndAgeBtn.layer.cornerRadius = 9; self.genderAndAgeBtn.layer.cornerRadius = 9;
self.genderAndAgeBtn.layer.masksToBounds = YES; self.genderAndAgeBtn.layer.masksToBounds = YES;
...@@ -171,8 +171,8 @@ ...@@ -171,8 +171,8 @@
[self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) { [self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel); make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2); make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18); make.height.mas_equalTo(14);
make.width.mas_equalTo(37); make.width.mas_equalTo(30);
}]; }];
...@@ -305,16 +305,16 @@ ...@@ -305,16 +305,16 @@
[self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) { [self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel); make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2); make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18); make.height.mas_equalTo(14);
make.width.mas_equalTo(37); make.width.mas_equalTo(30);
}]; }];
} else { } else {
[self.genderAndAgeBtn setTitle:@"" forState:UIControlStateNormal]; [self.genderAndAgeBtn setTitle:@"" forState:UIControlStateNormal];
[self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) { [self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel); make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2); make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18); make.height.mas_equalTo(14);
make.width.mas_equalTo(18); make.width.mas_equalTo(14);
}]; }];
} }
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceTableViewCell.m
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
[self.contentView addSubview:self.onlineLabel]; [self.contentView addSubview:self.onlineLabel];
self.genderAndAgeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.genderAndAgeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.genderAndAgeBtn.titleLabel.font = [UIFont fus_themeFont:11]; self.genderAndAgeBtn.titleLabel.font = [UIFont fus_themeFont:9];
self.genderAndAgeBtn.layer.borderColor = [UIColor colorWithHex:@"#87878A"].CGColor; self.genderAndAgeBtn.layer.borderColor = [UIColor colorWithHex:@"#D6D6D7"].CGColor;
self.genderAndAgeBtn.layer.borderWidth = 0.5; self.genderAndAgeBtn.layer.borderWidth = 0.5;
self.genderAndAgeBtn.layer.cornerRadius = 9; self.genderAndAgeBtn.layer.cornerRadius = 9;
self.genderAndAgeBtn.layer.masksToBounds = YES; self.genderAndAgeBtn.layer.masksToBounds = YES;
...@@ -131,8 +131,8 @@ ...@@ -131,8 +131,8 @@
[self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) { [self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel); make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2); make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18); make.height.mas_equalTo(14);
make.width.mas_equalTo(37); make.width.mas_equalTo(30);
}]; }];
} }
...@@ -241,8 +241,8 @@ ...@@ -241,8 +241,8 @@
make.left.equalTo(self.nicknameLabel); make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2); make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18); make.height.mas_equalTo(14);
make.width.mas_equalTo(37); make.width.mas_equalTo(30);
}]; }];
} else { } else {
...@@ -253,8 +253,8 @@ ...@@ -253,8 +253,8 @@
[self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) { [self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel); make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2); make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18); make.height.mas_equalTo(14);
make.width.mas_equalTo(18); make.width.mas_equalTo(14);
}]; }];
} }
} }
......
FuSiLive/Classes/NewsFeed/RichEditor/TZImagePickerController/TZGifPhotoPreviewController.m
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
_originStatusBarStyle = [UIApplication sharedApplication].statusBarStyle; _originStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent; [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
} }
- (void)viewWillDisappear:(BOOL)animated { - (void)viewWillDisappear:(BOOL)animated {
......
FuSiLive/Classes/NewsFeed/RichEditor/TZImagePickerController/TZImagePickerController.h
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
@property (nonatomic, assign) BOOL hideWhenCanNotSelect; @property (nonatomic, assign) BOOL hideWhenCanNotSelect;
/// Deprecated, Use statusBarStyle (顶部statusBar 是否为系统默认的黑色，默认为NO) /// Deprecated, Use statusBarStyle (顶部statusBar 是否为系统默认的黑色，默认为NO)
@property (nonatomic, assign) BOOL isStatusBarDefault __attribute__((deprecated("Use -statusBarStyle."))); @property (nonatomic, assign) BOOL isStatusBarDefault __attribute__((deprecated("Use -statusBarStyle.")));
/// statusBar的样式，默认为UIStatusBarStyleLightContent /// statusBar的样式，默认为UIStatusBarStyleDarkContent
@property (assign, nonatomic) UIStatusBarStyle statusBarStyle; @property (assign, nonatomic) UIStatusBarStyle statusBarStyle;
#pragma mark - #pragma mark -
......
FuSiLive/Classes/NewsFeed/RichEditor/TZImagePickerController/TZImagePickerController.m
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
if (isStatusBarDefault) { if (isStatusBarDefault) {
self.statusBarStyle = UIStatusBarStyleDefault; self.statusBarStyle = UIStatusBarStyleDefault;
} else { } else {
self.statusBarStyle = UIStatusBarStyleLightContent; self.statusBarStyle = UIStatusBarStyleDarkContent;
} }
} }
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
// 2.2.26版本，不主动缩放图片，降低内存占用 // 2.2.26版本，不主动缩放图片，降低内存占用
self.notScaleImage = YES; self.notScaleImage = YES;
self.needFixComposition = NO; self.needFixComposition = NO;
self.statusBarStyle = UIStatusBarStyleLightContent; self.statusBarStyle = UIStatusBarStyleDarkContent;
self.cannotSelectLayerColor = [[UIColor whiteColor] colorWithAlphaComponent:0.8]; self.cannotSelectLayerColor = [[UIColor whiteColor] colorWithAlphaComponent:0.8];
self.allowCameraLocation = YES; self.allowCameraLocation = YES;
......
FuSiLive/Classes/NewsFeed/RichEditor/TZImagePickerController/TZVideoPlayerController.m
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated]; [super viewWillAppear:animated];
_originStatusBarStyle = [UIApplication sharedApplication].statusBarStyle; _originStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent; [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
} }
- (void)viewWillDisappear:(BOOL)animated { - (void)viewWillDisappear:(BOOL)animated {
......
FuSiLive/Classes/ZhaiXin/Main/Controller/FUSIMZhaiXinViewController.m
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
@implementation FUSIMZhaiXinViewController @implementation FUSIMZhaiXinViewController
- (UIStatusBarStyle)preferredStatusBarStyle { - (UIStatusBarStyle)preferredStatusBarStyle {
return UIStatusBarStyleLightContent; return UIStatusBarStyleDarkContent;
} }
- (instancetype)init { - (instancetype)init {
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
[FUSIMChatService shareInstance].chatDelegate = nil; [FUSIMChatService shareInstance].chatDelegate = nil;
// // 设置状态栏为白色 // // 设置状态栏为白色
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO]; // [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
// [self setNeedsStatusBarAppearanceUpdate]; // [self setNeedsStatusBarAppearanceUpdate];
} }
......
FuSiLive/Info.plist
...@@ -22,68 +22,6 @@ ...@@ -22,68 +22,6 @@
<string>$(MARKETING_VERSION)</string> <string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSCameraUsageDescription</key>
<string>开启直播，需要访问您的相机哦</string>
<key>NSContactsUsageDescription</key>
<string>获取您的通讯录，邀请好友来加入</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>需要获取您的位置，以便发现附近的主播哦</string>
<key>NSMicrophoneUsageDescription</key>
<string>开启直播，需要访问您的麦克风哦</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>存储图片，需要访问您的相册</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>获取图片，需要访问您的相册</string>
<key>NSUserTrackingUsageDescription</key>
<string>此标识符将用于向您推荐个性化广告。</string>
<key>UIAppFonts</key>
<array>
<string>FZCustom01.ttf</string>
</array>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
<string>Launch Screen.storyboard</string>
<key>FacebookAdvertiserIDCollectionEnabled</key>
<true/>
<key>FacebookAppID</key>
<string>382456482257502</string>
<key>FacebookAutoLogAppEventsEnabled</key>
<true/>
<key>FacebookClientToken</key>
<string>045478b9202f7c4913ab5366eaf15f8a</string>
<key>FacebookDisplayName</key>
<string>FuSiLive</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UIStatusBarHidden</key>
<true/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>WKRunsIndependentlyOfCompanionApp</key>
<false/>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
...@@ -143,5 +81,69 @@ ...@@ -143,5 +81,69 @@
</array> </array>
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>FacebookAdvertiserIDCollectionEnabled</key>
<true/>
<key>FacebookAppID</key>
<string>382456482257502</string>
<key>FacebookAutoLogAppEventsEnabled</key>
<true/>
<key>FacebookClientToken</key>
<string>045478b9202f7c4913ab5366eaf15f8a</string>
<key>FacebookDisplayName</key>
<string>FuSiLive</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSCameraUsageDescription</key>
<string>开启直播，需要访问您的相机哦</string>
<key>NSContactsUsageDescription</key>
<string>获取您的通讯录，邀请好友来加入</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>需要获取您的位置，以便发现附近的主播哦</string>
<key>NSMicrophoneUsageDescription</key>
<string>开启直播，需要访问您的麦克风哦</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>存储图片，需要访问您的相册</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>获取图片，需要访问您的相册</string>
<key>NSUserTrackingUsageDescription</key>
<string>此标识符将用于向您推荐个性化广告。</string>
<key>UIAppFonts</key>
<array>
<string>FZCustom01.ttf</string>
</array>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
<string>remote-notification</string>
</array>
<key>UILaunchStoryboardName</key>
<string>Launch Screen.storyboard</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UIRequiresFullScreen</key>
<true/>
<key>UIStatusBarHidden</key>
<true/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Dark</string>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>WKRunsIndependentlyOfCompanionApp</key>
<false/>
</dict> </dict>
</plist> </plist>
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