From e863cc5da7b0c581c65d7e16ac3aa2ff9d98e4fc Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 20 三月 2025 11:46:20 +0800
Subject: [PATCH] feat(generallibrary): 添加项目选择功能

---
 baselibrary/src/main/java/com/dayu/baselibrary/view/LibraryDialog.java |   87 ++++++++++++++++++++++++++-----------------
 1 files changed, 53 insertions(+), 34 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 48301b1..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,43 +51,57 @@
         getWindow().setGravity(CENTER);
         setContentView(R.layout.library_dialog);
         setCanceledOnTouchOutside(false);
+        setCancelable(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 = HeNanLibrary;
+                    libraryBean.setType(type);
+                    data = "纭閫夋嫨娌冲崡鐗堟湰鍚楋紵";
+                } else if (checkedId == R.id.qhAloneLibrary) {// 澶勭悊閫変腑Option 2鐨勯�昏緫
+                    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 -> {
+                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 = 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();
-
-            }
-        });
 
 
     }

--
Gitblit v1.8.0