IMEI:
${escapeHtml(d.imei)}
-
名称:
${escapeHtml(d.name || '-')}
-
类型:
${escapeHtml(d.device_type || '-')}
+
型号:
${escapeHtml(d.device_type || '-')}
状态:
${statusBadge(d.status)}
-
电量:
${d.battery_level !== undefined && d.battery_level !== null ? d.battery_level + '%' : '-'}
-
信号强度:
${d.signal_strength !== undefined && d.signal_strength !== null ? d.signal_strength : '-'}
-
固件版本:
${escapeHtml(d.firmware_version || '-')}
-
时区:
${escapeHtml(d.timezone || '-')}
-
语言:
${escapeHtml(d.language || '-')}
+
电量:
${d.battery_level != null ? d.battery_level + '%' : '-'} ${d.gsm_signal != null ? ' | 信号: ' + d.gsm_signal : ''}
+
ICCID:
${escapeHtml(d.iccid || '-')}
+
时区/语言:
${escapeHtml(d.timezone || '-')} / ${escapeHtml(d.language || '-')}
最后登录:
${formatTime(d.last_login)}
最后心跳:
${formatTime(d.last_heartbeat)}
-
创建时间:
${formatTime(d.created_at)}
-
-
+
+
+
+
定位信息
+
+
当前模式:
${_locTypeLabel(locType)}
+
定位时间:
${locTime}
+
地址:
${locAddr}
+
+
${_locModeBadges(locType)}
+
+
+
+
+
功能开关${online ? '' : ' (设备离线，无法操作)'}
+
+ ${_btn('satellite-dish', 'GPS 开启', 'GPSON#', '#0d9488')}
+ ${_btn('bluetooth-b', '蓝牙开启', 'BTON#', '#2563eb')}
+ ${_btn('broadcast-tower', 'BLE扫描', 'BTSCAN,1#', '#7c3aed')}
+
+
工作模式:
+
+ ${_btn('clock', '定时定位', 'MODE,1#', '#4b5563')}
+ ${_btn('brain', '智能模式', 'MODE,3#', '#4b5563')}
+
+
信息查询:
+
+ ${_btn('info-circle', '设备状态', 'STATUS#', '#374151')}
+ ${_btn('cog', '参数查询', 'PARAM#', '#374151')}
+ ${_btn('code-branch', '固件版本', 'VERSION#', '#374151')}
+ ${_btn('stopwatch', '定时器', 'TIMER#', '#374151')}
+ ${_btn('clipboard-check', '完整信息', 'CHECK#', '#374151')}
+
+
+
+
+
+
+
语音播报 (TTS)
+
+
+
+
+
+
+
+
+
+
+
+
`);
@@ -1364,15 +1740,69 @@
}
}
+ // ==================== MAP PROVIDER ====================
+ // Switch tile provider: 'gaode' | 'tianditu'
+ // 高德: GCJ-02 tiles, need coordinate conversion; 天地图: WGS-84 native
+ const MAP_PROVIDER = 'gaode';
+
+ // WGS-84 → GCJ-02 coordinate conversion (for 高德 tiles)
+ const _gcj_a = 6378245.0, _gcj_ee = 0.00669342162296594;
+ function _outOfChina(lat, lng) { return lng < 72.004 || lng > 137.8347 || lat < 0.8293 || lat > 55.8271; }
+ function _transformLat(x, y) {
+ let r = -100.0 + 2.0*x + 3.0*y + 0.2*y*y + 0.1*x*y + 0.2*Math.sqrt(Math.abs(x));
+ r += (20.0*Math.sin(6.0*x*Math.PI) + 20.0*Math.sin(2.0*x*Math.PI)) * 2.0/3.0;
+ r += (20.0*Math.sin(y*Math.PI) + 40.0*Math.sin(y/3.0*Math.PI)) * 2.0/3.0;
+ r += (160.0*Math.sin(y/12.0*Math.PI) + 320.0*Math.sin(y*Math.PI/30.0)) * 2.0/3.0;
+ return r;
+ }
+ function _transformLng(x, y) {
+ let r = 300.0 + x + 2.0*y + 0.1*x*x + 0.1*x*y + 0.1*Math.sqrt(Math.abs(x));
+ r += (20.0*Math.sin(6.0*x*Math.PI) + 20.0*Math.sin(2.0*x*Math.PI)) * 2.0/3.0;
+ r += (20.0*Math.sin(x*Math.PI) + 40.0*Math.sin(x/3.0*Math.PI)) * 2.0/3.0;
+ r += (150.0*Math.sin(x/12.0*Math.PI) + 300.0*Math.sin(x/30.0*Math.PI)) * 2.0/3.0;
+ return r;
+ }
+ function wgs84ToGcj02(lat, lng) {
+ if (_outOfChina(lat, lng)) return [lat, lng];
+ let dLat = _transformLat(lng - 105.0, lat - 35.0);
+ let dLng = _transformLng(lng - 105.0, lat - 35.0);
+ const radLat = lat / 180.0 * Math.PI;
+ let magic = Math.sin(radLat);
+ magic = 1 - _gcj_ee * magic * magic;
+ const sqrtMagic = Math.sqrt(magic);
+ dLat = (dLat * 180.0) / ((_gcj_a * (1 - _gcj_ee)) / (magic * sqrtMagic) * Math.PI);
+ dLng = (dLng * 180.0) / (_gcj_a / sqrtMagic * Math.cos(radLat) * Math.PI);
+ return [lat + dLat, lng + dLng];
+ }
+
+ // Convert WGS-84 coords for current map provider
+ function toMapCoord(lat, lng) {
+ if (MAP_PROVIDER === 'gaode') return wgs84ToGcj02(lat, lng);
+ return [lat, lng]; // tianditu uses WGS-84 natively
+ }
+
// ==================== LOCATIONS ====================
function initLocationMap() {
if (locationMap) return;
setTimeout(() => {
- locationMap = L.map('locationMap').setView([39.9042, 116.4074], 10);
- L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
- attribution: '© OpenStreetMap contributors',
- maxZoom: 19,
- }).addTo(locationMap);
+ locationMap = L.map('locationMap').setView(toMapCoord(39.9042, 116.4074), 10);
+ if (MAP_PROVIDER === 'gaode') {
+ // 高德矢量底图 (GCJ-02, standard Mercator, no API key needed)
+ L.tileLayer('https://webrd0{s}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=2&style=8&x={x}&y={y}&z={z}', {
+ subdomains: '1234', maxZoom: 18,
+ attribution: '© 高德地图',
+ }).addTo(locationMap);
+ } else {
+ // 天地图矢量底图 + 中文注记 (WGS-84)
+ const TDT_KEY = '1918548e81a5ae3ff0cb985537341146';
+ L.tileLayer('https://t{s}.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=' + TDT_KEY, {
+ subdomains: ['0','1','2','3','4','5','6','7'], maxZoom: 18,
+ }).addTo(locationMap);
+ L.tileLayer('https://t{s}.tianditu.gov.cn/cva_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cva&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=' + TDT_KEY, {
+ subdomains: ['0','1','2','3','4','5','6','7'], maxZoom: 18,
+ attribution: '© 天地图',
+ }).addTo(locationMap);
+ }
locationMap.invalidateSize();
}, 100);
}
@@ -1420,10 +1850,11 @@
const lat = loc.latitude || loc.lat;
const lng = loc.longitude || loc.lng || loc.lon;
if (lat && lng) {
- latlngs.push([lat, lng]);
+ const [mLat, mLng] = toMapCoord(lat, lng);
+ latlngs.push([mLat, mLng]);
const isFirst = i === 0;
const isLast = i === locations.length - 1;
- const marker = L.circleMarker([lat, lng], {
+ const marker = L.circleMarker([mLat, mLng], {
radius: isFirst || isLast ? 8 : 4,
fillColor: isFirst ? '#22c55e' : isLast ? '#ef4444' : '#3b82f6',
color: '#fff', weight: 1, fillOpacity: 0.9,
@@ -1466,7 +1897,8 @@
const lng = loc.longitude || loc.lng || loc.lon;
if (!lat || !lng) { showToast('没有有效坐标数据', 'info'); return; }
- const marker = L.marker([lat, lng]).addTo(locationMap);
+ const [mLat, mLng] = toMapCoord(lat, lng);
+ const marker = L.marker([mLat, mLng]).addTo(locationMap);
marker.bindPopup(`
最新位置
类型: ${loc.location_type || '-'}
@@ -1476,7 +1908,7 @@
时间: ${formatTime(loc.recorded_at || loc.created_at)}
`).openPopup();
mapMarkers.push(marker);
- locationMap.setView([lat, lng], 15);
+ locationMap.setView([mLat, mLng], 15);
showToast('已显示最新位置');
} catch (err) {
showToast('获取最新位置失败: ' + err.message, 'error');
@@ -1783,6 +2215,8 @@
}).join('');
}
renderPagination('beaconsPagination', data.total || 0, data.page || p, data.page_size || ps, 'loadBeacons');
+ // Render beacon side panel
+ renderBeaconPanel(items);
} catch (err) {
showToast('加载信标列表失败: ' + err.message, 'error');
document.getElementById('beaconsTableBody').innerHTML = '
| 加载失败 |
';
diff --git a/app/tcp_server.py b/app/tcp_server.py
index fb6107f..4c25141 100644
--- a/app/tcp_server.py
+++ b/app/tcp_server.py
@@ -60,6 +60,7 @@ from app.protocol.constants import (
PROTO_ONLINE_CMD_REPLY,
PROTO_TIME_SYNC,
PROTO_TIME_SYNC_2,
+ PROTO_ADDRESS_REPLY_EN,
PROTO_WIFI,
PROTO_WIFI_4G,
START_MARKER_LONG,
@@ -718,6 +719,11 @@ class TCPManager:
logger.warning("Heartbeat received before login")
return
+ # Ensure device is tracked in active connections (e.g. after server restart)
+ if imei not in self.connections:
+ self.connections[imei] = (reader, writer, conn_info)
+ logger.info("Device IMEI=%s re-registered via heartbeat", imei)
+
terminal_info: int = 0
battery_level: Optional[int] = None
gsm_signal: Optional[int] = None
@@ -752,11 +758,12 @@ class TCPManager:
logger.warning("Heartbeat for unknown IMEI=%s", imei)
return
- # Update device record
+ # Update device record (also ensure status=online if heartbeat is coming in)
await session.execute(
update(Device)
.where(Device.id == device_id)
.values(
+ status="online",
battery_level=battery_level,
gsm_signal=gsm_signal,
last_heartbeat=now,
diff --git a/requirements.txt b/requirements.txt
index f309d3d..b664a68 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@ sqlalchemy>=2.0.0
aiosqlite>=0.19.0
pydantic>=2.0.0
pydantic-settings>=2.0.0
+slowapi