From 276156837ebca8b8b08a516e61fe105e670375fc Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 04 六月 2024 10:35:23 +0800
Subject: [PATCH] Merge branch 'dev' into feature/v1.4.1
---
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/DeviceSearchActivity.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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 a0a4a62..a3db417 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
@@ -21,6 +21,7 @@
import com.hdl.photovoltaic.databinding.ActivityDeviceSearchBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
@@ -162,6 +163,7 @@
viewBinding.powerStationSearchEt.setText("");
viewBinding.historyListParent.setVisibility(View.VISIBLE);
viewBinding.listParent.setVisibility(View.GONE);
+ viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
searchHistoryAdapter.setList(searchHistoryTitleList);
clearData();
}
@@ -172,6 +174,7 @@
public void onClick(View v) {
searchHistoryTitleList = new ArrayList<>();
searchHistoryAdapter.setList(searchHistoryTitleList);
+ viewBinding.deviceNullDataIc.getRoot().setVisibility(View.GONE);
HdlFileLogic.getInstance().deleteFile(getHistoryFileNamePath());
}
});
@@ -354,6 +357,7 @@
//鏇存柊UI
searchDeviceAdapter.setList(deviceList);
}
+ nullDataUpdateUi();
}
}
}, _mActivity, ShowErrorMode.YES);
@@ -428,6 +432,15 @@
}
}
+
+ /**
+ * 娌℃湁璁惧鍒楄〃鐨勬牱寮�
+ */
+ private void nullDataUpdateUi() {
+ boolean is_data = deviceList != null && deviceList.size() > 0;
+ HdlCommonLogic.getInstance().nullDataUpdateUi(_mActivity, viewBinding.deviceNullDataIc.getRoot(), viewBinding.deviceNullDataIc.nullDataGifAnimationIv, viewBinding.deviceNullDataIc.nullDataTv, getString(R.string.no_equipment), is_data);
+ }
+
/**
* 娣诲姞鍘嗗彶璁板綍
*/
--
Gitblit v1.8.0