Merge branch '1.3.1'

wjc

2 天以前 53057d6bbf444fe630debd9f043d4ce4ad22279b

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

@@ -7,13 +7,18 @@

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;
@@ -122,22 +127,23 @@
        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);
        }
//        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.setContextSwitchIl.parentCl.setVisibility(View.GONE);
        viewBinding.setTemperatureUnitIl.lineV.setVisibility(View.GONE);


    }
@@ -168,7 +174,8 @@
            public void Confirm() {
                dialog.dismiss();
                HdlLogLogic.print("设置界面退出登录---", true);
                HDLLinkPMUser.getInstance().logout(0);
                HdlAccountLogic.getInstance().logout(LogoutType.NormalLogout);

            }
        });
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@@ -195,7 +202,7 @@
            public void Confirm() {
                dialog.dismiss();
                HdlLogLogic.print("设置是否切换环境界面退出登录---", true);
                HDLLinkPMUser.getInstance().logout(100);
                HdlAccountLogic.getInstance().logout(LogoutType.ServerSwitchingLogout);
            }
        });
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {