注册/登录接口联调

个人信息接口联调

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2026-05-15T02:49:19.581976200Z">
+        <DropdownSelection timestamp="2026-05-19T02:00:28.842946500Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\Admin\.android\avd\Pixel_7a_2.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=D122222104A9" />
             </handle>
           </Target>
         </DropdownSelection>

app/src/main/java/com/ckkj/water/MyApplication.java

@@ -16,7 +16,7 @@ import com.ckkj.water.fate.util.LunarDateLoader;
 import com.ckkj.water.login.entity.LoginEntity;
 import com.ckkj.water.network.NetWorkManager;
 import com.ckkj.water.utils.dataUtil.SharePreUtil;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
 
 import java.util.List;
 
@@ -76,16 +76,12 @@ public class MyApplication extends Application {
         NetWorkManager.getInstance().init(this);
         AppConfig.USER_LOGIN = SharePreUtil.getBoolean(ConstantUtil.SHARE_PRE_NAME,context,ConstantUtil.USER_LOGIN);
         AppConfig.USER_TOKEN = SharePreUtil.getString(ConstantUtil.SHARE_PRE_NAME,context,ConstantUtil.USER_TOKEN);
-        AppConfig.USER_SET_BIRTH_INFO = SharePreUtil.getBoolean(ConstantUtil.SHARE_PRE_NAME,context,ConstantUtil.USER_HAS_SET_BIRTH);
         //单位JSON
-        AppConfig.PRODUCT_UNIT_JSON = SharePreUtil.getString(ConstantUtil.SHARE_PRE_NAME,context,ConstantUtil.GOODS_UNIT_JSON);
-        AppConfig.PRODUCT_BRAND_JSON = SharePreUtil.getString(ConstantUtil.SHARE_PRE_NAME,context,ConstantUtil.GOODS_BRAND_JSON);
-        AppConfig.USER_ID = SharePreUtil.getString(ConstantUtil.SHARE_PRE_NAME,context, ConstantUtil.USER_ID);
         String userInfoJson = SharePreUtil.getString(ConstantUtil.SHARE_PRE_NAME,context, ConstantUtil.USER_INFO_JSON_CONTENT);
         if(!TextUtils.isEmpty(userInfoJson)){
             LoginEntity entity = new Gson().fromJson(userInfoJson, LoginEntity.class);
-            MingDengUserInfoManager.getInstance().setEntity(entity);
+            WaterUserInfoManager.getInstance().setEntity(entity);
-            MingDengUserInfoManager.getInstance().setUserInfo(entity.getUser_info());
+//            WaterUserInfoManager.getInstance().setUserInfo(entity.getUser_info());
         }
         registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() {
             @Override

app/src/main/java/com/ckkj/water/base/entity/MineUserInfoBean.java

@@ -1,6 +1,10 @@
 package com.ckkj.water.base.entity;
 
 import java.io.Serializable;
+import java.util.List;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author fengxiaoyang
@@ -8,44 +12,55 @@ import java.io.Serializable;
  * @description TODO: 描述该类的作用
  */
 
+@NoArgsConstructor
+@Data
 public class MineUserInfoBean implements Serializable {
-    private UserInfoEntity userInfo;
-    private boolean hasEightCharacters;
-    private String constellation;
-    private String birthTime;
 
+    /**
+     * userId : 2056543507514097665
+     * tenantId : 000000
+     * deptId : null
+     * userName : null
+     * nickName : 用户1779153155517
+     * userType : app_user
+     * email :
+     * phonenumber : 133****6054
+     * sex : 0
+     * avatar : null
+     * password : $2a$10$KsCb1Z1znyQgL7W.GoljuuVPctzZ7tS7obu8W2WkK5ydsejQOjRi2
+     * status : 0
+     * loginIp : 192.168.1.7
+     * loginDate : 2026-05-19 11:06:22
+     * remark : null
+     * createTime : 2026-05-19 09:12:36
+     * deptName : null
+     * roles : []
+     * roleIds : null
+     * postIds : null
+     * roleId : null
+     * oldPassword : null
+     */
 
-
+    private String userId;
-    public String getConstellation() {
+    private String tenantId;
-
+    private Object deptId;
-        return constellation;
+    private Object userName;
-    }
+    private String nickName;
-
+    private String userType;
-    public void setConstellation(String constellation) {
+    private String email;
-        this.constellation = constellation;
+    private String phonenumber;
-    }
+    private String sex;
-
+    private Object avatar;
-    public String getBirthTime() {
+    private String password;
-        return birthTime;
+    private String status;
-    }
+    private String loginIp;
-
+    private String loginDate;
-    public void setBirthTime(String birthTime) {
+    private Object remark;
-        this.birthTime = birthTime;
+    private String createTime;
-    }
+    private Object deptName;
-
+    private Object roleIds;
-    public UserInfoEntity getUserInfo() {
+    private Object postIds;
-        return userInfo;
+    private Object roleId;
-    }
+    private Object oldPassword;
-
+    private List<?> roles;
-    public void setUserInfo(UserInfoEntity userInfo) {
-        this.userInfo = userInfo;
-    }
-
-    public boolean isHasEightCharacters() {
-        return hasEightCharacters;
-    }
-
-    public void setHasEightCharacters(boolean hasEightCharacters) {
-        this.hasEightCharacters = hasEightCharacters;
-    }
 }

app/src/main/java/com/ckkj/water/fate/view/FateFragment.java

@@ -35,7 +35,6 @@ import com.ckkj.water.base.BaseFragment;
 import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.custom.view.CustomRefreshHeader;
 import com.ckkj.water.databinding.FateLayoutBinding;
-import com.ckkj.water.dialog.ContentReportDialog;
 import com.ckkj.water.fate.entity.CityDataEntity;
 import com.ckkj.water.fate.entity.FateHistoryEntity;
 import com.ckkj.water.fate.entity.TodayFateEntity;
@@ -47,7 +46,7 @@ import com.ckkj.water.utils.WeatherIconUtil;
 import com.ckkj.water.utils.click.ClickUtil;
 import com.ckkj.water.utils.color.FateDataUtil;
 import com.ckkj.water.utils.dataUtil.SharePreUtil;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
 import com.ckkj.water.utils.number.NumberDecimalFilter;
 import com.ckkj.water.utils.show.ToastUtil;
 import com.ckkj.water.utils.time.ZYTimeUtils;
@@ -492,19 +491,6 @@ public class FateFragment extends BaseFragment<FateLayoutBinding, FatePresenter>
 
     @Override
     public void getUserInfoSuccess(MineUserInfoBean bean) {
-        if(bean != null){
-            MingDengUserInfoManager.getInstance().setUserInfo(bean.getUserInfo());
-            SharePreUtil.putBoolean(ConstantUtil.SHARE_PRE_NAME,mContext,ConstantUtil.USER_HAS_SET_BIRTH,bean.isHasEightCharacters());
-            AppConfig.USER_SET_BIRTH_INFO = bean.isHasEightCharacters();
-            //是否设置过生辰
-            if(AppConfig.USER_SET_BIRTH_INFO){
-                viewBinding.llInput.setVisibility(View.GONE);
-                viewBinding.refresh.setVisibility(View.VISIBLE);
-            }else{
-                viewBinding.llInput.setVisibility(View.VISIBLE);
-                viewBinding.refresh.setVisibility(View.GONE);
-            }
-        }
     }
 
     /**

app/src/main/java/com/ckkj/water/login/LoginActivity.java

@@ -2,8 +2,10 @@ package com.ckkj.water.login;
 
 
 import static android.view.View.GONE;
+import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 
+import android.graphics.Color;
 import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.CountDownTimer;
@@ -20,8 +22,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 
-import com.ckkj.water.custom.view.PhotoViewActivity;
-import com.ckkj.water.utils.DownFileUtil;
 import com.google.gson.Gson;
 import com.gyf.immersionbar.ImmersionBar;
 import com.ckkj.water.AppConfig;
@@ -34,11 +34,10 @@ import com.ckkj.water.login.mvp.LoginContract;
 import com.ckkj.water.login.mvp.LoginImpl;
 import com.ckkj.water.login.mvp.LoginPresenter;
 import com.ckkj.water.main.activity.MainActivity;
-import com.ckkj.water.mine.WebviewUserAgreement;
 import com.ckkj.water.network.BaseBean;
 import com.ckkj.water.utils.click.ClickUtil;
 import com.ckkj.water.utils.dataUtil.SharePreUtil;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
 import com.ckkj.water.utils.number.PhoneNumberUtils;
 import com.ckkj.water.utils.show.ToastUtil;
 import com.lxj.xpopup.XPopup;
@@ -140,6 +139,7 @@ public class LoginActivity extends BaseActivity<LoginLayoutBinding, LoginPresent
 
         tvAgreement.setText(spannableString);
         tvAgreement.setMovementMethod(LinkMovementMethod.getInstance()); // 开启点击事件
+        tvAgreement.setHighlightColor(Color.TRANSPARENT);
     }
 
     public void onClick(View v) {
@@ -167,7 +167,7 @@ public class LoginActivity extends BaseActivity<LoginLayoutBinding, LoginPresent
 
                 viewBinding.tvLoginByPsd.setTextColor(mContext.getResources().getColor(R.color.color_999999));
                 viewBinding.tvLoginByPsd.setTypeface(Typeface.DEFAULT);
-                viewBinding.viewLinePsd.setVisibility(GONE);
+                viewBinding.viewLinePsd.setVisibility(INVISIBLE);
 
                 viewBinding.linearVerfiCode.setVisibility(VISIBLE);
                 viewBinding.linearPsd.setVisibility(GONE);
@@ -182,7 +182,7 @@ public class LoginActivity extends BaseActivity<LoginLayoutBinding, LoginPresent
 
                 viewBinding.tvLoginByCode.setTextColor(mContext.getResources().getColor(R.color.color_999999));
                 viewBinding.tvLoginByCode.setTypeface(Typeface.DEFAULT);
-                viewBinding.viewLineCode.setVisibility(GONE);
+                viewBinding.viewLineCode.setVisibility(INVISIBLE);
 
                 viewBinding.linearVerfiCode.setVisibility(GONE);
                 viewBinding.linearPsd.setVisibility(VISIBLE);
@@ -199,11 +199,10 @@ public class LoginActivity extends BaseActivity<LoginLayoutBinding, LoginPresent
                     ToastUtil.showShort(mContext, getString(R.string.login_error_phone_invalid));
                     return;
                 }
-                cdTimer.start();
+//                cdTimer.start();
-//                showLoadingDialog();
+                showLoadingDialog();
-//                mPresenter.getPhoneCode(
+                //发送短信
-//                        viewBinding.edPhoneInput.getText().toString().trim(),
+                mPresenter.getPhoneCode(viewBinding.etAccount.getText().toString(),"");
-//                        AppConfig.SMS_CODE_TYPE_LOGIN);
                 break;
 
             case R.id.tv_language:
@@ -241,6 +240,9 @@ public class LoginActivity extends BaseActivity<LoginLayoutBinding, LoginPresent
                     ToastUtil.showShort(mContext, getString(R.string.login_error_phone_invalid));
                     return;
                 }
+                String loginType = "sms";
+                if(LOGIN_TYPE_STATUS_CODE == 100){//验证码登录
+                    loginType = "sms";
                     if (TextUtils.isEmpty(viewBinding.edCodeInput.getText().toString())) {
                         ToastUtil.showShort(mContext, getString(R.string.login_error_code_empty));
                         return;
@@ -249,20 +251,24 @@ public class LoginActivity extends BaseActivity<LoginLayoutBinding, LoginPresent
                         ToastUtil.showShort(mContext, getString(R.string.login_error_code_invalid));
                         return;
                     }
+                }else{//密码登录
+                    loginType = "password";
+                    if (TextUtils.isEmpty(viewBinding.etInputPsd.getText().toString())) {
+                        ToastUtil.showShort(mContext, getString(R.string.login_error_psd_empty));
+                        return;
+                    }
+                }
+
                 if (!mYinsiConfirm) {
                     ToastUtil.showShort(mContext, getString(R.string.login_error_agreement));
                     return;
                 }
-                String loginType = "sms";
+
-                if(LOGIN_TYPE_STATUS_CODE == 100){
-                    loginType = "sms";
-                }else{
-                    loginType = "password";
-                }
                 showLoadingDialog();
                 mPresenter.loginBySmsCode(loginType,
                         viewBinding.etAccount.getText().toString().trim(),
-                        viewBinding.edCodeInput.getText().toString().trim());
+                        viewBinding.edCodeInput.getText().toString().trim(),
+                        viewBinding.etInputPsd.getText().toString());
 //                new Handler().postDelayed(() -> hideDialogLoading(), 1000);
                 break;
 
@@ -298,26 +304,22 @@ public class LoginActivity extends BaseActivity<LoginLayoutBinding, LoginPresent
     @Override
     public void getPhoneCodeSuccess(BaseBean bean) {
         hideDialogLoading();
-        ToastUtil.showShort(mContext, getString(R.string.login_code_sent));
+        ToastUtil.showLong(mContext, getString(R.string.login_code_sent) + ":" + bean.getDataString());
-        cdTimer.start();
+//        cdTimer.start();
     }
 
     @Override
     public void loginBySmsCodeSuccess(LoginEntity entity) {
         hideDialogLoading();
         ToastUtil.showShort(mContext, getString(R.string.login_success));
-//        SharePreUtil.putBoolean(ConstantUtil.SHARE_PRE_NAME, mContext, ConstantUtil.USER_LOGIN, true);
+        SharePreUtil.putBoolean(ConstantUtil.SHARE_PRE_NAME, mContext, ConstantUtil.USER_LOGIN, true);
-//        SharePreUtil.putString(ConstantUtil.SHARE_PRE_NAME, mContext, ConstantUtil.USER_TOKEN, entity.getAccess_token());
+        SharePreUtil.putString(ConstantUtil.SHARE_PRE_NAME, mContext, ConstantUtil.USER_TOKEN, entity.getAccess_token());
-//        SharePreUtil.putString(ConstantUtil.SHARE_PRE_NAME, mContext, ConstantUtil.USER_NICKNAME, entity.getUser_info().getNickname());
+        WaterUserInfoManager.getInstance().setEntity(entity);
-//        SharePreUtil.putString(ConstantUtil.SHARE_PRE_NAME, mContext, ConstantUtil.USER_ID, String.valueOf(entity.getUser_info().getUserId()));
-//        MingDengUserInfoManager.getInstance().setEntity(entity);
-//        MingDengUserInfoManager.getInstance().setUserInfo(entity.getUser_info());
 //        Gson gson = new Gson();
 //        String userInfoJson = gson.toJson(entity);
 //        SharePreUtil.putString(ConstantUtil.SHARE_PRE_NAME, mContext, ConstantUtil.USER_INFO_JSON_CONTENT, userInfoJson);
-//        AppConfig.USER_LOGIN = true;
+        AppConfig.USER_LOGIN = true;
-//        AppConfig.USER_TOKEN = entity.getAccess_token();
+        AppConfig.USER_TOKEN = entity.getAccess_token();
-//        AppConfig.USER_ID = String.valueOf(entity.getUser_info().getUserId());
         new Handler().postDelayed(() -> {
             goTo(mContext, MainActivity.class, null);
             finish();

app/src/main/java/com/ckkj/water/login/entity/LoginEntity.java

@@ -1,41 +1,35 @@
 package com.ckkj.water.login.entity;
 
-import com.ckkj.water.base.entity.UserInfoEntity;
-
 import java.io.Serializable;
 
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 /**
  * @author fengxiaoyang
  * @date 2025/7/28
  * @description TODO: 描述该类的作用
  */
 
+@NoArgsConstructor
+@Data
 public class LoginEntity implements Serializable {
+
+    /**
+     * scope : null
+     * openid : null
+     * access_token : eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhcHBfdXNlcjoyMDU2NTQzNTA3NTE0MDk3NjY1Iiwicm5TdHIiOiJFOVE4a1VzT2dJbjRCZWtGY0pTRXZGdkljNjhFOG1FQSIsImNsaWVudGlkIjoiNDI4YTgzMTBjZDQ0Mjc1N2FlNjk5ZGY1ZDg5NGYwNTEiLCJ0ZW5hbnRJZCI6IjAwMDAwMCIsInVzZXJJZCI6MjA1NjU0MzUwNzUxNDA5NzY2NX0.nh38mcgK2JOtuBR4ogQlcnQbMTiLJ_TXln_BGFhlUkU
+     * refresh_token : null
+     * expire_in : 60480000
+     * refresh_expire_in : null
+     * client_id : 428a8310cd442757ae699df5d894f051
+     */
+
+    private Object scope;
+    private Object openid;
     private String access_token;
-    private UserInfoEntity user_info;
+    private Object refresh_token;
-    private long expires_in;
+    private int expire_in;
-
+    private Object refresh_expire_in;
-    public String getAccess_token() {
+    private String client_id;
-        return access_token;
-    }
-
-    public void setAccess_token(String access_token) {
-        this.access_token = access_token;
-    }
-
-    public UserInfoEntity getUser_info() {
-        return user_info;
-    }
-
-    public void setUser_info(UserInfoEntity user_info) {
-        this.user_info = user_info;
-    }
-
-    public long getExpires_in() {
-        return expires_in;
-    }
-
-    public void setExpires_in(long expires_in) {
-        this.expires_in = expires_in;
-    }
 }

app/src/main/java/com/ckkj/water/login/mvp/LoginPresenter.java

@@ -1,16 +1,9 @@
 package com.ckkj.water.login.mvp;
 
 import com.ckkj.water.AppConfig;
-import com.ckkj.water.ConstantUtil;
-import com.ckkj.water.EventMessage;
-import com.ckkj.water.MyApplication;
 import com.ckkj.water.base.BasePresenter;
-import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.login.entity.LoginEntity;
-import com.ckkj.water.mine.mvp.MineImpl;
 import com.ckkj.water.network.BaseBean;
-import com.ckkj.water.utils.dataUtil.SharePreUtil;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -18,8 +11,6 @@ import org.json.JSONObject;
 import java.util.HashMap;
 import java.util.Map;
 
-import de.greenrobot.event.EventBus;
-
 /**
  * @author fengxiaoyang
  * @date 2025/7/26
@@ -95,17 +86,16 @@ public class LoginPresenter extends BasePresenter<LoginContract.LoginView> {
      * @param account
      * @param code
      */
-    public void loginBySmsCode(String loginType,String account, String code) {
+    public void loginBySmsCode(String loginType,String account, String code,String psd) {
         try {
-
             JSONObject json = new JSONObject();
             json.put("grantType",loginType);
             if(loginType.equals("sms")){
                 json.put("phonenumber",account);
-                json.put("sms",code);
+                json.put("smsCode",code);
             }else{
                 json.put("username",account);
-                json.put("password",code);
+                json.put("password",psd);
             }
             json.put("clientId",AppConfig.APP_CLIENT_ID);
             json.put("userType",AppConfig.APP_USER_TYPE);

app/src/main/java/com/ckkj/water/main/activity/MainActivity.java

@@ -28,18 +28,15 @@ import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.chat.ChatFragment;
 import com.ckkj.water.databinding.MainActivityLayoutBinding;
 import com.ckkj.water.dialog.DialogAppUpdate;
-import com.ckkj.water.fate.view.FateFragment;
 import com.ckkj.water.main.MainContract;
 import com.ckkj.water.main.MainImpl;
 import com.ckkj.water.main.MainPresenter;
 import com.ckkj.water.main.entity.CheckVersionEntity;
-import com.ckkj.water.mine.MineFragment;
 import com.ckkj.water.network.BaseBean;
-import com.ckkj.water.plate.PlateFragment;
 import com.ckkj.water.utils.AppInfoUtil;
 import com.ckkj.water.utils.dataUtil.SharePreUtil;
 import com.ckkj.water.utils.manager.ActivityManager;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
 import com.ckkj.water.utils.show.ToastUtil;
 
 import org.jetbrains.annotations.NotNull;
@@ -289,9 +286,7 @@ public class MainActivity extends BaseActivity<MainActivityLayoutBinding, MainPr
     @Override
     public void getUserInfoSuccess(MineUserInfoBean bean) {
         if(bean != null){
-            MingDengUserInfoManager.getInstance().setUserInfo(bean.getUserInfo());
+            WaterUserInfoManager.getInstance().setUserInfo(bean);
-            SharePreUtil.putBoolean(ConstantUtil.SHARE_PRE_NAME,mContext,ConstantUtil.USER_HAS_SET_BIRTH,bean.isHasEightCharacters());
-            AppConfig.USER_SET_BIRTH_INFO = bean.isHasEightCharacters();
         }
     }
 

app/src/main/java/com/ckkj/water/mine/AppThemActivity.java

@@ -5,6 +5,7 @@ import android.view.View;
 
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseActivity;
+import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.databinding.AppThemeChangeLayoutBinding;
 import com.ckkj.water.mine.mvp.MineContract;
 import com.ckkj.water.mine.mvp.MineImpl;
@@ -96,4 +97,9 @@ public class AppThemActivity extends BaseActivity<AppThemeChangeLayoutBinding, M
     public void logOut(BaseBean bean) {
 
     }
+
+    @Override
+    public void getUserInfoSuccess(MineUserInfoBean bean) {
+
+    }
 }

app/src/main/java/com/ckkj/water/mine/ChangePhoneActivity.java

@@ -2,30 +2,22 @@ package com.ckkj.water.mine;
 
 import android.os.Bundle;
 import android.os.CountDownTimer;
-import android.os.Handler;
 import android.text.TextUtils;
 import android.view.View;
 
+import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.gyf.immersionbar.ImmersionBar;
-import com.ckkj.water.AppConfig;
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseActivity;
-import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.databinding.ChangePhoneActivityBinding;
-import com.ckkj.water.login.LoginActivity;
-import com.ckkj.water.main.entity.CheckVersionEntity;
-import com.ckkj.water.mine.entity.MemberComboEntity;
 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.manager.ActivityManager;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
 import com.ckkj.water.utils.number.PhoneNumberUtils;
 import com.ckkj.water.utils.show.ToastUtil;
 
-import java.util.List;
-
 
 /**
  * @Description TODO
@@ -54,7 +46,6 @@ public class ChangePhoneActivity extends BaseActivity<ChangePhoneActivityBinding
                 .titleBar(viewBinding.rlTitle)
                 .init();
         viewBinding.includeTitle.tvTitle.setText("更换手机号");
-        viewBinding.tvUserPhone.setText(MingDengUserInfoManager.getInstance().getUserInfo().getMobile());
         initListener();
     }
 
@@ -140,4 +131,9 @@ public class ChangePhoneActivity extends BaseActivity<ChangePhoneActivityBinding
     public void logOut(BaseBean bean) {
 
     }
+
+    @Override
+    public void getUserInfoSuccess(MineUserInfoBean bean) {
+
+    }
 }

app/src/main/java/com/ckkj/water/mine/MineCenterFragment.java

@@ -5,6 +5,7 @@ import static android.view.View.INVISIBLE;
 import android.os.Bundle;
 import android.view.View;
 
+import com.ckkj.water.AppConfig;
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseFragment;
 import com.ckkj.water.base.entity.MineUserInfoBean;
@@ -43,6 +44,14 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
         initListener();
     }
 
+    @Override
+    protected void onResumeInitData() {
+        super.onResumeInitData();
+        if(AppConfig.USER_LOGIN){
+            mPresenter.getUserinfo();
+        }
+    }
+
     private void initListener() {
         setClick(viewBinding.imgAvatar);
         setClick(viewBinding.linearLanguage);
@@ -91,6 +100,15 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
         }
     }
 
+    /**
+     * 获取个人信息
+     * @param bean
+     */
+    @Override
+    public void getUserInfoSuccess(MineUserInfoBean bean) {
+
+    }
+
     @Override
     public MinePresenter createPresenter() {
         return new MinePresenter(new MineImpl());
@@ -111,4 +129,5 @@ public class MineCenterFragment extends BaseFragment<MineFragmentLayoutBinding,
     public void logOut(BaseBean bean) {
 
     }
+
 }

app/src/main/java/com/ckkj/water/mine/MineFragment.java

@@ -14,19 +14,16 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.sdk.android.oss.ClientException;
 import com.alibaba.sdk.android.oss.ServiceException;
-import com.bumptech.glide.Glide;
+import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.esafirm.imagepicker.features.ImagePicker;
 import com.esafirm.imagepicker.model.Image;
 import com.ckkj.water.AppConfig;
 import com.ckkj.water.EventMessage;
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseFragment;
-import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.base.inter.UploadCallback;
 import com.ckkj.water.databinding.MineFragmentBinding;
 import com.ckkj.water.login.LoginActivity;
-import com.ckkj.water.main.entity.CheckVersionEntity;
-import com.ckkj.water.mine.entity.MemberComboEntity;
 import com.ckkj.water.mine.mvp.MineContract;
 import com.ckkj.water.mine.mvp.MineImpl;
 import com.ckkj.water.mine.mvp.MinePresenter;
@@ -35,10 +32,9 @@ import com.ckkj.water.utils.LubanCompressUtil;
 import com.ckkj.water.utils.PreviewFileUtil;
 import com.ckkj.water.utils.click.ClickUtil;
 import com.ckkj.water.utils.dataUtil.FileUtil;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
 import com.ckkj.water.utils.oss.OssUploadHelper;
 import com.ckkj.water.utils.show.ToastUtil;
-import com.ckkj.water.utils.time.ZYTimeUtils;
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.interfaces.OnSelectListener;
 import com.yalantis.ucrop.UCrop;
@@ -112,8 +108,8 @@ public class MineFragment extends BaseFragment<MineFragmentBinding, MinePresente
                                 }
                                 break;
                             case 1:
-                                String suffix = FileUtil.getFileSuffixWithQuestion(MingDengUserInfoManager.getInstance().getUserInfo().getAvatar());
+//                                String suffix = FileUtil.getFileSuffixWithQuestion(WaterUserInfoManager.getInstance().getUserInfo().getAvatar());
-                                PreviewFileUtil.previewFiles(mContext, suffix, MingDengUserInfoManager.getInstance().getUserInfo().getAvatar());
+//                                PreviewFileUtil.previewFiles(mContext, suffix, WaterUserInfoManager.getInstance().getUserInfo().getAvatar());
                                 break;
                         }
                     }
@@ -266,4 +262,8 @@ public class MineFragment extends BaseFragment<MineFragmentBinding, MinePresente
     }
 
 
+    @Override
+    public void getUserInfoSuccess(MineUserInfoBean bean) {
+
+    }
 }

app/src/main/java/com/ckkj/water/mine/MineInfomationActivity.java

@@ -3,21 +3,16 @@ package com.ckkj.water.mine;
 import android.Manifest;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.alibaba.sdk.android.oss.ClientException;
-import com.alibaba.sdk.android.oss.ServiceException;
 import com.bumptech.glide.Glide;
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseActivity;
 import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.databinding.MineInformationLayoutBinding;
-import com.ckkj.water.main.entity.CheckVersionEntity;
-import com.ckkj.water.mine.entity.MemberComboEntity;
 import com.ckkj.water.mine.mvp.MineContract;
 import com.ckkj.water.mine.mvp.MineImpl;
 import com.ckkj.water.mine.mvp.MinePresenter;
@@ -25,7 +20,7 @@ import com.ckkj.water.network.BaseBean;
 import com.ckkj.water.utils.LubanCompressUtil;
 import com.ckkj.water.utils.PreviewFileUtil;
 import com.ckkj.water.utils.dataUtil.FileUtil;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
 import com.ckkj.water.utils.show.ToastUtil;
 import com.esafirm.imagepicker.features.ImagePicker;
 import com.esafirm.imagepicker.model.Image;
@@ -34,7 +29,6 @@ import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.interfaces.OnSelectListener;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.List;
 
 import pub.devrel.easypermissions.EasyPermissions;
@@ -98,8 +92,8 @@ public class MineInfomationActivity extends BaseActivity<MineInformationLayoutBi
                                 }
                                 break;
                             case 1:
-                                String suffix = FileUtil.getFileSuffixWithQuestion(MingDengUserInfoManager.getInstance().getUserInfo().getAvatar());
+//                                String suffix = FileUtil.getFileSuffixWithQuestion(WaterUserInfoManager.getInstance().getUserInfo().getAvatar());
-                                PreviewFileUtil.previewFiles(mContext, suffix, MingDengUserInfoManager.getInstance().getUserInfo().getAvatar());
+//                                PreviewFileUtil.previewFiles(mContext, suffix, WaterUserInfoManager.getInstance().getUserInfo().getAvatar());
                                 break;
                         }
                     }
@@ -211,4 +205,9 @@ public class MineInfomationActivity extends BaseActivity<MineInformationLayoutBi
             }
         }
     }
+
+    @Override
+    public void getUserInfoSuccess(MineUserInfoBean bean) {
+
+    }
 }

app/src/main/java/com/ckkj/water/mine/PsdManageActivity.java

@@ -5,6 +5,7 @@ import android.view.View;
 
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseActivity;
+import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.databinding.PasswordManLayoutBinding;
 import com.ckkj.water.login.ForgetPasswordActivity;
 import com.ckkj.water.mine.mvp.MineContract;
@@ -79,4 +80,9 @@ public class PsdManageActivity extends BaseActivity<PasswordManLayoutBinding, Mi
     public void logOut(BaseBean bean) {
 
     }
+
+    @Override
+    public void getUserInfoSuccess(MineUserInfoBean bean) {
+
+    }
 }

app/src/main/java/com/ckkj/water/mine/ResetPsdActivity.java

@@ -6,6 +6,7 @@ import android.view.View;
 
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseActivity;
+import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.databinding.ResetPsdLayoutBinding;
 import com.ckkj.water.mine.mvp.MineContract;
 import com.ckkj.water.mine.mvp.MineImpl;
@@ -95,4 +96,9 @@ public class ResetPsdActivity extends BaseActivity<ResetPsdLayoutBinding, MinePr
     public void logOut(BaseBean bean) {
 
     }
+
+    @Override
+    public void getUserInfoSuccess(MineUserInfoBean bean) {
+
+    }
 }

app/src/main/java/com/ckkj/water/mine/SettingsActivity.java

@@ -6,29 +6,25 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.view.View;
 
+import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.gyf.immersionbar.ImmersionBar;
 import com.ckkj.water.AppConfig;
 import com.ckkj.water.EventMessage;
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseActivity;
 import com.ckkj.water.base.BaseFragment;
-import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.databinding.ActivitySettingsLayoutBinding;
 import com.ckkj.water.dialog.DialogAppUpdate;
 import com.ckkj.water.login.LoginActivity;
-import com.ckkj.water.main.entity.CheckVersionEntity;
-import com.ckkj.water.mine.entity.MemberComboEntity;
 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.AppInfoUtil;
 import com.ckkj.water.utils.manager.ActivityManager;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
 import com.ckkj.water.utils.show.ToastUtil;
 
 import java.io.File;
-import java.util.List;
 
 import de.greenrobot.event.EventBus;
 
@@ -54,7 +50,7 @@ public class SettingsActivity extends BaseActivity<ActivitySettingsLayoutBinding
         viewBinding.includeTitle.tvTitle.setText("设置");
         viewBinding.includeTitle.imgBack.setOnClickListener(c -> finish());
         if(AppConfig.USER_LOGIN){
-            viewBinding.tvUserPhone.setText(MingDengUserInfoManager.getInstance().getUserInfo().getMobile());
+//            viewBinding.tvUserPhone.setText(WaterUserInfoManager.getInstance().getUserInfo().getMobile());
             viewBinding.tvLogOut.setVisibility(View.VISIBLE);
         }
         //获取本应用所占用的缓存
@@ -119,7 +115,7 @@ public class SettingsActivity extends BaseActivity<ActivitySettingsLayoutBinding
 
                             @Override
                             public void onConfirmClick() {
-                                MingDengUserInfoManager.getInstance().clearUser(mContext);
+                                WaterUserInfoManager.getInstance().clearUser(mContext);
                                 ActivityManager.removeAllActivity();
                                 goTo(mContext, LoginActivity.class,null);
                                 EventBus.getDefault().post(new EventMessage(EventMessage.USER_LOGIN_LOST));
@@ -205,4 +201,9 @@ public class SettingsActivity extends BaseActivity<ActivitySettingsLayoutBinding
         }
         return dir.delete();
     }
+
+    @Override
+    public void getUserInfoSuccess(MineUserInfoBean bean) {
+
+    }
 }

app/src/main/java/com/ckkj/water/mine/UserLogOffAccountActivity.java

@@ -2,30 +2,23 @@ package com.ckkj.water.mine;
 
 import android.os.Bundle;
 import android.os.CountDownTimer;
-import android.os.Handler;
 import android.text.TextUtils;
 import android.view.View;
 
+import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.gyf.immersionbar.ImmersionBar;
 import com.ckkj.water.AppConfig;
 import com.ckkj.water.R;
 import com.ckkj.water.base.BaseActivity;
-import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.databinding.UserLogOffActivityBinding;
-import com.ckkj.water.login.LoginActivity;
-import com.ckkj.water.main.entity.CheckVersionEntity;
-import com.ckkj.water.mine.entity.MemberComboEntity;
 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.manager.ActivityManager;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
 import com.ckkj.water.utils.number.PhoneNumberUtils;
 import com.ckkj.water.utils.show.ToastUtil;
 
-import java.util.List;
-
 
 /**
  * @Description 用户注销账号
@@ -56,10 +49,10 @@ public class UserLogOffAccountActivity extends BaseActivity<UserLogOffActivityBi
                 .init();
         viewBinding.includeTitle.tvTitle.setText("注销账号");
         if(AppConfig.USER_LOGIN){
-            String phoneNum = MingDengUserInfoManager.getInstance().getUserInfo().getMobile();
+//            String phoneNum = WaterUserInfoManager.getInstance().getUserInfo().getMobile();
-            if(!TextUtils.isEmpty(phoneNum)){
+//            if(!TextUtils.isEmpty(phoneNum)){
-                viewBinding.tvUserPhone.setText(PhoneNumberUtils.hidePhoneNumber(phoneNum));
+//                viewBinding.tvUserPhone.setText(PhoneNumberUtils.hidePhoneNumber(phoneNum));
-            }
+//            }
         }
     }
 
@@ -118,4 +111,9 @@ public class UserLogOffAccountActivity extends BaseActivity<UserLogOffActivityBi
     public void logOut(BaseBean bean) {
 
     }
+
+    @Override
+    public void getUserInfoSuccess(MineUserInfoBean bean) {
+
+    }
 }

app/src/main/java/com/ckkj/water/mine/mvp/MineContract.java

@@ -27,11 +27,15 @@ public class MineContract {
         void fail(String msg);
     }
     public interface DataModel{
+        //获取个人信息
+        void getUserInfo(Map<String,Object> map, CallBack callBack);
+
     }
 
 
 
     public interface MineView extends IView {
+        void getUserInfoSuccess(MineUserInfoBean bean);
     }
 
     public interface RecommendModel{

app/src/main/java/com/ckkj/water/mine/mvp/MineImpl.java

@@ -25,4 +25,38 @@ import io.reactivex.schedulers.Schedulers;
 
 public class MineImpl implements MineContract.DataModel {
 
+    /**
+     * 获取个人信息
+     * @param map
+     * @param callBack
+     */
+    @Override
+    public void getUserInfo(Map<String, Object> map, MineContract.CallBack callBack) {
+        NetWorkManager.getRequest().getMineUserInfo(NetWorkManager.getToken(), map)
+                .subscribeOn(Schedulers.io())
+                .unsubscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new Observer<BaseBean<MineUserInfoBean>>() {
+                    @Override
+                    public void onSubscribe(@NonNull Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(@NonNull BaseBean<MineUserInfoBean> bean) {
+                        if (bean.getCode() == 200) {
+                            callBack.success(bean.getData());
+                        }
+                    }
+
+                    @Override
+                    public void onError(@NonNull Throwable e) {
+                        callBack.fail(e.getMessage());
+                    }
+
+                    @Override
+                    public void onComplete() {
+                    }
+                });
+    }
 }

app/src/main/java/com/ckkj/water/mine/mvp/MinePresenter.java

@@ -5,20 +5,9 @@ import android.text.TextUtils;
 import com.ckkj.water.base.BasePresenter;
 import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.base.entity.UserInfoEntity;
-import com.ckkj.water.login.mvp.LoginContract;
+import com.ckkj.water.utils.manager.WaterUserInfoManager;
-import com.ckkj.water.login.mvp.LoginImpl;
-import com.ckkj.water.main.MainContract;
-import com.ckkj.water.main.MainImpl;
-import com.ckkj.water.main.entity.CheckVersionEntity;
-import com.ckkj.water.mine.entity.MemberComboEntity;
-import com.ckkj.water.network.BaseBean;
-import com.ckkj.water.utils.manager.MingDengUserInfoManager;
-
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -38,4 +27,24 @@ public class MinePresenter extends BasePresenter<MineContract.MineView> {
     /**
      * 获取个人信息
      */
+    public void getUserinfo() {
+        Map<String,Object> map = new HashMap<>();
+        impl.getUserInfo(map, new MineContract.CallBack<MineUserInfoBean>() {
+            @Override
+            public void success(MineUserInfoBean bean) {
+                if(MinePresenter.this.getView() != null){
+                    WaterUserInfoManager.getInstance().setUserInfo(bean);
+                    MinePresenter.this.getView().getUserInfoSuccess(bean);
+                }
+            }
+
+            @Override
+            public void fail(String msg) {
+                if(MinePresenter.this.getView() != null){
+                    MinePresenter.this.getView().showError(msg);
+                }
+            }
+        });
+    }
+
 }

app/src/main/java/com/ckkj/water/network/NetWorkManager.java

@@ -337,6 +337,7 @@ public class NetWorkManager {
         Map<String, String> map = new HashMap<>();
         try {
             map.put("Authorization", "Bearer  " + AppConfig.USER_TOKEN);
+            map.put("clientId", AppConfig.APP_CLIENT_ID);
 //            map.put("Authorization", "Bearer  " + "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxOTI1NzYwMTgxMTMyNzI2MDIyLCJ1c2VyX2tleSI6IjY0YjVmMjRjLTIyM2ItNDRkZC1iMDJlLTI0ZTRiNzNmODgxZCIsInVzZXJuYW1lIjoiMTg2NDU5MDQzMDIifQ.PiIjBZlQ9UtOuotfhd5mZZO2e8SbMpbXU7VDvVeiWZIecsFDUd51Rae09EFxQ_MJmBUEvIdyysnyqYiBC2AEfw");
         } catch (Exception e) {
             e.printStackTrace();

app/src/main/java/com/ckkj/water/network/Request.java

@@ -87,6 +87,8 @@ public interface Request {
     @POST("auth/login")
     Observable<BaseBean<LoginEntity>> loginBySmsCode(@HeaderMap Map<String, String> headMap, @Body RequestBody requestBody);
     //获取个人信息
+    @GET("app/v1/getUserInfo")
+    Observable<BaseBean<MineUserInfoBean>> getMineUserInfo(@HeaderMap Map<String, String> headMap, @QueryMap Map<String, Object> map);
     //更新用户头像
     //获取今日运势
     @POST("mobile/yourhoroscope/today")

app/src/main/java/com/ckkj/water/utils/manager/WaterUserInfoManager.java

@@ -4,6 +4,7 @@ import android.content.Context;
 
 import com.ckkj.water.AppConfig;
 import com.ckkj.water.ConstantUtil;
+import com.ckkj.water.base.entity.MineUserInfoBean;
 import com.ckkj.water.base.entity.UserInfoEntity;
 import com.ckkj.water.login.entity.LoginEntity;
 import com.ckkj.water.utils.dataUtil.SharePreUtil;
@@ -15,20 +16,20 @@ import com.ckkj.water.utils.dataUtil.SharePreUtil;
  * @Date 04-07-2025 周一 12:51
  */
 
-public class MingDengUserInfoManager {
+public class WaterUserInfoManager {
-    private static MingDengUserInfoManager instance;
+    private static WaterUserInfoManager instance;
     private LoginEntity entity;
-    private UserInfoEntity userInfo;
+    private MineUserInfoBean userInfo;
 
-    private MingDengUserInfoManager() {
+    private WaterUserInfoManager() {
         // 私有构造方法，防止外部直接创建实例
     }
 
-    public static MingDengUserInfoManager getInstance() {
+    public static WaterUserInfoManager getInstance() {
         if (instance == null) {
-            synchronized (MingDengUserInfoManager.class) {
+            synchronized (WaterUserInfoManager.class) {
                 if (instance == null) {
-                    instance = new MingDengUserInfoManager();
+                    instance = new WaterUserInfoManager();
                 }
             }
         }
@@ -43,11 +44,11 @@ public class MingDengUserInfoManager {
         this.entity = entity;
     }
 
-    public UserInfoEntity getUserInfo() {
+    public MineUserInfoBean getUserInfo() {
         return userInfo;
     }
 
-    public void setUserInfo(UserInfoEntity userInfo) {
+    public void setUserInfo(MineUserInfoBean userInfo) {
         this.userInfo = userInfo;
     }
 

app/src/main/res/layout/login_layout.xml

@@ -25,7 +25,6 @@
                 android:id="@+id/tab_code"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
                 android:orientation="vertical">
 
                 <TextView
@@ -50,7 +49,6 @@
                 android:id="@+id/tab_psd"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center"
                 android:orientation="vertical"
                 android:layout_marginLeft="40dp">
 
@@ -151,6 +149,7 @@
                 android:layout_height="24dp"
                 android:src="@mipmap/icon_psd"/>
             <EditText
+                android:id="@+id/et_input_psd"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"