Merge branch 'cabinet_req_2023_05_04' of zyh/ich-android into cabinet_req_2023_05_04

app/src/main/java/com/emato/ich/fragment/ChooseCabinetFragment.java

@@ -104,7 +104,7 @@ public class ChooseCabinetFragment extends Fragment {
         if (!"expressDelivery".equals(pageType)){
             view.findViewById(R.id.how_to_send).setVisibility(View.GONE);
         }else{
-            view.findViewById(R.id.how_to_send).setVisibility(View.GONE);
+            view.findViewById(R.id.how_to_send).setVisibility(View.VISIBLE);
         }
 
 

app/src/main/java/com/emato/ich/fragment/CollectMaterialsFragment.java

@@ -819,7 +819,7 @@ public class CollectMaterialsFragment extends Fragment {
             if (null != timer) {
                 timer.cancel();
             }
-            NavUtils.navigate(this, R.id.action_collectMaterialsFragment_to_mainFragment);
+            NavUtils.navigate(this, R.id.action_collectMaterialsFragment_to_SendKeyBoardFragment);
         });
 
         // 默认选中运单号输入框

app/src/main/java/com/emato/ich/fragment/PaymentFragment.java

@@ -164,14 +164,69 @@ public class PaymentFragment extends Fragment {
                     });
                 }
             });
+            binding.keyBoard.inputButtonConfirm.setOnClickListener(v -> {
+                String s = binding.paymentNo.getText().toString();
+                if (paymentNoLock.get() == 1) {
+                    // 禁用软件盘
+                    Editable text = binding.paymentNo.getText();
+                    text.clear();
+                    binding.paymentNo.setText(s);
+                    paymentNoLock.incrementAndGet();
+                    // TODO 预定义,实际参数可能不一致 oms获取用户手机号 自动填充
+                    ICSPClient.delivererPay(LocalStorage.getInstance().getSession().getToken(), s, new Callback() {
+                        @Override
+                        public void onFailure(@NotNull Call call, @NotNull IOException e) {
+                            // 请求失败
+                            Log.e(TAG, "onFailure: 投递员付款! 网络异常! ", e);
+                            LoggingUtils.sendErrorLog("业务异常: 投递员付款! 网络异常! ", e);
+                            ToastUtils.make(getContext(), "服务器异常! 请联系管理员!");
+                            paymentNoLock.set(1);
+                        }
 
+                        @Override
+                        public void onResponse(@NotNull Call call, @NotNull Response response) throws IOException {
+
+                            getActivity().runOnUiThread(() -> {
+                                String parseResponse = ICSPClient.isSuccessfulAndParseResponse(response);
+                                if (!StringUtils.isNullOrEmpty(parseResponse)) {
+                                    try {
+                                        ResponseData responseData = JacksonUtils.objectmapper.readValue(parseResponse, ResponseData.class);
+                                        if (null != responseData && ICSPConstant.OK.equals(responseData.getCode())) {
+                                            NavUtils.navigate(PaymentFragment.this, R.id.action_paymentFragment_to_InputInfoKeyBoardFragment);
+                                        } else {
+                                            ToastUtils.make(getContext(), responseData.getMsg());
+                                        }
+
+                                    } catch (JsonProcessingException e) {
+                                        Log.e(TAG, "onResponse: 服务器响应错误! 自动获取用户手机号失败! ", e);
+                                        ToastUtils.make(getContext(), "网络异常! 请手动输入手机号! ");
+                                        LoggingUtils.sendErrorLog("业务异常: 服务器响应错误! 自动获取用户手机号失败! ", e);
+                                    } catch (RuntimeException e) {
+                                        Log.e(TAG, "onResponse: 获取用户手机号未知错误! ", e);
+                                        ToastUtils.make(getContext(), "未查询到手机号! 请手动输入! ");
+                                        LoggingUtils.sendErrorLog("业务异常: 获取用户手机号未知错误! ", e);
+                                    } catch (Exception e) {
+                                        Log.e(TAG, "onResponse: 获取用户手机号未知错误! ", e);
+                                        ToastUtils.make(getContext(), "未查询到手机号! 请手动输入! ");
+                                        LoggingUtils.sendErrorLog("业务异常: 获取用户手机号未知错误! ", e);
+                                    }
+                                } else {
+                                    ToastUtils.make(getContext(), "服务器异常！请稍后重试！");
+                                }
+                                paymentNoLock.set(1);
+                            });
+
+                        }
+                    });
+                }
+            });
         } catch (RuntimeException e) {
             Log.e(TAG, "onViewCreated: InputInfoFragment页面获取ChooseCabinetFragment传值错误! ", e);
             LoggingUtils.sendErrorLog("业务异常: InputInfoFragment页面获取ChooseCabinetFragment传值错误! ", e);
         }
 
         // TODO 离线逻辑, 暂时不做
-        // 数字输入 5 手机号   4 面单号
+        // 数字输入 5 手机号   4 付款码
         binding.paymentNo.setOnFocusChangeListener((view1, hasFocus) -> {
             AtomicBoolean caseSmallFlag = new AtomicBoolean(true);
             
@@ -180,8 +235,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -192,8 +247,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -204,8 +259,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -216,8 +271,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -228,8 +283,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -240,8 +295,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -252,8 +307,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -264,8 +319,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -276,8 +331,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -288,8 +343,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -302,8 +357,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -314,8 +369,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -326,8 +381,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -338,8 +393,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -350,8 +405,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -362,8 +417,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -374,8 +429,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -386,8 +441,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -398,8 +453,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -410,8 +465,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -422,8 +477,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -434,8 +489,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -446,8 +501,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -458,8 +513,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -470,8 +525,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -482,8 +537,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -494,8 +549,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -506,8 +561,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -518,8 +573,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -530,8 +585,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -542,8 +597,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位!");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位!");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -554,8 +609,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -566,8 +621,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -578,8 +633,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -590,8 +645,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -602,8 +657,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -615,8 +670,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -627,8 +682,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -639,8 +694,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -651,8 +706,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -663,8 +718,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -675,8 +730,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -687,8 +742,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -699,8 +754,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -711,8 +766,8 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
-                    ToastUtils.make(getContext(), "面单号最多不能超过16位! ");
+                if (length >= 32) {
+                    ToastUtils.make(getContext(), "付款码最多不能超过32位! ");
                     return;
                 }
                 int start = binding.paymentNo.getSelectionStart();
@@ -723,7 +778,7 @@ public class PaymentFragment extends Fragment {
                     return;
                 }
                 int length = binding.paymentNo.getText().length();
-                if (length >= 16) {
+                if (length >= 32) {
                     ToastUtils.make(getContext(), "?");
                     return;
                 }

app/src/main/res/layout/fragment_send_key_board.xml

@@ -27,7 +27,7 @@
         android:layout_x="122dp"
         android:layout_y="40dp"
         android:gravity="center"
-        android:text="@string/courier_title"
+        android:text="@string/courier_login_title"
         android:textColor="@color/black"
         android:textSize="14dp" />
 

app/src/main/res/navigation/nav_graph.xml

@@ -182,6 +182,9 @@
         <action
             android:id="@+id/action_collectMaterialsFragment_to_mainFragment"
             app:destination="@id/MainFragment"/>
+        <action
+            android:id="@+id/action_collectMaterialsFragment_to_SendKeyBoardFragment"
+            app:destination="@id/SendKeyBoardFragment"/>
     </fragment>
     <!--  扫码支付页面  -->
     <fragment