mac
2024-07-02 d7ff801372431e64aee8f68ece4b8532cffb2207
2024年07月02日18:32:40

备份代码
6个文件已修改
33 ■■■■ 已修改文件
app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/bean/BUserInfo.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/drawable/next.png 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/res/layout/fragment_me.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
@@ -119,7 +119,7 @@
    //获取用户详情信息
    public static final String B_POST_GET_USERINFO = "/basis-footstone/mgmt/user/oauth/getUserInfo";
    public static final String B_POST_GET_USERINFO = "/basis-user/mgmt/user/manage/info";//"/basis-footstone/mgmt/user/oauth/getUserInfo";
    //联系我们
    public static final String B_POST_GET_UTIL_CONTACT = "/home-wisdom/app/powerStation/util/contact";
    //获取当前账号在公司的身份
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -222,6 +222,7 @@
    public void getUserInfo_B(CloudCallBeak<BUserInfo> cloudCallBeak) {
        String requestUrl = HttpApi.B_POST_GET_USERINFO;
        JsonObject json = new JsonObject();
        json.addProperty("userId",UserConfigManage.getInstance().getUserId());
        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
            @Override
            public void onSuccess(String jsonStr) {
app/src/main/java/com/hdl/photovoltaic/ui/bean/BUserInfo.java
@@ -11,6 +11,25 @@
    private String companyId;//公司id
    private String companyName;//公司名称
    private String userPhone;
    private String userEmail;
    public String getUserPhone() {
        return userPhone == null ? "" : userPhone;
    }
    public void setUserPhone(String userPhone) {
        this.userPhone = userPhone;
    }
    public String getUserEmail() {
        return userEmail == null ? "" : userEmail;
    }
    public void setUserEmail(String userEmail) {
        this.userEmail = userEmail;
    }
    public String getUserId() {
        return userId == null ? "" : userId;
    }
@@ -21,6 +40,7 @@
    /**
     * 用户名称
     *
     * @return -
     */
    public String getUserName() {
app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java
@@ -144,7 +144,11 @@
        HdlAccountLogic.getInstance().getUserInfo_B(new CloudCallBeak<BUserInfo>() {
            @Override
            public void onSuccess(BUserInfo bUserInfo) {
                mB_UserInfo = bUserInfo;
                UserConfigManage.getInstance().setBingPhone(bUserInfo.getUserPhone());
                UserConfigManage.getInstance().setBingEmail(bUserInfo.getUserEmail());
                UserConfigManage.getInstance().Save();
//                hideLoading();
                setMemberName(bUserInfo.getUserName());
            }
@@ -281,7 +285,7 @@
     */
    private void setMemberName(String userName) {
        if (TextUtils.isEmpty(userName)) {
            return;
            userName = "--";
        }
        viewBinding.fragmentMeUserNameTv.setText(userName);
        UserConfigManage.getInstance().setUserName(userName);
app/src/main/res/drawable/next.png

app/src/main/res/layout/fragment_me.xml
@@ -52,10 +52,10 @@
            android:layout_width="7dp"
            android:layout_height="@dimen/dp_12"
            android:layout_marginStart="@dimen/text_15"
            android:layout_marginTop="@dimen/dp_21"
            android:src="@drawable/next"
            app:layout_constraintBottom_toBottomOf="@+id/fragment_me_user_name_tv"
            app:layout_constraintStart_toEndOf="@+id/fragment_me_user_name_tv"
            app:layout_constraintTop_toBottomOf="@+id/fragment_me_icon_iv" />
            app:layout_constraintTop_toTopOf="@+id/fragment_me_user_name_tv" />
        <TextView
            android:id="@+id/fragment_me_user_role_tv"