From 4f7f99c6ea914bcd38de78bd8371be566026b905 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 26 二月 2025 15:54:14 +0800
Subject: [PATCH] -为按钮和列表项添加波纹效果，以获得更好的视觉反馈 -改进MapFragment中的底部布局动画 -在MapFragment中添加设备状态和RTU地址显示 -更新BaseListResult以支持泛型类型 -为设备数据添加IntakeListResult和IntakeResult -通过数据库支持增强标记位置更新功能 -添加电话拨号意图以分隔标记详细信息 -通过过期检查改进磁贴缓存 -添加问题报告的确认对话框 -更新登录活动以限制用户名长度 -为波纹效果和UI元素添加新颜色 -重构XML布局以使用新的波纹图 -改进MapFragment中的错误处理和用户反馈
---
app/src/main/java/com/dayu/pipirrapp/activity/ChangePSActivity.java | 74 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/dayu/pipirrapp/activity/ChangePSActivity.java b/app/src/main/java/com/dayu/pipirrapp/activity/ChangePSActivity.java
index 69711eb..f61d087 100644
--- a/app/src/main/java/com/dayu/pipirrapp/activity/ChangePSActivity.java
+++ b/app/src/main/java/com/dayu/pipirrapp/activity/ChangePSActivity.java
@@ -1,12 +1,23 @@
package com.dayu.pipirrapp.activity;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import androidx.annotation.Nullable;
+import com.dayu.pipirrapp.MyApplication;
+import com.dayu.pipirrapp.bean.net.IssueResult;
import com.dayu.pipirrapp.databinding.ActivityChangePassWordBinding;
+import com.dayu.pipirrapp.net.ApiManager;
+import com.dayu.pipirrapp.net.BaseResponse;
+import com.dayu.pipirrapp.net.Constants;
+import com.dayu.pipirrapp.net.subscribers.SubscriberListener;
+import com.dayu.pipirrapp.utils.ToastUtil;
import com.dayu.pipirrapp.view.TitleBar;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* author: zuo
@@ -22,6 +33,67 @@
super.onCreate(savedInstanceState);
binding = ActivityChangePassWordBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
- new TitleBar(this).setTitleText("淇敼瀵嗙爜");
+ new TitleBar(this).setTitleText("淇敼瀵嗙爜").setLeftIco().setLeftIcoListening(v -> ChangePSActivity.this.finish());
+ initView();
+ }
+
+ private void initView() {
+ binding.changePSBtn.setOnClickListener(v -> {
+ String oldPassword = binding.oldPassword.getText().toString();
+ String newPSOne = binding.newPsone.getText().toString();
+ String newPStwo = binding.newPsTwo.getText().toString();
+ if (!TextUtils.isEmpty(oldPassword) && !TextUtils.isEmpty(newPSOne) && !TextUtils.isEmpty(newPStwo)) {
+ if (newPStwo.equals(newPSOne)) {
+ if (isPasswordComplex(newPSOne)) {
+ changePS(oldPassword, newPSOne);
+ } else {
+ ToastUtil.showToastShort(ChangePSActivity.this, "鏂板瘑鐮侀暱搴﹀簲涓�6-12浣嶏紝骞朵笖鑷冲皯鍖呭惈1涓暟瀛楁垨瀛楁瘝锛�");
+ }
+ } else {
+ ToastUtil.showToastShort(ChangePSActivity.this, "涓ゆ瀵嗙爜涓嶄竴鑷达紒");
+ }
+ } else {
+ ToastUtil.showToastShort(ChangePSActivity.this, "璇疯緭鍏ュ畬鏁翠俊鎭紒");
+ }
+ });
+ }
+
+
+ private void changePS(String oldPassword, String newPassword) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("id", MyApplication.myApplication.userId);
+ params.put("oldPassword", oldPassword);
+ params.put("newPassword", newPassword);
+ ApiManager.getInstance().requestPost(this, Constants.BASE_URL + "/base/user/changePassword", IssueResult.class, params, new SubscriberListener<BaseResponse<IssueResult>>() {
+ @Override
+ public void onNext(BaseResponse<IssueResult> t) {
+ if (t.isSuccess()) {
+ ToastUtil.showToastLong(ChangePSActivity.this, "淇敼鎴愬姛!");
+ ChangePSActivity.this.finish();
+ } else {
+ ToastUtil.showToast(ChangePSActivity.this, t.getMsg());
+ }
+ }
+
+ @Override
+ public void onCloose() {
+ super.onCloose();
+ }
+
+ @Override
+ public void onError(Throwable e) {
+ super.onError(e);
+ ToastUtil.showToastLong(ChangePSActivity.this, "淇敼澶辫触锛岃绋嶅悗鍐嶈瘯");
+
+ }
+ });
+ }
+
+ // 妫�鏌ュ瘑鐮佸鏉傚害鐨勬柟娉�
+ boolean isPasswordComplex(String password) {
+ // 瀵嗙爜澶嶆潅搴﹁鍒欙細闀垮害鍦�6鍒�12浣嶄箣闂达紝鑷冲皯鍖呭惈涓�涓暟瀛楀拰涓�涓瓧姣�
+ return password.length() >= 6 && password.length() <= 12 &&
+ password.matches(".*\\d.*") && // 鑷冲皯鍖呭惈涓�涓暟瀛�
+ password.matches(".*[a-zA-Z].*"); // 鑷冲皯鍖呭惈涓�涓瓧姣�
}
}
--
Gitblit v1.8.0