修改UI走查问题

BaseLibrary/src/main/res/drawable/shape_click_btn.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_01c1b5"/>
-    <corners android:radius="39dp"/>
+    <solid android:color="@color/color_2dc7aa"/>
+    <corners android:radius="22dp"/>
 </shape>

BaseLibrary/src/main/res/layout/common_popu.xml

@@ -44,7 +44,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_22"
             android:layout_marginEnd="14dp"
-            android:layout_marginStart="14dp"
             android:lineSpacingExtra="10dp"
             android:text=""
             tools:text="哈哈哈哈哈哈"

teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalActivity.java

@@ -85,7 +85,11 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
             goSignProtocol();
             return;
         } else if (id == R.id.tv_go_bind_bankcard) {
-            goBindCard();
+            if (null == mWithdrawalInfo.userBankCard) {
+                goBindCard();
+            } else {
+                goMineBindCard();
+            }
             return;
         }
     }
@@ -203,12 +207,13 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
         viewBinding.tvAvailablePrice.setText("可结算余额 ¥" + getTwoDecimal(data.amountWithdrawal));
         viewBinding.tvServiceFee.setText("单次收入结算时，平台将收取" + getTwoDecimal(data.withdrawalServiceFee) + "元手续费");
         if (null != data.userBankCard) {
-            viewBinding.tvBankName.setText(data.userBankCard.bankName + getBankNum(data.userBankCard.bankCard));
+            viewBinding.tvBankName.setText(data.userBankCard.bankName);
             viewBinding.tvTip.setVisibility(View.VISIBLE);
+            viewBinding.tvTip.setText(getBankNum(data.userBankCard.bankCard));
             viewBinding.tvGoBindBankcard.setText("去换绑");
         } else {
-            viewBinding.tvBankName.setText("您未绑定银行卡");
             viewBinding.tvTip.setVisibility(View.GONE);
+            viewBinding.tvBankName.setText("您未绑定银行卡");
             viewBinding.tvGoBindBankcard.setText("去绑卡");
         }
     }
@@ -241,6 +246,11 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
     }
 
     private void goBindCard() {
+        ARouter.getInstance().build(RouterPath.MineCenter.MINE_BIND_BANKCARD)
+                .navigation();
+    }
+
+    private void goMineBindCard() {
         ARouter.getInstance().build(RouterPath.MineCenter.MINE_MY_BANKCARD)
                 .navigation();
     }
@@ -248,14 +258,12 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
     private void showProtocolTipDialog() {
         if (mProtocolTipDialog == null) {
             mProtocolTipDialog = new CommonDialog(this);
-//            mProtocolTipDialog.setCanceledOnTouchOutside(false);
-//            mProtocolTipDialog.setCancelable(false);
         }
         if (!mProtocolTipDialog.isShowing()) {
             mProtocolTipDialog.show();
         }
-        mProtocolTipDialog.setTitle("协议签署");
-        mProtocolTipDialog.setContent("您需要先签署协议才能结算");
+        mProtocolTipDialog.setTitle("签署协议");
+        mProtocolTipDialog.setContent("您暂未签署协议，请签署后结算");
         mProtocolTipDialog.setConfirmText("去签署");
         mProtocolTipDialog.setOnConfirmClickListener(new View.OnClickListener() {
             @Override
@@ -333,8 +341,8 @@ public class WithdrawalActivity extends BaseMVPActivity<ActivityWithdrawalBindin
             return "";
         }
         try {
-            String substring = num.substring(num.length() - 8);
-            return "(" + substring + ")";
+            String substring = num.substring(num.length() - 4);
+            return "**** **** **** " + substring;
         } catch (Exception e) {
             e.printStackTrace();
         }

teacher/src/main/res/layout/activity_withdrawal.xml

@@ -82,7 +82,7 @@
             android:layout_marginLeft="12dp"
             android:layout_marginTop="12dp"
             android:text="到账银行卡"
-            android:textColor="@color/black"
+            android:textColor="@color/color_777777"
             android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -104,23 +104,26 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="47dp"
             android:text="银行卡号"
+            android:textStyle="bold"
             android:textColor="@color/black"
             android:textSize="@dimen/sp_16"
+            android:includeFontPadding="false"
             app:layout_constraintBottom_toBottomOf="@+id/iv_bankcard_tag"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="@+id/iv_bankcard_tag"
-            tool:text="中国工商银行储蓄卡（****1917）" />
+            tool:text="中国工商银行储蓄卡" />
 
         <TextView
-            android:visibility="gone"
+            android:layout_marginLeft="10dp"
             android:id="@+id/tv_tip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:text="预计2小时内到账"
-            android:textColor="@color/color_999999"
-            android:textSize="@dimen/sp_14"
-            app:layout_constraintLeft_toLeftOf="@+id/tv_bank_name"
+            android:layout_marginTop="12dp"
+            tools:text="**** **** **** 1917"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_20"
+            android:includeFontPadding="false"
+            app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_bank_name" />
         
         
@@ -155,7 +158,7 @@
             android:layout_marginLeft="11dp"
             android:layout_marginTop="10dp"
             android:text="结算金额"
-            android:textColor="@color/black"
+            android:textColor="@color/color_777777"
             android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />