更新 TaskManagerDialog.java

test 7

Author: Waim908

termux-x11/src/main/java/com/termux/x11/controller/winhandler/TaskManagerDialog.java

@@ -190,7 +190,7 @@ private void updateCPUInfoView() {
         short[] clockSpeeds = CPUStatus.getCurrentClockSpeeds();
         int totalClockSpeed = 0;
         short maxClockSpeed = 0;
-
+    
         for (int i = 0; i < clockSpeeds.length; i++) {
             TextView textView = new TextView(activity);
             textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
@@ -200,48 +200,36 @@ private void updateCPUInfoView() {
             totalClockSpeed += clockSpeeds[i];
             maxClockSpeed = (short) Math.max(maxClockSpeed, clockSpeed);
         }
-
+    
         int avgClockSpeed = totalClockSpeed / clockSpeeds.length;
         TextView tvCPUTitle = findViewById(R.id.TVCPUTitle);
         byte cpuUsagePercent = (byte) (((float) avgClockSpeed / maxClockSpeed) * 100.0f);
-
-        // 仅使用Android API获取温度
+    
+        // 直接尝试获取温度，失败就返回-1
         float cpuTemperature = getCPUTemperatureViaAndroidAPI();
         String temperatureText = (cpuTemperature >= 0) ? 
             String.format(" | %.1f°C", cpuTemperature) : "";
 
         tvCPUTitle.setText("CPU (" + cpuUsagePercent + "%)" + temperatureText);
     }
-
+    
     /**
-     * 使用Android官方API获取CPU温度（需要API 24+）
+     * 尝试获取CPU温度，失败返回-1
      */
-    @RequiresApi(api = Build.VERSION_CODES.N)
     private float getCPUTemperatureViaAndroidAPI() {
         try {
             HardwarePropertiesManager hwManager = 
                 (HardwarePropertiesManager) activity.getSystemService(Context.HARDWARE_PROPERTIES_SERVICE);
-            if (hwManager == null) {
-                Log.w("TaskManager", "HardwarePropertiesManager not available");
-                return -1;
-            }
-
-            // 使用正确的常量名称（Android 7.0+）
             float[] temps = hwManager.getDeviceTemperatures(
                 HardwarePropertiesManager.DEVICE_TEMPERATURE_CPU,
                 HardwarePropertiesManager.TEMPERATURE_CURRENT
             );
-            
-            if (temps != null && temps.length > 0) {
-                return temps[0];
-            }
+            return (temps != null && temps.length > 0) ? temps[0] : -1;
         } catch (Exception e) {
-            Log.e("TaskManager", "Failed to get CPU temperature", e);
+            return -1; // 静默失败，不显示温度
         }
-        return -1;
     }
 
-
     private void updateMemoryInfoView() {
         ActivityManager activityManager = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
         ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();