Browse Source

修改提现字样为结算

Pq 3 years ago
parent
commit
0ed3a02391

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/adapter/WithdrawalRecordAdapter.java

@@ -46,11 +46,11 @@ public class WithdrawalRecordAdapter extends BaseQuickAdapter<WithdrawalRecordBe
                     tv_state.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_666666));
                     break;
                 case "succeeded":
-                    tv_state.setText("提现成功");
+                    tv_state.setText("结算成功");
                     tv_state.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
                     break;
                 case "failed":
-                    tv_state.setText("提现失败");
+                    tv_state.setText("结算失败");
                     tv_state.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff5c5f));
                     break;
             }

+ 3 - 3
teacher/src/main/java/com/cooleshow/teacher/api/APIService.java

@@ -440,7 +440,7 @@ public interface APIService {
     Observable<BaseResponse<UserAccountBean>> userAccountPage(@Body RequestBody body);
 
     /**
-     * 查询提现页面信息
+     * 查询结算页面信息
      *
      * @return
      */
@@ -448,7 +448,7 @@ public interface APIService {
     Observable<BaseResponse<WithdrawalInfoBean>> getWithdrawalInfo();
 
     /**
-     * 发起提现
+     * 发起结算
      *
      * @param body
      * @return
@@ -457,7 +457,7 @@ public interface APIService {
     Observable<BaseResponse<Object>> doWithdrawal(@Body RequestBody body);
 
     /**
-     * 提现记录
+     * 结算记录
      *
      * @param body
      * @return

+ 5 - 5
teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalActivity.java

@@ -41,7 +41,7 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
             case R.id.tv_confirm_withdrawal:
                 String amountWithdrawal = viewBinding.etPrice.getText().toString().trim();
                 if (Double.parseDouble(amountWithdrawal) <= mWithdrawalInfo.withdrawalServiceFee) {
-                    ToastUtils.showShort("提现金额需要大于手续费");
+                    ToastUtils.showShort("结算金额需要大于手续费");
                     break;
                 }
                 if (null == mWithdrawalInfo.userBankCard) {
@@ -65,10 +65,10 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
 
     @Override
     protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "提现");
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "结算");
         viewBinding.toolbarInclude.tvRightText.setTextColor(getResources().getColor(com.cooleshow.base.R.color.common_black));
         viewBinding.toolbarInclude.tvRightText.setVisibility(View.VISIBLE);
-        viewBinding.toolbarInclude.tvRightText.setText("提现记录");
+        viewBinding.toolbarInclude.tvRightText.setText("结算记录");
         viewBinding.toolbarInclude.tvRightText.setOnClickListener(this);
         viewBinding.tvWithdrawalAll.setOnClickListener(this);
         viewBinding.tvConfirmWithdrawal.setOnClickListener(this);
@@ -96,8 +96,8 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
     @Override
     public void getWithdrawalInfoSuccess(WithdrawalInfoBean data) {
         mWithdrawalInfo = data;
-        viewBinding.tvAvailablePrice.setText("可提现余额 " + getTwoDecimal(data.amountWithdrawal));
-        viewBinding.tvServiceFee.setText("单次收入提现时,平台将收取" + getTwoDecimal(data.withdrawalServiceFee) + "元手续费");
+        viewBinding.tvAvailablePrice.setText("可结算余额 " + getTwoDecimal(data.amountWithdrawal));
+        viewBinding.tvServiceFee.setText("单次收入结算时,平台将收取" + getTwoDecimal(data.withdrawalServiceFee) + "元手续费");
         if (null != data.userBankCard) {
             viewBinding.tvBankName.setText(data.userBankCard.bankName);
         }

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalRecordActivity.java

@@ -76,7 +76,7 @@ public class WithdrawalRecordActivity extends BaseMVPActivity<ActivityWithdrawal
 
     @Override
     protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "提现记录");
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "结算记录");
         viewBinding.tvDate.setOnClickListener(this);
         viewBinding.tvType.setOnClickListener(this);
 

+ 1 - 1
teacher/src/main/res/layout/activity_mine_income.xml

@@ -48,7 +48,7 @@
             android:layout_marginRight="22dp"
             android:background="@drawable/bg_white_border"
             android:gravity="center"
-            android:text="提现"
+            android:text="结算"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_16"
             app:layout_constraintRight_toRightOf="parent"

+ 5 - 5
teacher/src/main/res/layout/activity_withdrawal.xml

@@ -77,7 +77,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="11dp"
             android:layout_marginTop="10dp"
-            android:text="提现金额"
+            android:text="结算金额"
             android:textColor="@color/black"
             android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -128,7 +128,7 @@
             android:layout_height="@dimen/dp_43"
             android:layout_marginLeft="12dp"
             android:gravity="center"
-            tool:text="可提现余额 ¥400.00"
+            tool:text="可结算余额 ¥400.00"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -141,7 +141,7 @@
             android:layout_height="@dimen/dp_43"
             android:layout_marginRight="10dp"
             android:gravity="center"
-            android:text="全部提现"
+            android:text="全部结算"
             android:textColor="@color/color_2dc7aa"
             android:textSize="@dimen/sp_14"
             app:layout_constraintRight_toRightOf="parent"
@@ -159,7 +159,7 @@
         android:background="@drawable/bg_withdrawal_tips"
         android:gravity="center_vertical"
         android:paddingLeft="11dp"
-        android:text="单次收入提现时,平台将收取2元手续费"
+        android:text="单次收入结算时,平台将收取2元手续费"
         android:textColor="@color/color_e0945a" />
 
     <TextView
@@ -171,7 +171,7 @@
         android:layout_marginRight="28dp"
         android:background="@drawable/shape_course_status_ing"
         android:gravity="center"
-        android:text="确认提现"
+        android:text="确认结算"
         android:textColor="@color/white"
         android:textSize="@dimen/sp_14" />
 

+ 2 - 2
teacher/src/main/res/layout/activity_withdrawal_success.xml

@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="15dp"
-        android:text="您已成功提交提现申请"
+        android:text="您已成功提交结算申请"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/sp_15" />
 
@@ -32,7 +32,7 @@
         android:layout_marginTop="11dp"
         android:gravity="center"
         android:lineSpacingExtra="4dp"
-        android:text="平台将在2个工作日内将提现金额转账至你\n所绑定的银行卡,请留意银行卡收入信息"
+        android:text="平台将在2个工作日内将结算金额转账至你\n所绑定的银行卡,请留意银行卡收入信息"
         android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_15" />
 

+ 1 - 1
teacher/src/main/res/layout/empty_my_bank_card.xml

@@ -22,7 +22,7 @@
         android:lineSpacingExtra="4dp"
         android:layout_marginTop="12dp"
         android:gravity="center"
-        android:text="您暂未绑定银行卡\n绑定后可将收入提现"
+        android:text="您暂未绑定银行卡\n绑定后可将收入结算"
         android:textColor="@color/color_999999"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"