Preparation for automatic websocket server time

Author: gizmocuz

push/WebsocketPush.cpp

@@ -119,5 +119,5 @@ void CWebSocketPush::OnNotificationReceived(const std::string & Subject, const s
 	}
 
 	// push message to websocket
-	m_sock->OnMessage(Subject, Text, ExtraData, Priority, Sound, bFromNotification);
+	m_sock->SendNotification(Subject, Text, ExtraData, Priority, Sound, bFromNotification);
 }

webserver/WebsocketHandler.cpp

@@ -169,7 +169,7 @@ namespace http {
 			}
 		}
 
-		void CWebsocketHandler::OnMessage(const std::string &Subject, const std::string &Text, const std::string &ExtraData, const int Priority, const std::string &Sound, const bool bFromNotification)
+		void CWebsocketHandler::SendNotification(const std::string &Subject, const std::string &Text, const std::string &ExtraData, const int Priority, const std::string &Sound, const bool bFromNotification)
 		{
 			Json::Value json;
 
@@ -184,5 +184,17 @@ namespace http {
 			MyWrite(response);
 		}
 
+		void CWebsocketHandler::SendDateTime(const std::string& ServerTime, const std::string& Sunrise, const std::string& Sunset)
+		{
+			Json::Value json;
+
+			json["event"] = "date_time";
+			json["ServerTime"] = ServerTime;
+			json["Sunrise"] = Sunrise;
+			json["Sunset"] = Sunset;
+			std::string response = json.toStyledString();
+			MyWrite(response);
+		}
+
 	}
 }

webserver/WebsocketHandler.h

@@ -18,7 +18,8 @@ namespace http {
 			virtual void Start();
 			virtual void Stop();
 			virtual void OnDeviceChanged(const uint64_t DeviceRowIdx);
-			virtual void OnMessage(const std::string &Subject, const std::string &Text, const std::string &ExtraData, const int Priority, const std::string &Sound, const bool bFromNotification);
+			virtual void SendNotification(const std::string& Subject, const std::string& Text, const std::string& ExtraData, const int Priority, const std::string& Sound, const bool bFromNotification);
+			virtual void SendDateTime(const std::string& ServerTime, const std::string& Sunrise, const std::string& Sunset);
 			virtual void store_session_id(const request &req, const reply &rep);
 		protected:
 			boost::function<void(const std::string &packet_data)> MyWrite;

www/app/livesocket.js

@@ -94,6 +94,10 @@ define(['app', 'angular-websocket'], function (app) {
 						case "notification":
 							notifyBrowser.notify(msg.Subject, msg.Text);
 							return;
+						case "date_time":
+							//alert("ServerTime: " + msg.ServerTime + ", Sunrise: " + msg.Sunrise + ", Sunset: " + msg.Sunset);
+							$rootScope.SetTimeAndSun(msg.Sunrise, msg.Sunset, msg.ServerTime);
+							return;
 					}
 					var requestid = msg.requestid;
 					if (requestid >= 0) {