Changeset 129

Timestamp:

Jul 20, 2021, 11:08:27 AM (3 years ago)

Author:

chronos

Message:

• Added: Webcam video archive list for previous days.
• Fixed: Link to 4net.tv.

Location:

trunk

Files:

• Modules/ZdechovNET/UIPTVPage.pas (modified) (1 diff)
• Modules/ZdechovNET/UInternetPage.pas (modified) (1 diff)
• Modules/ZdechovNET/UWebCamPage.lfm (modified) (1 diff)
• Modules/ZdechovNET/UWebCamPage.pas (modified) (7 diffs)
• ZdechovNET.lpi (modified) (1 diff)

trunk/Modules/ZdechovNET/UIPTVPage.pas

@@ -258 +258 @@
       '<li>lze spárovat až 4 zařízení na jeden účet</li>' +
       '<li>vyzkoušení na měsíc zdarma</li>' +
-      '<li>převzaté vysílání zajišťuje společnost <a href="www.4net.tv">4NET.TV services s.r.o.</a></li>' +
+      '<li>převzaté vysílání zajišťuje společnost <a href="https://www.4net.tv">4NET.TV services s.r.o.</a></li>' +
       '<li>pro provoz služby stačí i nejnižší internetový tarif Internet 20M za 190 Kč/měsíc</li>' +
       '</ul><br/>' +

trunk/Modules/ZdechovNET/UInternetPage.pas

@@ -42 +42 @@
 
       '<table class="WideTable">' +
-      '<tr><th>Označení</th><th>Minimální rychlost</th><th>Běžně dostupná</th><th>Maximální rychlost</th><th>Bonusová rychlost</th><th>Cena</th></tr>' +
+      '<tr><th>Označení</th><th>Minimální rychlost</th><th>Běžně dostupná rychlost</th><th>Maximální rychlost</th><th>Bonusová rychlost</th><th>Cena</th></tr>' +
       '<tr><td>Zdarma</td><td align="center">0</td><td align="center">&nbsp;</td><td align="center">256 kbit/s</td><td align="center">&nbsp;</td><td align="center">0 Kč</td></tr>' +
       '<tr><td>Internet 20M</td><td align="center">6 Mbit/s</td><td align="center">12 Mbit/s</td><td align="center">20 Mbit/s</td><td align="center">140 Mbit/s</td><td align="center">190 Kč</td></tr>' +

trunk/Modules/ZdechovNET/UWebCamPage.lfm

@@ -3 +3 @@
   Caption = 'Webové kamery'
   OnProduce = DataModuleProduce
-  Height = 50
-  HorizontalOffset = 259
-  VerticalOffset = 250
-  Width = 50
+  Height = 75
+  HorizontalOffset = 389
+  VerticalOffset = 375
+  Width = 75
+  PPI = 144
 end

trunk/Modules/ZdechovNET/UWebCamPage.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, UWebPage, UHTTPServer, UHtmlClasses, USqlDatabase,
-  UModuleUser;
+  UModuleUser, DateUtils;
 
 type
@@ -16 +16 @@
     procedure DataModuleProduce(HandlerData: THTTPHandlerData);
   private
-    { private declarations }
+    function GetVideoArchive(Id: string): string;
   public
     ModuleUser: TModuleUser;
@@ -63 +63 @@
       end;
 
-      if CameraId >= 0 then IdParam := '&Id=' + IntToStr(CameraId)
+      if CameraId >= 0 then IdParam := '&Id=' + IntToStr(CameraId)
         else IdParam := '';
       Text := Text + '<table style="width: 100%"><tr><td style="width: 20%" valign="top">' +
@@ -79 +79 @@
         Database.Query(DbRows, 'SELECT * FROM `Webcam` WHERE `Enabled`=1');
         for I := 0 to DbRows.Count - 1 do begin
-          Text := Text + '<a href="?Id=' + DbRows[I].Values['Id'] + '&W=' + IntToStr(ImageWidth) +
+          Text := Text + '<a href="?Id=' + DbRows[I].Values['Id'] + '&amp;W=' + IntToStr(ImageWidth) +
           '">' + DbRows[I].Values['Name'] + '</a><br/>';
         end;
@@ -87 +87 @@
 
       Text := Text + '<br/><strong>Kamery v okolí:</strong><br />' +
-        '<a href="http://www.mestovsetin.cz/vismo/dokumenty2.asp?id_org=18676&id=480245">Vsetínské kamery</a><br />' +
-        '<a href="http://www.huslenky.cz/?page=kamery&I=2">Kamery v Huslenkách</a><br/>' +
+        '<a href="http://www.mestovsetin.cz/vismo/dokumenty2.asp?id_org=18676&amp;id=480245">Vsetínské kamery</a><br />' +
+        '<a href="https://www.huslenky.cz/webkamery%2Dhuslenky/ds-1119/archiv=0&amp;p1=1020">Kamery v Huslenkách</a><br/>' +
         '<a href="http://kamery.hovnet.cz/">Kamery v Hovnetu</a><br/>' +
         '</td><td style="width: 80%" valign="top">';
@@ -121 +121 @@
           ImageHeight := Round(ImageWidth * StrToInt(DbRows[0].Values['Height']) / StrToInt(DbRows[0].Values['Width']));
 
-        if FileExists(WebCamImage) then begin
-        DateTimeToString(LastFileDate, 'hh:mm:ss d.m.yyyy', FileDateToDateTime(FileAge(WebCamImage)));
-        Text := Text + '<script language="JavaScript">' + #13#10 +
-        '  var ImageURL= "' + NavigationLink('/' + WebCamImage) + '";' + #13#10 +
-        '' + #13#10 +
-        '// Force an immediate image load' + #13#10 +
-        'var theTimer = setTimeout("reloadImage()", 1);' + #13#10 +
-        '' + #13#10 +
-        'function reloadImage()' + #13#10 +
-        '{' + #13#10 +
-        '  theDate = new Date();' + #13#10 +
-        '  var url = ImageURL;' + #13#10 +
-        '  url += "?dummy=";' + #13#10 +
-        '  url += theDate.getTime().toString(10);' + #13#10 +
-        '  // The above dummy cgi-parameter enforce a bypass of the browser image cache.' + #13#10 +
-        '  // Here we actually load the image' + #13#10 +
-        '  document.theImage.src = document.theImageTemp.src;' + #13#10 +
-        '  document.theImageTemp.src = url;' + #13#10 +
-        '' + #13#10 +
-        '  // Reload the image every defined period' + #13#10 +
-        '  theTimer = setTimeout("reloadImage()", ' + IntToStr(RefreshInterval * 1000) + ');' + #13#10 +
-        '}' + #13#10 +
-        '</script>' + #13#10 +
-
-        '<br /><div align="center">' + DbRows[0].Values['Name'] + '<br/>' +
-        '<img name="theImageTemp" src="' + NavigationLink('/' + WebCamImage) + '" width="0" height="0" alt="Temp image"/>' +
-        '<img name="theImage" src="' + NavigationLink('/' + WebCamImage) + '" width="' + IntToStr(ImageWidth) +
-        '" height="' + IntToStr(ImageHeight) + '" alt="' +
-        DbRows[0].Values['Name'] + '"/><br/>Aktualizace: <span id="lasttime">' +
-          LastFileDate + '</span>, Perioda: ' +
-          IntToStr(RefreshInterval) + ' sekund, Typ: ' + DbRows[0].Values['DeviceType'] + '<br />' +
-          '<br/>' + DbRows[0].Values['Description'] + '</div>';
-        end else Text := Text + '<br />Obrázek nenalezen.<br /><br />';
+          if FileExists(WebCamImage) then begin
+            DateTimeToString(LastFileDate, 'hh:mm:ss d.m.yyyy', FileDateToDateTime(FileAge(WebCamImage)));
+            Text := Text + '<script language="JavaScript">' + #13#10 +
+            '  var ImageURL= "' + NavigationLink('/' + WebCamImage) + '";' + #13#10 +
+            '' + #13#10 +
+            '// Force an immediate image load' + #13#10 +
+            'var theTimer = setTimeout("reloadImage()", 1);' + #13#10 +
+            '' + #13#10 +
+             'function reloadImage()' + #13#10 +
+            '{' + #13#10 +
+            '  theDate = new Date();' + #13#10 +
+            '  var url = ImageURL;' + #13#10 +
+            '  url += "?dummy=";' + #13#10 +
+            '  url += theDate.getTime().toString(10);' + #13#10 +
+            '  // The above dummy cgi-parameter enforce a bypass of the browser image cache.' + #13#10 +
+            '  // Here we actually load the image' + #13#10 +
+            '  document.theImage.src = document.theImageTemp.src;' + #13#10 +
+            '  document.theImageTemp.src = url;' + #13#10 +
+            '' + #13#10 +
+            '  // Reload the image every defined period' + #13#10 +
+            '  theTimer = setTimeout("reloadImage()", ' + IntToStr(RefreshInterval * 1000) + ');' + #13#10 +
+            '}' + #13#10 +
+            '</script>' + #13#10 +
+
+            '<br /><div align="center">' + DbRows[0].Values['Name'] + '<br/>' +
+            '<img name="theImageTemp" src="' + NavigationLink('/' + WebCamImage) + '" width="0" height="0" alt="Temp image"/>' +
+            '<img name="theImage" src="' + NavigationLink('/' + WebCamImage) + '" width="' + IntToStr(ImageWidth) +
+            '" height="' + IntToStr(ImageHeight) + '" alt="' +
+            DbRows[0].Values['Name'] + '"/></div>';
+          end else Text := Text + '<br />Obrázek nenalezen.<br /><br />';
+          Text := Text + '<br/><div align="center">';
+          if LastFileDate <> '' then Text := Text + 'Aktualizace: <span id="lasttime">' +
+            LastFileDate + '</span>, ';
+          Text := Text + 'Perioda: ' + IntToStr(RefreshInterval) + ' sekund, Typ: ' + DbRows[0].Values['DeviceType'] + '<br />' +
+            '<br/>' + DbRows[0].Values['Description'];
+          Text := Text + GetVideoArchive(DbRows[0].Values['Id']) + '</div>';
         end else Text := Text + '<br />Id kamery nenalezeno.<br/><br>';
       finally
@@ -164 +167 @@
 end;
 
+function TWebCamPage.GetVideoArchive(Id: string): string;
+var
+  I: Integer;
+  Items: TStringList;
+  DateStr: string;
+  VideoPathFormat: string;
+  Date: TDateTime;
+  Video: string;
+const
+  OneDay = 24 * OneHour;
+begin
+  Result := '';
+  VideoPathFormat := 'images/webcam_archive/%s/%s/video.mp4';
+  Items := TStringList.Create;
+  Date := Now - OneDay;
+  repeat
+    DateStr := FormatDateTime('yyyy-mm-dd', Date);
+    Video := Format(VideoPathFormat, [DateStr, Id]);
+    if FileExists(Video) then begin
+      Items.Add(DateStr + Items.NameValueSeparator + Video);
+      Date := Date - OneDay;
+      Continue;
+    end else Break;
+  until False;
+
+  if Items.Count > 0 then begin
+    Result := '<br/>Video archív: <select name="dates" id="dates">';
+    for I := 0 to Items.Count - 1 do begin
+      Result := Result + '<option value="' + NavigationLink('/' + Items.ValueFromIndex[I]) + '">' + Items.Names[I] + '</option>';
+    end;
+    Result := Result + '</select>';
+    Result := Result + ' <button onclick="var element = document.getElementById(''dates''); window.open(element.value, ''_blank'')">Zobrazit</button>';
+  end;
+
+  Items.Free;
+end;
+
 end.
 

trunk/ZdechovNET.lpi

@@ -244 +244 @@
         <Filename Value="Modules/ZdechovNET/UWebCamPage.pas"/>
         <IsPartOfProject Value="True"/>
-        <HasResources Value="True"/>
+        <ComponentName Value="WebCamPage"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="DataModule"/>
       </Unit22>
       <Unit23>