koishi-plugin-ets2-tools-tmp 3.3.62 → 3.3.63

package/lib/command/ets-app/changePoint/changePoint.js

@@ -1,14 +1,5 @@
 const changePointV1 = require("./changePointV1");
-const changePointV2 = require("./changePointV2");
 
 module.exports = async (ctx, cfg, session, target, changeType, quantity, reason) => {
-  const { platformVersion } = cfg.mainSettings?.settings || {};
-  const platform = (platformVersion || "v1").toLowerCase();
-
-  switch (platform) {
-    case "v2":
-      return await changePointV2(ctx, cfg, session, target, changeType, quantity);
-    default:
-      return await changePointV1(ctx, cfg, session, target, changeType, quantity, reason);
-  }
+  return await changePointV1(ctx, cfg, session, target, changeType, quantity, reason);
 };

package/lib/command/ets-app/queryPoint/queryPoint.js

@@ -1,10 +1,6 @@
 const queryPointV1 = require("./queryPointV1");
-const queryPointV2 = require("./queryPointV2");
 
 module.exports = async (ctx, cfg, session, targetQQ) => {
-  const { platformVersion } = cfg.mainSettings?.settings || {};
-  const platform = (platformVersion || "v1").toLowerCase();
-
   let queryQQ = targetQQ;
   if (!queryQQ) {
     queryQQ = session.userId;
@@ -29,10 +25,5 @@ module.exports = async (ctx, cfg, session, targetQQ) => {
     }
   }
 
-  switch (platform) {
-    case "v2":
-      return await queryPointV2(ctx, cfg, queryQQ);
-    default:
-      return await queryPointV1(ctx, cfg, queryQQ);
-  }
+  return await queryPointV1(ctx, cfg, queryQQ);
 };

package/lib/command/ets-app/resetPassword/resetPassword.js

@@ -1,20 +1,5 @@
 const resetPasswordV1 = require("./resetPasswordV1");
-const resetPasswordV2 = require("./resetPasswordV2");
 
 module.exports = async (ctx, cfg, session, targetTeamId, password) => {
-  const { platformVersion } = cfg.mainSettings?.settings || {};
-  const platform = (platformVersion || "v1").toLowerCase();
-
-  switch (platform) {
-    case "v2": {
-      let actualPassword = password;
-      if (targetTeamId && !password && !/^\d+$/.test(targetTeamId)) {
-        actualPassword = targetTeamId;
-        targetTeamId = undefined;
-      }
-      return await resetPasswordV2(ctx, cfg, session, actualPassword);
-    }
-    default:
-      return await resetPasswordV1(ctx, cfg, session, targetTeamId, password);
-  }
+  return await resetPasswordV1(ctx, cfg, session, targetTeamId, password);
 };

package/lib/command/tmpActivityService.js

@@ -5,7 +5,6 @@ exports.ActivityService = void 0;
 const koishi_1 = require("koishi");
 
 const v1Methods = require('./tmpActivityService/tmpActivityServiceV1');
-const v2Methods = require('./tmpActivityService/tmpActivityServiceV2');
 
 class ActivityService {
     constructor(ctx, config) {
@@ -18,12 +17,7 @@ class ActivityService {
         this.timers = [];
         this.logger = this.initLogger();
 
-        const platformVersion = (this.cfg.mainSettings?.platformVersion || "v1").toLowerCase();
-        if (platformVersion === "v2") {
-            Object.assign(this, v2Methods);
-        } else {
-            Object.assign(this, v1Methods);
-        }
+        Object.assign(this, v1Methods);
     }
 
     initLogger() {

package/lib/command/tmpQuery/tmpQueryImg.js

@@ -21,11 +21,44 @@ const userGroup = {
     'Add-On Team': '附加组件团队',
     'Game Moderator': '游戏管理员'
 };
+/**
+ * 渲染倍率。1 = 原始像素（偏糊），2 = 视网膜屏清晰度。
+ * 代价：像素面积 ×4、单张渲染内存与耗时上升；配合 JPEG 编码后体积反而比 1 倍 PNG 更小。
+ */
+const RENDER_SCALE = 2;
+/**
+ * 遥测数据超过这个时长即视为过期，整块不显示（默认 2 分钟）
+ */
+const TELEMETRY_MAX_AGE_MS = 2 * 60 * 1000;
+/**
+ * 遥测记录距今的时间差（毫秒）。
+ * updateTime 是 UTC 字面量、updateTimeCn 是北京时间字面量，两者都能换算成绝对时间，
+ * 因此与机器人所在时区无关；两个字段都取不到时返回 null。
+ */
+function telemetryRecordAge(player) {
+    const asUtc = (s) => {
+        const t = Date.parse(String(s).replace(' ', 'T') + 'Z');
+        return Number.isNaN(t) ? null : t;
+    };
+    const asCn = (s) => {
+        const t = Date.parse(String(s).replace(' ', 'T') + '+08:00');
+        return Number.isNaN(t) ? null : t;
+    };
+    let ts = player.updateTime ? asUtc(player.updateTime) : null;
+    if (ts === null && player.updateTimeCn) ts = asCn(player.updateTimeCn);
+    if (ts === null) return null;
+    return Date.now() - ts;
+}
 /**
  * 查询玩家信息
  */
 module.exports = async (ctx, cfg, session, tmpId) => {
     const { vtcId } = cfg.tmpActivityService?.api || {};
+    // 车队平台配置（遥测 / 积分共用），提前取出供多处使用
+    const mainSettingValues = cfg.mainSettings?.settings || {};
+    const platformUrl = mainSettingValues.url;
+    const platformToken = mainSettingValues.token;
+    const logOutput = mainSettingValues.logOutput;
     if (!ctx.puppeteer) {
         return '未启用 puppeteer 服务';
     }
@@ -66,6 +99,58 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     else if (playerInfo.error) {
         return '查询玩家信息失败，请重试';
     }
+    // ===== 车队平台实时遥测（在线 + 本队成员） =====
+    // 触发条件：玩家当前在线，且其 vtcId 与 tmpActivityService.api.vtcId 一致
+    const isOwnVtcMember = vtcId !== undefined && vtcId !== null && vtcId !== '' &&
+        playerInfo.data.vtcId !== undefined && playerInfo.data.vtcId !== null &&
+        String(playerInfo.data.vtcId) === String(vtcId);
+    // 玩家离线时没有实时遥测可看，直接不发请求
+    const isPlayerOnline = !!(playerMapInfo && !playerMapInfo.error && playerMapInfo.data && playerMapInfo.data.online);
+    // 请求提前发起，与下方的积分查询 / 翻译 / Steam时长并行，避免串行等待
+    const telemetryPromise = (platformUrl && platformToken && isPlayerOnline && isOwnVtcMember)
+        ? (async () => {
+            const telemetryUrl = `https://${platformUrl}/api/telemetry/bot/live?tmpId=${tmpId}&token=${platformToken}`;
+            try {
+                if (logOutput) {
+                    ctx.logger.info(`[TMP_BOT] tmpQueryImg：开始查询TmpID ${tmpId} 的V1.0实时遥测`);
+                    ctx.logger.info(`[TMP_BOT] 请求V1.0遥测接口: ${telemetryUrl.replace(platformToken, "***")}`);
+                }
+                const telemetryResponse = await ctx.http.get(telemetryUrl, { timeout: 10000 });
+                const playerList = telemetryResponse?.data?.players;
+                if (logOutput) {
+                    ctx.logger.info(`[TMP_BOT] V1.0遥测响应: code=${telemetryResponse?.code}, online=${telemetryResponse?.data?.online}, players=${Array.isArray(playerList) ? playerList.length : 0}`);
+                }
+                if (telemetryResponse && telemetryResponse.code === 0 && Array.isArray(playerList) && playerList.length > 0) {
+                    // 优先取与查询 tmpId 一致的那条，避免接口返回多人的情况
+                    const matched = playerList.find(p => p && String(p.tmpId) === String(tmpId)) || playerList[0];
+                    // players 为空数组（无遥测记录）时不返回，渲染页会整块隐藏
+                    if (!matched || typeof matched !== 'object') {
+                        return null;
+                    }
+                    // 记录时间距今超过 TELEMETRY_MAX_AGE_MS 视为过期，同样不显示
+                    const ageMs = telemetryRecordAge(matched);
+                    if (ageMs === null || ageMs > TELEMETRY_MAX_AGE_MS) {
+                        if (logOutput) {
+                            ctx.logger.info(`[TMP_BOT] V1.0遥测记录已过期（${ageMs === null ? '无有效时间戳' : Math.round(ageMs / 1000) + ' 秒前'}），不显示遥测板块`);
+                        }
+                        return null;
+                    }
+                    return {
+                        online: telemetryResponse.data.online === 1,
+                        generatedAt: telemetryResponse.data.generatedAt || null,
+                        player: matched
+                    };
+                }
+                if (logOutput) {
+                    ctx.logger.info(`[TMP_BOT] V1.0遥测接口未返回记录（players 为空），不显示遥测板块`);
+                }
+                return null;
+            } catch (error) {
+                ctx.logger.error(`遥测查询过程出错: ${error}`);
+                return null;
+            }
+        })()
+        : null;
     // Steam游戏时长请求提前发起，与下方积分查询/翻译并行执行
     const steamApiKey = cfg.steamApi?.key;
     const steamGameTimePromise = (cfg.commands?.tmpQueryGameTime && steamApiKey)
@@ -129,44 +214,28 @@ module.exports = async (ctx, cfg, session, tmpId) => {
         const isInAllowedGroup = allowedGroups.some(g => currentGroupId.includes(g));
 
         if (isInAllowedGroup && playerInfo.data.vtcId == vtcId) {
-            const { url, token, logOutput, platformVersion } = cfg.mainSettings?.settings || {};
-            const platform = (platformVersion || "v1").toLowerCase();
             try {
-                if (platform === "v2") {
-                    const baseUrl = url;
-                    const userInfoUrl = `https://${baseUrl}/members/get?token=${token}&tmpId=${tmpId}`;
-                    if (logOutput) {
-                        ctx.logger.info(`[TMP_BOT] tmpQueryImg：开始查询TmpID ${tmpId} 的V2.0积分`);
-                        ctx.logger.info(`[TMP_BOT] 请求V2.0用户信息: ${userInfoUrl}`);
-                    }
-                    const userInfoResponse = await ctx.http.get(userInfoUrl);
-                    if (logOutput) {
-                        ctx.logger.info(`[TMP_BOT] V2.0用户信息响应: ${JSON.stringify(userInfoResponse)}`);
-                    }
-                    if (userInfoResponse.code === 200 && userInfoResponse.data) {
-                        data.rewardPoints = userInfoResponse.data.point || 0;
-                    }
-                } else {
-                    if (logOutput) {
-                        ctx.logger.info(`[TMP_BOT] tmpQueryImg：开始查询TmpID ${tmpId} 的V1.0积分`);
-                    }
-                    const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=0&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&state=0&teamRole=`;
-                    if (logOutput) {
-                        ctx.logger.info(`[TMP_BOT] 请求V1.0用户信息: ${userInfoUrl}`);
-                    }
-                    const userInfoResponse = await ctx.http.post(userInfoUrl);
-                    if (logOutput) {
-                        ctx.logger.info(`[TMP_BOT] V1.0用户信息响应: ${JSON.stringify(userInfoResponse)}`);
-                    }
-                    const userList = userInfoResponse.page?.list || [];
-                    const userInfo = userList[0];
-                    data.rewardPoints = userInfo.rewardPoints || 0;
+                if (logOutput) {
+                    ctx.logger.info(`[TMP_BOT] tmpQueryImg：开始查询TmpID ${tmpId} 的积分`);
+                }
+                const userInfoUrl = `https://${platformUrl}/api/user/info/list?token=${platformToken}&page=0&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&state=0&teamRole=`;
+                if (logOutput) {
+                    ctx.logger.info(`[TMP_BOT] 请求用户信息: ${userInfoUrl}`);
+                }
+                const userInfoResponse = await ctx.http.post(userInfoUrl);
+                if (logOutput) {
+                    ctx.logger.info(`[TMP_BOT] 用户信息响应: ${JSON.stringify(userInfoResponse)}`);
                 }
+                const userList = userInfoResponse.page?.list || [];
+                const userInfo = userList[0];
+                data.rewardPoints = userInfo.rewardPoints || 0;
             } catch (error) {
                 ctx.logger.error(`积分查询过程出错: ${error}`);
             }
         }
     }
+    // 等待V1遥测结果（请求已提前发起，与积分查询/Steam时长并行）
+    data.telemetry = telemetryPromise ? await telemetryPromise : null;
     // 等待Steam游戏时长结果（请求已提前发起，与积分查询/翻译并行）
     data.ets2GameTime = null;
     data.atsGameTime = null;
@@ -178,15 +247,19 @@ module.exports = async (ctx, cfg, session, tmpId) => {
     let page;
     try {
         page = await ctx.puppeteer.page();
-        await page.setViewport({ width: 520, height: 1000 });
+        // deviceScaleFactor=RENDER_SCALE：按 RENDER_SCALE 倍像素渲染，客户端放大后依然清晰
+        await page.setViewport({ width: 520, height: 1000, deviceScaleFactor: RENDER_SCALE });
         await page.goto(`file:///${resolve(__dirname, '../../resource/query.html')}`);
         await page.evaluate(`init(${JSON.stringify(data)})`);
         await common.sleep(100);
         await page.waitForNetworkIdle();
         const element = await page.$("#container");
+        // 用 JPEG 编码：同一清晰度下体积远小于 PNG（卡片背景不透明，无需 alpha 通道）
         return (segment.image(await element.screenshot({
+            type: "jpeg",
+            quality: 90,
             encoding: "binary"
-        }), "image/jpg"));
+        }), "image/jpeg"));
     }
     catch {
         return '渲染异常，请重试';

package/lib/command/tmpQuery/tmpQueryText.js

@@ -95,40 +95,23 @@ module.exports = async (ctx, cfg, session, tmpId) => {
             const isInAllowedGroup = allowedGroups.some(g => currentGroupId.includes(g));
 
             if (isInAllowedGroup && playerInfo.data.vtcId == vtcId) {
-                const { url, token, logOutput, platformVersion } = cfg.mainSettings?.settings || {};
-                const platform = (platformVersion || "v1").toLowerCase();
+                const { url, token, logOutput } = cfg.mainSettings?.settings || {};
                 try {
                     let rewardPoints = 0;
-                    if (platform === "v2") {
-                        const baseUrl = url;
-                        const userInfoUrl = `https://${baseUrl}/members/get?token=${token}&tmpId=${tmpId}`;
-                        if (logOutput) {
-                            ctx.logger.info(`[TMP_BOT] tmpQuery：开始查询TmpID ${tmpId} 的V2.0积分`);
-                            ctx.logger.info(`[TMP_BOT] 请求V2.0用户信息: ${userInfoUrl}`);
-                        }
-                        const userInfoResponse = await ctx.http.get(userInfoUrl);
-                        if (logOutput) {
-                            ctx.logger.info(`[TMP_BOT] V2.0用户信息响应: ${JSON.stringify(userInfoResponse)}`);
-                        }
-                        if (userInfoResponse.code === 200 && userInfoResponse.data) {
-                            rewardPoints = userInfoResponse.data.point || 0;
-                        }
-                    } else {
-                        if (logOutput) {
-                            ctx.logger.info(`[TMP_BOT] tmpQuery：开始查询TmpID ${tmpId} 的V1.0积分`);
-                        }
-                        const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=0&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&state=0&teamRole=`;
-                        if (logOutput) {
-                            ctx.logger.info(`[TMP_BOT] 请求V1.0用户信息: ${userInfoUrl}`);
-                        }
-                        const userInfoResponse = await ctx.http.post(userInfoUrl);
-                        if (logOutput) {
-                            ctx.logger.info(`[TMP_BOT] V1.0用户信息响应: ${JSON.stringify(userInfoResponse)}`);
-                        }
-                        const userList = userInfoResponse.page?.list || [];
-                        const userInfo = userList[0];
-                        rewardPoints = userInfo.rewardPoints || 0;
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] tmpQuery：开始查询TmpID ${tmpId} 的积分`);
                     }
+                    const userInfoUrl = `https://${url}/api/user/info/list?token=${token}&page=0&limit=7&tmpId=${tmpId}&tmpName=&teamId=&qq=&state=0&teamRole=`;
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] 请求用户信息: ${userInfoUrl}`);
+                    }
+                    const userInfoResponse = await ctx.http.post(userInfoUrl);
+                    if (logOutput) {
+                        ctx.logger.info(`[TMP_BOT] 用户信息响应: ${JSON.stringify(userInfoResponse)}`);
+                    }
+                    const userList = userInfoResponse.page?.list || [];
+                    const userInfo = userList[0];
+                    rewardPoints = userInfo.rewardPoints || 0;
                     message += `\n⭐ 当前车队积分: ${rewardPoints}`;
                 } catch (error) {
                     ctx.logger.error(`积分查询过程出错: ${error}`);

package/lib/index.js

@@ -21,7 +21,6 @@ const commands = {
     resetPassword: require('./command/ets-app/resetPassword/resetPassword'),
     queryPoint: require('./command/ets-app/queryPoint/queryPoint'),
     changePoint: require('./command/ets-app/changePoint/changePoint'),
-    addMember: require('./command/ets-app/addMember/addMemberV2'),
     pointRanking: require('./command/ets-app/pointRanking/pointRanking'),
     tmpVtc: require('./command/tmpVtc'),
     tmpVtcOnline: require('./command/tmpVtcOnline/tmpVtcOnline'),
@@ -88,7 +87,6 @@ exports.Config = koishi_1.Schema.intersect([
             mainSettings: koishi_1.Schema.boolean().default(false).description('是否启用车队平台积分查询功能'),
             resetPassword: koishi_1.Schema.boolean().default(false).description('是否启用车队平台重置密码功能'),
             changePoint: koishi_1.Schema.boolean().default(false).description('是否启用车队平台积分修改功能'),
-            addMember: koishi_1.Schema.boolean().default(false).description('是否启用车队平台新增成员功能'),
             tmpActivityService: koishi_1.Schema.boolean().default(false).description('是否启用车队活动查询'),
             tmpVersionCheck: koishi_1.Schema.boolean().default(false).description('是否启用TMP版本更新查询'),
             tmpQueryGameTime: koishi_1.Schema.boolean().default(true).description('是否启用游戏时长查询功能'),
@@ -136,18 +134,9 @@ exports.Config = koishi_1.Schema.intersect([
         mainSettings: koishi_1.Schema.object({
             settings: koishi_1.Schema.object({
                 Name: koishi_1.Schema.string().description("车队名称"),
-                platformVersion: koishi_1.Schema.union([
-                    koishi_1.Schema.const("v1").description("车队平台V1.0"),
-                    koishi_1.Schema.const("v2").description("车队平台V2.0")
-                ]).default("v1").description("车队平台版本"),
                 url: koishi_1.Schema.string().description("API服务器地址（不含协议）"),
                 token: koishi_1.Schema.string().description("API认证令牌"),
-                logOutput: koishi_1.Schema.boolean().description("是否输出日志").default(true),
-                mailEnabled: koishi_1.Schema.boolean().description("【V2.0】重置密码后发送邮件（需启用 adapter-mail）").default(false),
-                mailTo: koishi_1.Schema.string().description("【V2.0】重置密码通知邮箱（自定义邮箱地址）").default(""),
-                mailSubject: koishi_1.Schema.string().description("【V2.0】重置密码邮件标题").default("重置密码通知"),
-                mailTemplate: koishi_1.Schema.string().description("【V2.0】重置密码邮件内容模板，支持变量：{uid} {qq} {password} {psw}").default("我们已将您平台的密码进行重置，您的账号:{uid},新的密码为：{psw} 请妥善保管好您的密码，以防泄露"),
-                mailFromName: koishi_1.Schema.string().description("【V2.0】重置密码邮件发件人名字（覆盖 adapter-mail 的 name）").default(""),
+                logOutput: koishi_1.Schema.boolean().description("是否输出日志").default(true)
             }).description("车队平台配置")
         }).description("车队平台配置"),
         resetPassword: koishi_1.Schema.object({
@@ -160,12 +149,6 @@ exports.Config = koishi_1.Schema.intersect([
                 adminUsers: koishi_1.Schema.array(koishi_1.Schema.string()).description("管理员用户ID（拥有积分修改权限）").default([])
             })
         }).description("积分修改功能配置"),
-        addMember: koishi_1.Schema.object({
-            settings: koishi_1.Schema.object({
-                adminUsers: koishi_1.Schema.array(koishi_1.Schema.string()).description("管理员用户ID（拥有新增成员权限）").default([]),
-                teamNumberGenerateEnable: koishi_1.Schema.boolean().default(true).description("自动生成车队编号（关闭后需手动输入车队编号）")
-            })
-        }).description("新增成员功能配置"),
         tmpActivityService: koishi_1.Schema.object({
             api: koishi_1.Schema.object({
                 vtcId: koishi_1.Schema.string().description("VTC ID（用于TMP API）").default("")
@@ -403,10 +386,9 @@ function registerBaseCommands(ctx, cfg) {
 
     if (cfg.commands?.resetPassword) {
         ctx.command(`重置密码 [targetTeamId:string] [password:string]`, "重置欧卡车队平台密码")
-            .usage("V1.0使用teamId，V2.0使用QQ号；管理员可用 uid=12345；V2.0可指定新密码")
+            .usage("使用车队编号(teamId)指定目标；管理员可用 uid=12345")
             .example(`重置密码 - 重置自己的密码`)
             .example(`重置密码 789 - 管理员重置指定teamId的密码`)
-            .example(`重置密码 123456 Abc123def4 - V2.0指定QQ与新密码`)
             .action(async ({ session }, targetTeamId, password) => await commands.resetPassword(ctx, cfg, session, targetTeamId, password));
     }
 
@@ -420,20 +402,12 @@ function registerBaseCommands(ctx, cfg) {
 
     if (cfg.commands?.changePoint) {
         ctx.command(`积分修改 <target:string> <changeType:string> <quantity:string> <reason:string>`, "修改欧卡车队平台积分")
-            .usage("管理员专用。changeType: 增加 或 减少。target可输入车队编号(V1)或UID(V2)或@群成员。reason为备注原因(V1必填)")
+            .usage("管理员专用。changeType: 增加 或 减少。target可输入车队编号或@群成员。reason为备注原因")
             .example(`积分修改 @某人 增加 10 活动奖励 - 增加@某人10积分，备注活动奖励`)
             .example(`积分修改 5 减少 5 违规扣分 - 减少车队编号5的用户5积分，备注违规扣分`)
             .action(async ({ session }, target, changeType, quantity, reason) => await commands.changePoint(ctx, cfg, session, target, changeType, quantity, reason));
     }
 
-    if (cfg.commands?.addMember) {
-        ctx.command(`新增成员 <tmpId:string> <qq:string> [teamNumber:string]`, "新增车队平台成员")
-            .usage("管理员专用。qq可输入QQ号或@群成员。若关闭自动生成车队编号则需手动输入teamNumber")
-            .example(`新增成员 12345 79887143 - 自动生成车队编号`)
-            .example(`新增成员 12345 @某人 5 - 手动指定车队编号为5`)
-            .action(async ({ session }, tmpId, qq, teamNumber) => await commands.addMember(ctx, cfg, session, tmpId, qq, teamNumber));
-    }
-
     ctx.command('规则查询')
         .action(async () => 'TruckersMP官方规则链接：https://truckersmp.com/knowledge-base/article/746');
 }

package/lib/resource/footprint.html

@@ -249,6 +249,27 @@
       // 轨迹的分段（断点判定）与抽稀已在 Node 侧完成，这里直接渲染
       render(data.segments || [], data.mapType);
     }
+    // 量出上下两张悬浮卡片（玩家卡片 / 底部统计栏）真实占用的高度，作为 fitBounds 的留白。
+    // 写死数字会随字号、名字长度、图例与「统计开始日期」提示的增减而失准，所以按真实布局测量。
+    function measureOverlayPadding(side, gap) {
+      side = side === undefined ? 60 : side;
+      gap = gap === undefined ? 14 : gap;
+      const box = document.getElementById('container').getBoundingClientRect();
+      const header = document.querySelector('.header');
+      const bar = document.querySelector('.status-bar');
+      let top = header ? Math.max(0, header.getBoundingClientRect().bottom - box.top) + gap : 0;
+      let bottom = bar ? Math.max(0, box.bottom - bar.getBoundingClientRect().top) + gap : 0;
+
+      // 兜底：万一下方留白过大，按比例压缩，至少给轨迹留 80px 高度
+      const maxY = box.height - 80;
+      if (top + bottom > maxY) {
+        const k = maxY / (top + bottom);
+        top = Math.round(top * k);
+        bottom = Math.round(bottom * k);
+      }
+      return { side: side, top: top, bottom: bottom };
+    }
+
     function render(lines, mapType) {
       const config = mapConfig[mapType];
 
@@ -324,11 +345,12 @@
         }).addTo(map);
       });
 
-      // 自动适应（预留上下 UI 卡片区域；容器为正方形，尽量让正方形瓦片图占满）
+      // 自动适应（按上下两张悬浮卡片的实测高度预留留白，轨迹不会被卡片压住）
       if (allLatlngs.length > 0) {
+        const pad = measureOverlayPadding();
         map.fitBounds(L.latLngBounds(allLatlngs), {
-          paddingTopLeft: [60, 95],
-          paddingBottomRight: [60, 65]
+          paddingTopLeft: [pad.side, pad.top],
+          paddingBottomRight: [pad.side, pad.bottom]
         });
       }
     }