From b7ee99a71e88a08a09fe9daada6675a175d09be1 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期三, 14 一月 2026 10:35:27 +0800
Subject: [PATCH] 部分优化
---
app/src/main/java/com/shlb/comb/fragment/DeviceListFragment.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/shlb/comb/fragment/DeviceListFragment.java b/app/src/main/java/com/shlb/comb/fragment/DeviceListFragment.java
index 8d5f7a6..3015ed5 100644
--- a/app/src/main/java/com/shlb/comb/fragment/DeviceListFragment.java
+++ b/app/src/main/java/com/shlb/comb/fragment/DeviceListFragment.java
@@ -26,7 +26,6 @@
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
import com.shlb.comb.R;
-import com.shlb.comb.activity.ConnActivity;
import com.shlb.comb.activity.TestActivity;
import com.shlb.comb.activity.HomeActivity;
import com.shlb.comb.adapter.HomeDeviceListAdapter;
@@ -58,6 +57,7 @@
private QMUIEmptyView mEmptyView;
private ListView homeList;
+ private android.widget.ProgressBar pbScanning;
private BluetoothScanManager scanManager;
private BluetoothLeDeviceStore mDeviceStore;
private BluetoothUtils mBluetoothUtils;
@@ -88,13 +88,16 @@
View view = inflater.inflate(R.layout.fragment_device_list, container, false);
mEmptyView = view.findViewById(R.id.emptyView);
homeList = view.findViewById(R.id.homeList);
+ pbScanning = view.findViewById(R.id.pb_scanning);
return view;
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
- EventBus.getDefault().register(this);
+ if (!EventBus.getDefault().isRegistered(this)) {
+ EventBus.getDefault().register(this);
+ }
initView();
initData();
}
@@ -154,6 +157,7 @@
scanManager.setScanOverListener(new ScanOverListener() {
@Override
public void onScanOver() {
+ if (pbScanning != null) pbScanning.setVisibility(View.GONE);
}
});
@@ -161,6 +165,7 @@
@Override
public void onScanFailed(final int errorCode) {
super.onScanFailed(errorCode);
+ if (pbScanning != null) pbScanning.setVisibility(View.GONE);
Toast.makeText(getContext(), "鎵弿澶辫触锛�" + errorCode, Toast.LENGTH_SHORT).show();
}
@@ -206,6 +211,7 @@
mDeviceStore.clear();
EventBus.getDefault().post(new UpdateEvent(UpdateEvent.Type.SCAN_UPDATE));
((BaseActivity) getActivity()).Toast("寮�濮嬫壂鎻�...");
+ if (pbScanning != null) pbScanning.setVisibility(View.VISIBLE);
scanManager.startScanNow();
}
}
@@ -349,7 +355,9 @@
public void onDestroyView() {
super.onDestroyView();
dismissLoading();
- EventBus.getDefault().unregister(this);
+ if (EventBus.getDefault().isRegistered(this)) {
+ EventBus.getDefault().unregister(this);
+ }
if (scanManager != null) {
scanManager.setScanCallbackCompat(null);
scanManager.setScanOverListener(null);
--
Gitblit v1.9.3