Skip to content

pidan / FuSiLive

Go to a project
Commit 1c6d259c by pierce
Options

fixed bugs

parent 3b03baed
Expand all
Inline Side-by-side
Showing with 251 additions and 200 deletions
DevelopmentPods/FUSFoundation/FUSFoundation.podspec
......@@ -27,6 +27,7 @@ Pod::Spec.new do |s|
s.resource_bundles = {
'FUSFoundationBundle' => ['FUSFoundation/Assets/AppDataPlists/*',
'FUSFoundation/Assets/Asset.xcassets',
'FUSFoundation/Assets/ByteDanceResources/*',
'FUSFoundation/Assets/Anims/**/*.png',
'FUSFoundation/Assets/Sounds/*',
'FUSFoundation/Assets/**/*.plist',
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
......@@ -1794,8 +1794,6 @@
"开播失败,请退出重试" = "開播失敗,請退出重試";
"柔白" = "柔白";
"下麦" = "下麥";
"直播前请开启权限及认证" = "直播前請開啟權限及認證";
......@@ -2254,3 +2252,22 @@
"开启系统通知权限，不再错过每天的连续签到奖励" = "開啟系統通知權限，不再錯過每天的連續簽到獎勵";
"柔白" = "柔白";
"蜜桃" = "蜜桃";
"马卡龙" = "馬卡龍";
"温柔" = "溫柔";
"清透" = "清透";
"氧气" = "氧氣";
"桔梗" = "桔梗";
"初见" = "初見";
"超甜" = "超甜";
"自然" = "自然";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
......@@ -1794,8 +1794,6 @@
"开播失败,请退出重试" = "開播失敗,請退出重試";
"柔白" = "柔白";
"下麦" = "下麥";
"直播前请开启权限及认证" = "直播前請開啟權限及認證";
......@@ -2254,3 +2252,23 @@
"开启系统通知权限，不再错过每天的连续签到奖励" = "開啟系統通知權限，不再錯過每天的連續簽到獎勵";
"柔白" = "柔白";
"蜜桃" = "蜜桃";
"马卡龙" = "馬卡龍";
"温柔" = "溫柔";
"清透" = "清透";
"氧气" = "氧氣";
"桔梗" = "桔梗";
"初见" = "初見";
"超甜" = "超甜";
"自然" = "自然";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_English.strings
......@@ -1794,8 +1794,6 @@
"开播失败,请退出重试" = "The live broadcast failed, please exit and try again";
"柔白" = "White";
"下麦" = "Leave Mic";
"直播前请开启权限及认证" = "Please open the permission and certification before the live broadcast";
......@@ -2254,3 +2252,22 @@
"开启系统通知权限，不再错过每天的连续签到奖励" = "Enable system notification permission, no longer miss the daily check-in rewards.";
"柔白" = "White";
"蜜桃" = "Peach";
"马卡龙" = "Macaron";
"温柔" = "Gentle";
"清透" = "Clear";
"氧气" = "Air";
"桔梗" = "Flower";
"初见" = "First look";
"超甜" = "Sweet";
"自然" = "Natural";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Japanese.strings
......@@ -1778,8 +1778,6 @@
"开播失败,请退出重试" = "ライブ配信に失敗しました。終了してからもう一度お試しください";
"柔白" = "White";
"下麦" = "Leave Mic";
"直播前请开启权限及认证" = "ライブ配信の前に許可と認証を開いてください";
......@@ -2232,3 +2230,22 @@
"开启系统通知权限，不再错过每天的连续签到奖励" = "システム通知許可を有効にすると、毎日のチェックイン特典を見逃すことがなくなります。";
"柔白" = "White";
"蜜桃" = "Peach";
"马卡龙" = "Macaron";
"温柔" = "Gentle";
"清透" = "Clear";
"氧气" = "Air";
"桔梗" = "Flower";
"初见" = "First look";
"超甜" = "Sweet";
"自然" = "Natural";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Thai.strings
......@@ -1774,8 +1774,6 @@
"开播失败,请退出重试" = "การถ่ายทอดสดล้มเหลว โปรดออกและลองอีกครั้ง";
"柔白" = "White";
"下麦" = "Leave Mic";
"直播前请开启权限及认证" = "โปรดเปิดการอนุญาตและหนังสือรับรองก่อนการถ่ายทอดสด";
......@@ -2226,3 +2224,22 @@
"开启系统通知权限，不再错过每天的连续签到奖励" = "เปิดใช้งานการอนุญาตการแจ้งเตือนของระบบ ไม่พลาดรางวัลเช็คอินรายวันอีกต่อไป";
"柔白" = "White";
"蜜桃" = "Peach";
"马卡龙" = "Macaron";
"温柔" = "Gentle";
"清透" = "Clear";
"氧气" = "Air";
"桔梗" = "Flower";
"初见" = "First look";
"超甜" = "Sweet";
"自然" = "Natural";
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_vietnamese.strings
......@@ -1778,8 +1778,6 @@
"开播失败,请退出重试" = "Phát trực tiếp thất bại, vui lòng thoát và thử lại";
"柔白" = "White";
"下麦" = "Leave Mic";
"直播前请开启权限及认证" = "Vui lòng cấp quyền và chứng nhận trước khi phát trực tiếp";
......@@ -2232,3 +2230,22 @@
"开启系统通知权限，不再错过每天的连续签到奖励" = "Bật quyền thông báo hệ thống, không còn bỏ lỡ phần thưởng đăng ký hàng ngày.";
"柔白" = "White";
"蜜桃" = "Peach";
"马卡龙" = "Macaron";
"温柔" = "Gentle";
"清透" = "Clear";
"氧气" = "Air";
"桔梗" = "Flower";
"初见" = "First look";
"超甜" = "Sweet";
"自然" = "Natural";
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/StreamView/Beauty/FUSBeautyHelper.m
......@@ -269,11 +269,11 @@
@"Filter_04_12",
@"Filter_24_Po2",
@"Filter_25_Po3",
@"Filter_09_19",
@"Filter_10_11",
@"Filter_29_Po7",
@"Filter_27_Po5",
@"Filter_06_03"]];
@"Filter_06_03",
@"Filter_07_06",
@"Filter_23_Po1",
@"Filter_37_L5",
@"Filter_38_F1"]];
for (NSString *filterPath in arr) {
BEEffect *filter = [BEEffect new];
......@@ -282,6 +282,7 @@
[filterArray addObject:filter];
}
}
if ([path isEqualToString:@"Filter"]) {
NSArray *filterNames = @[
[NSString fus_localString:@"柔白"],
......@@ -289,22 +290,22 @@
[NSString fus_localString:@"桔梗"],
[NSString fus_localString:@"初见"],
[NSString fus_localString:@"超甜"],
[NSString fus_localString:@"樱花"],
[NSString fus_localString:@"浅暖"],
[NSString fus_localString:@"夕阳"],
[NSString fus_localString:@"奶茶"],
[NSString fus_localString:@"蜜桃"]];
[NSString fus_localString:@"蜜桃"],
[NSString fus_localString:@"马卡龙"],
[NSString fus_localString:@"温柔"],
[NSString fus_localString:@"清透"],
[NSString fus_localString:@"自然"]];
NSArray *filterCNName = @[
@"icon_beauty_filter_roubai",
@"icon_beauty_filter_yangqi",
@"icon_beauty_filter_jigeng",
@"icon_beauty_filter_chujian",
@"icon_beauty_filter_chaotian",
@"icon_beauty_filter_yinghua",
@"icon_beauty_filter_qiannuan",
@"icon_beauty_filter_xiyang",
@"icon_beauty_filter_naicha",
@"icon_beauty_filter_mitao"];
@"yabyte_icon_beauty_filter_roubai.jpeg",
@"yabyte_icon_beauty_filter_yangqi.jpeg",
@"yabyte_icon_beauty_filter_jigeng.jpeg",
@"yabyte_icon_beauty_filter_chujian.jpeg",
@"yabyte_icon_beauty_filter_chaotian.jpeg",
@"yabyte_icon_beauty_filter_mitao.JPG",
@"yabyte_icon_beauty_filter_makalong.JPG",
@"yabyte_icon_beauty_filter_wenrou.JPG",
@"yabyte_icon_beauty_filter_qingtou.JPG",
@"yabyte_icon_beauty_filter_ziran.JPG"];
[filterArray enumerateObjectsUsingBlock:^(BEEffect * filter, NSUInteger idx, BOOL * _Nonnull stop) {
// idx = [filter.filePath componentsSeparatedByString:@"_"][1].integerValue - 1;
filter.title = idx < filterNames.count ? filterNames[idx] : @"";
......@@ -312,7 +313,7 @@
}];
BEEffect *normal = [BEEffect new];
normal.title = [NSString fus_localString:@"正常"];
normal.imageName = @"icon_beauty_filter_origin";
normal.imageName = @"yabyte_icon_beauty_filter_origin";
normal.filePath = @"";
[filterArray insertObject:normal atIndex:0];
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Bundle/FUSFoundationBundle.h
......@@ -64,6 +64,9 @@ NS_ASSUME_NONNULL_BEGIN
/// 露水图片
+(UIImage *)fus_dewIcon;
/// 蓝色的气图片
+(UIImage *)fus_bluePopularIcon;
/// 帮助图标
+ (UIImage *)fus_helpIcon;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Bundle/FUSFoundationBundle.m
......@@ -138,6 +138,12 @@
return [UIImage fus_ImageNamed:@"DailyCheckInSmallDew"];
}
/// 蓝色的气图片
+(UIImage *)fus_bluePopularIcon {
return [UIImage fus_ImageNamed:@"common_blue_popular_icon"];
}
+ (UIImage *)fus_rightArrowIcon {
return [self fus_ImageNamed:@"icon_right_arrows"];
}
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/ZhaiXin/Official/Controller/FUSOfficialViewController.m
......@@ -324,30 +324,37 @@
// 小图标
NSString *iconString = itemDict[@"icon"];
UIImage *iconImage = nil;
CGFloat iconWidth = 0;
CGFloat iconWidth = 15;
if (![NSString isNull:iconString]) {
// 图标链接
NSString *dealUrlStr = nil;
if ([iconString hasPrefix:@"http"] || [iconString hasPrefix:@"https"]) {
dealUrlStr = iconString;
}else{
dealUrlStr = [FUSConfig.sharedInstanced.pathConfigs webImagePath:iconString];
}
// 图标此时已经下载好了 直接用SDWebImage去取
NSString *imageKey = [[YYWebImageManager sharedManager] cacheKeyForURL:[NSURL URLWithString:dealUrlStr]];
iconImage = [[YYWebImageManager sharedManager].cache getImageForKey:imageKey];
if (iconImage) {
iconWidth = NOTIFICATION_MUTLI_LINE_ICON_IMAGE_HEIGHT * (iconImage.size.width / iconImage.size.height);
// 内容和图标之间没有间距
contentTextX += iconWidth;
}else{
// 图标缓存被用户清理了 再次下载小图标
[[YYWebImageManager sharedManager] requestImageWithURL:[NSURL URLWithString:dealUrlStr] options:0 progress:nil transform:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
if (!error && image) {
[[YYWebImageManager sharedManager].cache setImage:image forKey:imageKey];
}
}];
if ([iconString containsString:@"level/bonds.png"]) {
iconImage = UIImage.fus_fireIcon;
} else if ([iconString containsString:@"level/popular.png"]) {
iconImage = UIImage.fus_bluePopularIcon;
} else {
// 图标链接
NSString *dealUrlStr = nil;
if ([iconString hasPrefix:@"http"] || [iconString hasPrefix:@"https"]) {
dealUrlStr = iconString;
}else{
dealUrlStr = [FUSConfig.sharedInstanced.pathConfigs webImagePath:iconString];
}
// 图标此时已经下载好了 直接用SDWebImage去取
NSString *imageKey = [[YYWebImageManager sharedManager] cacheKeyForURL:[NSURL URLWithString:dealUrlStr]];
iconImage = [[YYWebImageManager sharedManager].cache getImageForKey:imageKey];
if (iconImage) {
iconWidth = NOTIFICATION_MUTLI_LINE_ICON_IMAGE_HEIGHT * (iconImage.size.width / iconImage.size.height);
// 内容和图标之间没有间距
contentTextX += iconWidth;
}else{
// 图标缓存被用户清理了 再次下载小图标
[[YYWebImageManager sharedManager] requestImageWithURL:[NSURL URLWithString:dealUrlStr] options:0 progress:nil transform:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
if (!error && image) {
[[YYWebImageManager sharedManager].cache setImage:image forKey:imageKey];
}
}];
}
}
}
CGFloat contentHeight = [showRichString boundingRectWithSize:CGSizeMake(UIView.fus_screenW - NOTIFICATION_MUTLI_LINE_MAIN_VIEW_PADDING*2 - 16*2 - contentTextX, CGFLOAT_MAX) options:NSStringDrawingUsesLineFragmentOrigin context:nil].size.height;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/Filter/icon_beauty_filter_jigeng.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Lark20210105-190456.jpeg",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/Filter/icon_beauty_filter_origin.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon_beauty_filter_origin@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/Filter/icon_beauty_filter_roubai.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Lark20210105-190341.jpeg",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/Filter/icon_beauty_filter_yangqi.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Lark20210105-190418.jpeg",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBeautyParameterView.m
......@@ -251,7 +251,7 @@
BEEffect *filter = FUSBeautyHelper.shareInstance.filtersArr[indexPath.row];
cell.filterName = filter.title;
cell.filterImage = [FUSShowRoomCenterBunble imageNamed:filter.imageName];
cell.filterImage = [UIImage fus_ImageNamed:filter.imageName];
cell.filterKey = filter.filePath;
cell.select = indexPath.row == self.selectedFilterIndex;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FFGiftView/FUSLiveParcelView.m
......@@ -171,9 +171,9 @@
self.segmentView = [[FUSSegmentControlView alloc] initWithFrame:CGRectMake(5, 0, self.topView.width - 5, self.topView.height)];
self.segmentView.alignment = FUSSegmentControlAlignmentLeft;
self.segmentView.segmentDelegate = self;
self.segmentView.isShowSelectedBgImgView = NO;
self.segmentView.isShowSelectedBgImgView = YES;
self.segmentView.isShowUnderLine = YES;
[self.segmentView fus_setUnderLineSelectedImage:UIImage.fus_segmentSelected];
[self.segmentView fus_setUnderLineSelectedImage:UIImage.fus_segmentSelectedDot];
self.segmentView.itemFont = [UIFont fus_themeFont:13];
[self.segmentView fus_setItemTitleColor:[UIColor colorWithHex:@"#808080" alpha:1] forState:UIControlStateNormal];
[self.segmentView fus_setItemTitleColor:[UIColor whiteColor] forState:UIControlStateSelected];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
......@@ -1235,7 +1235,7 @@ UIGestureRecognizerDelegate
_volumnView = [[UIView alloc] initWithFrame:_volumnBGView.bounds];
_volumnView.width = 0;
_volumnView.backgroundColor = [UIColor colorWithHex:@"00F088"];
_volumnView.backgroundColor = [UIColor fus_themeColor];
[_volumnBGView addSubview:_volumnView];
_volumnBGView.alpha = 0;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/HeadView/FUSLiveHeadPusherView.m
......@@ -50,7 +50,7 @@
/**
透明过渡效果 Layer
*/
@property (nonatomic, strong) CAGradientLayer *gradientLayer;
//@property (nonatomic, strong) CAGradientLayer *gradientLayer;
/**
银币添加按钮
......@@ -104,7 +104,7 @@
weakSelf.userCollectionBGView.frame = CGRectMake(maxX + 2, weakSelf.userCollectionBGView.y, weakSelf.width - maxX - 8 - 30, weakSelf.userCollectionBGView.height);
weakSelf.userListView.frame = CGRectMake(0, 0, weakSelf.width - maxX - 8 - 30, weakSelf.userCollectionBGView.height);
weakSelf.gradientLayer.frame = CGRectMake(0, 0, weakSelf.width - maxX - 8 - 30, weakSelf.userCollectionBGView.height);
// weakSelf.gradientLayer.frame = CGRectMake(0, 0, weakSelf.width - maxX - 8 - 30, weakSelf.userCollectionBGView.height);
}];
}];
......@@ -193,19 +193,19 @@
// 添加 inset
// _userCollectionView.contentInset = UIEdgeInsetsMake(0, _userCollectionBGView.width * 0.05, 0, _userCollectionBGView.width * 0.0);
// 添加一个过渡遮罩
CAGradientLayer *gradientLayer = [CAGradientLayer layer];
gradientLayer.startPoint = CGPointMake(0, 0.0);
gradientLayer.endPoint = CGPointMake(1, 0.0);
gradientLayer.colors = @[(__bridge id)[UIColor clearColor].CGColor,
(__bridge id)[UIColor blackColor].CGColor,
(__bridge id)[UIColor blackColor].CGColor,
(__bridge id)[UIColor clearColor].CGColor];
gradientLayer.locations = @[@(0), @(0.05), @(0.95), @(1)];
gradientLayer.frame = _userCollectionBGView.bounds;
self.gradientLayer = gradientLayer;
[_userCollectionBGView.layer addSublayer:gradientLayer];
_userCollectionBGView.layer.mask = gradientLayer;
// // 添加一个过渡遮罩
// CAGradientLayer *gradientLayer = [CAGradientLayer layer];
// gradientLayer.startPoint = CGPointMake(0, 0.0);
// gradientLayer.endPoint = CGPointMake(1, 0.0);
// gradientLayer.colors = @[(__bridge id)[UIColor clearColor].CGColor,
// (__bridge id)[UIColor blackColor].CGColor,
// (__bridge id)[UIColor blackColor].CGColor,
// (__bridge id)[UIColor clearColor].CGColor];
// gradientLayer.locations = @[@(0), @(0.05), @(0.95), @(1)];
// gradientLayer.frame = _userCollectionBGView.bounds;
// self.gradientLayer = gradientLayer;
// [_userCollectionBGView.layer addSublayer:gradientLayer];
// _userCollectionBGView.layer.mask = gradientLayer;
}
/**
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/FUSVideoStartBeautySetView.m
......@@ -247,7 +247,7 @@
BEEffect *filter = FUSBeautyHelper.shareInstance.filtersArr[indexPath.row];
cell.filterName = filter.title;
cell.filterImage = [FUSShowRoomCenterBunble imageNamed:filter.imageName];
cell.filterImage = [UIImage fus_ImageNamed:filter.imageName];
cell.filterKey = filter.filePath;
cell.select = indexPath.row == self.selectedFilterIndex;
......
Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/ImagePicker_icon_confirm.imageset/Contents.json
......@@ -5,12 +5,11 @@
"scale" : "1x"
},
{
"filename" : "选照片选中@2x.png",
"filename" : "common_icon_segment_selected_dot@3x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "选照片选中@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/Filter/icon_beauty_filter_chujian.imageset/Contents.json → Modules/FUSUserCenterModule/FUSUserCenterModule/FUSUserCenterModuleBundle.bundle/FUSUserCenterAssets.xcassets/textfield_clear_btn.imageset/Contents.json
......@@ -5,11 +5,12 @@
"scale" : "1x"
},
{
"filename" : "Lark20210105-190539.jpeg",
"filename" : "textfield_clear_btn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "textfield_clear_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/FUSImagePicker/Controller/FUSPhotoViewController.m
......@@ -470,7 +470,7 @@
self.lineSpace = 3;
self.confirmBtnTitle = [NSString fus_localString:@"发送"];
self.confirmBtnColor = [UIColor colorWithHex:@"00F088"];
self.confirmBtnColor = [UIColor fus_themeColor];
}
/**
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/FUSImagePicker/View/FUSChoseButton.m
......@@ -16,7 +16,7 @@
{
self = [super initWithFrame:frame];
if (self) {
[self setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
}
return self;
}
......@@ -36,7 +36,7 @@
[super setSelected:selected];
if (selected) {
self.backgroundColor = [UIColor colorWithHex:@"6eec92"];
self.backgroundColor = [UIColor fus_themeColor];
}else{
self.backgroundColor = [UIColor clearColor];
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/FUSImagePicker/View/FUSHalfScreenPhotoView.m
......@@ -97,6 +97,7 @@
}];
}else if (status == PHAuthorizationStatusAuthorized) {
FUSImagePickerViewController *pickVc = [[FUSImagePickerViewController alloc] initWithMaxImagesCount:MAX_IMAGE_NUMBER];
pickVc.modalPresentationStyle = UIModalPresentationFullScreen;
pickVc.imagePickerDelegate = self;
[[UIViewController fus_topViewController] presentViewController:pickVc animated:YES completion:nil];
}
......@@ -343,7 +344,7 @@
NEW_FUSFullImageViewController *fullImageVC = [[NEW_FUSFullImageViewController alloc] initWithPhotos:self.photos];
fullImageVC.currentIndex = indexPath.row;
fullImageVC.confirmBtnTitle = [NSString fus_localString:@"发送"];
fullImageVC.confirmBtnColor = [UIColor colorWithHex:@"00F088"];
fullImageVC.confirmBtnColor = [UIColor fus_themeColor];
fullImageVC.enableSelected = YES;
fullImageVC.dismissHandler = ^(BOOL isSend, NSMutableArray<FUSAssetModel *> *photos) {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/FUSImagePicker/View/FUSNumberView.m
......@@ -43,7 +43,7 @@
- (void)initLabel
{
self.numberLabel = [[UILabel alloc]initWithFrame:self.bounds];
self.numberLabel.textColor = [UIColor whiteColor];
self.numberLabel.textColor = [UIColor fus_textColorRich];
self.numberLabel.font = [UIFont systemFontOfSize:14 weight:0.2];
_numberLabel.textAlignment = NSTextAlignmentCenter;
[self addSubview:_numberLabel];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Controller/FUSLoginFailReportViewController.m
......@@ -98,7 +98,7 @@
[self fus_submitReportAnchor];
}];
[_submitBtn setTitleColor:[UIColor colorWithHex:@"00F088"] forState:UIControlStateNormal];
[_submitBtn setTitleColor:[UIColor fus_themeColor] forState:UIControlStateNormal];
self.imageArray = [NSMutableArray array];
[self fus_enableNavigationBackWithPopFunction:popViewController withAnimated:YES];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/RichEditor/Controller/FUSPublishNewsFeedViewController.m
......@@ -627,6 +627,8 @@ FUSImagePickerViewControllerDelegate>
}else if (status == PHAuthorizationStatusAuthorized) {
[FUSImagePickerManager sharedManager].confirmBtnTitle = [NSString fus_localString:@"确定"];
FUSImagePickerViewController *pickVc = [[FUSImagePickerViewController alloc] initWithMaxImagesCount:1 columnNumber:3 type:FUSAssetTypeVideo];
pickVc.modalPresentationStyle = UIModalPresentationFullScreen;
pickVc.imagePickerDelegate = self;
pickVc.videoTimeLimit = 15.0 * 60.0;
[self presentViewController:pickVc animated:YES completion:nil];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/Views/FUSNewsFeedReplyInputView.m
......@@ -246,6 +246,8 @@
self.imagePickerVc = [[FUSImagePickerViewController alloc] initWithMaxImagesCount:1 columnNumber:4 isPushToPhoto:NO type:FUSAssetTypePhoto];
self.imagePickerVc.modalPresentationStyle = UIModalPresentationFullScreen;
self.imagePickerVc.imagePickerDelegate = self;
self.imagePickerVc.showRecordBtn = NO;
......@@ -480,6 +482,11 @@
self.superview.hidden = NO;
[self.inputTextView becomeFirstResponder];
MJWeakSelf
[imagePicker dismissViewControllerAnimated:YES completion:^{
weakSelf.superview.hidden = NO;
[weakSelf.inputTextView becomeFirstResponder];
}];
self.imagePickerVc = nil;
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Search/Controller/FUSSearchViewController.swift
......@@ -113,6 +113,10 @@ public class FUSSearchViewController: FUSBaseViewController, UITableViewDelegate
self.searchInputBgView.backgroundColor = .fus_textInputBackgroundGray()
self.searchTextField.textAlignment = NSTextAlignment.left;
if let clearBtn = self.searchTextField.value(forKey: "_clearButton") as? UIButton {
clearBtn.setImage(FUSUserCenterBunble.imageNamed("textfield_clear_btn"), for: .normal)
}
var attrString:NSAttributedString{
get{
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Search/Controller/FUSSearchViewController.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUSSearchViewController" customModule="FuSiLive" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUSSearchViewController" customModule="FUSUserCenterModuleBundle" customModuleProvider="target">
<connections>
<outlet property="bgViewTopContraint" destination="VxD-D7-0gy" id="MCH-lL-TeL"/>
<outlet property="cancelBtn" destination="xTR-9K-Ajr" id="Dga-0e-fhd"/>
......@@ -39,6 +39,7 @@
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" placeholder="输入FuSi ID或昵称" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="pRN-Ye-p5q">
<rect key="frame" x="30" y="0.0" width="309" height="32"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<color key="tintColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" returnKeyType="search"/>
......@@ -62,7 +63,7 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="观看记录" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ygj-1H-BxV">
<rect key="frame" x="15" y="119" width="58" height="17"/>
<rect key="frame" x="15" y="119" width="56" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.50196078430000002" green="0.50196078430000002" blue="0.50196078430000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSZoneUserInfoEditViewController.swift
......@@ -183,7 +183,7 @@ import FUSCommon
self.rightBtn!.size = CGSize(width: 44, height: 20)
self.rightBtn!.setTitle(NSString.fus_localString("保存"), for: .normal)
self.rightBtn!.titleLabel?.font = UIFont.systemFont(ofSize: 15)
self.rightBtn!.setTitleColor(UIColor(white: 0.2, alpha: 1), for: .normal)
self.rightBtn!.setTitleColor(UIColor.fus_textColorMedium(), for: .normal)
self.rightBtn!.addTarget(self, action: #selector(self.fus_onClickRightBtnAction(_:)), for: .touchUpInside)
self.navigationItem.rightBarButtonItem = UIBarButtonItem(customView: self.rightBtn!)
self.hiddenNavigationBar = false
......@@ -1029,10 +1029,10 @@ import FUSCommon
private func fus_setRightBtnEnable() {
if self.infoDict.count <= 0 {
self.rightBtn?.setTitleColor(UIColor.init(hex: "333333"), for: .normal)
self.rightBtn?.setTitleColor(UIColor.fus_textColorMedium(), for: .normal)
self.rightBtn?.isEnabled = false
} else {
self.rightBtn?.setTitleColor(UIColor.init(hex: "cccccc"), for: .normal)
self.rightBtn?.setTitleColor(UIColor.fus_theme(), for: .normal)
self.rightBtn?.isEnabled = true
}
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FUSRankProgressView.m
......@@ -42,7 +42,7 @@
[self addSubview:_bgView];
_progressView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, _bgView.width, _bgView.height)];
_progressView.backgroundColor = [UIColor colorWithHex:@"#00F088"];
_progressView.backgroundColor = [UIColor fus_themeColor];
[_bgView addSubview:_progressView];
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/FireFlyView/View/FUSFireCountHeaderView.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
......@@ -12,8 +13,12 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="83"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qsm-Fj-M09">
<rect key="frame" x="0.0" y="0.0" width="375" height="38"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0f5-iv-gge">
<rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
<rect key="frame" x="0.0" y="38" width="375" height="45"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收获萤火：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pir-bq-I8P">
<rect key="frame" x="10" y="12" width="75" height="21"/>
......@@ -63,18 +68,14 @@
<constraint firstItem="Kn6-Bn-CKo" firstAttribute="centerY" secondItem="0f5-iv-gge" secondAttribute="centerY" id="xoY-h2-kfY"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qsm-Fj-M09">
<rect key="frame" x="0.0" y="45" width="375" height="38"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="qsm-Fj-M09" firstAttribute="top" secondItem="0f5-iv-gge" secondAttribute="bottom" id="SYX-av-i04"/>
<constraint firstItem="qsm-Fj-M09" firstAttribute="top" secondItem="gO8-mc-ZGs" secondAttribute="top" id="Nbv-i0-NlY"/>
<constraint firstItem="0f5-iv-gge" firstAttribute="top" secondItem="qsm-Fj-M09" secondAttribute="bottom" id="VMm-o9-5XY"/>
<constraint firstAttribute="trailing" secondItem="0f5-iv-gge" secondAttribute="trailing" id="ZGl-t9-f1q"/>
<constraint firstItem="qsm-Fj-M09" firstAttribute="leading" secondItem="gO8-mc-ZGs" secondAttribute="leading" id="aAa-2D-gDL"/>
<constraint firstAttribute="bottom" secondItem="qsm-Fj-M09" secondAttribute="bottom" id="cRT-Ta-Eil"/>
<constraint firstItem="0f5-iv-gge" firstAttribute="top" secondItem="gO8-mc-ZGs" secondAttribute="top" id="fcv-KB-akc"/>
<constraint firstAttribute="bottom" secondItem="0f5-iv-gge" secondAttribute="bottom" id="bmJ-Ce-BXf"/>
<constraint firstAttribute="trailing" secondItem="qsm-Fj-M09" secondAttribute="trailing" id="l4x-9R-rID"/>
<constraint firstItem="0f5-iv-gge" firstAttribute="leading" secondItem="gO8-mc-ZGs" secondAttribute="leading" id="qZe-IA-sHg"/>
</constraints>
......@@ -90,6 +91,6 @@
</view>
</objects>
<resources>
<image name="myuser_zone_fire" width="128" height="128"/>
<image name="myuser_zone_fire" width="12" height="15.5"/>
</resources>
</document>
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/MyEditName/FUSMyEditNameAlertView.m
......@@ -119,6 +119,7 @@
self.inpuTextField = [[FUSTextField alloc] init];
self.inpuTextField.font = [UIFont fus_themeFont:15];
self.inpuTextField.backgroundColor = [UIColor clearColor];
self.inpuTextField.textColor = [UIColor fus_textColorRich];
self.inpuTextField.borderStyle = UITextBorderStyleNone;
[self.inpuContentView addSubview:self.inpuTextField];
[self.inpuTextField mas_makeConstraints:^(MASConstraintMaker *make) {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m
......@@ -252,7 +252,9 @@
columnNumber:(NSInteger)columnNumber
isPushToPhoto:(BOOL)isPushToPhoto
type:(FUSAssetType)type {
return [[FUSImagePickerViewController alloc] initWithMaxImagesCount:maxImagesCount columnNumber:columnNumber isPushToPhoto:isPushToPhoto type:type];;
FUSImagePickerViewController *vc = [[FUSImagePickerViewController alloc] initWithMaxImagesCount:maxImagesCount columnNumber:columnNumber isPushToPhoto:isPushToPhoto type:type];
vc.modalPresentationStyle = UIModalPresentationFullScreen;
return vc;
}
- (void)fus_showSettingMicDivideViewWithSettingItemList:(NSArray *)divideList selectedItem:(NSString *)selectedItem changedHandler:(void(^)(NSDictionary<NSString *,id> * _Nonnull selectedDict, NSString *percent))changedHandler {
......
Podfile.lock
......@@ -375,7 +375,7 @@ SPEC CHECKSUMS:
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
FUSCommon: e454e7b391ab8f8954d471eb13c11e238bfea615
FUSFoundation: 9f37f1972570f8bdcec9e4d9477b3655a58f2ff8
FUSFoundation: 866b0d08a170e406461ef7cf3990887e45898b61
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
......@@ -420,4 +420,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 0087139e98434188881e3a26f8dd1dcc9daab53d
COCOAPODS: 1.16.2
COCOAPODS: 1.15.2
Pods/Local Podspecs/FUSFoundation.podspec.json
......@@ -28,6 +28,7 @@
"FUSFoundationBundle": [
"FUSFoundation/Assets/AppDataPlists/*",
"FUSFoundation/Assets/Asset.xcassets",
"FUSFoundation/Assets/ByteDanceResources/*",
"FUSFoundation/Assets/Anims/**/*.png",
"FUSFoundation/Assets/Sounds/*",
"FUSFoundation/Assets/**/*.plist",
......
Pods/Manifest.lock
......@@ -375,7 +375,7 @@ SPEC CHECKSUMS:
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FMDB: 854a0341b4726e53276f2a8996f06f1b80f9259a
FUSCommon: e454e7b391ab8f8954d471eb13c11e238bfea615
FUSFoundation: 9f37f1972570f8bdcec9e4d9477b3655a58f2ff8
FUSFoundation: 866b0d08a170e406461ef7cf3990887e45898b61
GCDWebServer: 2c156a56c8226e2d5c0c3f208a3621ccffbe3ce4
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
......@@ -420,4 +420,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 0087139e98434188881e3a26f8dd1dcc9daab53d
COCOAPODS: 1.16.2
COCOAPODS: 1.15.2
Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
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