From 420562c180324d5cc22bb8bec0fe040c304eca03 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 12 七月 2024 15:29:13 +0800
Subject: [PATCH] 齐河单机版充值逻辑调整由水费计价改为电费计价

---
 qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
index bcba78a..4520884 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/MyActivity.java
@@ -21,6 +21,7 @@
 import com.dayu.baselibrary.view.datepicker.DateFormatUtils;
 import com.dayu.qihealonelibrary.databinding.ActivityMyQhaBinding;
 import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
+import com.dayu.qihealonelibrary.dbBean.ElectricPriceBean;
 import com.dayu.qihealonelibrary.utils.DeviceNumberUtils;
 import com.dayu.qihealonelibrary.utils.ExcelUtil;
 
@@ -210,11 +211,11 @@
             if (adminData != null) {
                 myBinding.myAdminName.setText(adminData.getAddressCode());
                 myBinding.myVillageNum.setText(adminData.getSerial());
-                myBinding.myWaterPrice.setText(MornyUtil.changeF2Y(adminData.getWaterPrice()));
+//                myBinding.myWaterPrice.setText(MornyUtil.changeF2Y(adminData.getWaterPrice()));
             } else {
                 myBinding.myAdminName.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
                 myBinding.myVillageNum.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
-                myBinding.myWaterPrice.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
+//                myBinding.myWaterPrice.setText("璇风偣鍑诲尯鍩熷彿杩涜璁剧疆");
             }
             StringBuilder msgData = new StringBuilder();
 
@@ -225,6 +226,12 @@
                 msgData.append("璁惧娉ㄥ唽鍙凤細" + initCode);
             }
             myBinding.myTestConnect.setText(msgData);
+            ElectricPriceBean priceBean = baseDao.electricPriceDao().findFirst();
+            if (priceBean != null) {
+                myBinding.myWaterPrice.setText(priceBean.getPrice() + "鍏�");
+            } else {
+                myBinding.myWaterPrice.setText("1.000鍏�");
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }

--
Gitblit v1.8.0