Fix count down #185

davidmigloz · Feb 2, 2017 · 1c16b74 · 1c16b74
1 parent 262e8cd
commit 1c16b74
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -169,6 +169,7 @@ sonarqube {
     properties {
         property "sonar.projectName", "GoBees"
         property "sonar.projectKey", "com.davidmiguel.gobees"
+        property "sonar.language", "java"
         property "sonar.projectVersion", "${android.defaultConfig.versionName}"
         property "sonar.exclusions", "**/*.png,**/*.jpg"
         property "sonar.android.lint.report", "./build/outputs/lint-results-mockDebug.xml"

diff --git a/app/src/main/java/com/davidmiguel/gobees/monitoring/MonitoringContract.java b/app/src/main/java/com/davidmiguel/gobees/monitoring/MonitoringContract.java
@@ -61,7 +61,7 @@ interface View extends BaseView<MonitoringContract.Presenter> {
          *
          * @param ms monitoring settings.
          */
-        void startMonitoringgService(MonitoringSettings ms);
+        void startMonitoringService(MonitoringSettings ms);
 
         /**
          * Stops monitoring service.

diff --git a/app/src/main/java/com/davidmiguel/gobees/monitoring/MonitoringFragment.java b/app/src/main/java/com/davidmiguel/gobees/monitoring/MonitoringFragment.java
@@ -169,6 +169,7 @@ public void onFailure() {
                 });
                 // Set chronometer
                 chronometer.setBase(mService.getStartTime());
+                chronometer.setVisibility(View.VISIBLE);
                 chronometer.start();
             }
 
@@ -244,7 +245,7 @@ public void run() {
     }
 
     @Override
-    public void startMonitoringgService(MonitoringSettings ms) {
+    public void startMonitoringService(MonitoringSettings ms) {
         // Start service
         Intent intent = new Intent(getActivity(), MonitoringService.class);
         intent.setAction(MonitoringService.START_ACTION);

diff --git a/app/src/main/java/com/davidmiguel/gobees/monitoring/MonitoringPresenter.java b/app/src/main/java/com/davidmiguel/gobees/monitoring/MonitoringPresenter.java
@@ -71,7 +71,7 @@ public void startMonitoring() {
         // Show monitoring view
         view.showMonitoringView();
         // Start recording service
-        view.startMonitoringgService(ms);
+        view.startMonitoringService(ms);
         // Bind to service
         view.bindMonitoringService();
     }

diff --git a/app/src/main/java/com/davidmiguel/gobees/monitoring/MonitoringService.java b/app/src/main/java/com/davidmiguel/gobees/monitoring/MonitoringService.java
@@ -146,6 +146,10 @@ public int onStartCommand(Intent intent, int flags, int startId) {
 
         // START action
         if (intent.getAction().equals(START_ACTION)) {
+            // Calculate start time (to be use in chronometer)
+            Date now = new Date();
+            long elapsedRealTimeOffset = System.currentTimeMillis() - SystemClock.elapsedRealtime();
+            startTime = now.getTime() - elapsedRealTimeOffset;
             // Get monitoring config
             monitoringSettings =
                     (MonitoringSettings) intent.getSerializableExtra(ARGUMENT_MON_SETTINGS);
@@ -230,10 +234,6 @@ public boolean isOpenCvLoaded() {
     public void onCameraStarted(int width, int height) {
         // Counter for creating background model with the first frames
         initialNumFrames = 0;
-        // Calculate start time (to be use in chronometer)
-        Date now = new Date();
-        long elapsedRealtimeOffset = System.currentTimeMillis() - SystemClock.elapsedRealtime();
-        startTime = now.getTime() - elapsedRealtimeOffset;
     }
 
     @Override
@@ -294,6 +294,8 @@ private void configCamera() {
     private Notification configNotification() {
         // Intent to the monitoring activity (when the notification is clicked)
         Intent monitoringIntent = new Intent(this, MonitoringActivity.class);
+        monitoringIntent.putExtra(MonitoringFragment.ARGUMENT_APIARY_ID,
+                monitoringSettings.getApiaryId());
         monitoringIntent.putExtra(MonitoringFragment.ARGUMENT_HIVE_ID,
                 monitoringSettings.getHiveId());
         PendingIntent pMonitoringIntent = PendingIntent.getActivity(this, 0,

diff --git a/app/src/main/res/layout/monitoring_frag.xml b/app/src/main/res/layout/monitoring_frag.xml
@@ -58,7 +58,8 @@
             android:layout_marginTop="24dp"
             android:textAlignment="center"
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="@color/colorCameraControlsIcons"/>
+            android:textColor="@color/colorCameraControlsIcons"
+            android:visibility="invisible"/>
     </LinearLayout>
 
 

diff --git a/app/src/test/java/com/davidmiguel/gobees/monitoring/MonitoringPresenterTest.java b/app/src/test/java/com/davidmiguel/gobees/monitoring/MonitoringPresenterTest.java
@@ -65,7 +65,7 @@ public void onStartClicked_startMonitoring() {
         // Config view and start monitoring
         verify(view).hideCameraView();
         verify(view).showMonitoringView();
-        verify(view).startMonitoringgService(eq(monitoringSettings));
+        verify(view).startMonitoringService(eq(monitoringSettings));
         verify(view).bindMonitoringService();
     }