APPLINK-8120: HMI matrix implementedSNAPSHOT_PASA17072014

3 files changed, 35 insertions, 24 deletions

diff --git a/src/components/HMI/app/controller/sdl/Controller.js b/src/components/HMI/app/controller/sdl/Controller.js
index 5665c6d4ac..a702114429 100644
--- a/src/components/HMI/app/controller/sdl/Controller.js
+++ b/src/components/HMI/app/controller/sdl/Controller.js
@@ -504,6 +504,7 @@ SDL.SDLController = Em.Object
             FFW.UI.sendUIResult(result,
                 FFW.UI.performAudioPassThruRequestID,
                 "UI.PerformAudioPassThru");
+            FFW.UI.performAudioPassThruRequestID = -1;
         },
         /**
          * Method close PerformAudioPassThruPopUp and call error response from
@@ -519,6 +520,7 @@ SDL.SDLController = Em.Object
                 FFW.UI.performAudioPassThruRequestID,
                 "UI.PerformAudioPassThru",
                 "PerformAudioPassThru was not completed successfuly!");
+            FFW.UI.performAudioPassThruRequestID = -1;
         },
         /**
          * Method to set language for UI component with parameters sent from
diff --git a/src/components/HMI/app/model/sdl/Model.js b/src/components/HMI/app/model/sdl/Model.js
index f5c564127b..1596916b58 100644
--- a/src/components/HMI/app/model/sdl/Model.js
+++ b/src/components/HMI/app/model/sdl/Model.js
@@ -994,10 +994,11 @@ SDL.SDLModel = Em.Object.create({
             } else {
                 SDL.ScrollableMessage.activate(SDL.SDLController.getApplicationModel(request.params.appID).appName, request.params, messageRequestId);
             }
+            return true;
         } else {
             FFW.UI.sendError(SDL.SDLModel.resultCode["REJECTED"], request.id, request.method, 'Higher priority request is being processed on HMI!');
+            return false;
         }
-
     },
 
     /**
@@ -1135,8 +1136,10 @@ SDL.SDLModel = Em.Object.create({
 
         if (!SDL.AlertPopUp.active) {
             SDL.AlertPopUp.AlertActive(message, alertRequestId);
+            return true;
         } else {
             SDL.SDLController.alertResponse(this.resultCode['REJECTED'], alertRequestId);
+            return false;
         }
     },
 
@@ -1150,21 +1153,22 @@ SDL.SDLModel = Em.Object.create({
 
         if (!SDL.SDLController.getApplicationModel(message.params.appID).activeRequests.uiPerformInteraction) {
             SDL.SDLController.getApplicationModel(message.params.appID).activeRequests.uiPerformInteraction = message.id;
-        } else {
-            SDL.SDLController.interactionChoiseCloseResponse(message.params.appID, SDL.SDLModel.resultCode['REJECTED']);
-            return;
-        }
 
-        if (message.params && message.params.vrHelpTitle && message.params.vrHelp) {
+            if (message.params && message.params.vrHelpTitle && message.params.vrHelp) {
 
-            SDL.SDLModel.set('interactionData.vrHelpTitle', message.params.vrHelpTitle);
-            SDL.SDLModel.set('interactionData.vrHelp', message.params.vrHelp);
-        }
+                SDL.SDLModel.set('interactionData.vrHelpTitle', message.params.vrHelpTitle);
+                SDL.SDLModel.set('interactionData.vrHelp', message.params.vrHelp);
+            }
 
-       // if (message.params.choiceSet || message.params.interactionLayout == "KEYBOARD") {
             SDL.InteractionChoicesView.activate(message);
             SDL.SDLController.VRMove();
-        //}
+
+            return true;
+        } else {
+
+            FFW.UI.sendError(SDL.SDLModel.resultCode['REJECTED'], message.id, message.method, "UI PerformInterection REJECTED on HMI");
+            return false;
+        }
     },
 
     /**
@@ -1178,7 +1182,7 @@ SDL.SDLModel = Em.Object.create({
         if (!SDL.SDLModel.vrActiveRequests.vrPerformInteraction) {
             SDL.SDLModel.vrActiveRequests.vrPerformInteraction = message.id;
         } else {
-            SDL.SDLController.vrInteractionResponse(SDL.SDLModel.resultCode['REJECTED']);
+            FFW.VR.sendError(SDL.SDLModel.resultCode['REJECTED'], message.id, message.method, "VR PerformInterection REJECTED on HMI")
             return;
         }
 
diff --git a/src/components/HMI/ffw/UIRPC.js b/src/components/HMI/ffw/UIRPC.js
index a690d80e36..400f35d1c8 100644
--- a/src/components/HMI/ffw/UIRPC.js
+++ b/src/components/HMI/ffw/UIRPC.js
@@ -168,9 +168,9 @@ FFW.UI = FFW.RPCObserver.create({
                 case "UI.Alert":
                 {
 
-                    SDL.SDLModel.onUIAlert(request.params, request.id);
-
-                    SDL.SDLController.onSystemContextChange(request.params.appID);
+                    if (SDL.SDLModel.onUIAlert(request.params, request.id)) {
+                        SDL.SDLController.onSystemContextChange(request.params.appID);
+                    }
 
                     break;
                 }
@@ -230,9 +230,9 @@ FFW.UI = FFW.RPCObserver.create({
                 case "UI.PerformInteraction":
                 {
 
-                    SDL.SDLModel.uiPerformInteraction(request);
-
-                    SDL.SDLController.onSystemContextChange();
+                    if (SDL.SDLModel.uiPerformInteraction(request)) {
+                        SDL.SDLController.onSystemContextChange();
+                    }
 
                     break;
                 }
@@ -260,9 +260,9 @@ FFW.UI = FFW.RPCObserver.create({
                 case "UI.ScrollableMessage":
                 {
 
-                    SDL.SDLModel.onSDLScrolableMessage(request, request.id);
-
-                    SDL.SDLController.onSystemContextChange();
+                    if (SDL.SDLModel.onSDLScrolableMessage(request, request.id)) {
+                        SDL.SDLController.onSystemContextChange();
+                    }
 
                     break;
                 }
@@ -775,10 +775,15 @@ FFW.UI = FFW.RPCObserver.create({
                 case "UI.PerformAudioPassThru":
                 {
 
-                    this.performAudioPassThruRequestID = request.id;
-                    SDL.SDLModel.UIPerformAudioPassThru(request.params);
+                    if (this.performAudioPassThruRequestID > 0) {
+                        this.sendError(SDL.SDLModel.resultCode["REJECTED"], request.id, request.method, 'PerformAudioPassThru request aborted!');
+                    } else {
+
+                        this.performAudioPassThruRequestID = request.id;
+                        SDL.SDLModel.UIPerformAudioPassThru(request.params);
 
-                    SDL.SDLController.onSystemContextChange();
+                        SDL.SDLController.onSystemContextChange();
+                    }
 
                     break;
                 }