Merge branch 'feature/v1.4.1'

mac

2024-07-16 3ec7de773bff5582411c6f1f659d35cf8fb1734a

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

@@ -9,7 +9,6 @@
import androidx.annotation.Nullable;

import com.alibaba.fastjson.JSONObject;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
@@ -18,18 +17,25 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentMeBinding;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.UserRightType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMemberLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
import com.hdl.photovoltaic.ui.bean.UserRightTypeBean;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.utils.GlideUtils;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;

import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;

/**
 * 我的-界面
@@ -87,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();
                //获取用户头像路径
@@ -138,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
@@ -160,18 +173,28 @@
        viewBinding.fragmentMeIconParentCl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

                if (UserConfigManage.getInstance().isBAccount()) {
                    //todo B端不支持更改昵称
                    HdlThreadLogic.toast(_mActivity, R.string.loading_not_supported);
                    return;
                    Intent intent = new Intent();
                    intent.setClass(_mActivity, BPersonalDataActivity.class);
                    startActivity(intent);
                } else {
                    Intent intent = new Intent();
                    intent.setClass(_mActivity, CPersonalDataActivity.class);
                    if (mC_UserInfo == null) {
                        mC_UserInfo = new CUserInfo();
                    }
                    intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
                    startActivityForResult(intent, 10);
                }
                Intent intent = new Intent();
                intent.setClass(_mActivity, PersonalDataActivity.class);
                if (mC_UserInfo == null) {
                    mC_UserInfo = new CUserInfo();
                }
                intent.putExtra("memberHeadIcon", mC_UserInfo.getMemberHeadIcon());
                startActivityForResult(intent, 10);
            }
        });
        //员工管理（主账号才显示）
        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                String path = HDLUniMP.UNI_EVENT_OPEN_MINE_MINESTAFFMANAGER;
                HdlUniLogic.getInstance().openUniMP(path, null);
            }
        });
        viewBinding.fragmentMeLineSetIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
@@ -189,7 +212,7 @@
            }
        });
        final int[] count = {0};
        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setOnClickListener(new View.OnClickListener() {
        viewBinding.meTitleTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                count[0] = count[0] + 1;
@@ -208,24 +231,31 @@
     */
    private void initView() {


        viewBinding.toolbarTopFragmentMeRl.topTitleTv.setText(R.string.me);
//        viewBinding.toolbarTopFragmentMeRl.topMoreIv.setVisibility(View.VISIBLE);
//        viewBinding.toolbarTopFragmentMeRl.topMoreIv.setImageResource(R.drawable.message);


        viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
        viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);
        viewBinding.fragmentMeLineSetIl.fragmentMeLineV.setVisibility(View.VISIBLE);
        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management);
        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.staff_management);
//        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE);

        viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.asregards);
        viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineTitleIv.setText(R.string.me_regard);
//        viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineV.setVisibility(View.VISIBLE);

        viewBinding.fragmentMeLineSetIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.set);
        viewBinding.fragmentMeLineSetIl.fragmentMeLineTitleIv.setText(R.string.me_set);


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


    }

    public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
        super.onActivityResult(requestCode, resultCode, data);
        if (UserConfigManage.getInstance().isBAccount()) {
            //B端不需要更新
            return;
        }
        if (requestCode == 10 && resultCode == 10) {
            if (data != null) {
                String iconUrl = data.getStringExtra("memberHeadIcon");
@@ -243,10 +273,14 @@
     * 显示用户头像
     */
    private void setMemberHeadIcon(String memberHeadIconUrl) {
        if (TextUtils.isEmpty(memberHeadIconUrl)) {
            return;
        }
        if (mC_UserInfo != null) {
            mC_UserInfo.setMemberHeadIcon(memberHeadIconUrl);
        }
        GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4));
        GlideUtils.getCircleCropImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, true);
//        GlideUtils.getRoundedCornersImage(_mActivity, memberHeadIconUrl, viewBinding.fragmentMeIconIv, new RoundedCorners(4), true);

    }

@@ -254,13 +288,27 @@
     * 显示用户名称
     */
    private void setMemberName(String userName) {
        viewBinding.fragmentMeUserNameIv.setText(userName);
        UserConfigManage.getInstance().setUserName(userName);
        UserConfigManage.getInstance().Save();
        if (TextUtils.isEmpty(userName)) {
            userName = "--";
        }
        viewBinding.fragmentMeUserNameTv.setText(userName);


    }

    @Override
    /**
     * 显示账号
     */
    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) {
        super.onEventMessage(eventBus);
        if (eventBus == null) {
@@ -269,14 +317,16 @@
        //接收外部点击事件
        if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
            if (eventBus.getType().equals(HomepageTitleTabSwitch.me.toString())) {
                // 取消粘性事件
                EventBus.getDefault().removeStickyEvent(eventBus);
                //读取头像
                if (UserConfigManage.getInstance().isBAccount()) {
                    this.getBUserInfo();
                } else {
                    this.getCMemberInfo();
                }
                // 取消粘性事件
                EventBus.getDefault().removeStickyEvent(eventBus);
                getUserRightType();

            }

        }
@@ -284,6 +334,29 @@
    }

    /**
     * 员工权限类型(B端)
     * MANAGER : 公司管理员
     * USER ： 普通员工
     */
    private void getUserRightType() {
        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);
                }
            }

            @Override
            public void onFailure(HDLException e) {

            }
        });
    }

    /**
     * 获取用户自定义配置温度单位详情(app启动的时候要获取)
     */
    private void getResidenceTemperatureUnit() {