'2023年3月14日10:05:15'

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/HomeListInfo.java

@@ -133,6 +133,7 @@ public class HomeListInfo extends AppActivity implements StatusAction {
                         binding.cancel.setVisibility(View.GONE);
                         break;
                     case "11":  //(11, "已完成")
+                        binding.nextStep.setVisibility(View.GONE);
                         binding.vehicleInformation.setVisibility(View.GONE);
                         break;
                     default:
@@ -204,14 +205,14 @@ public class HomeListInfo extends AppActivity implements StatusAction {
                                 ResultBean.BizContent productBean = new ResultBean.BizContent();
                                 productBean.setId(bizContent1.productId);
                                 productBean.setName(bizContent1.getProductName());
-                                if(bizContent1.product != null){
+                                if (bizContent1.product != null) {
                                     productBean.setProductMsg(bizContent1.product.productMsg);
                                     productBean.setFee(bizContent1.product.fee);
                                 }
                                 Bundle bundle = new Bundle();
                                 bundle.putString("bizContent", JSON.toJSONString(productBean));
-                                bundle.putString("orderId",  bizContent1.getOrderId());
-                                jumpToPage(ETCHandleSonActivity.class,bundle);
+                                bundle.putString("orderId", bizContent1.getOrderId());
+                                jumpToPage(ETCHandleSonActivity.class, bundle);
 
                                 /*Intent intent = new Intent();
                                 intent.putExtra("orderId", bizContent1.getOrderId()); //客车
@@ -366,7 +367,7 @@ public class HomeListInfo extends AppActivity implements StatusAction {
         //设备激活
         new ObuActivation(BoxManagers.mDecryptVehicleApduBean,
                 getActivity()).start(bizContent -> {
-                    bizContent.setOrderId(content.getOrderId());
+            bizContent.setOrderId(content.getOrderId());
             //激活步骤
             new ObuActivateRequester().start(bizContent, getActivity());
         });

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/TopEntrapmentActivity.java

@@ -35,9 +35,10 @@ import java.util.Objects;
 
 /**
  * 圈存确认
+ *
  * @author admin
  */
-public class TopEntrapmentActivity extends AppActivity implements INRechargeChoose{
+public class TopEntrapmentActivity extends AppActivity implements INRechargeChoose {
     private ActivityToEntrapmentBinding binding;
     private String cardId, vehiclePlate, vehiclePlateColorStr, name, command;
 
@@ -59,7 +60,7 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
     @Override
     protected void initView() {
         inRechargeChoose = this;
-        rechargeMoneyAdapter = new RechargeAdapter(TopEntrapmentActivity.this,inRechargeChoose);
+        rechargeMoneyAdapter = new RechargeAdapter(TopEntrapmentActivity.this, inRechargeChoose);
 
         cardId = getIntent().getStringExtra("cardId");
         vehiclePlate = getIntent().getStringExtra("vehiclePlate");
@@ -79,7 +80,7 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
     /*
      * 设置界面数据
      */
-    private void setDataToView(){
+    private void setDataToView() {
         binding.tvCardNum.setText("ETC卡号：" + (FunHelper.isEmpty(cardId) ? "" : cardId));
         binding.tvMoneyLabel.setText(FunHelper.isEmpty(name) ? "" : name);
         binding.tvMoney.setText(FunHelper.isEmpty(vehiclePlate) ? "" : vehiclePlate);
@@ -89,7 +90,7 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
     /*
      * 设置充值金额
      */
-    private void setRechargeMoneyList () {
+    private void setRechargeMoneyList() {
         List<RechargeBean> list = new ArrayList<>();
         list.add(new RechargeBean("100"));
         list.add(new RechargeBean("200"));
@@ -106,15 +107,15 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
      * 确认充值弹窗
      * @param payMoney
      */
-    private void showConfirmDialog(String payMoney){
+    private void showConfirmDialog(String payMoney) {
         new RechargeConfirmDialog.Builder(TopEntrapmentActivity.this)
-                .setContent(payMoney,"请确认是否为车牌号为：" + vehiclePlate + "，车牌颜色为：" + vehiclePlateColorStr + "的车充值。")
+                .setContent(payMoney, "请确认是否为车牌号为：" + vehiclePlate + "，车牌颜色为：" + vehiclePlateColorStr + "的车充值。")
                 .setListener(new RechargeConfirmDialog.InOnConfirmClick() {
                     @Override
                     public void onConfirmClick() {
-                       doRecharge();
+                        doRecharge();
                     }
-                }) .show();
+                }).show();
     }
 
     /*
@@ -135,7 +136,7 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
         调用圈存检测->圈存修复->圈存申请->圈存确认
         调用圈存检测->圈存修复->圈存确认
      */
-    private void doRecharge(){
+    private void doRecharge() {
         toast("马上执行充值" + moneyInfo.payMoney);
         SendTheVerificationCodeBean bean = new SendTheVerificationCodeBean();
         bean.setCardId(cardId); //卡号(传入)
@@ -394,17 +395,18 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
 
     interface Callback {
         void result(ResultBean.BizContent bizContent);
+
         default void fail() {
         }
     }
 
 
-    private void  initClick(){
+    private void initClick() {
         //立即充值
         binding.nextStep.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if(FunHelper.isEmpty(FunHelper.getText(binding.etInputMoney))){
+                if (FunHelper.isEmpty(FunHelper.getText(binding.etInputMoney))) {
                     toast("请输入充值金额，或者选择需要充值的金额！");
                     return;
                 }
@@ -413,6 +415,7 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
 //                    return;
 //                }
                 moneyInfo = new RechargeBean(FunHelper.getText(binding.etInputMoney));
+
                 doRecharge();
             }
         });