From f3df4a5d4abd0e10265b8e2fd85eaff2e782f755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B5=A9=E7=A8=8B?= <798994511@qq.com> Date: Sat, 10 May 2025 10:43:43 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=B8=80=E7=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/viewmodel/RemoteDeviceModel.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/ets/viewmodel/RemoteDeviceModel.ets b/entry/src/main/ets/viewmodel/RemoteDeviceModel.ets index 86d3a7e..b197948 100644 --- a/entry/src/main/ets/viewmodel/RemoteDeviceModel.ets +++ b/entry/src/main/ets/viewmodel/RemoteDeviceModel.ets @@ -181,7 +181,7 @@ export class RemoteDeviceModel { return; } } - this.discoverList[this.discoverList.length] = data; + this.discoverList.push(data); Logger.info(TAG, `deviceFound self.discoverList= ${this.discoverList}`); this.callback(); } -- Gitee From da5b2126087773f24c0f5b8bd1287bedf38fe8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B5=A9=E7=A8=8B?= <798994511@qq.com> Date: Sat, 10 May 2025 11:20:28 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=B8=80=E7=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/viewmodel/RemoteDeviceModel.ets | 1 - 1 file changed, 1 deletion(-) diff --git a/entry/src/main/ets/viewmodel/RemoteDeviceModel.ets b/entry/src/main/ets/viewmodel/RemoteDeviceModel.ets index b197948..2fb560d 100644 --- a/entry/src/main/ets/viewmodel/RemoteDeviceModel.ets +++ b/entry/src/main/ets/viewmodel/RemoteDeviceModel.ets @@ -54,7 +54,6 @@ export class RemoteDeviceModel { if (data === null) { return; } - this.discoverList = []; Logger.info(TAG, `discoverSuccess data=${JSON.stringify(data)}`); this.deviceFound(data.device); }; -- Gitee From a575741896db42ebe0e037ce1e27f94c02d0c5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B5=A9=E7=A8=8B?= <798994511@qq.com> Date: Sat, 10 May 2025 14:38:38 +0800 Subject: [PATCH 3/6] 1 --- entry/src/main/ets/view/DeviceDialog.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/ets/view/DeviceDialog.ets b/entry/src/main/ets/view/DeviceDialog.ets index 2f1c94b..11d5c8c 100644 --- a/entry/src/main/ets/view/DeviceDialog.ets +++ b/entry/src/main/ets/view/DeviceDialog.ets @@ -118,7 +118,7 @@ export default struct DeviceListDialogComponent { } }, (item: distributedDeviceManager.DeviceBasicInfo) => JSON.stringify(item)) } - .width(CommonConstants.FULL_PERCENT) + .width('85%') Row() { Column() { -- Gitee From e1376e2e3a77e8db2358d73866322288ff3e4589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B5=A9=E7=A8=8B?= <798994511@qq.com> Date: Sat, 10 May 2025 15:00:45 +0800 Subject: [PATCH 4/6] 1 --- entry/src/main/ets/view/DeviceDialog.ets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/entry/src/main/ets/view/DeviceDialog.ets b/entry/src/main/ets/view/DeviceDialog.ets index 11d5c8c..35d7b1e 100644 --- a/entry/src/main/ets/view/DeviceDialog.ets +++ b/entry/src/main/ets/view/DeviceDialog.ets @@ -118,8 +118,10 @@ export default struct DeviceListDialogComponent { } }, (item: distributedDeviceManager.DeviceBasicInfo) => JSON.stringify(item)) } + .scrollBar(BarState.On) .width('85%') + Blank() Row() { Column() { Text($r('app.string.select_device_cancel')) @@ -167,6 +169,7 @@ export default struct DeviceListDialogComponent { .padding($r('app.float.button_line_padding')) .margin({ top: $r('app.float.button_line_margin_top') }) } + .height('100%') } getDeviceTypeIcon(): Resource { -- Gitee From bd48be80332ea50a182e27962bc82e73947cd74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B5=A9=E7=A8=8B?= <798994511@qq.com> Date: Sat, 10 May 2025 15:04:18 +0800 Subject: [PATCH 5/6] 1 --- entry/src/main/ets/view/DeviceDialog.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/ets/view/DeviceDialog.ets b/entry/src/main/ets/view/DeviceDialog.ets index 35d7b1e..8ab4173 100644 --- a/entry/src/main/ets/view/DeviceDialog.ets +++ b/entry/src/main/ets/view/DeviceDialog.ets @@ -119,7 +119,7 @@ export default struct DeviceListDialogComponent { }, (item: distributedDeviceManager.DeviceBasicInfo) => JSON.stringify(item)) } .scrollBar(BarState.On) - .width('85%') + .height('70%') Blank() Row() { -- Gitee From 09cba8c44b4cafa47767fa601aa536f86945100e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B5=A9=E7=A8=8B?= <798994511@qq.com> Date: Sat, 10 May 2025 15:14:45 +0800 Subject: [PATCH 6/6] 1 --- entry/src/main/ets/view/DeviceDialog.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/ets/view/DeviceDialog.ets b/entry/src/main/ets/view/DeviceDialog.ets index 8ab4173..d8dbe7a 100644 --- a/entry/src/main/ets/view/DeviceDialog.ets +++ b/entry/src/main/ets/view/DeviceDialog.ets @@ -119,7 +119,7 @@ export default struct DeviceListDialogComponent { }, (item: distributedDeviceManager.DeviceBasicInfo) => JSON.stringify(item)) } .scrollBar(BarState.On) - .height('70%') + .height('80%') Blank() Row() { -- Gitee