分布式硬件DM新接口适配

Signed-off-by: guoke <guoke8@huawei.com>
This commit is contained in:
guoke 2024-01-12 15:09:29 +08:00
parent c140caa341
commit 961ac185df
2 changed files with 30 additions and 21 deletions

View File

@ -16,7 +16,7 @@
import rpc from "@ohos.rpc";
import avSession from "@ohos.multimedia.avsession";
import featureAbility from '@ohos.ability.featureAbility';
import deviceManager from '@ohos.distributedHardware.deviceManager';
import deviceManager from '@ohos.distributedDeviceManager';
import process from "@ohos.process";
import audio from "@ohos.multimedia.audio";
import TestService from "./testService";
@ -50,18 +50,7 @@ export default function AVSessionManagerJsUnit() {
let localDeviceId = undefined;
let dvList = [];
let dvId = null;
deviceManager.createDeviceManager('com.example.myapplication', async (error, deviceManager) => {
console.info("Client ceate device manager success");
localDeviceId = deviceManager.getLocalDeviceInfoSync().deviceId;
console.info("local device id is: " + localDeviceId);
let deviceList = deviceManager.getTrustedDeviceListSync();
dvList = deviceList;
let deviceId = deviceList[0].deviceId;
dvId = deviceId;
console.info("deviceid is: " + deviceId)
console.info("deviceList is: " + JSON.stringify(deviceList))
})
let dmInstance;
function sleep(time) {
return new Promise(resolve => setTimeout(resolve, time));
@ -97,7 +86,25 @@ export default function AVSessionManagerJsUnit() {
await getPermission();
sleep(5000);
await driveFn();
sleep(100);
await sleep(500);
try {
dmInstance = deviceManager.createDeviceManager('com.example.myapplication');
if (dmInstance) {
console.info("Client ceate device manager success");
localDeviceId = dmInstance.getLocalDeviceId();
console.info("local device id is: " + localDeviceId);
let deviceList = dmInstance.getAvailableDeviceListSync();
dvList = deviceList;
let deviceId = deviceList[0].deviceId;
dvId = deviceId;
console.info("deviceid is: " + deviceId)
console.info("deviceList is: " + JSON.stringify(deviceList))
}
} catch(err) {
console.info('err is ' + err);
return;
}
audioManager = audio.getAudioManager().getRoutingManager();

View File

@ -14,13 +14,14 @@
*/
import rpc from "@ohos.rpc";
import deviceManager from '@ohos.distributedHardware.deviceManager';
import deviceManager from '@ohos.distributedDeviceManager';
import featureAbility from '@ohos.ability.featureAbility';
var results;
var bundleName = "com.example.myapplication";
var abilityName = "com.example.myapplication.ServiceAbility";
var deviceList;
var dmInstance;
export default class TestService {
@ -28,8 +29,8 @@ export default class TestService {
}
getDeviceList(deviceManager) {
deviceList = deviceManager.getTrustedDeviceListSync();
getDeviceList(dmInstance) {
deviceList = dmInstance.getAvailableDeviceListSync();
console.info("getDeviceList success, deviceList id: " + JSON.stringify(deviceList));
}
@ -37,9 +38,10 @@ export default class TestService {
console.info("avsessionClient: toConnectAbility")
return new Promise(resolve=>{
let self = this;
deviceManager.createDeviceManager('com.example.myapplication', (error, deviceManager) => {
self.getDeviceList(deviceManager);
console.info("avsessionClient: got deviceManager: " + deviceManager)
dmInstance = deviceManager.createDeviceManager('com.example.myapplication');
if (dmInstance) {
self.getDeviceList(dmInstance);
console.info("avsessionClient: got dmInstance: " + dmInstance)
let networkId = deviceList[0].networkId
console.info("avsessionClient: networkId : " + networkId)
console.info("avsessionClient: online deviceList id: " + JSON.stringify(deviceList))
@ -63,7 +65,7 @@ export default class TestService {
}
let connectId = featureAbility.connectAbility(want, connect)
console.info("connect ability got id: " + connectId)
})
}
})
}
}