Skip to content

pidan / FuSiLive

Go to a project
Commit a0f2c6c2 by pierce
Options

fixed bugs

parent 29913755
Expand all
Inline Side-by-side
Showing with 222 additions and 184 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/UIImageView/UIImageView+WebImage.m
...@@ -158,6 +158,14 @@ static dispatch_queue_t get_image_clip_queue(){ ...@@ -158,6 +158,14 @@ static dispatch_queue_t get_image_clip_queue(){
return; return;
} }
// 宝箱hot 图标
if ([urlString containsString:@"/dynamic/props_hot_foot.png"]) {
self.image = [UIImage imageNamed:@"treasure_setting_hot_tag"];
return;
}
if (![urlString containsString:@"http"]) { if (![urlString containsString:@"http"]) {
urlString = [FUSConfig.sharedInstanced.pathConfigs downloadPath:urlString]; urlString = [FUSConfig.sharedInstanced.pathConfigs downloadPath:urlString];
} }
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/SegmentView/FUSSegmentControlView.m
...@@ -144,7 +144,7 @@ typedef enum :NSInteger{ ...@@ -144,7 +144,7 @@ typedef enum :NSInteger{
_underLine.clipsToBounds = YES; _underLine.clipsToBounds = YES;
//选中的下标图片 //选中的下标图片
_selectedImgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 4, 4)]; _selectedImgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 10, 3)];
_selectedImgView.centerX = _underLine.width/2.0; _selectedImgView.centerX = _underLine.width/2.0;
self.selectedImgView.y = 0; self.selectedImgView.y = 0;
_selectedImgView.contentMode = UIViewContentModeScaleAspectFit; _selectedImgView.contentMode = UIViewContentModeScaleAspectFit;
...@@ -795,7 +795,7 @@ typedef enum :NSInteger{ ...@@ -795,7 +795,7 @@ typedef enum :NSInteger{
_selectedBgImgBtn.height = (NSInteger)_selectBgView.height*0.9; _selectedBgImgBtn.height = (NSInteger)_selectBgView.height*0.9;
self.selectedImgView.y = 0; self.selectedImgView.y = 0;
[_selectedBgImgBtn setStyle:FUSButtonStyleNone]; [_selectedBgImgBtn setStyle:FUSButtonStyleNone];
_selectedBgImgBtn.backgroundColor = [UIColor whiteColor]; _selectedBgImgBtn.backgroundColor = [UIColor fus_textColorRich];
_selectedBgImgBtn.layer.cornerRadius = _selectedBgImgBtn.height/2.0; _selectedBgImgBtn.layer.cornerRadius = _selectedBgImgBtn.height/2.0;
_selectedBgImgBtn.clipsToBounds = YES; _selectedBgImgBtn.clipsToBounds = YES;
......
FuSiLive/Assets.xcassets/Common/common_selected_img.imageset/Contents.json
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "common_selected_img@2x.png", "filename" : "打钩-选中@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "common_selected_img@3x.png", "filename" : "打钩-选中@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
FuSiLive/Assets.xcassets/Common/common_unselected_img.imageset/Contents.json
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "common_unselected_img@2x.png", "filename" : "弹窗打钩-未选中@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "common_unselected_img@3x.png", "filename" : "弹窗打钩-未选中@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
FuSiLive/Assets.xcassets/Live/TreasureBox/treasure_setting_hot_tag.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "treasure_setting_hot_tag@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/live_anchor_left_right_swipe.imageset/Contents.json
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "组 1@2x.png",
"idiom" : "universal", "idiom" : "universal",
"filename" : "右滑動提示@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "组 1@3x.png",
"idiom" : "universal", "idiom" : "universal",
"filename" : "右滑動提示@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
"info" : { "info" : {
"version" : 1, "author" : "xcode",
"author" : "xcode" "version" : 1
} }
} }
\ No newline at end of file
FuSiLive/Assets.xcassets/Live/live_anchor_up_down_swipe.imageset/Contents.json
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "组 1 拷贝@2x.png",
"idiom" : "universal", "idiom" : "universal",
"filename" : "上下滑動提示@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "组 1 拷贝@3x.png",
"idiom" : "universal", "idiom" : "universal",
"filename" : "上下滑動提示@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
"info" : { "info" : {
"version" : 1, "author" : "xcode",
"author" : "xcode" "version" : 1
} }
} }
\ No newline at end of file
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
...@@ -1048,7 +1048,7 @@ ...@@ -1048,7 +1048,7 @@
// 阿拉伯帮助 // 阿拉伯帮助
#define URL_WEB_ARBIC_HELP DNS_WEB(@"/Nesting/help/l7.html") #define URL_WEB_ARBIC_HELP DNS_WEB(@"/Nesting/help/l7.html")
// 直播管理条例 // 《直播 & 社区公约》
#define URL_WEB_REGULATION DNS_WEB(@"/Nesting/rule/adminRule.html")//DNS_WEB(@"/regulation.html") #define URL_WEB_REGULATION DNS_WEB(@"/Nesting/rule/adminRule.html")//DNS_WEB(@"/regulation.html")
// 主播时长查询 // 主播时长查询
......
FuSiLive/Classes/InstantMessaging/Other/Agora/FUSAgoraSessionHelper.m
...@@ -320,9 +320,10 @@ ...@@ -320,9 +320,10 @@
*/ */
- (void)fus_conversationDidConnectAndOtherUserPictureDidExistWithUid:(NSUInteger)uid - (void)fus_conversationDidConnectAndOtherUserPictureDidExistWithUid:(NSUInteger)uid
{ {
UIView *remoteView = [[UIView alloc] init]; UIView *remoteView = [[UIView alloc] initWithFrame:UIView.fus_screenFrame];
remoteView.translatesAutoresizingMaskIntoConstraints = NO; remoteView.translatesAutoresizingMaskIntoConstraints = NO;
remoteView.contentMode = UIViewContentModeScaleAspectFit; remoteView.contentMode = UIViewContentModeScaleAspectFill;
remoteView.clipsToBounds = YES;
remoteView.tag = uid; remoteView.tag = uid;
AgoraRtcVideoCanvas *remoteViewCanvas = [[AgoraRtcVideoCanvas alloc] init]; AgoraRtcVideoCanvas *remoteViewCanvas = [[AgoraRtcVideoCanvas alloc] init];
...@@ -467,6 +468,7 @@ ...@@ -467,6 +468,7 @@
* @param size The size of video stream * @param size The size of video stream
* @param elapsed The elapsed time(ms) from the beginning of the session. * @param elapsed The elapsed time(ms) from the beginning of the session.
*/ */
- (void)rtcEngine:(AgoraRtcEngineKit *)engine firstRemoteVideoDecodedOfUid:(NSUInteger)uid size:(CGSize)size elapsed:(NSInteger)elapsed - (void)rtcEngine:(AgoraRtcEngineKit *)engine firstRemoteVideoDecodedOfUid:(NSUInteger)uid size:(CGSize)size elapsed:(NSInteger)elapsed
{ {
if (ENABLE_AGORA_LOG) { if (ENABLE_AGORA_LOG) {
...@@ -591,45 +593,7 @@ ...@@ -591,45 +593,7 @@
- (void)fus_captureHelper:(FUSStreamCaptureHelper *)helper - (void)fus_captureHelper:(FUSStreamCaptureHelper *)helper
didGetPixelBuffer:(CVPixelBufferRef)pixelBuffer didGetPixelBuffer:(CVPixelBufferRef)pixelBuffer
{ {
// if (self.delegate && [self.delegate respondsToSelector:@selector(fus_agoraSessionHelper:didRenderCapturePixelBuffer:)]) {
// [self.delegate fus_agoraSessionHelper:self didRenderCapturePixelBuffer:pixelBuffer];
// }
} }
/**
摄像头数据采集回调
@param helper Helper
@param pixelBuffer 转换好的帧数据
@param time 帧时间戳
*/
//- (void)fus_cameraCaptureHelper:(FUSCameraCaptureHelper *)helper
// didOutputSampleBuffer:(CVPixelBufferRef)pixelBuffer
// timeStamp:(CMTime)time
//{
// AgoraVideoFrame *frame = [[AgoraVideoFrame alloc] init];
// frame.textureBuf = pixelBuffer;
// frame.format = 12;
// frame.time = time;
// frame.rotation = 90;
//
// [_agoraEngine pushExternalVideoFrame:frame];
//}
/**
摄像头渲染完成一帧图片的回调
@param helper Helper
@param renderImage 渲染的图片
@param time 截取时间戳
*/
//- (void)fus_cameraCaptureHelper:(FUSCameraCaptureHelper *)helper
// didRenderCaptureImage:(UIImage *)renderImage
//{
// if (self.delegate && [self.delegate respondsToSelector:@selector(fus_agoraSessionHelper:didRenderCaptureImage:)]) {
// [self.delegate fus_agoraSessionHelper:self didRenderCaptureImage:renderImage];
// }
//}
#pragma mark - Dealloc #pragma mark - Dealloc
- (void)dealloc - (void)dealloc
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FUSVideoChatCommunicationView.m
...@@ -94,6 +94,9 @@ ...@@ -94,6 +94,9 @@
[self.videoBgView addSubview:_remoteView]; [self.videoBgView addSubview:_remoteView];
[self.videoBgView addSubview:_localView]; [self.videoBgView addSubview:_localView];
[_remoteView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.videoBgView);
}];
[_localView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTapSmallVideoViewAction:)]]; [_localView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTapSmallVideoViewAction:)]];
[_remoteView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTapSmallVideoViewAction:)]]; [_remoteView addGestureRecognizer:[[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTapSmallVideoViewAction:)]];
...@@ -200,15 +203,25 @@ ...@@ -200,15 +203,25 @@
_localView.frame = SMALL_VIDEO_FRAME(); _localView.frame = SMALL_VIDEO_FRAME();
[self.videoBgView bringSubviewToFront:_localView]; [self.videoBgView bringSubviewToFront:_localView];
[self.videoBgView sendSubviewToBack:_remoteView]; [self.videoBgView sendSubviewToBack:_remoteView];
[self.countDownView removeFromSuperview]; [self.countDownView removeFromSuperview];
self.countDownView.frame = _localView.bounds; self.countDownView.frame = _localView.bounds;
[self.localView addSubview:self.countDownView]; [self.localView addSubview:self.countDownView];
[_remoteView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(_remoteView.superview);
}];
}else { }else {
_remoteView.frame = SMALL_VIDEO_FRAME(); CGRect smallFrame = SMALL_VIDEO_FRAME();
_remoteView.frame = smallFrame;
_localView.frame = MAIN_VIDEO_FRAME; _localView.frame = MAIN_VIDEO_FRAME;
[self.videoBgView bringSubviewToFront:_remoteView]; [self.videoBgView bringSubviewToFront:_remoteView];
[self.videoBgView sendSubviewToBack:_localView]; [self.videoBgView sendSubviewToBack:_localView];
[_remoteView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(smallFrame.origin.y);
make.left.mas_equalTo(smallFrame.origin.x);
make.width.mas_equalTo(smallFrame.size.width);
make.height.mas_equalTo(smallFrame.size.height);
}];
[self.countDownView removeFromSuperview]; [self.countDownView removeFromSuperview];
self.countDownView.frame = _remoteView.bounds; self.countDownView.frame = _remoteView.bounds;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSContributeCellTableViewCell.m
...@@ -147,10 +147,17 @@ ...@@ -147,10 +147,17 @@
make.top.equalTo(self.faceImageView.mas_top).offset(2); make.top.equalTo(self.faceImageView.mas_top).offset(2);
}]; }];
[self.onlineLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel.mas_right).offset(4);
make.bottom.equalTo(self.faceImageView.mas_bottom);
make.height.mas_equalTo(18);
make.width.mas_equalTo(25);
}];
[self.vipImageView mas_makeConstraints:^(MASConstraintMaker *make) { [self.vipImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(13); make.width.height.mas_equalTo(13);
make.centerY.equalTo(self.nicknameLabel.mas_centerY); make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.nicknameLabel.mas_right).offset(4); make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}]; }];
[self.firstLoveImageView mas_makeConstraints:^(MASConstraintMaker *make) { [self.firstLoveImageView mas_makeConstraints:^(MASConstraintMaker *make) {
...@@ -160,14 +167,6 @@ ...@@ -160,14 +167,6 @@
make.left.equalTo(self.vipImageView.mas_right).offset(4); make.left.equalTo(self.vipImageView.mas_right).offset(4);
}]; }];
[self.onlineLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel);
make.bottom.equalTo(self.faceImageView.mas_bottom);
make.height.mas_equalTo(18);
make.width.mas_equalTo(25);
}];
[self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) { [self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.onlineLabel.mas_right).offset(5); make.left.equalTo(self.onlineLabel.mas_right).offset(5);
make.centerY.equalTo(self.onlineLabel.mas_centerY); make.centerY.equalTo(self.onlineLabel.mas_centerY);
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSLiveContributeView.m
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#import "FUSMyContributeView.h" #import "FUSMyContributeView.h"
#import "FUSContributeListView.h" #import "FUSContributeListView.h"
#import "FUSLiveHelper.h"
@interface FUSLiveContributeView () <UIScrollViewDelegate> @interface FUSLiveContributeView () <UIScrollViewDelegate>
@property (nonatomic, copy) NSArray<NSNumber *> *typeList; @property (nonatomic, copy) NSArray<NSNumber *> *typeList;
...@@ -70,15 +72,18 @@ ...@@ -70,15 +72,18 @@
[self.listViews setObject:listView forKey:@(type)]; [self.listViews setObject:listView forKey:@(type)];
} }
CGFloat height = 74 + UIView.fus_SafeBottom; if ([FUSLiveHelper shareInstance].liveType != FUSLiveTypeAnchor) {
self.myContributeView = [[FUSMyContributeView alloc] initWithFrame:CGRectMake(0, self.height - height, self.width, height)];
self.myContributeView.clickSendGiftHandler = ^{ CGFloat height = 74 + UIView.fus_SafeBottom;
if (weakSelf.clickSendGiftHandler) { self.myContributeView = [[FUSMyContributeView alloc] initWithFrame:CGRectMake(0, self.height - height, self.width, height)];
FUSContributeNextSendDataModel *sendData = weakSelf.listViews[@(weakSelf.segmentView.selectedType)].listModel.sendData; self.myContributeView.clickSendGiftHandler = ^{
weakSelf.clickSendGiftHandler(sendData.gid, sendData.num.integerValue); if (weakSelf.clickSendGiftHandler) {
} FUSContributeNextSendDataModel *sendData = weakSelf.listViews[@(weakSelf.segmentView.selectedType)].listModel.sendData;
}; weakSelf.clickSendGiftHandler(sendData.gid, sendData.num.integerValue);
[self addSubview:self.myContributeView]; }
};
[self addSubview:self.myContributeView];
}
} }
return self; return self;
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/FUSAudiencePopView.m
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
FUSLocalizationHelper.versionLocalString(@"贡献榜")]]; FUSLocalizationHelper.versionLocalString(@"贡献榜")]];
self.segmentView.space = 27; self.segmentView.space = 27;
self.segmentView.alignment = FUSSegmentControlAlignmentLeft; self.segmentView.alignment = FUSSegmentControlAlignmentLeft;
[self.segmentView fus_setUnderLineSelectedImage:[UIImage fus_ImageNamed:@"common_icon_segment_selected"]];
[self.contentView addSubview:self.segmentView]; [self.contentView addSubview:self.segmentView];
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceTableViewCell.m
...@@ -106,10 +106,18 @@ ...@@ -106,10 +106,18 @@
make.top.equalTo(self.faceImageView.mas_top); make.top.equalTo(self.faceImageView.mas_top);
}]; }];
[self.onlineLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.nicknameLabel.mas_right).offset(4);
make.top.equalTo(self.nicknameLabel.mas_bottom).offset(2);
make.height.mas_equalTo(18);
make.width.mas_equalTo(25);
}];
[self.vipImageView mas_makeConstraints:^(MASConstraintMaker *make) { [self.vipImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(13); make.width.height.mas_equalTo(13);
make.centerY.equalTo(self.nicknameLabel.mas_centerY); make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.nicknameLabel.mas_right).offset(4); make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}]; }];
[self.firstLoveImageView mas_makeConstraints:^(MASConstraintMaker *make) { [self.firstLoveImageView mas_makeConstraints:^(MASConstraintMaker *make) {
...@@ -119,14 +127,6 @@ ...@@ -119,14 +127,6 @@
make.left.equalTo(self.vipImageView.mas_right).offset(4); make.left.equalTo(self.vipImageView.mas_right).offset(4);
}]; }];
[self.onlineLabel 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(25);
}];
[self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) { [self.genderAndAgeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.onlineLabel.mas_right).offset(5); make.left.equalTo(self.onlineLabel.mas_right).offset(5);
make.centerY.equalTo(self.onlineLabel.mas_centerY); make.centerY.equalTo(self.onlineLabel.mas_centerY);
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftView.m
...@@ -2665,12 +2665,13 @@ static FUSLiveGiftView *giftView = nil; ...@@ -2665,12 +2665,13 @@ static FUSLiveGiftView *giftView = nil;
if (buttonIndex == 1) { if (buttonIndex == 1) {
FUSLogInfo(@"--->兑换露水"); FUSLogInfo(@"--->兑换露水");
FUSWKWebViewController *exchangeDewVC = [[FUSWKWebViewController alloc] init]; FUSHalfWebViewModel *halfWebModel = [[FUSHalfWebViewModel alloc] init];
exchangeDewVC.webUrlString = URL_WEB_DEW_EXCHANGE_DEW; halfWebModel.popupType = FUSHalfWebViewPopupTypeHalfWeb;
exchangeDewVC.needShowReload = YES; halfWebModel.url = URL_WEB_DEW_EXCHANGE_DEW_HALF;
exchangeDewVC.shouldIncludeIdentifyInfo = YES; halfWebModel.clickBlank = YES;
halfWebModel.transparency = YES;
[self.currentVC.navigationController pushViewController:exchangeDewVC animated:YES]; halfWebModel.heightR = @(82).stringValue;
[FUSLiveHelper.shareInstance.currentFunctionView fus_showHalfWebView:halfWebModel];
} }
if (buttonIndex == 0) { if (buttonIndex == 0) {
...@@ -2726,11 +2727,14 @@ static FUSLiveGiftView *giftView = nil; ...@@ -2726,11 +2727,14 @@ static FUSLiveGiftView *giftView = nil;
NSLog(@"-----%@",sender.titleLabel.text); NSLog(@"-----%@",sender.titleLabel.text);
if ([sender.titleLabel.text isEqualToString:FUSLocalizationHelper.localString(@"买入")]) { if ([sender.titleLabel.text isEqualToString:FUSLocalizationHelper.localString(@"买入")]) {
[FUSTalkingData fus_trackEvent:EVENT_LIVE_GIFTPANEL_DEWEXCHANGE]; [FUSTalkingData fus_trackEvent:EVENT_LIVE_GIFTPANEL_DEWEXCHANGE];
FUSWKWebViewController *exchangeDewVC = [[FUSWKWebViewController alloc] init];
exchangeDewVC.webUrlString = URL_WEB_DEW_EXCHANGE_DEW; FUSHalfWebViewModel *halfWebModel = [[FUSHalfWebViewModel alloc] init];
exchangeDewVC.needShowReload = YES; halfWebModel.popupType = FUSHalfWebViewPopupTypeHalfWeb;
exchangeDewVC.shouldIncludeIdentifyInfo = YES; halfWebModel.url = URL_WEB_DEW_EXCHANGE_DEW_HALF;
[self.currentVC.navigationController pushViewController:exchangeDewVC animated:YES]; halfWebModel.clickBlank = YES;
halfWebModel.transparency = YES;
halfWebModel.heightR = @(82).stringValue;
[FUSLiveHelper.shareInstance.currentFunctionView fus_showHalfWebView:halfWebModel];
}else{ }else{
if (_currentVC.navigationController) { if (_currentVC.navigationController) {
[FUSRechargeViewController fus_showRechargeViewControllerForRootVC:_currentVC from:FUSFromLiveRoom rechargePageFrom:FUSRechargePageFromOthers backHandler:^{ [FUSRechargeViewController fus_showRechargeViewControllerForRootVC:_currentVC from:FUSFromLiveRoom rechargePageFrom:FUSRechargePageFromOthers backHandler:^{
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSAgoraHelper.m
...@@ -650,7 +650,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -650,7 +650,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
[[FUSLiveHelper shareInstance].streamView.playView addSubview:_agoraOtherPreview]; [[FUSLiveHelper shareInstance].streamView.playView addSubview:_agoraOtherPreview];
if ([FUSLiveHelper shareInstance].streamView.playView) { if ([FUSLiveHelper shareInstance].streamView.playView) {
[_agoraOtherPreview mas_makeConstraints:^(MASConstraintMaker *make) { [_agoraOtherPreview mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo([FUSLiveHelper shareInstance].streamView.playView); make.edges.equalTo(_agoraOtherPreview.superview);
}]; }];
} }
[FUSLiveHelper shareInstance].streamView.playView.agoraOtherPreview = _agoraOtherPreview; [FUSLiveHelper shareInstance].streamView.playView.agoraOtherPreview = _agoraOtherPreview;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKPrepareView/FUSPKInviteAlertView.m
...@@ -177,7 +177,9 @@ ...@@ -177,7 +177,9 @@
_bgView.backgroundColor = [UIColor fus_appBGColor]; _bgView.backgroundColor = [UIColor fus_appBGColor];
[self addSubview:_bgView]; [self addSubview:_bgView];
[_bgView addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(17, 17)];
_bgView.layer.cornerRadius = 17;
_bgView.layer.masksToBounds = YES;
// 头像 // 头像
_faceImageView = [[UIImageView alloc] initWithFrame:CGRectMake(_bgView.width * 0.5 - 25 , 15, 50, 50)]; _faceImageView = [[UIImageView alloc] initWithFrame:CGRectMake(_bgView.width * 0.5 - 25 , 15, 50, 50)];
...@@ -211,11 +213,11 @@ ...@@ -211,11 +213,11 @@
// 拒绝 // 拒绝
_refuseBtn = [FUSStyleButton buttonWithType:UIButtonTypeCustom]; _refuseBtn = [FUSStyleButton buttonWithType:UIButtonTypeCustom];
_refuseBtn.frame = CGRectMake(0, _receiveBtn.bottom + 10, 150, 40); _refuseBtn.frame = CGRectMake(0, _receiveBtn.bottom + 10, 150, 40);
_refuseBtn.style = FUSButtonStyleGrayBorder; _refuseBtn.style = FUSButtonStyleBlueBorder;
_refuseBtn.centerX = _receiveBtn.centerX; _refuseBtn.centerX = _receiveBtn.centerX;
_refuseBtn.titleLabel.font = [UIFont fus_themeFont:17]; _refuseBtn.titleLabel.font = [UIFont fus_themeFont:17];
[_refuseBtn setTitle:FUSLocalizationHelper.localString(@"拒绝") forState:UIControlStateNormal]; [_refuseBtn setTitle:FUSLocalizationHelper.localString(@"拒绝") forState:UIControlStateNormal];
[_refuseBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [_refuseBtn setTitleColor:[UIColor fus_appMainColor] forState:UIControlStateNormal];
[_refuseBtn addTarget:self action:@selector(fus_clickRefuseBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [_refuseBtn addTarget:self action:@selector(fus_clickRefuseBtnAction:) forControlEvents:UIControlEventTouchUpInside];
[_bgView addSubview:_refuseBtn]; [_bgView addSubview:_refuseBtn];
...@@ -241,8 +243,11 @@ ...@@ -241,8 +243,11 @@
- (void)initRefuseUI { - (void)initRefuseUI {
_bgView = [[UIView alloc] initWithFrame:CGRectMake((UIView.fus_screenW - RECEIVE_WIDTH)/2, (UIView.fus_screenH - RECEIVE_HEIGHT) / 2, RECEIVE_WIDTH, RECEIVE_HEIGHT)]; _bgView = [[UIView alloc] initWithFrame:CGRectMake((UIView.fus_screenW - RECEIVE_WIDTH)/2, (UIView.fus_screenH - RECEIVE_HEIGHT) / 2, RECEIVE_WIDTH, RECEIVE_HEIGHT)];
_bgView.backgroundColor = [UIColor fus_appBGColor];
[self addSubview:_bgView]; [self addSubview:_bgView];
[_bgView addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(17, 17)]; _bgView.layer.cornerRadius = 17;
_bgView.layer.masksToBounds = YES;
// 头像 // 头像
_faceImageView = [[UIImageView alloc] initWithFrame:CGRectMake(_bgView.width * 0.5 - 48 , 30, 96, 39)]; _faceImageView = [[UIImageView alloc] initWithFrame:CGRectMake(_bgView.width * 0.5 - 48 , 30, 96, 39)];
_faceImageView.image = [UIImage imageNamed:@"PK_Window_PK"]; _faceImageView.image = [UIImage imageNamed:@"PK_Window_PK"];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ShareToChat/FUSLiveShareToChatView.m
...@@ -178,28 +178,29 @@ ...@@ -178,28 +178,29 @@
- (void)fus_loadDataWithPage:(NSInteger)page { - (void)fus_loadDataWithPage:(NSInteger)page {
__weak typeof(self) weakSelf = self;
[self fus_loadDatasWithPage:page [self fus_loadDatasWithPage:page
success:^(NSMutableArray<FUSLiveShareToChatModel *> *userArray, NSInteger page, NSInteger pageSize) { success:^(NSMutableArray<FUSLiveShareToChatModel *> *userArray, NSInteger page, NSInteger pageSize) {
_page = page; weakSelf.page = page;
if (page == 1) { if (page == 1) {
self.selectedCount = 0; weakSelf.selectedCount = 0;
[self.userList removeAllObjects]; [weakSelf.userList removeAllObjects];
} }
if (![NSArray isNull:userArray]) { if (![NSArray isNull:userArray]) {
[self.userList addObjectsFromArray:userArray]; [weakSelf.userList addObjectsFromArray:userArray];
} }
[self fus_updateEmptyList]; [weakSelf fus_updateEmptyList];
[self.tableView.mj_header endRefreshing]; [weakSelf.tableView.mj_header endRefreshing];
[self.tableView.mj_footer endRefreshing]; [weakSelf.tableView.mj_footer endRefreshing];
[self.tableView reloadData]; [weakSelf.tableView reloadData];
if (userArray.count <= 0) { if (userArray.count <= 0) {
[self.tableView.mj_footer endRefreshingWithNoMoreData]; [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
} }
self.isLoading = NO; weakSelf.isLoading = NO;
} failure:^(NSString *msg) { } failure:^(NSString *msg) {
self.isLoading = NO; weakSelf.isLoading = NO;
[FUSDialogView fus_showDialog:msg]; [FUSDialogView fus_showDialog:msg];
}]; }];
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ShareToChat/FUSLiveShareToChatView.xib
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<constraint firstAttribute="height" constant="44" id="EtY-v6-pwF"/> <constraint firstAttribute="height" constant="44" id="EtY-v6-pwF"/>
<constraint firstAttribute="width" constant="44" id="MB5-bT-Mkc"/> <constraint firstAttribute="width" constant="44" id="MB5-bT-Mkc"/>
</constraints> </constraints>
<state key="normal" image="common_nav_search_icon"/> <state key="normal" image="fus_home_navi_search_icon"/>
<connections> <connections>
<action selector="clickSearchBtnAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="IcC-t2-gQt"/> <action selector="clickSearchBtnAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="IcC-t2-gQt"/>
</connections> </connections>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="common_nav_search_icon" width="16" height="17.5"/> <image name="fus_home_navi_search_icon" width="16" height="17.5"/>
<image name="live_share_check_selected" width="18.5" height="18.5"/> <image name="live_share_check_selected" width="18.5" height="18.5"/>
<image name="live_share_check_unselected" width="18.5" height="18.5"/> <image name="live_share_check_unselected" width="18.5" height="18.5"/>
</resources> </resources>
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ShareToChat/Views/FUSLiveShareToChatCell.xib
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YjD-re-NGE"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YjD-re-NGE">
<rect key="frame" x="62" y="39.5" width="38" height="21"/> <rect key="frame" x="62" y="39.5" width="38" height="21"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="0.90196078431372551" green="0.90196078431372551" blue="0.90196078431372551" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_svip" translatesAutoresizingMaskIntoConstraints="NO" id="DI5-z3-n8n"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_svip" translatesAutoresizingMaskIntoConstraints="NO" id="DI5-z3-n8n">
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/WarningView/FUSRoomGuideAnchorBigFontNoticeView.xib
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <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">
<device id="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
...@@ -21,20 +21,20 @@ ...@@ -21,20 +21,20 @@
</connections> </connections>
</button> </button>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_anchor_left_right_swipe" translatesAutoresizingMaskIntoConstraints="NO" id="Btx-PE-Slb"> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_anchor_left_right_swipe" translatesAutoresizingMaskIntoConstraints="NO" id="Btx-PE-Slb">
<rect key="frame" x="107.5" y="253.5" width="160" height="160"/> <rect key="frame" x="137.5" y="283.5" width="100" height="100"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="160" id="Mau-jK-2ef"/> <constraint firstAttribute="width" constant="100" id="Mau-jK-2ef"/>
<constraint firstAttribute="width" secondItem="Btx-PE-Slb" secondAttribute="height" multiplier="1:1" id="f8Q-OJ-LwA"/> <constraint firstAttribute="width" secondItem="Btx-PE-Slb" secondAttribute="height" multiplier="1:1" id="f8Q-OJ-LwA"/>
</constraints> </constraints>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="右滑切换大字体模式" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Fl-vj-VM0"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="右滑切换大字体模式" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Fl-vj-VM0">
<rect key="frame" x="0.0" y="413.5" width="375" height="29.5"/> <rect key="frame" x="0.0" y="383.5" width="375" height="29.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="21"/> <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="21"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cdm-Im-EnB" customClass="FUSStyleButton"> <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cdm-Im-EnB" customClass="FUSStyleButton">
<rect key="frame" x="112.5" y="459" width="150" height="45"/> <rect key="frame" x="112.5" y="429" width="150" height="45"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="45" id="WMf-Kx-mAc"/> <constraint firstAttribute="height" constant="45" id="WMf-Kx-mAc"/>
<constraint firstAttribute="width" constant="150" id="nVW-e9-20Q"/> <constraint firstAttribute="width" constant="150" id="nVW-e9-20Q"/>
...@@ -69,6 +69,6 @@ ...@@ -69,6 +69,6 @@
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="live_anchor_left_right_swipe" width="117" height="124.5"/> <image name="live_anchor_left_right_swipe" width="71.5" height="75.5"/>
</resources> </resources>
</document> </document>
FuSiLive/Classes/NewLive/Main/View/FunctionView/WarningView/FUSRoomGuideSlideNoticeView.xib
...@@ -27,33 +27,33 @@ ...@@ -27,33 +27,33 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_anchor_up_down_swipe" translatesAutoresizingMaskIntoConstraints="NO" id="80Z-Nv-Yv0"> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_anchor_up_down_swipe" translatesAutoresizingMaskIntoConstraints="NO" id="80Z-Nv-Yv0">
<rect key="frame" x="127.5" y="163.5" width="120" height="120"/> <rect key="frame" x="147.5" y="183.5" width="80" height="80"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="120" id="CBX-Rg-kxq"/> <constraint firstAttribute="width" constant="80" id="CBX-Rg-kxq"/>
<constraint firstAttribute="width" secondItem="80Z-Nv-Yv0" secondAttribute="height" multiplier="1:1" id="mNA-6P-MBY"/> <constraint firstAttribute="width" secondItem="80Z-Nv-Yv0" secondAttribute="height" multiplier="1:1" id="mNA-6P-MBY"/>
</constraints> </constraints>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上下滑动切换直播间" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aWa-1H-OZJ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上下滑动切换直播间" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aWa-1H-OZJ">
<rect key="frame" x="0.0" y="283.5" width="375" height="25.5"/> <rect key="frame" x="0.0" y="263.5" width="375" height="25.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="18"/> <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_anchor_left_right_swipe" translatesAutoresizingMaskIntoConstraints="NO" id="vgY-7h-zPm"> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_anchor_left_right_swipe" translatesAutoresizingMaskIntoConstraints="NO" id="vgY-7h-zPm">
<rect key="frame" x="127.5" y="353.5" width="120" height="120"/> <rect key="frame" x="147.5" y="373.5" width="80" height="80"/>
<constraints> <constraints>
<constraint firstAttribute="width" secondItem="vgY-7h-zPm" secondAttribute="height" multiplier="1:1" id="NdC-MJ-kRs"/> <constraint firstAttribute="width" secondItem="vgY-7h-zPm" secondAttribute="height" multiplier="1:1" id="NdC-MJ-kRs"/>
<constraint firstAttribute="width" constant="120" id="wmy-Ie-UNm"/> <constraint firstAttribute="width" constant="80" id="wmy-Ie-UNm"/>
</constraints> </constraints>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="右滑进入纯观看模式" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xZ0-Ak-iUa"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="右滑进入纯观看模式" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xZ0-Ak-iUa">
<rect key="frame" x="0.0" y="473.5" width="375" height="25.5"/> <rect key="frame" x="0.0" y="453.5" width="375" height="25.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="18"/> <fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CVA-wT-bOz" customClass="FUSStyleButton"> <button hidden="YES" opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CVA-wT-bOz" customClass="FUSStyleButton">
<rect key="frame" x="112.5" y="531" width="150" height="45"/> <rect key="frame" x="112.5" y="511" width="150" height="45"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="45" id="NOZ-ax-ORX"/> <constraint firstAttribute="height" constant="45" id="NOZ-ax-ORX"/>
<constraint firstAttribute="width" constant="150" id="V7g-nq-l6P"/> <constraint firstAttribute="width" constant="150" id="V7g-nq-l6P"/>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
</objects> </objects>
<resources> <resources>
<image name="live_anchor_guide_like_btn_bg" width="47.5" height="47"/> <image name="live_anchor_guide_like_btn_bg" width="47.5" height="47"/>
<image name="live_anchor_left_right_swipe" width="117" height="124.5"/> <image name="live_anchor_left_right_swipe" width="71.5" height="75.5"/>
<image name="live_anchor_up_down_swipe" width="115" height="127"/> <image name="live_anchor_up_down_swipe" width="72.5" height="77"/>
</resources> </resources>
</document> </document>
FuSiLive/Classes/NewLive/Main/View/Push/FUSVideoStartSetScopeBtnView.m
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
self.lastStepBtn.layer.masksToBounds = YES; self.lastStepBtn.layer.masksToBounds = YES;
NSAttributedString *title1 = [[NSAttributedString alloc]initWithString:FUSLocalizationHelper.localString(@"开始即同意") attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"CCCCCC"]}]; NSAttributedString *title1 = [[NSAttributedString alloc]initWithString:FUSLocalizationHelper.localString(@"开始即同意") attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"CCCCCC"]}];
NSAttributedString *title2 = [[NSAttributedString alloc]initWithString:FUSLocalizationHelper.localString(@"直播管理条例") attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"999999"], NSUnderlineStyleAttributeName:[NSNumber numberWithInteger:NSUnderlineStyleSingle]}]; NSAttributedString *title2 = [[NSAttributedString alloc]initWithString:FUSLocalizationHelper.localString(@"《直播 & 社区公约》") attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"999999"], NSUnderlineStyleAttributeName:[NSNumber numberWithInteger:NSUnderlineStyleSingle]}];
NSMutableAttributedString *completeTitle = [[NSMutableAttributedString alloc]init]; NSMutableAttributedString *completeTitle = [[NSMutableAttributedString alloc]init];
[completeTitle appendAttributedString:title1]; [completeTitle appendAttributedString:title1];
......
FuSiLive/Classes/NewLive/Main/View/Push/FUSVideoStartSetScopeBtnView.xib
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SVE-Xv-x3z"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SVE-Xv-x3z">
<rect key="frame" x="8" y="280" width="398" height="30"/> <rect key="frame" x="8" y="280" width="398" height="30"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="10"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="10"/>
<state key="normal" title="开始即同意直播管理条例"/> <state key="normal" title="开始即同意《直播 &amp; 社区公约》"/>
<connections> <connections>
<action selector="clickProtocolBtnAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="qwW-fG-Y8D"/> <action selector="clickProtocolBtnAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="qwW-fG-Y8D"/>
</connections> </connections>
......
FuSiLive/Classes/NewLive/Main/View/StreamView/FUSByteStreamPlayView.m
...@@ -70,6 +70,11 @@ typedef id<FUSVideoPlayerProtocal> FUSStreamPlayer; ...@@ -70,6 +70,11 @@ typedef id<FUSVideoPlayerProtocal> FUSStreamPlayer;
return self; return self;
} }
- (void)layoutSubviews {
[super layoutSubviews];
[self fus_updatePlayersFrame];
}
#pragma mark - Notification #pragma mark - Notification
/** /**
注册通知 注册通知
...@@ -178,9 +183,9 @@ typedef id<FUSVideoPlayerProtocal> FUSStreamPlayer; ...@@ -178,9 +183,9 @@ typedef id<FUSVideoPlayerProtocal> FUSStreamPlayer;
} }
- (void)fus_updateAgoraView { - (void)fus_updateAgoraView {
if (self.agoraOtherPreview) { if (self.agoraOtherPreview.superview) {
[self.agoraOtherPreview mas_remakeConstraints:^(MASConstraintMaker *make) { [self.agoraOtherPreview mas_remakeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self); make.edges.equalTo(self.agoraOtherPreview.superview);
}]; }];
} }
} }
......
FuSiLive/Classes/NewsFeed/Controller/FUSNewsFeedDetailViewController.m
...@@ -326,11 +326,14 @@ ...@@ -326,11 +326,14 @@
[FUSAlertView showAlertWithTitle:FUSLocalizationHelper.localString(@"露水不足") message:nil cancelButtonTitle:nil otherButtonTitles:otherBtns clickBlock:^(NSInteger buttonIndex) { [FUSAlertView showAlertWithTitle:FUSLocalizationHelper.localString(@"露水不足") message:nil cancelButtonTitle:nil otherButtonTitles:otherBtns clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 0) { if (buttonIndex == 0) {
FUSWKWebViewController *exchangeDewVC = [[FUSWKWebViewController alloc] init];
exchangeDewVC.webUrlString = URL_WEB_DEW_EXCHANGE_DEW; FUSHalfWebViewModel *halfWebModel = [[FUSHalfWebViewModel alloc] init];
exchangeDewVC.needShowReload = YES; halfWebModel.popupType = FUSHalfWebViewPopupTypeHalfWeb;
exchangeDewVC.shouldIncludeIdentifyInfo = YES; halfWebModel.url = URL_WEB_DEW_EXCHANGE_DEW_HALF;
[[UIViewController fus_topViewController].navigationController pushViewController:exchangeDewVC animated:YES]; halfWebModel.clickBlank = YES;
halfWebModel.transparency = YES;
halfWebModel.heightR = @(82).stringValue;
[FUSLiveHelper.shareInstance.currentFunctionView fus_showHalfWebView:halfWebModel];
} else if (buttonIndex == 1) { } else if (buttonIndex == 1) {
FUSZoneTaskCenterViewController *taskCenterVC = [[FUSZoneTaskCenterViewController alloc] init]; FUSZoneTaskCenterViewController *taskCenterVC = [[FUSZoneTaskCenterViewController alloc] init];
[[UIViewController fus_topViewController].navigationController pushViewController:taskCenterVC animated:YES]; [[UIViewController fus_topViewController].navigationController pushViewController:taskCenterVC animated:YES];
......
FuSiLive/Classes/Zone/Controller/FUSReportViewController.m
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
[weakSelf fus_submitReportAnchor]; [weakSelf fus_submitReportAnchor];
}]; }];
[_reportButton setTitleColor:[UIColor colorWithHex:@"#666666"] forState:UIControlStateDisabled]; [_reportButton setTitleColor:[UIColor fus_textColorMedium] forState:UIControlStateDisabled];
[_reportButton setTitleColor:[UIColor colorWithHex:@"#58DBD7"] forState:UIControlStateNormal]; [_reportButton setTitleColor:[UIColor fus_appMainColor] forState:UIControlStateNormal];
_uploadTipsLabel.text = FUSLocalizationHelper.localString(@"上传图片证据"); _uploadTipsLabel.text = FUSLocalizationHelper.localString(@"上传图片证据");
...@@ -110,8 +110,8 @@ ...@@ -110,8 +110,8 @@
[FUSZoneHttpRequest fus_requestReportOptionsuccess:^(NSArray *dataArr) { [FUSZoneHttpRequest fus_requestReportOptionsuccess:^(NSArray *dataArr) {
_optionArr = dataArr; self.optionArr = dataArr;
[_reportOptionTableView reloadData]; [self.reportOptionTableView reloadData];
} failure:^(NSString *msg, int code) { } failure:^(NSString *msg, int code) {
...@@ -135,12 +135,12 @@ ...@@ -135,12 +135,12 @@
[FUSLoadingView fus_showProgressViewWithContentMessage:@"" withView:self.view]; [FUSLoadingView fus_showProgressViewWithContentMessage:@"" withView:self.view];
[FUSZoneHttpRequest fus_reportUserWithFid:self.fid reason:reason imageArray:_imageArray etype:self.fromType success:^{ [FUSZoneHttpRequest fus_reportUserWithFid:self.fid reason:reason imageArray:_imageArray etype:self.fromType success:^{
[FUSDialogView fus_showDialog:FUSLocalizationHelper.localString(@"举报成功")]; [FUSDialogView fus_showDialog:FUSLocalizationHelper.localString(@"举报成功")];
_reportButton.enabled = YES; self.reportButton.enabled = YES;
[FUSLoadingView fus_dismissProgressViewWithView:self.view]; [FUSLoadingView fus_dismissProgressViewWithView:self.view];
[[NSNotificationCenter defaultCenter] postNotificationName:RECHARGE_BACK_TO_CONVERSATION object:@{@"uid":_fid}]; [[NSNotificationCenter defaultCenter] postNotificationName:RECHARGE_BACK_TO_CONVERSATION object:@{@"uid":self.fid}];
[self.navigationController popViewControllerAnimated:YES]; [self.navigationController popViewControllerAnimated:YES];
} failure:^(NSString *msg, int code) { } failure:^(NSString *msg, int code) {
_reportButton.enabled = YES; self.reportButton.enabled = YES;
[FUSLoadingView fus_dismissProgressViewWithView:self.view]; [FUSLoadingView fus_dismissProgressViewWithView:self.view];
[FUSDialogView fus_showDialog:msg]; [FUSDialogView fus_showDialog:msg];
}]; }];
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
weakSelf.reportButton.enabled = YES; weakSelf.reportButton.enabled = YES;
[FUSLoadingView fus_dismissProgressViewWithView:weakSelf.view]; [FUSLoadingView fus_dismissProgressViewWithView:weakSelf.view];
[weakSelf.navigationController popViewControllerAnimated:YES]; [weakSelf.navigationController popViewControllerAnimated:YES];
[[NSNotificationCenter defaultCenter] postNotificationName:RECHARGE_BACK_TO_CONVERSATION object:@{@"uid":_fid}]; [[NSNotificationCenter defaultCenter] postNotificationName:RECHARGE_BACK_TO_CONVERSATION object:@{@"uid":self.fid}];
} failure:^(NSString *msg, int code) { } failure:^(NSString *msg, int code) {
weakSelf.reportButton.enabled = YES; weakSelf.reportButton.enabled = YES;
[FUSLoadingView fus_dismissProgressViewWithView:weakSelf.view]; [FUSLoadingView fus_dismissProgressViewWithView:weakSelf.view];
...@@ -281,13 +281,13 @@ ...@@ -281,13 +281,13 @@
if (isSuccess) { if (isSuccess) {
// 压缩图片 // 压缩图片
image = [UIImage compressImage:image targetSize:MAX_PHOTO_SZIE targetLength:MAX_PHOTO_LENGTH]; image = [UIImage compressImage:image targetSize:MAX_PHOTO_SZIE targetLength:MAX_PHOTO_LENGTH];
if (indexPath.row < _imageArray.count) { if (indexPath.row < self.imageArray.count) {
[_imageArray replaceObjectAtIndex:indexPath.row withObject:image]; [self.imageArray replaceObjectAtIndex:indexPath.row withObject:image];
}else{ }else{
[_imageArray addObject:image]; [self.imageArray addObject:image];
} }
[_collectionView reloadData]; [self.collectionView reloadData];
} }
}]; }];
} else { } else {
...@@ -297,13 +297,13 @@ ...@@ -297,13 +297,13 @@
[photoBrowerView selectImageViewToVisbleWIthOriginFrameArray:[self calculateImageOriginFrameWithPhotoBrowserView:photoBrowerView]]; [photoBrowerView selectImageViewToVisbleWIthOriginFrameArray:[self calculateImageOriginFrameWithPhotoBrowserView:photoBrowerView]];
__weak FUSPhotoBrowserView *weakPhotoBrowerView = photoBrowerView; __weak FUSPhotoBrowserView *weakPhotoBrowerView = photoBrowerView;
photoBrowerView.refreshOriginFrameBlock = ^(NSInteger currentIndex) { photoBrowerView.refreshOriginFrameBlock = ^(NSInteger currentIndex) {
[_collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:currentIndex inSection:0] atScrollPosition:(UICollectionViewScrollPositionTop) animated:NO]; [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:currentIndex inSection:0] atScrollPosition:(UICollectionViewScrollPositionTop) animated:NO];
[_collectionView layoutIfNeeded]; [self.collectionView layoutIfNeeded];
[weakPhotoBrowerView refreshOriginFrameArray:[self calculateImageOriginFrameWithPhotoBrowserView:weakPhotoBrowerView]]; [weakPhotoBrowerView refreshOriginFrameArray:[self calculateImageOriginFrameWithPhotoBrowserView:weakPhotoBrowerView]];
}; };
photoBrowerView.deleteReportImageBlock = ^(NSInteger currentIndex) { photoBrowerView.deleteReportImageBlock = ^(NSInteger currentIndex) {
[_imageArray removeObjectAtIndex:currentIndex]; [self.imageArray removeObjectAtIndex:currentIndex];
[_collectionView reloadData]; [self.collectionView reloadData];
}; };
[[UIApplication sharedApplication].keyWindow addSubview:photoBrowerView]; [[UIApplication sharedApplication].keyWindow addSubview:photoBrowerView];
} }
......
FuSiLive/Classes/Zone/Controller/FUSReportViewController.xib
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<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="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
...@@ -43,7 +44,7 @@ ...@@ -43,7 +44,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择举报类型" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PEh-DB-d6P"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择举报类型" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PEh-DB-d6P">
<rect key="frame" x="8" y="11" width="86" height="17"/> <rect key="frame" x="8" y="11" width="86" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(选填)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S9x-Di-m6Y"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="(选填)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S9x-Di-m6Y">
...@@ -77,7 +78,7 @@ ...@@ -77,7 +78,7 @@
<textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done"/> <textInputTraits key="textInputTraits" autocapitalizationType="sentences" returnKeyType="done"/>
</textView> </textView>
</subviews> </subviews>
<color key="backgroundColor" red="0.11372549019607843" green="0.11372549019607843" blue="0.14117647058823529" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="150" id="2Dm-HQ-u27"/> <constraint firstAttribute="height" constant="150" id="2Dm-HQ-u27"/>
<constraint firstAttribute="trailing" secondItem="A2y-dJ-i9V" secondAttribute="trailing" constant="10" id="Ah1-Q3-qvQ"/> <constraint firstAttribute="trailing" secondItem="A2y-dJ-i9V" secondAttribute="trailing" constant="10" id="Ah1-Q3-qvQ"/>
...@@ -92,7 +93,7 @@ ...@@ -92,7 +93,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上传图片证据(可选)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I6u-U0-WIE"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上传图片证据(可选)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I6u-U0-WIE">
<rect key="frame" x="20" y="8" width="135.5" height="18"/> <rect key="frame" x="20" y="8" width="135.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/> <fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="0.1333333333" green="0.1333333333" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="pre-C0-mlp"> <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="pre-C0-mlp">
...@@ -123,7 +124,7 @@ ...@@ -123,7 +124,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="填写详细举报原因" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ak0-w5-7fF"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="填写详细举报原因" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ak0-w5-7fF">
<rect key="frame" x="8" y="208" width="114.5" height="17"/> <rect key="frame" x="8" y="208" width="114.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/> <fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.1333333333" green="0.1333333333" blue="0.1333333333" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
</subviews> </subviews>
...@@ -144,7 +145,7 @@ ...@@ -144,7 +145,7 @@
</constraints> </constraints>
</scrollView> </scrollView>
</subviews> </subviews>
<color key="backgroundColor" red="0.066666666666666666" green="0.070588235294117646" blue="0.10196078431372549" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints> <constraints>
<constraint firstAttribute="trailing" secondItem="VNg-MC-W4t" secondAttribute="trailing" id="aRJ-bx-F7m"/> <constraint firstAttribute="trailing" secondItem="VNg-MC-W4t" secondAttribute="trailing" id="aRJ-bx-F7m"/>
<constraint firstItem="VNg-MC-W4t" firstAttribute="top" secondItem="dW9-Lw-S20" secondAttribute="top" id="aWz-Ip-H8S"/> <constraint firstItem="VNg-MC-W4t" firstAttribute="top" secondItem="dW9-Lw-S20" secondAttribute="top" id="aWz-Ip-H8S"/>
......
FuSiLive/Classes/Zone/View/FUSReportOptionTableViewCell.xib
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <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">
<device id="retina6_1" orientation="portrait" appearance="light"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<constraints> <constraints>
<constraint firstAttribute="width" constant="31" id="29R-cg-iB3"/> <constraint firstAttribute="width" constant="31" id="29R-cg-iB3"/>
</constraints> </constraints>
<state key="normal" image="baofang_rem_unSelect"/> <state key="normal" image="common_unselected_img"/>
<state key="selected" image="baofang_rem_select"/> <state key="selected" image="common_selected_img"/>
<connections> <connections>
<action selector="onClickSelect:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="BTG-Lt-aUT"/> <action selector="onClickSelect:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="BTG-Lt-aUT"/>
</connections> </connections>
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pf1-qg-p4p"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pf1-qg-p4p">
<rect key="frame" x="43" y="11.5" width="42" height="21"/> <rect key="frame" x="43" y="11.5" width="42" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
</subviews> </subviews>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</tableViewCell> </tableViewCell>
</objects> </objects>
<resources> <resources>
<image name="baofang_rem_select" width="16" height="16"/> <image name="common_selected_img" width="12" height="12"/>
<image name="baofang_rem_unSelect" width="16" height="16"/> <image name="common_unselected_img" width="12" height="12"/>
</resources> </resources>
</document> </document>
FuSiLive/FUSAPPConfigs/FUSFuSiWebViewEventHelper.m
...@@ -1035,12 +1035,22 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey"; ...@@ -1035,12 +1035,22 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey";
break; break;
case FUSJExchangeDew: case FUSJExchangeDew:
{ {
FUSWKWebViewController *exchangeDewVC = [[FUSWKWebViewController alloc] init]; if (FUSConfig.sharedInstanced.liveConfigs.isInRoom) {
exchangeDewVC.webUrlString = URL_WEB_DEW_EXCHANGE_DEW; FUSHalfWebViewModel *halfWebModel = [[FUSHalfWebViewModel alloc] init];
exchangeDewVC.needShowReload = YES; halfWebModel.popupType = FUSHalfWebViewPopupTypeHalfWeb;
exchangeDewVC.shouldIncludeIdentifyInfo = YES; halfWebModel.url = URL_WEB_DEW_EXCHANGE_DEW_HALF;
halfWebModel.clickBlank = YES;
[[UIViewController fus_topViewController].navigationController pushViewController:exchangeDewVC animated:YES]; halfWebModel.transparency = YES;
halfWebModel.heightR = @(82).stringValue;
[FUSLiveHelper.shareInstance.currentFunctionView fus_showHalfWebView:halfWebModel];
} else {
FUSWKWebViewController *exchangeDewVC = [[FUSWKWebViewController alloc] init];
exchangeDewVC.webUrlString = URL_WEB_DEW_EXCHANGE_DEW;
exchangeDewVC.needShowReload = YES;
exchangeDewVC.shouldIncludeIdentifyInfo = YES;
[[UIViewController fus_topViewController].navigationController pushViewController:exchangeDewVC animated:YES];
}
} }
break; break;
case FUSJRechargeGem: case FUSJRechargeGem:
......
FuSiLive/Resources/LocalizationString/Firefly_Arbic.strings
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
"开始即同意" = "تأكيد بالضغط على بدأ البث"; "开始即同意" = "تأكيد بالضغط على بدأ البث";
"直播管理条例" = "لوائح إدارة البث المباشر"; "《直播 & 社区公约》" = "لوائح إدارة البث المباشر";
"看全部" = "الكل"; "看全部" = "الكل";
......
FuSiLive/Resources/LocalizationString/Firefly_Chinese.strings
This source diff could not be displayed because it is too large. You can view the blob instead.
FuSiLive/Resources/LocalizationString/Firefly_Chinese_Traditional.strings
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
"开始即同意" = "開始即同意"; "开始即同意" = "開始即同意";
"直播管理条例" = "直播管理條例"; "《直播 & 社区公约》" = "《直播 & 社區公約》";
"看全部" = "看全部"; "看全部" = "看全部";
......
FuSiLive/Resources/LocalizationString/Firefly_English.strings
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
"开始即同意" = "Begin to agree"; "开始即同意" = "Begin to agree";
"直播管理条例" = "Live Management Regulations"; "《直播 & 社区公约》" = "Live Management Regulations";
"看全部" = "Look at all"; "看全部" = "Look at all";
......
FuSiLive/Resources/LocalizationString/Firefly_Indonesian.strings
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"开始即同意"="Mulailah untuk setuju"; "开始即同意"="Mulailah untuk setuju";
"直播管理条例"="Peraturan Pengelolaan Siaran Langsung"; "《直播 & 社区公约》"="Peraturan Pengelolaan Siaran Langsung";
"看全部"="Lihat semuanya"; "看全部"="Lihat semuanya";
......
FuSiLive/Resources/LocalizationString/Firefly_Japanese.strings
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"开始即同意" = "合意を始める"; "开始即同意" = "合意を始める";
"直播管理条例" = "ライブ管理規制"; "《直播 & 社区公约》" = "ライブ管理規制";
"看全部" = "全てを見る"; "看全部" = "全てを見る";
......
FuSiLive/Resources/LocalizationString/Firefly_Thai.strings
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
"开始即同意" = "เริ่มต้นเพื่อยอมรับ"; "开始即同意" = "เริ่มต้นเพื่อยอมรับ";
"直播管理条例" = "กฎระเบียบการจัดการแบบสด"; "《直播 & 社区公约》" = "กฎระเบียบการจัดการแบบสด";
"看全部" = "ดูทั้งหมด"; "看全部" = "ดูทั้งหมด";
......
FuSiLive/Resources/LocalizationString/Firefly_vietnamese.strings
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
"开始即同意" = "Bắt đầu để đồng ý "; "开始即同意" = "Bắt đầu để đồng ý ";
"直播管理条例" = "Quy định Quản lý Phát sóng Trực tiếp"; "《直播 & 社区公约》" = "Quy định Quản lý Phát sóng Trực tiếp";
"看全部" = "Tìm tất cả"; "看全部" = "Tìm tất cả";
......
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