From a8751388c9a86ae95714a15279994d8aa426a26d Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期五, 13 六月 2025 14:59:02 +0800 Subject: [PATCH] feat(generallibrary): 优化充值功能并添加水价获取- 在 activity_recharge_detail.xml 中移除了不必要的 bold 样式- 在 EditText 中添加了金额输入限制(数字和小数点)- 在 BaseApplication 中添加了水价信息存储 - 在 MainActivity 中实现了延时获取水价的功能- 优化了 RechargeDetailActivity 中的水价检查和使用逻辑 - 在 README.md 中添加了金额格式化和水价获取的最佳实践指南 --- 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