1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug

zuoxiao

2024-06-13 d1573513f0eada6a915c2163ce6c84451c8c1070

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

@@ -11,14 +11,14 @@
import androidx.annotation.NonNull;

import com.dayu.baselibrary.activity.BaseActivity;
import com.dayu.baselibrary.dao.BaseDaoSingleton;
import com.dayu.baselibrary.dbbean.PassWordBean;
import com.dayu.baselibrary.utils.BaseCommon;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.WSMD5;
import com.dayu.baselibrary.view.LibraryDialog;
import com.dayu.henanlibrary.HeNanApplication;
import com.dayu.henanlibrary.dao.HNBaseDaoSingleton;

import com.dayu.henanlibrary.dbBean.PassWordBean;

import com.dayu.qihealonelibrary.activity.HomeActivity;
import com.dayu.recharge.MyApplication;
@@ -41,45 +41,40 @@

    ActivityLoginBinding binding;
    PassWordBean passWordBean;
//    com.dayu.qihealonelibrary.dbBean.PassWordBean
    int clickNumber;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        binding = ActivityLoginBinding.inflate(LayoutInflater.from(this));
        setContentView(binding.getRoot());

        getPermission();
        initView();
    }

    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, HomeActivity.class));
                if (MyApplication.myApplication.libraryType == BaseCommon.NoLibrary) {
                    choesLibrary();
                    //没有选择版本先选择版本
                } else {
                    startToHomeActivity();
                }
                LoginActivity.this.finish();
            } else {
                Toast.makeText(LoginActivity.this, "密码错误", Toast.LENGTH_SHORT).show();
            }
@@ -90,6 +85,32 @@
        } catch (PackageManager.NameNotFoundException e) {
            throw new RuntimeException(e);
        }
    }

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

        LibraryDialog dialog = new LibraryDialog(this, type -> {
            if (type == BaseCommon.HeNanLibrary) {
                getHNPermission();
            } else if (type == BaseCommon.QHAloneLibrary) {

            }
            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();
    }

    /**
@@ -123,7 +144,7 @@
                                        if (!file.exists()) {
                                            file.mkdirs();
                                        }
                                        passWordBean = HNBaseDaoSingleton.getInstance(LoginActivity.this).loginPsDao().findFirst();

                                    } catch (Exception e) {
                                        e.printStackTrace();
                                    }
@@ -145,7 +166,7 @@
        }
    }

    private void getQHAlonePermission() {
    private void getPermission() {
        try {
            XXPermissions.with(this)
                    .permission(
@@ -162,7 +183,7 @@
                                        if (!file.exists()) {
                                            file.mkdirs();
                                        }
                                        passWordBean = HNBaseDaoSingleton.getInstance(LoginActivity.this).loginPsDao().findFirst();
                                        passWordBean = BaseDaoSingleton.getInstance(LoginActivity.this).loginPsDao().findFirst();
                                    } catch (Exception e) {
                                        e.printStackTrace();
                                    }