Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

 app/src/main/java/com/hdl/photovoltaic/ui/me/MeFragment.java

@@ -93,6 +93,7 @@
                mC_UserInfo = cUserInfo;
                UserConfigManage.getInstance().setBingPhone(cUserInfo.getMemberPhone());
                UserConfigManage.getInstance().setBingEmail(cUserInfo.getMemberEmail());
                UserConfigManage.getInstance().setUserName(cUserInfo.getMemberName());
                UserConfigManage.getInstance().Save();
//                hideLoading();
                //获取用户头像路径
@@ -144,9 +145,15 @@
        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().setUserName(bUserInfo.getUserName());
                UserConfigManage.getInstance().Save();
//                hideLoading();
                setMemberName(bUserInfo.getUserName());
                setMemberAccount(TextUtils.isEmpty(bUserInfo.getUserPhone()) ? bUserInfo.getUserEmail() : bUserInfo.getUserPhone());
            }

            @Override
@@ -237,6 +244,7 @@


        setMemberName(UserConfigManage.getInstance().getUserName());
        setMemberAccount(UserConfigManage.getInstance().getAccount());
//        setMemberHeadIcon(UserConfigManage.getInstance().getUserImageUrl());


@@ -281,13 +289,24 @@
     */
    private void setMemberName(String userName) {
        if (TextUtils.isEmpty(userName)) {
            return;
            userName = "--";
        }
        viewBinding.fragmentMeUserNameTv.setText(userName);
        UserConfigManage.getInstance().setUserName(userName);
        UserConfigManage.getInstance().Save();


    }

    /**
     * 显示账号
     */
    private void setMemberAccount(String userAccount) {
        if (TextUtils.isEmpty(userAccount)) {
            userAccount = "--";
        }
        viewBinding.fragmentMeUserRoleTv.setText(userAccount);

    }


    @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
    public void onEventMessage(BaseEventBus eventBus) {
@@ -323,11 +342,11 @@
        HdlMemberLogic.getInstance().getUserRightType(new CloudCallBeak<UserRightTypeBean>() {
            @Override
            public void onSuccess(UserRightTypeBean obj) {
//                if (obj.getUserRightType().equals(UserRightType.MANAGER)) {
//                    viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.VISIBLE);
//                } else {
//                    viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);
//                }
                if (obj.getUserRightType().equals(UserRightType.MANAGER)) {
                    viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.VISIBLE);
                } else {
                    viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);
                }
            }

            @Override