Merge branch 'master' into 1.2.1_google

wjc

昨天 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

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

@@ -10,11 +10,14 @@
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.other.HdlLogLogic;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;


/**
 * 我的-设置-界面
@@ -34,6 +37,7 @@
    @Override
    public void onBindView(Bundle savedInstanceState) {
        setStatusBarTranslucent();
        getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
        //初始化
        initView();
        //初始化界面监听器
@@ -75,6 +79,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
@@ -110,6 +122,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
@@ -137,6 +168,7 @@
            @Override
            public void Confirm() {
                dialog.dismiss();
                HdlLogLogic.print("设置界面退出登录---", true);
                HDLLinkPMUser.getInstance().logout(0);
            }
        });
@@ -149,4 +181,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);
                HDLLinkPMUser.getInstance().logout(100);
            }
        });
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
            @Override
            public void Cancel() {
                dialog.dismiss();
            }
        });

    }


}