From 5c0a0c45ede006049240b9c23389d7ba10853dc1 Mon Sep 17 00:00:00 2001
From: yueye <yueye2@huawei.com>
Date: Mon, 20 Nov 2023 01:56:57 +0000
Subject: [PATCH] =?UTF-8?q?DM=E6=96=B0=E6=8E=A5=E5=8F=A3=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: yueye <yueye2@huawei.com>
---
 .../client/src/main/js/test/testService.js    | 61 +++++++++----------
 1 file changed, 29 insertions(+), 32 deletions(-)

diff --git a/filemanagement/fileio/client/src/main/js/test/testService.js b/filemanagement/fileio/client/src/main/js/test/testService.js
index c1dca2a..911f031 100644
--- a/filemanagement/fileio/client/src/main/js/test/testService.js
+++ b/filemanagement/fileio/client/src/main/js/test/testService.js
@@ -13,10 +13,9 @@
  * limitations under the License.
  */
 
-import deviceManager from '@ohos.distributedHardware.deviceManager';
+import deviceManager from '@ohos.distributedDeviceManager';
 import featureAbility from '@ohos.ability.featureAbility';
 
-var results;
 var bundleName = "com.ohos.fileiotest";
 var abilityName = "com.ohos.fileiotest.ServiceAbility";
 var deviceList;
@@ -26,8 +25,8 @@ export default class TestService {
 
     }
 
-    getDeviceList(deviceManager) {
-        deviceList = deviceManager.getTrustedDeviceListSync();
+    getDeviceList(dmInstance) {
+        deviceList = dmInstance.getAvailableDeviceListSync();
         console.info("getDeviceList success, deviceList id: " + JSON.stringify(deviceList))
     }
 
@@ -35,34 +34,32 @@ export default class TestService {
         console.info("fileioClient:  toConnectAbility")
         return new Promise(resolve=>{
             let self = this;
-            deviceManager.createDeviceManager('com.ohos.fileiotest', (error, deviceManager) => {
-                self.getDeviceList(deviceManager);
-                console.info("fileioClient:  got deviceManager: " + deviceManager)
-                let networkId = deviceList[0].networkId
-                console.info("fileioClient: deviceid : " + networkId)
-                console.info("fileioClient: online deviceList id: " + JSON.stringify(deviceList))
-                let want = {
-                    "bundleName": bundleName,
-                    "abilityName": abilityName,
-                    "deviceId": networkId,
-                    "flags": 256
+            let dmInstance = deviceManager.createDeviceManager('com.ohos.fileiotest');
+            self.getDeviceList(dmInstance);
+            console.info("fileioClient:  got deviceManager: " + dmInstance)
+            let networkId = deviceList[0].networkId
+            console.info("fileioClient: deviceid : " + networkId)
+            console.info("fileioClient: online deviceList id: " + JSON.stringify(deviceList))
+            let want = {
+                "bundleName": bundleName,
+                "abilityName": abilityName,
+                "deviceId": networkId,
+                "flags": 256
+            }
+            let connect = {
+                onConnect: function (elementName, remoteProxy) {
+                    console.log('fileioClient: onConnect called, remoteProxy: ' + remoteProxy);
+                    resolve(remoteProxy)
+                },
+                onDisconnect: function (elementName) {
+                    console.log("fileioClient: onDisconnect")
+                },
+                onFailed: function () {
+                    console.log("fileioClient: onFailed")
                 }
-                let connect = {
-                    onConnect: function (elementName, remoteProxy) {
-                        console.log('fileioClient: onConnect called, remoteProxy: ' + remoteProxy);
-                        resolve(remoteProxy)
-                    },
-                    onDisconnect: function (elementName) {
-                        console.log("fileioClient: onDisconnect")
-                    },
-                    onFailed: function () {
-                        console.log("fileioClient: onFailed")
-                    }
-                }
-                let connectId = featureAbility.connectAbility(want, connect)
-                console.info("fileioClient: connect ability got id: " + connectId)
-            })
+            }
+            let connectId = featureAbility.connectAbility(want, connect)
+            console.info("fileioClient: connect ability got id: " + connectId)
         })
-
     }
-}
+}
\ No newline at end of file