lvwang2002
/
react-native-bt-device
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature():1.修改dyglucose的消息发送模式适配新版程序 2.删除用不到的读卡库引用代码

This commit is contained in:
lvwang2002 2024-03-29 01:09:57 +08:00
parent bb1ee3228a
commit d25c64ea51
3 changed files with 377 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ios/RNBTDevice/Device/RNMethodModule.h
View File

@ -17,14 +17,15 @@
#import "ENCholesterolDevice.h"
#import "RCTEventEmitter.h"
#if TARGET_IPHONE_SIMULATOR//模拟器
//#if TARGET_IPHONE_SIMULATOR//模拟器
//真机
@interface RNMethodModule : NSObject<RCTBridgeModule,DeviceManagerProtocol,BLEDeviceProtocol,ENGlucoDeviceProtocal,ENGGlucoDeviceProtocal,ENBPDeviceProtocal,ENCholesterolDeviceProtocal>
#elif TARGET_OS_IPHONE//真机
#import "INVSSDK/INVSSDK.h"
#import "INVSSDK/NSString+ThreeDES.h"
@interface RNMethodModule : NSObject<RCTBridgeModule,DeviceManagerProtocol,BLEDeviceProtocol,ENGlucoDeviceProtocal,ENGGlucoDeviceProtocal,ENBPDeviceProtocal,ENCholesterolDeviceProtocal,BR_Callback>
#endif
//#elif TARGET_OS_IPHONE//真机
//#import "INVSSDK/INVSSDK.h"
//#import "INVSSDK/NSString+ThreeDES.h"
//@interface RNMethodModule : NSObject<RCTBridgeModule,DeviceManagerProtocol,BLEDeviceProtocol,ENGlucoDeviceProtocal,ENGGlucoDeviceProtocal,ENBPDeviceProtocal,ENCholesterolDeviceProtocal,BR_Callback>
//#endif

72
ios/RNBTDevice/Device/RNMethodModule.mm
View File

@ -36,7 +36,7 @@
#if TARGET_IPHONE_SIMULATOR//模拟器
#elif TARGET_OS_IPHONE//真机
INVSBleTool *_bletool;
// INVSBleTool *_bletool;
#endif
BLEDevice *_cardDevice;
Boolean _isUpdateDeviceList;
@ -66,7 +66,7 @@ RCT_EXPORT_MODULE();
#if TARGET_IPHONE_SIMULATOR//模拟器
#elif TARGET_OS_IPHONE//真机
_bletool=[[INVSBleTool alloc]init:self];
// _bletool=[[INVSBleTool alloc]init:self];
#endif
@ -757,7 +757,7 @@ RCT_REMAP_METHOD(stopCardReaderScan,
#if TARGET_IPHONE_SIMULATOR//模拟器
#elif TARGET_OS_IPHONE//真机
[_bletool disconnectBt];
// [_bletool disconnectBt];
#endif
// if(!_cardDevice){
@ -789,7 +789,7 @@ RCT_EXPORT_METHOD(connectCardReader:(NSString *)uuid
#if TARGET_IPHONE_SIMULATOR//模拟器
#elif TARGET_OS_IPHONE//真机
[_bletool connectBt:[device getPeripheral]];
// [_bletool connectBt:[device getPeripheral]];
#endif
_cardDevice = device;
@ -819,7 +819,7 @@ RCT_EXPORT_METHOD(connectCardReader:(NSString *)uuid
#if TARGET_IPHONE_SIMULATOR//模拟器
#elif TARGET_OS_IPHONE//真机
[_bletool disconnectBt];
// [_bletool disconnectBt];
#endif
return;
}
@ -855,37 +855,37 @@ RCT_REMAP_METHOD(readCard,
#if TARGET_IPHONE_SIMULATOR//模拟器
#elif TARGET_OS_IPHONE//真机
if(!_bletool){
reject(@"400",@"no device",[NSError errorWithDomain:@"device" code:400 userInfo:@{}]);
return;
}
NSDictionary *obj = [_bletool readCard];
if(!obj){
reject(@"400",@"no device",[NSError errorWithDomain:@"device" code:400 userInfo:@{}]);
return;
}
// NSMutableString *resultContent = [[NSMutableString alloc] init];
NSInteger resultFlag = [obj[@"resultFlag"] integerValue];
if(resultFlag == -1){
reject(@"400",@"no data",[NSError errorWithDomain:@"device" code:400 userInfo:@{}]);
}else{
NSMutableDictionary *info = [[NSMutableDictionary alloc] initWithCapacity:10];
[info setObject:obj[@"partyName"] forKey:@"name"];
[info setObject:obj[@"certAddress"] forKey:@"address"];
[info setObject:obj[@"bornDay"] forKey:@"birth"];
[info setObject:obj[@"expDate"] forKey:@"end"];
[info setObject:obj[@"certNumber"] forKey:@"idNo"];
[info setObject:obj[@"nation"] forKey:@"nation"];
[info setObject:obj[@"certOrg"] forKey:@"police"];
[info setObject:obj[@"gender"] forKey:@"sex"];
[info setObject:obj[@"effDate"] forKey:@"start"];
resolve([info copy]);
}
// if(!_bletool){
// reject(@"400",@"no device",[NSError errorWithDomain:@"device" code:400 userInfo:@{}]);
// return;
// }
//
// NSDictionary *obj = [_bletool readCard];
// if(!obj){
// reject(@"400",@"no device",[NSError errorWithDomain:@"device" code:400 userInfo:@{}]);
// return;
// }
//
//// NSMutableString *resultContent = [[NSMutableString alloc] init];
//
// NSInteger resultFlag = [obj[@"resultFlag"] integerValue];
// if(resultFlag == -1){
// reject(@"400",@"no data",[NSError errorWithDomain:@"device" code:400 userInfo:@{}]);
// }else{
// NSMutableDictionary *info = [[NSMutableDictionary alloc] initWithCapacity:10];
//
// [info setObject:obj[@"partyName"] forKey:@"name"];
// [info setObject:obj[@"certAddress"] forKey:@"address"];
// [info setObject:obj[@"bornDay"] forKey:@"birth"];
// [info setObject:obj[@"expDate"] forKey:@"end"];
// [info setObject:obj[@"certNumber"] forKey:@"idNo"];
// [info setObject:obj[@"nation"] forKey:@"nation"];
// [info setObject:obj[@"certOrg"] forKey:@"police"];
// [info setObject:obj[@"gender"] forKey:@"sex"];
// [info setObject:obj[@"effDate"] forKey:@"start"];
//
// resolve([info copy]);
// }
#endif

107
src/rn-dy-glucose-driver.js
View File

@ -58,6 +58,8 @@ const GET_BATTERY = 16;
let driver = null;
export default class RNDYGlucoseDriver {
subscriptionMap = {};
constructor() {
this._eventMap = {
@ -390,7 +392,11 @@ export default class RNDYGlucoseDriver{
if (dataList.length >= count) {
DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA,receiveData);
// DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA, receiveData);
if (this.subscriptionMap['DYG_ON_GET_ALL_DATA']) {
this.subscriptionMap['DYG_ON_GET_ALL_DATA'].remove();
delete this.subscriptionMap['DYG_ON_GET_ALL_DATA']; // 可选，从映射中删除键，避免内存泄漏
}
finish(null, dataList);
return;
} else {
@ -398,19 +404,27 @@ export default class RNDYGlucoseDriver{
}
timer = setTimeout(() => {
DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA,receiveData);
// DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA, receiveData);
if (this.subscriptionMap['DYG_ON_GET_ALL_DATA']) {
this.subscriptionMap['DYG_ON_GET_ALL_DATA'].remove();
delete this.subscriptionMap['DYG_ON_GET_ALL_DATA']; // 可选，从映射中删除键，避免内存泄漏
}
finish(new Error('receive data time out'))
}, PROGRESS_TIME_INTERVAL);
};
DeviceEventEmitter.addListener(DYG_ON_GET_ALL_DATA,receiveData);
this.subscriptionMap[DYG_ON_GET_ALL_DATA] = DeviceEventEmitter.addListener(DYG_ON_GET_ALL_DATA, receiveData);
await this._commadTimeInterval(COMMAND_TIME_INTERVAL);
MethodModule.getAllDataDYG(deviceMac, GET_ALL_DATA);
timer = setTimeout(() => {
DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA,receiveData);
// DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA, receiveData);
if (this.subscriptionMap['DYG_ON_GET_ALL_DATA']) {
this.subscriptionMap['DYG_ON_GET_ALL_DATA'].remove();
delete this.subscriptionMap['DYG_ON_GET_ALL_DATA']; // 可选，从映射中删除键，避免内存泄漏
}
finish(new Error('receive data time out'))
}, PROGRESS_TIME_INTERVAL);
@ -450,7 +464,11 @@ export default class RNDYGlucoseDriver{
console.log(TAG, 'rcv data count', dataList.length);
if (dataList.length >= count) {
DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA,receiveData);
// DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA, receiveData);
if (this.subscriptionMap['DYG_ON_GET_ALL_DATA']) {
this.subscriptionMap['DYG_ON_GET_ALL_DATA'].remove();
delete this.subscriptionMap['DYG_ON_GET_ALL_DATA']; // 可选，从映射中删除键，避免内存泄漏
}
finish(null, dataList);
return;
} else {
@ -458,19 +476,28 @@ export default class RNDYGlucoseDriver{
}
timer = setTimeout(() => {
DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA,receiveData);
// DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA, receiveData);
if (this.subscriptionMap['DYG_ON_GET_ALL_DATA']) {
this.subscriptionMap['DYG_ON_GET_ALL_DATA'].remove();
delete this.subscriptionMap['DYG_ON_GET_ALL_DATA']; // 可选，从映射中删除键，避免内存泄漏
}
finish(new Error('receive data time out'))
}, PROGRESS_TIME_INTERVAL);
};
DeviceEventEmitter.addListener(DYG_ON_GET_ALL_DATA,receiveData);
this.subscriptionMap[DYG_ON_GET_ALL_DATA] = DeviceEventEmitter.addListener(DYG_ON_GET_ALL_DATA, receiveData);
await this._commadTimeInterval(COMMAND_TIME_INTERVAL);
MethodModule.getAllDataFromIndexDYG(deviceMac, GET_ALL_DATA_FROM_INDEX, index);
timer = setTimeout(() => {
DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA,receiveData);
// DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA, receiveData);
if (this.subscriptionMap['DYG_ON_GET_ALL_DATA']) {
this.subscriptionMap['DYG_ON_GET_ALL_DATA'].remove();
delete this.subscriptionMap['DYG_ON_GET_ALL_DATA']; // 可选，从映射中删除键，避免内存泄漏
}
finish(new Error('receive data time out'))
}, PROGRESS_TIME_INTERVAL);
@ -508,7 +535,11 @@ export default class RNDYGlucoseDriver{
dataList = dataList.concat(deviceInfo.dataList);
console.log(TAG, 'rcv device data length:', dataList.length);
if (dataList.length >= count) {
DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA,receiveData);
// DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA, receiveData);
if (this.subscriptionMap['DYG_ON_GET_ALL_DATA']) {
this.subscriptionMap['DYG_ON_GET_ALL_DATA'].remove();
delete this.subscriptionMap['DYG_ON_GET_ALL_DATA']; // 可选，从映射中删除键，避免内存泄漏
}
finish(null, dataList);
return;
} else {
@ -516,19 +547,27 @@ export default class RNDYGlucoseDriver{
}
timer = setTimeout(() => {
DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA,receiveData);
// DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA, receiveData);
if (this.subscriptionMap['DYG_ON_GET_ALL_DATA']) {
this.subscriptionMap['DYG_ON_GET_ALL_DATA'].remove();
delete this.subscriptionMap['DYG_ON_GET_ALL_DATA']; // 可选，从映射中删除键，避免内存泄漏
}
finish(new Error('receive data time out'));
}, PROGRESS_TIME_INTERVAL);
};
DeviceEventEmitter.addListener(DYG_ON_GET_ALL_DATA,receiveData);
this.subscriptionMap[DYG_ON_GET_ALL_DATA] = DeviceEventEmitter.addListener(DYG_ON_GET_ALL_DATA, receiveData);
await this._commadTimeInterval(COMMAND_TIME_INTERVAL);
MethodModule.getNumberDataFromIndexDYG(deviceMac, GET_NUMBER_DATA_FROM_INDEX, index, count);
timer = setTimeout(() => {
DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA,receiveData);
// DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA, receiveData);
if (this.subscriptionMap['DYG_ON_GET_ALL_DATA']) {
this.subscriptionMap['DYG_ON_GET_ALL_DATA'].remove();
delete this.subscriptionMap['DYG_ON_GET_ALL_DATA']; // 可选，从映射中删除键，避免内存泄漏
}
finish(new Error('receive data time out'));
}, PROGRESS_TIME_INTERVAL);
@ -638,26 +677,26 @@ export default class RNDYGlucoseDriver{
console.log(TAG, 'created channel');
this._executeEvent(DYG_CREATED_CHANNEL, deviceInfo);
};
DeviceEventEmitter.addListener(DYG_CREATED_CHANNEL,this._createChannel);
this.subscriptionMap['DYG_CREATED_CHANNEL'] = DeviceEventEmitter.addListener(DYG_CREATED_CHANNEL, this._createChannel);
this._onDoAuthorization = (deviceInfo) => {
console.log(TAG, 'received ' + DYG_ON_DO_AUTHORIZATION);
this._executeEvent(DYG_ON_DO_AUTHORIZATION, deviceInfo);
};
DeviceEventEmitter.addListener(DYG_ON_DO_AUTHORIZATION,this._onDoAuthorization);
this.subscriptionMap[DYG_ON_DO_AUTHORIZATION] = DeviceEventEmitter.addListener(DYG_ON_DO_AUTHORIZATION, this._onDoAuthorization);
this._onGetBattery = (deviceInfo) => {
console.log(TAG, 'received ' + DYG_ON_GET_BATTERY);
this._executeEvent(DYG_ON_GET_BATTERY, deviceInfo);
};
DeviceEventEmitter.addListener(DYG_ON_GET_BATTERY,this._onGetBattery);
this.subscriptionMap[DYG_ON_GET_BATTERY] = DeviceEventEmitter.addListener(DYG_ON_GET_BATTERY, this._onGetBattery);
this._onGetAllDataCount = (deviceInfo) => {
console.log(TAG, 'received ' + DYG_ON_GET_ALL_DATA_COUNT);
this._executeEvent(DYG_ON_GET_ALL_DATA_COUNT, deviceInfo);
};
DeviceEventEmitter.addListener(DYG_ON_GET_ALL_DATA_COUNT,this._onGetAllDataCount);
this.subscriptionMap[DYG_ON_GET_ALL_DATA_COUNT] = DeviceEventEmitter.addListener(DYG_ON_GET_ALL_DATA_COUNT, this._onGetAllDataCount);
this._updateDeviceList = (deviceInfos) => {
// console.log(TAG,deviceInfos);
@ -670,24 +709,24 @@ export default class RNDYGlucoseDriver{
this._onUpdateDeviceList(deviceList);
};
DeviceEventEmitter.addListener(UPDATE_DEVICE_LIST,this._updateDeviceList);
this.subscriptionMap[UPDATE_DEVICE_LIST] = DeviceEventEmitter.addListener(UPDATE_DEVICE_LIST, this._updateDeviceList);
/** 获得当前监控的状态 */
this._onGetMonitorStatus = (deviceInfo) => {
this._executeEvent(DYG_ON_GET_MONITOR_STATUS, deviceInfo);
}
DeviceEventEmitter.addListener(DYG_ON_GET_MONITOR_STATUS,this._onGetMonitorStatus);
this.subscriptionMap[DYG_ON_GET_MONITOR_STATUS] = DeviceEventEmitter.addListener(DYG_ON_GET_MONITOR_STATUS, this._onGetMonitorStatus);
/** 获得是否已经开始监控 */
this._onStartMonitor = (deviceInfo) => {
this._executeEvent(DYG_ON_START_MONITOR, deviceInfo);
}
DeviceEventEmitter.addListener(DYG_ON_START_MONITOR,this._onStartMonitor);
this.subscriptionMap[DYG_ON_START_MONITOR] = DeviceEventEmitter.addListener(DYG_ON_START_MONITOR, this._onStartMonitor);
this._onStopMonitor = (deviceInfo) => {
this._executeEvent(DYG_ON_STOP_MONITOR, deviceInfo);
}
DeviceEventEmitter.addListener(DYG_ON_STOP_MONITOR,this._onStopMonitor);
this.subscriptionMap[DYG_ON_STOP_MONITOR] = DeviceEventEmitter.addListener(DYG_ON_STOP_MONITOR, this._onStopMonitor);
@ -699,20 +738,28 @@ export default class RNDYGlucoseDriver{
this._onUpdateNewData(deviceInfo.index, deviceInfo.value);
}
DeviceEventEmitter.addListener(DYG_ON_UPDATE_NEW_DATA,this._updateNewData);
this.subscriptionMap[DYG_ON_UPDATE_NEW_DATA] = DeviceEventEmitter.addListener(DYG_ON_UPDATE_NEW_DATA, this._updateNewData);
}
endMonitorDriverEvent() {
DeviceEventEmitter.removeListener(DYG_CREATED_CHANNEL,this._createChannel);
DeviceEventEmitter.removeListener(DYG_ON_DO_AUTHORIZATION,this._onDoAuthorization);
DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA_COUNT,this._onGetAllDataCount);
DeviceEventEmitter.removeListener(DYG_ON_GET_MONITOR_STATUS,this._onGetMonitorStatus);
DeviceEventEmitter.removeListener(UPDATE_DEVICE_LIST,this._updateDeviceList);
DeviceEventEmitter.removeListener(DYG_ON_START_MONITOR,this._onStartMonitor);
DeviceEventEmitter.removeListener(DYG_ON_STOP_MONITOR,this._onStopMonitor);
DeviceEventEmitter.removeListener(DYG_ON_UPDATE_NEW_DATA,this._updateNewData);
DeviceEventEmitter.removeListener(DYG_ON_GET_BATTERY,this._onGetBattery);
// DeviceEventEmitter.removeListener(DYG_CREATED_CHANNEL,this._createChannel);
// DeviceEventEmitter.removeListener(DYG_ON_DO_AUTHORIZATION,this._onDoAuthorization);
// DeviceEventEmitter.removeListener(DYG_ON_GET_ALL_DATA_COUNT,this._onGetAllDataCount);
// DeviceEventEmitter.removeListener(DYG_ON_GET_MONITOR_STATUS,this._onGetMonitorStatus);
// DeviceEventEmitter.removeListener(UPDATE_DEVICE_LIST,this._updateDeviceList);
// DeviceEventEmitter.removeListener(DYG_ON_START_MONITOR,this._onStartMonitor);
// DeviceEventEmitter.removeListener(DYG_ON_STOP_MONITOR,this._onStopMonitor);
// DeviceEventEmitter.removeListener(DYG_ON_UPDATE_NEW_DATA,this._updateNewData);
// DeviceEventEmitter.removeListener(DYG_ON_GET_BATTERY,this._onGetBattery);
// 移除监听器
Object.keys(this.subscriptionMap).forEach(key => {
this.subscriptionMap[key].remove();
});
// 清除订阅对象记录，避免内存泄漏
this.subscriptionMap = {};
}
}