From d1573513f0eada6a915c2163ce6c84451c8c1070 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 13 六月 2024 15:06:05 +0800
Subject: [PATCH] 1.修复河南版本域名卡结构不同问题 2.修复齐河版本最终购水日期的bug
---
baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java | 72 +++++++++++++++++++----------------
1 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java b/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
index 0d49596..d593f50 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
@@ -33,6 +33,8 @@
int type;
String data;
+ ConfirmDialog confirmDialog;
+
public LibraryDialog(Activity context, libraryBack libraryBack) {
super(context, com.dayu.baselibrary.R.style.ws_pay_showSelfDialog);
mContext = context;
@@ -46,40 +48,44 @@
setCanceledOnTouchOutside(false);
RadioGroup radioGroup = findViewById(R.id.radioLibrary);
libraryDao = BaseDaoSingleton.getInstance(mContext).libraryDao();
- libraryBean = libraryDao.findFirst();
- if (libraryBean == null) {
- libraryBean = new LibraryBean();
+ if (libraryDao != null) {
+ libraryBean = libraryDao.findFirst();
+ if (libraryBean == null) {
+ libraryBean = new LibraryBean();
+ }
+
+ radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
+ ischose = true;
+ // 褰撻�変腑鐨凴adioButton鍙戠敓鍙樺寲鏃惰皟鐢�
+ if (checkedId == R.id.henanLibrary) {
+ type = 0;
+ libraryBean.setType(type);
+ data = "纭閫夋嫨娌冲崡鐗堟湰鍚楋紵";
+ } else if (checkedId == R.id.qhAloneLibrary) {// 澶勭悊閫変腑Option 2鐨勯�昏緫
+ type = 1;
+ libraryBean.setType(type);
+ data = "纭閫夋嫨榻愭渤鍗曟満鐗堟湰鍚楋紵";
+ }
+ });
+ TextView okBtn = findViewById(R.id.ok);
+ okBtn.setOnClickListener(v -> {
+ if (ischose) {
+ //浜屾纭
+ confirmDialog = new ConfirmDialog(mContext, data, new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ libraryDao.insert(libraryBean);
+ mLibraryBack.listener(type);
+ LibraryDialog.this.dismiss();
+ confirmDialog.dismiss();
+ }
+ });
+ confirmDialog.show();
+
+ }
+ });
+
}
-
- radioGroup.setOnCheckedChangeListener((group, checkedId) -> {
- ischose = true;
- // 褰撻�変腑鐨凴adioButton鍙戠敓鍙樺寲鏃惰皟鐢�
- if (checkedId == R.id.henanLibrary) {
- type = 0;
- libraryBean.setType(type);
- data = "纭閫夋嫨娌冲崡鐗堟湰鍚楋紵";
- } else if (checkedId == R.id.qhAloneLibrary) {// 澶勭悊閫変腑Option 2鐨勯�昏緫
- type = 1;
- libraryBean.setType(type);
- data = "纭閫夋嫨榻愭渤鍗曟満鐗堟湰鍚楋紵";
- }
- });
- TextView okBtn = findViewById(R.id.ok);
- okBtn.setOnClickListener(v -> {
- if (ischose) {
- //浜屾纭
- ConfirmDialog confirmDialog = new ConfirmDialog(mContext, data, new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- libraryDao.insert(libraryBean);
- mLibraryBack.listener(type);
- LibraryDialog.this.dismiss();
- }
- });
- confirmDialog.show();
-
- }
- });
}
--
Gitblit v1.8.0