diff --git a/CSS/index/lens.css b/CSS/index/lens.css index 866c5cf..1894d2c 100644 --- a/CSS/index/lens.css +++ b/CSS/index/lens.css @@ -73,7 +73,10 @@ #my_lens_account_icon img { width: 4em; + /* height: 4em; */ padding: 1em; + /* border-radius: 100%; */ + /* border: 0.25em solid rgba(0, 0, 0, 0.2); */ } #area_lens_content { @@ -83,19 +86,44 @@ display: grid; grid-template-columns: repeat(auto-fill, minmax(15em, 1fr)); - grid-auto-rows: 1em; - column-gap: 1px; + grid-auto-rows: 0.5; + column-gap: 2px; + row-gap: 2px; - border: 1px solid #000; + /* border: 1px solid #000; */ } #area_lens_content .lens_content { - - padding: 0.5em; grid-row-start: auto; - border: 1px solid red; word-break: break-all; word-wrap: break-word; + text-align: center; +} + +#area_lens_content .lens_content img { + width: 98%; + margin: auto; + /* border: 0.1em solid rgba(0, 0, 0, 0.2); */ + border-radius: 1em; +} + +#area_lens_content .lens_content .img_tag { + text-align: left; + width: 95%; + margin: auto; +} + +#area_lens_content .lens_content .img_tag span { + padding: 1px 10px; + border: 2px solid #999; + border-radius: 1em; + color: #FFFFFF; + background: rgba(0, 0, 0, 0.2); + word-break: keep-all; + word-wrap: normal; + display: inline-block; + margin: 1px auto; + font-size: 0.75em; } @media screen and (max-width: 750px) { @@ -111,6 +139,7 @@ padding: 0.5em; } #area_lens_content { + width: 99%; grid-template-columns: repeat(auto-fill, minmax(8em, 1fr)); } } \ No newline at end of file diff --git a/JS/General/navigation_bar.js b/JS/General/navigation_bar.js index d4213a4..569a88f 100644 --- a/JS/General/navigation_bar.js +++ b/JS/General/navigation_bar.js @@ -19,4 +19,6 @@ function navigation_bar_onclick() { $('#main_content_table').css('margin-left', '-400%'); }); + + } \ No newline at end of file diff --git a/JS/INDEX/index.js b/JS/INDEX/index.js index 3cb556f..dd2e548 100644 --- a/JS/INDEX/index.js +++ b/JS/INDEX/index.js @@ -29,6 +29,10 @@ window.onload = function() { asyncFunction(); lensLayout(); + + $(window).resize(function() { + lensLayout(); + }); } async function asyncFunction() { diff --git a/JS/INDEX/lens.js b/JS/INDEX/lens.js index 17b7e77..7276332 100644 --- a/JS/INDEX/lens.js +++ b/JS/INDEX/lens.js @@ -1,17 +1,36 @@ function lensLayout() { let Client_Width = $('.lens_content')[0].clientWidth; + $('.lens_content:eq(0)').css('display', 'none'); + $.getJSON('../../JSON/LAYOUT/lens_image.json', function(data) { - for(let i = 0; i < 100; i++) { + data.sort(function() { + return Math.random() - 0.5; + }) - let randomNum = Math.random() * (50 - 10) + 10; - randomNum = Math.floor(randomNum) + $('#area_lens_content').html("") + for(let i = 0; i < data.length; i++) { - $('#area_lens_content').html( - $('#area_lens_content').html() - + '

' + randomNum + '

' - ); - } -} + img_src = `./MATERIALS/LENS/${data[i]['name']}` + img_h = data[i]['height'] + img_w = data[i]['width'] + newHeight = img_h * (Client_Width / img_w) * 0.625 + img_tag = data[i]['img-tag'] + + $('#area_lens_content').html( + $('#area_lens_content').html() + + '
' + + '' + + '

' + + '' + img_tag[0] + ' ' + + '' + img_tag[1] + ' ' + + '' + img_tag[2] + ' ' + + '

' + ); -//

1

\ No newline at end of file + console.log($('.lens_content:eq(' + i + ') img').css('height')) + + $('.lens_content:eq(' + i + ')').css("grid-row-end", `span ${Math.floor(newHeight) + 1}`); + } + }); +} \ No newline at end of file diff --git a/JSON/LAYOUT/lens_image.json b/JSON/LAYOUT/lens_image.json new file mode 100644 index 0000000..b9badda --- /dev/null +++ b/JSON/LAYOUT/lens_image.json @@ -0,0 +1,236 @@ +[ + { + "name": "20240329_112209.avif", + "width": 4608, + "height": 3456, + "latitude": 116.075546265, + "longitude": 40.289943695, + "flash-mode": 0, + "focal-length": "163mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/1000 sec.", + "iso-speed": "ISO-50", + "exposure-step": "-1.3", + "date": "2024-03-29", + "time": "11:22:09", + "img-tag": ["Spring", "Huawei-P50Pro", "Beijing"] + }, + { + "name": "20240329_115623.avif", + "width": 4608, + "height": 3456, + "latitude": 116.07555389333334, + "longitude": 40.289916991666665, + "flash-mode": 0, + "focal-length": "217mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/610 sec.", + "iso-speed": "ISO-50", + "exposure-step": "-1.1", + "date": "2024-03-29", + "time": "11:56:23", + "img-tag": ["Spring", "Train", "JuYongGuan"] + }, + { + "name": "20240329_115636.avif", + "width": 4608, + "height": 3456, + "latitude": 116.07555389333334, + "longitude": 40.289916991666665, + "flash-mode": 0, + "focal-length": "217mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/800 sec.", + "iso-speed": "ISO-50", + "exposure-step": "-1.2", + "date": "2024-03-29", + "time": "11:56:36", + "img-tag": ["Spring", "Pink", "Beijing"] + }, + { + "name": "20240329_135145.avif", + "width": 4608, + "height": 3456, + "latitude": 116.07559204166667, + "longitude": 40.290950775, + "flash-mode": 0, + "focal-length": "178mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/500 sec.", + "iso-speed": "ISO-50", + "exposure-step": "-1.6", + "date": "2024-03-29", + "time": "13:51:45", + "img-tag": ["Spring", "Train", "Beijing"] + }, + { + "name": "20240329_135154.avif", + "width": 4608, + "height": 3456, + "latitude": 116.07559204166667, + "longitude": 40.290950775, + "flash-mode": 0, + "focal-length": "178mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/380 sec.", + "iso-speed": "ISO-50", + "exposure-step": "0.0", + "date": "2024-03-29", + "time": "13:51:54", + "img-tag": ["Spring", "Train", "Beijing"] + }, + { + "name": "20240721_204044.avif", + "width": 2914, + "height": 3886, + "latitude": 118.15161132833333, + "longitude": 39.602874756666665, + "flash-mode": 0, + "focal-length": "270mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/60 sec.", + "iso-speed": "ISO-100", + "exposure-step": "0.0", + "date": "2024-07-21", + "time": "20:40:44", + "img-tag": ["Night", "Moon", "HeBei"] + }, + { + "name": "20240721_205048.avif", + "width": 3160, + "height": 4214, + "latitude": 118.151786805, + "longitude": 39.603019715, + "flash-mode": 0, + "focal-length": "270mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/20 sec.", + "iso-speed": "ISO-2000", + "exposure-step": "0.0", + "date": "2024-07-21", + "time": "20:50:48", + "img-tag": ["Night", "Moon", "HeBei"] + }, + { + "name": "20240721_205457.avif", + "width": 3456, + "height": 4608, + "latitude": 118.15187835666667, + "longitude": 39.6031456, + "flash-mode": 0, + "focal-length": "270mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/20 sec.", + "iso-speed": "ISO-2500", + "exposure-step": "0.0", + "date": "2024-07-21", + "time": "20:54:57", + "img-tag": ["Night", "Moon", "HeBei"] + }, + { + "name": "20240721_210030.avif", + "width": 3456, + "height": 4608, + "latitude": 118.15184021, + "longitude": 39.60278320333333, + "flash-mode": 0, + "focal-length": "367mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/25 sec.", + "iso-speed": "ISO-1000", + "exposure-step": "0.0", + "date": "2024-07-21", + "time": "21:00:30", + "img-tag": ["Night", "Moon", "HeBei"] + }, + { + "name": "20240721_210812.avif", + "width": 3456, + "height": 4608, + "latitude": 118.151275635, + "longitude": 39.60151290833333, + "flash-mode": 0, + "focal-length": "192mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/25 sec.", + "iso-speed": "ISO-1000", + "exposure-step": "0.0", + "date": "2024-07-21", + "time": "21:08:12", + "img-tag": ["Night", "Moon", "HeBei"] + }, + { + "name": "20240611_194057.avif", + "width": 8964, + "height": 6723, + "latitude": 116.178710945, + "longitude": 39.729736333333335, + "flash-mode": 0, + "focal-length": "95mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/25 sec.", + "iso-speed": "ISO-1250", + "exposure-step": "-4.0", + "date": "2024-06-11", + "time": "19:40:57", + "img-tag": ["Moment", "Lightning", "Beijing"] + }, + { + "name": "20240611_194237.avif", + "width": 6035, + "height": 8047, + "latitude": 116.178627, + "longitude": 39.72968291666667, + "flash-mode": 0, + "focal-length": "95mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/30 sec.", + "iso-speed": "ISO-1250", + "exposure-step": "-4.0", + "date": "2024-06-11", + "time": "19:42:37", + "img-tag": ["Moment", "Lightning", "Beijing"] + }, + { + "name": "20240611_194336.avif", + "width": 6767, + "height": 9022, + "latitude": 116.17860413833333, + "longitude": 39.72976302833333, + "flash-mode": 0, + "focal-length": "95mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/25 sec.", + "iso-speed": "ISO-1250", + "exposure-step": "-4.0", + "date": "2024-06-11", + "time": "19:43:36", + "img-tag": ["Moment", "Lightning", "Beijing"] + } +] \ No newline at end of file diff --git a/MATERIALS/LENS/20240329_112209.avif b/MATERIALS/LENS/20240329_112209.avif new file mode 100644 index 0000000..ec0c3a5 Binary files /dev/null and b/MATERIALS/LENS/20240329_112209.avif differ diff --git a/MATERIALS/LENS/20240329_115623.avif b/MATERIALS/LENS/20240329_115623.avif new file mode 100644 index 0000000..dc01185 Binary files /dev/null and b/MATERIALS/LENS/20240329_115623.avif differ diff --git a/MATERIALS/LENS/20240329_115636.avif b/MATERIALS/LENS/20240329_115636.avif new file mode 100644 index 0000000..5f0053f Binary files /dev/null and b/MATERIALS/LENS/20240329_115636.avif differ diff --git a/MATERIALS/LENS/20240329_135145.avif b/MATERIALS/LENS/20240329_135145.avif new file mode 100644 index 0000000..68928bb Binary files /dev/null and b/MATERIALS/LENS/20240329_135145.avif differ diff --git a/MATERIALS/LENS/20240329_135154.avif b/MATERIALS/LENS/20240329_135154.avif new file mode 100644 index 0000000..44b0caf Binary files /dev/null and b/MATERIALS/LENS/20240329_135154.avif differ diff --git a/MATERIALS/LENS/20240611_194057.avif b/MATERIALS/LENS/20240611_194057.avif new file mode 100644 index 0000000..377d0f8 Binary files /dev/null and b/MATERIALS/LENS/20240611_194057.avif differ diff --git a/MATERIALS/LENS/20240611_194237.avif b/MATERIALS/LENS/20240611_194237.avif new file mode 100644 index 0000000..ccdf88c Binary files /dev/null and b/MATERIALS/LENS/20240611_194237.avif differ diff --git a/MATERIALS/LENS/20240611_194336.avif b/MATERIALS/LENS/20240611_194336.avif new file mode 100644 index 0000000..01a2d45 Binary files /dev/null and b/MATERIALS/LENS/20240611_194336.avif differ diff --git a/MATERIALS/LENS/20240721_204044.avif b/MATERIALS/LENS/20240721_204044.avif new file mode 100644 index 0000000..e678590 Binary files /dev/null and b/MATERIALS/LENS/20240721_204044.avif differ diff --git a/MATERIALS/LENS/20240721_205048.avif b/MATERIALS/LENS/20240721_205048.avif new file mode 100644 index 0000000..16c73a3 Binary files /dev/null and b/MATERIALS/LENS/20240721_205048.avif differ diff --git a/MATERIALS/LENS/20240721_205457.avif b/MATERIALS/LENS/20240721_205457.avif new file mode 100644 index 0000000..d6efcbf Binary files /dev/null and b/MATERIALS/LENS/20240721_205457.avif differ diff --git a/MATERIALS/LENS/20240721_210030.avif b/MATERIALS/LENS/20240721_210030.avif new file mode 100644 index 0000000..9c2ae58 Binary files /dev/null and b/MATERIALS/LENS/20240721_210030.avif differ diff --git a/MATERIALS/LENS/20240721_210812.avif b/MATERIALS/LENS/20240721_210812.avif new file mode 100644 index 0000000..bf693ef Binary files /dev/null and b/MATERIALS/LENS/20240721_210812.avif differ diff --git a/MATERIALS/LENS/get_detials.py b/MATERIALS/LENS/get_detials.py new file mode 100644 index 0000000..b4ee91b --- /dev/null +++ b/MATERIALS/LENS/get_detials.py @@ -0,0 +1,131 @@ + +from PIL import Image +import json +import piexif +from PIL import Image +import pillow_avif + +def convert_to_degrees(value): + d = float(value[0][0]) / float(value[0][1]) + m = float(value[1][0]) / float(value[1][1]) + s = float(value[2][0]) / float(value[2][1]) + + return d + (m / 60.0) + (s / 3600.0) + +all_img = [] +for _i in range(1, 14): + + with Image.open(f'{_i}.jpg') as img: + + img_w = img.size[0] + img_h = img.size[1] + + exif_data = piexif.load(img.info['exif']) + gps_info = exif_data['GPS'] + + if gps_info: + gps_latitude = gps_info[piexif.GPSIFD.GPSLatitude] + gps_latitude_ref = gps_info[piexif.GPSIFD.GPSLatitudeRef].decode() + gps_longitude = gps_info[piexif.GPSIFD.GPSLongitude] + gps_longitude_ref = gps_info[piexif.GPSIFD.GPSLongitudeRef].decode() + + latitude = convert_to_degrees(gps_latitude) + longitude = convert_to_degrees(gps_longitude) + + if gps_latitude_ref != "N": + latitude = -latitude + if gps_longitude_ref != "E": + longitude = -longitude + + img_lati = latitude + img_long = longitude + else: + + img_lati = 0 + img_long = 0 + + need_tag = [ + 'DateTimeDigitized', + 'Flash', + 'FocalLengthIn35mmFilm', + 'Make', + 'Model', + 'FNumber', + 'ExposureTime', + 'ISOSpeedRatings', + 'ExposureBiasValue', + 'OffsetTime' + ] + + for ifd in exif_data: + for tag in exif_data[ifd]: + try: + tag_name = piexif.TAGS[ifd][tag]["name"] + tag_value = exif_data[ifd][tag] + except: + continue + + if tag_name in need_tag: + if tag_name == 'DateTimeDigitized': + tag_value = tag_value.decode('utf-8') + img_taken = tag_value.split(' ') + img_date = img_taken[0].replace(':', '-') + img_time = img_taken[1] + + elif tag_name == 'Flash': + img_flash = tag_value + + elif tag_name == 'FocalLengthIn35mmFilm': + img_focal_length = f'{tag_value}mm' + + elif tag_name == 'Make': + tag_value = tag_value.decode('utf-8') + img_make = tag_value + + elif tag_name == 'Model': + tag_value = tag_value.decode('utf-8') + img_model = tag_value + + elif tag_name == 'FNumber': + img_f_stop = f'f/{tag_value[0] / tag_value[1]}' + + elif tag_name == 'ExposureTime': + img_exposure_time = f'{tag_value[0]}/{tag_value[1]} sec.' + + elif tag_name == 'ISOSpeedRatings': + img_iso = f'ISO-{tag_value}' + + elif tag_name == 'ExposureBiasValue': + img_step = f'{tag_value[0] / tag_value[1]}' + + elif tag_name == 'OffsetTime': + tag_value = tag_value.decode('utf-8') + img_gmt = f'{tag_value}' + + img_name = f'{img_date.replace("-", "")}_{img_time.replace(":", "")}' + img_current = { + "name": f'{img_name}.avif', + "width": img_w, + "height": img_h, + "latitude": img_long, + "longitude": img_lati, + "flash-mode": img_flash, + "focal-length": img_focal_length, + "camera-make": img_make, + "camera-model": img_model, + "f-stop": img_f_stop, + "exposure-time": img_exposure_time, + "iso-speed": img_iso, + "exposure-step": img_step, + "date": img_date, + "time": img_time, + "img-tag": "" + } + + JPGimg = Image.open(f'{_i}.jpg') + JPGimg.save(f'{img_name}.avif', 'AVIF', exif=None) + + all_img.append(img_current) + +with open('output.json', 'w') as json_file: + json.dump(all_img, json_file, indent=4) diff --git a/MATERIALS/LENS/output.json b/MATERIALS/LENS/output.json new file mode 100644 index 0000000..048d154 --- /dev/null +++ b/MATERIALS/LENS/output.json @@ -0,0 +1,236 @@ +[ + { + "name": "20240329_112209.avif", + "width": 4608, + "height": 3456, + "latitude": 116.075546265, + "longitude": 40.289943695, + "flash-mode": 0, + "focal-length": "163mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/1000 sec.", + "iso-speed": "ISO-50", + "exposure-step": "-1.3", + "date": "2024-03-29", + "time": "11:22:09", + "img-tag": "" + }, + { + "name": "20240329_115623.avif", + "width": 4608, + "height": 3456, + "latitude": 116.07555389333334, + "longitude": 40.289916991666665, + "flash-mode": 0, + "focal-length": "217mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/610 sec.", + "iso-speed": "ISO-50", + "exposure-step": "-1.1", + "date": "2024-03-29", + "time": "11:56:23", + "img-tag": "" + }, + { + "name": "20240329_115636.avif", + "width": 4608, + "height": 3456, + "latitude": 116.07555389333334, + "longitude": 40.289916991666665, + "flash-mode": 0, + "focal-length": "217mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/800 sec.", + "iso-speed": "ISO-50", + "exposure-step": "-1.2", + "date": "2024-03-29", + "time": "11:56:36", + "img-tag": "" + }, + { + "name": "20240329_135145.avif", + "width": 4608, + "height": 3456, + "latitude": 116.07559204166667, + "longitude": 40.290950775, + "flash-mode": 0, + "focal-length": "178mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/500 sec.", + "iso-speed": "ISO-50", + "exposure-step": "-1.6", + "date": "2024-03-29", + "time": "13:51:45", + "img-tag": "" + }, + { + "name": "20240329_135154.avif", + "width": 4608, + "height": 3456, + "latitude": 116.07559204166667, + "longitude": 40.290950775, + "flash-mode": 0, + "focal-length": "178mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/380 sec.", + "iso-speed": "ISO-50", + "exposure-step": "0.0", + "date": "2024-03-29", + "time": "13:51:54", + "img-tag": "" + }, + { + "name": "20240721_204044.avif", + "width": 2914, + "height": 3886, + "latitude": 118.15161132833333, + "longitude": 39.602874756666665, + "flash-mode": 0, + "focal-length": "270mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/60 sec.", + "iso-speed": "ISO-100", + "exposure-step": "0.0", + "date": "2024-07-21", + "time": "20:40:44", + "img-tag": "" + }, + { + "name": "20240721_205048.avif", + "width": 3160, + "height": 4214, + "latitude": 118.151786805, + "longitude": 39.603019715, + "flash-mode": 0, + "focal-length": "270mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/20 sec.", + "iso-speed": "ISO-2000", + "exposure-step": "0.0", + "date": "2024-07-21", + "time": "20:50:48", + "img-tag": "" + }, + { + "name": "20240721_205457.avif", + "width": 3456, + "height": 4608, + "latitude": 118.15187835666667, + "longitude": 39.6031456, + "flash-mode": 0, + "focal-length": "270mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/20 sec.", + "iso-speed": "ISO-2500", + "exposure-step": "0.0", + "date": "2024-07-21", + "time": "20:54:57", + "img-tag": "" + }, + { + "name": "20240721_210030.avif", + "width": 3456, + "height": 4608, + "latitude": 118.15184021, + "longitude": 39.60278320333333, + "flash-mode": 0, + "focal-length": "367mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/25 sec.", + "iso-speed": "ISO-1000", + "exposure-step": "0.0", + "date": "2024-07-21", + "time": "21:00:30", + "img-tag": "" + }, + { + "name": "20240721_210812.avif", + "width": 3456, + "height": 4608, + "latitude": 118.151275635, + "longitude": 39.60151290833333, + "flash-mode": 0, + "focal-length": "192mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/25 sec.", + "iso-speed": "ISO-1000", + "exposure-step": "0.0", + "date": "2024-07-21", + "time": "21:08:12", + "img-tag": "" + }, + { + "name": "20240611_194057.avif", + "width": 8964, + "height": 6723, + "latitude": 116.178710945, + "longitude": 39.729736333333335, + "flash-mode": 0, + "focal-length": "95mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/25 sec.", + "iso-speed": "ISO-1250", + "exposure-step": "-4.0", + "date": "2024-06-11", + "time": "19:40:57", + "img-tag": "" + }, + { + "name": "20240611_194237.avif", + "width": 6035, + "height": 8047, + "latitude": 116.178627, + "longitude": 39.72968291666667, + "flash-mode": 0, + "focal-length": "95mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/30 sec.", + "iso-speed": "ISO-1250", + "exposure-step": "-4.0", + "date": "2024-06-11", + "time": "19:42:37", + "img-tag": "" + }, + { + "name": "20240611_194336.avif", + "width": 6767, + "height": 9022, + "latitude": 116.17860413833333, + "longitude": 39.72976302833333, + "flash-mode": 0, + "focal-length": "95mm", + "camera-make": "HUAWEI", + "camera-model": "JAD-AL50", + "f-stop": "f/3.5", + "exposure-time": "1/25 sec.", + "iso-speed": "ISO-1250", + "exposure-step": "-4.0", + "date": "2024-06-11", + "time": "19:43:36", + "img-tag": "" + } +] \ No newline at end of file diff --git a/MATERIALS/ico_dy.png b/MATERIALS/ico_dy.png index c2ba137..97ae0e1 100644 Binary files a/MATERIALS/ico_dy.png and b/MATERIALS/ico_dy.png differ diff --git a/MATERIALS/ico_ks.png b/MATERIALS/ico_ks.png index e42d1fc..d5fd233 100644 Binary files a/MATERIALS/ico_ks.png and b/MATERIALS/ico_ks.png differ diff --git a/index.html b/index.html index 86a9afa..44ad1c4 100644 --- a/index.html +++ b/index.html @@ -11,24 +11,24 @@ - - + + - + - + - + - - + + @@ -94,7 +94,14 @@
-

+
+ +

+ Huawei P50 Pro + BeiJing + Moment +

+