Merge branch '1.3.1'

wjc

20 小时以前 c19f27f32f3c3d2caf82ddbdc3b2602ee3610e46

 app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java

@@ -111,7 +111,7 @@
        try {
            viewBinding.homeLoginCheckBCCl.setSelected(UserConfigManage.getInstance().isBAccount());
            viewBinding.homeLoginPrivacyCheckIv.setSelected(UserConfigManage.getInstance().isAcceiptPolicy());
            setStringDifferentColors(viewBinding.homeLoginPrivacyTv, false);
            setStringDifferentColors(viewBinding.homeLoginPrivacyTv, true);

            //注册和忘记密码需要加下划线
            String registerTvStr = viewBinding.homeLoginRegisterTv.getText().toString();
@@ -343,14 +343,14 @@
                            SharedPreUtils.putBoolean("no_network_mode", true);
                            UserConfigManage.getInstance().setNoNetworkFlag(true);
                            UserConfigManage.getInstance().Save();
                            String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=" + UserConfigManage.getInstance().isNoNetworkFlag();
                            String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=false";
                            HdlUniLogic.getInstance().openUniMP(path, null);
                        }
                    });
                } else {
                    UserConfigManage.getInstance().setNoNetworkFlag(true);
                    UserConfigManage.getInstance().Save();
                    String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=" + UserConfigManage.getInstance().isNoNetworkFlag();
                    String path = HDLUniMP.UNI_EVENT_OPEN_NONETWORKDEVICELIST + "?mac=" + UserConfigManage.getInstance().getNoNetworkDeviceMac() + "&password=" + UserConfigManage.getInstance().getNoNetworkPassword() + "&autoVerify=false";
                    HdlUniLogic.getInstance().openUniMP(path, null);
                }
            }