Commit 4ec51edf by ludi

完成通话设置的页面

parent c15e3d74
Showing with 423 additions and 46 deletions
//
// FUSCallTimeIncomeModel.h
// FUSCommon
//
// Created by aaa on 2024/11/21.
//
#import <FUSFoundation/FUSFoundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface FUSCallTimeIncomeModel : FUSBaseModel
/// 货币类型(3:宝石、4:萤火、5:露水、6:宝箱)
@property (nonatomic, assign) NSInteger currency;
/// 数量
@property (nonatomic, assign) NSInteger total;
/// 获取对应收入的icon
-(UIImage *)fus_getCurrencyIcon;
/// 获取对应的颜色
-(UIColor *)fus_getCurrencyTextColor;
@end
NS_ASSUME_NONNULL_END
//
// FUSCallTimeIncomeModel.m
// FUSCommon
//
// Created by aaa on 2024/11/21.
//
#import "FUSCallTimeIncomeModel.h"
@implementation FUSCallTimeIncomeModel
- (UIImage *)fus_getCurrencyIcon{
switch (self.currency) {
case 3:
return [UIImage fus_diamonIcon];
break;
case 4:
return [UIImage fus_fireIcon];
case 5:
return [UIImage fus_dewIcon];
default:
return nil;
break;
}
}
- (UIColor *)fus_getCurrencyTextColor{
switch (self.currency) {
case 3:
return [UIColor fus_diamondBlue];
break;
case 4:
return [UIColor fus_fireGreen];
break;
case 5:
return [UIColor fus_dewBlue];
break;
default:
return [UIColor whiteColor];
break;
}
}
@end
//
// FUSOnetoOneCheckQualificationModel.h
// FUSCommon
//
// Created by aaa on 2024/11/21.
//
#import <FUSFoundation/FUSFoundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface FUSOnetoOneCheckQualificationModel : FUSBaseModel
///更新资源状态 1:已更新 0:未更新
@property (nonatomic, assign) NSInteger status;
/// 更新昵称状态 1:已更新 0:未更新
@property (nonatomic, assign) NSInteger nickUpdate;
@end
NS_ASSUME_NONNULL_END
//
// FUSOnetoOneCheckQualificationModel.m
// FUSCommon
//
// Created by aaa on 2024/11/21.
//
#import "FUSOnetoOneCheckQualificationModel.h"
@implementation FUSOnetoOneCheckQualificationModel
@end
......@@ -18,6 +18,7 @@ typedef NS_ENUM(NSInteger,FUSPushNoticeViewType){
FUSPushNoticeViewTypeNewsFeed = 6,
FUSPushNoticeViewTypeLinkMic = 7,
FUSPushNoticeViewTypeCheckIn = 8,
FUSPushNoticeViewTypeOneToOneChatReceive = 9,
};
@interface FUSRoomPushNoticeView : UIView
......
......@@ -81,6 +81,10 @@
_noticeWordsLabel.text = [NSString fus_localString:@"开启系统通知权限,不再错过每天的连续签到奖励"];
break;
}
case FUSPushNoticeViewTypeOneToOneChatReceive:
{
_noticeWordsLabel.text = [NSString fus_versionLocalString:@"开启通知权限,可以帮助您提升接通率,增加通话收入"];
}
default:
break;
}
......
......@@ -20,6 +20,7 @@
#import "FUSUserTradeRemindModel.h"
#import "FUSLiveStartConfigModel.h"
#import "FUSZoneInfosModel.h"
#import "FUSOnetoOneCheckQualificationModel.h"
@interface FUSCacheDataShare : NSObject
......@@ -37,6 +38,9 @@
/// 记录当前最新的myZoneInfoModel,网络请求的总会覆盖掉缓存的
@property (nonatomic, strong) FUSZoneInfosModel *myZoneInfoModel;
/// 校验是否已更新账号资料
@property (nonatomic, strong) FUSOnetoOneCheckQualificationModel *onetoOneCheckQualificationModel;
@property (nonatomic, strong) FUSLangAreaCountryModel *areaCountryInfo; // 語言、語區、註冊國家相關信息
......
......@@ -59,6 +59,8 @@
#import "FUSRechargeDataModel.h"
#import "FUSShareTipsModel.h"
#import "FUSUserInfosModel.h"
#import "FUSOnetoOneCheckQualificationModel.h"
#import "FUSCallTimeIncomeModel.h"
#import "FUSAliOSSModel.h"
#import "FUSAliOSSUploadFileModel.h"
#import "FUSMomentCreateModel.h"
......
......@@ -18,10 +18,12 @@
@property (nonatomic,copy) NSString *audioPrice;
@property (nonatomic,copy) NSString *videoPrice; // 视讯收费价格
@property (nonatomic, copy) NSString *callPrice;
@property (nonatomic,copy) NSString *defaultType;
@property (nonatomic,copy) NSString *avgLevel; // 评分(0.00)
@property (nonatomic,copy) NSString *succRatio; // 接听率(0.00)
@property (nonatomic, assign) BOOL auth;
@end
......@@ -7,6 +7,7 @@
//
#import "FUSBaseModel.h"
#import "FUSCallTimeIncomeModel.h"
@interface FUSPrivateLivePriceItemModel : FUSBaseModel
......@@ -31,6 +32,9 @@
// 状态(0:不可选、1:可选)
@property (nonatomic, assign) NSInteger status;
/// 对应收益
@property (nonatomic, strong) FUSCallTimeIncomeModel *income;
@end
@interface FUSPrivateLivePriceModel : FUSBaseModel
......
......@@ -70,6 +70,9 @@ NS_ASSUME_NONNULL_BEGIN
+ (NSString *)fus_SHOULD_REMOTE_NOTIFICATION_TIP;
/// 是否已经显示过私房童话接收的通知
+ (NSString *)fus_SHOULD_ONE_TO_ONE_RECEIVE_NOTIFICATION_TIP;
// 是否已经显示过包房滑动引导 View
+ (NSString *)fus_HAVE_SHOW_ROOM_GUIDE_VIEW;
......
......@@ -105,6 +105,11 @@
return @"remoteNotificationTip";
}
/// 是否已经显示过私房童话接收的通知
+ (NSString *)fus_SHOULD_ONE_TO_ONE_RECEIVE_NOTIFICATION_TIP {
return @"fus_SHOULD_ONE_TO_ONE_RECEIVE_NOTIFICATION_TIP";
}
// 是否已经显示过包房滑动引导 View
+ (NSString *)fus_HAVE_SHOW_ROOM_GUIDE_VIEW {
return @"haveShowRoomGuideView";
......
......@@ -227,6 +227,7 @@ static NSString *const kGtAppSecret = @"OSSSWqbWY0ACJiUv4AHdW7";
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSUserUDKeys.fus_SETTING_LAUNCH_SOUND_SWITCH_BOOL];
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:kFUSConfigAppStatusUDKey];
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_SHOULD_REMOTE_NOTIFICATION_TIP];
[[NSUserDefaults standardUserDefaults] setObject:@(YES) forKey:FUSLiveUDKeys.fus_SHOULD_ONE_TO_ONE_RECEIVE_NOTIFICATION_TIP];
[[NSUserDefaults standardUserDefaults] setObject:@([NSDate date].timeIntervalSince1970) forKey:FirstLaunchTimeUDKey];
}
......
......@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>72</integer>
<integer>71</integer>
</dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>76</integer>
<integer>72</integer>
</dict>
</dict>
</dict>
......
......@@ -21,21 +21,21 @@
typedef NS_ENUM(NSInteger,FUSVoiceViewShowState){
FUSVoiceViewShowStateShowInMainScreen = 0, // 正在语音通话
FUSVoiceViewShowStateShowInWindow // 最小化到窗口上(UIWindow)
};
typedef NS_ENUM(NSInteger,FUSVideoViewShowState){
FUSVideoViewShowStateChatMainScreenIsOther = 0, // 正在视频通话 主屏幕是别人
FUSVideoViewShowStateChatMainScreenIsMe, // 正在视频通话 主屏幕是自己
FUSVideoViewShowStateShowInWindow // 最小化到窗口上(UIWindow)
};
typedef enum: NSUInteger {
FUSRemoveTypeUpToTop = 0,//从下至上
FUSRemoveTypeAlphaGradulToZero,//可见度渐变
}FUSRemoveType;
//typedef NS_ENUM(NSInteger,FUSVoiceViewShowState){
// FUSVoiceViewShowStateShowInMainScreen = 0, // 正在语音通话
// FUSVoiceViewShowStateShowInWindow // 最小化到窗口上(UIWindow)
//};
//
//typedef NS_ENUM(NSInteger,FUSVideoViewShowState){
// FUSVideoViewShowStateChatMainScreenIsOther = 0, // 正在视频通话 主屏幕是别人
// FUSVideoViewShowStateChatMainScreenIsMe, // 正在视频通话 主屏幕是自己
// FUSVideoViewShowStateShowInWindow // 最小化到窗口上(UIWindow)
//};
//
//typedef enum: NSUInteger {
// FUSRemoveTypeUpToTop = 0,//从下至上
// FUSRemoveTypeAlphaGradulToZero,//可见度渐变
//}FUSRemoveType;
@interface FUSIMConversationViewHelper ()
//other
......
......@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>71</integer>
<integer>75</integer>
</dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>74</integer>
<integer>76</integer>
</dict>
</dict>
</dict>
......
......@@ -7,6 +7,12 @@
objects = {
/* Begin PBXBuildFile section */
008FF10D2CEF3675002974EA /* FUSUserManagerVoiceSignModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 008FF10C2CEF3675002974EA /* FUSUserManagerVoiceSignModel.m */; };
008FF10E2CEF3675002974EA /* FUSUserManagerVoiceSignModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FF10B2CEF3675002974EA /* FUSUserManagerVoiceSignModel.h */; };
008FF1112CEF42A1002974EA /* FUSChatSettingOneToOneHeaderView.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FF10F2CEF42A1002974EA /* FUSChatSettingOneToOneHeaderView.h */; };
008FF1122CEF42A1002974EA /* FUSChatSettingOneToOneHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = 008FF1102CEF42A1002974EA /* FUSChatSettingOneToOneHeaderView.m */; };
008FF1152CEF45FA002974EA /* FUSOneToOnePriceGetListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 008FF1142CEF45FA002974EA /* FUSOneToOnePriceGetListModel.m */; };
008FF1162CEF45FA002974EA /* FUSOneToOnePriceGetListModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 008FF1132CEF45FA002974EA /* FUSOneToOnePriceGetListModel.h */; };
9E8D0BED6061C8C88FBF8686 /* Pods_FUSUserCenterModule.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BED3EAC4EA2F921CB5B2FEE8 /* Pods_FUSUserCenterModule.framework */; };
BE189A2D2C7323FE0008418B /* FSRDynamicImModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BE1899A72C7323FE0008418B /* FSRDynamicImModel.h */; };
BE189A2E2C7323FE0008418B /* FSRDynamicImModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BE1899A82C7323FE0008418B /* FSRDynamicImModel.m */; };
......@@ -835,6 +841,12 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
008FF10B2CEF3675002974EA /* FUSUserManagerVoiceSignModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSUserManagerVoiceSignModel.h; sourceTree = "<group>"; };
008FF10C2CEF3675002974EA /* FUSUserManagerVoiceSignModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSUserManagerVoiceSignModel.m; sourceTree = "<group>"; };
008FF10F2CEF42A1002974EA /* FUSChatSettingOneToOneHeaderView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSChatSettingOneToOneHeaderView.h; sourceTree = "<group>"; };
008FF1102CEF42A1002974EA /* FUSChatSettingOneToOneHeaderView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSChatSettingOneToOneHeaderView.m; sourceTree = "<group>"; };
008FF1132CEF45FA002974EA /* FUSOneToOnePriceGetListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSOneToOnePriceGetListModel.h; sourceTree = "<group>"; };
008FF1142CEF45FA002974EA /* FUSOneToOnePriceGetListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSOneToOnePriceGetListModel.m; sourceTree = "<group>"; };
29DC17A1A1D4B29CA3BB6003 /* Pods-FUSUserCenterModule.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FUSUserCenterModule.debug.xcconfig"; path = "Target Support Files/Pods-FUSUserCenterModule/Pods-FUSUserCenterModule.debug.xcconfig"; sourceTree = "<group>"; };
BE1899A72C7323FE0008418B /* FSRDynamicImModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FSRDynamicImModel.h; sourceTree = "<group>"; };
BE1899A82C7323FE0008418B /* FSRDynamicImModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FSRDynamicImModel.m; sourceTree = "<group>"; };
......@@ -2559,6 +2571,10 @@
BE78C9E92C538D7D00F38855 /* FUSBlackListModel.m */,
BE78C9EA2C538D7D00F38855 /* FUSSettingChatInviteModel.h */,
BE78C9EB2C538D7D00F38855 /* FUSSettingChatInviteModel.m */,
008FF10B2CEF3675002974EA /* FUSUserManagerVoiceSignModel.h */,
008FF10C2CEF3675002974EA /* FUSUserManagerVoiceSignModel.m */,
008FF1132CEF45FA002974EA /* FUSOneToOnePriceGetListModel.h */,
008FF1142CEF45FA002974EA /* FUSOneToOnePriceGetListModel.m */,
);
path = Models;
sourceTree = "<group>";
......@@ -2584,6 +2600,8 @@
BE78CA032C538D7D00F38855 /* FUSChatSettingHeaderView.h */,
BE78CA042C538D7D00F38855 /* FUSChatSettingHeaderView.m */,
BE78CA052C538D7D00F38855 /* FUSChatSettingHeaderView.xib */,
008FF10F2CEF42A1002974EA /* FUSChatSettingOneToOneHeaderView.h */,
008FF1102CEF42A1002974EA /* FUSChatSettingOneToOneHeaderView.m */,
BE78CA062C538D7D00F38855 /* FUSChatSettingPriceCell.h */,
BE78CA072C538D7D00F38855 /* FUSChatSettingPriceCell.m */,
BE78CA082C538D7D00F38855 /* FUSChatSettingPriceCell.xib */,
......@@ -3416,6 +3434,7 @@
BE78CCE52C538D8000F38855 /* FUSImAnchorHeaderView.h in Headers */,
BE78CCA72C538D8000F38855 /* FUSNewsFeedUnlockPriceView.h in Headers */,
BE78CCC82C538D8000F38855 /* TZGifPhotoPreviewController.h in Headers */,
008FF10E2CEF3675002974EA /* FUSUserManagerVoiceSignModel.h in Headers */,
BED65B472C5B990400668116 /* FUSMyView.h in Headers */,
BE78CBFD2C538D7F00F38855 /* FUSCheckNetworkWebController.h in Headers */,
BE78CC802C538D7F00F38855 /* FUSNewsFeedDetailVideoHeaderView.h in Headers */,
......@@ -3430,6 +3449,7 @@
BE78CCEB2C538D8000F38855 /* FUSImagePickerViewController.h in Headers */,
BE78CC3A2C538D7F00F38855 /* FUSNewsFeedLikeListViewController.h in Headers */,
BE78CB112C538D7E00F38855 /* FUSLoginViewController.h in Headers */,
008FF1162CEF45FA002974EA /* FUSOneToOnePriceGetListModel.h in Headers */,
BE78CB5C2C538D7E00F38855 /* FUSReportOptionModel.h in Headers */,
BE189A4F2C7323FE0008418B /* FSRImViewController.h in Headers */,
BE78CC0A2C538D7F00F38855 /* FUSSettingViewController.h in Headers */,
......@@ -3461,6 +3481,7 @@
BE78CD022C538D8000F38855 /* FUSNumberView.h in Headers */,
BE78CBCC2C538D7F00F38855 /* FUSTaskCenterHeaderSimpleTableViewCell.h in Headers */,
BE78CC032C538D7F00F38855 /* FUSNoticeSettingViewController.h in Headers */,
008FF1112CEF42A1002974EA /* FUSChatSettingOneToOneHeaderView.h in Headers */,
BEDEDC492C66075400B4B0B0 /* FUSSingleDailyCheckInView.h in Headers */,
BE78CCA22C538D8000F38855 /* FUSNewsFeedReplyView.h in Headers */,
BE189A5B2C7323FE0008418B /* FSRPrivacyMineViewController.h in Headers */,
......@@ -4075,6 +4096,7 @@
BE189AA22C7323FE0008418B /* FSRSettingdictDynamicImView.m in Sources */,
BE78CBCD2C538D7F00F38855 /* FUSTaskCenterHeaderSimpleTableViewCell.m in Sources */,
BE78CC572C538D7F00F38855 /* ResultViewController.m in Sources */,
008FF1122CEF42A1002974EA /* FUSChatSettingOneToOneHeaderView.m in Sources */,
BE78CBAE2C538D7E00F38855 /* FUSMyZoneHeaderView.m in Sources */,
BE78CB122C538D7E00F38855 /* FUSLoginViewController.m in Sources */,
BE78CC992C538D8000F38855 /* FUSNewsFeedMessageCell.m in Sources */,
......@@ -4110,10 +4132,12 @@
BE78CCF22C538D8000F38855 /* FUSAlbumModel.m in Sources */,
BE78CC6D2C538D7F00F38855 /* FUSNewsFeedDetailToolView.m in Sources */,
BED65B1D2C5B795900668116 /* FUSChatInputTaskListTableViewCell.swift in Sources */,
008FF1152CEF45FA002974EA /* FUSOneToOnePriceGetListModel.m in Sources */,
BE189A702C7323FE0008418B /* FSRMinePrivacySearchCollectionViewCell.m in Sources */,
BE78CC922C538D8000F38855 /* FUSNewsFeedLikeCell.m in Sources */,
BE78CCC52C538D8000F38855 /* TZAssetCell.m in Sources */,
BE78CD032C538D8000F38855 /* FUSNumberView.m in Sources */,
008FF10D2CEF3675002974EA /* FUSUserManagerVoiceSignModel.m in Sources */,
BE78CBC52C538D7E00F38855 /* FUSGotBackpackItemAnimView.m in Sources */,
BE189A9E2C7323FE0008418B /* FSRMotordictStartView.m in Sources */,
BE189A382C7323FE0008418B /* FSRMinePrivacySearchModel.m in Sources */,
......
......@@ -12,7 +12,7 @@
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>75</integer>
<integer>74</integer>
</dict>
</dict>
</dict>
......
......@@ -9,10 +9,12 @@
#import "FUSImAnchorViewController.h"
#import "FUSImAnchorHeaderView.h"
#import "FUSSettingTableView.h"
#import "FUSChatSettingViewController.h"
#import "FUSMyZoneViewController.h"
#import "FUSNewsFeedHelper.h"
#import "FUSLoginCacheOperate.h"
#import "FUSSettingHttpRequest.h"
#import <Masonry/Masonry.h>
......@@ -22,6 +24,7 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
FUSImAnchorItemTypePopular,
FUSImAnchorItemTypeLiveTime,
FUSImAnchorItemTypeTotalFire,
/// 私房设置
FUSImAnchorItemTypePrivacyRoomSetting,
FUSImAnchorItemTypeBroadcastBuild,
FUSImAnchorItemTypeActivity,
......@@ -135,13 +138,13 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
section2 = @[@(FUSImAnchorItemTypeLiveTime)];
}
// 暂时不要私房设置
// NSArray *section3 = @[@(FUSImAnchorItemTypePrivacyRoomSetting)];
NSArray *section3 = @[@(FUSImAnchorItemTypePrivacyRoomSetting)];
NSArray *section4 = @[@(FUSImAnchorItemTypeBroadcastBuild), @(FUSImAnchorItemTypeActivity)];
if ([NSString isNullWithString:[FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.activitiesAddress]
|| FUSConfig.sharedInstanced.devConfigs.appStatus) {
section4 = @[@(FUSImAnchorItemTypeBroadcastBuild)];
}
NSArray *itemTypeSectionList = @[section1, section2, section4];
NSArray *itemTypeSectionList = @[section1, section2, section3, section4];
[self.allGroups removeAllObjects];
for (NSArray *evSection in itemTypeSectionList) {
......@@ -167,7 +170,8 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
break;
case FUSImAnchorItemTypePrivacyRoomSetting:
itemModel.rightShowTextColor = [UIColor fus_textColorLight];
itemModel.redCircleColor = [UIColor fus_diamondBlue];
itemModel.redCircleColor = [UIColor fus_themeColor];
itemModel.isShowRedCirclePoint = YES;
break;
default:
break;
......@@ -256,9 +260,15 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
}
}
break;
case FUSImAnchorItemTypePrivacyRoomSetting:
// itemModel.rightShowText =
case FUSImAnchorItemTypePrivacyRoomSetting:{
NSInteger callPirce = [[FUSCacheDataShare shareStore].myZoneInfoModel.chatWith[@"callPrice"] integerValue];
if (callPirce > 0) {
itemModel.rightShowText = [NSString stringWithFormat:@" %ld%@/min",(long)callPirce,[NSString fus_versionLocalString:@"宝石"]];
}else {
itemModel.rightShowText = [NSString stringWithFormat:@" %@",[NSString fus_versionLocalString:@"免费"]];
}
break;
}
default:
break;
}
......@@ -306,6 +316,19 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
[self.navigationController pushViewController:vc animated:YES];
}
break;
case FUSImAnchorItemTypePrivacyRoomSetting: {
MJWeakSelf
[FUSLoadingView fus_showProgressViewWithMessage:@"" canTouchBottomView:NO];
[FUSSettingHttpRequest fus_oneToOneCheckQualificationSuccess:^(FUSOnetoOneCheckQualificationModel *model) {
[FUSLoadingView fus_dismissProgressView];
FUSChatSettingViewController *vc = [[FUSChatSettingViewController alloc] init];
[weakSelf.navigationController pushViewController:vc animated:YES];
} failure:^(NSString *msg, int code) {
[FUSLoadingView fus_dismissProgressView];
[FUSDialogView fus_showDialog:msg];
}];
}
break;
default:
break;
}
......
......@@ -12,12 +12,6 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSChatSettingViewController : FUSBaseViewController
// 自动弹出声讯价格设置弹窗
@property (nonatomic, assign) BOOL autoShowVoiceChatPriceView;
// 自动弹出视讯价格设置弹窗
@property (nonatomic, assign) BOOL autoShowVideoChatPriceView;
@end
NS_ASSUME_NONNULL_END
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
......@@ -22,18 +22,18 @@
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="setting_chat_bg" translatesAutoresizingMaskIntoConstraints="NO" id="ZqJ-t0-EIU">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ZqJ-t0-EIU">
<rect key="frame" x="0.0" y="0.0" width="414" height="310"/>
<constraints>
<constraint firstAttribute="width" secondItem="ZqJ-t0-EIU" secondAttribute="height" multiplier="375:281" id="CKE-LE-AAx"/>
</constraints>
</imageView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="6V3-zH-yez">
<rect key="frame" x="0.0" y="88" width="414" height="774"/>
<rect key="frame" x="0.0" y="92" width="414" height="770"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</tableView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vmU-W5-IPB">
<rect key="frame" x="0.0" y="44" width="414" height="44"/>
<rect key="frame" x="0.0" y="48" width="414" height="44"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bI8-P2-j3R">
<rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
......@@ -41,12 +41,12 @@
<constraint firstAttribute="width" secondItem="bI8-P2-j3R" secondAttribute="height" id="3yL-vZ-Oa6"/>
</constraints>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" image="common_navigation_back_white"/>
<state key="normal" image="fus_common_navigation_back_black"/>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="通话设置" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bKz-WV-Lkx">
<rect key="frame" x="177" y="11.5" width="60" height="21"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
......@@ -79,8 +79,7 @@
</view>
</objects>
<resources>
<image name="common_navigation_back_white" width="9" height="15.5"/>
<image name="setting_chat_bg" width="375" height="281.5"/>
<image name="fus_common_navigation_back_black" width="8" height="14.5"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
......
//
// FUSOneToOnePriceGetListModel.h
// FUSUserCenterModule
//
// Created by aaa on 2024/11/21.
//
#import <FUSFoundation/FUSFoundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface FUSOneToOnePriceGetListModel : FUSBaseModel
@property (nonatomic, strong) NSMutableArray<FUSPrivateLivePriceItemModel *> *priceList;
/// 分成比例
@property (nonatomic, assign) CGFloat divideRatio;
/// 分成文案
@property (nonatomic, copy) NSString *divideRatioTxt;
@end
NS_ASSUME_NONNULL_END
//
// FUSOneToOnePriceGetListModel.m
// FUSUserCenterModule
//
// Created by aaa on 2024/11/21.
//
#import "FUSOneToOnePriceGetListModel.h"
@implementation FUSOneToOnePriceGetListModel
//嵌套的 model
+ (NSDictionary *)modelContainerPropertyGenericClass {
return @{
@"priceList" : FUSPrivateLivePriceItemModel.class
};
}
@end
//
// FUSUserManagerVoiceSignModel.h
// FUSUserCenterModule
//
// Created by aaa on 2024/11/21.
//
#import <FUSFoundation/FUSFoundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface FUSUserManagerVoiceSignModel : FUSBaseModel
/// 语音签名URL
@property (nonatomic, copy) NSString *url;
/// 语音时长(秒)
@property (nonatomic, assign) CGFloat duration;
/// 语音审核状态 -1:未通过 0:待审核 1:已审核
@property (nonatomic, assign) int status;
@end
NS_ASSUME_NONNULL_END
//
// FUSUserManagerVoiceSignModel.m
// FUSUserCenterModule
//
// Created by aaa on 2024/11/21.
//
#import "FUSUserManagerVoiceSignModel.h"
@implementation FUSUserManagerVoiceSignModel
@end
......@@ -10,6 +10,9 @@
#import <UIKit/UIKit.h>
#import "FUSPrivateLiveConfigModel.h"
#import "FUSPrivateLivePriceModel.h"
#import "FUSCommon.h"
#import "FUSUserManagerVoiceSignModel.h"
#import "FUSOneToOnePriceGetListModel.h"
@class FUSSettingChatInviteModel;
......@@ -220,4 +223,30 @@
success:(void(^)(void))success
failure:(void(^)(NSString *msg, int code))failure;
/// 校验是否已更新账号资料
/// @param success 成功
/// @param failure 失败
+ (void)fus_oneToOneCheckQualificationSuccess:(void (^)(FUSOnetoOneCheckQualificationModel *model))success
failure:(void (^)(NSString *msg, int code))failure;
/// 获取语音签名信息及状态
/// @param success 成功
/// @param failure 失败
+ (void)fus_userManagerVoiceSignGetSuccess:(void (^)(FUSUserManagerVoiceSignModel *model))success
failure:(void (^)(NSString *msg, int code))failure;
/// 1对1私房价格选项列表
/// @param success 成功
/// @param failure 失败
+ (void)fus_onetoonePriceGetListSuccess:(void (^)(FUSOneToOnePriceGetListModel *model))success
failure:(void (^)(NSString *msg, int code))failure;
/// 1对1私房设置价格
/// @param pid id
/// @param success 成功
/// @param failure 失败
+(void)fus_oneToOnePriceSetWithPid:(NSString *)pid
success:(void (^)(NSDictionary *dataDict))success
failure:(void (^)(NSString *msg, int code))failure;
@end
......@@ -535,4 +535,49 @@
}];
}
/// 校验是否已更新账号资料
+ (void)fus_oneToOneCheckQualificationSuccess:(void (^)(FUSOnetoOneCheckQualificationModel *))success failure:(void (^)(NSString *, int))failure{
[FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_OneToOneCheckQualification params:nil success:^(NSDictionary * _Nullable dataDict, int code) {
FUSOnetoOneCheckQualificationModel *model = [FUSOnetoOneCheckQualificationModel fus_modelWithDict:dataDict];
[FUSCacheDataShare shareStore].onetoOneCheckQualificationModel = model;
success(model);
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
/// 获取语音签名信息及状态
+ (void)fus_userManagerVoiceSignGetSuccess:(void (^)(FUSUserManagerVoiceSignModel *))success failure:(void (^)(NSString *, int))failure{
[FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_userManagerVoiceSignGet params:nil success:^(NSDictionary * _Nullable dataDict, int code) {
FUSUserManagerVoiceSignModel *model = [FUSUserManagerVoiceSignModel fus_modelWithDict:dataDict];
success(model);
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
/// 1对1私房价格选项列表
+ (void)fus_onetoonePriceGetListSuccess:(void (^)(FUSOneToOnePriceGetListModel *))success failure:(void (^)(NSString *, int))failure{
[FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_oneToOnePriceGetList params:nil success:^(NSDictionary * _Nullable dataDict, int code) {
FUSOneToOnePriceGetListModel *model = [FUSOneToOnePriceGetListModel fus_modelWithDict:dataDict];
success(model);
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
/// 1对1私房设置价格
+ (void)fus_oneToOnePriceSetWithPid:(NSString *)pid success:(void (^)(NSDictionary *))success failure:(void (^)(NSString *, int))failure{
[FUSHttpHelper postRequestBinaryWithUrl:FUSUserCenterURLs.fus_URL_oneToOnePriceSet params:@{@"priceId": pid} success:^(NSDictionary * _Nullable dataDict, int code) {
success(dataDict);
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE,code);
}
}];
}
@end
......@@ -17,6 +17,9 @@
self.selectedBackgroundView = [[UIView alloc] init];
self.selectedBackgroundView.backgroundColor = UIColor.fus_appBGPressColor;
self.arrowImageView.image = UIImage.fus_rightArrowIcon;
self.titleLabel.textColor = [UIColor fus_textColorRich];
self.detailLabel.textColor = [UIColor fus_textColorLight2];
}
/**
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -43,7 +43,7 @@
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.070588235294117646" green="0.070588235294117646" blue="0.086274509803921567" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="i0P-UN-dUJ" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="12e-hB-Nb7"/>
<constraint firstItem="CQQ-zp-zt3" firstAttribute="top" secondItem="qqh-H2-4Tm" secondAttribute="bottom" constant="8" id="9fm-Up-FBO"/>
......
......@@ -5,6 +5,7 @@
// Created by pierce on 2022/1/14.
// Copyright © 2024年 FusiClub. All rights reserved.
//
//TODO: 7600以后版本这个类废弃,使用FUSChatSettingOneToOneHeaderView替代,后续如无意外删除此类
#import <UIKit/UIKit.h>
......
//
// FUSChatSettingOneToOneHeaderView.h
// FUSUserCenterModule
//
// Created by aaa on 2024/11/21.
//
#import <UIKit/UIKit.h>
#import "FUSPrivateLiveConfigModel.h"
#import "FUSUserManagerVoiceSignModel.h"
NS_ASSUME_NONNULL_BEGIN
@interface FUSChatSettingOneToOneHeaderView : UIView
@property (nonatomic, strong) FUSPrivateLiveConfigModel *configModel;
/// 语音签名状态模型
@property (nonatomic, strong) FUSUserManagerVoiceSignModel *voiceSignModel;
+(CGFloat)fus_viewHeight;
@end
NS_ASSUME_NONNULL_END
......@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
cell 的Nib对象
*/
+ (UINib *)cellNib;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *priceLabelTop;
@property (strong, nonatomic) IBOutlet UILabel *priceLabel;
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
......@@ -31,7 +31,7 @@
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="setting_price_lock" translatesAutoresizingMaskIntoConstraints="NO" id="gJ0-X0-4m2">
<rect key="frame" x="0.0" y="0.0" width="357" height="215"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.60072951158940402" colorSpace="custom" customColorSpace="calibratedRGB"/>
</imageView>
</subviews>
</view>
......@@ -54,6 +54,7 @@
<outlet property="lockImageView" destination="gJ0-X0-4m2" id="MgX-wr-lIN"/>
<outlet property="nexttipsLabel" destination="uQV-Z1-wW6" id="OZF-Sa-B7B"/>
<outlet property="priceLabel" destination="Eck-0t-3tl" id="aUf-mv-2cQ"/>
<outlet property="priceLabelTop" destination="XXm-QD-fDV" id="wUQ-Sx-DsF"/>
</connections>
<point key="canvasLocation" x="221.01449275362322" y="180.46875"/>
</collectionViewCell>
......
......@@ -65,6 +65,18 @@ NS_ASSUME_NONNULL_BEGIN
// 获取用户信息
+ (NSString *)fus_URL_USER_INFO;
/// 校验是否已更新账号资料
+ (NSString *)fus_URL_OneToOneCheckQualification;
/// 获取语音签名信息及状态
+ (NSString *)fus_URL_userManagerVoiceSignGet;
/// 1对1私房价格选项列表
+ (NSString *)fus_URL_oneToOnePriceGetList;
/// 1对1私房设置价格
+ (NSString *)fus_URL_oneToOnePriceSet;
// 获取用户头像认证状态
+ (NSString *)fus_URL_USER_FACE_AUTH_STATUS;
......
......@@ -94,6 +94,22 @@
+ (NSString *)fus_URL_USER_INFO {
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/sync/me.html"];
}
/// 校验是否已更新账号资料
+ (NSString *)fus_URL_OneToOneCheckQualification {
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/onetoone/check/qualification"];
}
/// 获取语音签名信息及状态
+ (NSString *)fus_URL_userManagerVoiceSignGet {
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/userManager/voice/sign/get"];
}
/// 1对1私房价格选项列表
+ (NSString *)fus_URL_oneToOnePriceGetList{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/onetoone/price/getList"];
}
/// 1对1私房设置价格
+ (NSString *)fus_URL_oneToOnePriceSet{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/onetoone/price/set"];
}
// 获取用户头像认证状态
+ (NSString *)fus_URL_USER_FACE_AUTH_STATUS {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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