From da8d00e706afcff506848331ec0e58ea1ee58969 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 30 七月 2025 16:24:52 +0800 Subject: [PATCH] 2025年07月30日16:24:47 --- app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 83 ++++++++++++++++++++++++----------------- 1 files changed, 48 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java index 0450dd8..cfb88e9 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java @@ -101,7 +101,6 @@ // // }); - } /** @@ -176,6 +175,13 @@ // viewBinding.homeLoginPasswordEt.setText(pws); checkClearIconShowOrNot(viewBinding.homeLoginAccountEt.getText().toString()); isLoginTextViewEnabled(); + if (UserConfigManage.getInstance().isAutomaticSkipNoNetworkFlag()) { + 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=false"; + HdlUniLogic.getInstance().openUniMP(path, null); + } } catch (Exception ignored) { } } @@ -319,40 +325,7 @@ viewBinding.homeNoNetworkModeLoginTv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - boolean isNoNetworkModeLogin = SharedPreUtils.getBoolean("no_network_mode"); - if (!isNoNetworkModeLogin) { - //绗竴娆℃墦寮�瑕佹彁绀� - ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity); - confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip)); - confirmationCancelDialog.setContent(getString(R.string.no_network_mode_tip)); - confirmationCancelDialog.setConfirmation(getString(R.string.home_login_affirm)); - confirmationCancelDialog.setCancel(getString(R.string.scan_cancel)); - confirmationCancelDialog.show(); - confirmationCancelDialog.getContentTextView().setGravity(Gravity.START); - confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() { - @Override - public void Cancel() { - confirmationCancelDialog.dismiss(); - SharedPreUtils.putBoolean("no_network_mode", false); - } - }); - confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() { - @Override - public void Confirm() { - confirmationCancelDialog.dismiss(); - 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=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=false"; - HdlUniLogic.getInstance().openUniMP(path, null); - } + noNetworkMode(); } }); @@ -479,6 +452,46 @@ } /** + * 杩涘叆鏃犵綉妯″紡 + */ + private void noNetworkMode() { + boolean isNoNetworkModeLogin = SharedPreUtils.getBoolean("no_network_mode"); + if (!isNoNetworkModeLogin) { + //绗竴娆℃墦寮�瑕佹彁绀� + ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity); + confirmationCancelDialog.setTitle(getString(R.string.loading_title_tip)); + confirmationCancelDialog.setContent(getString(R.string.no_network_mode_tip)); + confirmationCancelDialog.setConfirmation(getString(R.string.home_login_affirm)); + confirmationCancelDialog.setCancel(getString(R.string.scan_cancel)); + confirmationCancelDialog.show(); + confirmationCancelDialog.getContentTextView().setGravity(Gravity.START); + confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() { + @Override + public void Cancel() { + confirmationCancelDialog.dismiss(); + SharedPreUtils.putBoolean("no_network_mode", false); + } + }); + confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() { + @Override + public void Confirm() { + confirmationCancelDialog.dismiss(); + 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=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=false"; + HdlUniLogic.getInstance().openUniMP(path, null); + } + } + + /** * 鏍¢獙鐧诲綍鎸夐挳鏄惁鍚敤 */ private void isLoginTextViewEnabled() { -- Gitblit v1.8.0