From ebc06a3ae3a42bd6ac1359a59c55d5e6f1a0e2f0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 26 三月 2024 16:18:08 +0800
Subject: [PATCH] 优化通讯 写卡界面添加二次确认 优化用户写卡逻辑,提高写卡速度。

---
 app/src/main/java/com/dayu/recharge/activity/SysActivity.java |  109 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/activity/SysActivity.java b/app/src/main/java/com/dayu/recharge/activity/SysActivity.java
index a8b6967..ce5ad00 100644
--- a/app/src/main/java/com/dayu/recharge/activity/SysActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/SysActivity.java
@@ -3,14 +3,19 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
-import android.view.View;
 
 import com.dayu.recharge.card.CleanCard;
 import com.dayu.recharge.card.CleanUserCard;
+import com.dayu.recharge.card.ConfigurationPowerCard;
+import com.dayu.recharge.card.ConfigureDeviceRegistrationCrad;
 import com.dayu.recharge.card.DomainCard;
 import com.dayu.recharge.card.ManageCard;
 import com.dayu.recharge.card.RegisteredCard;
+import com.dayu.recharge.card.TestCard;
 import com.dayu.recharge.databinding.ActivityAdminBinding;
+import com.dayu.recharge.dbBean.DomainBean;
+import com.dayu.recharge.dbBean.PowerBean;
+import com.dayu.recharge.utils.TipUtil;
 
 /**
  * Copyright (C), 2023,
@@ -31,52 +36,82 @@
         initView();
     }
 
-    private void initView() {
-        Intent intent = new Intent(this, NFCWreatActivity.class);
 
-        adminBinding.adminAdmin.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ManageCard manageCard = new ManageCard();
-                intent.putExtra("manageCard", manageCard);
-                startActivity(intent);
-            }
+    private void initView() {
+
+       //鍒朵綔绠$悊鍗�
+        adminBinding.adminAdmin.setOnClickListener(v -> {
+            Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+            ManageCard manageCard = new ManageCard();
+
+            intent.putExtra("manageCard", manageCard);
+            startActivity(intent);
         });
         //鍒朵綔娓呴浂鍗�
-        adminBinding.adminCleanZero.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                CleanCard cleanCard = new CleanCard();
-                intent.putExtra("cleanCard", cleanCard);
-                startActivity(intent);
-            }
+        adminBinding.adminCleanZero.setOnClickListener(v -> {
+            Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+            CleanCard cleanCard = new CleanCard();
+            intent.putExtra("cleanCard", cleanCard);
+            startActivity(intent);
         });
-        adminBinding.adminRegistered.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                RegisteredCard registeredCard = new RegisteredCard();
-                intent.putExtra("registeredCard", registeredCard);
-                startActivity(intent);
-            }
+        adminBinding.adminRegistered.setOnClickListener(v -> {
+            Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+            RegisteredCard registeredCard = new RegisteredCard();
+            intent.putExtra("registeredCard", registeredCard);
+            startActivity(intent);
         });
         //鍒犻櫎鍏ㄩ儴鐢ㄦ埛
-        adminBinding.adminCleanUser.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                CleanUserCard cleanUserCard = new CleanUserCard();
-                intent.putExtra("cleanUserCard", cleanUserCard);
-                startActivity(intent);
-            }
+        adminBinding.adminCleanUser.setOnClickListener(v -> {
+            Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+            CleanUserCard cleanUserCard = new CleanUserCard();
+            intent.putExtra("cleanUserCard", cleanUserCard);
+            startActivity(intent);
         });
 //        璁剧疆鍩熷悕鍗�
-        adminBinding.adminDomain.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                DomainCard domainCard = new DomainCard();
-                intent.putExtra("domainCard", domainCard);
-                startActivity(intent);
+        adminBinding.adminDomain.setOnClickListener(v -> {
+            Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+            DomainBean domainBean = baseDao.domainPortDao().findFirst();
+            DomainCard domainCard = new DomainCard();
+            if (domainBean != null) {
+                domainCard.setDomainNumber(domainBean.getDomainNumber());
+                domainCard.setDomainName(domainBean.getDomain());
+                domainCard.setPort(domainBean.getPort());
+            } else {
+                domainCard.setDomainNumber("1");
+                domainCard.setDomainName("newreceive.hnsjgg.com");
+                domainCard.setPort(9999);
             }
+            intent.putExtra("domainCard", domainCard);
+            startActivity(intent);
         });
+        adminBinding.adminTest.setOnClickListener(v -> {
+            Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+            TestCard testCard = new TestCard();
+            intent.putExtra("testCard", testCard);
+            startActivity(intent);
+        });
+        adminBinding.adminConfigDeviceRegistration.setOnClickListener(v -> {
+            Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+            ConfigureDeviceRegistrationCrad configureDeviceRegistrationCrad = new ConfigureDeviceRegistrationCrad();
+            intent.putExtra("configureDeviceRegistrationCrad", configureDeviceRegistrationCrad);
+            startActivity(intent);
+        });
+
+        //璁剧疆姘存车鍔熺巼
+        adminBinding.adminConfigPower.setOnClickListener(v -> {
+            PowerBean powerBean = baseDao.powerDao().findFirst();
+            if (powerBean != null) {
+                Intent intent = new Intent(SysActivity.this, NFCWreatActivity.class);
+                ConfigurationPowerCard configurationPowerCard = new ConfigurationPowerCard();
+                configurationPowerCard.setPower(powerBean.getPower());
+                intent.putExtra("configurationPowerCard", configurationPowerCard);
+                startActivity(intent);
+            } else {
+                TipUtil.show("璇峰厛璁剧疆姘存车鍔熺巼");
+            }
+
+        });
+
     }
 
 

--
Gitblit v1.8.0