已合并
filter HUB @Co-authored-by: Agent #41666
dong-dongzhen创建于 7月4日
filter HUB @Co-authored-by: Agent #41666
已合并
共 1 个文件变更+22-1
| @@ -17,6 +17,22 @@ import { beforeAll, describe, it, expect, TestType, Size, Level } from "@ohos/hy | |||
| 17 | import usbDdk from 'libusbddkndk.so' | 17 | import usbDdk from 'libusbddkndk.so' |
| 18 | import deviceManager from "@ohos.driver.deviceManager"; | 18 | import deviceManager from "@ohos.driver.deviceManager"; |
| 19 | 19 | ||
| 20 | +interface FilteredDevice { | ||
| 21 | + vendorId: number; | ||
| 22 | + productId: number; | ||
| 23 | +} | ||
| 24 | + | ||
| 25 | +const FILTERED_DEVICES: Array<FilteredDevice> = [ | ||
| 26 | + { vendorId: 3034, productId: 33107 }, | ||
| 27 | + { vendorId: 65535, productId: 14131 }, | ||
| 28 | +]; | ||
| 29 | + | ||
| 30 | +function isFilteredDevice(device: deviceManager.USBDevice): boolean { | ||
| 31 | + return FILTERED_DEVICES.some(item => | ||
| 32 | + device.vendorId === item.vendorId && device.productId === item.productId | ||
| 33 | + ); | ||
| 34 | +} | ||
| 35 | + | ||
| 20 | export default function usbDdkTest() { | 36 | export default function usbDdkTest() { |
| 21 | let dev: number = -1; | 37 | let dev: number = -1; |
| 22 | let deviceId: number = -1; | 38 | let deviceId: number = -1; |
| @@ -50,7 +66,12 @@ export default function usbDdkTest() { | |||
| 50 | beforeAll(async () => { | 66 | beforeAll(async () => { |
| 51 | try { | 67 | try { |
| 52 | let devices: Array<deviceManager.Device> = deviceManager.queryDevices(deviceManager.BusType.USB); | 68 | let devices: Array<deviceManager.Device> = deviceManager.queryDevices(deviceManager.BusType.USB); |
| 53 | - for (let item of devices) { | 69 | + let filteredList: Array<deviceManager.Device> = devices.filter(item => { |
| 70 | + let device: deviceManager.USBDevice = item as deviceManager.USBDevice; | ||
| 71 | + return !isFilteredDevice(device); | ||
| 72 | + }); | ||
| 73 | + console.info('filter device list:', JSON.stringify(filteredList)); | ||
| 74 | + for (let item of filteredList) { | ||
| 54 | let device: deviceManager.USBDevice = item as deviceManager.USBDevice; | 75 | let device: deviceManager.USBDevice = item as deviceManager.USBDevice; |
| 55 | dev = device.deviceId; | 76 | dev = device.deviceId; |
| 56 | console.info(`Device id is ${device.deviceId}`); | 77 | console.info(`Device id is ${device.deviceId}`); |