Skip to content

pidan / FuSiLive

Go to a project
Commit 31871e38 by pierce
Options

删除用不到的User Default Key

parent 53b65801
Inline Side-by-side
Showing with 108 additions and 451 deletions
FuSiLive/AppDelegate.m
......@@ -596,7 +596,6 @@ static dispatch_queue_t get_status_queue() {
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:SETTING_LAUNCH_SOUND_SWITCH_BOOL];
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:kFUSConfigAppStatusUDKey];
[[NSUserDefaults standardUserDefaults] setObject:@(NO) forKey:kFUSConfigAppzfStatusUDKey];
[[NSUserDefaults standardUserDefaults] setObject:@(0) forKey:TABBAR_ITEM_SOUND];
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:SHOULD_REMOTE_NOTIFICATION_TIP];
[[NSUserDefaults standardUserDefaults] setObject:@([NSDate date].timeIntervalSince1970) forKey:FirstLaunchTimeUDKey];
}
......
FuSiLive/Classes/Common/Other/FUSCommonCacheOperate.m
......@@ -627,11 +627,6 @@
[[NSUserDefaults standardUserDefaults] setObject:showTaskSystem forKey:TASK_SYSTEM_SHOW_SWITCH];
}
NSString *showWithdraw = [dataDict[@"showWithdraw"] description];
if (![NSString isNullWithString:showWithdraw]) {
[[NSUserDefaults standardUserDefaults] setObject:showWithdraw forKey:MY_PAGE_SHOW_WEB_WITHDRAW_SWITCH];
}
NSString *shareSendTotalStint = [dataDict[@"shareSendTotalStint"] description];
if (![NSString isNullWithString:shareSendTotalStint]) {
[[NSUserDefaults standardUserDefaults] setObject:shareSendTotalStint forKey:SHARE_SEND_TO_TOTAL_STINT];
......
FuSiLive/Classes/Foundation/DataStores/FUSUserDefaultsStore.h
......@@ -8,9 +8,6 @@
#import <Foundation/Foundation.h>
// 标记选择的货币
#define CHOOSE_CURRENCY_TYPE @"ChooseCurrencyType"
// 标记非第一次启动
#define kFUSConfigTalkingDataUDKey @"openStatswith"
// 标记非第一次启动
......@@ -21,10 +18,6 @@
#define FIRST_LAUNCH_NETWORK_ALLOW @"FirstLaunchNetworkAllow"
// 自动登录标记
#define AUTO_LOGIN_MARK_BOOL @"AutoLoginMarkBool"
// 标记直播热门是否为大图
#define HOT_VIEW_LAYOUT_BIG @"HotViewLayoutBig"
// 标记声播、视讯热门是否为大图
#define SIGLE_HOT_VIEW_LAYOUT_BIG @"SigleHotViewLayoutBig"
// 新用户注册
#define NEW_USER_REGIST @"NewUserRegist"
// 新用户注册，通知后台的请求失败了
......@@ -39,12 +32,8 @@
#define BOUND_AGENT_RED_CLICK @"Bound_agent_red_click"
// 绑定经纪人的红点是否点击过
#define ZONE_BOUND_AGENT_RED_CLICK @"Zone_bound_agent_red_click"
// 是否绑定经纪人成功
#define SHOW_BIND_AGENT_SUCCESS @"Show_bind_agent_success"
// 记录邀请有奖是否被点击过
#define INVITEITEM_IS_CLICK @"inviteItemIsClick"
// 记录任务中心是否被点击过
#define TASKCENTER_IS_CLICK @"taskCenterIsClick"
// 第一次安装的时间
#define LAST_OPEN_TIME @"FirstInstallTime"
......@@ -61,26 +50,16 @@
#define USER_COUNTRY_INFO @"UserContryInfo"
// 用户是否已认证
#define USER_AUTHSTATE @"videoAuthState"
// 列表性别
#define USER_SELECTED_SEX @"UserSelectedSex"
// 最新的登录时间
#define LASTED_LOGIN_DATE @"LastedLoginDate"
// 日常统计日志
#define EVERYDAY_STAT_LOG_DATE_STRING @"EverydayStatLogDateString"
// 设置中声音开关
#define SETTING_SOUND_SWITCH_BOOL @"SettingSoundSwitchBool"
// 定位 城市名
#define LOCATION_COUNTRY_NAME @"LoacationCountryName"
// 定位 城市代码
#define LOCATION_COUNTRY_CODE @"LocationCountryCode"
// 设置中振动开关
#define SETTING_VIBRATE_SWITCH_BOOL @"SettingVibrateSwitchBool"
// 设置中启动语音开关
#define SETTING_LAUNCH_SOUND_SWITCH_BOOL @"SettingLaunchSoundSwitchBool"
// 定位 城市名
#define LOCATION_CITY_NAME @"LoacationCityName"
// 定位 城市代码
#define LOCATION_CITY_CODE @"LocationCityCode"
//定位 位置
#define LOCATION_ADDRESS @"LocationAddress"
// 包房提示
......@@ -89,10 +68,6 @@
#define SPLASH_IMAGE_URL @"SplashImageUrl"
// 音视频播放质量
#define VIDEO_CHAT_QUALITY @"videoChatQuality"
// 标记是否第一次启动萤火虫直播3.0.0版本
#define FUSI_LIVE_FIRST_LAUNCH_3000 @"FuSiLiveFirstLaunch3000"
// 标记是否启动过8.0.0版本
#define HAD_FIRST_LAUNCH_3900 @"hadFirstLaunch3900"
// 记录是否第一次进入app
#define IS_FIRST_ENTER_APP_CURRENT @"isFirstEnterAppCurrent"
// 记录是否是开屏推送进入好友页面的
......@@ -146,19 +121,13 @@
#define DEVICE_TOKEN_DATA @"DeviceTokenData"
// 标记是否为正式服务器
#define SWITCH_API_CODE_BOOL @"SwitchAPICodeBool"
// 标记是否已经显示直播内的追踪引导
#define IS_SHOW_LIVE_FOCUS_GUIDE @"IsShowLiveFocusGuide"
// 单聊 草稿箱
#define SINGLE_CHAT_DRAFT_BOX @"SingleChatDraftBox"
// 审核状态
// shenhe状态
#define kFUSConfigAppStatusUDKey @"AppStoreReviewStatus"
// 真实shenhe状态
#define APPSTORE_REVIEW_REAL_STATUS @"AppStoreReviewRealStatus"
// 修复聊天数据
#define FIX_DATA_ALL @"fix_data_all"
#define FIX_DATA @"fix_data"
// disanfang支付显示状态
#define kFUSConfigAppzfStatusUDKey @"Third_PartyP_ayStatus"
// 是否使用测试帐号登录过
......@@ -167,14 +136,8 @@
#define IM_MEDIA_ENTRY_STATUS @"IMMediaEntryStatus"
// 包房首页 模块音视频通话入口状态
#define VIDEO_LIVE_ENTRY_STATUS @"VideoLiveEntryStatus"
// 主题校验是否需要更换图片(泡泡、TabBar图片) MD5
#define THEME_IMAGE_MD5 @"ThemeImageMD5"
// 主题数据
#define THEME_DATA_DICT @"ThemeDataDict"
// 语音播放器类型
#define AUDIO_OUTPUT_TYPE @"myAudioOutputType"
// 菜单音效
#define TABBAR_ITEM_SOUND @"TabbarItemSound"
#pragma --mark API地址相关
......@@ -209,14 +172,11 @@
#define RECHARGE_WEB_URL @"rechargeWebUrl"
// FaceUnity 美颜参数
#define BEAUTY_PARAMS @"FaceUnityBeautyParams"
// 直播间主播端礼物按钮开关
#define LIVE_HOST_GIFT_VIEW_SWITCH @"liveHostGiftViewSwitch"
// 直播间礼物面板富豪进度条是否显示
#define LIVE_LIVERICHSWITCH @"liveRichSwitch"
//#define LIVE_LIVERICHSWITCH @"liveRichSwitch"
// 直播间背包道具，记录最后一次打开背包道具页面的时间
#define LIVE_LAST_OPEN_PROPS_PAGE_TIME @"LIVE_LAST_OPEN_PROPS_PAGE_TIME"
......@@ -239,9 +199,6 @@
// 连麦未读信息
#define LIVE_NEW_LINKMIC_UNREAD @"liveNewLinkMicUnread"
// 空间“萤火提现”H5显示开关（0：不显示、1：显示）
#define MY_PAGE_SHOW_WEB_WITHDRAW_SWITCH @"showWithdraw"
// 分享限制发送的数量
#define SHARE_SEND_TO_TOTAL_STINT @"shareSendTotalStint"
......@@ -270,14 +227,9 @@
#define LIVE_ROOM_SEND_GIFT_TIP_VIEW @"liveRoomSendGiftTipView"
// 送礼提示当天有没有提示过
#define LIVE_ROOM_SEND_GIFT_TIP_TODAY_SHOW @"liveRoomSendGiftTipTodayShow"
// 记录是否是4.0版本及以上新注册的用户
#define IS_NEW_USER_AFTER_FOUR @"isNewUserAfterFour"
// pk是否追踪对面主播
#define PK_IS_FOCUS_OPPOSITE_ANCHOR @"pkISFocusOppositeAnchor"
// 记录首页热门上一次大图还是小图
#define UD_LAST_MAIN_HOT_COVER_IS_SMALL_KEY @"ud_last_main_hot_cover_is_small_key"
// 当前使用的环信 Key，只有在开发环境下可以使用
#define CURRENT_EASE_MOB_KEY @"currentEaseMobKey"
......@@ -287,9 +239,6 @@
// 直播推送配置（字典）
#define LIVE_PUSH_CONFIG @"newlivePushConfig"
// 声网推送配置（字典）
//#define AGORA_PUSH_CONFIG @"AGORA_PUSH_CONFIG"
// 是否关闭动态码率开关（False为关闭，则使用动态码率；True 为打开，则关闭动态码率）
#define LIVE_PUSH_CLOSE_AUTO_BITRATE @"livePushCloseAutoBitrate"
......@@ -323,9 +272,6 @@
//美颜参数
#define BEAUTY_SETTING_PARAMS @"beautySetttingParams"
//关闭是否需要显示添加好友的 View的次数
#define CLOSENEEDSHOWADDFRIENDVIEW @"closeNeedShowAddFriendViewInfo"
// 陌生人聊天开关的User default key
#define UD_KEY_OPEN_STRANGER_MESSAGE @"UD_KEY_OPEN_STRANGER_MESSAGE"
......@@ -341,7 +287,7 @@
// 设置悬浮最小化开关（1：开启、0：关闭）
#define UD_KEY_OPEN_ROOM_MINIMIZE @"UD_KEY_OPEN_ROOM_MINIMIZE"
// 设置悬浮最小化开关（1：开启、0：关闭）
// 进房间的座驾声音（1：开启、0：关闭）
#define UD_KEY_OPEN_ENTER_ROOM_MOTOR_AUDIO @"UD_KEY_OPEN_ENTER_ROOM_MOTOR_AUDIO"
#define UD_KEY_WelcomeMessageFoldSwitch @"UD_KEY_WelcomeMessageFoldSwitch"
......@@ -358,8 +304,6 @@
// openPlace 是否打开地址
#define PUBLISH_NEWSFEED_INFO @"publish_newsfeed_info"
#define PUBLISH_NEWSFEED_COMMENT_TEXT @"publish_newsfeed_comment_text"
#define PUBLISH_NEWSFEED_COMMENT_IMAGE @"publish_newsfeed_comment_image"
#define DYNAMIC_COMMENT_LEVEL_STINT @"dynamicCommentLevelStint"
......@@ -388,9 +332,6 @@
// 等待上麦的人数
#define LINK_MIC_WAITTING_AMOUNT @"LINK_MIC_WAITTING_AMOUNT"
// 珍爱团引导弹窗
#define UDKEY_LIVE_FANS_GROUP_GUIDE_POP_ALERT @"UDKEY_LIVE_FANS_GROUP_GUIDE_POP_ALERT"
// 沙盒-账号相关-用户首次开播弹出协议提示
#define UDKEY_ACCOUNT_FIRST_STAR_LIVE_SHOW_PROTOCOL @"UDKEY_ACCOUNT_FIRST_STAR_LIVE_SHOW_PROTOCOL"
// 沙盒-账号相关-用户首次发布动态协议提示
......
FuSiLive/Classes/InstantMessaging/Controller/FUSChatDetailViewController.m
......@@ -453,17 +453,8 @@
[self fus_setupSubviews];
// 加载第一页聊天记录
[FUSLoadingView fus_showProgressViewWithMessage:@""];
__weak typeof(self) weakSelf = self;
[[FUSIMUserService shareInstance] fus_fixChatHistoryDBWithConversationId:_talkID completion:^(NSString *conversationId) {
[FUSLoadingView fus_dismissProgressView];
weakSelf.oldMessagePage = 1;
[weakSelf fus_loadMessageArrFromDB];
}];
// _oldMessagePage = 1;
// [self fus_loadMessageArrFromDB];
_oldMessagePage = 1;
[self fus_loadMessageArrFromDB];
// 设置数据库所有消息已读
[[FUSIMChatService shareInstance] fus_setCurrentTalkAllMessageRead];
......
FuSiLive/Classes/InstantMessaging/Other/FUSIMUserService.h
......@@ -75,12 +75,5 @@
*/
- (BOOL)fus_selectIsInBlackListWithUid:(NSString *)uid;
/// 根据服务器的记录，修复某个人的聊天记录(内部判断是否需要更新)
/// 环信 3.4.5 升级到 3.8.3.1 SDK逻辑有改，之前我们本地把消息的服务器时间戳修改了，现在要改回去，用于对那些离线消息进行排序
- (void)fus_fixChatHistoryDBWithConversationId:(NSString *)cid completion:(void (^)(NSString *conversationId))completionBlock;
/// 根据服务器的记录，修复所有人的聊天记录(内部判断是否需要更新)
/// 环信 3.4.5 升级到 3.8.3.1 SDK逻辑有改，之前我们本地把消息的服务器时间戳修改了，现在要改回去，用于对那些离线消息进行排序
- (void)fus_fixAllChatHistoryDB;
@end
FuSiLive/Classes/InstantMessaging/Other/FUSIMUserService.m
......@@ -65,204 +65,6 @@
return self;
}
#pragma mark - 修复数据
- (void)fus_fixAllChatHistoryDB{
// 测试：清除修复记录，多次修复
// [[NSUserDefaults standardUserDefaults] removeObjectForKey:FIX_DATA_ALL];
// [[NSUserDefaults standardUserDefaults] removeObjectForKey:FIX_DATA];
_chatInfo = [NSMutableDictionary dictionaryWithDictionary:[[NSUserDefaults standardUserDefaults] objectForKey:FIX_DATA]];
_chatDetailInfo = [NSMutableDictionary dictionaryWithDictionary:_chatInfo[[FUSCacheDataShare shareStore].userDetailInfo.uid]];
NSDictionary *allDict = [[NSUserDefaults standardUserDefaults] objectForKey:FIX_DATA_ALL];
if ([NSDictionary isNull:allDict]) {
allDict = @{};
}
//该账户的聊天记录是否已更新
NSMutableDictionary *allInfo = [NSMutableDictionary dictionaryWithDictionary:allDict];
if ([allInfo[[FUSCacheDataShare shareStore].userDetailInfo.uid] boolValue]) {
return;
}
NSArray *conversations = [[EMClient sharedClient].chatManager getAllConversations];
if ([NSArray isNull:conversations]) {
// 手机没有新聊天记录，新安装不需要拉以前的记录
allInfo[[FUSCacheDataShare shareStore].userDetailInfo.uid] = @(YES);
[[NSUserDefaults standardUserDefaults] setObject:allInfo forKey:FIX_DATA_ALL];
return;
}
dispatch_group_t group = dispatch_group_create();
dispatch_queue_t queue = dispatch_queue_create("data_queue", DISPATCH_QUEUE_CONCURRENT);
dispatch_semaphore_t semaphore = dispatch_semaphore_create(5); // 控制并发数
// 遍历修复所有数据
for (EMConversation *conversation in conversations) {
dispatch_group_enter(group);
if (![_chatDetailInfo[conversation.conversationId] boolValue]) {
dispatch_group_async(group, queue, ^{
dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
[self fus_fixChatHistoryDBWithConversationId:conversation.conversationId completion:^(NSString *conversationId) {
FUSLogDebug(@"_count: === %@",conversationId);
dispatch_group_leave(group);
dispatch_semaphore_signal(semaphore);
}];
});
}else{
dispatch_group_leave(group);
}
}
dispatch_group_notify(group, queue, ^{
allInfo[[FUSCacheDataShare shareStore].userDetailInfo.uid] = @(YES);
[[NSUserDefaults standardUserDefaults] setObject:allInfo forKey:FIX_DATA_ALL];
});
}
- (void)fus_fixChatHistoryDBWithConversationId:(NSString *)cid completion:(void (^)(NSString *))completionBlock{
//该账户的聊天记录是否已更新
NSDictionary *allDict = [[NSUserDefaults standardUserDefaults] objectForKey:FIX_DATA_ALL];
// 判断是否已经修复过数据，如果去掉，则会重新修复数据
if ([_chatDetailInfo[cid] boolValue] || [allDict[[FUSCacheDataShare shareStore].userDetailInfo.uid] boolValue]) {
dispatch_async(dispatch_get_main_queue(), ^{
if (completionBlock) {
completionBlock(cid);
}
});
return;
}
_oldDBArr = [NSMutableArray array];
// 获取本地数据库
[self fus_getChatHistoryDBWithConversationId:cid fromId:nil completion:^(NSArray *localMessages, EMError *aError) {
if (localMessages.count == 0) {
_chatDetailInfo[cid] = @(YES);
_chatInfo[[FUSCacheDataShare shareStore].userDetailInfo.uid] = _chatDetailInfo;
[[NSUserDefaults standardUserDefaults] setObject:_chatInfo forKey:FIX_DATA];
dispatch_async(dispatch_get_main_queue(), ^{
if (completionBlock) {
completionBlock(cid);
}
});
return;
}
FUSLogVerbose(@"===> 修复聊天数据：从数据库获取本地信息条数 ：%ld", localMessages.count);
EMConversation *currentTalkObj = [[EMClient sharedClient].chatManager getConversation:cid type:EMConversationTypeChat createIfNotExist:YES];
NSMutableArray *errorMsgArr = [NSMutableArray array];
// 获取全部漫游记录
[self fus_getHistoryMessageFromSeverWithMessageId:nil conversationId:cid pageSize:(int)localMessages.count completion:^(NSArray *result, EMError *aError) {
FUSLogVerbose(@"===> 修复聊天数据：从服务器获取漫游信息条数 ：%ld",result.count);
_serverDBMutableArr = [result mutableCopy];
// 过滤 漫游消息中在本地之前不存在的信息
for (EMMessage *serverMsg in result) {
BOOL suitable = NO;
for (EMMessage *msg in localMessages) {
if ([msg.messageId isEqualToString:serverMsg.messageId]) {
suitable = YES;
}
}
if (!suitable) {
[_serverDBMutableArr removeObject:serverMsg];
// 只要拉过漫游，那些消息就会存在本地数据库，所以要删除这些原来没有的消息，或者被用户手动删除的消息
[currentTalkObj deleteMessageWithId:serverMsg.messageId error:nil];
FUSLogVerbose(@"===>移除本地不存在的漫游信息id ：%@ , timestamp: %ld",serverMsg.messageId , serverMsg.timestamp);
}
}
// 数据修复
EMMessage *lastMsg = nil;
for (EMMessage *msg in localMessages) {
[_serverDBMutableArr removeObject:lastMsg];
// 此条本地消息是否有匹配的消息
BOOL suitable = NO;
// 数据比对
for (EMMessage *serverMsg in _serverDBMutableArr) {
if ([msg.messageId isEqualToString:serverMsg.messageId]) {
// 还原服务器时间戳
msg.timestamp = serverMsg.timestamp;
[currentTalkObj updateMessageChange:msg error:nil];
EMTextMessageBody *body = (EMTextMessageBody *)serverMsg.body;
if ([body isKindOfClass:[EMTextMessageBody class]]) {
FUSLogVerbose(@"===> 修复聊天数据：从服务器获==更新==本地信息id ：%@ , timestamp: %ld, %@",serverMsg.messageId , serverMsg.timestamp, body.text);
}else{
FUSLogVerbose(@"===> 修复聊天数据：从服务器获==更新==本地信息id ：%@ , timestamp: %ld, %@",serverMsg.messageId , serverMsg.timestamp, [body class]);
}
int i = (int)errorMsgArr.count + 1;
NSArray *noSuitableArr = [errorMsgArr copy];
// 给本地生成的信息一个正确的时间戳，用于排序
for (EMMessage *localMsg in noSuitableArr) {
localMsg.timestamp = serverMsg.timestamp - i;
i--;
[currentTalkObj updateMessageChange:localMsg error:nil];
if ([localMsg.body isKindOfClass:[EMTextMessageBody class]]) {
FUSLogVerbose(@"===> 修复聊天数据：从服务器获==更新==本地自行生成的信息id ：%@ , timestamp: %ld, %@",localMsg.messageId , localMsg.timestamp, [(EMTextMessageBody *)localMsg.body text]);
}else{
FUSLogVerbose(@"===> 修复聊天数据：从服务器获==更新==本地自行生成的信息id ：%@ , timestamp: %ld, %@",localMsg.messageId , localMsg.timestamp, [localMsg.body class]);
}
[errorMsgArr removeObject:localMsg];
}
suitable = YES;
lastMsg = serverMsg;
break;
}
}
//找不到这条信息，说明这是原来本地的信息
if (!suitable) {
[errorMsgArr addObject:msg];
}
}
// 处理如果本地生成的消息是最后一条的情况
int i = 1;
if (errorMsgArr.count > 0) {
for (EMMessage *localMsg in errorMsgArr) {
localMsg.timestamp = lastMsg.timestamp + i;
i++;
[currentTalkObj updateMessageChange:localMsg error:nil];
if ([localMsg.body isKindOfClass:[EMTextMessageBody class]]) {
FUSLogVerbose(@"===> 修复聊天数据：从服务器获==更新==本地自行生成的信息id ：%@ , timestamp: %ld, %@",localMsg.messageId , localMsg.timestamp, [(EMTextMessageBody *)localMsg.body text]);
}else{
FUSLogVerbose(@"===> 修复聊天数据：从服务器获==更新==本地自行生成的信息id ：%@ , timestamp: %ld, %@",localMsg.messageId , localMsg.timestamp, [localMsg.body class]);
}
}
}
[errorMsgArr removeAllObjects];
@synchronized (self) {
_chatDetailInfo[cid] = @(YES);
_chatInfo[[FUSCacheDataShare shareStore].userDetailInfo.uid] = _chatDetailInfo;
[[NSUserDefaults standardUserDefaults] setObject:_chatInfo forKey:FIX_DATA];
}
sleep(1); //防止一下请求太多
dispatch_async(dispatch_get_main_queue(), ^{
if (completionBlock) {
completionBlock(cid);
}
});
}];
}];
}
- (void)fus_getChatHistoryDBWithConversationId:(NSString *)cid fromId:(NSString *)messageId completion:(void (^)(NSArray *aMessages, EMError *aError))aCompletionBlock{
......@@ -393,11 +195,6 @@
});
// 修复数据库
[self fus_fixAllChatHistoryDB];
} failure:^(NSString *errorMsg) {
// 重试次数加1
......
FuSiLive/Classes/Login/Controller/FUSMessageRegisterViewController.m
......@@ -539,15 +539,6 @@
NSString *uid = [NSString stringWithObject:[dataDict objectForKey:@"uid"]];
NSString *token = [NSString stringWithObject:[dataDict objectForKey:@"token"]];
// 记录是否是4.0以后注册的新账号
NSMutableArray *uidArray = [NSMutableArray array];
NSMutableArray *array = [[NSUserDefaults standardUserDefaults] objectForKey:IS_NEW_USER_AFTER_FOUR];
if (array) {
[uidArray addObjectsFromArray:array];
}
[uidArray addObject:uid];
[[NSUserDefaults standardUserDefaults] setObject:uidArray forKey:IS_NEW_USER_AFTER_FOUR];
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:NEW_USER_REGIST];
[weakself.phoneTextField resignFirstResponder];
[weakself.codeTextField resignFirstResponder];
......@@ -1032,27 +1023,6 @@
}
[self requestCheckStatusFinish];
// if (!self.countryInfoDict) {
//
// self.countryInfoDict = [[FUSCountryHelper sharedInstance] fus_getCountryInfoForCountryName:@"Taiwan"];
//
// }
//
// NSString *countryName = [_countryInfoDict objectForKey:FUSCountryLocaleNameKey];
// NSString *countryCode = [_countryInfoDict objectForKey:FUSCountryCodeKey];
// self.countryLabel.text = countryName;
// self.countryLabel.textAlignment = NSTextAlignmentRight;
// self.countryCode = [NSString stringWithFormat:@"+%@", countryCode];
// self.areaCodeLabel.text = self.countryCode;
// [[NSUserDefaults standardUserDefaults] setObject:self.countryCode forKey:LOCATION_COUNTRY_CODE];
//
// NSInteger length = [[FUSCountryHelper sharedInstance] lengthForPhoneNumberWithCountryCode:countryCode];
// if (length == 0) length = 13;
// self.phoneTextField.textMaxLength = length;
//
// [self requestCheckStatusFinish];
}
/**
......
FuSiLive/Classes/Login/Controller/FUSStartPageViewController.m
......@@ -832,19 +832,10 @@
BOOL isNewRegister = [dataDict[@"inReg"] boolValue];
[[NSUserDefaults standardUserDefaults] setObject:@(isNewRegister) forKey:NEW_USER_REGIST];
if (isNewRegister) {
// [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:IS_FIRST_ENTER_APP_CURRENT];
// FireBase 注册统计
NSString *uid = [dataDict[@"uid"] description];
// [Flurry setUserID:uid];
// [Flurry logEvent:EVENT_FLURRY_REGIST withParameters:@{@"uid":uid}];
// 记录是否是4.0以后注册的新账号
NSMutableArray *uidArray = [NSMutableArray array];
NSMutableArray *array = [[NSUserDefaults standardUserDefaults] objectForKey:IS_NEW_USER_AFTER_FOUR];
if (array) {
[uidArray addObjectsFromArray:array];
}
[uidArray addObject:uid];
[[NSUserDefaults standardUserDefaults] setObject:uidArray forKey:IS_NEW_USER_AFTER_FOUR];
switch (sign) {
case signFacebook:
{
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
......@@ -466,7 +466,7 @@ FUSLinkMicUserListDelegate
CGFloat x = self.width;
self.contentView = [[FUSContentView alloc]initWithFrame:CGRectMake(x, 0, self.width, self.height)];
_contentView.layer.masksToBounds = YES;
// self.scrollView.offsetY = 0;
// self.scrollView.offsetY = 0;
_scrollView.offsetX = x;
__weak typeof(self) weakSelf = self;
[_contentView setTouchBeganHandler:^(NSSet<UITouch *> *touches, UIEvent *event) {
......@@ -496,7 +496,7 @@ FUSLinkMicUserListDelegate
// 萤火虫3.0.0去除家族
// 搭建家族列表
// [self initFamilyView];
// [self initFamilyView];
// 搭建活动按钮
[self initActivtiyView];
......@@ -583,7 +583,7 @@ FUSLinkMicUserListDelegate
}
//v6.1.0 产品要改
// _activityOriginalFrame = CGRectMake(15, CGRectGetMaxY(_headView.frame), ACTIVITY_VIEW_WIDTH, ACTIVITY_VIEW_HEIGHT);
// _activityOriginalFrame = CGRectMake(15, CGRectGetMaxY(_headView.frame), ACTIVITY_VIEW_WIDTH, ACTIVITY_VIEW_HEIGHT);
CGFloat x = self.width - 10 - 55;
if (FUSRTL.isRTL) {
x = 10;
......@@ -642,8 +642,8 @@ FUSLinkMicUserListDelegate
_bottomToolView.delegate = _chatInputHelper;
}
// _chatInputView.liveType = [FUSLiveHelper shareInstance].roomType;
// _chatInputView.delegate = self;
// _chatInputView.liveType = [FUSLiveHelper shareInstance].roomType;
// _chatInputView.delegate = self;
__weak typeof(self) weakSelf = self;
[_bottomToolView setKeyboardWillShowHandler:^(CGFloat height){
......@@ -662,11 +662,11 @@ FUSLinkMicUserListDelegate
// 更新公屏消息列表的位置，来适应当前是否显示弹幕选择列表
[weakSelf fus_updateChatTableYKeyboardShow:YES];
// if (weakSelf.chatInputView.chatTextView.isBullets) {
// if (weakSelf.chatInputView.chatTextView.isBullets) {
weakSelf.bulletsView.y = weakSelf.bulletsViewY - (height + BULLETS_LIST_HEIGHT) *0.5;
// } else {
// weakSelf.bulletsView.y = weakSelf.bulletsViewY - height*0.5;
// }
// } else {
// weakSelf.bulletsView.y = weakSelf.bulletsViewY - height*0.5;
// }
CGFloat gameEntranceY = (weakSelf.bottomToolView.y - 55 - 10) - 55 - 10;
weakSelf.treasureBoxListIcon.y = gameEntranceY - 75 - 10 - height;
......@@ -1078,7 +1078,7 @@ FUSLinkMicUserListDelegate
FUSRoomUserInfoModel *userInfoModel = [[FUSRoomUserInfoModel alloc]init];
[userInfoModel fus_setValueWithModel:model];
[FUSTalkingData fus_trackEvent:EVENT_ROOM_COMMENT_INFOCARD label:nil parameters:nil];
// userInfoModel.cannotBeAt = YES;
// userInfoModel.cannotBeAt = YES;
[weakSelf.userInfoView fus_showUserInfoViewWithUserInfoViewType:FUSUserInfoViewTypeLive userInfoModel:userInfoModel shouldRequestData:YES];
}];
......@@ -1138,7 +1138,7 @@ FUSLinkMicUserListDelegate
self.realtimeActivityWebView.wkWebView.scrollView.showsVerticalScrollIndicator = NO;
self.realtimeActivityWebView.wkWebView.scrollView.showsHorizontalScrollIndicator = NO;
self.realtimeActivityWebView.hideProgress = YES;
// [self.realtimeActivityWebView loadWebURL:@"https://ceshi.yabolive.tv/webAppBridge.html"];
// [self.realtimeActivityWebView loadWebURL:@"https://ceshi.yabolive.tv/webAppBridge.html"];
[self.realtimeActivityWebView configWebViewWithWebUrl:FUSCacheDataShare.shareStore.settingInitDataModel.roomWebFramework.horizontalUrl];
[[self fus_viewWithLayer:FUSLiveFunctionLayerFunctionButtons] addSubview:self.realtimeActivityWebView];
......@@ -1344,7 +1344,7 @@ FUSLinkMicUserListDelegate
[_linkMicroView fus_setUserInfos:@[]];
FUSLiveFunctionLayerView *layerView = [self fus_viewWithLayer:FUSLiveFunctionLayerConnentMic];
if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) {
// layerView.stayOnScreen = YES;
// layerView.stayOnScreen = YES;
}else{
layerView.stayOnScreen = NO;
}
......@@ -1418,12 +1418,12 @@ FUSLinkMicUserListDelegate
_pushLinkMicroView.tag = FUSLiveFunctionLayerConnentMic;
[_pushLinkMicroView fus_setUserInfos:@[]];
// FUSLiveFunctionLayerView *layerView = [self.viewLayerArray objectAtIndex:FUSLiveFunctionLayerConnentMic];
// if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) {
//// layerView.stayOnScreen = YES;
// }else{
// layerView.stayOnScreen = NO;
// }
// FUSLiveFunctionLayerView *layerView = [self.viewLayerArray objectAtIndex:FUSLiveFunctionLayerConnentMic];
// if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) {
//// layerView.stayOnScreen = YES;
// }else{
// layerView.stayOnScreen = NO;
// }
[self.pusherContentView addSubview:_pushLinkMicroView];
......@@ -1513,10 +1513,6 @@ FUSLinkMicUserListDelegate
- (void)showRoomSlideNoticeGuideView
{
NSString *loginUid = [[FUSCacheDataShare shareStore] userDetailInfo].uid;
NSArray *recordUid = [[NSUserDefaults standardUserDefaults] objectForKey:IS_NEW_USER_AFTER_FOUR];
if (![recordUid containsObject:loginUid]) {
return;
}
BOOL cardFoucsHaveShow = NO;
NSMutableDictionary *infoDic = [[NSUserDefaults standardUserDefaults] objectForKey:HAVE_SHOW_ROOM_GUIDE_CARD_FOUCS];
if ([infoDic isKindOfClass:[NSDictionary class]] && [[infoDic allKeys] containsObject:loginUid]) {
......@@ -1573,12 +1569,12 @@ FUSLinkMicUserListDelegate
[_sendGiftCountdownBtn fus_setBackgroundImage:giftModel.resource];
_activityView.y = _activityChangeFrame.origin.y - 65;
// _gameEntranceBtn.hidden = YES;
// _gameEntranceBtn.hidden = YES;
__weak typeof(self) weakSelf = self;
[_sendGiftCountdownBtn setDidCountDownFinishHandler:^{
//倒计时结束
// weakSelf.gameEntranceBtn.hidden = NO;
// weakSelf.gameEntranceBtn.hidden = NO;
weakSelf.activityView.frame = weakSelf.activityChangeFrame;
}];
......@@ -1829,7 +1825,7 @@ FUSLinkMicUserListDelegate
// 人气值变化消息
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_roomPopularChanged:) name:STR(ROOM_CID_RoomPopularChanged) object:nil];
// 接收红包消息
// 接收红包消息
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveRedPacketMessageNotification:) name:STR(ROOM_CID_RED_PACKET) object:nil]; // 分享消息
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveShareMessageNotification:) name:STR(ROOM_SHARE_MESSAGE) object:nil];
......@@ -1851,10 +1847,10 @@ FUSLinkMicUserListDelegate
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_receiveBroadcastNotification:) name:STR(CID_BROADCAST_NOTICE) object:nil];
// 4000: 给全部的直播间广播推送
// 4003:新版本直播间特效广播
// 4003:新版本直播间特效广播
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveSpacialBroadCastNotification:) name:STR(CID_ROOM_SPACIAL_BROADCAST_NOTICE) object:nil];
// 4005 关键词特效socket
// 4005 关键词特效socket
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_showKeywordEffectNofitication:) name:STR(CID_KEYWORD_EFFECT_NOTICE) object:nil];
// 被设置为场控通知
......@@ -1864,7 +1860,7 @@ FUSLinkMicUserListDelegate
// 取消场控消息回执
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveControllerCancleNotification:) name:STR(ROOM_CID_CANCEL_CONTROL) object:nil];
// 接收直播警告消息
// 接收直播警告消息
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveLiveWarningNotification:) name:STR(ROOM_CID_LIVE_WARNING) object:nil];
// 接收切换直播类型消息
......@@ -1875,9 +1871,9 @@ FUSLinkMicUserListDelegate
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveRichLevelChangeNotification:) name:RICH_LEVEL_CHANGE_NOTIFICATION object:nil];
// FUSLogInfo(@"FunctionView 通知注册完成");
// FUSLogInfo(@"FunctionView 通知注册完成");
// 检测 GiftView 通知
// 检测 GiftView 通知
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveGiftViewWillShowNotification:) name:kLiveGiftViewWillShowNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveGiftViewWillDismissNotification:) name:kLiveGiftViewWillDismissNotification object:nil];
......@@ -2201,7 +2197,7 @@ FUSLinkMicUserListDelegate
}];
__weak typeof(self) weakSelf = self;
[self.motorsView setTapContentHandler:^(FUSRoomUserInfoModel *model) {
// BOOL enableAtBtn = weakSelf.scrollView.contentOffset.x == (FUSRTL.isRTL ? 0 : self.width);
// BOOL enableAtBtn = weakSelf.scrollView.contentOffset.x == (FUSRTL.isRTL ? 0 : self.width);
[weakSelf.userInfoView fus_showUserInfoViewWithUserInfoViewType:FUSUserInfoViewTypeLive
userInfoModel:model
shouldRequestData:YES
......@@ -2340,7 +2336,7 @@ FUSLinkMicUserListDelegate
[self.webpMotorsView setTapContentHandler:^(FUSRoomUserInfoModel *model) {
// BOOL enableAtBtn = weakSelf.scrollView.contentOffset.x == (FUSRTL.isRTL ? 0 : self.width);
// BOOL enableAtBtn = weakSelf.scrollView.contentOffset.x == (FUSRTL.isRTL ? 0 : self.width);
[weakSelf.userInfoView fus_showUserInfoViewWithUserInfoViewType:FUSUserInfoViewTypeLive
userInfoModel:model
shouldRequestData:YES
......@@ -2591,11 +2587,11 @@ FUSLinkMicUserListDelegate
// 银币礼物
if (giftModel.currency.integerValue == 2) {
// [_headView fus_showCoinNumberChangeWithCoin:giftModel.giveprice showImage:YES];
//
// if (_pusherHeadView) {
// [_pusherHeadView fus_showCoinNumberChangeWithCoin:giftModel.giveprice];
// }
// [_headView fus_showCoinNumberChangeWithCoin:giftModel.giveprice showImage:YES];
//
// if (_pusherHeadView) {
// [_pusherHeadView fus_showCoinNumberChangeWithCoin:giftModel.giveprice];
// }
}else if (giftModel.currency.integerValue == 3){
......@@ -3183,19 +3179,19 @@ FUSLinkMicUserListDelegate
if (buttonIndex == 1) {
[self fus_closeLiveRoomWithTips:YES];
// [self fus_showEndLiveRoomSelectedView];
// [self fus_showEndLiveRoomSelectedView];
}
}];
return;
}
// if ([FUSLiveHelper shareInstance].roomInfoModel.channelId.integerValue != 0
// && [FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor
// && [FUSLiveHelper shareInstance].liveRoomType != FUSRoomTypeLinkMic) {
// [self fus_showEndLiveRoomSelectedView];
// }else{
// if ([FUSLiveHelper shareInstance].roomInfoModel.channelId.integerValue != 0
// && [FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor
// && [FUSLiveHelper shareInstance].liveRoomType != FUSRoomTypeLinkMic) {
// [self fus_showEndLiveRoomSelectedView];
// }else{
[self fus_closeLiveRoomWithTips:YES];
// }
// }
}
- (void)fus_showEndLiveRoomSelectedView{
......@@ -3215,7 +3211,7 @@ FUSLinkMicUserListDelegate
}
- (void)fus_changeToLinkMic{
// [[FUSLiveHelper shareInstance].streamView.pushView fus_stopRTCStreamingWithCompletion:nil];
// [[FUSLiveHelper shareInstance].streamView.pushView fus_stopRTCStreamingWithCompletion:nil];
// 改为 聊天直播间
[FUSLiveHttpHelper fus_requestChangeRoomType:@"2" fid:[FUSLiveHelper shareInstance].roomInfoModel.roomId success:^(NSDictionary *dataDict) {
[[FUSLiveHelper shareInstance].streamView.pushView.captureHelper fus_stopStreamPush];
......@@ -3262,9 +3258,9 @@ FUSLinkMicUserListDelegate
[FUSLiveHelper shareInstance].liveRoomType = FUSRoomTypeLinkMic;
// 创建麦位列表
// [_linkMicroView removeFromSuperview];
// _linkMicroView = nil;
// [self initLinkMicroViewWithAmount:7 needReloadData:YES];
// [_linkMicroView removeFromSuperview];
// _linkMicroView = nil;
// [self initLinkMicroViewWithAmount:7 needReloadData:YES];
WEAKSELF
[_linkMicroView fus_stopAllHeaderViewAnimComplete:^{
weakSelf.linkMicroView.viewAmount = 7;
......@@ -3274,7 +3270,7 @@ FUSLinkMicUserListDelegate
// 连麦房，一开始就要进入频道
if ([FUSLiveHelper shareInstance].liveRoomType == FUSRoomTypeLinkMic) {
[_linkMicroView fus_joinChannelSuccess:^{
// [weakSelf.linkMicroView fus_resetDelegate];
// [weakSelf.linkMicroView fus_resetDelegate];
FUSLogDebug(@"");
} failure:^{
......@@ -3333,9 +3329,9 @@ FUSLinkMicUserListDelegate
[self.chatTableView.superview fusrtl_setRTLFrame:self.chatTableView.superview.frame superWidth:UIView.fus_screenW];
// 创建麦位列表
// [_linkMicroView removeFromSuperview];
// _linkMicroView = nil;
// [self initLinkMicroViewWithAmount:4 needReloadData:YES];
// [_linkMicroView removeFromSuperview];
// _linkMicroView = nil;
// [self initLinkMicroViewWithAmount:4 needReloadData:YES];
_linkMicroView.viewAmount = 4;
_linkMicroView.y = _chatViewBgView.y - 60;
......@@ -3357,9 +3353,7 @@ FUSLinkMicUserListDelegate
- (void)fus_closeLiveRoomWithTips:(BOOL)show{
NSString *loginUid = [[FUSCacheDataShare shareStore] userDetailInfo].uid;
NSArray *recordUid = [[NSUserDefaults standardUserDefaults] objectForKey:IS_NEW_USER_AFTER_FOUR];
if ([recordUid containsObject:loginUid]) {
// 只有从热门进来的退出才算一次，三次提示显示开播提示，且当前累计三次有效
if ([[[NSUserDefaults standardUserDefaults] objectForKey:IS_ENTER_LIVEROOM_FROM_HOT] boolValue]) {
[[NSUserDefaults standardUserDefaults] setObject:@(NO) forKey:IS_ENTER_LIVEROOM_FROM_HOT];
......@@ -3387,8 +3381,6 @@ FUSLinkMicUserListDelegate
[[NSUserDefaults standardUserDefaults] setObject:saveTimeDic forKey:RECORD_USER_EXIT_ROOM_INFO];
}
NSArray *recordUid1 = [[NSUserDefaults standardUserDefaults] objectForKey:IS_NEW_USER_AFTER_FOUR];
if ([recordUid1 isKindOfClass:[NSArray class]] && [recordUid1 containsObject:loginUid]) {
// 获取是否需要显示包房引导 VIew
BOOL haveShow = NO;
NSMutableDictionary *infoDic = [[NSUserDefaults standardUserDefaults] objectForKey:HAVE_SHOW_ROOM_GUIDE_VIEW];
......@@ -3422,19 +3414,17 @@ FUSLinkMicUserListDelegate
return;
}
}
}
if ([FUSLiveHelper shareInstance].roomInfoModel.channelId.integerValue == 0) {
[self fus_exitRoom];
}
//TODO:不自动开启画中画: added By Pidan
// else if (([FUSLiveHelper shareInstance].liveType != FUSLiveTypeAnchor
// && [[NSUserDefaults fus_readCurrentUserObjectWithKey:UD_KEY_OPEN_ROOM_MINIMIZE] boolValue])
// || ([FUSLiveHelper shareInstance].liveRoomType == FUSRoomTypeLinkMic
// && [FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor)) {
// [self fus_minimizeRoom];
// }
// else if (([FUSLiveHelper shareInstance].liveType != FUSLiveTypeAnchor
// && [[NSUserDefaults fus_readCurrentUserObjectWithKey:UD_KEY_OPEN_ROOM_MINIMIZE] boolValue])
// || ([FUSLiveHelper shareInstance].liveRoomType == FUSRoomTypeLinkMic
// && [FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor)) {
// [self fus_minimizeRoom];
// }
else if(show){
[self fus_exitRoomCompelete:nil];
......@@ -3448,7 +3438,7 @@ FUSLinkMicUserListDelegate
*/
- (void)onLikeCountTimeOut:(NSTimer *)sender
{
// NSString *roomId = sender.userInfo[@"uid"];
// NSString *roomId = sender.userInfo[@"uid"];
[self.likeCountTimer invalidate];
......@@ -4039,7 +4029,7 @@ FUSLinkMicUserListDelegate
}];
// 隐藏活动
// self.activityView.hidden = YES;
// self.activityView.hidden = YES;
CGFloat safeAreaBottom = 0;
if (@available(iOS 11.0, *)) {
......@@ -4126,7 +4116,7 @@ FUSLinkMicUserListDelegate
_pkStyleView.tragetVC = liveVC;
_pkStyleView.hidden = YES;
_pkStyleView.didClickStartPKBlock = ^{
// [weakSelf.chatInputView changePKBtnStateImageWithPKBtnState:(FUSLiveChatToolPKBtnStateStart)];
// [weakSelf.chatInputView changePKBtnStateImageWithPKBtnState:(FUSLiveChatToolPKBtnStateStart)];
[[NSNotificationCenter defaultCenter] postNotificationName:FUS_LIVE_ROOM_CHANGE_PKBTN_STATUS object:@(FUSLiveChatToolPKBtnStateStart)];
};
_pkStyleView.dismissBlock = ^{
......@@ -4264,7 +4254,7 @@ FUSLinkMicUserListDelegate
_pkStyleView = [[FUSPKStyleView alloc] initWithFrame:self.bounds];
_pkStyleView.tragetVC = liveVC;
_pkStyleView.didClickStartPKBlock = ^{
// [weakSelf.chatInputView changePKBtnStateImageWithPKBtnState:(FUSLiveChatToolPKBtnStateStart)];
// [weakSelf.chatInputView changePKBtnStateImageWithPKBtnState:(FUSLiveChatToolPKBtnStateStart)];
[[NSNotificationCenter defaultCenter] postNotificationName:FUS_LIVE_ROOM_CHANGE_PKBTN_STATUS object:@(FUSLiveChatToolPKBtnStateStart)];
};
_pkStyleView.dismissBlock = ^{
......@@ -4276,7 +4266,7 @@ FUSLinkMicUserListDelegate
_pkStyleView = [[FUSPKStyleView alloc] initWithFrame:self.bounds];
_pkStyleView.tragetVC = liveVC;
_pkStyleView.didClickStartPKBlock = ^{
// [weakSelf.chatInputView changePKBtnStateImageWithPKBtnState:(FUSLiveChatToolPKBtnStateStart)];
// [weakSelf.chatInputView changePKBtnStateImageWithPKBtnState:(FUSLiveChatToolPKBtnStateStart)];
[[NSNotificationCenter defaultCenter] postNotificationName:FUS_LIVE_ROOM_CHANGE_PKBTN_STATUS object:@(FUSLiveChatToolPKBtnStateStart)];
};
_pkStyleView.dismissBlock = ^{
......@@ -4344,7 +4334,7 @@ FUSLinkMicUserListDelegate
@param message 发送的内容
*/
- (void)fus_sendCharacterHyperlinkMessage:(NSString *)message liveChatModel:(FUSLiveChatModel *)livechatModel{
// [self fus_chatInputView:self.chatInputView didClickSendWithMessage:message isBullets:NO];
// [self fus_chatInputView:self.chatInputView didClickSendWithMessage:message isBullets:NO];
[self.chatInputHelper fus_bottomToolView:self.bottomToolView didClickSendWithMessage:message atSomebady:nil isBullets:NO barrageType:0 liveChatModel:livechatModel finishHandler:nil];
}
......@@ -4377,7 +4367,7 @@ FUSLinkMicUserListDelegate
[self.pusherChatTableView fus_recoveryDataSource];
// [self.bottomToolView registerNotification];
// [self.bottomToolView registerNotification];
[self setupGiftCenter];
......@@ -4420,10 +4410,6 @@ FUSLinkMicUserListDelegate
return;
}
NSString *loginUid = [[FUSCacheDataShare shareStore] userDetailInfo].uid;
NSArray *recordUid = [[NSUserDefaults standardUserDefaults] objectForKey:IS_NEW_USER_AFTER_FOUR];
if (![recordUid containsObject:loginUid]) {
return;
}
if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) {
return;
......@@ -4440,7 +4426,7 @@ FUSLinkMicUserListDelegate
}
if ([showTime intValue] < 6) {
// NSString *todayStr = [[NSUserDefaults standardUserDefaults] objectForKey:LIVE_ROOM_SEND_GIFT_TIP_TODAY_SHOW];
// NSString *todayStr = [[NSUserDefaults standardUserDefaults] objectForKey:LIVE_ROOM_SEND_GIFT_TIP_TODAY_SHOW];
NSDate *date=[NSDate date];
NSDateFormatter *format=[[NSDateFormatter alloc] init];
[format setDateFormat:@"yyyy-MM-dd"];
......@@ -4481,7 +4467,7 @@ FUSLinkMicUserListDelegate
*/
- (void)fus_setupWithRoomInfoModel:(FUSRoomInfoModel *)model
{
// FUSRoomInfoModel *roomInfoModel = [FUSLiveHelper shareInstance].roomInfoModel;
// FUSRoomInfoModel *roomInfoModel = [FUSLiveHelper shareInstance].roomInfoModel;
_bgImgView.image = nil;
// 设置 PortraitView
[self.headView fus_setupPortraitViewWithRoomOwnerModel:[[FUSLiveHelper shareInstance] roomInfoModel] animate:YES];
......@@ -4686,7 +4672,7 @@ FUSLinkMicUserListDelegate
[self endEditing:YES];
[[FUSLiveGiftView shareGiftView] fus_dismissWithAnimate:NO needUpload:NO];
// [[FUSLiveGiftView shareGiftView] fus_resetGiftView]; //放到setup functionview上面
// [[FUSLiveGiftView shareGiftView] fus_resetGiftView]; //放到setup functionview上面
[_popularPopView fus_dismissViewAnimation:NO];
......@@ -4697,7 +4683,7 @@ FUSLinkMicUserListDelegate
[_pusherAcitivtyView fus_cleanActivityView];
}
// [_chatInputView fus_cleanChatInputView];
// [_chatInputView fus_cleanChatInputView];
[_motorsView fus_stopAnimation];
[_motorsView removeFromSuperview];
......@@ -4780,11 +4766,11 @@ FUSLinkMicUserListDelegate
[FUSGiftCenter fus_shareGiftCenter].giftFrame = CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH - FUS_LIVE_GIFT_VIEW_HEIGHT() - 10);
[FUSGiftCenter fus_shareGiftCenter].bgView = [self fus_viewWithLayer:FUSLiveFunctionLayerBigEffects];
// if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAudience) {
// if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAudience) {
[FUSGiftCenter fus_shareGiftCenter].normalGiftBgView = [self fus_viewWithLayer:FUSLiveFunctionLayerEffects];
// }else{
// [FUSGiftCenter fus_shareGiftCenter].normalGiftBgView = [self fus_viewWithLayer:FUSLiveFunctionLayerBigEffects];
// }
// }else{
// [FUSGiftCenter fus_shareGiftCenter].normalGiftBgView = [self fus_viewWithLayer:FUSLiveFunctionLayerBigEffects];
// }
}
/**
......@@ -5101,7 +5087,7 @@ FUSLinkMicUserListDelegate
*/
- (void)fus_pkHelper:(FUSPKHelper *)pkHelper updatePKContentViewWithPKInfoModel:(FUSPKInfoModel *)infoModel {
// 隐藏活动view
// self.activityView.hidden = YES;
// self.activityView.hidden = YES;
// 开始创建pkcontentView
[self fus_setupPKContentViewWithInfoModel:infoModel];
}
......@@ -5238,7 +5224,7 @@ FUSLinkMicUserListDelegate
if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAudience) {
__weak FUSLiveMainViewController *liveVC = (FUSLiveMainViewController *)[[FUSLiveHelper shareInstance] fus_getTargetViewController];
// 移除对应主播的画面
// [liveVC.playView fus_destroyWithUID:_pkHelper.pkId];
// [liveVC.playView fus_destroyWithUID:_pkHelper.pkId];
[liveVC.playView fus_destroyPKOtherPlayer];
}
......@@ -5275,7 +5261,7 @@ FUSLinkMicUserListDelegate
}
// 隐藏活动view
// self.activityView.hidden = YES;
// self.activityView.hidden = YES;
if (_realtimeActivityView) {
_realtimeActivityView.hidden = YES;
}
......@@ -5323,7 +5309,7 @@ FUSLinkMicUserListDelegate
__weak FUSLiveMainViewController *liveVC = (FUSLiveMainViewController *)[[FUSLiveHelper shareInstance] fus_getTargetViewController];
// 移除对应主播的画面
// [liveVC.playView fus_destroyWithUID:_pkHelper.pkId];
// [liveVC.playView fus_destroyWithUID:_pkHelper.pkId];
[liveVC.playView fus_destroyPKOtherPlayer];
if (_pkContentView) {
......@@ -5392,7 +5378,7 @@ FUSLinkMicUserListDelegate
- (void)fus_linkMicroUserListView:(FUSLinkMicroUserListView *)userListView receivedBitrate:(NSInteger)bite uid:(NSInteger)uid{
if (uid == [FUSLiveHelper shareInstance].roomInfoModel.roomId.integerValue && bite < 400) {
// [self fus_updataBitrateWithRate:bite]; //只判断视频的码率，不管音频
// [self fus_updataBitrateWithRate:bite]; //只判断视频的码率，不管音频
}
}
......@@ -5677,8 +5663,8 @@ FUSLinkMicUserListDelegate
CGPoint offset = [change[@"new"] CGPointValue];
CGFloat alpha = offset.x/UIView.fus_screenW;
// FUSLogInfo(@"pierce CO x:%f",offset.x);
// FUSLogInfo(@"pierce CO alpha:%f",alpha);
// FUSLogInfo(@"pierce CO x:%f",offset.x);
// FUSLogInfo(@"pierce CO alpha:%f",alpha);
if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAudience) {
_bulletsView.alpha = alpha;
[FUSGiftCenter fus_shareGiftCenter].normalGiftNumberView.alpha = alpha;
......@@ -5734,11 +5720,11 @@ FUSLinkMicUserListDelegate
return;
}
// if (scrollView.offsetX < 50) {
// [_pushLinkMicroView fus_resetDelegate];
// }else{
// [_linkMicroView fus_resetDelegate];
// }
// if (scrollView.offsetX < 50) {
// [_pushLinkMicroView fus_resetDelegate];
// }else{
// [_linkMicroView fus_resetDelegate];
// }
}
#pragma mark - FUSLiveHeadViewDelegate
......@@ -5748,26 +5734,26 @@ FUSLinkMicUserListDelegate
- (void)fus_headViewClickCoinTicket
{
// 审核状态下不显示守护榜
// if (FUSConfig.sharedInstanced.devConfigs.appStatus) return;
// if (FUSConfig.sharedInstanced.devConfigs.appStatus) return;
[self fus_showAudiencePopViewStartWithContribute:YES];
// __weak typeof(self) weakSelf = self;
// // 正在显示，不重复显示
// if (_liveFireCountView.isOnShow == YES) return;
//
// [FUSTalkingData fus_trackEvent:EVENT_ROOM_GIFTGOT_RANK label:nil parameters:nil];
//
// _liveFireCountView = [[FUSLiveFireCountView alloc] initWithFrame:UIView.fus_screenFrame withUid:[[FUSLiveHelper shareInstance]roomInfoModel].roomId];
// [_liveFireCountView fus_showViewWithView:[self fus_viewWithLayer:FUSLiveFunctionLayerManualPopView]];
// _liveFireCountView.didClickUserBlock = ^(NSString *uid) {
// FUSMyZoneViewController *zoneVC = [[FUSMyZoneViewController alloc]init];
// zoneVC.zoneUid = uid;
// [[weakSelf getViewController].navigationController pushViewController:zoneVC animated:YES];
// };
// _liveFireCountView.dismissBlock = ^{
// [[FUSLiveHelper shareInstance] fus_setupScrollToSwitchRoomEnable:YES];
// };
// // 设置弹出时不能滚动
// [[FUSLiveHelper shareInstance] fus_setupScrollToSwitchRoomEnable:NO];
// __weak typeof(self) weakSelf = self;
// // 正在显示，不重复显示
// if (_liveFireCountView.isOnShow == YES) return;
//
// [FUSTalkingData fus_trackEvent:EVENT_ROOM_GIFTGOT_RANK label:nil parameters:nil];
//
// _liveFireCountView = [[FUSLiveFireCountView alloc] initWithFrame:UIView.fus_screenFrame withUid:[[FUSLiveHelper shareInstance]roomInfoModel].roomId];
// [_liveFireCountView fus_showViewWithView:[self fus_viewWithLayer:FUSLiveFunctionLayerManualPopView]];
// _liveFireCountView.didClickUserBlock = ^(NSString *uid) {
// FUSMyZoneViewController *zoneVC = [[FUSMyZoneViewController alloc]init];
// zoneVC.zoneUid = uid;
// [[weakSelf getViewController].navigationController pushViewController:zoneVC animated:YES];
// };
// _liveFireCountView.dismissBlock = ^{
// [[FUSLiveHelper shareInstance] fus_setupScrollToSwitchRoomEnable:YES];
// };
// // 设置弹出时不能滚动
// [[FUSLiveHelper shareInstance] fus_setupScrollToSwitchRoomEnable:NO];
}
/**
......@@ -5867,7 +5853,7 @@ FUSLinkMicUserListDelegate
if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) return;
FUSRoomUserInfoModel *userInfoModel = [[FUSRoomUserInfoModel alloc] init];
[userInfoModel fus_setValueWithModel:[FUSLiveHelper shareInstance].roomInfoModel];
// [weakSelf.userInfoView fus_showWithUID:[FUSLiveHelper shareInstance].roomInfoModel.owner withModel:userInfoModel];
// [weakSelf.userInfoView fus_showWithUID:[FUSLiveHelper shareInstance].roomInfoModel.owner withModel:userInfoModel];
[weakSelf.userInfoView fus_showUserInfoViewWithUserInfoViewType:FUSUserInfoViewTypeLive userInfoModel:userInfoModel shouldRequestData:YES];
};
// 点击榜单说明
......@@ -5889,7 +5875,7 @@ FUSLinkMicUserListDelegate
}
- (void)fus_headViewLikeSucceed {
// [self.hostInfoView fus_updateLikeState:[[FUSLiveHelper shareInstance].roomInfoModel.liked boolValue]];
// [self.hostInfoView fus_updateLikeState:[[FUSLiveHelper shareInstance].roomInfoModel.liked boolValue]];
}
#pragma mark - Emitter Delegate
......@@ -6022,7 +6008,7 @@ FUSLinkMicUserListDelegate
if (self.delegate && [self.delegate respondsToSelector:@selector(fus_liveFunctionViewExitLinkMicRoomLeftRoom:completed:)]) {
[self.delegate fus_liveFunctionViewExitLinkMicRoomLeftRoom:self completed:completed];
}
// [self.pkHelper fus_removeAllNotification];
// [self.pkHelper fus_removeAllNotification];
}
/// 触发最小化
......
FuSiLive/Classes/Setting/Controller/FUSPrivacySettingViewController.m
......@@ -38,12 +38,6 @@
[[NSUserDefaults standardUserDefaults] setObject:@(item.currentSwitchState) forKey:SETTING_LAUNCH_SOUND_SWITCH_BOOL];
};
FUSCustomSettingItem *item3 = [FUSCustomSettingItem fus_itemWithTitle:[NSString fus_localString:@"菜单音效"] type:CustomSettingItemTypeSwitch];
item3.switchState = [[[NSUserDefaults standardUserDefaults] objectForKey:TABBAR_ITEM_SOUND] boolValue];
item3.switchClick = ^(FUSCustomSettingItem *item) {
[[NSUserDefaults standardUserDefaults] setObject:@(item.currentSwitchState) forKey:TABBAR_ITEM_SOUND];
};
FUSCustomSettingItem *item4 = [FUSCustomSettingItem fus_itemWithTitle:[NSString fus_localString:@"定位"] type:CustomSettingItemTypeSwitch];
NSNumber *locationNum = [[NSUserDefaults standardUserDefaults] objectForKey:PRIVACY_SET_POSITION_STATE];
item4.switchState = [locationNum intValue] == 0 ? YES : NO;
......
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