Commit 06659a55 by pidan

修改App icon和开播端的欢迎语

parent 00a9c550

53.8 KB | W: | H:

53.1 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-1024.png
  • 2-up
  • Swipe
  • Onion skin

1.55 KB | W: | H:

1.39 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
  • 2-up
  • Swipe
  • Onion skin

3.4 KB | W: | H:

2.99 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
  • 2-up
  • Swipe
  • Onion skin

1.93 KB | W: | H:

1.72 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29 1.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29 1.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29 1.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29 1.png
  • 2-up
  • Swipe
  • Onion skin

1.93 KB | W: | H:

1.72 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29.png
  • 2-up
  • Swipe
  • Onion skin

5.01 KB | W: | H:

4.3 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
  • 2-up
  • Swipe
  • Onion skin

2.4 KB | W: | H:

2.13 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40.png
  • 2-up
  • Swipe
  • Onion skin

4.58 KB | W: | H:

3.92 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x 1.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x 1.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x 1.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x 1.png
  • 2-up
  • Swipe
  • Onion skin

4.58 KB | W: | H:

3.92 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
  • 2-up
  • Swipe
  • Onion skin

7.14 KB | W: | H:

5.99 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
  • 2-up
  • Swipe
  • Onion skin

7.14 KB | W: | H:

5.99 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
  • 2-up
  • Swipe
  • Onion skin

11.7 KB | W: | H:

9.85 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
  • 2-up
  • Swipe
  • Onion skin

4.35 KB | W: | H:

3.66 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76.png
  • 2-up
  • Swipe
  • Onion skin

9.51 KB | W: | H:

7.73 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
  • 2-up
  • Swipe
  • Onion skin

10.6 KB | W: | H:

8.78 KB | W: | H:

FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
FuSiLive/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -672,64 +672,82 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
主播进入直播间
*/
- (void)fus_enterRoom{
[FUSLiveHttpHelper fus_enterRoomWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId vdoid:[FUSLiveHelper shareInstance].streamModel.vdoid success:^(FUSRoomInfoModel *roomInfoModel,BOOL micMode, NSString *streamUrl, NSString *pkInfo) {
__weak typeof(self) weakSelf = self;
[FUSLiveHttpHelper fus_enterRoomGetPredataWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId success:^(NSDictionary *dataDict) {
if (![roomInfoModel.roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
NSArray *reminderKey = dataDict[@"reminderKey"];
NSDictionary *roomInfo = dataDict[@"roomInfo"];
if ([roomInfo[@"uid"] integerValue] != [FUSLiveHelper shareInstance].roomInfoModel.roomId.integerValue) {
FUSLogInfo(@"不是当前包房");
return ;
}
// PKview更新
if (pkInfo.integerValue == 1) { //在pk中
// 审核下不显示PK
if(FUSConfig.sharedInstanced.devConfigs.appStatus) return;
[FUSLiveHttpHelper fus_getRoomPKInfoWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId success:^(NSString *status, NSString *remainTime, NSString *winner, NSString *content,NSString *isLikePk,NSArray<FUSPKRoomPKInfoModel *> *userlistArray,NSString *matchId) {
if (![roomInfoModel.roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
FUSLogInfo(@"不是当前包房");
return ;
}
[[FUSLiveHelper shareInstance].currentFunctionView fus_setupContentViewWithStatus:status remainTime:remainTime winner:winner content:content userlistArray:userlistArray isShowEntrance:YES];
} failure:^(NSString *msg, int code) {
FUSLogInfo(@"@%",msg);
}];
}
[FUSLiveHelper shareInstance].roomInfoModel.reminderKeys = reminderKey;
[self.liveFunctionView.chatTableView fus_addEnterRoomSystemTipMessage];
[FUSLiveHelper shareInstance].streamModel.url = streamUrl;
if (![NSString isNull:[[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_IP]] &&
![NSString isNull:[[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_PORT]]) {
[[FUSLiveHelper shareInstance] streamModel].ip = [[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_IP];
[[FUSLiveHelper shareInstance] streamModel].port = [[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_PORT];
}
if ([FUSLiveHelper shareInstance].roomInfoModel) {
[[FUSLiveHelper shareInstance].roomInfoModel fus_setValueWithModel:roomInfoModel];
} else {
[FUSLiveHelper shareInstance].roomInfoModel = roomInfoModel;
}
[self.liveFunctionView fus_setupWithRoomInfoModel:roomInfoModel];
[FUSSocketMessageHelper fus_socketRoomConnectWithRoomId:roomInfoModel.roomId];
[FUSLiveHttpHelper fus_enterRoomWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId vdoid:[FUSLiveHelper shareInstance].streamModel.vdoid success:^(FUSRoomInfoModel *roomInfoModel,BOOL micMode, NSString *streamUrl, NSString *pkInfo) {
if (![roomInfoModel.roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
FUSLogInfo(@"不是当前包房");
return ;
}
// PKview更新
if (pkInfo.integerValue == 1) { //在pk中
// 审核下不显示PK
if(FUSConfig.sharedInstanced.devConfigs.appStatus) return;
[FUSLiveHttpHelper fus_getRoomPKInfoWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId success:^(NSString *status, NSString *remainTime, NSString *winner, NSString *content,NSString *isLikePk,NSArray<FUSPKRoomPKInfoModel *> *userlistArray,NSString *matchId) {
if (![roomInfoModel.roomId isEqualToString:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
FUSLogInfo(@"不是当前包房");
return ;
}
[[FUSLiveHelper shareInstance].currentFunctionView fus_setupContentViewWithStatus:status remainTime:remainTime winner:winner content:content userlistArray:userlistArray isShowEntrance:YES];
} failure:^(NSString *msg, int code) {
FUSLogInfo(@"@%",msg);
}];
}
[FUSLiveHelper shareInstance].streamModel.url = streamUrl;
if (![NSString isNull:[[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_IP]] &&
![NSString isNull:[[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_PORT]]) {
[[FUSLiveHelper shareInstance] streamModel].ip = [[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_IP];
[[FUSLiveHelper shareInstance] streamModel].port = [[NSUserDefaults standardUserDefaults] objectForKey:SOCKET_PORT];
}
if ([FUSLiveHelper shareInstance].roomInfoModel) {
[[FUSLiveHelper shareInstance].roomInfoModel fus_setValueWithModel:roomInfoModel];
} else {
[FUSLiveHelper shareInstance].roomInfoModel = roomInfoModel;
}
[self.liveFunctionView fus_setupWithRoomInfoModel:roomInfoModel];
[FUSSocketMessageHelper fus_socketRoomConnectWithRoomId:roomInfoModel.roomId];
if ([roomInfoModel.livestate intValue] == 1) {
[[NSNotificationCenter defaultCenter] postNotificationName:FUSLiveNotificationKeys.fus_LIVE_STATE_CHANGE object:@"1"];
}
} failure:^(NSDictionary *errorDict, NSString *msg, int code) {
[FUSDialogView fus_showDialog:msg];
}];
if ([roomInfoModel.livestate intValue] == 1) {
[[NSNotificationCenter defaultCenter] postNotificationName:FUSLiveNotificationKeys.fus_LIVE_STATE_CHANGE object:@"1"];
}
} failure:^(NSDictionary *errorDict, NSString *msg, int code) {
// 拉取在线用户列表
[FUSLiveHttpHelper fus_requestRoomOnlineUsersWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId count:@"0" success:^(NSArray *usersArr) {
[self.liveFunctionView fus_setupOnlineUsers:usersArr];
} failure:^(NSString *msg, int code) {
FUSLogError(@"拉取在线用户列表失败:%@",msg);
}];
} failure:^(NSDictionary * _Nonnull errorDict, NSString * _Nonnull msg, int code) {
[FUSDialogView fus_showDialog:msg];
FUSLogVerbose(@"");
}];
// 拉取在线用户列表
[FUSLiveHttpHelper fus_requestRoomOnlineUsersWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId count:@"0" success:^(NSArray *usersArr) {
[self.liveFunctionView fus_setupOnlineUsers:usersArr];
} failure:^(NSString *msg, int code) {
FUSLogError(@"拉取在线用户列表失败");
}];
}
......
......@@ -37,7 +37,7 @@
-(void)fus_createUI{
self.backgroundColor = [UIColor whiteColor];
NSString *imagePath = [[NSBundle mainBundle] pathForResource:@"fus_startSplash_logo_image_1" ofType:@"png"];
NSString *imagePath = [[NSBundle mainBundle] pathForResource:@"fus_startSplash_logo_image_2" ofType:@"png"];
UIImage *image = [UIImage imageWithContentsOfFile:imagePath];
self.logoImgView = [[UIImageView alloc] initWithImage:image];
[self addSubview:self.logoImgView];
......
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