Merge branch '1.3.1'

wjc

20 小时以前 c19f27f32f3c3d2caf82ddbdc3b2602ee3610e46

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

@@ -1,8 +1,6 @@
package com.hdl.photovoltaic.ui.me;


import android.app.ActivityManager;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
@@ -12,15 +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.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;

import java.util.List;

/**
 * 我的-设置-界面
@@ -82,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
@@ -116,6 +121,24 @@
        viewBinding.setLanguageIl.sllLlRlRightContentTv.setText(str);
        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);


    }

@@ -157,4 +180,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();
            }
        });

    }


}