修复低 Android 版本无法过滤指定应用的 Logcat 的问题

Author: getActivity

shell/device-tools/DisplayLogcat.sh

@@ -45,9 +45,15 @@ displayLogcatSingleDevice() {
     local deviceId=$1
     if [[ -z ${packageName} ]]; then
         adb -s "${deviceId}" logcat < /dev/null
-    else
+        return
+    fi
+
+    local androidVersionCode
+    androidVersionCode=$(getAndroidVersionCodeByAdb "${deviceId}")
+
+    if (( androidVersionCode >= 24 )); then
         local uid
-        if (( $(getAndroidVersionCodeByAdb "${deviceId}") >= 26 )); then
+        if (( androidVersionCode >= 26 )); then
             uid=$(adb -s "${deviceId}" shell pm list packages -U < /dev/null 2>/dev/null | grep "${packageName}" | awk -F 'uid:' '{print $2}')
         fi
 
@@ -64,10 +70,23 @@ displayLogcatSingleDevice() {
             echo "📝 设备支持 uid 过滤，使用原生过滤的方式（UID: ${uid}）"
             adb -s "${deviceId}" logcat --uid "${uid}" < /dev/null
         else
-            echo "💡 设备不支持 uid 过滤，使用文本过滤的方式（UID: ${uid}）"
+            echo "📝 设备不支持 uid 过滤，使用文本过滤的方式（UID: ${uid}）"
             adb -s "${deviceId}" logcat -v uid < /dev/null | grep -F " ${uid} "
         fi
+        return
+    fi
+
+    local pid
+    pid=$(adb -s "${deviceId}" shell ps < /dev/null 2>/dev/null | tr -d '\r' | awk -v pkg="${packageName}" '$NF ~ ("^" pkg "(:.*)?$") {print $2; exit}')
+    if [[ -z "${pid}" || ! "${pid}" =~ ^[0-9]+$ ]]; then
+        pid=$(adb -s "${deviceId}" shell ps -A < /dev/null 2>/dev/null | tr -d '\r' | awk -v pkg="${packageName}" '$NF ~ ("^" pkg "(:.*)?$") {print $2; exit}')
+    fi
+    if [[ -z "${pid}" || ! "${pid}" =~ ^[0-9]+$ ]]; then
+        echo "❌ 无法解析该应用的 PID，请检查 ${packageName} 应用是否正在运行"
+        return 1
     fi
+    echo "📝 低版本设备，使用 pid 文本过滤的方式（PID: ${pid}）"
+    adb -s "${deviceId}" logcat -v threadtime < /dev/null | awk -v pid="${pid}" '$3==pid'
 }
 
 displayLogcatForDevice() {