diff --git a/system/etc/ZyC-Core/misc/funclist.sh b/system/etc/ZyC-Core/misc/funclist.sh index 4128e6e76ac9ba69f2f654e77b41c884171f5c87..feb736e8599224c5b1091058b21d277cf4fc4252 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 7e290bef2f890cf0708b6c815bb13d75d5c0fcbd..6dcb34369f182abb242351c457ede2a8fee6d6a4 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