From b93ca15aa55af7cf2dee653beb100076c897f152 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 25 六月 2024 16:56:38 +0800
Subject: [PATCH] 2024年06月25日16:56:31
---
app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
index b509aef..8ea0293 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
@@ -74,7 +74,7 @@
}
private void initEvent() {
- viewBinding.topBackBtn.setOnClickListener(this);
+ viewBinding.topBackLl.setOnClickListener(this);
viewBinding.topLogBtn.setOnClickListener(this);
viewBinding.clickCommandTv.setOnClickListener(this);
viewBinding.clickSelectDeviceTv.setOnClickListener(this);
@@ -91,7 +91,7 @@
return;
}
- showLoading();
+
startRequest(position, mGatewayBean);
}
});
@@ -101,7 +101,7 @@
@Override
public void onClick(View v) {
int id = v.getId();
- if (id == viewBinding.topBackBtn.getId()) {
+ if (id == viewBinding.topBackLl.getId()) {
finish();
} else if (id == viewBinding.topLogBtn.getId()) {
startActivity(TestLogActivity.class);
@@ -139,6 +139,7 @@
* @param position 绱㈠紩鍊�
*/
private void startRequest(int position, GatewayBean gatewayBean) {
+ showLoading();
String title = getTitleList().get(position);
switch (title) {
case "鎼滅储銆愭墍鏈夈�戦�嗗彉鍣ㄥ垪琛�(0)": {
@@ -284,18 +285,18 @@
ConfirmationCancelDialog confirmationCancelDialog = new ConfirmationCancelDialog(_mActivity);
confirmationCancelDialog.show();
confirmationCancelDialog.setTitle("鎻愮ず!");
- confirmationCancelDialog.setContent("鏄惁瑕佽В缁�+\"" + mGatewayBean.getDevice_name() + "\"?");
+ confirmationCancelDialog.setContent("鏄惁瑕佽В缁慭"" + mGatewayBean.getDevice_name() + "\"?");
confirmationCancelDialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
@Override
public void Confirm() {
confirmationCancelDialog.dismiss();
showLoading("瑙ｇ粦涓�...");
- HdlDeviceLogic.getInstance().initializeGateway(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
+ HdlDeviceLogic.getInstance().initializeInverter(gatewayBean.getDevice_mac(), new LinkCallBack<Boolean>() {
@Override
public void onSuccess(Boolean obj) {
hideLoading();
gsonConvertJsonStr(obj);
- HdlDeviceLogic.getInstance().removeLocalCacheMemoryGateway(UserConfigManage.getInstance().getHomeId(), mGatewayBean.getDevice_mac());
+ HdlDeviceLogic.getInstance().removeLocalCacheMemoryGatewayToMac(UserConfigManage.getInstance().getHomeId(), mGatewayBean.getDevice_mac());
HdlDeviceLogic.getInstance().delInverterDevice(UserConfigManage.getInstance().getHomeId(), mGatewayBean.getDeviceId(), null);
}
@@ -310,6 +311,7 @@
confirmationCancelDialog.setNoOnclickListener(new ConfirmationCancelDialog.onNoOnclickListener() {
@Override
public void Cancel() {
+ hideLoading();
confirmationCancelDialog.dismiss();
}
});
--
Gitblit v1.8.0