added stt output to always-on view; my-view reload button does hard-reload

Author: fquirin

www/always-on.html

@@ -25,6 +25,7 @@
 						<div id="sepiaFW-alwaysOn-battery"></div>
 					</div>
 				</div>
+				<div id="sepiaFW-alwaysOn-stt-out"></div>
 			</div>
 		</div>
 	</div>

www/css/sepiaFW-alwaysOn.css

@@ -197,4 +197,18 @@
 }
 #sepiaFW-alwaysOn-info-box > div {
 	padding: 4px;
+}
+
+#sepiaFW-alwaysOn-stt-out {
+	height: 42px;
+    width: 100%;
+    text-align: center;
+    color: #aaa;
+    padding: 0px 24px;
+    position: absolute;
+	bottom: 12px;
+	font-size: 18px;
+	overflow: hidden;
+	display: flex;
+    flex-direction: column-reverse;
 }

www/scripts/sepiaFW.alwaysOn.js

@@ -42,6 +42,7 @@ function sepiaFW_build_always_on(){
             onClose: AlwaysOn.onClose,
             //onMessageHandler: AlwaysOn.onMessageHandler,              //TODO: use this?
             onMissedMessageHandler: AlwaysOn.onMissedMessageHandler,
+            onSpeechToTextInputHandler: AlwaysOn.onSpeechToTextInputHandler,
             theme: "dark_full"
         });
     }
@@ -71,6 +72,7 @@ function sepiaFW_build_always_on(){
         $clock = $('#sepiaFW-alwaysOn-clock');
         $notes = $('#sepiaFW-alwaysOn-notifications');
         $battery = $('#sepiaFW-alwaysOn-battery');
+        $sttOut = $('#sepiaFW-alwaysOn-stt-out');
     }
 
     //On open
@@ -149,6 +151,27 @@ function sepiaFW_build_always_on(){
         }
     }
 
+    //STT input handling
+    AlwaysOn.onSpeechToTextInputHandler = function(sttResult){
+        if (sttResult && sttResult.text){
+            if (sttResult.isFinal){
+                console.log('AO saw text: ' + sttResult.text);
+            }else{
+                //console.log('AO saw text: ' + sttResult.text);
+            }
+            $sttOut.html(sttResult.text);
+            if (fadeSttTimer) clearTimeout(fadeSttTimer);
+            $sttOut.stop().show();
+            fadeSttTimer = setTimeout(function(){
+                $sttOut.stop();
+                $sttOut.fadeOut(3000, function(){
+                    $sttOut.html("");
+                });
+            }, 4000);
+        }
+    }
+    var fadeSttTimer;
+
     //Animations and wake controls:
 
     AlwaysOn.onWakeup = function(){
@@ -323,7 +346,7 @@ function sepiaFW_build_always_on(){
         var availableWidth = $('#sepiaFW-alwaysOn-view').width();
         var avatarHeigth = $avatar.height();
         var avatarWidth = $avatar.width();
-        var newTop = getRandomPixel(availableHeight-avatarHeigth);
+        var newTop = getRandomPixel(availableHeight-avatarHeigth-60);
         var newLeft = getRandomPixel(availableWidth-avatarWidth);
         $avatar.css({top: newTop, left: newLeft});
     }

www/scripts/sepiaFW.frames.js

@@ -14,6 +14,7 @@ function sepiaFW_build_frames(){
 	//handlers
 	var onMessageHandler = undefined; 			//should receive a message object
 	var onMissedMessageHandler = undefined;		//should be triggered when a message was not visible for user (e.g. because frame was open)
+	var onSpeechToTextInputHandler = undefined;	//should show text (and optionally interrim results) that are generated by STT engine
 
 	Frames.open = function(info){
 		//callbacks?
@@ -22,6 +23,7 @@ function sepiaFW_build_frames(){
 		onFinishSetup = info.onFinishSetup;
 		onMessageHandler = info.onMessageHandler;
 		onMissedMessageHandler = info.onMissedMessageHandler;
+		onSpeechToTextInputHandler = info.onSpeechToTextInputHandler;
 
 		//theme
 		if (info.theme && info.theme == "dark"){
@@ -70,6 +72,7 @@ function sepiaFW_build_frames(){
 		//handlers reset
 		onMessageHandler = undefined;
 		onMissedMessageHandler = undefined;
+		onSpeechToTextInputHandler = undefined;
 	}
 
 	Frames.setup = function(info, finishCallback){
@@ -134,6 +137,13 @@ function sepiaFW_build_frames(){
 	Frames.handleMissedMessages = function(msgObject){
 		if (onMissedMessageHandler) onMissedMessageHandler(msgObject);
 	}
+
+	Frames.canShowSpeechToTextInput = function(){
+		return !!onSpeechToTextInputHandler;
+	}
+	Frames.handleSpeechToTextInput = function(msgObject){
+		if (onSpeechToTextInputHandler) onSpeechToTextInputHandler(msgObject);
+	}
 
 	return Frames;
 }

www/scripts/sepiaFW.webSocket.js

@@ -348,11 +348,6 @@ function sepiaFW_build_webSocket_client(){
 	//actions triggered when the client becomes active (in this case when the active channel is obtained)
 	Client.onActive = function(){
 		//LOAD SOME MORE STUFF that requires account verification:
-			
-		//refresh timers
-		if (SepiaFW.events){
-			SepiaFW.events.setupTimeEvents();
-		}
 
 		//update myView
 		SepiaFW.ui.updateMyView(false, true, 'onActive');
@@ -732,6 +727,8 @@ function sepiaFW_build_webSocket_client(){
 				$(myEventsBtn).off();
 				$(myEventsBtn).on("click", function () {
 					SepiaFW.animate.flash(this.id);
+					SepiaFW.ui.updateMyView(true, true, 'shortcutsButton');
+					/*
 					var dataset = {};	dataset.info = "direct_cmd";
 						dataset.cmd = "events_personal;;";
 						dataset.newReceiver = SepiaFW.assistant.id;
@@ -741,6 +738,7 @@ function sepiaFW_build_webSocket_client(){
 						options.showView = true;
 						options.skipTTS = true;
 					Client.sendCommand(dataset, options);
+					*/
 					closeControlsMenueWithDelay();
 				});
 			}
@@ -773,6 +771,14 @@ function sepiaFW_build_webSocket_client(){
 		if (optimizeAsrResult && (SepiaFW.speech.language === "de") && text && text.match(/^(GTA|GPA|PPA|WPA|dpa|liebherr)( ).+/ig)){
 			text = text.replace(/^(GTA|GPA|PPA|WPA|dpa|liebherr)( )/i, "Sepia ");
 		}
+
+		//show results in frame as well? (SHOW ONLY!)
+		if (SepiaFW.frames && SepiaFW.frames.isOpen && SepiaFW.frames.canShowSpeechToTextInput()){
+			SepiaFW.frames.handleSpeechToTextInput({
+				"text": text,
+				"isFinal": true
+			});
+		}
 
 		//try speech-bubble
 		var inBox =	document.getElementById('sepiaFW-chat-controls-speech-box-bubble');
@@ -799,6 +805,14 @@ function sepiaFW_build_webSocket_client(){
 		}
 	}
 	Client.asrCallbackInterim = function(text){
+		//show results in frame as well? (SHOW ONLY!)
+		if (SepiaFW.frames && SepiaFW.frames.isOpen && SepiaFW.frames.canShowSpeechToTextInput()){
+			SepiaFW.frames.handleSpeechToTextInput({
+				"text": text,
+				"isFinal": false
+			});
+		}
+
 		//try speech-bubble
 		var inBox =	document.getElementById('sepiaFW-chat-controls-speech-box-bubble');
 		if (inBox){