Skip to content

pidan / FuSiLive

Go to a project
Commit 6b43ca63 by pidan
Options

1、App改名 

2、Mp4礼物相关的bug
3、fixed 背包礼物送完没有连送按钮的问题
parent 06659a55
Inline Side-by-side
Showing with 140 additions and 99 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/FUSGiftCenter/DataCenter/Model/FUSMotorDataModel.h
......@@ -49,4 +49,6 @@
/// 播放座驾音效
-(void)fus_playMotorAudioIfNeeded;
- (BOOL)fus_needPlayAudio;
@end
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/FUSGiftCenter/DataCenter/Model/FUSMotorDataModel.m
......@@ -13,16 +13,8 @@
@implementation FUSMotorDataModel
- (void)fus_playMotorAudioIfNeeded{
BOOL audioresourceIsNull = [NSString isNullWithString:self.audioresource];
BOOL localEnterRoomCarAudioSwitch = [FUSCacheDataShare shareStore].settingInitDataModel.localEnterRoomCarAudioSwitch == YES;
BOOL myselfIsOnMic = [FUSRouter liveRouter].selfOnMicList;
BOOL isNotAnchor = ![[FUSRouter liveRouter] isAnchor];
BOOL isPlayOnSpeaker = [[FUSAudioHelper shareInstance] isPlayOnSpeaker];
if (!audioresourceIsNull
&& localEnterRoomCarAudioSwitch
&& ((!myselfIsOnMic
&& isNotAnchor)
|| !isPlayOnSpeaker)) {
if ([self fus_needPlayAudio]) {
if ([[FUSGiftDataCenter sharedCenter] fus_checkGiftResourceExitWithURL:self.audioresource resourceMD5:nil]) {
......@@ -38,4 +30,18 @@
}
}
- (BOOL)fus_needPlayAudio {
BOOL audioresourceIsNull = [NSString isNullWithString:self.audioresource];
BOOL localEnterRoomCarAudioSwitch = [FUSCacheDataShare shareStore].settingInitDataModel.localEnterRoomCarAudioSwitch == YES;
BOOL myselfIsOnMic = [FUSRouter liveRouter].selfOnMicList;
BOOL isNotAnchor = ![[FUSRouter liveRouter] isAnchor];
BOOL isPlayOnSpeaker = [[FUSAudioHelper shareInstance] isPlayOnSpeaker];
return (!audioresourceIsNull
&& localEnterRoomCarAudioSwitch
&& ((!myselfIsOnMic
&& isNotAnchor)
|| !isPlayOnSpeaker));
}
@end
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/FUSGiftCenter/NormalGift/Model/FUSLiveStickerModel.h
......@@ -36,6 +36,9 @@ NS_ASSUME_NONNULL_BEGIN
// zip资源md5
@property (nonatomic, copy) NSString *resMd5;
/// 展示状态（0：不展示、1：展示）
@property (nonatomic, assign) BOOL inShow;
// 解压后的地址
@property (nonatomic, copy, readonly) NSString *unzipPath;
......
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h
......@@ -30,6 +30,9 @@ NS_ASSUME_NONNULL_BEGIN
- (FUSHomePageBaseView *)homeMyPage;
#pragma mark - Public ViewController
- (void)fus_checkAppStatus;
- (void)fus_enterUserZone:(NSString *)userId;
- (void)fus_enterUserZone:(NSString *)userId isFromLiveRoomChat:(BOOL)isFromLiveRoomChat;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese.strings
"告诉朋友前往应用商店搜寻“FusiYa”" = "告诉朋友前往应用商店搜寻“富西屋”";
"告诉朋友前往应用商店搜寻“FusiYa”" = "告诉朋友前往应用商店搜寻“FusiYa”";
"告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词" = "告诉朋友前往自己手机熟悉的应用商店,并搜寻“富西屋” 关键词";
"告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词" = "告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词";
"很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的关注!" = "很遗憾，您的年龄未满足富西屋的注册条件。但是还是非常感谢对我们的关注!";
"很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的关注!" = "很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的关注!";
"回撩并关注" = "回撩并追踪";
......@@ -14,7 +14,7 @@
"已关注的主播开播时的通知" = "已追踪的主播开播时的通知";
"嗨，我刚加入FusiYa，希望和你成为朋友。" = "嗨，我刚加入富西屋，希望和你成为朋友";
"嗨，我刚加入FusiYa，希望和你成为朋友。" = "嗨，我刚加入FusiYa，希望和你成为朋友";
"私房信用：" = "私房信用：";
......@@ -914,7 +914,7 @@
"跳过" = "跳过";
"很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的追踪!" = "很遗憾，您的年龄未满足富西屋的注册条件。但是还是非常感谢对我们的追踪!";
"很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的追踪!" = "很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的追踪!";
"1分 (很差)" = "1分 (很差)";
......@@ -1010,7 +1010,7 @@
"暂无可领取的奖励" = "暂无可领取的奖励";
"请维护聊天秩序，勿传播低俗、引诱、暴露图片、敏感内容及广告等，违者将封停帐号。FusiYa一刻，包你欢乐！" = "请维护聊天秩序，勿传播低俗、引诱、暴露图片、敏感内容及广告等，违者将封停帐号。富西屋一刻，包你欢乐！";
"请维护聊天秩序，勿传播低俗、引诱、暴露图片、敏感内容及广告等，违者将封停帐号。FusiYa一刻，包你欢乐！" = "请维护聊天秩序，勿传播低俗、引诱、暴露图片、敏感内容及广告等，违者将封停帐号。FusiYa一刻，包你欢乐！";
"正在通話中，不能播放語音哦" = "正在通话中，不能播放语音哦";
......@@ -1134,7 +1134,7 @@
"宝石奖励" = "宝石奖励";
"FusiYa 新星" = "富西屋 新星";
"FusiYa 新星" = "FusiYa 新星";
"网络异常，请检查网络连接" = "网络异常，请检查网络连接";
......@@ -1746,7 +1746,7 @@
"亲密度达到%@后，回复私信将无露水奖励" = "亲密度达到%@后，回复私信将无露水奖励";
"手机的位置服务未开放，无法使用此功能。请设置并允许FusiYa访问位置信息" = "手机的位置服务未开启，无法使用此功能。请设置并允许富西屋访问位置信息";
"手机的位置服务未开放，无法使用此功能。请设置并允许FusiYa访问位置信息" = "手机的位置服务未开启，无法使用此功能。请设置并允许FusiYa访问位置信息";
"上榜" = "上榜";
......@@ -1972,13 +1972,13 @@
"1.請提供高清品質的圖片作為頭像和封面。\n2.請確認您的頭像和封面不涉及違反您所在國法律的內容。\n3.請確認您的頭像和封面沒有涉及暴力和過度暴露、色情的圖片。\n4.請確認您的頭像和封面尊重您社交群體的文化。" = "1.请提供高清品质的图片作为头像和封面。\n2.请确认您的头像和封面不涉及违反您所在国法律的内容。\n3.请确认您的头像和封面没有涉及暴力和过度暴露、色情的图片。\n4.请确认您的头像和封面尊重您社交群体的文化。";
"FusiYa Share" = "富西屋 Share";
"FusiYa Share" = "FusiYa Share";
"表情" = "表情";
"性别：" = "性别：";
"FusiYa" = "富西屋";
"FusiYa" = "FusiYa";
"反馈问题" = "反馈问题";
......@@ -1996,7 +1996,7 @@
"全部" = "全部";
"输入FusiYa用户的昵称或ID进行搜索" = "输入富西屋用户的昵称或ID进行搜索";
"输入FusiYa用户的昵称或ID进行搜索" = "输入FusiYa用户的昵称或ID进行搜索";
"明天" = "明日";
......@@ -2028,7 +2028,7 @@
"樱花" = "樱花";
"嗨，我刚加入FusiYa，希望和你成为朋友。" = "嗨，我刚加入富西屋，希望和你成为朋友";
"嗨，我刚加入FusiYa，希望和你成为朋友。" = "嗨，我刚加入FusiYa，希望和你成为朋友";
"连麦成功" = "连麦成功";
......@@ -2046,7 +2046,7 @@
"成功" = "成功";
"请勿使用第三方平台进行交易，谨防被骗。一经查出永久封号冻结余额，FusiYa将保留追求相关法律责任的权利，平台只认可FusiYa内的记录作为有效凭证" = "请勿使用第三方平台进行交易，谨防被骗。一经查出永久封号冻结余额，富西屋将保留追求相关法律责任的权利，平台只认可富西屋内的记录作为有效凭证";
"请勿使用第三方平台进行交易，谨防被骗。一经查出永久封号冻结余额，FusiYa将保留追求相关法律责任的权利，平台只认可FusiYa内的记录作为有效凭证" = "请勿使用第三方平台进行交易，谨防被骗。一经查出永久封号冻结余额，FusiYa将保留追求相关法律责任的权利，平台只认可FusiYa内的记录作为有效凭证";
"本地错误" = "本地错误";
......@@ -2094,7 +2094,7 @@
"Twitter 登录失败，请开启访问系统 Twitter 账户权限" = "Twitter 登入失败，请开启访问系统 ​​Twitter 帐号权限";
"输入FusiYa ID或昵称" = "输入富西屋 ID或昵称";
"输入FusiYa ID或昵称" = "输入FusiYa ID或昵称";
"还没工作呢" = "还没工作呢";
......@@ -2112,7 +2112,7 @@
"给个好评" = "给个好评";
"FusiYa ID" = "富西屋 ID";
"FusiYa ID" = "FusiYa ID";
"往期" = "往期";
......@@ -2694,7 +2694,7 @@
"人气" = "人气";
"需要獲取所有照片權限，請在「設置」-「FusiYa」-「照片」中選擇「所有照片」" = "需要获取所有照片权限，请在「设置」-「富西屋」-「照片」中选择「所有照片」";
"需要獲取所有照片權限，請在「設置」-「FusiYa」-「照片」中選擇「所有照片」" = "需要获取所有照片权限，请在「设置」-「FusiYa」-「照片」中选择「所有照片」";
"人气直播PK" = "人气直播PK";
......@@ -2786,7 +2786,7 @@
"上一月" = "上一月";
"FusiYa" = "富西屋";
"FusiYa" = "FusiYa";
"更高的清晰度对手机性能、网络性能要求更高。请确保手机散热良好，网络连接通畅。" = "更高的清晰度对手机性能、网络性能要求更高。请确保手机散热良好，网络连接通畅。";
......@@ -2894,7 +2894,7 @@
"将带有下载二维码的QRCode图传送给朋友" = "将带有下载二维码的QRCode图传送给朋友";
"告诉朋友前往应用商店搜寻“FusiYa”" = "告诉朋友前往应用商店搜寻“富西屋”";
"告诉朋友前往应用商店搜寻“FusiYa”" = "告诉朋友前往应用商店搜寻“FusiYa”";
"我的使者码" = "我的使者码";
......@@ -2936,7 +2936,7 @@
"保存您的邀请QRCode图片，新玩家通过扫描QRCode可以下载" = "保存您的邀请QRCode图片，新玩家通过扫描QRCode可以下载";
"告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词" = "告诉朋友前往自己手机熟悉的应用商店,并搜寻“富西屋” 关键词";
"告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词" = "告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词";
"部分地区新玩家注册的时候需要填写邀请码才可以完成注册流程" = "部分地区新玩家註册的时候需要填写邀请码才可以完成註册流程";
......@@ -3020,7 +3020,7 @@
"获得族人奖励" = "获得族人奖励";
"您所在的中国大陆地区无法使用FusiYa" = "您所在的中国大陆地区无法使用富西屋";
"您所在的中国大陆地区无法使用FusiYa" = "您所在的中国大陆地区无法使用FusiYa";
"超过%@天" = "超过%@天";
......
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
"告诉朋友前往应用商店搜寻“FusiYa”" = "告訴朋友前往應用商店搜尋“富西屋”";
"告诉朋友前往应用商店搜寻“FusiYa”" = "告訴朋友前往應用商店搜尋“FusiYa”";
"告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词" = "告訴朋友前往自己手機熟悉的應用商店,並搜尋“富西屋” 關鍵詞";
"告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词" = "告訴朋友前往自己手機熟悉的應用商店,並搜尋“FusiYa” 關鍵詞";
"很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的关注!" = "很遺憾，您的年龄未滿足富西屋的註冊條件。但是還是非常感謝對我們的關注!";
"很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的关注!" = "很遺憾，您的年龄未滿足FusiYa的註冊條件。但是還是非常感謝對我們的關注!";
"回撩并关注" = "回撩並追蹤";
......@@ -14,7 +14,7 @@
"已关注的主播开播时的通知" = "已追蹤的主播開播時的通知";
"嗨，我刚加入FusiYa，希望和你成为朋友。" = "嗨，我剛加入富西屋，希望和你成為朋友";
"嗨，我刚加入FusiYa，希望和你成为朋友。" = "嗨，我剛加入FusiYa，希望和你成為朋友";
"私房信用：" = "私房信用：";
......@@ -914,7 +914,7 @@
"跳过" = "跳過";
"很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的追踪!" = "很遺憾，您的年龄未滿足富西屋的註冊條件。但是還是非常感謝對我們的追蹤!";
"很遗憾，您的年龄未满足FusiYa的注册条件。但是还是非常感谢对我们的追踪!" = "很遺憾，您的年龄未滿足FusiYa的註冊條件。但是還是非常感謝對我們的追蹤!";
"1分 (很差)" = "1分 (很差)";
......@@ -1010,7 +1010,7 @@
"暂无可领取的奖励" = "暫無可領取的獎勵";
"请维护聊天秩序，勿传播低俗、引诱、暴露图片、敏感内容及广告等，违者将封停帐号。FusiYa一刻，包你欢乐！" = "請維護聊天秩序，勿傳播低俗、引誘、暴露圖片、敏感內容及廣告等，違者將封停帳號。富西屋一刻，包你歡樂！";
"请维护聊天秩序，勿传播低俗、引诱、暴露图片、敏感内容及广告等，违者将封停帐号。FusiYa一刻，包你欢乐！" = "請維護聊天秩序，勿傳播低俗、引誘、暴露圖片、敏感內容及廣告等，違者將封停帳號。FusiYa一刻，包你歡樂！";
"正在通話中，不能播放語音哦" = "正在通話中，不能播放語音哦";
......@@ -1134,7 +1134,7 @@
"宝石奖励" = "寶石獎勵";
"FusiYa 新星" = "富西屋 新星";
"FusiYa 新星" = "FusiYa 新星";
"网络异常，请检查网络连接" = "網絡異常，請檢查網絡連接";
......@@ -1746,7 +1746,7 @@
"亲密度达到%@后，回复私信将无露水奖励" = "親密度達到%@後，回復私信將無露水獎勵";
"手机的位置服务未开放，无法使用此功能。请设置并允许FusiYa访问位置信息" = "手機的位置服務未開啟，無法使用此功能。請設置并允許富西屋訪問位置信息";
"手机的位置服务未开放，无法使用此功能。请设置并允许FusiYa访问位置信息" = "手機的位置服務未開啟，無法使用此功能。請設置并允許FusiYa訪問位置信息";
"上榜" = "上榜";
......@@ -1972,13 +1972,13 @@
"1.請提供高清品質的圖片作為頭像和封面。\n2.請確認您的頭像和封面不涉及違反您所在國法律的內容。\n3.請確認您的頭像和封面沒有涉及暴力和過度暴露、色情的圖片。\n4.請確認您的頭像和封面尊重您社交群體的文化。" = "1.請提供高清品質的圖片作為頭像和封面。\n2.請確認您的頭像和封面不涉及違反您所在國法律的內容。\n3.請確認您的頭像和封面沒有涉及暴力和過度暴露、色情的圖片。\n4.請確認您的頭像和封面尊重您社交群體的文化。";
"FusiYa Share" = "富西屋 Share";
"FusiYa Share" = "FusiYa Share";
"表情" = "表情";
"性别：" = "性別：";
"FusiYa" = "富西屋";
"FusiYa" = "FusiYa";
"反馈问题" = "反饋問題";
......@@ -1996,7 +1996,7 @@
"全部" = "全部";
"输入FusiYa用户的昵称或ID进行搜索" = "輸入富西屋用戶的暱稱或ID進行搜索";
"输入FusiYa用户的昵称或ID进行搜索" = "輸入FusiYa用戶的暱稱或ID進行搜索";
"明天" = "明日";
......@@ -2028,7 +2028,7 @@
"樱花" = "櫻花";
"嗨，我刚加入FusiYa，希望和你成为朋友。" = "嗨，我剛加入富西屋，希望和你成為朋友";
"嗨，我刚加入FusiYa，希望和你成为朋友。" = "嗨，我剛加入FusiYa，希望和你成為朋友";
"连麦成功" = "連麥成功";
......@@ -2046,7 +2046,7 @@
"成功" = "成功";
"请勿使用第三方平台进行交易，谨防被骗。一经查出永久封号冻结余额，FusiYa将保留追求相关法律责任的权利，平台只认可FusiYa内的记录作为有效凭证" = "請勿使用第三方平台進行交易，謹防被騙。一經查出永久封號凍結餘額，富西屋將保留追求相關法律責任的權利，平台只認可富西屋內的記錄作為有效憑證";
"请勿使用第三方平台进行交易，谨防被骗。一经查出永久封号冻结余额，FusiYa将保留追求相关法律责任的权利，平台只认可FusiYa内的记录作为有效凭证" = "請勿使用第三方平台進行交易，謹防被騙。一經查出永久封號凍結餘額，FusiYa將保留追求相關法律責任的權利，平台只認可FusiYa內的記錄作為有效憑證";
"本地错误" = "本地錯誤";
......@@ -2094,7 +2094,7 @@
"Twitter 登录失败，请开启访问系统 Twitter 账户权限" = "Twitter 登入失敗，請開啟訪問系統 ​​Twitter 帳號權限";
"输入FusiYa ID或昵称" = "輸入富西屋 ID或暱稱";
"输入FusiYa ID或昵称" = "輸入FusiYa ID或暱稱";
"还没工作呢" = "還沒工作呢";
......@@ -2112,7 +2112,7 @@
"给个好评" = "給個好評";
"FusiYa ID" = "富西屋 ID";
"FusiYa ID" = "FusiYa ID";
"往期" = "往期";
......@@ -2694,7 +2694,7 @@
"人气" = "人氣";
"需要獲取所有照片權限，請在「設置」-「FusiYa」-「照片」中選擇「所有照片」" = "需要獲取所有照片權限，請在「設置」-「富西屋」-「照片」中選擇「所有照片」";
"需要獲取所有照片權限，請在「設置」-「FusiYa」-「照片」中選擇「所有照片」" = "需要獲取所有照片權限，請在「設置」-「FusiYa」-「照片」中選擇「所有照片」";
"人气直播PK" = "人氣直播PK";
......@@ -2786,7 +2786,7 @@
"上一月" = "上一月";
"FusiYa" = "富西屋";
"FusiYa" = "FusiYa";
"更高的清晰度对手机性能、网络性能要求更高。请确保手机散热良好，网络连接通畅。" = "更高的清晰度對手機性能、網絡性能要求更高。請確保手機散熱良好，網絡連接通暢。";
......@@ -2894,7 +2894,7 @@
"将带有下载二维码的QRCode图传送给朋友" = "將帶有下載二維碼的QRCode圖傳送給朋友";
"告诉朋友前往应用商店搜寻“FusiYa”" = "告訴朋友前往應用商店搜尋“富西屋”";
"告诉朋友前往应用商店搜寻“FusiYa”" = "告訴朋友前往應用商店搜尋“FusiYa”";
"我的使者码" = "我的使者碼";
......@@ -2936,7 +2936,7 @@
"保存您的邀请QRCode图片，新玩家通过扫描QRCode可以下载" = "保存您的邀請QRCode圖片，新玩家通過掃描QRCode可以下載";
"告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词" = "告訴朋友前往自己手機熟悉的應用商店,並搜尋“富西屋” 關鍵詞";
"告诉朋友前往自己手机熟悉的应用商店,并搜寻“FusiYa” 关键词" = "告訴朋友前往自己手機熟悉的應用商店,並搜尋“FusiYa” 關鍵詞";
"部分地区新玩家注册的时候需要填写邀请码才可以完成注册流程" = "部分地區新玩家註冊的時候需要填寫邀請碼才可以完成註冊流程";
......@@ -3020,7 +3020,7 @@
"获得族人奖励" = "獲得族人獎勵";
"您所在的中国大陆地区无法使用FusiYa" = "您所在的中國大陸地區無法使用富西屋";
"您所在的中国大陆地区无法使用FusiYa" = "您所在的中國大陸地區無法使用FusiYa";
"超过%@天" = "超過%@天";
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSAlphaVideoPlayView/FUSAlphaVideoPlayView.h
......@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) BOOL shouldRepeat;
- (void)fus_startWithVideoUrl:(NSURL *)videoUrl;
- (void)fus_startWithVideoUrl:(NSURL *)videoUrl playAudio:(BOOL)playAudio;
- (void)fus_resumePlay;
- (void)fus_stopPlay;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSAlphaVideoPlayView/FUSAlphaVideoPlayView.m
......@@ -58,7 +58,12 @@
self.filterView.frame = filterFrame;
}
- (void)fus_startWithVideoUrl:(NSURL *)videoUrl {
[self fus_startWithVideoUrl:videoUrl playAudio:true];
}
- (void)fus_startWithVideoUrl:(NSURL *)videoUrl playAudio:(BOOL)playAudio {
NSLog(@"test ffloadWebpImageWithURL 1 %@",videoUrl);
if (self.movie) {
......@@ -112,9 +117,11 @@
[_filter addTarget:self.filterView];
AVPlayerItem *playItem = [[AVPlayerItem alloc] initWithURL:videoUrl];
self.audioPlayer = [AVPlayer playerWithPlayerItem:playItem];
[self.audioPlayer play];
if (playAudio) {
AVPlayerItem *playItem = [[AVPlayerItem alloc] initWithURL:videoUrl];
self.audioPlayer = [AVPlayer playerWithPlayerItem:playItem];
[self.audioPlayer play];
}
[self.movie startProcessing];
}
......
FuSiLive.xcodeproj/project.pbxproj
......@@ -487,7 +487,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20250402113555;
CURRENT_PROJECT_VERSION = 202505290002;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO;
......@@ -522,7 +522,7 @@
"$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.4;
OTHER_CFLAGS = (
"$(inherited)",
"-isystem",
......@@ -755,7 +755,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = FuSiLive/FuSiLive.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20250402113555;
CURRENT_PROJECT_VERSION = 202505290002;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 6GG26BHUMC;
ENABLE_ON_DEMAND_RESOURCES = NO;
......@@ -790,7 +790,7 @@
"$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 1.1;
MARKETING_VERSION = 1.4;
OTHER_CFLAGS = (
"$(inherited)",
"-isystem",
......
FuSiLive/AppDelegate.m
......@@ -75,10 +75,7 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
[Bifrost checkAllModulesWithSelector:@selector(application:didFinishLaunchingWithOptions:) arguments:@[application, launchOptions ?: @{}]];
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP];
// 请求sh状态
[self fus_checkAppStatus];
return YES;
}
......@@ -102,7 +99,7 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
if (status > 0 && !firstLaunchNetworkAllow) {
firstLaunchNetworkAllow = YES;
[self fus_checkAppStatus];
[FUSRouter.userRouter fus_checkAppStatus];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[FUSAPIDNSManager fus_checkCurrentDNSAddress];
[FUSEventTrack fus_initial];
......@@ -112,30 +109,6 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
}];
}
/**
请求APP状态
*/
- (void)fus_checkAppStatus {
[FUSCommonHttpRequest fus_checkAppStatuWithSuccess:^(NSString *appStatus) {
//黑名单帐号登录过
BOOL isCheckCountLogined = [[[NSUserDefaults standardUserDefaults] objectForKey:FUSUserUDKeys.fus_CHECKCOUNT_LOGINED] boolValue];
if (isCheckCountLogined) {
appStatus = @"1";
}
[[NSUserDefaults standardUserDefaults] setObject:appStatus forKey:kFUSConfigAppStatusUDKey];
[FUSLocalizationHelper fus_initLocalizationIfNeed];
[[NSNotificationCenter defaultCenter] postNotificationName:FUSConfig.sharedInstanced.devConfigs.appStatusUpdateNotificationKey object:nil];
} failure:^(NSString *msg) {
[FUSLocalizationHelper fus_initLocalizationIfNeed];
[[NSNotificationCenter defaultCenter] postNotificationName:FUSConfig.sharedInstanced.devConfigs.appStatusUpdateNotificationKey object:nil];
}];
}
// 支付回调, 9.0以后使用新API接口
- (BOOL)application:(UIApplication *)app openURL:(NSURL *)url options:(NSDictionary<NSString*, id> *)options
{
......
FuSiLive/Resources/LocalizationString/zh-Hans.lproj/InfoPlist.strings
......@@ -6,7 +6,7 @@
Copyright © 2018年 压寨团队. All rights reserved.
*/
"CFBundleDisplayName" = "富西屋";
"CFBundleDisplayName" = "FusiYa";
"NSCameraUsageDescription" = "開啟直播、聊天分享視頻或反饋舉報等功能，需要访问您的相機權限";
......
FuSiLive/Resources/LocalizationString/zh-Hant.lproj/InfoPlist.strings
......@@ -6,7 +6,7 @@
Copyright © 2018年 压寨团队. All rights reserved.
*/
"CFBundleDisplayName" = "富西屋";
"CFBundleDisplayName" = "FusiYa";
"NSCameraUsageDescription" = "開啟直播、聊天分享視頻或反饋舉報等功能，需要访问您的相機權限";
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Controller/FUSLiveMainViewController.m
......@@ -685,8 +685,7 @@ typedef NS_ENUM(NSInteger, FUSStreamState) {
[FUSLiveHelper shareInstance].roomInfoModel.reminderKeys = reminderKey;
[self.liveFunctionView.chatTableView fus_addEnterRoomSystemTipMessage];
[FUSLiveHttpHelper fus_enterRoomWithRoomId:[FUSLiveHelper shareInstance].roomInfoModel.roomId vdoid:[FUSLiveHelper shareInstance].streamModel.vdoid success:^(FUSRoomInfoModel *roomInfoModel,BOOL micMode, NSString *streamUrl, NSString *pkInfo) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHttpHelper.m
......@@ -2574,7 +2574,7 @@
/// 结束直播
+ (void)fus_requestEndLiveWithRoomId:(NSString *)roomid channelId:(NSString *)channelId succeed:(void (^)(NSDictionary *))succeed failure:(void (^)(NSString *, NSInteger))failure{
NSDictionary *parm = @{@"roomid": roomid,
@"channelId": channelId};
@"channelId": channelId ?: @""};
[FUSHttpHelper postRequestBinaryWithUrl:FUSShowRoomURLs.fus_URL_liveEnd params:parm success:^(NSDictionary * _Nullable dataDict, int code) {
succeed(dataDict);
} failure:^(NSDictionary * _Nullable dataDict, int code) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceListView.m
......@@ -16,6 +16,8 @@
@property (nonatomic, strong) UITableView *tableView;
@property (nonatomic, strong) FUSEmptyView *emptyView;
@property (nonatomic, strong) NSMutableArray<FUSOnlineUserModel *> *userList;
/// 用户uid列表
......@@ -53,6 +55,15 @@
self.tableView.tableFooterView = [[UIView alloc] init];
[self addSubview:self.tableView];
self.emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, 400)];
self.emptyView.contentAligment = FUSEmptyViewAligmentCenter;
[self.emptyView fus_setEmptyViewIcon:UIImage.fus_emptyImg title:[NSString fus_localString:@"暂无数据"] buttonTittle:nil];
self.emptyView.imageScale = 0.3;
self.emptyView.contentVerticalOffset = -20;
self.emptyView.backgroundColor = [UIColor clearColor];
__weak typeof(self) weakSelf = self;
self.tableView.mj_header = [FUSRefreshHeader headerWithRefreshingBlock:^{
[weakSelf fus_reloadData];
......@@ -199,6 +210,13 @@
}
[self.userList addObjectsFromArray:users];
if (self.userList.count > 0) {
self.tableView.tableFooterView = [[UIView alloc] init];
} else {
self.tableView.tableFooterView = self.emptyView;
[self.tableView.mj_footer endRefreshingWithNoMoreData];
}
[self.tableView reloadData];
if (self.totalUserChangedHandler && dataDict[@"total"]) {
NSInteger total = [dataDict[@"total"] integerValue];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBeautyStickerSettingView.swift
......@@ -80,8 +80,8 @@ public class FUSLiveBeautyStickerSettingView: UIView, UICollectionViewDelegate,
func fus_requestStickerList() {
FUSLoadingView.fus_showProgressView(withMessage: "")
FUSLiveHttpHelper.fus_requestLiveStickerList(FUSLiveHelper.shareInstance().roomInfoModel?.roomId ?? "") { (dataList:[FUSLiveStickerModel]?) in
self.stickerList = dataList
self.pageControl.numberOfPages = Int((dataList?.count ?? 0) / 8) + 1
self.stickerList = dataList?.filter({ $0.inShow == true })
self.pageControl.numberOfPages = Int((self.stickerList?.count ?? 0) / 8) + 1
self.collectionView.reloadData()
if UIView.appearance().semanticContentAttribute == UISemanticContentAttribute.forceRightToLeft {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
......@@ -2947,14 +2947,15 @@ UIGestureRecognizerDelegate
self.sendGiftInfoDic = notification.userInfo;
NSDictionary *sendGiftInfo = notification.userInfo;
FUSLiveGiftDataModel *giftModel = sendGiftInfo[@"giftModel"];
NSString *parcelStr = sendGiftInfo[@"parcel"];
// NSString *parcelStr = sendGiftInfo[@"parcel"];
NSString *isClickSendBtn = sendGiftInfo[@"send"];
if ([parcelStr isEqualToString:@"NO"]) {
// ludy:7580 gcp说背包礼物也得连送
// if ([parcelStr isEqualToString:@"NO"]) {
if ([isClickSendBtn isEqualToString:@"YES"]) {
[self fus_setDewGiftCountdownBtn];
}
_sendGiftCountdownBtn.backgroundImgName = giftModel.resource;
}
// _sendGiftCountdownBtn.backgroundImgName = giftModel.resource;
// }
}
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Other/FUSCarEnterView.m
......@@ -200,7 +200,7 @@
NSString *filePath = [FUSConfig.sharedInstanced.pathConfigs downloadResourcePath:self.motorModel.mp4Res pathMd5:self.motorModel.mp4Md5];
if (filePath.length > 0) {
dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf.playView fus_startWithVideoUrl:[NSURL fileURLWithPath:filePath]];
[weakSelf.playView fus_startWithVideoUrl:[NSURL fileURLWithPath:filePath] playAudio:[self.motorModel fus_needPlayAudio]];
[weakSelf fus_startEnterAnimation];
});
}
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Login/Other/FUSLoginHelper.m
......@@ -402,6 +402,8 @@
// 获取包房提示信息
[FUSCommonCacheOperate fus_getUpdateRoomTipMessageWithSuccess:nil failure:nil];
[FUSCommonCacheOperate updateCommonContentConfig];
[FUSRouter.userRouter fus_checkAppStatus];
// 获取视讯礼物更新
[[FUSGiftDataCenter sharedCenter] fus_fetchSingleChatConversationGiftDataWithType:ReadServerBegin success:nil failure:nil];
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m
......@@ -544,6 +544,7 @@
}];
}
- (void)logOut {
[[FUSLoginHelper sharedInstance] logOut];
}
......@@ -551,7 +552,8 @@
#pragma mark - UIApplicationDelegate
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary<UIApplicationLaunchOptionsKey,id> *)launchOptions {
// 请求sh状态
[self fus_checkAppStatus];
[self fus_startAPPPages];
......@@ -586,6 +588,30 @@
/**
请求APP状态
*/
- (void)fus_checkAppStatus {
[FUSCommonHttpRequest fus_checkAppStatuWithSuccess:^(NSString *appStatus) {
//黑名单帐号登录过
BOOL isCheckCountLogined = [[[NSUserDefaults standardUserDefaults] objectForKey:FUSUserUDKeys.fus_CHECKCOUNT_LOGINED] boolValue];
if (isCheckCountLogined) {
appStatus = @"1";
}
[[NSUserDefaults standardUserDefaults] setObject:appStatus forKey:kFUSConfigAppStatusUDKey];
[FUSLocalizationHelper fus_initLocalizationIfNeed];
[[NSNotificationCenter defaultCenter] postNotificationName:FUSConfig.sharedInstanced.devConfigs.appStatusUpdateNotificationKey object:nil];
} failure:^(NSString *msg) {
[FUSLocalizationHelper fus_initLocalizationIfNeed];
[[NSNotificationCenter defaultCenter] postNotificationName:FUSConfig.sharedInstanced.devConfigs.appStatusUpdateNotificationKey object:nil];
}];
}
- (CGFloat)remindTime {
NSDictionary *infoDic = [[NSUserDefaults standardUserDefaults] objectForKey:BOUND_AGENT_INFO];
......
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