Merge branch '1.4.4' into dev

wjc

1 天以前 db937c029a3f9dbaec86cbbc944ebbee3ece13be

 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) {
        }
    }
@@ -196,11 +202,11 @@
                listDialog.setItemOnclickListener(new ListDialogAdapter.OnclickListener() {
                    @Override
                    public void onClick(int position, LanguageAdapter.ItemData itemData) {
                        listDialog.dismiss();
                        UserConfigManage.getInstance().setCurrentAppLanguage(itemData.getLanguage());
                        UserConfigManage.getInstance().Save();
                        //配置接口请求语言
                        HDLLinkPMSdk.setLanguage(UserConfigManage.getInstance().getCurrentAppLanguage());
                        listDialog.dismiss();
                        AppManagerUtils.getAppManager().finishAllActivity();
                        Intent intent = new Intent();
                        intent.setClass(HDLApp.getInstance(), StartActivity.class);
@@ -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() {