Merge branch '1.5.2'

wjc

2025-04-15 cdf49871675e42a5576f725a93eec7ca15294c6f

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

@@ -189,14 +189,25 @@
                }
            }
        });
        //员工管理（主账号才显示）
        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
        //设备调试
        viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineRightIconClickIv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                String path = HDLUniMP.UNI_EVENT_OPEN_MINE_MINESTAFFMANAGER;
                UserConfigManage.getInstance().setUniBottomSafeDistanceBackgroundColor(2);
                //设备调试
                String path = HDLUniMP.UNI_EVENT_OPEN_MINE_DEVICEDEBUG;
                HdlUniLogic.getInstance().openUniMP(path, null);
            }
        });
//        //员工管理（主账号才显示）
//        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() {
            @Override
            public void onClick(View v) {
@@ -205,21 +216,11 @@
                startActivity(intent);
            }
        });
        //关于
        viewBinding.fragmentMeLineAsregardsIl.fragmentMeLineCl.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                startActivity(AsRegardsActivity.class);
            }
        });
        final int[] count = {0};
        viewBinding.meTitleTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                count[0] = count[0] + 1;
                if (count[0] > 3) {
                    count[0] = 0;
                    startActivity(TestMainActivity.class);
                }
            }
        });

@@ -230,15 +231,20 @@
     * 初始化界面
     */
    private void initView() {

        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management);
        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.staff_management);
        viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);//先隐藏,读取到有限权在显示
        //设备调试
        viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.device_debug);
        viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineTitleIv.setText(R.string.device_debugging);
        viewBinding.fragmentMeLineDeviceDebugIl.fragmentMeLineV.setVisibility(View.VISIBLE);
//        //员工管理
//        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineLeftIconIv.setImageResource(R.drawable.user_management);
//        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineTitleIv.setText(R.string.staff_management);
//        viewBinding.fragmentMeLineUserManagementIl.getRoot().setVisibility(View.GONE);//先隐藏,读取到有限权在显示
//        viewBinding.fragmentMeLineUserManagementIl.fragmentMeLineV.setVisibility(View.VISIBLE);

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

        viewBinding.fragmentMeLineSetIl.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);
@@ -290,11 +296,9 @@
     */
    private void setMemberName(String userName) {
        if (TextUtils.isEmpty(userName)) {
            viewBinding.fragmentMeUserNameTv.setVisibility(View.GONE);
            viewBinding.fragmentMeUserNameNextIv.setVisibility(View.GONE);
            viewBinding.userNameLl.setVisibility(View.GONE);
        } else {
            viewBinding.fragmentMeUserNameTv.setVisibility(View.VISIBLE);
            viewBinding.fragmentMeUserNameNextIv.setVisibility(View.VISIBLE);
            viewBinding.userNameLl.setVisibility(View.VISIBLE);
            viewBinding.fragmentMeUserNameTv.setText(userName);
        }

@@ -305,17 +309,15 @@
     * 显示账号
     */
    private void setMemberAccount(String userAccount) {
        if (viewBinding.fragmentMeUserNameTv.getVisibility() == View.VISIBLE) {
        if (viewBinding.userNameLl.getVisibility() == View.VISIBLE) {
            viewBinding.fragmentMeUserRoleNextIv.setVisibility(View.GONE);
        } else {
            viewBinding.fragmentMeUserRoleNextIv.setVisibility(View.VISIBLE);
        }

        if (TextUtils.isEmpty(userAccount)) {
            userAccount = "--";
        }
        viewBinding.fragmentMeUserRoleTv.setText(userAccount);

    }


@@ -336,7 +338,7 @@
                } else {
                    this.getCMemberInfo();
                }
                getUserRightType();
//                getUserRightType();

            }

@@ -353,11 +355,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