设置超时时间为心跳间隔的1.5倍

neilyhe · neilyhe · commit 34c12b411f2f · 2025-12-19T15:34:13.000+08:00
diff --git a/hub/hub-device-android/src/main/java/com/tencent/iot/hub/device/android/core/mqtt/TXAlarmPingSender.java b/hub/hub-device-android/src/main/java/com/tencent/iot/hub/device/android/core/mqtt/TXAlarmPingSender.java
@@ -158,7 +158,11 @@ public void onReceive(Context context, Intent intent) {
             PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
             wakelock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, wakeLockTag);
             try { // 唤醒锁获取失败，抛出权限异常，同时避免后续的释放过程
-                wakelock.acquire(60000);
+                // 设置超时时间为心跳间隔的1.5倍，确保有足够时间等待ping响应
+                long keepAliveTime = mComms.getKeepAlive();
+                long timeout = Math.max(keepAliveTime * 3 / 2, 60000); // 至少60秒
+                wakelock.acquire(timeout);
+                TXLog.d(TAG, "WakeLock acquired with timeout: " + timeout + "ms, keepAlive: " + keepAliveTime + "ms");
             } catch (Exception e) {
                 TXLog.e(TAG, "wakelock without permission.WAKE_LOCK return");
                 e.printStackTrace();
