diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/ChangeYulActivity.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/ChangeYulActivity.java index e66e8c9..692854d 100755 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/ChangeYulActivity.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/ChangeYulActivity.java @@ -20,6 +20,8 @@ import java.util.List; import static org.litepal.crud.DataSupport.where; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + public class ChangeYulActivity extends BaseActivity { ListView lv; @@ -99,7 +101,7 @@ public class ChangeYulActivity extends BaseActivity { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULONE); //注册广播 - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); } private void searchdata() { @@ -172,7 +174,7 @@ public class ChangeYulActivity extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - //反注册广播（注销） - unregisterReceiver(myReceiver); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/SbSelectActivity.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/SbSelectActivity.java index 3f6a56f..6a10e4b 100755 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/SbSelectActivity.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/SbSelectActivity.java @@ -8,6 +8,9 @@ import android.os.Bundle; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; + +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.rehome.bhdxj.DBModel.QYDDATABean; import com.rehome.bhdxj.R; import com.rehome.bhdxj.adapter.DlbAdapter; @@ -80,7 +83,7 @@ public class SbSelectActivity extends BaseActivity { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULONE); //注册广播 - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); } private void setListAdapter() { @@ -121,7 +124,7 @@ public class SbSelectActivity extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - //反注册广播（注销） - unregisterReceiver(myReceiver); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/SbxdjcjsbActivity.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/SbxdjcjsbActivity.java index b8b11de..4b8b19b 100755 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/SbxdjcjsbActivity.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/SbxdjcjsbActivity.java @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; /** @@ -132,7 +133,7 @@ public class SbxdjcjsbActivity extends BaseActivity3 { } }); - registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); + LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Bundle bundle = SbxdjcjsbActivity.this.getIntent().getExtras(); if (bundle != null) { @@ -265,8 +266,7 @@ public class SbxdjcjsbActivity extends BaseActivity3 { Intent intent = new Intent(Contans.ACTION_YULONE); intent.putExtra(Contans.KEY_POSITION, position); intent.putExtra(Contans.KEY_NAME, name); - sendBroadcast(intent); - + LocalBroadcastManager.getInstance(SbxdjcjsbActivity.this).sendBroadcast(intent); } private final BroadcastReceiver mGattUpdateReceiver = new BroadcastReceiver() { @@ -298,7 +298,8 @@ public class SbxdjcjsbActivity extends BaseActivity3 { @Override protected void onDestroy() { - unregisterReceiver(mGattUpdateReceiver); super.onDestroy(); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver); } } \ No newline at end of file diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/YulActivity.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/YulActivity.java index 789f05c..3ebf3c1 100755 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/YulActivity.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/YulActivity.java @@ -21,6 +21,8 @@ import java.util.ArrayList; import java.util.List; import static org.litepal.crud.DataSupport.where; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + public class YulActivity extends BaseActivity { ListView lv; @@ -99,7 +101,7 @@ public class YulActivity extends BaseActivity { IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULONE); - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); } private void searchdata() { @@ -210,7 +212,7 @@ public class YulActivity extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - //反注册广播（注销） - unregisterReceiver(myReceiver); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/Yul_SBActivity.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/Yul_SBActivity.java index bf3171e..0f553d2 100755 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/Yul_SBActivity.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxdj/Yul_SBActivity.java @@ -25,6 +25,8 @@ import java.util.List; import static org.litepal.crud.DataSupport.where; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + public class Yul_SBActivity extends BaseActivity { private static final int Req = 101; @@ -116,7 +118,7 @@ public class Yul_SBActivity extends BaseActivity { TYOnclick(); IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULONE); - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); } private void TYOnclick() { @@ -268,6 +270,7 @@ public class Yul_SBActivity extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - unregisterReceiver(myReceiver); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/SbxjcjsbActivity.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/SbxjcjsbActivity.java index 91b7077..c67002c 100755 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/SbxjcjsbActivity.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/SbxjcjsbActivity.java @@ -36,6 +36,7 @@ import java.util.List; import androidx.annotation.RequiresApi; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; /** @@ -156,7 +157,7 @@ public class SbxjcjsbActivity extends BaseActivity3 { } }); - registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); + LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); Bundle bundle = SbxjcjsbActivity.this.getIntent().getExtras(); if (bundle != null) { isEdit = bundle.getBoolean("edit"); @@ -277,8 +278,7 @@ public class SbxjcjsbActivity extends BaseActivity3 { intent.putExtra(Contans.KEY_POSITION, position); intent.putExtra(Contans.KEY_NAME, name); //发送广播 - sendBroadcast(intent); - + LocalBroadcastManager.getInstance(SbxjcjsbActivity.this).sendBroadcast(intent); } @Override @@ -320,7 +320,8 @@ public class SbxjcjsbActivity extends BaseActivity3 { @Override protected void onDestroy() { - unregisterReceiver(mGattUpdateReceiver); super.onDestroy(); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver); } } diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/XjYulActivity.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/XjYulActivity.java index 4f885af..ee5aaab 100755 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/XjYulActivity.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/activity/sbxj/XjYulActivity.java @@ -24,6 +24,8 @@ import java.util.List; import static com.rehome.bhdxj.activity.sbxdj.SbxdjcjsbActivity.Req; import static org.litepal.crud.DataSupport.where; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + public class XjYulActivity extends BaseActivity { ListView lv; @@ -86,7 +88,7 @@ public class XjYulActivity extends BaseActivity { setListAdapter(); IntentFilter filter = new IntentFilter(); filter.addAction(Contans.ACTION_YULONE); - registerReceiver(myReceiver, filter); + LocalBroadcastManager.getInstance(this).registerReceiver(myReceiver, filter); } private void searchdata() { @@ -181,6 +183,7 @@ public class XjYulActivity extends BaseActivity { @Override protected void onDestroy() { super.onDestroy(); - unregisterReceiver(myReceiver); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(myReceiver); } } diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/bleUtil/BlueTestInfoActivity.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/bleUtil/BlueTestInfoActivity.java index 810daaa..84a7f1d 100644 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/bleUtil/BlueTestInfoActivity.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/bleUtil/BlueTestInfoActivity.java @@ -32,6 +32,7 @@ import com.rehome.bhdxj.base.BaseActivity3; import java.util.ArrayList; import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; public class BlueTestInfoActivity extends BaseActivity3 { @@ -92,7 +93,9 @@ public class BlueTestInfoActivity extends BaseActivity3 { return; } setAdapter(); - registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); + LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); + + Intent gattServiceIntent = new Intent(BlueTestInfoActivity.this, BluetoothLeService.class); bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE); initconn = true; @@ -241,7 +244,7 @@ public class BlueTestInfoActivity extends BaseActivity3 { if (initconn) { if (!mConnected) mBluetoothLeService.connect(mDeviceAddress); } else { - registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); + LocalBroadcastManager.getInstance(this).registerReceiver(mGattUpdateReceiver, makeGattUpdateIntentFilter()); Intent gattServiceIntent = new Intent(BlueTestInfoActivity.this, BluetoothLeService.class); bindService(gattServiceIntent, mServiceConnection, BIND_AUTO_CREATE); initconn = true; @@ -396,7 +399,8 @@ public class BlueTestInfoActivity extends BaseActivity3 { scanLeDevice(false); mLeDeviceListAdapter.clear(); unbindService(mServiceConnection); - unregisterReceiver(mGattUpdateReceiver); + // 注销广播接收器 + LocalBroadcastManager.getInstance(this).unregisterReceiver(mGattUpdateReceiver); super.onDestroy(); } diff --git a/BHDXJ/app/src/main/java/com/rehome/bhdxj/bleUtil/BluetoothLeService.java b/BHDXJ/app/src/main/java/com/rehome/bhdxj/bleUtil/BluetoothLeService.java index 2e7e8d8..28fe60c 100644 --- a/BHDXJ/app/src/main/java/com/rehome/bhdxj/bleUtil/BluetoothLeService.java +++ b/BHDXJ/app/src/main/java/com/rehome/bhdxj/bleUtil/BluetoothLeService.java @@ -19,6 +19,7 @@ import android.os.IBinder; import android.util.Log; import androidx.core.app.ActivityCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import java.util.List; import java.util.UUID; @@ -116,7 +117,7 @@ public class BluetoothLeService extends Service { private void broadcastUpdate(final String action) { final Intent intent = new Intent(action); - sendBroadcast(intent); + LocalBroadcastManager.getInstance(BluetoothLeService.this).sendBroadcast(intent); } //收到数据后，触发广播 @@ -130,7 +131,7 @@ public class BluetoothLeService extends Service { stringBuilder.append(String.format("%02X ", byteChar)); intent.putExtra(EXTRA_DATA, new String(data) + "\n" + stringBuilder.toString()); } - sendBroadcast(intent); + LocalBroadcastManager.getInstance(BluetoothLeService.this).sendBroadcast(intent); } public class LocalBinder extends Binder {