Merge branch 'master' into 1.2.1_google

wjc

昨天 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90

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

@@ -122,22 +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);
            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);


    }