From 3982cc5fdc5c73b3bd380729b470c00dfe605739 Mon Sep 17 00:00:00 2001 From: gaohui Date: Thu, 4 Nov 2021 09:53:24 +0800 Subject: [PATCH 1/5] update audioplayer ANR Signed-off-by: gaohui --- .../main/java/ohos/samples/audioplayer/OnlinePlayClient.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java index ae464c11e7..eafc072f9b 100644 --- a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java +++ b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java @@ -19,6 +19,7 @@ import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; import ohos.agp.components.Button; import ohos.agp.components.Text; +import ohos.app.dispatcher.task.TaskPriority; import ohos.media.common.Source; import ohos.media.player.Player; import ohos.samples.audioplayer.utils.LogUtil; @@ -117,7 +118,7 @@ public class OnlinePlayClient extends Ability { @Override protected void onStop() { super.onStop(); - release(); + getGlobalTaskDispatcher(TaskPriority.DEFAULT).asyncDispatch(this::release); } private void release() { -- Gitee From 1cf92900b20a90586adb24ccfab71c62d4d1950a Mon Sep 17 00:00:00 2001 From: gaohui Date: Thu, 4 Nov 2021 15:05:50 +0800 Subject: [PATCH 2/5] update audioplayer ANR Signed-off-by: gaohui --- .../main/java/ohos/samples/audioplayer/OnlinePlayClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java index eafc072f9b..18055adebd 100644 --- a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java +++ b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java @@ -118,7 +118,7 @@ public class OnlinePlayClient extends Ability { @Override protected void onStop() { super.onStop(); - getGlobalTaskDispatcher(TaskPriority.DEFAULT).asyncDispatch(this::release); + ThreadPoolManager.getInstance().execute(this::release); } private void release() { -- Gitee From b900d4fc0410f5afc89e23f3362d50b426ad6c90 Mon Sep 17 00:00:00 2001 From: gaohui Date: Thu, 4 Nov 2021 15:10:44 +0800 Subject: [PATCH 3/5] update audioplayer ANR Signed-off-by: gaohui --- .../src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java | 1 - 1 file changed, 1 deletion(-) diff --git a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java index 18055adebd..bcd9741e2e 100644 --- a/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java +++ b/media/AudioPlayer/entry/src/main/java/ohos/samples/audioplayer/OnlinePlayClient.java @@ -19,7 +19,6 @@ import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; import ohos.agp.components.Button; import ohos.agp.components.Text; -import ohos.app.dispatcher.task.TaskPriority; import ohos.media.common.Source; import ohos.media.player.Player; import ohos.samples.audioplayer.utils.LogUtil; -- Gitee From 78a109799d49eadfba686fbe1d57ae9ff2793e9a Mon Sep 17 00:00:00 2001 From: gaohui Date: Tue, 9 Nov 2021 17:11:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?ed-off-by:=20gaohui=20?= =?UTF-8?q?=20monkey=E7=A8=B3=E5=AE=9A=E6=80=A7=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../samples/distributedpictures/slice/MainAbilitySlice.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java b/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java index a6ec5cc358..c9f3736dfa 100644 --- a/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java +++ b/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java @@ -61,8 +61,10 @@ public class MainAbilitySlice extends AbilitySlice { } private void initDistributedFile() { - distributedFile = this.getDistributedDir().getPath() + "/icon.png"; - HiLog.info(LABEL_LOG, "%{public}s", "distributedFile :" + distributedFile); + if (this.getDistributedDir() != null) { + distributedFile = this.getDistributedDir().getPath() + "/icon.png"; + HiLog.info(LABEL_LOG, "%{public}s", "distributedFile :" + distributedFile); + } } private void initComponents() { -- Gitee From 9d9a4330c881d9f391680cefba786db30bf98f0c Mon Sep 17 00:00:00 2001 From: gaohui Date: Tue, 9 Nov 2021 17:41:47 +0800 Subject: [PATCH 5/5] huanyuan Signed-off-by: gaohui --- .../samples/distributedpictures/slice/MainAbilitySlice.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java b/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java index c9f3736dfa..a6ec5cc358 100644 --- a/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java +++ b/data/DistributedPictures/entry/src/main/java/ohos/samples/distributedpictures/slice/MainAbilitySlice.java @@ -61,10 +61,8 @@ public class MainAbilitySlice extends AbilitySlice { } private void initDistributedFile() { - if (this.getDistributedDir() != null) { - distributedFile = this.getDistributedDir().getPath() + "/icon.png"; - HiLog.info(LABEL_LOG, "%{public}s", "distributedFile :" + distributedFile); - } + distributedFile = this.getDistributedDir().getPath() + "/icon.png"; + HiLog.info(LABEL_LOG, "%{public}s", "distributedFile :" + distributedFile); } private void initComponents() { -- Gitee