zhanghaochen / ParentControl

Download as
Browse Code »

Commit 5cc69290e43f97c58abf159b04023441c9357804

Authored by zhanghaochen
1 parent f1ce56b9bb
Exists in master

登录到指定学生

Showing 3 changed files with 41 additions and 33 deletions   Show diff stats
... ... @@ -25,8 +25,8 @@ android {
25 25 applicationId "com.hjx.parent"
26 26 minSdk 24
27 27 targetSdk 32
28   - versionCode 1004
29   - versionName "1.0.0.4"
  28 + versionCode 1005
  29 + versionName "1.0.0.5"
30 30  
31 31 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
32 32 }
... ...
app/src/main/java/com/hjx/parent/QRActivity.java
Diff comments   View file @5cc6929
... ... @@ -5,6 +5,7 @@ import android.widget.Toast;
5 5  
6 6 import com.google.gson.Gson;
7 7 import com.hjx.parent.bean.RegisterBean;
  8 +import com.hjx.parent.bean.StudentBean;
8 9 import com.prws.common.base.BaseActivity;
9 10 import com.prws.common.base.BasePresenter;
10 11 import com.prws.common.net.NetWorks;
... ... @@ -66,43 +67,50 @@ public class QRActivity extends BaseActivity {
66 67 }
67 68  
68 69 public void loginAnd(String str) {
69   - NetWorks.scanAndLogin(str, new Observer<ResponseBody>() {
70   - @Override
71   - public void onSubscribe(Disposable d) {
  70 + String student = (String) SharedPreferencesUtil.getData("student", "");
  71 + try {
  72 + StudentBean studentBean = new Gson().fromJson(student, StudentBean.class);
72 73  
73   - }
  74 + NetWorks.scanAndLogin(str, studentBean.getStuId(), new Observer<ResponseBody>() {
  75 + @Override
  76 + public void onSubscribe(Disposable d) {
74 77  
75   - @Override
76   - public void onNext(ResponseBody responseBody) {
77   - try {
78   -
79   - String str = responseBody.string().toString();
80   - LogUtil.e(TAG, "----" + str);
81   - JSONObject jo = new JSONObject(str);
82   - boolean isSucceed = jo.getBoolean("success");
83   - if (isSucceed) {
  78 + }
  79 +
  80 + @Override
  81 + public void onNext(ResponseBody responseBody) {
  82 + try {
  83 +
  84 + String str = responseBody.string().toString();
  85 + LogUtil.e(TAG, "----" + str);
  86 + JSONObject jo = new JSONObject(str);
  87 + boolean isSucceed = jo.getBoolean("success");
  88 + if (isSucceed) {
  89 + startActivity(MainActivity.class);
  90 + finish();
  91 + } else {
  92 + Toast.makeText(QRActivity.this, jo.getString("msg"), Toast.LENGTH_SHORT).show();
  93 + }
  94 + } catch (Exception e) {
  95 + e.printStackTrace();
  96 + Toast.makeText(QRActivity.this, "服务繁忙，请重试", Toast.LENGTH_SHORT).show();
84 97 startActivity(MainActivity.class);
85   - finish();
86   - } else {
87   - Toast.makeText(QRActivity.this, jo.getString("msg"), Toast.LENGTH_SHORT).show();
88 98 }
89   - } catch (Exception e) {
90   - e.printStackTrace();
91   - Toast.makeText(QRActivity.this, "服务繁忙，请重试", Toast.LENGTH_SHORT).show();
92   - startActivity(MainActivity.class);
93 99 }
94   - }
95 100  
96   - @Override
97   - public void onError(Throwable e) {
  101 + @Override
  102 + public void onError(Throwable e) {
98 103  
99   - }
  104 + }
100 105  
101   - @Override
102   - public void onComplete() {
  106 + @Override
  107 + public void onComplete() {
103 108  
104   - }
105   - });
  109 + }
  110 + });
  111 + } catch (Exception e) {
  112 +
  113 + }
106 114 }
107 115  
108 116 @Override
... ...
libs/common/src/main/java/com/prws/common/net/NetWorks.java
Diff comments   View file @5cc6929
... ... @@ -103,7 +103,7 @@ public class NetWorks extends RetrofitUtils {
103 103 Observable<ResponseBody> generalQrCode();
104 104  
105 105 @GET("/api/v1/parent/scanAndLogin?")
106   - Observable<ResponseBody> scanAndLogin(@Header("Authorization") String token, @Query("code") String code);
  106 + Observable<ResponseBody> scanAndLogin(@Header("Authorization") String token, @Query("code") String code, @Query("stuId") String stuId);
107 107  
108 108 @GET("/api/v1/parent/getChildrenList")
109 109 Observable<ResponseBody> getChildrenList(@Header("Authorization") String token);
... ... @@ -290,8 +290,8 @@ public class NetWorks extends RetrofitUtils {
290 290 }
291 291  
292 292  
293   - public static void scanAndLogin(String code, Observer<ResponseBody> observer) {
294   - setSubscribe(service_url.scanAndLogin(getHeader(), code), observer);
  293 + public static void scanAndLogin(String code, String stuId, Observer<ResponseBody> observer) {
  294 + setSubscribe(service_url.scanAndLogin(getHeader(), code, stuId), observer);
295 295 }
296 296  
297 297 public static void getChildrenList(Observer<ResponseBody> observer) {
... ...