Skip to content

Commit 92fad46

Browse files
author
shihoo.wang
committed
增加对升级对象为空的判断,用来取消升级功能。
1 parent 916c6e9 commit 92fad46

2 files changed

Lines changed: 16 additions & 10 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ void bleCoreModule(byte data);
174174
* V2.2.0更新说明 2019/06/28 提供reInit方法,解决蓝牙服务在Application中绑定失败
175175
* V2.2.2更新说明 2019/07/13 适配android8.0相关操作
176176
* V2.2.5更新说明 2019/08/02 优化BleService后台运行 优化部分功能
177+
* V2.3.0更新说明 2019/08/02 增加对升级对象为空的判断,用来取消升级功能。
177178

178179

179180
### 6、效果图

mylibrary/src/main/java/cc/bodyplus/sdk/ble/manger/BleConnectionManger.java

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -577,9 +577,8 @@ private void msgPowerLevel(byte[] data) {
577577
* @param device 设备详情
578578
*/
579579
private void msgReConnectDevice(DeviceInfo device) {
580-
boolean needUpgrade = checkDeviceVersion(device);
581-
if (needUpgrade) {
582-
// TODO 留个彩蛋
580+
if (null!=mBPDfuListener && checkDeviceVersion(device)) {
581+
// TODO 留个彩蛋
583582
msgReConnectDevicesDfu();
584583
}else {
585584
for (Object o : connectionMap.entrySet()) {
@@ -648,7 +647,9 @@ private void msgBleState(int arg1){
648647
connectionInterface.reBleStateOn();
649648
}
650649
}else if (arg1 == 2){ // 蓝牙关闭
651-
mBPDfuListener.onBleOff();
650+
if (null != mBPDfuListener) {
651+
mBPDfuListener.onBleOff();
652+
}
652653
}
653654
}
654655

@@ -689,15 +690,19 @@ private boolean checkDeviceVersion(DeviceInfo device){
689690
}
690691

691692
private void startAssetsDfu(int type, String assetsName, DeviceInfo device) {
692-
dfuHelperS02 = new DfuHelperS02(application,type,mBPDfuListener);
693-
int status = dfuHelperS02.setAssetsZipFile(assetsName, device);
694-
mBPDfuListener.onStart(status,device);
693+
if (null != mBPDfuListener) {
694+
dfuHelperS02 = new DfuHelperS02(application, type, mBPDfuListener);
695+
int status = dfuHelperS02.setAssetsZipFile(assetsName, device);
696+
mBPDfuListener.onStart(status, device);
697+
}
695698
}
696699

697700
private void startSdCardDfu(int type, String filePath, DeviceInfo device) {
698-
dfuHelperS02 = new DfuHelperS02(application,type,mBPDfuListener);
699-
int status = dfuHelperS02.setSdCardZipFile(filePath, device);
700-
mBPDfuListener.onStart(status,device);
701+
if (null != mBPDfuListener) {
702+
dfuHelperS02 = new DfuHelperS02(application, type, mBPDfuListener);
703+
int status = dfuHelperS02.setSdCardZipFile(filePath, device);
704+
mBPDfuListener.onStart(status, device);
705+
}
701706
}
702707

703708
private void msgProcessDfuState(String sn){

0 commit comments

Comments
 (0)