@windypro-rourou/dsh-logcat 0.6.4 → 0.6.5

package/lib/client.js

@@ -65,6 +65,13 @@ window.__ModuleLoader__.load({
 .lc-icobtn:hover { background: light-dark(rgba(0,0,0,.06), rgba(255,255,255,.1)); }
 .lc-icobtn[data-on] { background: light-dark(rgba(66,133,244,.12), rgba(66,133,244,.22)); border-color: rgba(66,133,244,.45); color: #4285f4; }
 .lc-hit { background: rgba(66,133,244,.28); border-radius: 2px; color: inherit; }
+.lc-log.compact { font-size: 11px; line-height: 15px; }
+.lc-line.lw-V { border-left: 3px solid rgba(158,158,158,.35); }
+.lc-line.lw-D { border-left: 3px solid #4fc3f7; }
+.lc-line.lw-I { border-left: 3px solid #4caf50; }
+.lc-line.lw-W { border-left: 3px solid #fbc02d; }
+.lc-line.lw-E { border-left: 3px solid #ef5350; }
+.lc-line.lw-F { border-left: 3px solid #ab47bc; }
 .lc-screen-img:fullscreen { background: #000; }
 .lc-toolbar { display: flex; align-items: center; gap: 6px; padding: 6px 12px; border-bottom: 1px solid light-dark(rgba(0,0,0,.1), rgba(255,255,255,.12)); flex: none; flex-wrap: wrap; }
 .lc-select, .lc-search { background: light-dark(rgba(0,0,0,.05), rgba(255,255,255,.08)); border: 1px solid light-dark(rgba(0,0,0,.16), rgba(255,255,255,.2)); border-radius: 7px; color: inherit; font: inherit; font-size: 12px; padding: 5px 9px; }
@@ -208,6 +215,7 @@ window.__ModuleLoader__.load({
 			const [keyword, setKeyword] = useState("");
 			const [autoScroll, setAutoScroll] = useState(true);
 			const [scrollTop, setScrollTop] = useState(0);
+			const [rowDensity, setRowDensity] = useState(() => { try { return localStorage.getItem("dsh-logcat-density") === "compact" ? "compact" : "std"; } catch { return "std"; } });
 			const [tab, setTab] = useState(() => { try { const t = localStorage.getItem("dsh-logcat-tab"); return t === "screen" || t === "re" ? t : "log"; } catch { return "log"; } });
 			const switchTab = (t) => { setTab(t); try { localStorage.setItem("dsh-logcat-tab", t); } catch { /* private mode */ } };
 			const [eventsOn, setEventsOn] = useState(false);
@@ -574,6 +582,15 @@ window.__ModuleLoader__.load({
 				}
 			};
 
+			// Toggle log row density (std 20px / compact 15px, remembered).
+			const toggleDensity = () => {
+				setRowDensity((prev) => {
+					const next = prev === "compact" ? "std" : "compact";
+					try { localStorage.setItem("dsh-logcat-density", next); } catch { /* private */ }
+					return next;
+				});
+			};
+
 			const device = devices.find((d) => d.serial === serial);
 			const deviceState = device?.state ?? "";
 			const live = connected && serial !== "" && streaming.includes(serial);
@@ -945,7 +962,7 @@ window.__ModuleLoader__.load({
 					h("h2", { className: "lc-title" }, "Logcat"),
 					h("span", { className: "lc-dot " + (live ? "on" : connected ? "warn" : "off") }),
 					h("span", { style: { fontSize: 12, color: "var(--lc-dim, #9e9e9e)" } },
-						live ? "实机日志流中" : connected ? "未选设备" : "未连接"),
+						live ? "实机日志流中" : devices.length === 0 ? "无设备" : connected ? "未选设备" : "未连接"),
 					h("select", {
 						className: "lc-select",
 						value: serial,
@@ -986,7 +1003,11 @@ window.__ModuleLoader__.load({
 							"电量 " + stats.batteryLevel + "%" + (BATTERY_STATUS[stats.batteryStatus] !== undefined ? " · " + BATTERY_STATUS[stats.batteryStatus] : ""))
 						: null,
 					spark.bat.length >= 2 ? h(Spark, { data: spark.bat, color: "#4caf50", width: 44, height: 14, title: "电量趋势" }) : null,
-					stats === null && serial !== "" ? h("span", { className: "lc-chip" }, "正在采集设备状态…") : null,
+					stats === null && serial !== "" && devices.length > 0
+						? h("span", { className: "lc-chip" }, "正在采集设备状态…")
+						: devices.length === 0
+							? h("span", { className: "lc-chip" }, "无设备 — 连接后自动采集状态")
+							: null,
 				),
 				h("div", { className: "lc-tabs" },
 					h("button", { type: "button", className: "lc-tab", "data-on": tab === "log" ? "" : undefined, onClick: () => switchTab("log") }, "日志"),
@@ -1151,10 +1172,10 @@ window.__ModuleLoader__.load({
 							: eventsOn
 							? (filteredEvents.length === 0
 								? h("div", { className: "lc-empty" }, "events 事件缓冲（已开启流，等待事件…）")
-								: h(VirtualLog, { entries: filteredEvents, scrollTop, onScrollTop: setScrollTop, bodyRef, keyword, onTagClick: addKeyword, onLineDblClick: copyLine }))
+								: h(VirtualLog, { entries: filteredEvents, scrollTop, onScrollTop: setScrollTop, bodyRef, keyword, onTagClick: addKeyword, onLineDblClick: copyLine, rowDensity }))
 							: (filtered.length === 0
-								? h("div", { className: "lc-empty" }, paused ? "已暂停（" + entries.length + " 条已缓冲）" : "暂无日志")
-								: h(VirtualLog, { entries: filtered, scrollTop, onScrollTop: setScrollTop, bodyRef, keyword, onTagClick: addKeyword, onLineDblClick: copyLine })),
+								? h("div", { className: "lc-empty" }, paused ? "已暂停（" + entries.length + " 条已缓冲）" : (devices.length === 0 ? "连接设备并开启 USB 调试后自动开始…" : "暂无日志"))
+								: h(VirtualLog, { entries: filtered, scrollTop, onScrollTop: setScrollTop, bodyRef, keyword, onTagClick: addKeyword, onLineDblClick: copyLine, rowDensity })),
 					tab === "log" && !eventsOn && live && !paused
 						? h("button", { type: "button", className: "lc-fab", onClick: togglePause, title: "暂停：冻结当前视图（新日志进入缓冲）" }, "⏸ 暂停")
 						: null,
@@ -1242,6 +1263,8 @@ window.__ModuleLoader__.load({
 					deviceState === "unauthorized"
 						? h("span", { style: { color: "#ef5350" } }, "⚠ 设备未授权 — 请在手机上点击“允许 USB 调试”")
 						: null,
+					h("button", { type: "button", className: "lc-btn", style: { padding: "1px 6px", marginLeft: "auto" }, onClick: toggleDensity, title: "日志行密度（标准 20px / 紧凑 15px）" },
+						rowDensity === "compact" ? "密集" : "标准"),
 				),
 			);
 		}
@@ -1287,9 +1310,9 @@ window.__ModuleLoader__.load({
 			return parts;
 		}
 
-		/** Windowed log list: fixed 20px rows, only the visible slice is rendered. */
-		function VirtualLog({ entries, scrollTop, onScrollTop, bodyRef, keyword, onTagClick, onLineDblClick }) {
-			const ROW = 20;
+		/** Windowed log list: fixed rows, only the visible slice is rendered. */
+		function VirtualLog({ entries, scrollTop, onScrollTop, bodyRef, keyword, onTagClick, onLineDblClick, rowDensity }) {
+			const ROW = rowDensity === "compact" ? 15 : 20;
 			const height = useRef(0);
 			const [viewport, setViewport] = useState({ top: 0, bottom: 100 });
 
@@ -1325,7 +1348,7 @@ window.__ModuleLoader__.load({
 				rows.push(
 					h("div", {
 						key: i,
-						className: "lc-line" + (e.cont === true ? " cont" : "") + (isCrash(e) ? " crash" : ""),
+						className: "lc-line" + (e.cont === true ? " cont" : "") + (isCrash(e) ? " crash" : "") + (level !== " " ? " lw-" + level : ""),
 						style: { top: i * ROW },
 						title: e.raw + "\n（点 tag 过滤 · 双击复制该行）",
 						onDoubleClick: () => { if (onLineDblClick) onLineDblClick(e.raw); },
@@ -1341,7 +1364,7 @@ window.__ModuleLoader__.load({
 
 			return h("div",
 				{
-					className: "lc-log",
+					className: "lc-log" + (rowDensity === "compact" ? " compact" : ""),
 					ref: bodyRef,
 					onScroll: (e) => { onScrollTop(e.target.scrollTop); },
 				},

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@windypro-rourou/dsh-logcat",
   "description": "Android Logcat viewer for the dsh web GUI: auto-connects to any adb device in debug mode, live logcat stream with level/keyword filters, pause/clear/export, plus agent tools (logcat_recent). Hot-pluggable — mounted via ~/.dsh/cordis.patch.yml + a profile node_modules copy, no dsh source changes.",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "type": "module",
   "packageManager": "pnpm@11.22.0",
   "engines": {