Merge pull request #13 from CoderJava/hotfix/perbaikan-timer-yang-tidak-sync

CoderJava · web-flow · commit 654b8492380b · 2023-08-06T19:42:01.000+07:00
Hotfix - Perbaikan timer yang tidak sync
diff --git a/assets/images/image_file_not_found.png b/assets/images/image_file_not_found.png
diff --git a/lib/core/util/images.dart b/lib/core/util/images.dart
@@ -9,6 +9,7 @@ class BaseIconTray {
 class BaseImage {
   static const _path = 'assets/images';
   static const imagePlaceholder = '$_path/image_placeholder.jpeg';
+  static const imageFileNotFound = '$_path/image_file_not_found.png';
 }
 
 class BaseAnimation {
diff --git a/lib/core/util/widget_helper.dart b/lib/core/util/widget_helper.dart
@@ -1,10 +1,14 @@
 import 'dart:io';
+import 'dart:math';
 
+import 'package:dipantau_desktop_client/core/util/enum/global_variable.dart';
 import 'package:dipantau_desktop_client/core/util/helper.dart';
+import 'package:dipantau_desktop_client/core/util/shared_preferences_manager.dart';
 import 'package:dipantau_desktop_client/feature/presentation/page/splash/splash_page.dart';
 import 'package:dipantau_desktop_client/injection_container.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:go_router/go_router.dart';
 import 'package:path_provider/path_provider.dart';
 
@@ -182,4 +186,27 @@ class WidgetHelper {
       },
     );
   }
+
+  Future<File> getImageFileFromAssets(String path) async {
+    final byteData = await rootBundle.load(path);
+
+    final directoryPath = await getDirectoryApp('screenshot');
+    var userId = sharedPreferencesManager.getString(SharedPreferencesManager.keyUserId) ?? '';
+    final random = Random();
+    if (userId.isEmpty) {
+      userId = random.nextInt(100).toString();
+    }
+    final strRandomNumber = random.nextInt(100).toString();
+
+    final now = DateTime.now();
+    final timeInMillis = now.millisecondsSinceEpoch;
+    final timeInSeconds = Duration(milliseconds: timeInMillis).inSeconds;
+    final pathString = '${timeInSeconds}_${userId}_${strRandomNumber}_1.jpg';
+    final file = File('$directoryPath/$pathString');
+
+    await file.create(recursive: true);
+    await file.writeAsBytes(byteData.buffer.asUint8List(byteData.offsetInBytes, byteData.lengthInBytes));
+
+    return file;
+  }
 }
diff --git a/lib/feature/presentation/page/home/home_page.dart b/lib/feature/presentation/page/home/home_page.dart
@@ -69,6 +69,7 @@ class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
   final notificationHelper = sl<NotificationHelper>();
   final intervalScreenshot = 60 * 5; // 300 detik (5 menit)
   final listTrackLocal = <Track>[];
+  final listPathStartScreenshots = <String?>[];
 
   var isWindowVisible = true;
   var userId = '';
@@ -84,6 +85,7 @@ class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
   DateTime? startTime;
   DateTime? finishTime;
   DateTime? infoDateTime;
+  DateTime? now;
 
   @override
   void setState(VoidCallback fn) {
@@ -596,7 +598,8 @@ class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
                     }
 
                     if (isPermissionScreenRecordingGranted!) {
-                      final isPermissionAccessibilityGranted = await platformChannelHelper.checkPermissionAccessibility();
+                      final isPermissionAccessibilityGranted =
+                          await platformChannelHelper.checkPermissionAccessibility();
                       if (mounted && isPermissionAccessibilityGranted != null && !isPermissionAccessibilityGranted) {
                         widgetHelper.showDialogPermissionAccessibility(context);
                         return;
@@ -618,8 +621,8 @@ class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
                     } else {
                       isTimerStart = false;
                       itemTask.trackedInSeconds = valueNotifierTaskTracked.value;
-                      finishTime = DateTime.now();
                       stopTimer();
+                      finishTime = DateTime.now();
                       doTakeScreenshot(startTime, finishTime);
                       selectedTask = null;
                     }
@@ -1004,13 +1007,28 @@ class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
     platformChannelHelper.startEventChannel().listen((Object? event) {
       if (event != null) {
         if (event is String) {
-          isHaveActivity = true;
+          final strEvent = event.toLowerCase();
+          if (strEvent == 'triggered') {
+            // update flag activity menjadi true
+            isHaveActivity = true;
+          } else if (strEvent == 'screen_is_locked') {
+            // auto stop timer dan ambil screenshot-nya
+            isTimerStart = false;
+            stopTimer();
+            finishTime = DateTime.now();
+            doTakeScreenshot(startTime, finishTime, isForceStop: true);
+            selectedTask = null;
+            setState(() {});
+          } else if (strEvent == 'screen_is_unlocked') {
+            // muat ulang datanya setelah user unlock screen
+            doLoadData();
+          }
         }
       }
     });
   }
 
-  void doTakeScreenshot(DateTime? startTime, DateTime? finishTime) async {
+  void doTakeScreenshot(DateTime? startTime, DateTime? finishTime, {bool isForceStop = false}) async {
     var percentActivity = 0.0;
     if (counterActivity > 0 && countTimerInSeconds > 0) {
       percentActivity = (counterActivity / countTimerInSeconds) * 100;
@@ -1065,28 +1083,35 @@ class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
 
     final activity = percentActivity.round();
 
-    final listPathScreenshots = await platformChannelHelper.doTakeScreenshot();
-    final isPermissionScreenRecordingGranted = await platformChannelHelper.checkPermissionScreenRecording();
-    if (isPermissionScreenRecordingGranted != null && !isPermissionScreenRecordingGranted) {
-      debugPrint('screen recording not granted');
-      notificationHelper.showPermissionScreenRecordingIssuedNotification();
-      valueNotifierTotalTracked.value -= durationInSeconds;
-      valueNotifierTaskTracked.value -= durationInSeconds;
-      isTimerStart = false;
-      stopTimer();
-      selectedTask = null;
-      setState(() {});
-      return;
-    } else if (listPathScreenshots.isEmpty) {
-      debugPrint('list path screenshots is empty');
-      valueNotifierTotalTracked.value -= durationInSeconds;
-      valueNotifierTaskTracked.value -= durationInSeconds;
-      isTimerStart = false;
-      stopTimer();
-      selectedTask = null;
-      setState(() {});
-      return;
+    final listPathScreenshots = <String?>[];
+    String files;
+    if (!isForceStop) {
+      listPathScreenshots.clear();
+      listPathScreenshots.addAll(await platformChannelHelper.doTakeScreenshot());
+      final isPermissionScreenRecordingGranted = await platformChannelHelper.checkPermissionScreenRecording();
+      if ((isPermissionScreenRecordingGranted != null && !isPermissionScreenRecordingGranted) ||
+          listPathScreenshots.isEmpty) {
+        stopTimer();
+        isTimerStart = false;
+        selectedTask = null;
+        setState(() {});
+        final fileDefaultScreenshot = await widgetHelper.getImageFileFromAssets(BaseImage.imageFileNotFound);
+        listPathScreenshots.add(fileDefaultScreenshot.path);
+      }
+    } else {
+      listPathScreenshots.clear();
+      if (listPathStartScreenshots.isNotEmpty) {
+        listPathScreenshots.addAll(listPathStartScreenshots);
+      } else {
+        stopTimer();
+        isTimerStart = false;
+        selectedTask = null;
+        setState(() {});
+        final fileDefaultScreenshot = await widgetHelper.getImageFileFromAssets(BaseImage.imageFileNotFound);
+        listPathScreenshots.add(fileDefaultScreenshot.path);
+      }
     }
+
     listPathScreenshots.removeWhere((element) => element == null || element.isEmpty);
     if (listPathScreenshots.isNotEmpty) {
       final firstElement = listPathScreenshots.first ?? '';
@@ -1105,7 +1130,7 @@ class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
         );
       }
     }
-    final files = listPathScreenshots.join(',');
+    files = listPathScreenshots.join(',');
 
     final isShowScreenshotNotification =
         sharedPreferencesManager.getBool(SharedPreferencesManager.keyIsEnableScreenshotNotification) ?? false;
@@ -1149,8 +1174,42 @@ class _HomePageState extends State<HomePage> with TrayListener, WindowListener {
   void startTimer() {
     countTimeReminderTrackInSeconds = 0;
     stopTimer();
-    timeTrack = Timer.periodic(const Duration(seconds: 1), (_) {
-      increaseTimerTray();
+
+    now = DateTime.now();
+    platformChannelHelper.checkPermissionScreenRecording().then((isGranted) async {
+      if (isGranted != null && isGranted) {
+        final listPathScreenshots = await platformChannelHelper.doTakeScreenshot();
+        if (listPathScreenshots.isNotEmpty) {
+          listPathStartScreenshots.clear();
+          listPathStartScreenshots.addAll(listPathScreenshots);
+        }
+      }
+    });
+    timeTrack = Timer.periodic(const Duration(milliseconds: 1), (timer) {
+      // intervalnya dibuat milliseconds agar bisa mengikuti dengan date time device-nya.
+      final newNow = DateTime.now();
+      final newNowDate = DateTime(
+        newNow.year,
+        newNow.month,
+        newNow.day,
+        newNow.hour,
+        newNow.minute,
+        newNow.second,
+      );
+      if (now != null) {
+        final nowDate = DateTime(
+          now!.year,
+          now!.month,
+          now!.day,
+          now!.hour,
+          now!.minute,
+          now!.second,
+        );
+        if (!nowDate.isAtSameMomentAs(newNowDate)) {
+          now = newNowDate;
+          increaseTimerTray();
+        }
+      }
     });
   }
 
diff --git a/macos/Runner/AppDelegate.swift b/macos/Runner/AppDelegate.swift
@@ -4,14 +4,14 @@ import FlutterMacOS
 @NSApplicationMain
 class AppDelegate: FlutterAppDelegate, FlutterStreamHandler {
     private var eventSink: FlutterEventSink?
+    private let dnc = DistributedNotificationCenter.default()
     
     override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
         // Set quit while window is minimized
         // return true
         return false
     }
     
-    
     override func applicationDidFinishLaunching(_ notification: Notification) {
         let controller: FlutterViewController = mainFlutterWindow?.contentViewController as! FlutterViewController
         let channel = FlutterMethodChannel.init(name: "dipantau/channel", binaryMessenger: controller.engine.binaryMessenger)
@@ -41,7 +41,7 @@ class AppDelegate: FlutterAppDelegate, FlutterStreamHandler {
                     result(true)
                 }
             } else if ("check_permission_accessibility" == call.method) {
-                var hasAccessibility = AXIsProcessTrusted()
+                let hasAccessibility = AXIsProcessTrusted()
                 if (hasAccessibility) {
                     result(true)
                 } else {
@@ -100,6 +100,7 @@ class AppDelegate: FlutterAppDelegate, FlutterStreamHandler {
     func onListen(withArguments arguments: Any?, eventSink: @escaping FlutterEventSink) -> FlutterError? {
         self.eventSink = eventSink
         setActivityListener()
+        setScreenLockedListener()
         return nil
     }
     
@@ -108,6 +109,23 @@ class AppDelegate: FlutterAppDelegate, FlutterStreamHandler {
         return nil
     }
     
+    func setScreenLockedListener() {
+        dnc.addObserver(forName: .init("com.apple.screenIsLocked"), object: nil, queue: .main) { _ in
+            guard let eventSink = self.eventSink else {
+                return
+            }
+            
+            eventSink("screen_is_locked")
+        }
+        dnc.addObserver(forName: .init("com.apple.screenIsUnlocked"), object: nil, queue: .main) { _ in
+            guard let eventSink = self.eventSink else {
+                return
+            }
+            
+            eventSink("screen_is_unlocked")
+        }
+    }
+    
     func setActivityListener() {
         NSEvent.addGlobalMonitorForEvents(matching: [NSEvent.EventTypeMask.keyDown, NSEvent.EventTypeMask.leftMouseDown, NSEvent.EventTypeMask.rightMouseDown, NSEvent.EventTypeMask.leftMouseDragged, NSEvent.EventTypeMask.rightMouseDragged], handler: {(event: NSEvent) in
             guard let eventSink = self.eventSink else {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ class BaseIconTray {`
`9`	`9`	`class BaseImage {`
`10`	`10`	`static const _path = 'assets/images';`
`11`	`11`	`static const imagePlaceholder = '$_path/image_placeholder.jpeg';`
	`12`	`+ static const imageFileNotFound = '$_path/image_file_not_found.png';`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`class BaseAnimation {`