From be9bea2335d4e4617844a1603aa624098c84b2a2 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 15 十月 2024 13:55:00 +0800
Subject: [PATCH] 1、退出登录 2.显示当前版本号 3.删除缓存 4.地图相关
---
app/src/main/java/com/dayu/pipirrapp/activity/LoginActivity.java | 68 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/LoginActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/LoginActivity.java
index 5adb68e..eea278f 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/LoginActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/LoginActivity.java
@@ -8,7 +8,6 @@
import android.os.Bundle;
import android.os.PersistableBundle;
import android.text.InputType;
-import android.text.TextUtils;
import android.util.Base64;
import android.util.Log;
import android.view.LayoutInflater;
@@ -26,7 +25,6 @@
import com.dayu.pipirrapp.databinding.ActivityLoginBinding;
import com.dayu.pipirrapp.net.ApiManager;
import com.dayu.pipirrapp.net.BaseResponse;
-import com.dayu.pipirrapp.net.subscribers.CodeListener;
import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
import com.dayu.pipirrapp.observer.LoginObserver;
import com.dayu.pipirrapp.utils.CommonData;
@@ -138,13 +136,15 @@
private void getCode() {
Map<String, Object> data = new HashMap<>();
data.put("type", "math");//鍥剧墖绫诲瀷锛歝har-鏂囨湰锛宮ath-涓�浣嶆暟绠楀紡锛宮ath2-涓や綅鏁扮畻寮�
- ApiManager.getInstance().getCode(data, new CodeListener() {
+
+
+ ApiManager.getInstance().requestGetHideLoading(LoginActivity.this, BASE_URL + ":8088/app/captcha/get", CodeResult.class, data, new SubscriberListener<BaseResponse<CodeResult>>() {
@Override
- public void onNext(CodeResult body) {
+ public void onNext(BaseResponse<CodeResult> t) {
try {
- if (body != null && !TextUtils.isEmpty(body.getBase64())) {
- String encodedString = body.getBase64();
- codeToken = body.getToken();
+ if (t.isSuccess()) {
+ String encodedString = t.getContent().getBase64();
+ codeToken = t.getContent().getToken();
// 绉婚櫎Base64瀛楃涓茬殑澶撮儴淇℃伅
encodedString = encodedString.substring("data:image/png;base64,".length());
// 瀵笲ase64瀛楃涓茶繘琛岃В鐮�
@@ -159,17 +159,48 @@
binding.codeError.setVisibility(View.VISIBLE);
ToastUtil.showToast(LoginActivity.this, "楠岃瘉鐮佽幏鍙栧け璐�");
}
+
} catch (Exception e) {
e.printStackTrace();
CrashReport.postCatchedException(e);
}
- }
-
- @Override
- public void error(Throwable throwable) {
}
});
+
+
+// ApiManager.getInstance().getCode(data, new CodeListener() {
+// @Override
+// public void onNext(CodeResult body) {
+// try {
+// if (body != null && !TextUtils.isEmpty(body.getBase64())) {
+// String encodedString = body.getBase64();
+// codeToken = body.getToken();
+// // 绉婚櫎Base64瀛楃涓茬殑澶撮儴淇℃伅
+// encodedString = encodedString.substring("data:image/png;base64,".length());
+// // 瀵笲ase64瀛楃涓茶繘琛岃В鐮�
+// byte[] imageAsBytes = Base64.decode(encodedString, Base64.DEFAULT);
+// // 浣跨敤BitmapFactory灏嗗瓧鑺傛暟缁勮В鐮佹垚Bitmap瀵硅薄
+// Bitmap image = BitmapFactory.decodeByteArray(imageAsBytes, 0, imageAsBytes.length);
+// binding.codeImg.setImageBitmap(image);
+// binding.codeImg.setVisibility(View.VISIBLE);
+// binding.codeError.setVisibility(View.GONE);
+// } else {
+// binding.codeImg.setVisibility(View.INVISIBLE);
+// binding.codeError.setVisibility(View.VISIBLE);
+// ToastUtil.showToast(LoginActivity.this, "楠岃瘉鐮佽幏鍙栧け璐�");
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// CrashReport.postCatchedException(e);
+// }
+// }
+//
+// @Override
+// public void error(Throwable throwable) {
+//
+// }
+// });
}
private void login(String phone, String pw, String token, String code) {
@@ -195,11 +226,9 @@
}
loginBean.setName(t.getContent().getName());
loginBean.setPhone(t.getContent().getPhone());
- DaoSingleton.getInstance(LoginActivity.this).loginDao().update(loginBean);
+ DaoSingleton.getInstance(LoginActivity.this).loginDao().insert(loginBean);
SharedPreferencesHelper.getInstance(LoginActivity.this).put(CommonData.isShowCode, false);
- Intent intent = new Intent(LoginActivity.this, MainActivity.class);
- startActivity(intent);
- LoginActivity.this.finish();
+ startMainActivity();
} else {
ToastUtil.showToast(LoginActivity.this, t.getMsg());
loginError++;
@@ -219,6 +248,15 @@
});
}
+ /**
+ * 鍚姩MainActivity
+ */
+ private void startMainActivity() {
+ Intent intent = new Intent(LoginActivity.this, MainActivity.class);
+ startActivity(intent);
+ LoginActivity.this.finish();
+ }
+
@Override
protected void onStart() {
super.onStart();
--
Gitblit v1.8.0