Skip to content

pidan / FuSiLive

Go to a project
Commit 90d76701 by pierce
Options

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

parents 1e153f91 4a6e2900
Expand all
Inline Side-by-side
Showing with 274 additions and 137 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWKWebView.m
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
if (![_webUrlString containsString:@"appname="]) { if (![_webUrlString containsString:@"appname="]) {
// urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"appname":NSBundle.mainBundle.bundleIdentifier}]; // urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"appname":NSBundle.mainBundle.bundleIdentifier}];
//TODO: 暂时先改成这个，正式服使用上面那个 //TODO: 暂时先改成这个，正式服使用上面那个
urlString = @"com.fusi.live.ios"; urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"appname":@"com.fusi.live.ios"}];
} }
// 增加安全区高度数据注入 // 增加安全区高度数据注入
urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"safeAreaTop":@((NSInteger)((UIView.fus_SafeTop / UIView.fus_screenH) * 100))}]; urlString = [FUSHttpManager fus_getHttUrl:urlString params:@{@"safeAreaTop":@((NSInteger)((UIView.fus_SafeTop / UIView.fus_screenH) * 100))}];
......
FuSiLive.xcodeproj/project.pbxproj
...@@ -54,6 +54,8 @@ ...@@ -54,6 +54,8 @@
00A4529B2C2FEDB2004EC526 /* FUSControllerPushHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A4529A2C2FEDB2004EC526 /* FUSControllerPushHelper.m */; }; 00A4529B2C2FEDB2004EC526 /* FUSControllerPushHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A4529A2C2FEDB2004EC526 /* FUSControllerPushHelper.m */; };
00A6F0982C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A6F0972C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m */; }; 00A6F0982C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A6F0972C2EAAF700162BA0 /* FUSVideoOfficialEndV2View.m */; };
00B48E072C213CCD001E4872 /* FUSSettingInitDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00B48E062C213CCD001E4872 /* FUSSettingInitDataModel.m */; }; 00B48E072C213CCD001E4872 /* FUSSettingInitDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00B48E062C213CCD001E4872 /* FUSSettingInitDataModel.m */; };
00CABAC72C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 00CABAC62C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.m */; };
00CABAC92C32BD8700D269B7 /* img_novaList_cell_new_animation.webp in Resources */ = {isa = PBXBuildFile; fileRef = 00CABAC82C32BD8700D269B7 /* img_novaList_cell_new_animation.webp */; };
BE02D73D2C255ECA006FD462 /* FUSLiveFunctionViewHalfWebManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE02D73C2C255ECA006FD462 /* FUSLiveFunctionViewHalfWebManager.swift */; }; BE02D73D2C255ECA006FD462 /* FUSLiveFunctionViewHalfWebManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE02D73C2C255ECA006FD462 /* FUSLiveFunctionViewHalfWebManager.swift */; };
BE02EA292C21C3360092264C /* VELPictureInPictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE02EA282C21C3360092264C /* VELPictureInPictureController.m */; }; BE02EA292C21C3360092264C /* VELPictureInPictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = BE02EA282C21C3360092264C /* VELPictureInPictureController.m */; };
BE0395D12C132E0F003EB21B /* BEComposerNodeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BE0395BA2C132E0F003EB21B /* BEComposerNodeModel.m */; }; BE0395D12C132E0F003EB21B /* BEComposerNodeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BE0395BA2C132E0F003EB21B /* BEComposerNodeModel.m */; };
...@@ -1493,6 +1495,9 @@ ...@@ -1493,6 +1495,9 @@
00B48E052C213CCD001E4872 /* FUSSettingInitDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSSettingInitDataModel.h; sourceTree = "<group>"; }; 00B48E052C213CCD001E4872 /* FUSSettingInitDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSSettingInitDataModel.h; sourceTree = "<group>"; };
00B48E062C213CCD001E4872 /* FUSSettingInitDataModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSSettingInitDataModel.m; sourceTree = "<group>"; }; 00B48E062C213CCD001E4872 /* FUSSettingInitDataModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSSettingInitDataModel.m; sourceTree = "<group>"; };
00B8649F2C2AF52B0061F6FF /* FuSiLive.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FuSiLive.entitlements; sourceTree = "<group>"; }; 00B8649F2C2AF52B0061F6FF /* FuSiLive.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = FuSiLive.entitlements; sourceTree = "<group>"; };
00CABAC52C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FFHomeListNovaListCollectionViewSmallCell.h; sourceTree = "<group>"; };
00CABAC62C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FFHomeListNovaListCollectionViewSmallCell.m; sourceTree = "<group>"; };
00CABAC82C32BD8700D269B7 /* img_novaList_cell_new_animation.webp */ = {isa = PBXFileReference; lastKnownFileType = file; path = img_novaList_cell_new_animation.webp; sourceTree = "<group>"; };
6DFACA8A2DF329F3E7F7B2FF /* Pods-FuSiLive.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FuSiLive.debug.xcconfig"; path = "Target Support Files/Pods-FuSiLive/Pods-FuSiLive.debug.xcconfig"; sourceTree = "<group>"; }; 6DFACA8A2DF329F3E7F7B2FF /* Pods-FuSiLive.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FuSiLive.debug.xcconfig"; path = "Target Support Files/Pods-FuSiLive/Pods-FuSiLive.debug.xcconfig"; sourceTree = "<group>"; };
AD8AA4E093E761AA637769AD /* Pods-FuSiLive.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FuSiLive.release.xcconfig"; path = "Target Support Files/Pods-FuSiLive/Pods-FuSiLive.release.xcconfig"; sourceTree = "<group>"; }; AD8AA4E093E761AA637769AD /* Pods-FuSiLive.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FuSiLive.release.xcconfig"; path = "Target Support Files/Pods-FuSiLive/Pods-FuSiLive.release.xcconfig"; sourceTree = "<group>"; };
BE02D73C2C255ECA006FD462 /* FUSLiveFunctionViewHalfWebManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FUSLiveFunctionViewHalfWebManager.swift; sourceTree = "<group>"; }; BE02D73C2C255ECA006FD462 /* FUSLiveFunctionViewHalfWebManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FUSLiveFunctionViewHalfWebManager.swift; sourceTree = "<group>"; };
...@@ -3886,6 +3891,7 @@ ...@@ -3886,6 +3891,7 @@
00A36A462C1D89AF004D28FA /* NovaList */ = { 00A36A462C1D89AF004D28FA /* NovaList */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
00CABAC42C32A25000D269B7 /* cell */,
00A36A4F2C1D8A55004D28FA /* Model */, 00A36A4F2C1D8A55004D28FA /* Model */,
00A36A4B2C1D8A1C004D28FA /* ViewModel */, 00A36A4B2C1D8A1C004D28FA /* ViewModel */,
00A36A4A2C1D8A16004D28FA /* View */, 00A36A4A2C1D8A16004D28FA /* View */,
...@@ -3924,6 +3930,15 @@ ...@@ -3924,6 +3930,15 @@
path = Model; path = Model;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
00CABAC42C32A25000D269B7 /* cell */ = {
isa = PBXGroup;
children = (
00CABAC52C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.h */,
00CABAC62C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.m */,
);
path = cell;
sourceTree = "<group>";
};
BE0395B82C132E0F003EB21B /* include */ = { BE0395B82C132E0F003EB21B /* include */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -8588,6 +8603,7 @@ ...@@ -8588,6 +8603,7 @@
BEDC66462C09DAE700505F76 /* live_link_micro_request_14.png */, BEDC66462C09DAE700505F76 /* live_link_micro_request_14.png */,
BEDC66472C09DAE700505F76 /* live_linkmic_bgImg.png */, BEDC66472C09DAE700505F76 /* live_linkmic_bgImg.png */,
BEDC66482C09DAE700505F76 /* live_treasure_box_bg_img.png */, BEDC66482C09DAE700505F76 /* live_treasure_box_bg_img.png */,
00CABAC82C32BD8700D269B7 /* img_novaList_cell_new_animation.webp */,
); );
path = live; path = live;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -8908,6 +8924,7 @@ ...@@ -8908,6 +8924,7 @@
BEDC6F842C09DAE900505F76 /* login_start_background_zh_image.png in Resources */, BEDC6F842C09DAE900505F76 /* login_start_background_zh_image.png in Resources */,
00A0C5632C2676010044A41D /* FUSLoginPhoneViewController.xib in Resources */, 00A0C5632C2676010044A41D /* FUSLoginPhoneViewController.xib in Resources */,
BEDC6ED72C09DAE800505F76 /* dew_sky_award_1.png in Resources */, BEDC6ED72C09DAE800505F76 /* dew_sky_award_1.png in Resources */,
00CABAC92C32BD8700D269B7 /* img_novaList_cell_new_animation.webp in Resources */,
BEDC6F372C09DAE900505F76 /* box_00008.png in Resources */, BEDC6F372C09DAE900505F76 /* box_00008.png in Resources */,
BEDC6F4E2C09DAE900505F76 /* live_link_micro_request_14.png in Resources */, BEDC6F4E2C09DAE900505F76 /* live_link_micro_request_14.png in Resources */,
BED0FBAE2C0C49CA0017B285 /* FUSChatSettingHeaderView.xib in Resources */, BED0FBAE2C0C49CA0017B285 /* FUSChatSettingHeaderView.xib in Resources */,
...@@ -9478,6 +9495,7 @@ ...@@ -9478,6 +9495,7 @@
BED0F8B92C0C49C80017B285 /* FUSBaoFangControllerHelper.m in Sources */, BED0F8B92C0C49C80017B285 /* FUSBaoFangControllerHelper.m in Sources */,
00A2D4A62C1AEFBF00A15ECA /* FUSTopRightBadgeButton.m in Sources */, 00A2D4A62C1AEFBF00A15ECA /* FUSTopRightBadgeButton.m in Sources */,
BED0FB732C0C49CA0017B285 /* FUSExchangeDewModel.m in Sources */, BED0FB732C0C49CA0017B285 /* FUSExchangeDewModel.m in Sources */,
00CABAC72C32A25A00D269B7 /* FFHomeListNovaListCollectionViewSmallCell.m in Sources */,
BE0398302C134566003EB21B /* AnimationFontProvider.swift in Sources */, BE0398302C134566003EB21B /* AnimationFontProvider.swift in Sources */,
BED0F9AD2C0C49C90017B285 /* FUSVideoChatStateView.m in Sources */, BED0F9AD2C0C49C90017B285 /* FUSVideoChatStateView.m in Sources */,
00A44A5D2C2BC14E003FDF44 /* FUSSingleLiveRecordV2TableViewCell.m in Sources */, 00A44A5D2C2BC14E003FDF44 /* FUSSingleLiveRecordV2TableViewCell.m in Sources */,
......
FuSiLive/Assets.xcassets/fusiPart/FFMove/Contents.json 0 → 100644
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/fusiPart/FFMove/home_list_vchat_remark_star_half.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "home_list_vchat_remark_star_half@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "home_list_vchat_remark_star_half@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/fusiPart/FFMove/home_list_vchat_remark_star_light.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "home_list_vchat_remark_star_light@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "home_list_vchat_remark_star_light@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/fusiPart/FFMove/home_list_vchat_remark_star_whole_gray.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "home_list_vchat_remark_star_whole_gray@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "home_list_vchat_remark_star_whole_gray@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/fusiPart/FFMove/home_nova_list_previewMark_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "home_nova_list_previewMark_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "home_nova_list_previewMark_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m
...@@ -21,41 +21,45 @@ ...@@ -21,41 +21,45 @@
-(void)fus_pushToServiceControllerWithUID:(NSString *)uid face:(NSString *)facePath nikename:(NSString *)nikename welcome:(NSString *)welcomeStr animate:(BOOL)animate{ -(void)fus_pushToServiceControllerWithUID:(NSString *)uid face:(NSString *)facePath nikename:(NSString *)nikename welcome:(NSString *)welcomeStr animate:(BOOL)animate{
UIViewController *vc = nil; UIViewController *vc = nil;
FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:![NSString isNull:uid] ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
serviceChat.isServiceAccount = YES; // 测试原生客服
if (![NSString isNull:welcomeStr]) { // FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:![NSString isNull:uid] ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
serviceChat.welcomeStr = welcomeStr;
}
vc = serviceChat;
// if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 1) {
//
// if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
//
// FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:uid ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
// serviceChat.isServiceAccount = YES; // serviceChat.isServiceAccount = YES;
// if (![NSString isNull:welcomeStr]) { // if (![NSString isNull:welcomeStr]) {
// serviceChat.welcomeStr = welcomeStr; // serviceChat.welcomeStr = welcomeStr;
// } // }
// vc = serviceChat; // vc = serviceChat;
// } else {
// // 普通调起客服流程
// FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init]; if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 1) {
// NSString *webURL = FUSLocalizationHelper.isArbicLanguage ? URL_WEB_ARBIC_HELP : URL_WEB_HELP;
// webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID]; if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
// vc = webVC;
// } FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:uid ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
// }else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) { serviceChat.isServiceAccount = YES;
// if (![NSString isNull:welcomeStr]) {
// FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init]; serviceChat.welcomeStr = welcomeStr;
// NSString *webURL = [FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.url; }
// webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID]; vc = serviceChat;
// vc = webVC; } else {
// }
// NSArray *viewControllers = self.viewControllers; FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
// UIViewController *viewVC = [viewControllers lastObject]; NSString *webURL = FUSLocalizationHelper.isArbicLanguage ? URL_WEB_ARBIC_HELP : URL_WEB_HELP;
// if ([viewVC isKindOfClass:[FUSSingleChatViewController class]]){ webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
// return; vc = webVC;
// } }
}else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) {
FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
NSString *webURL = [FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.url;
webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
vc = webVC;
}
NSArray *viewControllers = self.viewControllers;
UIViewController *viewVC = [viewControllers lastObject];
if ([viewVC isKindOfClass:[FUSSingleChatViewController class]]){
return;
}
[self pushViewController:vc animated:YES]; [self pushViewController:vc animated:YES];
} }
......
FuSiLive/Classes/FusiVersionFeature/Others/FUSLiveStateAnimationView.h
...@@ -12,8 +12,14 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -12,8 +12,14 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSLiveStateAnimationView : UIImageView @interface FUSLiveStateAnimationView : UIImageView
/// // 房间类型（0：视频直播房、2：聊天直播房,） /// 直播状态（0：未在直播、1：视频直播中、2：语音直播中）
@property (nonatomic, assign) NSInteger roomType; @property (nonatomic, assign) NSInteger liveState;
/// 視訊状态（-1：離線中、0：空閒中、2：視訊中）
@property (nonatomic, assign) NSInteger videoState;
/// 高亮时开始播放动画
@property (nonatomic, assign) BOOL startAnimWhenHighlighted;
@end @end
......
FuSiLive/Classes/FusiVersionFeature/Others/FUSLiveStateAnimationView.m
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
// 聊天室动画 // 聊天室动画
@property (nonatomic, strong) NSMutableArray<UIImage *> *chatingRoomLivingAniImageArr; @property (nonatomic, strong) NSMutableArray<UIImage *> *chatingRoomLivingAniImageArr;
/// 空闲
@property (nonatomic, strong) NSMutableArray<UIImage *> *watingAniImageArr;
/// 当前动画状态 /// 当前动画状态
@property (nonatomic, assign) BOOL currentAnimate; @property (nonatomic, assign) BOOL currentAnimate;
...@@ -36,6 +39,8 @@ ...@@ -36,6 +39,8 @@
{ {
self = [super initWithFrame:frame]; self = [super initWithFrame:frame];
if (self) { if (self) {
_liveState = 0;
_videoState = -1;
[self fus_createUI]; [self fus_createUI];
} }
return self; return self;
...@@ -47,6 +52,15 @@ ...@@ -47,6 +52,15 @@
self.currentAnimate = NO; self.currentAnimate = NO;
} }
- (void)setHighlighted:(BOOL)highlighted
{
[super setHighlighted:highlighted];
if (self.startAnimWhenHighlighted) {
[self startAnimating];
}
}
- (void)startAnimating{ - (void)startAnimating{
[super startAnimating]; [super startAnimating];
self.currentAnimate = YES; self.currentAnimate = YES;
...@@ -57,19 +71,36 @@ ...@@ -57,19 +71,36 @@
self.currentAnimate = NO; self.currentAnimate = NO;
} }
-(void)fus_reloadAnimateState{
#pragma mark --- getter and setter self.hidden = NO;
- (void)setRoomType:(NSInteger)roomType{
_roomType = roomType;
[super stopAnimating]; [super stopAnimating];
if (roomType == 2) { if (_liveState) {
self.animationImages = self.livingAniImage;
}else if (_videoState == -1){
self.hidden = YES;
}else if (_videoState == 0) {
self.animationImages = self.watingAniImageArr;
}else if (_videoState == 2){
self.animationImages = self.chatingRoomLivingAniImageArr; self.animationImages = self.chatingRoomLivingAniImageArr;
}else { }else {
self.animationImages = self.livingAniImage; self.hidden = YES;
} }
if (!self.hidden) {
if (self.currentAnimate) { if (self.currentAnimate) {
[super startAnimating]; [super startAnimating];
} }
}
}
#pragma mark --- getter and setter
- (void)setLiveState:(NSInteger)liveState{
_liveState = liveState;
[self fus_reloadAnimateState];
}
- (void)setVideoState:(NSInteger)videoState{
_videoState = videoState;
[self fus_reloadAnimateState];
} }
- (NSMutableArray *)livingAniImage { - (NSMutableArray *)livingAniImage {
...@@ -102,4 +133,18 @@ ...@@ -102,4 +133,18 @@
return _chatingRoomLivingAniImageArr; return _chatingRoomLivingAniImageArr;
} }
- (NSMutableArray<UIImage *> *)watingAniImageArr{
if (!_watingAniImageArr) {
_watingAniImageArr = [[NSMutableArray alloc] init];
for (int i = 0; i < 17; i ++) {
UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"baofang_icon_video_onlive_%d",i]];
if (image) {
[_watingAniImageArr addObject:image];
}
}
}
return _watingAniImageArr;
}
@end @end
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ShowbroadcastGuide/FUSShowBroadcastGuideAlertView.m
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
if ([model.haveMC integerValue] == 1) { if ([model.haveMC integerValue] == 1) {
self.liveStateView.hidden = NO; self.liveStateView.hidden = NO;
[self.liveStateView startAnimating]; [self.liveStateView startAnimating];
self.liveStateView.roomType = 0; self.liveStateView.liveState = 1;
}else { }else {
self.liveStateView.hidden = YES; self.liveStateView.hidden = YES;
} }
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageView.m
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#import <Masonry/Masonry.h> #import <Masonry/Masonry.h>
#import "FUSCacheDataShare.h" #import "FUSCacheDataShare.h"
#import "FUSBaoFangHttpHelper.h" #import "FUSBaoFangHttpHelper.h"
#import "FUSControllerPushHelper.h"
#import "FUSZhaiXinSettingPopView.h"
// 导入通知框架 // 导入通知框架
#import <UserNotifications/UserNotifications.h> #import <UserNotifications/UserNotifications.h>
...@@ -165,6 +167,8 @@ ...@@ -165,6 +167,8 @@
[notificationRemindCloseBtn addTarget:self action:@selector(fus_notificationRemindCloseBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside]; [notificationRemindCloseBtn addTarget:self action:@selector(fus_notificationRemindCloseBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[notificationOpenBtn addTarget:self action:@selector(fus_notificationOpenBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside]; [notificationOpenBtn addTarget:self action:@selector(fus_notificationOpenBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[self.serviceBtn addTarget:self action:@selector(fus_serviceBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[self.settingBtn addTarget:self action:@selector(fus_settingBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
} }
-(void)fus_createMessageColumn{ -(void)fus_createMessageColumn{
...@@ -310,6 +314,12 @@ ...@@ -310,6 +314,12 @@
} }
#pragma mark --- button did clicked #pragma mark --- button did clicked
-(void)fus_serviceBtnDidClicked:(UIButton *)btn{
[self.parentController.navigationController fus_pushToServiceControllerWithAnimate:YES];
}
-(void)fus_settingBtnDidClicked:(UIButton *)btn{
[FUSZhaiXinSettingPopView fus_showFUSZhaiXinSettingPopView];
}
-(void)fus_notificationRemindCloseBtnDidClicked:(UIButton *)btn{ -(void)fus_notificationRemindCloseBtnDidClicked:(UIButton *)btn{
self.notificationRemindView.hidden = YES; self.notificationRemindView.hidden = YES;
self.isUserCloseNotificationRemind = YES; self.isUserCloseNotificationRemind = YES;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/cell/FUSHomeAnchorListSmallCell.h
...@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSHomeAnchorListSmallCell : FUSBaofangBaseHomeLiveCell @interface FUSHomeAnchorListSmallCell : FUSBaofangBaseHomeLiveCell
/// 赋值这个的话就会变成新星模式 /// 赋值这个的话就会变成新星模式
@property (nonatomic, strong) FUSHomeNovaListModel *novaModel; //@property (nonatomic, strong) FUSHomeNovaListModel *novaModel;
@end @end
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/cell/FUSHomeAnchorListSmallCell.m
...@@ -107,19 +107,19 @@ ...@@ -107,19 +107,19 @@
} }
#pragma mark --- getter and setter #pragma mark --- getter and setter
- (void)setNovaModel:(FUSHomeNovaListModel *)novaModel{ //- (void)setNovaModel:(FUSHomeNovaListModel *)novaModel{
_novaModel = novaModel; // _novaModel = novaModel;
//
self.nickNameLabel.text = novaModel.nickname; // self.nickNameLabel.text = novaModel.nickname;
if ([NSString isNull:novaModel.addr]) { // if ([NSString isNull:novaModel.addr]) {
self.locationBtn.hidden = YES; // self.locationBtn.hidden = YES;
}else { // }else {
self.locationBtn.hidden = NO; // self.locationBtn.hidden = NO;
[self.locationBtn setTitle:novaModel.addr forState:UIControlStateNormal]; // [self.locationBtn setTitle:novaModel.addr forState:UIControlStateNormal];
} // }
self.hotNumBtn.hidden = YES; // self.hotNumBtn.hidden = YES;
[self.bgImageView setWebImageWithSubURLString:novaModel.cover placeholder:[UIImage fus_defaultIcon]]; // [self.bgImageView setWebImageWithSubURLString:novaModel.cover placeholder:[UIImage fus_defaultIcon]];
} //}
- (void)setModel:(FUSBaoFangAnchorModel *)model{ - (void)setModel:(FUSBaoFangAnchorModel *)model{
[super setModel:model]; [super setModel:model];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/FUSHomeNovaListViewController.m
...@@ -124,31 +124,6 @@ ...@@ -124,31 +124,6 @@
[self.serviceBtn addTarget:self action:@selector(fus_serviceBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside]; [self.serviceBtn addTarget:self action:@selector(fus_serviceBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[self.rankBtn addTarget:self action:@selector(fus_rankBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside]; [self.rankBtn addTarget:self action:@selector(fus_rankBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
// CGFloat btn_w = 40;
//
// //右按钮，皇冠
// _rightBtn = [UIButton buttonWithType:UIButtonTypeCustom];
// _rightBtn.frame = CGRectMake(self.segmentView.width - btn_w, 0, btn_w, btn_w);
//
// YYAnimatedImageView *boardBtnImgView = [[YYAnimatedImageView alloc] initWithFrame:CGRectMake(0, 0, 24, 24)];
// boardBtnImgView.image = [HomeListBundle themeFestivalImageWebpNamed:@"img_roomlist_board_animation"];
//
// [_rightBtn addSubview:boardBtnImgView];
// boardBtnImgView.center = CGPointMake(_rightBtn.width/2, _rightBtn.height/2);
//
// [_rightBtn addTarget:self action:@selector(pushBoardViewController) forControlEvents:UIControlEventTouchUpInside];
// _rightBtn.contentMode = UIViewContentModeCenter;
// [self.segmentView addSubview:_rightBtn];
//
// self.serviceBtn = [UIButton buttonWithType:UIButtonTypeCustom];
// self.serviceBtn.frame = CGRectMake(_rightBtn.left - btn_w, _rightBtn.top, btn_w, btn_w);
// [self.serviceBtn setImage:[FFViewSetBundle animatedImageFor:@"service_icon_" duration:1.5] forState:UIControlStateNormal];
// [self.segmentView addSubview:self.serviceBtn];
// [self.serviceBtn.imageView mas_makeConstraints:^(MASConstraintMaker *make) {
// make.size.mas_equalTo(CGSizeMake(26, 26));
// }];
// [self.serviceBtn addTarget:self action:@selector(pushServiceViewController) forControlEvents:UIControlEventTouchUpInside];
} }
-(void)ffsetupBroadcastView{ -(void)ffsetupBroadcastView{
...@@ -275,6 +250,15 @@ ...@@ -275,6 +250,15 @@
[self.navView addSubview:titleLabel]; [self.navView addSubview:titleLabel];
} }
#pragma mark --------- method
-(void)ffreloadFollowAllStatus{
if (self.segmentIndex == 0) {
self.followAllBtn.enabled = !self.timeSortView.isFollowAll;
}else if (self.segmentIndex == 1) {
self.followAllBtn.enabled = !self.hotSortView.isFollowAll;
}
}
#pragma mark --- button did clicked #pragma mark --- button did clicked
-(void)fus_serviceBtnDidClicked:(UIButton *)btn{ -(void)fus_serviceBtnDidClicked:(UIButton *)btn{
[self.navigationController fus_pushToServiceControllerWithAnimate:YES]; [self.navigationController fus_pushToServiceControllerWithAnimate:YES];
...@@ -289,60 +273,6 @@ ...@@ -289,60 +273,6 @@
} }
#pragma mark --------- method
-(void)ffreloadFollowAllStatus{
if (self.segmentIndex == 0) {
self.followAllBtn.enabled = !self.timeSortView.isFollowAll;
}else if (self.segmentIndex == 1) {
self.followAllBtn.enabled = !self.hotSortView.isFollowAll;
}
}
#pragma mark --------- button did clicked
//-(void)pushServiceViewController{
// UIViewController *vc = [Bifrost handleURL:SingleChatRoute.serviceChatVC];
// [self.navigationController pushViewController:vc animated:YES];
//}
//
///**
// push榜单控制器
// */
//- (void)pushBoardViewController {
//
// FFWebViewController *boardVc = [[FFWebViewController alloc] init];
//
// UIView *loadingView = [boardVc.webView fus_showLoadingWithType:FFloadingTypeGrayColor];
// boardVc.webView.loadingStateChangedHandler = ^(BOOL isLoading, BOOL isSucceed) {
// if (!isLoading) {
// [loadingView fus_hideLoading];
// }
// };
//
// if (!BFModule(CommonService).application.checkVersionStatus) {
// boardVc.webUrlString = FFWebURL.checkBoardUrl;
// } else {
//
// NSString *liveBoardUrl = [NSString stringWithFormat:@"%@?isSpecialUser=%d",FFHomeListWebUrl.liveBoardUrl,BFModule(CommonService).oc_settingConfig.specialUserMark];
// boardVc.webUrlString = liveBoardUrl;
// }
//
// boardVc.hideWebTitleBar = YES;
// boardVc.hidesBottomBarWhenPushed = YES;
// [self.navigationController pushViewController:boardVc animated:YES];
// if (!BFModule(CommonService).application.checkVersionStatus) {
// __weak typeof(boardVc) weakBoardVc = boardVc;
// boardVc.webView.loadingStateChangedHandler = ^(BOOL isLoading, BOOL isSucceed) {
//
// if (!isSucceed) {
// return;
// }
//
// weakBoardVc.closeBtn.hidden = YES;
// weakBoardVc.showBackBtn = NO;
// };
// }
//}
-(void)follwAllBtnDidClicked:(UIButton *)btn{ -(void)follwAllBtnDidClicked:(UIButton *)btn{
if (self.segmentIndex == 0) { if (self.segmentIndex == 0) {
......
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/View/FUSHomeNovaListCollectionView.m
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#import "FUSHomeNovaListCollectionView.h" #import "FUSHomeNovaListCollectionView.h"
#import <Masonry/Masonry.h> #import <Masonry/Masonry.h>
#import "FUSHomeAnchorListSmallCell.h" #import "FFHomeListNovaListCollectionViewSmallCell.h"
#import "FUSDefine.h" #import "FUSDefine.h"
#import "FUSBaoFangHttpHelper.h" #import "FUSBaoFangHttpHelper.h"
#import <YYKit/YYKit.h> #import <YYKit/YYKit.h>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
make.edges.equalTo(self); make.edges.equalTo(self);
}]; }];
[self.collectionView registerClass:[FUSHomeAnchorListSmallCell class] forCellWithReuseIdentifier:@"FUSHomeAnchorListSmallCell"]; [self.collectionView registerClass:[FFHomeListNovaListCollectionViewSmallCell class] forCellWithReuseIdentifier:@"FFHomeListNovaListCollectionViewSmallCell"];
FUSWeakSelf(weakself); FUSWeakSelf(weakself);
self.collectionView.mj_header = [FUSRefreshHeader headerWithRefreshingBlock:^{ self.collectionView.mj_header = [FUSRefreshHeader headerWithRefreshingBlock:^{
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
self.followAllStatusDidChange(); self.followAllStatusDidChange();
} }
} failure:^(NSString *msg, int code) { } failure:^(NSString *msg, int code) {
[FUSLoadingView fus_showProgressViewWithMessage:msg]; [FUSDialogView fus_showDialog:msg];
[self.collectionView.mj_header endRefreshing]; [self.collectionView.mj_header endRefreshing];
[self.collectionView.mj_footer endRefreshing]; [self.collectionView.mj_footer endRefreshing];
}]; }];
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
} }
- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath{
FUSHomeAnchorListSmallCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"FUSHomeAnchorListSmallCell" forIndexPath:indexPath]; FFHomeListNovaListCollectionViewSmallCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"FFHomeListNovaListCollectionViewSmallCell" forIndexPath:indexPath];
cell.novaModel = self.dataSourceList[indexPath.row]; cell.novaModel = self.dataSourceList[indexPath.row];
return cell; return cell;
} }
......
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/cell/FFHomeListNovaListCollectionViewSmallCell.h 0 → 100644
//
// FFHomeListNovaListCollectionViewSmallCell.h
// HomeList
//
// Created by aaa on 2024/3/21.
//
// 这个是新星最小的cell
#import <UIKit/UIKit.h>
#import "FUSHomeNovaListModel.h"
NS_ASSUME_NONNULL_BEGIN
@interface FFHomeListNovaListCollectionViewSmallCell : UICollectionViewCell
@property (nonatomic, strong) FUSHomeNovaListModel *novaModel;
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/ZhaiXin/Main/Other/FUSZhaiXinDBCacheOperate.m
...@@ -215,6 +215,13 @@ ...@@ -215,6 +215,13 @@
[zhaiXinModel fus_setValueWithModel:userInfo]; [zhaiXinModel fus_setValueWithModel:userInfo];
[zhaiXinModelArray addObject:zhaiXinModel]; [zhaiXinModelArray addObject:zhaiXinModel];
zhaiXinModel.typeId = [NSString stringWithFormat:@"%@%@",SINGLE_CHAT,fid]; zhaiXinModel.typeId = [NSString stringWithFormat:@"%@%@",SINGLE_CHAT,fid];
// ludy:这里为了兼容客服错乱，因为这个b东西，分为三个系统，客服页面发送是用socket,普通聊天页面发送是走寨信，然后显示又是另外一个系统。
// 这个地方是负责显示的，所以是需要让显示层的tableview知道，这一条是需要显示跟哪一个人说
// 由于最老的构架先天没有from uid 的设定，也就是没有from谁，那么这里的uid自然就得用来显示别人，毕竟总不能自己跟自己说话
if ([zhaiXinModel.uid isEqualToString:[FUSCacheDataShare shareStore].userDetailInfo.uid]) {
zhaiXinModel.uid = fid;
}
switch (socketModel.cid) { switch (socketModel.cid) {
case 2002: // 图片 case 2002: // 图片
zhaiXinModel.content = [NSString stringWithFormat:@"[%@]",FUSLocalizationHelper.localString(@"图片")]; zhaiXinModel.content = [NSString stringWithFormat:@"[%@]",FUSLocalizationHelper.localString(@"图片")];
......
FuSiLive/Classes/ZhaiXin/Main/Other/FUSZhaiXinDBOperate.m
...@@ -277,6 +277,8 @@ ...@@ -277,6 +277,8 @@
return NO; return NO;
} }
// FUSLogInfo(@"ludy[fus_writeMultiDataToZhaiXinInfosTableWithModelArray]:\n%@", [modelArray modelToJSONObject]);
return [FUSDBHelper fus_writeMultiModeToTableWithName:ZHAI_XIN_INFOS_TABLE modeArr:modelArray keyArray:keyArray]; return [FUSDBHelper fus_writeMultiModeToTableWithName:ZHAI_XIN_INFOS_TABLE modeArr:modelArray keyArray:keyArray];
} }
......
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