From 5cc69290e43f97c58abf159b04023441c9357804 Mon Sep 17 00:00:00 2001
From: zhanghaochen <zhanghaochen@hjx.com>
Date: Tue, 2 Jul 2024 10:08:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=88=B0=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                   |  4 +-
 app/src/main/java/com/hjx/parent/QRActivity.java   | 64 ++++++++++++----------
 .../main/java/com/prws/common/net/NetWorks.java    |  6 +-
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a40fc54..e31c152 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@ android {
         applicationId "com.hjx.parent"
         minSdk 24
         targetSdk 32
-        versionCode 1004
-        versionName "1.0.0.4"
+        versionCode 1005
+        versionName "1.0.0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/hjx/parent/QRActivity.java b/app/src/main/java/com/hjx/parent/QRActivity.java
index 44d9ae7..8ec2bfd 100644
--- a/app/src/main/java/com/hjx/parent/QRActivity.java
+++ b/app/src/main/java/com/hjx/parent/QRActivity.java
@@ -5,6 +5,7 @@ import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.hjx.parent.bean.RegisterBean;
+import com.hjx.parent.bean.StudentBean;
 import com.prws.common.base.BaseActivity;
 import com.prws.common.base.BasePresenter;
 import com.prws.common.net.NetWorks;
@@ -66,43 +67,50 @@ public class QRActivity extends BaseActivity {
     }
 
     public void loginAnd(String str) {
-        NetWorks.scanAndLogin(str, new Observer<ResponseBody>() {
-            @Override
-            public void onSubscribe(Disposable d) {
+        String student = (String) SharedPreferencesUtil.getData("student", "");
+        try {
+            StudentBean studentBean = new Gson().fromJson(student, StudentBean.class);
 
-            }
+            NetWorks.scanAndLogin(str, studentBean.getStuId(), new Observer<ResponseBody>() {
+                @Override
+                public void onSubscribe(Disposable d) {
 
-            @Override
-            public void onNext(ResponseBody responseBody) {
-                try {
-
-                    String str = responseBody.string().toString();
-                    LogUtil.e(TAG, "----" + str);
-                    JSONObject jo = new JSONObject(str);
-                    boolean isSucceed = jo.getBoolean("success");
-                    if (isSucceed) {
+                }
+
+                @Override
+                public void onNext(ResponseBody responseBody) {
+                    try {
+
+                        String str = responseBody.string().toString();
+                        LogUtil.e(TAG, "----" + str);
+                        JSONObject jo = new JSONObject(str);
+                        boolean isSucceed = jo.getBoolean("success");
+                        if (isSucceed) {
+                            startActivity(MainActivity.class);
+                            finish();
+                        } else {
+                            Toast.makeText(QRActivity.this, jo.getString("msg"), Toast.LENGTH_SHORT).show();
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        Toast.makeText(QRActivity.this, "服务繁忙，请重试", Toast.LENGTH_SHORT).show();
                         startActivity(MainActivity.class);
-                        finish();
-                    } else {
-                        Toast.makeText(QRActivity.this, jo.getString("msg"), Toast.LENGTH_SHORT).show();
                     }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    Toast.makeText(QRActivity.this, "服务繁忙，请重试", Toast.LENGTH_SHORT).show();
-                    startActivity(MainActivity.class);
                 }
-            }
 
-            @Override
-            public void onError(Throwable e) {
+                @Override
+                public void onError(Throwable e) {
 
-            }
+                }
 
-            @Override
-            public void onComplete() {
+                @Override
+                public void onComplete() {
 
-            }
-        });
+                }
+            });
+        } catch (Exception e) {
+
+        }
     }
 
     @Override
diff --git a/libs/common/src/main/java/com/prws/common/net/NetWorks.java b/libs/common/src/main/java/com/prws/common/net/NetWorks.java
index b5c574a..38c3174 100644
--- a/libs/common/src/main/java/com/prws/common/net/NetWorks.java
+++ b/libs/common/src/main/java/com/prws/common/net/NetWorks.java
@@ -103,7 +103,7 @@ public class NetWorks extends RetrofitUtils {
         Observable<ResponseBody> generalQrCode();
 
         @GET("/api/v1/parent/scanAndLogin?")
-        Observable<ResponseBody> scanAndLogin(@Header("Authorization") String token, @Query("code") String code);
+        Observable<ResponseBody> scanAndLogin(@Header("Authorization") String token, @Query("code") String code, @Query("stuId") String stuId);
 
         @GET("/api/v1/parent/getChildrenList")
         Observable<ResponseBody> getChildrenList(@Header("Authorization") String token);
@@ -290,8 +290,8 @@ public class NetWorks extends RetrofitUtils {
     }
 
 
-    public static void scanAndLogin(String code, Observer<ResponseBody> observer) {
-        setSubscribe(service_url.scanAndLogin(getHeader(), code), observer);
+    public static void scanAndLogin(String code, String stuId, Observer<ResponseBody> observer) {
+        setSubscribe(service_url.scanAndLogin(getHeader(), code, stuId), observer);
     }
 
     public static void getChildrenList(Observer<ResponseBody> observer) {
-- 
1.9.0