Merge branch '1.4.4' into dev

wjc

2 天以前 db937c029a3f9dbaec86cbbc944ebbee3ece13be

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

@@ -12,6 +12,7 @@
import android.text.method.LinkMovementMethod;
import android.text.method.PasswordTransformationMethod;
import android.text.style.ClickableSpan;
import android.view.Gravity;
import android.view.View;
import android.widget.TextView;

@@ -32,6 +33,7 @@
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
import com.hdl.photovoltaic.ui.account.RegisterAccountActivity;
import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
@@ -41,6 +43,8 @@
import com.hdl.photovoltaic.other.HdlAccountLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.me.WebActivity;
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import com.hdl.photovoltaic.utils.SharedPreUtils;
@@ -97,7 +101,6 @@
//
//        });


    }

    /**
@@ -107,7 +110,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();
@@ -172,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) {
        }
    }
@@ -192,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);
@@ -264,7 +274,7 @@
        viewBinding.homeLoginTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {

                HDLUniMPSDKManager.isExistsActivity = false;
                String account = viewBinding.homeLoginAccountEt.getText().toString().replace(" ", "");
                String password = viewBinding.homeLoginPasswordEt.getText().toString().replace(" ", "");
                boolean is_login = isLocalCheckAccountAndPassword(account, password);
@@ -309,6 +319,13 @@
                Intent intent = new Intent();
                intent.setClass(LoginActivity.this, ChangePassword.class);
                startActivity(intent);
            }
        });
        //无网模式
        viewBinding.homeNoNetworkModeLoginTv.setOnClickListener(new View.OnClickListener() {
            @Override
            public void onClick(View v) {
                noNetworkMode();
            }
        });

@@ -435,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() {