#155 - for Android only - added exit app on background option, default on

Former-commit-id: 3b67465e4358895d6d7bf3967dba9aafd5141c9a

5 files changed, 33 insertions, 4 deletions

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index a11a0998..b1d5b578 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -63,6 +63,7 @@ angular.module('zmApp.controllers')
          'montageSize':'3',
          'useNphZms':true,
          'packMontage':true,
+         'exitOnSleep':true,
          
         
     };
@@ -242,6 +243,13 @@ angular.module('zmApp.controllers')
                     loginData.packMontage  = true;
                 }
                 
+                
+                if (typeof loginData.exitOnSleep == 'undefined')
+                {
+                    zmDebug ("exitOnSleep does not exist. Setting to true");
+                    loginData.exitOnSleep  = true;
+                }
+                
                 zmLog ("DataModel init recovered this loginData as " + JSON.stringify(loginData));
             }
             else
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index ddd667e6..9d2d4857 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -168,18 +168,24 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     $scope.datetimeValue.value = tdatetimeValue; 
     
     
+    $scope.dateChanged = function()
+    {
+        window.stop();
+        footerCollapse();
+    };
+    
     //console.log ("******************WATCHING ****************");
-    $scope.$watch('datetimeValue.value', function(oldv,newv) {
+    /*$scope.$watch('datetimeValue.value', function(oldv,newv) {
         if (newv !== oldv)
         {
-            ZMDataModel.zmLog(">>>>>>>>>>>>>>>>>>Datetime value changed to " + $scope.datetimeValue.value);
+            ZMDataModel.zmLog("Datetime value changed to " + $scope.datetimeValue.value);
             window.stop();
             footerCollapse();
         }
         
         //window.stop();
         ///footerCollapse();
-   },true);
+   },true);*/
     
     
     $scope.displayDateTimeSliders = true;
diff --git a/www/js/app.js b/www/js/app.js
index c3cd856a..0322d456 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -956,8 +956,16 @@ angular.module('zmApp', [
 
                 ZMDataModel.zmLog("Stopping network pull...");
                 window.stop();
+            
                 
                 var ld = ZMDataModel.getLogin();
+                
+                if (ld.exitOnSleep && $rootScope.platformOS == "android")
+                {
+                    ZMDataModel.zmLog("user exited app");
+                    ionic.Platform.exitApp();   
+                }
+                
                 if ($rootScope.apnsToken && ld.isUseEventServer == "1") {
                     //  ZMDataModel.zmDebug("sending enable push to Event Server");
                     //EventServer.sendMessage('push', {type:'control',enablepush:'1'});
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 2d267436..527a4f4f 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -24,6 +24,13 @@
                 </label>
             </div>
             
+            <div ng-if="$root.platformOS=='android'">
+                <label>
+                    <ion-toggle ng-model="loginData.exitOnSleep"
+                                ng-checked="{{loginData.exitOnSleep}}"
+                                toggle-class="toggle-calm">exit app in background</ion-toggle>
+                </label>
+            </div>
             
             <label>
                 <ion-toggle ng-model="loginData.useNphZms"
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index 6a935c15..d895457a 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -44,7 +44,7 @@
             
             
             
-            <div  class="timeline_text" ion-datetime-picker ng-model="datetimeValue.value" >
+            <div  class="timeline_text" ion-datetime-picker ng-model="datetimeValue.value" ng-change="dateChanged()">
                     <b>Tap to change: {{datetimeValue.value | date: "yyyy-MMM-dd hh:mma"}}  @ {{sliderVal.rate}}x</b>
                     
                 </div>