解决一系列bug

4f67aa18 · ludi · fde78eb3 · 4f67aa18 · 4f67aa18 · 4f67aa18
Commit 4f67aa18 authored Jul 15, 2024 by ludi
Showing with 90 additions and 55 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWKWebViewController.m
FuSiLive/Classes/Foundation/DataStores/FUSAccountStore.m
FuSiLive/Classes/Foundation/Models/FUSAccountModel.h
FuSiLive/Classes/Foundation/Models/FUSAccountModel.m
FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m
FuSiLive/Classes/Login/View/FUSBoundAgentInfoView.m
FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneVideoCreditCell.m
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneTableView.m
FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings
--- a/DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWKWebViewController.m
+++ b/DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWKWebViewController.m
@@ -25,6 +25,8 @@
 // 在无标题栏情况下的关闭按钮
 @property (nonatomic, strong) UIButton *closeBtn;
+/// 储存关闭按钮是否要隐藏逻辑
+@property (nonatomic, assign) BOOL isCloseBtnHidden;
 // 客服按钮
 @property (nonatomic, strong) UIButton *serviceBtn;
@@ -44,6 +46,8 @@
        // 默認都帶上用戶基礎信息
        self.shouldIncludeIdentifyInfo = YES;
        self.clearCache = YES;
+        self.isCloseBtnHidden = NO;
    }
    return self;
 }
@@ -92,6 +96,7 @@
 - (void)fus_hideCloseBtn{
    self.closeBtn.hidden = YES;
+    self.isCloseBtnHidden = YES;
 }
 #pragma mark - 初始化参数
@@ -204,6 +209,8 @@
            [self.closeBtn setImage:UIImage.fus_backImage forState:UIControlStateNormal];
            [self.closeBtn addTarget:self action:@selector(navLeftCancelBtnClick) forControlEvents:UIControlEventTouchUpInside];
            [self.view addSubview:self.closeBtn];
+            self.closeBtn.hidden = self.isCloseBtnHidden;
        }
    } else {

--- a/FuSiLive/Classes/Foundation/DataStores/FUSAccountStore.m
+++ b/FuSiLive/Classes/Foundation/DataStores/FUSAccountStore.m
@@ -149,9 +149,9 @@
 // 返回最后登录的账户
 -(FUSAccountModel *)lastAccount
 {
-    if(![NSArray isNull:self.accountArray]) {
+//    if(![NSArray isNull:self.accountArray]) {
        return [FUSAccountModel fus_modelWithDict:[self.accountArray firstObject]];
-    }
+//    }
    return nil;
 }

--- a/FuSiLive/Classes/Foundation/Models/FUSAccountModel.h
+++ b/FuSiLive/Classes/Foundation/Models/FUSAccountModel.h
@@ -16,7 +16,7 @@
 @property(nonatomic, copy) NSString *countryCode;    // 区码
 @property(nonatomic, copy) NSString *countryName;    // 国家英文名称
 @property(nonatomic, copy) NSString *password;       // 登录密码
-@property(nonatomic, retain) NSDate *lastTime;       // 最后登录时间
+@property(nonatomic, copy) NSString *lastTime;       // 最后登录时间
 /**

--- a/FuSiLive/Classes/Foundation/Models/FUSAccountModel.m
+++ b/FuSiLive/Classes/Foundation/Models/FUSAccountModel.m
@@ -50,7 +50,7 @@
        _account = account;
        _password = password;
-        _lastTime = lastTime;
+        _lastTime = [NSString stringWithFormat:@"%f",[lastTime timeIntervalSince1970]];
        _countryCode = countryCode;
        _countryName = countryName;
        _yaboid = yaboId;
@@ -89,7 +89,7 @@
    if (self) {
        [self setAccount:account];
        [self setPassword:password];
-        [self setLastTime:lastTime];
+        [self setLastTime:[NSString stringWithFormat:@"%f",[lastTime timeIntervalSince1970]]];
    }
    return self;
 }

--- a/FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m
+++ b/FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m
@@ -7,12 +7,16 @@
 #import "FUSControllerPushHelper.h"
 #import "FUSSingleChatViewController.h"
+#import "FUSSingleChatDBOperate.h"
+#import "FUSZhaiXinDBOperate.h"
+#import "FUSIMChatService.h"
 @implementation FUSControllerPushHelper
 + (UIViewController *)fus_getBuyVIPController{
    FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
 //    wkwVC.shouldShowShareBtn = NO;
+//    wkwVC.navigationController.navigationBar.barTintColor = [UIColor redColor];
    wkwVC.needHideWebTitleBar = YES;
    wkwVC.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.vipOpenAddress;
    return wkwVC;
@@ -43,11 +47,14 @@
 //     普通调起客服流程
+    NSString *serviceUID = uid ? uid : @(SERVEICE_UID).stringValue;
    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];
+            FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:serviceUID face:facePath nikename:nikename];
            serviceChat.isServiceAccount = YES;
            if (![NSString isNull:welcomeStr]) {
                serviceChat.welcomeStr = welcomeStr;
@@ -59,6 +66,11 @@
            NSString *webURL = FUSLocalizationHelper.isArbicLanguage ? URL_WEB_ARBIC_HELP : URL_WEB_HELP;
            webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
            vc = webVC;
+            // 更新未读
+            [FUSSingleChatDBOperate fus_updateReadStatusToSingleChatTableWithFid:serviceUID];
+            [FUSZhaiXinDBOperate fus_updateUnreadToZhaiXinInfosTableWithTypeId:[NSString stringWithFormat:@"%@%@",SINGLE_CHAT, serviceUID] unread:0];
+            [[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
        }
    }else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) {
@@ -66,6 +78,11 @@
        NSString *webURL = [FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.url;
        webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
        vc = webVC;
+        // 更新未读
+        [FUSSingleChatDBOperate fus_updateReadStatusToSingleChatTableWithFid:serviceUID];
+        [FUSZhaiXinDBOperate fus_updateUnreadToZhaiXinInfosTableWithTypeId:[NSString stringWithFormat:@"%@%@",SINGLE_CHAT, serviceUID] unread:0];
+        [[FUSIMChatService shareInstance] fus_updateTalkListToLastMessage];
    }
    NSArray *viewControllers = self.viewControllers;
    UIViewController *viewVC = [viewControllers lastObject];

--- a/FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
+++ b/FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
@@ -295,13 +295,8 @@
            break;
        case FUSHomeNaviViewClickTypeRank:{
            FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
-//            wkwVC.shouldShowShareBtn = NO;
-//            wkwVC.needShowReload = YES;
-//            wkwVC.from = FUSFromInvitShare;
-//            wkwVC.shouldIncludeIdentifyInfo = YES;
            wkwVC.needHideWebTitleBar = YES;
-            //TODO: 暂时写死榜单的，等阿甘回来再说,URL_WEB_HOME_RANK这个定义里有地址
+            wkwVC.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.rankAddress;
-            wkwVC.webUrlString = @"https://ceshi.yabolive.tv/fusi/allRank/index.html";
            [self.parentController.navigationController pushViewController:wkwVC animated:YES];
        }
            break;

--- a/FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m
+++ b/FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m
@@ -295,10 +295,10 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
                case FUSMySettingItemTypeSetIntitationCode:{
                    BOOL isClick = [[[NSUserDefaults standardUserDefaults] objectForKey:ZONE_BOUND_AGENT_RED_CLICK] boolValue];
                    itemModel.isShowRedCirclePoint = !isClick;
-//                    if (self.leftTime > 0) {
+                    if (self.leftTime > 0) {
-//                        itemModel.rightShowText = [self changeTimeFormatteWithLeftTime:[NSString stringWithFormat:@"%f",_leftTime]];
+                        itemModel.rightShowText = [self changeTimeFormatteWithLeftTime:[NSString stringWithFormat:@"%f",_leftTime]];
-//                    }
+                    }
-                    itemModel.rightShowText = @"";
+//                    itemModel.rightShowText = @"";
                }
                    break;
                case FUSMySettingItemTypeIntitationReward:{
@@ -404,7 +404,8 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
        //时间间隔
        NSInteger intevalTime = [nowDate timeIntervalSinceReferenceDate] - [lastDate timeIntervalSinceReferenceDate];
        // 计算剩余时间
-        CGFloat leftTime = [infoDic[@"bindagenttime"] floatValue] * 60 - intevalTime / 10;
+//        CGFloat leftTime = [infoDic[@"bindagenttime"] floatValue] * 60 - intevalTime / 10;
+        CGFloat leftTime = [infoDic[@"bindagenttime"] floatValue] * 60 - intevalTime;
        // 记录剩余时间
        _leftTime = leftTime;
@@ -415,9 +416,9 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
 #pragma mark --- notification
 - (void)receiveBoundAgentResult:(NSNotification *)notifi {
-    if (!FUSConfig.sharedInstanced.devConfigs.appStatus) {
+//    if (!FUSConfig.sharedInstanced.devConfigs.appStatus) {
-        return;
+//        return;
-    }
+//    }
    if (self.fus_needShowInviteTaskDewItems && self.inputInviteCodeItem != nil) {
        for (FUSCustomSettingGroup *tempGroup in self.allGroups) {
            if ([tempGroup.items containsObject:self.inputInviteCodeItem]) {
@@ -516,7 +517,6 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
    switch (item.itemTag) {
        case FUSMySettingItemTypeImAnchor:{
            FUSImAnchorViewController *vc = [[FUSImAnchorViewController alloc] init];
-//            vc.zoneModel = self.zoneModel;
            [[UINavigationController fus_topViewController].navigationController pushViewController:vc animated:YES];
        }
            break;

--- a/FuSiLive/Classes/Login/View/FUSBoundAgentInfoView.m
+++ b/FuSiLive/Classes/Login/View/FUSBoundAgentInfoView.m
@@ -118,13 +118,22 @@
        if ([NSString isNull:self.agentName]) {
            [self fus_requestAgentInfoSuccess:^(NSString *name) {
                // 显示绑定弹窗
-                [[[FUSBindSuccessPopView alloc] initWithFrame:UIView.fus_screenFrame brokerName:name brokerID:self.agentIdTextfield.text] fus_show];
+//                [[[FUSBindSuccessPopView alloc] initWithFrame:UIView.fus_screenFrame brokerName:name brokerID:self.agentIdTextfield.text] fus_show];
+                [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"绑定成功"] message:[NSString stringWithFormat:[NSString fus_localString:@"恭喜您和%@(ID:%@)绑定成功"],name,self.agentIdTextfield.text] cancelButtonTitle:[NSString fus_localString:@"确认"] otherButtonTitles:nil clickBlock:^(NSInteger buttonIndex) {
+                }];
            } failure:^(NSString *msg, int code) {
                [FUSDialogView fus_showDialog:msg];
            }];
        }else {
            // 显示绑定弹窗
-            [[[FUSBindSuccessPopView alloc] initWithFrame:UIView.fus_screenFrame brokerName:self.agentName brokerID:self.agentIdTextfield.text] fus_show];
+//            [[[FUSBindSuccessPopView alloc] initWithFrame:UIView.fus_screenFrame brokerName:self.agentName brokerID:self.agentIdTextfield.text] fus_show];
+            [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"绑定成功"] message:[NSString stringWithFormat:[NSString fus_localString:@"恭喜您和%@(ID:%@)绑定成功"],self.agentName,self.agentIdTextfield.text] cancelButtonTitle:[NSString fus_localString:@"确认"] otherButtonTitles:nil clickBlock:^(NSInteger buttonIndex) {
+            }];
        }

--- a/FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
+++ b/FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
@@ -136,6 +136,7 @@
 - (void)fus_setGroups
 {
    __weak typeof(self) weakSelf = self;
+    CGFloat sectionLineHeight = 1.0 / [UIScreen mainScreen].scale; // 获取屏幕缩放比例
    //第一组
    _item1 = [FUSCustomSettingItem fus_itemWithTitle:nil type:CustomSettingItemTypeThirdPartyAccount];
@@ -152,7 +153,7 @@
    group1.groupFooterTextBgColor  = [UIColor fus_lineColor];
    group1.groupFooterOriginY = 6;
-    group1.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
+    group1.groupFooterHeight = sectionLineHeight + group1.groupFooterOriginY * 2;
    group1.groupFooterOriginX = 16;
    group1.items = @[_item1];
@@ -206,7 +207,7 @@
    group2.groupFooterTextBgColor  = [UIColor fus_lineColor];
    group2.groupFooterOriginY = 6;
-    group2.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
+    group2.groupFooterHeight = sectionLineHeight + group1.groupFooterOriginY * 2;
    group2.groupFooterOriginX = 16;
    FUSCustomSettingItem *blackItem = [FUSCustomSettingItem fus_itemWithTitle:[NSString fus_localString:@"黑名单"] type:CustomSettingItemTypeArrow];
@@ -279,7 +280,7 @@
    _liveRoomSettingGroup.groupFooterTextBgColor  = [UIColor fus_lineColor];
    _liveRoomSettingGroup.groupFooterOriginY = 6;
-    _liveRoomSettingGroup.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
+    _liveRoomSettingGroup.groupFooterHeight = sectionLineHeight + group1.groupFooterOriginY * 2;
    _liveRoomSettingGroup.groupFooterOriginX = 16;
    _liveRoomSettingGroup.groupHeaderText = [NSString fus_localString:@"直播间设置"];
@@ -368,7 +369,7 @@
    _chatSettingGroup.groupFooterTextBgColor  = [UIColor fus_lineColor];
    _chatSettingGroup.groupFooterOriginY = 6;
-    _chatSettingGroup.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
+    _chatSettingGroup.groupFooterHeight = sectionLineHeight + group1.groupFooterOriginY * 2;
    _chatSettingGroup.groupFooterOriginX = 16;
    _chatSettingGroup.groupHeaderText = [NSString fus_localString:@"私信设置"];
@@ -396,7 +397,7 @@
    groupLanguage.groupFooterTextBgColor  = [UIColor fus_lineColor];
    groupLanguage.groupFooterOriginY = 6;
-    groupLanguage.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
+    groupLanguage.groupFooterHeight = sectionLineHeight + group1.groupFooterOriginY * 2;
    groupLanguage.groupFooterOriginX = 16;
    groupLanguage.groupHeaderText = [NSString fus_localString:@"语言设置"];

--- a/FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneVideoCreditCell.m
+++ b/FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneVideoCreditCell.m
@@ -34,7 +34,7 @@
 - (void)awakeFromNib {
    [super awakeFromNib];
-    self.videoCreditLabel.text = [NSString fus_localString:@"约会信用"];
+    self.videoCreditLabel.text = [NSString fus_localString:@"私房评分"];
    if (FUSLocalizationHelper.fus_currentLanguage.languageID.integerValue == 2) {
        self.connectionRateLabel.text = [NSString fus_localString:@"接通率"];
    } else {
@@ -48,6 +48,8 @@
    self.videoCreditLabel.textColor = [UIColor fus_textColorRich];
    self.connectionRateLabel.textColor = [UIColor fus_textColorRich];
+    self.rightArrowImageView.hidden = YES;
+    self.selectionStyle = UITableViewCellSelectionStyleNone;
 }
 - (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {

--- a/FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneTableView.m
+++ b/FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneTableView.m
@@ -164,35 +164,37 @@
    [self.rootVC presentViewController:vc animated:YES completion:nil];
 }
-// 添加一个view
+// 添加一个view,私房信用点击
 - (void)fus_cellManagerAddSpecificView:(FUSMyZoneCellManager *)cellManager {
-    if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
+    //暂时不需要点击
-        return;
-    }
-    FUSLogInfo(@"---视讯---");
+//    if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
-    [FUSTalkingData fus_trackEvent:EVENT_USER_HONE_PAGE_RATE];
+//        return;
-    __weak typeof(self) weakSelf = self;
+//    }
-    if (!_videoCreditDetailsView) {
+//    
-        _videoCreditDetailsView = [[[NSBundle mainBundle] loadNibNamed:@"FUSVideoCreditDetailsView" owner:self options:nil] firstObject];
+//    FUSLogInfo(@"---视讯---");
-        _videoCreditDetailsView.frame = CGRectMake(0, weakSelf.rootVC.view.height, weakSelf.rootVC.view.width, weakSelf.rootVC.view.height);
+//    [FUSTalkingData fus_trackEvent:EVENT_USER_HONE_PAGE_RATE];
-        _videoCreditDetailsView.zoneModel = _zoneModel;
+//    __weak typeof(self) weakSelf = self;
-        [self.rootVC.view addSubview:_videoCreditDetailsView];
+//    if (!_videoCreditDetailsView) {
-        _videoCreditDetailsView.closeViewBlock = ^{
+//        _videoCreditDetailsView = [[[NSBundle mainBundle] loadNibNamed:@"FUSVideoCreditDetailsView" owner:self options:nil] firstObject];
-            [UIView animateWithDuration:0.5 animations:^{
+//        _videoCreditDetailsView.frame = CGRectMake(0, weakSelf.rootVC.view.height, weakSelf.rootVC.view.width, weakSelf.rootVC.view.height);
-                weakSelf.videoCreditDetailsView.y = weakSelf.rootVC.view.height;
+//        _videoCreditDetailsView.zoneModel = _zoneModel;
-            }];
+//        [self.rootVC.view addSubview:_videoCreditDetailsView];
-        };
+//        _videoCreditDetailsView.closeViewBlock = ^{
-        [UIView animateWithDuration:0.5 animations:^{
+//            [UIView animateWithDuration:0.5 animations:^{
-            _videoCreditDetailsView.y = 0;
+//                weakSelf.videoCreditDetailsView.y = weakSelf.rootVC.view.height;
-        }];
+//            }];
-    } else {
+//        };
-        [_videoCreditDetailsView fus_refreshData];
+//        [UIView animateWithDuration:0.5 animations:^{
-        [UIView animateWithDuration:0.5 animations:^{
+//            _videoCreditDetailsView.y = 0;
-            _videoCreditDetailsView.y = 0;
+//        }];
-        }];
+//    } else {
-    }
+//        [_videoCreditDetailsView fus_refreshData];
+//        [UIView animateWithDuration:0.5 animations:^{
+//            _videoCreditDetailsView.y = 0;
+//        }];
+//    }
 }
 - (void)fus_updateVideoCreditCell {

--- a/FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings
+++ b/FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings
@@ -2194,3 +2194,5 @@
 "私房信用：" = "私房信用：";
+"私房信用" = "私房信用";