Skip to content

pidan / FuSiLive

Go to a project
Commit 99995492 by ludi
Options

1.添加了一个更新客服已读的方法。 

2.修复本地化导致私聊声讯崩溃的bug
parent ecdcf290
Inline Side-by-side
Showing with 50 additions and 42 deletions
FuSiLive/Classes/Common/MainControllerHelper/FUSMainViewControllerHelper.m
......@@ -80,7 +80,7 @@
[[UIApplication sharedApplication].keyWindow bringSubviewToFront:[UIApplication sharedApplication].keyWindow.subviews.firstObject];
// 更新未讀消息
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
/**
......
FuSiLive/Classes/Foundation/Socket/SocketMessage/FUSSocketMessageDBOperate.m
......@@ -179,7 +179,7 @@
}
// 通知刷新寨信界面
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
// 消息数量置0
[self.classifyMessageDict removeAllObjects];
......
FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m
......@@ -67,6 +67,7 @@
webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
vc = webVC;
[UINavigationController fus_updateWebServicesReadStatus:serviceUID];
webVC.closeWebViewHandler = ^(NSInteger cidType) {
// 更新未读
[UINavigationController fus_updateWebServicesReadStatus:serviceUID];
......@@ -83,6 +84,7 @@
webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
vc = webVC;
[UINavigationController fus_updateWebServicesReadStatus:serviceUID];
webVC.closeWebViewHandler = ^(NSInteger cidType) {
// 更新未读
[UINavigationController fus_updateWebServicesReadStatus:serviceUID];
......@@ -105,7 +107,7 @@
+(void)fus_updateWebServicesReadStatus:(NSString *)serviceUID{
[FUSSingleChatDBOperate fus_updateReadStatusToSingleChatTableWithFid:serviceUID];
[FUSZhaiXinDBOperate fus_updateUnreadToZhaiXinInfosTableWithTypeId:[NSString stringWithFormat:@"%@%@",SINGLE_CHAT, serviceUID] unread:0];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessageHandler];
}
- (void)fus_pushToBuyVIPControllerWithAnimate:(BOOL)animate{
......
FuSiLive/Classes/InstantMessaging/Controller/FUSChatDetailViewController.m
......@@ -459,7 +459,7 @@
// 设置数据库所有消息已读
[[FUSIMChatService shareInstance] fus_setCurrentTalkAllMessageRead];
// 更新未读
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
[self fus_executeDefaultSetting];
}
......@@ -678,7 +678,7 @@
if (buttonIndex == 1) {
[[FUSIMChatService shareInstance] fus_deleteAllMessageWithTalkID:self.talkID];
[FUSZhaiXinDBOperate fus_deleteLastReceiveMessageWithTalkID:self.talkID];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
[self.chatDetailArr removeAllObjects];
[self.tableView reloadData];
}
......@@ -990,7 +990,7 @@
[self fus_refrshVideoCellWithProgress:100 refreshIndex:refreshIndex serverMsgID:serverMsgID];
if (![FUSIMChatService shareInstance].chatDelegate) {
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
}
......@@ -1184,7 +1184,7 @@
// 设置数据库所有消息已读
[[FUSIMChatService shareInstance] fus_setCurrentTalkAllMessageRead];
// 更新会话列表
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
......
FuSiLive/Classes/InstantMessaging/Other/FUSIMChatService.h
......@@ -230,9 +230,12 @@
- (void)fus_sendAllUnreadMessageReadAck;
/**
更新所有会话到最新的消息
延迟 --- 更新所有会话到最新的消息
*/
- (void)fus_updateTalkListToLastMessage;
- (void)fus_delayUpdateTalkListToLastMessage;
/// 立刻--- 更新所有会话到最新的消息
-(void)fus_updateTalkListToLastMessageHandler;
/**
删除一条会话中的所有消息
......
FuSiLive/Classes/InstantMessaging/Other/FUSIMChatService.m
......@@ -446,21 +446,21 @@
// }
}
- (void)fus_updateTalkListToLastMessage
- (void)fus_delayUpdateTalkListToLastMessage
{
FUSLogInfo(@"pierce:fus_updateTalkListToLastMessage");
if ([NSThread isMainThread]) {
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_delayUpdateTalkListToLastMessage) object:nil];
[self performSelector:@selector(fus_delayUpdateTalkListToLastMessage) withObject:nil afterDelay:0.5];
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_updateTalkListToLastMessageHandler) object:nil];
[self performSelector:@selector(fus_updateTalkListToLastMessageHandler) withObject:nil afterDelay:0.5];
} else {
dispatch_async(dispatch_get_main_queue(), ^{
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_delayUpdateTalkListToLastMessage) object:nil];
[self performSelector:@selector(fus_delayUpdateTalkListToLastMessage) withObject:nil afterDelay:0.5];
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_updateTalkListToLastMessageHandler) object:nil];
[self performSelector:@selector(fus_updateTalkListToLastMessageHandler) withObject:nil afterDelay:0.5];
});
}
}
- (void)fus_delayUpdateTalkListToLastMessage
- (void)fus_updateTalkListToLastMessageHandler
{
NSArray *latestTalkList = [[EMClient sharedClient].chatManager getAllConversations];
[self fus_transformSdkListToTalkList:latestTalkList needCombinationOldTalkList:YES];
......@@ -807,7 +807,7 @@
[FUSLoadingView fus_dismissProgressView];
if (!_chatDelegate) {
// [self fus_updateTalkListToLastMessage];
// [self fus_delayUpdateTalkListToLastMessage];
// [[NSNotificationCenter defaultCenter] postNotificationName:ZhaiXin_Refresh object:nil];
}
......@@ -1675,7 +1675,7 @@
}
}else{ // 界面外更新未读消息
[self fus_updateTalkListToLastMessage];
[self fus_delayUpdateTalkListToLastMessage];
if (sysType == FUSSystemNoticeTypeReceivePrivateVoiceLive || sysType == FUSSystemNoticeTypeReceivePrivateVideoLive) {
[FUSSoundAndVibrateHelper fus_playSystemSoundAndVibrate];
}
......@@ -1758,7 +1758,7 @@
}
}else{ // 界面外
[self fus_updateTalkListToLastMessage];
[self fus_delayUpdateTalkListToLastMessage];
[FUSSoundAndVibrateHelper fus_playSystemSoundAndVibrate];
}
}
......@@ -2378,7 +2378,7 @@
if (!self.chatDelegate) {
// 发通知刷新寨信,修改发送状态
[self fus_updateTalkListToLastMessage];
[self fus_delayUpdateTalkListToLastMessage];
}
if (!error) {
......@@ -3597,7 +3597,7 @@
[_chatDelegate fus_triggerMessagesReceiveEvent:newMessageList];
}
}else{ // 界面外
[self fus_updateTalkListToLastMessage];
[self fus_delayUpdateTalkListToLastMessage];
[FUSSoundAndVibrateHelper fus_playSystemSoundAndVibrate];
}
......
FuSiLive/Classes/InstantMessaging/Other/FUSIMUserService.m
......@@ -175,7 +175,7 @@
}
// 更新到最新的会话
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
});
......@@ -209,7 +209,7 @@
dispatch_async(dispatch_get_main_queue(), ^{
// 更新到最新的离线会话
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
});
}
}];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/MessageBox/FUSLiveMessageBoxView.m
......@@ -206,7 +206,7 @@ static dispatch_queue_t get_live_message_box_parse_queue(){
// 发通知刷新寨信
if (![FUSIMChatService shareInstance].chatDelegate) {
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
[FUSDialogView fus_showDialog:[NSString fus_localString:@"所有私信已忽略"]];
......@@ -447,7 +447,7 @@ static dispatch_queue_t get_live_message_box_parse_queue(){
[[FUSIMChatService shareInstance] fus_deleteAllMessageWithTalkID:model.uid];
}
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
[weakSelf.tableView beginUpdates];
[weakSelf.dataSource removeObjectAtIndex:indexPath.row];
......
FuSiLive/Classes/NewsFeed/Controller/FUSNewsFeedListViewController.m
......@@ -47,7 +47,7 @@
[self configNavigation];
[[NSUserDefaults standardUserDefaults] setObject:@(NO) forKey:HAS_NEWS_FEED_NEW_PUBLISHED([FUSCacheDataShare shareStore].userDetailInfo.uid)];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
- (void)viewWillAppear:(BOOL)animated {
......@@ -299,7 +299,7 @@
NSInteger unhandleCount = [[[NSUserDefaults standardUserDefaults] objectForKey:NEWS_FEED_NEW_FOCUS_PUBLISH_COUNT([FUSCacheDataShare shareStore].userDetailInfo.uid)] integerValue];
if (unhandleCount > 0) {
[[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:NEWS_FEED_NEW_FOCUS_PUBLISH_COUNT([FUSCacheDataShare shareStore].userDetailInfo.uid)];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
}
if (FUSRTL.isRTL) {
......
FuSiLive/Classes/NewsFeed/Controller/FUSNewsFeedMessageViewController.m
......@@ -38,7 +38,7 @@
[self fus_loadData];
[[NSUserDefaults standardUserDefaults] setObject:@(0) forKey:NEWS_FEED_UNHANDLE_COUNT([FUSCacheDataShare shareStore].userDetailInfo.uid)];
[[NSNotificationCenter defaultCenter] postNotificationName:FUS_NEWS_FEED_DID_RECEIVE_MESSAGE_NOTIFICATION object:nil];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[FUSNewsFeedNoticeShownHelper fus_showEnterFeedMessagePageAlertIfNeeded];
......
FuSiLive/Classes/NewsFeed/Other/FUSNewsFeedNoticeShownHelper.m
......@@ -77,7 +77,7 @@
[FUSZhaiXinDBOperate fus_writeMultiDataToZhaiXinInfosTableWithModelArray:@[model] keyArray:@[@"typeId"]];
// 通知刷新寨信界面
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
} failure:^(NSString * _Nonnull msg, int code) {
......
FuSiLive/Classes/NewsFeed/RichEditor/TZImagePickerController/TZPhotoPickerController.m
......@@ -143,7 +143,7 @@ static CGFloat collectionViewMargin = 0;
_selectedStyleBtn = [FUSStyleButton buttonWithType:UIButtonTypeCustom];
_selectedStyleBtn.frame = CGRectMake(0, 0, 60, 30);
[_selectedStyleBtn setTitle:[NSString fus_localString:@"完成"] forState:UIControlStateNormal];
_selectedStyleBtn.style = FUSButtonStyleBlueBorder;
_selectedStyleBtn.style = FUSButtonStyleBlue;
_selectedStyleBtn.titleLabel.font = [UIFont systemFontOfSize:13];
[_selectedStyleBtn addTarget:self action:@selector(doneButtonClick) forControlEvents:UIControlEventTouchUpInside];
_selectedStyleBtn.enabled = NO;
......
FuSiLive/Classes/SingleChat/Main/Controller/FUSSingleChatViewController.m
......@@ -85,7 +85,7 @@
// 更新未读
[FUSSingleChatDBOperate fus_updateReadStatusToSingleChatTableWithFid:self.uid];
[FUSZhaiXinDBOperate fus_updateUnreadToZhaiXinInfosTableWithTypeId:[NSString stringWithFormat:@"%@%@",SINGLE_CHAT, self.uid] unread:0];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
// 注册通知
[self registerNotification];
......
FuSiLive/Classes/ZhaiXin/Main/Controller/FUSSingleLiveRecordViewController.m
......@@ -125,7 +125,7 @@
{
NSString *uid = [[[FUSCacheDataShare shareStore] userDetailInfo] uid];
[[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:FUSBO_SINGLE_LIVE_RECORD_COUNT(uid)];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
- (void)loadSingleLiveRecordList
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSZhaiXinTableView.m
......@@ -169,7 +169,7 @@
[self.viewController.navigationController pushViewController:newsfeedVc animated:YES];
[FUSZhaiXinDBOperate fus_updateUnreadToZhaiXinInfosTableWithTypeId:NEWS_FEED_MESSAGE unread:0];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
}
......@@ -245,7 +245,7 @@
[[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:FUSBO_SINGLE_LIVE_RECORD_COUNT(uid)];
}
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
- (void)zhaiXinRefresh
......
FuSiLive/Classes/ZhaiXin/Official/Controller/FUSOfficialViewController.m
......@@ -198,7 +198,7 @@
break;
}
[FUSZhaiXinDBOperate fus_updateUnreadToZhaiXinInfosTableWithTypeId:typeId unread:0];
[[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
[[FUSIMChatService shareInstance] fus_delayUpdateTalkListToLastMessage];
}
- (void)onClickNavBackBtn
......
FuSiLive/FUSAPPConfigs/FUSFuSiWebViewEventHelper.m
......@@ -975,8 +975,11 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey";
if ([dataDict[@"isBox"] boolValue]) {
return;
}
BOOL hideTitle = [dataDict[@"hideTitle"] boolValue];
FUSWKWebViewController *wkVc = [[FUSWKWebViewController alloc] init];
wkVc.needHideWebTitleBar = hideTitle;
wkVc.webUrlString = openURLString;
wkVc.shouldShowShareBtn = shouldShare;
if ([self.wkVC isKindOfClass:[FUSWKWebViewController class]]) {
......
FuSiLive/Resources/LocalizationString/Fusi_Arbic.strings
......@@ -326,7 +326,7 @@
"宝石储值" = "شحن GEMs";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "رصيد الجانب الآخر أقل من %1$s، مما قد ينطوي على مخاطر ائتمانية محتملة، هل تريد الاستمرار في الاتصال؟";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "رصيد الجانب الآخر أقل من %.1f، مما قد يكون له مخاطر ائتمانية محتملة، هل تريد الاستمرار في الاتصال؟";
"录制时长最短3秒。" = "Record time are 3 seconds at least";
......
FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings
......@@ -332,7 +332,7 @@
"宝石储值" = "寶石儲值";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "對方的信用指數低於%1$s分，可能存在一定的信用風險，確認繼續通話嗎？";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "對方的信用指數低於%.1f分，可能存在一定的信用風險，確認繼續通話嗎？";
"录制时长最短3秒。" = "錄製時長最短3秒";
......
FuSiLive/Resources/LocalizationString/Fusi_Chinese_Traditional.strings
......@@ -332,7 +332,7 @@
"宝石储值" = "寶石儲值";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "對方的信用指數低於%1$s分，可能存在一定的信用風險，確認繼續通話嗎？";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "對方的信用指數低於%.1f分，可能存在一定的信用風險，確認繼續通話嗎？";
"录制时长最短3秒。" = "錄製時長最短3秒";
......
FuSiLive/Resources/LocalizationString/Fusi_English.strings
......@@ -332,7 +332,7 @@
"宝石储值" = "Recharge GEMs";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "The credit of the other side is lower than %1$s,which may have potential credit risk ,continue to call?";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "The credit of the other side is lower than %.1f,which may have potential credit risk ,continue to call?";
"录制时长最短3秒。" = "Record time are 3 seconds at least";
......
FuSiLive/Resources/LocalizationString/Fusi_Indonesian.strings
......@@ -328,7 +328,7 @@
"宝石储值" = "Tambahkan Saldo GEMs";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "Kredit pihak lain lebih rendah dari %1$s, yang mungkin memiliki potensi risiko kredit, terus menelepon?";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "Kredit pihak lain lebih rendah dari %.1f, yang mungkin memiliki potensi risiko kredit, terus menelepon?";
"录制时长最短3秒。" = "Record time are 3 seconds at least";
......
FuSiLive/Resources/LocalizationString/Fusi_Japanese.strings
......@@ -330,7 +330,7 @@
"宝石储值" = "GEMsをトップアップ";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "相手側の信用度は %1$s より低いため、信用リスクがある可能性があります。引き続き電話をかけますか?";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "相手側の信用度は %.1f より低いため、潜在的な信用リスクがある可能性があります。引き続き電話をかけますか?";
"录制时长最短3秒。" = "Record time are 3 seconds at least";
......
FuSiLive/Resources/LocalizationString/Fusi_Thai.strings
......@@ -328,7 +328,7 @@
"宝石储值" = "เติมเงิน GEMs";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "เครดิตของอีกฝั่งต่ำกว่า %1$s ซึ่งอาจมีความเสี่ยงด้านเครดิต เรียกต่อไปหรือไม่?";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "เครดิตของอีกฝ่ายต่ำกว่า %.1f ซึ่งอาจมีความเสี่ยงด้านเครดิต เรียกต่อไปหรือไม่?";
"录制时长最短3秒。" = "Record time are 3 seconds at least";
......
FuSiLive/Resources/LocalizationString/Fusi_vietnamese.strings
......@@ -330,7 +330,7 @@
"宝石储值" = "Nạp GEMs";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "Tín dụng của bên kia thấp hơn %1$s, có thể tiềm ẩn rủi ro tín dụng, tiếp tục gọi?";
"对方的信用指数低于%.1f分的基础，可能有一定的诚信风险，确认继续通话吗？" = "Tín dụng của bên kia thấp hơn %.1f, có thể tiềm ẩn rủi ro tín dụng, tiếp tục gọi?";
"录制时长最短3秒。" = "Record time are 3 seconds at least";
......
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