diff --git a/app/src/main/java/com/unibuy/smartdevice/AppCompatActivityAbstract.java b/app/src/main/java/com/unibuy/smartdevice/AppCompatActivityAbstract.java index 3cba1d0..cfb34bc 100644 --- a/app/src/main/java/com/unibuy/smartdevice/AppCompatActivityAbstract.java +++ b/app/src/main/java/com/unibuy/smartdevice/AppCompatActivityAbstract.java @@ -78,4 +78,10 @@ public abstract class AppCompatActivityAbstract extends AppCompatActivity { finish(); } } + + @Override + public void onUserInteraction() { + super.onUserInteraction(); + com.unibuy.smartdevice.MyApp.getInstance().updateLastInteraction(); + } } diff --git a/app/src/main/java/com/unibuy/smartdevice/HomeActivity.java b/app/src/main/java/com/unibuy/smartdevice/HomeActivity.java index b104fd1..ae3e2dd 100644 --- a/app/src/main/java/com/unibuy/smartdevice/HomeActivity.java +++ b/app/src/main/java/com/unibuy/smartdevice/HomeActivity.java @@ -614,6 +614,9 @@ public class HomeActivity extends AppCompatActivityAbstract { protected void onDestroy() { super.onDestroy(); stopOnSwitchFragment(); + if (reportOnScheduler != null) { + reportOnScheduler.shutdown(); + } // ✅ 取消註冊廣告更新監聽 try { unregisterReceiver(adUpdateReceiver); diff --git a/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java index 8e24357..4fd912a 100644 --- a/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java +++ b/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java @@ -483,6 +483,12 @@ public class FontendActivity extends AppCompatActivityAbstract { } idleRunnable = () -> { + // 🚩 若目前處於主控台/管理員模式,則忽略閒置返回待機頁的觸發,並重新計時 + if (!MyApp.getInstance().getSuAccess().isEmpty()) { + getLogs().info("ℹ️ 偵測到當前處於開發者/主控台模式,忽略閒置返回待機頁的觸發。"); + resetIdleTimer(); + return; + } getLogs().info("⚠️ 無操作 3 分鐘,自動返回首頁(清空購物車)"); MyApp.getInstance().getBuyList().clear(); // 🚩 逾時返回首頁時,務必清空購物車,避免機台進入永久忙碌狀態 Intent intent = new Intent(FontendActivity.this, HomeActivity.class); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a83c6a..470811c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -142,7 +142,7 @@ 刷卡機結帳 刷卡機重啟 掃碼頭測試 - 結構設定APP + 下位機設定 下位機檢測 電控器檢測 其他測試