From f4fc58196bd246272bf755a767660c03f573cbc6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 03 六月 2025 14:03:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 d593f50..2df59dd 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java
@@ -2,6 +2,11 @@
import static android.view.Gravity.CENTER;
+import static com.dayu.baselibrary.utils.BaseCommon.Generalv1Library;
+import static com.dayu.baselibrary.utils.BaseCommon.HeNanLibrary;
+import static com.dayu.baselibrary.utils.BaseCommon.QHAloneLibrary;
+import static com.dayu.baselibrary.utils.BaseCommon.QHOnLineLibrary;
+
import android.app.Activity;
import android.app.Dialog;
import android.view.Gravity;
@@ -46,6 +51,7 @@
getWindow().setGravity(CENTER);
setContentView(R.layout.library_dialog);
setCanceledOnTouchOutside(false);
+ setCancelable(false);
RadioGroup radioGroup = findViewById(R.id.radioLibrary);
libraryDao = BaseDaoSingleton.getInstance(mContext).libraryDao();
if (libraryDao != null) {
@@ -58,14 +64,23 @@
ischose = true;
// 褰撻�変腑鐨凴adioButton鍙戠敓鍙樺寲鏃惰皟鐢�
if (checkedId == R.id.henanLibrary) {
- type = 0;
+ type = HeNanLibrary;
libraryBean.setType(type);
data = "纭閫夋嫨娌冲崡鐗堟湰鍚楋紵";
} else if (checkedId == R.id.qhAloneLibrary) {// 澶勭悊閫変腑Option 2鐨勯�昏緫
- type = 1;
+ type = QHAloneLibrary;
libraryBean.setType(type);
data = "纭閫夋嫨榻愭渤鍗曟満鐗堟湰鍚楋紵";
+ } else if (checkedId == R.id.qhOnLineLibrary) {// 澶勭悊閫変腑Option 2鐨勯�昏緫
+ type = QHOnLineLibrary;
+ libraryBean.setType(type);
+ data = "纭閫夋嫨榻愭渤鑱旂綉鐗堟湰鍚楋紵";
+ } else if (checkedId == R.id.generav1Library) {// 澶勭悊閫変腑Option 2鐨勯�昏緫
+ type = Generalv1Library;
+ libraryBean.setType(type);
+ data = "纭閫夋嫨閫氱敤1.0鐗堟湰鍚楋紵";
}
+
});
TextView okBtn = findViewById(R.id.ok);
okBtn.setOnClickListener(v -> {
@@ -78,6 +93,7 @@
mLibraryBack.listener(type);
LibraryDialog.this.dismiss();
confirmDialog.dismiss();
+
}
});
confirmDialog.show();
--
Gitblit v1.8.0