From 6f1016161b736b32c49d523e00d64181a665979d Mon Sep 17 00:00:00 2001
From: rjb <263303411@qq.com>
Date: Mon, 26 Jan 2026 10:18:10 +0800
Subject: [PATCH] ss

---
 .../service/main/activity/NewCodeLoginActivity.java | 13 ++++++++++++-
 .../activity/common/http/impl/OkHttpClientImpl.java |  5 ++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/ruilaizi/service/main/activity/NewCodeLoginActivity.java b/app/src/main/java/com/ruilaizi/service/main/activity/NewCodeLoginActivity.java
index 383863c..3540800 100644
--- a/app/src/main/java/com/ruilaizi/service/main/activity/NewCodeLoginActivity.java
+++ b/app/src/main/java/com/ruilaizi/service/main/activity/NewCodeLoginActivity.java
@@ -128,7 +128,18 @@ public class NewCodeLoginActivity extends BaseActivity implements ISmsCodeDialog
         findViewById(R.id.btn_login).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                commit(validate_code.getText().toString());
+                // 验证手机号是否已输入
+                if (mPhone == null || mPhone.isEmpty()) {
+                    ToastUtils.showToast(NewCodeLoginActivity.this, "请先输入手机号并获取验证码！");
+                    return;
+                }
+                // 验证验证码是否已输入
+                String code = validate_code.getText().toString();
+                if (code == null || code.isEmpty()) {
+                    ToastUtils.showToast(NewCodeLoginActivity.this, "请输入验证码！");
+                    return;
+                }
+                commit(code);
             }
         });
 
diff --git a/app/src/main/java/com/ruilaizi/service/main/activity/common/http/impl/OkHttpClientImpl.java b/app/src/main/java/com/ruilaizi/service/main/activity/common/http/impl/OkHttpClientImpl.java
index fc68dd4..b8309ce 100644
--- a/app/src/main/java/com/ruilaizi/service/main/activity/common/http/impl/OkHttpClientImpl.java
+++ b/app/src/main/java/com/ruilaizi/service/main/activity/common/http/impl/OkHttpClientImpl.java
@@ -81,7 +81,10 @@ public class OkHttpClientImpl implements IHttpClient {
 //        }
         FormBody.Builder builder1 = new FormBody.Builder();
         for (String key : bodytwo.keySet()) {
-            builder1.add(key, (String) bodytwo.get(key));
+            Object value = bodytwo.get(key);
+            // 处理 null 值，OkHttp 的 FormBody.Builder.add() 不允许 null
+            String stringValue = (value == null) ? "" : String.valueOf(value);
+            builder1.add(key, stringValue);
         }
         RequestBody body = builder1.build();