From b420d1b5e6b8574397e806cf1d54fb0201072318 Mon Sep 17 00:00:00 2001
From: fengjignqi <15192412330@163.com>
Date: Sat, 16 May 2026 18:00:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2+=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  5 +
 .../ckkj/water/mine/MineCenterFragment.java   | 21 ++++
 .../ckkj/water/mine/PsdManageActivity.java    |  2 +-
 .../com/ckkj/water/mine/ResetPsdActivity.java | 98 +++++++++++++++++++
 .../main/res/layout/mine_fragment_layout.xml  |  1 +
 app/src/main/res/layout/reset_psd_layout.xml  |  2 +-
 app/src/main/res/values-en/strings.xml        |  1 +
 app/src/main/res/values/strings.xml           |  1 +
 8 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 41531d4..f6e055d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -217,6 +217,11 @@
             android:name="com.ckkj.water.mine.PsdManageActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"/>
+
+        <activity
+            android:name="com.ckkj.water.mine.ResetPsdActivity"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java b/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
index 433b8c0..9dd8a62 100644
--- a/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
+++ b/app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java
@@ -16,7 +16,10 @@ import com.ckkj.water.mine.mvp.MineContract;
 import com.ckkj.water.mine.mvp.MineImpl;
 import com.ckkj.water.mine.mvp.MinePresenter;
 import com.ckkj.water.network.BaseBean;
+import com.ckkj.water.utils.show.ToastUtil;
 import com.gyf.immersionbar.ImmersionBar;
+import com.lxj.xpopup.XPopup;
+import com.lxj.xpopup.interfaces.OnSelectListener;
 
 import java.util.List;
 
@@ -41,6 +44,7 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
 
     private void initListener() {
         setClick(viewBinding.imgAvatar);
+        setClick(viewBinding.linearLanguage);
         setClick(viewBinding.linearPsdManage);
     }
 
@@ -54,6 +58,23 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
                 goTo(mContext, MineInfomationActivity.class,null);
                 break;
 
+            case R.id.linear_language:
+                new XPopup.Builder(mContext).asBottomList(
+                        "选择语言",
+                        new String[]{"中文", "English"},
+                        new int[]{R.mipmap.ic_launcher, R.mipmap.ic_launcher},
+                        0,
+                        new OnSelectListener() {
+                            @Override
+                            public void onSelect(int position, String text) {
+                                ToastUtil.showShort(mContext,text);
+                            }
+                        },
+                        R.layout.select_language_layout,
+                        R.layout.select_language_item
+                ).show();
+                break;
+
             case R.id.linear_psd_manage:
                 goTo(mContext, PsdManageActivity.class,null);
                 break;
diff --git a/app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java b/app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java
index 9aee903..f29cff1 100644
--- a/app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java
+++ b/app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java
@@ -51,7 +51,7 @@ public class PsdManageActivity extends BaseActivity<PasswordManLayoutBinding, Mi
                 break;
 
             case R.id.rl_reset_psd:
-
+                goTo(mContext, ResetPsdActivity.class,null);
                 break;
 
             case R.id.rl_find_psd:
diff --git a/app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java b/app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java
new file mode 100644
index 0000000..257b32b
--- /dev/null
+++ b/app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java
@@ -0,0 +1,98 @@
+package com.ckkj.water.mine;
+
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+
+import com.ckkj.water.R;
+import com.ckkj.water.base.BaseActivity;
+import com.ckkj.water.databinding.ResetPsdLayoutBinding;
+import com.ckkj.water.mine.mvp.MineContract;
+import com.ckkj.water.mine.mvp.MineImpl;
+import com.ckkj.water.mine.mvp.MinePresenter;
+import com.ckkj.water.network.BaseBean;
+import com.ckkj.water.utils.show.ToastUtil;
+import com.gyf.immersionbar.ImmersionBar;
+
+/**
+ * @author fengxiaoyang
+ * @date 2026/5/16
+ * @description TODO: 重置密码
+ */
+public class ResetPsdActivity extends BaseActivity<ResetPsdLayoutBinding, MinePresenter>
+        implements MineContract.MineView {
+
+    @Override
+    public void initData(Bundle savedInstanceState) {
+        super.initData(savedInstanceState);
+
+        ImmersionBar.with(this)
+                .statusBarColor(R.color.color_F9F9F9) // 设置状态栏颜色
+                .statusBarDarkFont(true) // 设置状态栏字体为黑色
+                .titleBar(viewBinding.rlTitle)
+                .init();
+        viewBinding.includedTitle.tvTitle.setText(R.string.mine_psd_reset);
+        initListener();
+    }
+
+    private void initListener() {
+        setClick(viewBinding.includedTitle.imgBack);
+        setClick(viewBinding.tvCommit);
+    }
+
+    private void setClick(View view) {
+        view.setOnClickListener(this::onClick);
+    }
+
+    public void onClick(View v){
+        switch (v.getId()){
+            case R.id.img_back:
+                finish();
+                break;
+
+            case R.id.tv_commit:
+                if(TextUtils.isEmpty(viewBinding.etCurrentPsd.getText().toString().trim())){
+                    ToastUtil.showShort(mContext,getString(R.string.hint_input_old_psd));
+                    return;
+                }
+
+                if(TextUtils.isEmpty(viewBinding.etNewPsd.getText().toString().trim())){
+                    ToastUtil.showShort(mContext,getString(R.string.hint_input_new_psd));
+                    return;
+                }
+
+                if(TextUtils.isEmpty(viewBinding.etInputConfirmPsd.getText().toString().trim())){
+                    ToastUtil.showShort(mContext,getString(R.string.hint_input_new_psd_agin));
+                    return;
+                }
+
+                if(!(viewBinding.etNewPsd.getText().toString().trim()).
+                        equals(viewBinding.etInputConfirmPsd.getText().toString().trim())){
+                    ToastUtil.showShort(mContext,getString(R.string.hint_input_psd_not_match));
+                    return;
+                }
+                ToastUtil.showShort(mContext,"接口触发");
+                break;
+        }
+    }
+
+    @Override
+    public MinePresenter createPresenter() {
+        return new MinePresenter(new MineImpl());
+    }
+
+    @Override
+    public int getLayoutResId(Bundle savedInstanceState) {
+        return 0;
+    }
+
+    @Override
+    public void showError(String message) {
+
+    }
+
+    @Override
+    public void logOut(BaseBean bean) {
+
+    }
+}
diff --git a/app/src/main/res/layout/mine_fragment_layout.xml b/app/src/main/res/layout/mine_fragment_layout.xml
index 037c516..98cbb71 100644
--- a/app/src/main/res/layout/mine_fragment_layout.xml
+++ b/app/src/main/res/layout/mine_fragment_layout.xml
@@ -99,6 +99,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/linear_language"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
diff --git a/app/src/main/res/layout/reset_psd_layout.xml b/app/src/main/res/layout/reset_psd_layout.xml
index e2d6842..13a1ecc 100644
--- a/app/src/main/res/layout/reset_psd_layout.xml
+++ b/app/src/main/res/layout/reset_psd_layout.xml
@@ -77,7 +77,7 @@
             android:layout_height="@dimen/dp_24"
             android:src="@mipmap/icon_psd"/>
         <EditText
-            android:id="@+id/et_input_psd"
+            android:id="@+id/et_input_confirm_psd"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_5"
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index b0ed49a..1db4150 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -16,6 +16,7 @@
     <string name="hint_input_new_psd">请输入新密码</string>
     <string name="hint_input_new_psd_agin">请再次输入新密码</string>
     <string name="login_error_phone_empty">手机号不能为空</string>
+    <string name="hint_input_psd_not_match">两次输入的密码不一致</string>
     <string name="login_error_phone_invalid">请输入正确的手机号或邮箱</string>
     <string name="register_title">注册用户</string>
     <string name="register_title_bar">注册</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 81fff7e..049221d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@
     <string name="hint_input_psd_agin">请再次输入密码</string>
     <string name="hint_input_new_psd">请输入新密码</string>
     <string name="hint_input_new_psd_agin">请再次输入新密码</string>
+    <string name="hint_input_psd_not_match">两次输入的密码不一致</string>
     <string name="login_error_phone_empty">手机号不能为空</string>
     <string name="login_error_phone_invalid">请输入正确的手机号或邮箱</string>
     <string name="register_title">注册用户</string>