1.修复16进制字符串转byte时的bug

zuoxiao

2024-05-10 8c57cb70cc165d21fdda9385966e8ae65d36cc1d

 app/src/main/java/com/dayu/recharge/activity/LoginActivity.java

@@ -20,7 +20,7 @@

import com.dayu.henanlibrary.dbBean.PassWordBean;

import com.dayu.qihealonelibrary.activity.HomeActivityQHAlone;
import com.dayu.qihealonelibrary.activity.HomeActivity;
import com.dayu.recharge.MyApplication;
import com.dayu.recharge.databinding.ActivityLoginBinding;
import com.hjq.permissions.OnPermissionCallback;
@@ -41,6 +41,7 @@

    ActivityLoginBinding binding;
    PassWordBean passWordBean;
    int clickNumber;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
@@ -52,34 +53,27 @@
    }

    private void initView() {
        binding.title.setOnClickListener(v -> {
            clickNumber++;
            if (clickNumber == 20) {
                choesLibrary();
            }

        });
        binding.loginBtn.setOnClickListener(v -> {
            String psStr = binding.loginPw.getText().toString();
            if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
                //选择版本
                LibraryDialog dialog = new LibraryDialog(this, type -> {
                    if (type == BaseCommon.HeNanLibrary) {
                        getHNPermission();
                    } else if (type == BaseCommon.QHAloneLibrary) {
                        getQHAlonePermission();
                    }
                    MyApplication.myApplication.initApplication();
                });
                dialog.show();
                //没有选择版本先选择版本
                return;
            }
            if (TextUtils.isEmpty(psStr)) {
                TipUtil.show("请输入密码");
                return;
            }
            if ((passWordBean == null && psStr.equals("123456"))
                    || passWordBean != null && passWordBean.getPassWord().equalsIgnoreCase(WSMD5.getMD5Str(psStr))) {
                if (MyApplication.myApplication.libraryType == BaseCommon.HeNanLibrary) {
                    startActivity(new Intent(LoginActivity.this, com.dayu.henanlibrary.activity.HomeActivity.class));
                } else if (MyApplication.myApplication.libraryType ==  BaseCommon.QHAloneLibrary) {
                    startActivity(new Intent(LoginActivity.this, HomeActivityQHAlone.class));
                if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
                    choesLibrary();
                    //没有选择版本先选择版本
                } else {
                    startToHomeActivity();
                }
                LoginActivity.this.finish();
            } else {
                Toast.makeText(LoginActivity.this, "密码错误", Toast.LENGTH_SHORT).show();
            }
@@ -93,6 +87,32 @@
    }

    /**
     * 选择版本
     */
    private void choesLibrary() {

        LibraryDialog dialog = new LibraryDialog(this, type -> {
            if (type == BaseCommon.HeNanLibrary) {
                getHNPermission();
            } else if (type == BaseCommon.QHAloneLibrary) {
                getQHAlonePermission();
            }
            MyApplication.myApplication.initApplication();
            startToHomeActivity();
        });
        dialog.show();
    }

    private void startToHomeActivity() {
        if (MyApplication.myApplication.libraryType == BaseCommon.HeNanLibrary) {
            startActivity(new Intent(LoginActivity.this, com.dayu.henanlibrary.activity.HomeActivity.class));
        } else if (MyApplication.myApplication.libraryType == BaseCommon.QHAloneLibrary) {
            startActivity(new Intent(LoginActivity.this, HomeActivity.class));
        }
        LoginActivity.this.finish();
    }

    /**
     * 河南版的获取权限
     */
    private void getHNPermission() {