From 765ef694376c8d2fcf097e98b979d76c603cc23e Mon Sep 17 00:00:00 2001 From: ZyCromerZ <neetroid97@gmail.com> Date: Fri, 10 Jun 2022 13:16:15 +0700 Subject: [PATCH] revert method to get current main app Signed-off-by: ZyCromerZ <neetroid97@gmail.com> --- system/etc/ZyC-Core/misc/funclist.sh | 11 ++++++----- system/etc/ZyC-Core/misc/generate-fps.sh | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/system/etc/ZyC-Core/misc/funclist.sh b/system/etc/ZyC-Core/misc/funclist.sh index 4128e6e..feb736e 100644 --- a/system/etc/ZyC-Core/misc/funclist.sh +++ b/system/etc/ZyC-Core/misc/funclist.sh @@ -346,11 +346,12 @@ GetStatusGpu(){ } 2>>$RLOGsE GetActiveAppName(){ - AppName="$(dumpsys window | grep mCurrentFocus)" - if [[ "$AppName" == *"u8"* ]];then - AppName="$(echo "$AppName" | awk -F 'u0' '{print $2}' | awk -F '}' '{print $1}')" - else - AppName="$(echo "$AppName" | awk -F ' ' '{print $2}')" + AppName="$(dumpsys activity recents | grep 'Recent #0' | awk -F 'A=' '{ print $2 }' | awk -F ' ' '{ print $1 }')" + if [[ "$AppName" == *":"* ]] ;then + AppName="$(echo "$AppName" | awk -F ':' '{ print $2 }')" + fi + if [[ "$AppName" == *"apex "* ]] ;then + AppName="" fi GetErrorMsg "GetActiveAppName" diff --git a/system/etc/ZyC-Core/misc/generate-fps.sh b/system/etc/ZyC-Core/misc/generate-fps.sh index 7e290be..6dcb343 100644 --- a/system/etc/ZyC-Core/misc/generate-fps.sh +++ b/system/etc/ZyC-Core/misc/generate-fps.sh @@ -26,12 +26,13 @@ ServiceFps(){ local StatFPSPath="$MPATHx/system/etc/ZyC-Core/configs/get_fps_status.conf" local StatFPS="1" [[ ! -d /sdcard/zycfps ]] && mkdir /sdcard/zycfps - local AppName="$(dumpsys window | grep mCurrentFocus)" + local AppName="$(dumpsys activity recents | grep 'Recent #0' | awk -F 'A=' '{ print $2 }' | awk -F ' ' '{ print $1 }')" local TypeDetect="Part-C" - if [[ "$AppName" == *"u8"* ]];then - AppName="$(echo "$AppName" | awk -F 'u0' '{print $2}' | awk -F '}' '{print $1}')" - else - AppName="$(echo "$AppName" | awk -F ' ' '{print $2}')" + if [[ "$AppName" == *":"* ]] ;then + AppName="$(echo "$AppName" | awk -F ':' '{ print $2 }')" + fi + if [[ "$AppName" == *"apex "* ]] ;then + AppName="" fi local FindFPsPath="$(find /sys -name *measured_fps* | grep "c-0")" if [[ -z "$FindFPsPath" ]];then -- GitLab