From 80aa637dacf955c5cb19e735a461b45515945c84 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 16:54:23 +0800
Subject: [PATCH] 2025年07月31日16:54:21
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
index 49eff41..19dc800 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java
@@ -1,12 +1,8 @@
package com.hdl.photovoltaic.ui.powerstation;
-import androidx.annotation.NonNull;
import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import android.content.Context;
-import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
@@ -22,7 +18,6 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.bean.PageNumberObject;
-import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityDeviceSearchBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -46,7 +41,6 @@
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
/**
@@ -116,7 +110,7 @@
@Override
public void run() {
viewBinding.listSrl.endRefreshing();
- loadNextPageDeviceList(true, 1, true);
+ loadNextPageDeviceList(false, 1, true);
}
};
// 寤惰繜 5 绉掓墽琛�
@@ -234,6 +228,10 @@
searchDeviceAdapter.setOnclickListener(new DeviceInfoAdapter.OnClickListener() {
@Override
public void onClick(int position, CloudInverterDeviceBean deviceBean) {
+ if (!deviceBean.isActivate()) {
+ HdlThreadLogic.toast(_mActivity, getString(R.string.device_not_activated));
+ return;
+ }
if (deviceBean.getDeviceStatus() == 4) {
HdlThreadLogic.toast(_mActivity, R.string.device_off);
return;
@@ -248,9 +246,19 @@
@Override
public void onSuccess(List<GatewayBean> obj) {
GatewayBean newGatewayBean = HDLLinkLocalGateway.getInstance().getLocalGateway(deviceBean.getOsn());
+ if (newGatewayBean == null) {
+ HdlThreadLogic.toast(_mActivity, getString(R.string.device_off));
+ return;
+ }
+ if (TextUtils.isEmpty(newGatewayBean.getGatewayId()) || TextUtils.isEmpty(newGatewayBean.getAesKey())) {
+ //杩欓噷鍙敮鎸佽繙绋嬭皟璇曪紝杩滅▼鎷夸笉鍒癿qtt閫氳绉橀挜浠ュ強gatewayId锛�
+ HdlThreadLogic.toast(_mActivity,getString(R.string.device_failed_to_certificate)+"(124004)");
+ return;
+ }
String jsonEncryption = URLEncodingUtils.encodeURIComponent(new Gson().toJson(newGatewayBean));
String path = HDLUniMP.UNI_EVENT_OPEN_DEVICE_DETAILS + "?inverterInfo=" + jsonEncryption;
HdlUniLogic.getInstance().openUniMP(path, null);
+
}
@Override
--
Gitblit v1.8.0