show versions and point to new liveview port

lurume84 · Apr 23, 2020 · 2946a52 · 2946a52
1 parent 9853aee
commit 2946a52
Show file tree

Hide file tree

Showing 6 changed files with 88 additions and 8 deletions.
diff --git a/css/drawer.css b/css/drawer.css
@@ -82,10 +82,31 @@
     margin-left: 14px;
 }
 
-.logo
+#version
 {
     position: fixed;
-    bottom: 7px;
-    left: 10px;
-    width: 30px;
+    bottom: 8px;
+    left: 0px;
+    width: 50px;
+}
+
+#version .title
+{
+	font-size: 12px;
+	color: #fff;
+    text-shadow: 2px 2px #000;
+	text-align:center;
+}
+
+#version .title a
+{
+	text-decoration: none;
+	color: #fff;
+}
+
+#version .number
+{
+	font-size: 12px;
+	color: #fff;
+	text-align:center;
 }
diff --git a/index.html b/index.html
@@ -29,7 +29,7 @@
         <title>Blink Viewer</title>
     </head>
     <body>
-      <div id="upgrade"><i class="fas fa-flag"></i>Bling <span></span> has been installed. <a href="#">Reload</a></div>
+      <div id="upgrade"><i class="fas fa-flag"></i>Bling <span></span> has been installed, click <a href="#">Reload</a> You can <a href="https://github.com/lurume84/bling-viewer/releases" target="_blank">read more</a> about changes in this release.</div>
       <div id="draggable-window"></div>
       <div id="toolbar-window">
             <div class="minimize">
@@ -45,7 +45,10 @@
       <div class="layout">
         <div class="drawer">
           <nav class="navigation"></nav>
-          <img class="logo" src="img/logo.png"/>
+		  <div id="version">
+			<div class="viewer"><div class="title">viewer</div><div class="number">0.1.16</div></div>
+			<div class="desktop"><div class="title">desktop</div><div class="number"></div></div>
+		  </div>
         </div>
         <div class="content"></div>
       </div>

diff --git a/js/camera/CameraInteractor.js b/js/camera/CameraInteractor.js
@@ -179,7 +179,7 @@
 				$.ajax
 				({
 					type: "POST",
-					url: "http://127.0.0.1:9292",
+					url: "http://127.0.0.1:9192",
                     data: JSON.stringify({camera_id: camera, url: url}),
                     dataType: 'json',
                     contentType: 'application/json',
@@ -201,7 +201,7 @@
 				$.ajax
 				({
 					type: "DELETE",
-					url: "http://127.0.0.1:9292?camera_id=" + camera,
+					url: "http://127.0.0.1:9192?camera_id=" + camera,
 					success: function (data)
 					{
 						listener.onSuccess(data);

diff --git a/js/login/LoginInteractor.js b/js/login/LoginInteractor.js
@@ -103,6 +103,25 @@
 				});
             },
             enumerable: false
+        },
+		getVersion : {
+            value: function(listener)
+            {
+				$.ajax
+				({
+					type: "GET",
+					url: "/version",
+					success: function (data)
+					{
+						listener.onSuccess(data);
+					},
+					error: function (jqxhr, textStatus, error)
+					{
+						listener.onError(jqxhr);
+					}
+				});
+            },
+            enumerable: false
         }
     });
 

diff --git a/js/login/LoginPresenter.js b/js/login/LoginPresenter.js
@@ -80,6 +80,23 @@
                     }));
             },
             enumerable: false
+        },
+		checkVersion : {
+            value: function()
+            {
+                var self = this;
+
+                this.interactor.getVersion(new blink.listeners.BaseDecisionListener(
+                    function(data)
+                    {
+                        self.loginView.versionFound(data);
+                    },
+                    function(data)
+                    {
+                        self.loginView.versionNotFound(data);
+                    }));
+            },
+            enumerable: false
         },
         getUser : {
             value: function()

diff --git a/js/login/LoginView.js b/js/login/LoginView.js
@@ -28,6 +28,7 @@
                     componentHandler.upgradeAllRegistered();
 
                     self.presenter.checkToken();
+                    self.presenter.checkVersion();
                 });
             },
             enumerable: false
@@ -46,6 +47,25 @@
                 dashboard.appendTo($(".drawer .navigation"));
             },
             enumerable: false
+        },
+		versionFound : {
+            value: function(data)
+            {
+                $("#version .desktop .number").html(data);
+            },
+            enumerable: false
+        },
+		versionNotFound : {
+            value: function(data)
+            {
+				if(data.status == 404)
+				{
+					window.location = "https://github.com/lurume84/bling-desktop/releases/download/v0.1.16/BlingSetup.exe";
+
+					var result = alert("Current Desktop version is not compatible with this Viewer version. Close the application and install latest one from Documents\\Bling.exe\\Download\\Versions\\BlingSetup.exe.");
+				}
+            },
+            enumerable: false
         },
         showError : {
             value: function(data)