Skip to content

pidan / FuSiLive

Go to a project
Commit a514747d by ludi
Options

Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

parents 4f67aa18 69a6410b
Inline Side-by-side
Showing with 107 additions and 102 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/BaseModel/FUSBaseModel.m
......@@ -20,7 +20,7 @@
*
* @return 返回对象
*/
+ (instancetype)fus_modelWithDict:(NSDictionary *)jsonDict{
+ (instancetype)fus_modelWithDict:(NSDictionary *)jsonDict {
return [self modelWithDictionary:jsonDict];
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/BaseVC/FUSBaseViewController.m
......@@ -42,7 +42,7 @@
//}
- (UIStatusBarStyle)preferredStatusBarStyle {
return UIStatusBarStyleDefault;
return UIStatusBarStyleDarkContent;
}
- (void)viewWillAppear:(BOOL)animated
......@@ -53,7 +53,7 @@
// 显示状态栏
[[UIApplication sharedApplication] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade];
// 设置状态栏为黑
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDefault animated:NO];
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
[self setNeedsStatusBarAppearanceUpdate];
if (!self.hiddenNavigationBar) {
......
FuSiLive/AppDelegate.m
......@@ -120,7 +120,7 @@ static dispatch_queue_t get_status_queue() {
[FUSConfig fus_setUpFusiLiveConfigs];
[[UIApplication sharedApplication] setStatusBarHidden:NO animated:NO];
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent;
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
[Sharetrace initWithDelegate:self appKey:SharetraceKey];
group = dispatch_group_create();
......
FuSiLive/Classes/BaoFang/Broadcast/Model/FUSBroadcastModel.m
......@@ -96,7 +96,7 @@
}
}
_languageContent = [FUSFormatContentHelper fus_replaceFusiLevelImg:_languageContent whiteBg:YES];
_languageContent = [FUSFormatContentHelper fus_replaceFusiLevelImg:_languageContent];
return _languageContent;
}
......
FuSiLive/Classes/BaoFang/Broadcast/View/FUSAnimationLabel.m
......@@ -178,7 +178,7 @@
FUSFormatContentModel *contentModel = [[FUSFormatContentModel alloc] init];
contentModel.languageContent = string;
NSMutableAttributedString *attributedString = [FUSFormatContentHelper fus_createContentAttributedStringWithModel:contentModel font:self.animationLabel.font levelImageSize:CGSizeMake(45, 27)];
NSMutableAttributedString *attributedString = [FUSFormatContentHelper fus_createContentAttributedStringWithModel:contentModel font:self.animationLabel.font levelImageSize:CGSizeMake(0, 14)];
dispatch_async(dispatch_get_main_queue(), ^{
complete(attributedString);
});
......
FuSiLive/Classes/Foundation/Controller/FUSImagePicker/Controller/FUSAlbumViewController.m
......@@ -62,7 +62,7 @@
{
[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 @@
{
[super viewDidAppear:animated];
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
}
#pragma mark - UI
......@@ -153,7 +153,7 @@
{
// 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 @@
[super viewDidAppear:animated];
// self.navigationController.delegate = self;
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
[self fus_setImageSelectIndex];
......@@ -299,7 +299,7 @@
UIBarButtonItem *backBarItem = [[UIBarButtonItem alloc]initWithCustomView:backBtn];
[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 @@
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;
......
FuSiLive/Classes/InstantMessaging/Controller/FUSChatDetailViewController.m
......@@ -1475,6 +1475,7 @@
for (FUSChatDetailFrameModel *frameModel in self.chatDetailArr) {
if ([model.msgModel.messageID isEqualToString:frameModel.msgModel.messageID]) {
[frameModel fus_setValueWithModel:model];
frameModel.msgModel = model.msgModel;
[self fus_judgeMessageTimeIsNeedShowWithIsNewMessage:YES];
FUSIMChatDetailCell *cell = [self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:[self.chatDetailArr indexOfObject:frameModel] inSection:0]];
[cell fus_setCellDetailContentWithModel:frameModel];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSContributeCellTableViewCell.m
......@@ -105,8 +105,8 @@
[self.contentView addSubview:self.onlineLabel];
self.genderAndAgeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.genderAndAgeBtn.titleLabel.font = [UIFont fus_themeFont:11];
self.genderAndAgeBtn.layer.borderColor = [UIColor colorWithHex:@"#87878A"].CGColor;
self.genderAndAgeBtn.titleLabel.font = [UIFont fus_themeFont:9];
self.genderAndAgeBtn.layer.borderColor = [UIColor colorWithHex:@"#D6D6D7"].CGColor;
self.genderAndAgeBtn.layer.borderWidth = 0.5;
self.genderAndAgeBtn.layer.cornerRadius = 9;
self.genderAndAgeBtn.layer.masksToBounds = YES;
......@@ -171,8 +171,8 @@
[self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18);
make.width.mas_equalTo(37);
make.height.mas_equalTo(14);
make.width.mas_equalTo(30);
}];
......@@ -305,16 +305,16 @@
[self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18);
make.width.mas_equalTo(37);
make.height.mas_equalTo(14);
make.width.mas_equalTo(30);
}];
} else {
[self.genderAndAgeBtn setTitle:@"" forState:UIControlStateNormal];
[self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18);
make.width.mas_equalTo(18);
make.height.mas_equalTo(14);
make.width.mas_equalTo(14);
}];
}
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceTableViewCell.m
......@@ -85,8 +85,8 @@
[self.contentView addSubview:self.onlineLabel];
self.genderAndAgeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.genderAndAgeBtn.titleLabel.font = [UIFont fus_themeFont:11];
self.genderAndAgeBtn.layer.borderColor = [UIColor colorWithHex:@"#87878A"].CGColor;
self.genderAndAgeBtn.titleLabel.font = [UIFont fus_themeFont:9];
self.genderAndAgeBtn.layer.borderColor = [UIColor colorWithHex:@"#D6D6D7"].CGColor;
self.genderAndAgeBtn.layer.borderWidth = 0.5;
self.genderAndAgeBtn.layer.cornerRadius = 9;
self.genderAndAgeBtn.layer.masksToBounds = YES;
......@@ -131,8 +131,8 @@
[self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18);
make.width.mas_equalTo(37);
make.height.mas_equalTo(14);
make.width.mas_equalTo(30);
}];
}
......@@ -241,8 +241,8 @@
make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18);
make.width.mas_equalTo(37);
make.height.mas_equalTo(14);
make.width.mas_equalTo(30);
}];
} else {
......@@ -253,8 +253,8 @@
[self.genderAndAgeBtn mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18);
make.width.mas_equalTo(18);
make.height.mas_equalTo(14);
make.width.mas_equalTo(14);
}];
}
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftView.m
......@@ -1232,12 +1232,13 @@ static FUSLiveGiftView *giftView = nil;
_broadcastNewsHaveData = YES;
__block int newsIndex = 0;
FUSBroadcastModel *model = broadcastNewsDic[@"newsModel"][newsIndex];
__weak typeof(self) weakSelf = self;
[_jackpotScrollInfoView.animationLabel changeTextColorWithString:model.languageContent complete:^(NSMutableAttributedString *attributedString) {
[_jackpotScrollInfoView.animationLabel fus_setAnimationattrContent:attributedString];
[_jackpotScrollInfoView.animationLabel fus_startAnimation];
[weakSelf.jackpotScrollInfoView.animationLabel fus_setAnimationattrContent:attributedString];
[weakSelf.jackpotScrollInfoView.animationLabel fus_startAnimation];
}];
__weak typeof(self) weakSelf = self;
_jackpotScrollInfoView.animationLabel.endBlock = ^{
if (weakSelf.giftPanelIsShow == YES && newsArr.count > 0) {
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKPrepareView/FUSPKRecordHeaderView.m
......@@ -35,15 +35,16 @@
self.sessionLocalLabel.text = [NSString fus_localString:@"场次"];
self.winRateLocalLabel.text = [NSString fus_localString:@"胜率"];
_circleView = [[FUSCircleProgressView alloc] initWithFrame:CGRectMake(8, 5.5, 75, 75)];
_circleView = [[FUSCircleProgressView alloc] initWithFrame:CGRectMake(-2, -2, 94, 94)];
// _circleView.textfont = [UIFont systemFontOfSize:11];
// _circleView.textColor = [UIColor clearColor];
// _circleView.processStr = nil;
_circleView.proessBgColor = [UIColor colorWithHex:@"#EEEEEE"];
// _circleView.processColor = [UIColor colorWithHex:@"#FFC231"];
_circleView.processColor = [UIColor colorWithHex:@"#FFC231"];
_circleView.processGradientColor = @[(id)[UIColor colorWithHex:@"#FFC231"].CGColor,(id)[UIColor colorWithHex:@"#FADA8D"].CGColor];
_circleView.processWidth = 4;
_circleView.isAnimate = YES;
_circleView.clockwise = YES;
[self.winRateBgView addSubview:_circleView];
[_circleView startDrawCircleProcessView];
[_circleView animateToProgress:0.0];
......
FuSiLive/Classes/NewsFeed/RichEditor/TZImagePickerController/TZGifPhotoPreviewController.m
......@@ -45,7 +45,7 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
_originStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent;
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
}
- (void)viewWillDisappear:(BOOL)animated {
......
FuSiLive/Classes/NewsFeed/RichEditor/TZImagePickerController/TZImagePickerController.h
......@@ -162,7 +162,7 @@
@property (nonatomic, assign) BOOL hideWhenCanNotSelect;
/// Deprecated, Use statusBarStyle (顶部statusBar 是否为系统默认的黑色，默认为NO)
@property (nonatomic, assign) BOOL isStatusBarDefault __attribute__((deprecated("Use -statusBarStyle.")));
/// statusBar的样式，默认为UIStatusBarStyleLightContent
/// statusBar的样式，默认为UIStatusBarStyleDarkContent
@property (assign, nonatomic) UIStatusBarStyle statusBarStyle;
#pragma mark -
......
FuSiLive/Classes/NewsFeed/RichEditor/TZImagePickerController/TZImagePickerController.m
......@@ -130,7 +130,7 @@
if (isStatusBarDefault) {
self.statusBarStyle = UIStatusBarStyleDefault;
} else {
self.statusBarStyle = UIStatusBarStyleLightContent;
self.statusBarStyle = UIStatusBarStyleDarkContent;
}
}
......@@ -296,7 +296,7 @@
// 2.2.26版本，不主动缩放图片，降低内存占用
self.notScaleImage = YES;
self.needFixComposition = NO;
self.statusBarStyle = UIStatusBarStyleLightContent;
self.statusBarStyle = UIStatusBarStyleDarkContent;
self.cannotSelectLayerColor = [[UIColor whiteColor] colorWithAlphaComponent:0.8];
self.allowCameraLocation = YES;
......
FuSiLive/Classes/NewsFeed/RichEditor/TZImagePickerController/TZVideoPlayerController.m
......@@ -57,7 +57,7 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
_originStatusBarStyle = [UIApplication sharedApplication].statusBarStyle;
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent;
[UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
}
- (void)viewWillDisappear:(BOOL)animated {
......
FuSiLive/Classes/ZhaiXin/Main/Controller/FUSIMZhaiXinViewController.m
......@@ -54,7 +54,7 @@
@implementation FUSIMZhaiXinViewController
- (UIStatusBarStyle)preferredStatusBarStyle {
return UIStatusBarStyleLightContent;
return UIStatusBarStyleDarkContent;
}
- (instancetype)init {
......@@ -104,7 +104,7 @@
[FUSIMChatService shareInstance].chatDelegate = nil;
// // 设置状态栏为白色
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
// [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleDarkContent animated:NO];
// [self setNeedsStatusBarAppearanceUpdate];
}
......
FuSiLive/Info.plist
......@@ -22,68 +22,6 @@
<string>$(MARKETING_VERSION)</string>
<key>CFBundleSignature</key>
<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>
<array>
<dict>
......@@ -143,5 +81,69 @@
</array>
</dict>
</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>
</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