提交翻译

DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/Models/FUSSettingConfigModel.h

@@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL showMyLiveSwitch;
 @property (nonatomic, assign) BOOL showPay;
 @property (nonatomic, assign) BOOL showTaskSystem;
-@property (nonatomic, assign) BOOL showWithdraw;
+@property (nonatomic, assign) BOOL showRedeem;
 @property (nonatomic, assign) BOOL statswitch;
 @property (nonatomic, strong) NSString *tips;
 @property (nonatomic, assign) NSInteger unicastDefaultType;

DevelopmentPods/FUSCommon/FUSCommon/Classes/FUSAPPConfigs/FUSFuSiWebViewEventHelper.h

@@ -15,7 +15,7 @@ typedef NS_ENUM(NSUInteger,FUSJumpType) {
     FUSJOpenH5Link = 3,           // 网页调起客户端打开新的网页
     FUSJMy = 10,                  // 我的
     FUSJPersonalInfo = 11,        // 个人信息
-    FUSJFiresWithDraw = 12,       // 萤火提现
+    FUSJFiresRedeem = 12,       // 萤火提现
     FUSJVipCenter = 13,           // VIP中心
     FUSJInviteAward = 14,         // 邀请有奖
     FUSJExchangeDew = 15,         // 兑换露水

DevelopmentPods/FUSCommon/FUSCommon/Classes/FUSAPPConfigs/FUSFuSiWebViewEventHelper.m

@@ -1078,14 +1078,14 @@ NSString * const kEVENT_RECHARGE_FIRST_RECHARGE_WINDOW_RECEIVE_OFFICIAL_RECAHARG
             [FUSRouter.userRouter fus_enterUserZone:[FUSCacheDataShare shareStore].userDetailInfo.uid];
         }
             break;
-        case FUSJFiresWithDraw:
+        case FUSJFiresRedeem:
         {
             if (FUSConfig.sharedInstanced.devConfigs.appStatus){
                 // sh不跳
                 return;
             }
             FUSWKWebViewController *vc = [[FUSWKWebViewController alloc] init];
-            vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.withdrawAddress;
+            vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.redeemAddress;
             [[UIViewController fus_topViewController].navigationController pushViewController:vc animated:YES];
         }
             break;

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/LiveRouter/FUSLivePublicDefine.h

@@ -133,7 +133,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 用户协议，暴奖部分
 + (NSString *)fus_liveAgreementConfirmBurstAward;
 /// 用户协议，提现部分
-+ (NSString *)fus_liveAgreementConfirmWithDraw;
++ (NSString *)fus_liveAgreementConfirmRedeem;
 
 /// 选中的开播质量
 + (NSString *)fus_livePushQualityBid;

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/LiveRouter/FUSLivePublicDefine.m

@@ -216,8 +216,8 @@
     return @"liveAgreementConfirmBurstAward";
 }
 /// 用户协议，提现部分
-+ (NSString *)fus_liveAgreementConfirmWithDraw{
-    return @"liveAgreementConfirmWithDraw";
++ (NSString *)fus_liveAgreementConfirmRedeem{
+    return @"liveAgreementConfirmRedeem";
 }
 
 /// 选中的开播质量

DevelopmentPods/FUSCommon/FUSCommon/FUSRouter/Routers/UserRouter/FUSPublicModels/Login/FUSSettingInitDataModel.h

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 平台活动地址
 @property (nonatomic, copy) NSString *activitiesAddress;
 /// 提现H5地址
-@property (nonatomic, copy) NSString *withdrawAddress;
+@property (nonatomic, copy) NSString *redeemAddress;
 /// 宝石记录H5地址
 @property (nonatomic, copy) NSString *gemTradeAddress;
 /// 露水记录H5地址

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/View/OpenScreenPush/Other/FUSOpenScreenPushHelp.m

@@ -19,7 +19,7 @@ typedef NS_ENUM(NSUInteger,JumpType) {
     JTOpenH5Link = 3,           // H5链接
     JTMy = 10,                  // 我的  
     JTPersonalInfo = 11,        // 个人信息
-    JTFiresWithDraw = 12,       // 萤火提现  
+    JTFiresRedeem = 12,       // 萤火提现
     JTVipCenter = 13,           // VIP中心
     JTInviteAward = 14,         // 邀请有奖
     JTExchangeDew = 15,         // 兑换露水
@@ -69,14 +69,14 @@ typedef NS_ENUM(NSUInteger,JumpType) {
             [FUSRouter.userRouter fus_enterUserZone:[FUSCacheDataShare shareStore].userDetailInfo.uid];
         }
             break;
-        case JTFiresWithDraw:
+        case JTFiresRedeem:
         {
             if (FUSConfig.sharedInstanced.devConfigs.appStatus){
                 // sh不跳
                 return;
             }
             FUSWKWebViewController *vc = [[FUSWKWebViewController alloc] init];
-            vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.withdrawAddress;
+            vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.redeemAddress;
             [currentController.navigationController pushViewController:vc animated:YES];
         }
             break;

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FFLiveAgreementAlertView/FUSIncomeAgreementAlertView.m

@@ -35,7 +35,7 @@
 }
 
 + (BOOL)fus_checkConfirm{
-    NSString *state = [[NSUserDefaults standardUserDefaults] stringForKey:FUSLiveUDKeys.fus_liveAgreementConfirmWithDraw];
+    NSString *state = [[NSUserDefaults standardUserDefaults] stringForKey:FUSLiveUDKeys.fus_liveAgreementConfirmRedeem];
     if (state == nil || state.length <= 0) {
         return NO;
     }
@@ -172,7 +172,7 @@
 }
 -(void)fus_okBtnDidClicked:(UIButton *)btn{
     
-    [[NSUserDefaults standardUserDefaults] setValue:@"1" forKey:FUSLiveUDKeys.fus_liveAgreementConfirmWithDraw];
+    [[NSUserDefaults standardUserDefaults] setValue:@"1" forKey:FUSLiveUDKeys.fus_liveAgreementConfirmRedeem];
     
     if (self.clickHandler) {
         self.clickHandler(FUSIncomeAgreementClickedOK);

Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/FUSLivePushPrepareView.m

@@ -207,11 +207,11 @@
             [FUSLoadingView fus_dismissProgressViewWithView:weakSelf];
             
             if (code == -60) {
-                // 开启直播需绑定手机
-                FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
-                webVC.webUrlString = FUSShowRoomURLs.fus_URL_SETTING_BIND_PHONE;
-                webVC.shouldIncludeIdentifyInfo = YES;
-                [[[weakSelf getViewController] navigationController] pushViewController:webVC animated:YES];
+//                // 开启直播需绑定手机
+//                FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
+//                webVC.webUrlString = FUSShowRoomURLs.fus_URL_SETTING_BIND_PHONE;
+//                webVC.shouldIncludeIdentifyInfo = YES;
+//                [[[weakSelf getViewController] navigationController] pushViewController:webVC animated:YES];
             } else if (code == -61) {
                 // 开启直播需要实名认证
 

Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.h

@@ -227,9 +227,6 @@ NS_ASSUME_NONNULL_BEGIN
 // 获取首冲信息
 + (NSString *)fus_URL_LIVE_FIRST_CHARGE_INFO;
 
-// 绑定手机号码
-+ (NSString *)fus_URL_SETTING_BIND_PHONE;
-
 // 获取指定用户的信息
 + (NSString *)fus_URL_FRIEND_INFO;
 

Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.m

@@ -380,11 +380,6 @@
     return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/firstcharge/info.html"];
 }
 
-// 绑定手机号码
-+ (NSString *)fus_URL_SETTING_BIND_PHONE {
-    return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/withdraw/phone/readybind.html"];
-}
-
 // 获取指定用户的信息
 + (NSString *)fus_URL_FRIEND_INFO {
     return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/sync/getUser.html"];

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/ImAnchor/FUSImAnchorViewController.m

@@ -120,13 +120,13 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
                 [weakSelf.navigationController pushViewController:myZoneVC animated:YES];
             }
                 break;
-            case FUSImAnchorHeaderButtonTypeWithDraw:{
+            case FUSImAnchorHeaderButtonTypeRedeem:{
                 if (FUSConfig.sharedInstanced.devConfigs.appStatus){
                     // sh不跳
                     return;
                 }
                 FUSWKWebViewController *vc = [[FUSWKWebViewController alloc] init];
-                vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.withdrawAddress;
+                vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.redeemAddress;
                 [weakSelf.navigationController pushViewController:vc animated:YES];
             }
                 break;

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/ImAnchor/View/FUSImAnchorHeaderView.h

@@ -14,7 +14,7 @@ typedef enum :NSInteger{
     /// 个人空间
     FUSImAnchorHeaderButtonTypeMyZone = 0,
     /// 可提现
-    FUSImAnchorHeaderButtonTypeWithDraw,
+    FUSImAnchorHeaderButtonTypeRedeem,
     /// vip
     FUSImAnchorHeaderButtonTypeVIP,
 }FUSImAnchorHeaderButtonType;

Modules/FUSUserCenterModule/FUSUserCenterModule/Features/ImAnchor/View/FUSImAnchorHeaderView.m

@@ -19,7 +19,7 @@
 @property (nonatomic, strong) UIButton *ageBtn;
 @property (nonatomic, strong) UILabel *idLabel;
 @property (nonatomic, strong) UILabel *fireNumLabel;
-@property (nonatomic, strong) UIButton *withdrawBtn;
+@property (nonatomic, strong) UIButton *redeemBtn;
 
 /// 数据
 @property (nonatomic, strong) FUSUserInfosModel *userinfoModel;
@@ -191,27 +191,27 @@
         make.top.equalTo(fireImgView.mas_bottom).offset(6);
     }];
     
-    UILabel *withdrawTitleLabel = [[UILabel alloc] init];
-    withdrawTitleLabel.font = [UIFont fus_themeMediumFont:13];
-    withdrawTitleLabel.textColor = [UIColor fus_textColorLight];
+    UILabel *redeemTitleLabel = [[UILabel alloc] init];
+    redeemTitleLabel.font = [UIFont fus_themeMediumFont:13];
+    redeemTitleLabel.textColor = [UIColor fus_textColorLight];
     if (!FUSConfig.sharedInstanced.devConfigs.appStatus) {
         // 非sh显示
-        withdrawTitleLabel.text = [NSString fus_localString:@"可兑换"];
+        redeemTitleLabel.text = [NSString fus_localString:@"可兑换"];
     }
-    [bottomBgImageView addSubview:withdrawTitleLabel];
-    [withdrawTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+    [bottomBgImageView addSubview:redeemTitleLabel];
+    [redeemTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.offset(-25);
         make.top.offset(20);
     }];
     
     // 单独独立一个透明button出来好操控空间，不然等下gcp又说要特定区域能点
-    self.withdrawBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-    self.withdrawBtn.tag = FUSImAnchorHeaderButtonTypeWithDraw;
-    [bottomBgImageView addSubview:self.withdrawBtn];
-    [self.withdrawBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+    self.redeemBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    self.redeemBtn.tag = FUSImAnchorHeaderButtonTypeRedeem;
+    [bottomBgImageView addSubview:self.redeemBtn];
+    [self.redeemBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.edges.equalTo(bottomBgImageView);
     }];
-    [self.withdrawBtn addTarget:self action:@selector(fus_commondBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
+    [self.redeemBtn addTarget:self action:@selector(fus_commondBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
     
     self.avatorBtn.tag = FUSImAnchorHeaderButtonTypeMyZone;
     [self.avatorBtn addTarget:self action:@selector(fus_commondBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];