对新接口进行了适配

张钢

2024-09-02 63608b5dca9eebb6fa2cb1a8652b395f1d910c3e

对新接口进行了适配

 app/src/main/java/com/application/zhangshi_app_android/bean/GrowthExperienceInformationBean.java

@@ -34,12 +34,13 @@
    private String familyName;// 所属家庭名字
    private String roleName;//所属角色
    private String img; //图片地址
    private String fatherId;//父亲id
    private String spouseId;
    private String fatherId;//父亲id
    private String momId;//母亲id
    private String birth;//出生日期
    private String clanId;//家族号
    private String birth;//出生
    private String createTime;//创建时间// 日期
    private String email;//邮箱
    private String createTime;//创建时间
    private String url;//个人背景视频、图片
    private String secondFamilyId;//其他家庭授权的家庭id

@@ -239,6 +240,10 @@
        this.momId = momId;
    }

    public String getClanId() { return clanId; }

    public void setClanId(String clanId) { this.clanId = clanId; }

    public String getBirth() {
        return birth;
    }

 app/src/main/java/com/application/zhangshi_app_android/bean/LoginRequestBean.java

@@ -8,13 +8,14 @@
public class LoginRequestBean {
    private String code;
    private String password;
    private String username;
    //private String username;
    private String nickname;
    private String uuid;

    public LoginRequestBean(String username,String password,String code,  String uuid) {
    public LoginRequestBean(String nickname,String password,String code,  String uuid) {
        this.code = code;
        this.password = password;
        this.username = username;
        this.nickname = nickname;
        this.uuid = uuid;
    }

@@ -33,9 +34,10 @@
    /**
     * 注册提交的用户名
     */
    public String getUsername() { return username; }
    public void setUsername(String value) { this.username = value; }
    public String getNickname() { return nickname; }
    public void setNickname(String value) { this.nickname = value; }

    //张若双
    /**
     * 验证码的UUID，请求后端获取验证码接口后返回
     */

 app/src/main/java/com/application/zhangshi_app_android/data/DataRepository.java

@@ -633,8 +633,8 @@
     *  获取家根网
     */
    @Override
    public Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth) {
        return mHttpDataSource.getHomeRoot(depth);
    public Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth, String clanid) {
        return mHttpDataSource.getHomeRoot(depth, clanid);
    }

    /**

 app/src/main/java/com/application/zhangshi_app_android/data/source/HttpDataSource.java

@@ -366,7 +366,7 @@
    /**
     * 获取家根网
     */
    Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth);
    Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth, String clanId);

    /**
     * 获取年度健康状况

 app/src/main/java/com/application/zhangshi_app_android/data/source/http/ApiService.java

@@ -515,7 +515,7 @@
     * @return
     */
    @GET("/self/user/root")
    Observable<ResultData<List<HomeRootBean>>> getHomeRoot(@Query("depth") String depth);
    Observable<ResultData<List<HomeRootBean>>> getHomeRoot(@Query("depth") String depth, @Query("clanId") String clanId);

    /**
     * 获取年度健康状况

 app/src/main/java/com/application/zhangshi_app_android/data/source/http/HttpDataSourceImpl.java

@@ -677,8 +677,8 @@
     *  获取家根网
     */
    @Override
    public Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth) {
        return apiService.getHomeRoot(depth);
    public Observable<ResultData<List<HomeRootBean>>> getHomeRoot(String depth, String clanId) {
        return apiService.getHomeRoot(depth, clanId);
    }

    /**

 app/src/main/java/com/application/zhangshi_app_android/ui/home/HomeFragmentViewModel.java

@@ -10,6 +10,7 @@
import com.android.app_base.base.StateViewEnum;
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.http.ResultData;
import com.android.app_base.manager.UserManager;
import com.android.app_base.utils.RxUtils;
import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
import com.application.zhangshi_app_android.bean.HomeRootBean;
@@ -42,7 +43,8 @@


    public void getHomeRootBeanList() {
        model.getHomeRoot("1000")
        String clanId = UserManager.getInstance().getClanId();
        model.getHomeRoot("1000", clanId)
                .compose(RxUtils.schedulersTransformer())
                .doFinally(new Action() {
                    @Override

 app/src/main/java/com/application/zhangshi_app_android/ui/home/HomeMindMapActivityViewModel.java

@@ -10,6 +10,7 @@
import com.android.app_base.base.StateViewEnum;
import com.android.app_base.base.viewmodel.BaseViewModel;
import com.android.app_base.http.ResultData;
import com.android.app_base.manager.UserManager;
import com.android.app_base.utils.RxUtils;
import com.application.zhangshi_app_android.bean.HomeRootBean;
import com.application.zhangshi_app_android.data.DataRepository;
@@ -38,7 +39,8 @@
    }

    public void getHomeRootBeanList() {
        model.getHomeRoot("4")
        String clanId = UserManager.getInstance().getClanId();
        model.getHomeRoot("4", clanId)
                .compose(RxUtils.schedulersTransformer())
                .doFinally(new Action() {
                    @Override

 app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivityViewModel.java

@@ -4,6 +4,7 @@

import android.app.Application;
import android.text.TextUtils;
import android.util.Log;

import androidx.annotation.NonNull;
import androidx.lifecycle.MutableLiveData;

 app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java

@@ -5,6 +5,7 @@
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
import android.util.Log;
import android.util.TypedValue;
import android.view.Menu;
import android.view.MenuItem;
@@ -164,6 +165,7 @@
                if(informationBean != null){
                    UserManager.getInstance().setUserName(informationBean.getNickName());
                    UserManager.getInstance().setUserAvatar(informationBean.getImg());
                    UserManager.getInstance().setClanId(informationBean.getClanId());
                    RxBus.getInstance().post(new MessageEvent(MessageEvent.EVENT_UPDATE_USER_INFO,informationBean));
                }


 app_base/src/main/java/com/android/app_base/manager/UserManager.java

@@ -124,6 +124,14 @@
        SPUtils.getInstance("userInfo").remove("userAvatar");
    }

    public String getClanId() {
        return SPUtils.getInstance("userInfo").getString("clanId");
    }

    public void setClanId(String clanId) {
        SPUtils.getInstance("userInfo").put("clanId",clanId);
    }

    /**
     * 退出登录，清除状态
     */