From 50f9b82ac862652e88444d727a32e0da1d824e9e Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 13 一月 2025 15:57:06 +0800
Subject: [PATCH] 1.分水房相关 2.删除极光推送相关配置 3.优化图片显示相关
---
app/src/main/java/com/dayu/pipirrapp/activity/LoginActivity.java | 86 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 23 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 0d8c0f5..8e62470 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,13 +25,11 @@
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;
+import com.dayu.pipirrapp.utils.CommonKeyName;
import com.dayu.pipirrapp.utils.SharedPreferencesHelper;
import com.dayu.pipirrapp.utils.ToastUtil;
-import com.dayu.pipirrapp.view.TagDialog;
import com.tencent.bugly.crashreport.CrashReport;
import java.util.HashMap;
@@ -67,7 +64,6 @@
private void initData() {
-
}
@@ -108,7 +104,7 @@
clickNumber = 0;
}
});
- if (SharedPreferencesHelper.getInstance(LoginActivity.this).get(CommonData.isShowCode, false)) {
+ if (SharedPreferencesHelper.getInstance(LoginActivity.this).get(CommonKeyName.isShowCode, false)) {
isShowCode = true;
binding.codeLL.setVisibility(View.VISIBLE);
getCode();
@@ -140,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 + "/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瀛楃涓茶繘琛岃В鐮�
@@ -161,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) {
@@ -184,30 +213,32 @@
data.put("token", token);
data.put("code", code);
}
- ApiManager.getInstance().requestPostLoading(LoginActivity.this, BASE_URL + ":8079/sso/sso/loginJson", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
+ ApiManager.getInstance().requestPostLoading(LoginActivity.this, BASE_URL + "/sso/sso/loginJson", LoginResult.class, data, new SubscriberListener<BaseResponse<LoginResult>>() {
@Override
public void onNext(BaseResponse<LoginResult> t) {
try {
if (t.isSuccess()) {
- SharedPreferencesHelper.getInstance(LoginActivity.this).put(CommonData.Token, t.getContent().getToken());
+ SharedPreferencesHelper.getInstance(LoginActivity.this).put(CommonKeyName.Token, t.getContent().getToken());
MyApplication.myApplication.token = t.getContent().getToken();
+ MyApplication.myApplication.userId = t.getContent().getId();
LoginBean loginBean = DaoSingleton.getInstance(LoginActivity.this).loginDao().findFirst();
if (loginBean == null) {
loginBean = new LoginBean();
}
loginBean.setName(t.getContent().getName());
loginBean.setPhone(t.getContent().getPhone());
- DaoSingleton.getInstance(LoginActivity.this).loginDao().update(loginBean);
- SharedPreferencesHelper.getInstance(LoginActivity.this).put(CommonData.isShowCode, false);
- Intent intent = new Intent(LoginActivity.this, MainActivity.class);
- startActivity(intent);
- LoginActivity.this.finish();
+ loginBean.setUserID(t.getContent().getId());
+ DaoSingleton.getInstance(LoginActivity.this).loginDao().insert(loginBean);
+ SharedPreferencesHelper.getInstance(LoginActivity.this).put(CommonKeyName.isShowCode, false);
+ ToastUtil.showToastLong(LoginActivity.this, "鐧诲綍鎴愬姛!");
+ startMainActivity();
+
} else {
ToastUtil.showToast(LoginActivity.this, t.getMsg());
loginError++;
if (loginError >= 3) {
isShowCode = true;
- SharedPreferencesHelper.getInstance(LoginActivity.this).put(CommonData.isShowCode, true);
+ SharedPreferencesHelper.getInstance(LoginActivity.this).put(CommonKeyName.isShowCode, true);
binding.codeLL.setVisibility(View.VISIBLE);
}
}
@@ -221,6 +252,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