From 3f682fce2b1b9b47103c4b12b9c5eb47a9460dcb Mon Sep 17 00:00:00 2001
From: jsbxyyx <jsbxyyx@163.com>
Date: Sat, 23 Nov 2024 15:32:02 +0800
Subject: [PATCH] reg

---
 .../jsbxyyx/xbook/RegistrationActivity.java      |  5 +++--
 .../github/jsbxyyx/xbook/data/BookNetHelper.java | 10 +++-------
 .../main/res/layout/activity_registration.xml    | 16 ++++++++--------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/com/github/jsbxyyx/xbook/RegistrationActivity.java b/app/src/main/java/com/github/jsbxyyx/xbook/RegistrationActivity.java
index e805b5f..28efa03 100644
--- a/app/src/main/java/com/github/jsbxyyx/xbook/RegistrationActivity.java
+++ b/app/src/main/java/com/github/jsbxyyx/xbook/RegistrationActivity.java
@@ -43,7 +43,8 @@ protected void onCreate(Bundle savedInstanceState) {
         btn_send_code.setOnClickListener((v) -> {
             String user = et_login_user.getText().toString();
             String password = et_login_password.getText().toString();
-            bookNetHelper.sendCode(user, password, new DataCallback<JsonNode>() {
+            String nickname = et_nickname.getText().toString();
+            bookNetHelper.sendCode(user, password, nickname, new DataCallback<JsonNode>() {
                 @Override
                 public void call(JsonNode dataObject, Throwable err) {
                     runOnUiThread(() -> {
@@ -69,7 +70,7 @@ public void call(JsonNode dataObject, Throwable err) {
             String nickname = et_nickname.getText().toString();
             LoadingDialog loading = new LoadingDialog(this);
             loading.show();
-            bookNetHelper.registrationWithNickname(user, password, code, nickname, new DataCallback<String>() {
+            bookNetHelper.registration(user, password, code, nickname, new DataCallback<String>() {
                 @Override
                 public void call(String str, Throwable err) {
                     runOnUiThread(() -> {
diff --git a/app/src/main/java/com/github/jsbxyyx/xbook/data/BookNetHelper.java b/app/src/main/java/com/github/jsbxyyx/xbook/data/BookNetHelper.java
index e344d29..9c7067d 100644
--- a/app/src/main/java/com/github/jsbxyyx/xbook/data/BookNetHelper.java
+++ b/app/src/main/java/com/github/jsbxyyx/xbook/data/BookNetHelper.java
@@ -514,7 +514,7 @@ public void onResponse(@NonNull Call call, @NonNull Response response) throws IO
         });
     }
 
-    public void sendCode(String email, String password, DataCallback dataCallback) {
+    public void sendCode(String email, String password, String nickname, DataCallback dataCallback) {
         Map<String, Object> object = new HashMap<>();
         String reqUrl = zurl + "/papi/user/verification/send-code";
         object.put("method", "POST");
@@ -528,7 +528,7 @@ public void sendCode(String email, String password, DataCallback dataCallback) {
         Map<String, Object> data = new HashMap<>();
         data.put("email", email);
         data.put("password", password);
-        data.put("name", email.split("\\@")[0]);
+        data.put("name", Common.isBlank(nickname) ? Common.urlEncode(email.split("\\@")[0]) : Common.urlEncode(nickname));
         data.put("rx", "215");
         data.put("action", "registration");
         data.put("redirectUrl", "");
@@ -640,7 +640,7 @@ public void onResponse(@NonNull Call call, @NonNull Response response) throws IO
         });
     }
 
-    public void registrationWithNickname(String email, String password, String verifyCode, String nickname, DataCallback dataCallback) {
+    public void registration(String email, String password, String verifyCode, String nickname, DataCallback dataCallback) {
         Map<String, Object> object = new HashMap<>();
         String reqUrl = zurl + "/rpc.php";
         object.put("method", "POST");
@@ -714,10 +714,6 @@ public void onResponse(@NonNull Call call, @NonNull Response response) throws IO
         });
     }
 
-    public void registration(String email, String password, String verifyCode, DataCallback dataCallback) {
-        registrationWithNickname(email, password, verifyCode, email.split("\\@")[0], dataCallback);
-    }
-
     public void cloudSync(Book book, DataCallback dataCallback) {
         cloudSyncMeta(book, dataCallback);
         cloudSyncRaw(book, dataCallback);
diff --git a/app/src/main/res/layout/activity_registration.xml b/app/src/main/res/layout/activity_registration.xml
index 60e7315..27547a0 100644
--- a/app/src/main/res/layout/activity_registration.xml
+++ b/app/src/main/res/layout/activity_registration.xml
@@ -16,6 +16,14 @@
         android:singleLine="true"
         android:hint="请输入邮箱" />
 
+    <EditText
+        android:id="@+id/et_nickname"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:singleLine="true"
+        android:hint="请输入昵称" />
+
     <EditText
         android:id="@+id/et_login_password"
         android:layout_width="match_parent"
@@ -48,14 +56,6 @@
 
     </LinearLayout>
 
-    <EditText
-        android:id="@+id/et_nickname"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:maxLines="1"
-        android:singleLine="true"
-        android:hint="请输入昵称" />
-
     <Button
         android:id="@+id/btn_registration"
         android:layout_width="match_parent"