增加防止触发异常导致wakelock未被释放问题

neilyhe · neilyhe · commit baa9b42eec68 · 2025-12-19T12:42:50.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,7 @@ 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();
+                wakelock.acquire(60000);
             } catch (Exception e) {
                 TXLog.e(TAG, "wakelock without permission.WAKE_LOCK return");
                 e.printStackTrace();
@@ -168,26 +168,47 @@ public void onReceive(Context context, Intent intent) {
             // Assign new callback to token to execute code after PingResq
             // arrives. Get another wakelock even receiver already has one,
             // release it until ping response returns.
-            IMqttToken token = mComms.checkForActivity(new IMqttActionListener() {
+            IMqttToken token = null;
+            try {
+                token = mComms.checkForActivity(new IMqttActionListener() {
+
+                    @Override
+                    public void onSuccess(IMqttToken asyncActionToken) {
+                        TXLog.d(TAG, "Success. Release lock(" + wakeLockTag + "):" + System.currentTimeMillis());
+                        //Release wakelock when it is done.
+                        safeReleaseWakeLock();
+                    }
+
+                    @Override
+                    public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
+                        TXLog.d(TAG, "Failure. Release lock(" + wakeLockTag + "):" + System.currentTimeMillis());
+                        //Release wakelock when it is done.
+                        safeReleaseWakeLock();
+                    }
+                });
+            } catch (Exception e) {
+                TXLog.e(TAG, "checkForActivity exception: " + e.getMessage());
+                e.printStackTrace();
+            }
 
-                @Override
-                public void onSuccess(IMqttToken asyncActionToken) {
-                    TXLog.d(TAG, "Success. Release lock(" + wakeLockTag + "):" + System.currentTimeMillis());
-                    //Release wakelock when it is done.
-                    wakelock.release();
-                }
+            if (token == null) {
+                TXLog.d(TAG, "Token is null. Release lock immediately.");
+                safeReleaseWakeLock();
+            }
+        }
 
-                @Override
-                public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
-                    TXLog.d(TAG, "Failure. Release lock(" + wakeLockTag + "):" + System.currentTimeMillis());
-                    //Release wakelock when it is done.
+        /**
+         * 安全释放 wake lock
+         */
+        private void safeReleaseWakeLock() {
+            try {
+                if (wakelock != null && wakelock.isHeld()) {
                     wakelock.release();
+                    TXLog.d(TAG, "WakeLock released successfully");
                 }
-            });
-
-
-            if (token == null && wakelock.isHeld()) {
-                wakelock.release();
+            } catch (Exception e) {
+                TXLog.e(TAG, "Error releasing wakelock: " + e.getMessage());
+                e.printStackTrace();
             }
         }
     }
