Skip to content

pidan / FuSiLive

Go to a project
Commit 4fcfe672 by ludi
Options

修复一系列bug

parent 3b03baed
Inline Side-by-side
Showing with 212 additions and 104 deletions
DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSUserRouterProtocol.h
...@@ -44,6 +44,9 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -44,6 +44,9 @@ NS_ASSUME_NONNULL_BEGIN
- (void)fus_enterSettingVC:(BOOL)jumpToHiddingStatus; - (void)fus_enterSettingVC:(BOOL)jumpToHiddingStatus;
/// 进入私房设定页面
- (void)fus_enterChatSettingVC;
- (void)fus_enterPhoneAuthVC; - (void)fus_enterPhoneAuthVC;
- (void)fus_blackListVC; - (void)fus_blackListVC;
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key> <key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>74</integer> <integer>77</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
......
Modules/FUSChatCenterModule/FUSChatCenterModule/FUSChatCenterBundle.bundle/FUSChatCenterAssets.xcassets/VideoChat/chatCenter_grade_star_unselect.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "chatCenter_grade_star_unselect@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Controller/FUSChatDetailViewController.m
...@@ -2052,7 +2052,7 @@ ...@@ -2052,7 +2052,7 @@
return; return;
} }
[FUSRouter.userRouter fus_enterSettingVC:NO]; [FUSRouter.userRouter fus_enterChatSettingVC];
} }
break; break;
case FUSSystemNoticeTypeNoticeAnchorToVideoAuth: // 提醒主播去官方认证 case FUSSystemNoticeTypeNoticeAnchorToVideoAuth: // 提醒主播去官方认证
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/Other/FUSIMChatCellHelper.m
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
if (matchStrings.count > 0) { if (matchStrings.count > 0) {
[attributedString setTextHighlightRange:NSMakeRange(range.location, replacedStr.length) [attributedString setTextHighlightRange:NSMakeRange(range.location, replacedStr.length)
color:messageBgColor color:[UIColor fus_themeColor]
backgroundColor:[UIColor clearColor] backgroundColor:[UIColor clearColor]
tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect)
{ {
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/CallView/FUSCallFreeTimeIsUpWaitingAlertView.swift
...@@ -81,7 +81,7 @@ class FUSCallFreeTimeIsUpWaitingAlertView: FUSBaseView { ...@@ -81,7 +81,7 @@ class FUSCallFreeTimeIsUpWaitingAlertView: FUSBaseView {
} }
let lineView = UIView() let lineView = UIView()
lineView.backgroundColor = .fus_line() lineView.backgroundColor = .clear
contentView.addSubview(lineView) contentView.addSubview(lineView)
lineView.snp.makeConstraints { make in lineView.snp.makeConstraints { make in
make.left.right.equalToSuperview().inset(28) make.left.right.equalToSuperview().inset(28)
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/CallView/FUSCallFreeTimeTipsSlideView.swift
...@@ -101,24 +101,25 @@ class FUSCallFreeTimeTipsSlideView: FUSBaseView { ...@@ -101,24 +101,25 @@ class FUSCallFreeTimeTipsSlideView: FUSBaseView {
} }
override func bindViewModel() { override func bindViewModel() {
FUSChatCallHelper.shared.callOrderModel // FUSChatCallHelper.shared.callOrderModel
.subscribe(onNext: {[weak self] model in // .subscribe(onNext: {[weak self] model in
//
if model?.callPrice ?? 0 > 0 { // if model?.callPrice ?? 0 > 0 {
self?.isHidden = false // self?.isHidden = false
self?.freeTimeInt = model?.callFreeTime ?? 0 // self?.freeTimeInt = model?.callFreeTime ?? 0
}else { // }else {
self?.isHidden = true // self?.isHidden = true
} // }
//
}).disposed(by: disposeBag) // }).disposed(by: disposeBag)
Observable.combineLatest(FUSChatCallHelper.shared.callOrderModel, FUSChatCallHelper.shared.isCaller) Observable.combineLatest(FUSChatCallHelper.shared.callOrderModel, FUSChatCallHelper.shared.isCaller)
.subscribe(onNext: {[weak self] callOrderModel, isCaller in .subscribe(onNext: {[weak self] callOrderModel, isCaller in
guard let self = self else { return } guard let self = self else { return }
if callOrderModel?.callPrice ?? 0 > 0 { if callOrderModel?.callPrice ?? 0 > 0
&& callOrderModel?.callFreeTime ?? 0 > 0{
self.isHidden = false self.isHidden = false
self.freeTimeInt = callOrderModel?.callFreeTime ?? 0 self.freeTimeInt = callOrderModel?.callFreeTime ?? 0
self.isCaller = isCaller self.isCaller = isCaller
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/CallView/FUSCallGradeView.swift
...@@ -10,10 +10,18 @@ import FUSCommon ...@@ -10,10 +10,18 @@ import FUSCommon
import RxSwift import RxSwift
import RxCocoa import RxCocoa
class FUSCallGradeView: FUSBaseView { @objcMembers public class FUSCallGradeView: FUSBaseView {
@objc public static func fus_create(orderId: String, showOn: UIView? = nil, dismissHandler: ((_ startRate: Int) -> Void)? = nil) {
guard let showOnView = ((showOn != nil) ? showOn : UIViewController.fus_top()?.view) else { return }
let view = FUSCallGradeView(orderId: orderId)
view.show(on: showOnView)
view.dismissHandler = dismissHandler
}
let orderId: String let orderId: String
var dismissHandler: ((Int) -> Void)? public var dismissHandler: ((Int) -> Void)?
init(orderId: String) { init(orderId: String) {
self.orderId = orderId self.orderId = orderId
...@@ -23,9 +31,10 @@ class FUSCallGradeView: FUSBaseView { ...@@ -23,9 +31,10 @@ class FUSCallGradeView: FUSBaseView {
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
override func makeUI() { public override func makeUI() {
super.makeUI() super.makeUI()
self.backgroundColor = .fus_alertViewBackground()
makeBgButton() makeBgButton()
makeBgView() makeBgView()
...@@ -96,11 +105,11 @@ class FUSCallGradeView: FUSBaseView { ...@@ -96,11 +105,11 @@ class FUSCallGradeView: FUSBaseView {
for index in 1...5 { for index in 1...5 {
let starBtn = UIButton(type: .custom) let starBtn = UIButton(type: .custom)
starBtn.imageView?.contentMode = .scaleAspectFit starBtn.imageView?.contentMode = .scaleAspectFit
starBtn.setImage(FUSChatCenterBunble.imageNamed("callCenter_grade_star_animation_13"), for: .selected) starBtn.setImage(FUSChatCenterBunble.imageNamed("chatCenter_grade_star_animation_13"), for: .selected)
starBtn.imageView?.animationImages = FUSChatCenterBunble.animatedImageArrayNamed("callCenter_grade_star_animation_") starBtn.imageView?.animationImages = FUSChatCenterBunble.animatedImageArrayNamed("chatCenter_grade_star_animation_")
// starBtn.imageView?.animationDuration = 0.75 // starBtn.imageView?.animationDuration = 0.75
starBtn.imageView?.animationDuration = 0.5 starBtn.imageView?.animationDuration = 0.5
starBtn.setImage(FUSChatCenterBunble.imageNamed("callCenter_grade_star_unselect"), for: .normal) starBtn.setImage(FUSChatCenterBunble.imageNamed("chatCenter_grade_star_unselect"), for: .normal)
starView.addArrangedSubview(starBtn) starView.addArrangedSubview(starBtn)
starBtn.rx.tap.map { index }.bind(to: rate).disposed(by: disposeBag) starBtn.rx.tap.map { index }.bind(to: rate).disposed(by: disposeBag)
...@@ -150,7 +159,7 @@ class FUSCallGradeView: FUSBaseView { ...@@ -150,7 +159,7 @@ class FUSCallGradeView: FUSBaseView {
} }
// MARK: Data // MARK: Data
let rate = BehaviorRelay<Int>(value: 0) let rate = BehaviorRelay<Int>(value: 0)
override func bindViewModel() { public override func bindViewModel() {
super.bindViewModel() super.bindViewModel()
rate.distinctUntilChanged().map { rate -> String? in rate.distinctUntilChanged().map { rate -> String? in
...@@ -177,11 +186,14 @@ class FUSCallGradeView: FUSBaseView { ...@@ -177,11 +186,14 @@ class FUSCallGradeView: FUSBaseView {
guard let self = self else { return } guard let self = self else { return }
guard self.rate.value > 0 else { return } guard self.rate.value > 0 else { return }
FUSLoadingView.fus_showProgressView(withMessage: "")
FUSIMChatHttpHelper.fus_requestSendCallGrade(with: self.orderId, level: self.rate.value) {[weak self] in FUSIMChatHttpHelper.fus_requestSendCallGrade(with: self.orderId, level: self.rate.value) {[weak self] in
FUSLoadingView.fus_dismissProgressView()
guard let self = self else { return } guard let self = self else { return }
self.dismissHandler?(rate.value) self.dismissHandler?(rate.value)
self.dismiss() self.dismiss()
} failure: { msg, code in } failure: { msg, code in
FUSLoadingView.fus_dismissProgressView()
FUSDialogView.fus_showDialog(msg) FUSDialogView.fus_showDialog(msg)
} }
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/InstantMessaging/View/ToolViews/VideoChat/CallView/FUSChatCallConnectingView.swift
...@@ -140,9 +140,9 @@ class FUSChatCallConnectingView: FUSBaseView { ...@@ -140,9 +140,9 @@ class FUSChatCallConnectingView: FUSBaseView {
portraitNicknameLabel.isUserInteractionEnabled = true portraitNicknameLabel.isUserInteractionEnabled = true
portraitView.addSubview(portraitNicknameLabel) portraitView.addSubview(portraitNicknameLabel)
portraitFollowBtn.imageView?.contentMode = .scaleAspectFit // portraitFollowBtn.imageView?.contentMode = .scaleAspectFit
portraitFollowBtn.setImage(FUSChatCenterBunble.imageNamed("callCenter_portrait_follow_icon"), for: .normal) // portraitFollowBtn.setImage(FUSChatCenterBunble.imageNamed("callCenter_portrait_follow_icon"), for: .normal)
portraitFollowBtn.setImage(FUSChatCenterBunble.imageNamed("callCenter_portrait_follow_selected_icon"), for: .selected) // portraitFollowBtn.setImage(FUSChatCenterBunble.imageNamed("callCenter_portrait_follow_selected_icon"), for: .selected)
portraitView.addSubview(portraitFollowBtn) portraitView.addSubview(portraitFollowBtn)
connectingBgView.addSubview(paidDataView) connectingBgView.addSubview(paidDataView)
...@@ -510,7 +510,11 @@ class FUSChatCallConnectingView: FUSBaseView { ...@@ -510,7 +510,11 @@ class FUSChatCallConnectingView: FUSBaseView {
FUSChatCallHelper.shared.callOtherInfo FUSChatCallHelper.shared.callOtherInfo
.map { $0?.isFollow ?? false } .map { $0?.isFollow ?? false }
.bind(to: portraitFollowBtn.rx.isSelected) // .bind(to: portraitFollowBtn.rx.isHighlighted)
.subscribe(onNext: {[weak self] isFollow in
let btnImg = isFollow ? FUSChatCenterBunble.imageNamed("callCenter_portrait_follow_selected_icon") : FUSChatCenterBunble.imageNamed("callCenter_portrait_follow_icon");
self?.portraitFollowBtn.setImage(btnImg, for: .normal)
})
.disposed(by: disposeBag) .disposed(by: disposeBag)
portraitFaceImageView.addGestureRecognizer(UITapGestureRecognizer(actionBlock: {[weak self] _ in portraitFaceImageView.addGestureRecognizer(UITapGestureRecognizer(actionBlock: {[weak self] _ in
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/ZhaiXin/Main/Controller/FUSSingleLiveRecordViewController.m
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#import "FUSSingleLiveGradePopView.h" #import "FUSSingleLiveGradePopView.h"
#import "FUSIMChatHttpHelper.h" #import "FUSIMChatHttpHelper.h"
#import "FUSChatCenterModule/FUSChatCenterModule-Swift.h" #import "FUSChatCenterModule/FUSChatCenterModule-Swift.h"
#import <FUSFoundation/FUSFoundation-Swift.h>
#define CELL_IDENTIFIER @"FUSSingleLiveRecordV2TableViewCell" #define CELL_IDENTIFIER @"FUSSingleLiveRecordV2TableViewCell"
...@@ -239,23 +240,30 @@ ...@@ -239,23 +240,30 @@
MJWeakSelf MJWeakSelf
cell.commentHandler = ^(FUSSingleLiveRecordModel * _Nonnull model) { cell.commentHandler = ^(FUSSingleLiveRecordModel * _Nonnull model) {
// 打分 // 打分
FUSSingleLiveGradePopView *pradeView = [[FUSSingleLiveGradePopView alloc]initWithFrame:UIView.fus_screenFrame category:recordModel.category.integerValue]; // FUSSingleLiveGradePopView *pradeView = [[FUSSingleLiveGradePopView alloc]initWithFrame:UIView.fus_screenFrame category:recordModel.category.integerValue];
pradeView.pradeStarsConfirmBlock = ^(NSNumber *pradeStar) { // pradeView.pradeStarsConfirmBlock = ^(NSNumber *pradeStar) {
[FUSLoadingView fus_showProgressViewWithMessage:nil]; // [FUSLoadingView fus_showProgressViewWithMessage:nil];
[FUSIMChatHttpHelper fus_requestSendCallGradeWith:model.callId level:pradeStar.integerValue success:^{ // [FUSIMChatHttpHelper fus_requestSendCallGradeWith:model.callId level:pradeStar.integerValue success:^{
[FUSLoadingView fus_dismissProgressView]; // [FUSLoadingView fus_dismissProgressView];
// [FUSDialogView fus_showDialog:[NSString fus_localString:@"评分成功"]];
// // 改为已评价
// recordModel.showType = @"1";
// recordModel.level = pradeStar.description;
// // 本地刷新这行cell
// [weakSelf.recordTableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationRight];
// } failure:^(NSString *msg, int code) {
// [FUSLoadingView fus_dismissProgressView];
// }];
// };
// [pradeView fus_showViewWithSuperView:[UIApplication sharedApplication].keyWindow];
[FUSCallGradeView fus_createWithOrderId:model.callId showOn:[UIWindow fus_keyWindow] dismissHandler:^(NSInteger startLevel) {
[FUSDialogView fus_showDialog:[NSString fus_localString:@"评分成功"]]; [FUSDialogView fus_showDialog:[NSString fus_localString:@"评分成功"]];
// 改为已评价
recordModel.showType = @"1"; recordModel.showType = @"1";
recordModel.level = pradeStar.description; recordModel.level = [NSString stringWithFormat:@"%ld",startLevel];
// 本地刷新这行cell
[weakSelf.recordTableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationRight]; [weakSelf.recordTableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationRight];
} failure:^(NSString *msg, int code) {
[FUSLoadingView fus_dismissProgressView];
}]; }];
}; };
[pradeView fus_showViewWithSuperView:[UIApplication sharedApplication].keyWindow];
};
return cell; return cell;
} }
......
Modules/FUSChatCenterModule/FUSChatCenterModule/Features/ZhaiXin/Main/View/FUSCallRecordCell.swift
...@@ -238,7 +238,7 @@ import SJAttributesStringMaker ...@@ -238,7 +238,7 @@ import SJAttributesStringMaker
make.append { make in make.append { make in
// 货币类型(3:宝石、4:萤火、5：露水) // 货币类型(3:宝石、4:萤火、5：露水)
if model.timeIncome.currency == 3 { if model.timeIncome.currency == 3 {
make.image = .fus_dewIcon() make.image = .fus_diamonIcon()
}else if model.timeIncome.currency == 4 { }else if model.timeIncome.currency == 4 {
make.image = .fus_fireIcon() make.image = .fus_fireIcon()
}else if model.timeIncome.currency == 5 { }else if model.timeIncome.currency == 5 {
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>77</integer> <integer>76</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHttpHelper.m
...@@ -767,58 +767,58 @@ ...@@ -767,58 +767,58 @@
[FUSEventTrack logEventWithName:@"followed_other"]; [FUSEventTrack logEventWithName:@"followed_other"];
// 每次追踪包房成功之后，需要显示提醒打开推送的 View // 每次追踪包房成功之后，需要显示提醒打开推送的 View
if (@available(iOS 11.0, *)) { // if (@available(iOS 11.0, *)) {
//
[[UNUserNotificationCenter currentNotificationCenter] getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) { // [[UNUserNotificationCenter currentNotificationCenter] getNotificationSettingsWithCompletionHandler:^(UNNotificationSettings * _Nonnull settings) {
if (settings.authorizationStatus != UNAuthorizationStatusAuthorized) { // if (settings.authorizationStatus != UNAuthorizationStatusAuthorized) {
//
BOOL shouldShowTip = [[[NSUserDefaults standardUserDefaults] objectForKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP] boolValue]; // BOOL shouldShowTip = [[[NSUserDefaults standardUserDefaults] objectForKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP] boolValue];
if (shouldShowTip) { // if (shouldShowTip) {
// 只显示一次，主线程执行 // // 只显示一次，主线程执行
dispatch_async(dispatch_get_main_queue(), ^{ // dispatch_async(dispatch_get_main_queue(), ^{
[[NSUserDefaults standardUserDefaults] setObject:@(NO) forKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP]; // [[NSUserDefaults standardUserDefaults] setObject:@(NO) forKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP];
FUSRoomPushNoticeView *noticeView = [[FUSRoomPushNoticeView alloc] initWithXibFileWithShowType:FUSPushNoticeViewTypeLiveRoom goToSystemSettingVcBlock:^{ // FUSRoomPushNoticeView *noticeView = [[FUSRoomPushNoticeView alloc] initWithXibFileWithShowType:FUSPushNoticeViewTypeLiveRoom goToSystemSettingVcBlock:^{
//
NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; // NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) { // if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) {
[[UIApplication sharedApplication] openURL:pushSettingUrl]; // [[UIApplication sharedApplication] openURL:pushSettingUrl];
} // }
//
}]; // }];
//
[noticeView fus_showViewWithSuperView:[UIApplication sharedApplication].keyWindow]; // [noticeView fus_showViewWithSuperView:[UIApplication sharedApplication].keyWindow];
}); // });
//
} // }
//
} else { // } else {
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP]; // [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP];
} // }
}]; // }];
} else { // } else {
//
if ([UIApplication sharedApplication].currentUserNotificationSettings.types == UIUserNotificationTypeNone) { // if ([UIApplication sharedApplication].currentUserNotificationSettings.types == UIUserNotificationTypeNone) {
// 没有打开推送 // // 没有打开推送
BOOL shouldShowTip = [[[NSUserDefaults standardUserDefaults] objectForKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP] boolValue]; // BOOL shouldShowTip = [[[NSUserDefaults standardUserDefaults] objectForKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP] boolValue];
if (shouldShowTip) { // if (shouldShowTip) {
// 只显示一次 // // 只显示一次
[[NSUserDefaults standardUserDefaults] setObject:@(NO) forKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP]; // [[NSUserDefaults standardUserDefaults] setObject:@(NO) forKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP];
FUSRoomPushNoticeView *noticeView = [[FUSRoomPushNoticeView alloc] initWithXibFileWithShowType:FUSPushNoticeViewTypeLiveRoom goToSystemSettingVcBlock:^{ // FUSRoomPushNoticeView *noticeView = [[FUSRoomPushNoticeView alloc] initWithXibFileWithShowType:FUSPushNoticeViewTypeLiveRoom goToSystemSettingVcBlock:^{
//
NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString]; // NSURL *pushSettingUrl = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) { // if ([[UIApplication sharedApplication] canOpenURL:pushSettingUrl]) {
[[UIApplication sharedApplication] openURL:pushSettingUrl]; // [[UIApplication sharedApplication] openURL:pushSettingUrl];
} // }
//
}]; // }];
[noticeView fus_showViewWithSuperView:[UIApplication sharedApplication].keyWindow]; // [noticeView fus_showViewWithSuperView:[UIApplication sharedApplication].keyWindow];
//
} // }
} else { // } else {
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP]; // [[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP];
} // }
//
} // }
if ([roomId isEqual:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) { if ([roomId isEqual:[FUSLiveHelper shareInstance].roomInfoModel.roomId]) {
[FUSLiveHelper shareInstance].roomInfoModel.liked = @"1"; [FUSLiveHelper shareInstance].roomInfoModel.liked = @"1";
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key> <key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>73</integer> <integer>74</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>76</integer> <integer>73</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Controller/FUSVerifyVersionController.swift
...@@ -56,7 +56,7 @@ import RxCocoa ...@@ -56,7 +56,7 @@ import RxCocoa
} }
var versionText = "" var versionText = ""
if FUSConfig.sharedInstanced().devConfigs.devLevel == .developer { if FUSConfig.sharedInstanced().devConfigs.devLevel == .developer {
versionText = "v" + FUSConfig.sharedInstanced().appConfigs.appVersion + "(\(Bundle.main.infoDictionary?["CFBundleVersion"] ?? ""))" versionText = "v" + FUSConfig.sharedInstanced().appConfigs.appVersion + "(\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] ?? ""))"
} else { } else {
versionText = "v" + FUSConfig.sharedInstanced().appConfigs.appVersion versionText = "v" + FUSConfig.sharedInstanced().appConfigs.appVersion
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Notification/View/FUSNotificationAlertTipsView.swift
...@@ -242,7 +242,8 @@ import RxCocoa ...@@ -242,7 +242,8 @@ import RxCocoa
func fus_setData(title: String, name: String?, imageUrl: String?, actionBlock: (() -> Void)?) { func fus_setData(title: String, name: String?, imageUrl: String?, actionBlock: (() -> Void)?) {
titleLabel.text = title titleLabel.text = title
self.actionBlock = actionBlock self.actionBlock = actionBlock
if let name = name, let imageUrl = imageUrl { if let name = name, let imageUrl = imageUrl,
imageUrl.count > 0{
topView.snp.remakeConstraints { make in topView.snp.remakeConstraints { make in
make.top.equalTo(self.topLineView.snp.bottom).offset(10) make.top.equalTo(self.topLineView.snp.bottom).offset(10)
make.height.equalTo(26) make.height.equalTo(26)
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/Notification/View/FUSNotificationSettingsView.swift
...@@ -17,7 +17,7 @@ import UIKit ...@@ -17,7 +17,7 @@ import UIKit
guard let showOnView = ((showOn != nil) ? showOn : UIViewController.fus_top()?.view) else { return } guard let showOnView = ((showOn != nil) ? showOn : UIViewController.fus_top()?.view) else { return }
if !showOnView.subviews.contains(where: { $0 is FUSNotificationSettingsView }) { if !showOnView.subviews.contains(where: { $0 is FUSNotificationSettingsView }) {
let view = FUSNotificationSettingsView() let view = FUSNotificationSettingsView()
view.fus_showAlertView(parentView: showOnView, isNormal: false) view.fus_showAlertView(parentView: showOnView, isNormal: isNormal)
} }
} }
...@@ -233,7 +233,9 @@ import UIKit ...@@ -233,7 +233,9 @@ import UIKit
notificationSubViewArr.append(switchBgView) notificationSubViewArr.append(switchBgView)
let switchImageView = UIImageView(frame: .zero) let switchImageView = UIImageView(frame: .zero)
switchImageView.image = FUSUserCenterBunble.imageNamed("setting_status_point") // switchImageView.image = FUSUserCenterBunble.imageNamed("setting_status_point")
switchImageView.backgroundColor = .gray
switchImageView.layer.cornerRadius = 5.0/2.0
switchBgView.addSubview(switchImageView) switchBgView.addSubview(switchImageView)
let switchLabel = UILabel() let switchLabel = UILabel()
...@@ -247,7 +249,7 @@ import UIKit ...@@ -247,7 +249,7 @@ import UIKit
switchBtn.contentVerticalAlignment = .center switchBtn.contentVerticalAlignment = .center
switchBtn.contentHorizontalAlignment = .center switchBtn.contentHorizontalAlignment = .center
switchBtn.setImage(UIImage.fus_unSelectedIcon(), for: .normal) switchBtn.setImage(UIImage.fus_unSelectedIcon(), for: .normal)
switchBtn.setImage(UIImage.fus_secretIcon(), for: .selected) switchBtn.setImage(UIImage.fus_selectedIconFillStyle(), for: .selected)
switchBtn.isSelected = self.notificationHashMap[type] ?? false switchBtn.isSelected = self.notificationHashMap[type] ?? false
switchBtn.isHidden = !isNormal switchBtn.isHidden = !isNormal
switchBtn.tag = type.rawValue switchBtn.tag = type.rawValue
...@@ -273,7 +275,7 @@ import UIKit ...@@ -273,7 +275,7 @@ import UIKit
switchBtn.snp.makeConstraints { make in switchBtn.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-20) make.right.equalToSuperview().offset(-20)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
make.size.equalTo(CGSizeMake(18, 18)) make.size.equalTo(CGSizeMake(22, 22))
} }
lastView = switchBgView lastView = switchBgView
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Setting/View/FUSChatSettingOneToOneHeaderView.m
...@@ -399,6 +399,15 @@ ...@@ -399,6 +399,15 @@
// }]; // }];
// return; // return;
// } // }
FUSPrivateLivePriceItemModel *price = self.priceModel.priceList[indexPath.row];
if ([self.selectedPriceModel.pid isEqualToString:price.pid]) {
// 一样的不选
return;
}
if (price.price.integerValue > 0) {
if (self.detailCompleteStage == -1) { if (self.detailCompleteStage == -1) {
//未完善 //未完善
[FUSAlertView showAlertWithTitle:[NSString fus_versionLocalString:@"私房价格"] message:[NSString fus_versionLocalString:@"完善个人资料设定，可解锁价格"] cancelButtonTitle:[NSString fus_versionLocalString:@"取消"] otherButtonTitles:@[[NSString fus_versionLocalString:@"确认"]] clickBlock:^(NSInteger buttonIndex) { [FUSAlertView showAlertWithTitle:[NSString fus_versionLocalString:@"私房价格"] message:[NSString fus_versionLocalString:@"完善个人资料设定，可解锁价格"] cancelButtonTitle:[NSString fus_versionLocalString:@"取消"] otherButtonTitles:@[[NSString fus_versionLocalString:@"确认"]] clickBlock:^(NSInteger buttonIndex) {
...@@ -417,8 +426,7 @@ ...@@ -417,8 +426,7 @@
}]; }];
return; return;
} }
}
FUSPrivateLivePriceItemModel *price = self.priceModel.priceList[indexPath.row];
MJWeakSelf MJWeakSelf
// 发起请求以 // 发起请求以
...@@ -477,7 +485,7 @@ ...@@ -477,7 +485,7 @@
#pragma mark - getter and setter #pragma mark - getter and setter
- (void)setConfigModel:(FUSPrivateLiveConfigModel *)configModel{ - (void)setConfigModel:(FUSPrivateLiveConfigModel *)configModel{
_configModel = configModel; _configModel = configModel;
self.chatSwitch.on = configModel.videoSwitch; self.chatSwitch.on = [configModel.videoSwitch boolValue];
self.chatSelectedMaskView.hidden = configModel.videoSwitch; self.chatSelectedMaskView.hidden = configModel.videoSwitch;
[self fus_loadDataSource]; [self fus_loadDataSource];
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FUSBackpackViewController.swift
...@@ -11,6 +11,31 @@ import RxCocoa ...@@ -11,6 +11,31 @@ import RxCocoa
@objcMembers public class FUSBackpackViewController: FUSBaseViewController { @objcMembers public class FUSBackpackViewController: FUSBaseViewController {
@objc public enum FUSBackpackPreloadSegment: Int {
case none
case gift
case props
case car
case edge
func fus_getTypeIndex() -> Int {
switch self{
case .gift:
return 90001
case .props:
return 90002
case .car:
return 90003
case .edge:
return 90004
default:
return -1
}
}
}
/// 一开始选择的segment
@objc public var preloadSegment: FUSBackpackPreloadSegment = .none
private let disposeBag = DisposeBag() private let disposeBag = DisposeBag()
public var defaultSegmentIndex = 0 public var defaultSegmentIndex = 0
...@@ -48,6 +73,20 @@ import RxCocoa ...@@ -48,6 +73,20 @@ import RxCocoa
bindViewModel() bindViewModel()
} }
public override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
// 一开始点击到哪个栏目
if self.preloadSegment != .none {
if let backpackTypeList = self.viewModel.backpackTypeList.value,
let index = backpackTypeList.firstIndex(where: { $0.index == preloadSegment.fus_getTypeIndex() }),
self.segmentView.itemTitles.count > index{
self.segmentView.fus_setSelectedItem(index, autoCallBack: true)
}
self.preloadSegment = .none
}
}
public override func viewDidAppear(_ animated: Bool) { public override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated) super.viewDidAppear(animated)
if isFirstLoad == false { if isFirstLoad == false {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Controller/FireFlyMyZone/FUSZoneUserInfoEditViewController.swift
...@@ -160,6 +160,7 @@ import FUSCommon ...@@ -160,6 +160,7 @@ import FUSCommon
else if self.preClicked == 2 { else if self.preClicked == 2 {
self.fus_beginEditUserNickname() self.fus_beginEditUserNickname()
} }
self.preClicked = -1;
} }
deinit { deinit {
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/Other/FUSMyZoneCellManager.m
...@@ -256,6 +256,7 @@ typedef NS_ENUM(NSUInteger, FUSMyZoneSectionType) { ...@@ -256,6 +256,7 @@ typedef NS_ENUM(NSUInteger, FUSMyZoneSectionType) {
switch (self.zoneModel.vehicleMall) { switch (self.zoneModel.vehicleMall) {
case FUSZoneMotoJumpPageTypeDefalut: { case FUSZoneMotoJumpPageTypeDefalut: {
FUSBackpackViewController *motorVC = [[FUSBackpackViewController alloc] init]; FUSBackpackViewController *motorVC = [[FUSBackpackViewController alloc] init];
motorVC.preloadSegment = FUSBackpackPreloadSegmentCar;
[_delegate fus_cellManager:self pushToController:motorVC]; [_delegate fus_cellManager:self pushToController:motorVC];
break; break;
} }
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Router/FUSUserCenterRouter.m
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#import "FUSImagePickerViewController.h" #import "FUSImagePickerViewController.h"
#import "FUSBlackListViewController.h" #import "FUSBlackListViewController.h"
#import "FUSNewsFeedListViewController.h" #import "FUSNewsFeedListViewController.h"
#import "FUSChatSettingViewController.h"
#import "FUSThirdPartyLoginHelper.h" #import "FUSThirdPartyLoginHelper.h"
#import "FUSRecieveNotificationHelper.h" #import "FUSRecieveNotificationHelper.h"
#import "FUSGotBackpackItemAnimView.h" #import "FUSGotBackpackItemAnimView.h"
...@@ -198,6 +199,12 @@ ...@@ -198,6 +199,12 @@
} }
- (void)fus_enterChatSettingVC{
FUSChatSettingViewController *vc = [[FUSChatSettingViewController alloc] init];
vc.hidesBottomBarWhenPushed = YES;
[[UIViewController fus_topViewController].navigationController pushViewController:vc animated:YES];
}
- (void)fus_enterPhoneAuthVC { - (void)fus_enterPhoneAuthVC {
......
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