Merge branch 'master' into google

wjc

2 天以前 dcdd7495322c36bc41c7d18fa91dc8884bc976ef

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

@@ -7,15 +7,22 @@

import androidx.annotation.Nullable;

import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.HDLLinkPMUser;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivitySetBinding;
import com.hdl.photovoltaic.enums.LogoutType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;


/**
 * 我的-设置-界面
@@ -77,6 +84,14 @@
                startActivityForResult(intent, 40);
            }
        });
        //切花环境
        viewBinding.setContextSwitchIl.getRoot().setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                switchServer();
            }
        });

        //退出登录
        viewBinding.outTv.setOnClickListener(new View.OnClickListener() {
            @Override
@@ -112,6 +127,25 @@
        viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
        viewBinding.setTemperatureUnitIl.sllLlRlRightContentTv.setText(UserConfigManage.getInstance().getTemperature_unit());

//        if (AppConfigManage.isDebug()) {
//            viewBinding.setContextSwitchIl.parentCl.setVisibility(View.VISIBLE);
//            viewBinding.setContextSwitchIl.sllLlRlNameTv.setText("当前环境");
//            viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setVisibility(View.VISIBLE);
//            viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.VISIBLE);
//            if (AppConfigManage.getOnlineServer()) {
//                viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("线上");
//            } else {
//                viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("测试");
//            }
//        } else {
//            viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
//            viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);
//        }

        viewBinding.setContextSwitchIl.parentCl.setVisibility(View.GONE);
        viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);


    }

    @Override
@@ -139,8 +173,9 @@
            @Override
            public void Confirm() {
                dialog.dismiss();
                HdlLogLogic.print("设置界面退出登录--->", true);
                HDLLinkPMUser.getInstance().logout(0);
                HdlLogLogic.print("设置界面退出登录---", true);
                HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);

            }
        });
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@@ -152,4 +187,32 @@

    }


    /**
     * 切换环境的方法
     */
    private void switchServer() {
        // 二次确认提示框
        ConfirmationCancelDialog dialog = new ConfirmationCancelDialog(this);
        dialog.show();
        dialog.setContent("是否切换环境?");
        dialog.isHideTitle(true);
        dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
            @Override
            public void Confirm() {
                dialog.dismiss();
                HdlLogLogic.print("设置是否切换环境界面退出登录---", true);
                HdlAccountLogic.getInstance().logout(LogoutType.ServerSwitchingLogout);
            }
        });
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
            @Override
            public void Cancel() {
                dialog.dismiss();
            }
        });

    }


}