Merge branch 'master' into 1.2.1_google

wjc

昨天 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

 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;
@@ -16,15 +14,10 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivitySetBinding;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.ui.StartActivity;
import com.hdl.photovoltaic.ui.test.TestMainActivity;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.umeng.analytics.MobclickAgent;

import java.util.List;

/**
 * 我的-设置-界面
@@ -129,20 +122,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);
            if (AppConfigManage.getOnlineServer()) {
                viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("线上");
            } else {
                viewBinding.setContextSwitchIl.sllLlRlRightContentTv.setText("测试");
            }
        } else {
            viewBinding.setContextSwitchIl.parentCl.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);


    }
@@ -198,7 +194,7 @@
        dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
            @Override
            public void Confirm() {
//                dialog.dismiss();
                dialog.dismiss();
                HdlLogLogic.print("设置是否切换环境界面退出登录---", true);
                HDLLinkPMUser.getInstance().logout(100);
            }
@@ -206,7 +202,7 @@
        dialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
            @Override
            public void Cancel() {
//                dialog.dismiss();
                dialog.dismiss();
            }
        });