diff --git a/README.md b/README.md index 5e68a7a..1bcd31c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ShortX ToolHub -一个模块化的 ShortX JS 浮窗工具框架，支持广播关闭、子线程模型、日志记录、自动下载与热更新。 +一个模块化的 ShortX JS 浮窗工具框架，支持子模块自动下载、按 `Last-Modified` 热更新、启动日志记录，以及面向大图标库的分页式 ShortX 图标选择器。 --- @@ -10,31 +10,32 @@ ``` shortx.getShortXDir()/ ├── ToolHub/ -│ └── code/ -│ ├── th_01_base.js -│ ├── th_02_core.js -│ ├── th_03_icon.js -│ ├── th_04_theme.js -│ ├── th_05_persistence.js -│ ├── th_06_icon_parser.js -│ ├── th_07_shortcut.js -│ ├── th_08_content.js -│ ├── th_09_animation.js -│ ├── th_10_shell.js -│ ├── th_11_action.js -│ ├── th_12_rebuild.js -│ ├── th_13_panel_ui.js -│ ├── th_14_panels.js -│ ├── th_15_extra.js -│ └── th_16_entry.js -└── ToolHub/logs/ - └── init.log +│ ├── code/ +│ │ ├── th_01_base.js +│ │ ├── th_02_core.js +│ │ ├── th_03_icon.js +│ │ ├── th_04_theme.js +│ │ ├── th_05_persistence.js +│ │ ├── th_06_icon_parser.js +│ │ ├── th_07_shortcut.js +│ │ ├── th_08_content.js +│ │ ├── th_09_animation.js +│ │ ├── th_10_shell.js +│ │ ├── th_11_action.js +│ │ ├── th_12_rebuild.js +│ │ ├── th_13_panel_ui.js +│ │ ├── th_14_panels.js +│ │ ├── th_15_extra.js +│ │ └── th_16_entry.js +│ └── logs/ +│ └── init.log ``` ### 服务器（项目维护目录） ``` ToolHub/ -├── ToolHub.js # 入口文件（粘贴到 ShortX 任务） +├── ToolHub.js +├── README.md └── code/ ├── th_01_base.js ├── th_02_core.js @@ -58,135 +59,131 @@ ToolHub/ ## 部署步骤 -### 1. 创建目录（可省略） +### 1. 放置入口文件 +将 `ToolHub.js` 内容粘贴到 ShortX 任务中。 -入口文件会自动检测并创建 `ToolHub/code/` 目录，无需手动操作。 +### 2. 直接运行 +入口文件会自动： +1. 检查并创建 `ToolHub/code/` +2. 修复目录权限（`chmod 700` + `chown 1000:1000`） +3. 对 16 个子模块做 HEAD 检测 +4. 缺失或有更新时自动下载覆盖 +5. 记录启动日志到 `ToolHub/logs/init.log` -若需手动创建，在 ShortX 数据根目录下执行： -```bash -mkdir -p ToolHub/code -chmod 700 ToolHub/code -chown 1000:1000 ToolHub/code -``` +--- -### 2. 放置入口文件 +## 返回信息格式 -将 `ToolHub.js` 的内容粘贴到 ShortX 任务中。 - -子模块会自动从 git 仓库下载到 `ToolHub/code/`，无需手动复制。 - -### 3. 运行 - -执行 ShortX 任务，正常返回示例： +成功启动示例： ```json { "ok": true, "started": true, - "msg": "已按 WM 专属 HandlerThread 模型启动", + "msg": "ToolHub 启动成功：已按 WM 专属 HandlerThread 模型启动", + "syncMsg": "本次已覆盖更新 2 个子模块（新增 0 / 覆盖 2）：th_14_panels.js、th_16_entry.js", + "updatedCount": 2, + "updatedModules": ["th_14_panels.js", "th_16_entry.js"], "closeAction": "shortx.wm.floatball.CLOSE", "layout": {"cols": 2, "rows": 2} } ``` ---- - -## 自动下载与权限管理 - -入口文件启动时会自动完成以下操作： - -1. **缺失自检**：检查 `ToolHub/code/` 下的 16 个模块文件，缺失则从 git raw URL 自动下载 -2. **权限保障**：目录不存在时自动创建并设置 `chmod 700` + `chown 1000:1000` -3. **权限判断**：通过 `stat` 命令精确检查 uid/gid/mode，不正确才修复 -4. **单次检查**：一次启动中只检查一次目录权限，避免重复 shell 开销 - ---- - -## 版本管理与热更新 - -每个模块文件第一行必须包含版本注释： -```javascript -// @version 1.0.0 +无子模块更新时： +```json +{ + "ok": true, + "started": true, + "msg": "ToolHub 启动成功：已按 WM 专属 HandlerThread 模型启动", + "syncMsg": "子模块已是最新，本次未覆盖更新。", + "updatedCount": 0, + "updatedModules": [], + "closeAction": "shortx.wm.floatball.CLOSE", + "layout": {"cols": 2, "rows": 2} +} ``` -入口文件中的 `MODULE_MANIFEST` 定义各模块的期望版本。启动时若本地版本与期望版本不匹配，自动重新下载。 +如果有非关键模块加载失败，会额外返回： +- `loadMsg` +- `loadErrors` -升级模块时只需： -1. 更新模块文件中的 `@version` 版本号 -2. 同步更新 `ToolHub.js` 中 `MODULE_MANIFEST` 的对应版本号 -3. 推送到 git 仓库 -4. 实机下次启动时自动检测并更新 +如果启动失败，会额外返回： +- `err` --- -## 下载校验 +## 子模块热更新机制 -- **大小校验**：对比 HTTP `Content-Length` 与实际写入字节数，不匹配则抛异常 -- **内容校验**：读取下载文件前 200 字节，检测 `200KB） - -### 运行日志 -路径：`shortx.getShortXDir() + "/ToolHub/logs/"` - -日志文件按天分割，默认保留 3 天。 - ---- - -## 关闭浮窗 - -通过 adb 或 ShortX Shell 执行： -```bash -am broadcast -a shortx.wm.floatball.CLOSE +启动日志路径： +```text +shortx.getShortXDir() + "/ToolHub/logs/init.log" ``` ---- - -## 模块说明 - -| 文件 | 职责 | 线数参考 | -|------|------|---------| -| `th_01_base.js` | 基础工具函数、Logger、崩溃处理、进程信息获取 | ~1300 | -| `th_02_core.js` | FloatBallAppWM 构造函数、基础工具方法（dp/now/clamp） | ~124 | -| `th_03_icon.js` | 图标缓存/LRU、悬浮球图标加载（PNG 文件） | ~170 | -| `th_04_theme.js` | 屏幕/旋转、UI 样式辅助、莫奈动态取色、主题检测 | ~800 | -| `th_05_persistence.js` | 面板/位置/配置持久化、设置面板 schema 与编辑缓存 | ~298 | -| `th_06_icon_parser.js` | 快捷方式图标解析、resolveIconDrawable、图标文件路径 | ~485 | -| `th_07_shortcut.js` | 内置快捷方式选择器（合并 shortcuts.js）、分组过滤 | ~1175 | -| `th_08_content.js` | ContentProvider URI 解析、通用 query、统一入口 | ~209 | -| `th_09_animation.js` | 动画/视图管理、吸边停靠、屏幕监控、重建悬浮球 | ~662 | -| `th_10_shell.js` | Shell 智能执行（Action 优先 + 广播桥兜底） | ~33 | -| `th_11_action.js` | 按钮动作执行（点击/长按/双击） | ~320 | -| `th_12_rebuild.js` | 改大小后安全重建悬浮球 | ~76 | -| `th_13_panel_ui.js` | 设置面板 UI 组件（SectionHeader、SettingItemView 等） | ~375 | -| `th_14_panels.js` | 面板配置工厂、按钮构建器、对话框、文本查看器 | ~2957 | -| `th_15_extra.js` | 额外面板：设备信息、网络状态、快捷操作 | ~1598 | -| `th_16_entry.js` | 入口面板定义、广播接收器注册、启动流程 | ~324 | +记录内容包括： +- 目录创建 / 权限修复 +- 更新检测 +- 下载开始 / 结束 / 异常 +- 模块加载失败 +- 模块体积告警（>200KB） --- -## 模块加载容错 +## 模块职责 -- `for` 循环加载 16 个模块，单模块失败记录日志但不阻断后续加载 -- `th_16_entry.js` 失败时直接抛异常（启动必备） -- 错误信息落盘到 `ToolHub/logs/init.log`，便于实机排查 +| 文件 | 职责 | +|------|------| +| `th_01_base.js` | 基础工具、日志、配置校验、通用辅助 | +| `th_02_core.js` | `FloatBallAppWM` 构造、基础状态与核心工具 | +| `th_03_icon.js` | 图标缓存、Bitmap 管理、悬浮球图标加载 | +| `th_04_theme.js` | 主题、颜色、样式工具 | +| `th_05_persistence.js` | 持久化与设置数据层 | +| `th_06_icon_parser.js` | 图标解析、ShortX 内置图标扫描与回退 | +| `th_07_shortcut.js` | 快捷方式选择器 | +| `th_08_content.js` | ContentProvider 读取与通用 query | +| `th_09_animation.js` | 面板动画、吸边、显示/隐藏管理 | +| `th_10_shell.js` | Shell 执行层 | +| `th_11_action.js` | 按钮动作分发与执行 | +| `th_12_rebuild.js` | 悬浮球重建逻辑 | +| `th_13_panel_ui.js` | 设置面板通用 UI 组件 | +| `th_14_panels.js` | 设置面板、按钮编辑器、ShortX 图标分页选择器 | +| `th_15_extra.js` | 主面板与附加展示层 | +| `th_16_entry.js` | 生命周期、广播注册、启动与销毁 | --- ## 注意事项 -- 入口文件通过 `loadScript()` 动态加载子模块，`var` 声明通过间接 `eval` 挂到全局作用域 -- 子模块加载顺序不可更改：base → core → icon → theme → persistence → icon_parser → shortcut → content → animation → shell → action → rebuild → panel_ui → panels → extra → entry -- 调试请查看日志文件，不通过返回 JSON 暴露内部细节 -- 单个模块建议不超过 200KB，超过时启动日志会记录 WARN 提示拆分 +- 入口文件只负责加载与汇总返回信息，不承载业务 UI +- `th_16_entry.js` 属于关键模块，加载失败会直接中止启动 +- 不建议把调试细节直接塞进返回 JSON，优先写日志；返回信息只保留用户判断启动/更新所需的关键信息 +- 若修改了模块结构、返回字段、图标选择器交互，记得同步更新 README 与相关技能说明 diff --git a/ToolHub.js b/ToolHub.js index fc60328..a50864e 100644 --- a/ToolHub.js +++ b/ToolHub.js @@ -6729,18 +6729,79 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { statusTv: null, searchEt: null, grid: null, + gridScroll: null, pickerWrap: null, toggleBtn: null, clearBtn: null, - pageSize: 20, + pageSize: 0, currentPage: 0, activeTab: "all", tabButtons: {}, pageInfoTv: null, prevBtn: null, - nextBtn: null + nextBtn: null, + pageCols: 4, + pageRows: 0, + cellWidthDp: 76, + cellHeightDp: 92, + cellMarginDp: 4, + lastMeasuredGridHeight: 0 }; + function getShortXPickerClosedLabel() { + return "展开图标库"; + } + + function getShortXPickerOpenedLabel() { + return "收起图标库"; + } + + function scrollShortXGridToTop() { + try { + if (shortxPickerState.gridScroll) { + shortxPickerState.gridScroll.post(new java.lang.Runnable({ + run: function() { + try { shortxPickerState.gridScroll.fullScroll(android.view.View.FOCUS_UP); } catch(eScroll0) {} + try { shortxPickerState.gridScroll.scrollTo(0, 0); } catch(eScroll1) {} + } + })); + } + } catch(eScrollWrap) {} + } + + function resolveShortXPickerPageSize() { + var cols = Number(shortxPickerState.pageCols || 4); + if (cols < 1) cols = 4; + var fallbackHeight = self.dp(520); + var rawHeight = 0; + try { + if (shortxPickerState.gridScroll) rawHeight = Number(shortxPickerState.gridScroll.getHeight() || 0); + } catch(eH0) {} + if (rawHeight <= 0) rawHeight = fallbackHeight; + var cellOuterHeight = self.dp(Number(shortxPickerState.cellHeightDp || 92) + Number(shortxPickerState.cellMarginDp || 4) * 2); + if (cellOuterHeight <= 0) cellOuterHeight = self.dp(100); + var rows = Math.max(1, Math.floor(rawHeight / cellOuterHeight)); + var size = Math.max(cols, rows * cols); + shortxPickerState.pageRows = rows; + shortxPickerState.lastMeasuredGridHeight = rawHeight; + shortxPickerState.pageSize = size; + return size; + } + + function setShortXPickerExpanded(expanded, doRender) { + shortxPickerState.expanded = !!expanded; + if (shortxPickerState.pickerWrap) { + shortxPickerState.pickerWrap.setVisibility(shortxPickerState.expanded ? android.view.View.VISIBLE : android.view.View.GONE); + } + try { + if (shortxPickerState.toggleBtn) shortxPickerState.toggleBtn.setText(shortxPickerState.expanded ? getShortXPickerOpenedLabel() : getShortXPickerClosedLabel()); + } catch(eToggleTxt) {} + if (shortxPickerState.expanded && doRender !== false) { + resolveShortXPickerPageSize(); + renderShortXIconGrid(); + } + } + var shortxQuickRow = new android.widget.LinearLayout(context); shortxQuickRow.setOrientation(android.widget.LinearLayout.HORIZONTAL); shortxQuickRow.setGravity(android.view.Gravity.CENTER_VERTICAL); @@ -6774,14 +6835,9 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { shortxBtnGap.setLayoutParams(new android.widget.LinearLayout.LayoutParams(self.dp(8), 1)); shortxQuickRow.addView(shortxBtnGap); - var btnBrowseShortXIcon = self.ui.createFlatButton(self, "图标库", C.primary, function() { + var btnBrowseShortXIcon = self.ui.createFlatButton(self, getShortXPickerClosedLabel(), C.primary, function() { self.touchActivity(); - shortxPickerState.expanded = !shortxPickerState.expanded; - if (shortxPickerState.pickerWrap) { - shortxPickerState.pickerWrap.setVisibility(shortxPickerState.expanded ? android.view.View.VISIBLE : android.view.View.GONE); - } - try { if (shortxPickerState.toggleBtn) shortxPickerState.toggleBtn.setText(shortxPickerState.expanded ? "收起" : "图标库"); } catch(eT1) {} - if (shortxPickerState.expanded) renderShortXIconGrid(); + setShortXPickerExpanded(!shortxPickerState.expanded, true); }); shortxPickerState.toggleBtn = btnBrowseShortXIcon; shortxQuickRow.addView(btnBrowseShortXIcon); @@ -10935,85 +10991,80 @@ FloatBallAppWM.prototype.startAsync = function(entryProcInfo, closeRule) { // =======================【执行（入口线程）】====================== var __out = (function() { + function optStr(v) { + return (v === undefined || v === null) ? "" : String(v); + } + function summarizeModuleUpdates(list) { + var names = []; + var created = 0; + var overwritten = 0; + var i; + for (i = 0; i < list.length; i++) { + var item = list[i] || {}; + var name = optStr(item.module); + if (name) names.push(name); + if (item.isNew) created++; else overwritten++; + } + if (names.length === 0) { + return { + count: 0, + modules: [], + msg: "子模块已是最新，本次未覆盖更新。" + }; + } + return { + count: names.length, + modules: names, + msg: "本次已覆盖更新 " + names.length + " 个子模块（新增 " + created + " / 覆盖 " + overwritten + "）：" + names.join("、") + }; + } + function summarizeLoadErrors(list) { + var names = []; + var i; + for (i = 0; i < list.length; i++) { + var item = list[i] || {}; + var name = optStr(item.module); + if (name) names.push(name); + } + return { + count: names.length, + modules: names, + msg: names.length ? ("有 " + names.length + " 个子模块加载失败：" + names.join("、")) : "所有子模块加载正常。" + }; + } + var entryInfo = getProcessInfo("entry"); - - // # 初始化 logger var logger = new ToolHubLogger(entryInfo); - // # 安装崩溃处理 - var crashHandlerInstalled = installCrashHandler(logger); - - // # 启动 app + installCrashHandler(logger); var app = new FloatBallAppWM(logger); - - // # 计算广播 action（支持规则） var closeRule = String(app.config.ACTION_CLOSE_ALL_RULE || "shortx.wm.floatball.CLOSE"); - var startRet = null; - try { startRet = app.startAsync(entryInfo, closeRule); } catch (eTop) { try { logger.fatal("TOP startAsync crash err=" + String(eTop)); } catch (eLog) {} startRet = { ok: false, err: String(eTop) }; } - - // # 中文摘要（方便 ShortX 日志/结果中快速识别） - var _btnCount = (startRet && startRet.buttons != null) ? startRet.buttons : 0; - var _layout = (startRet && startRet.layout) ? startRet.layout : { cols: app.config.PANEL_COLS, rows: app.config.PANEL_ROWS }; - var _closeAction = String(startRet && startRet.closeAction ? startRet.closeAction : "shortx.wm.floatball.CLOSE"); - var _logEnabled = !!app.config.LOG_ENABLE; - var _logDays = Math.max(1, Math.floor(Number(app.config.LOG_KEEP_DAYS || 3))); - - // # 返回信息 - return { - ok: true, - result: startRet, - process: entryInfo, - crashHandlerInstalled: !!crashHandlerInstalled, - log: { - enable: _logEnabled, - debug: !!app.config.LOG_DEBUG, - keepDays: _logDays, - dirActive: String(logger.dir || ""), - prefix: String(app.config.LOG_PREFIX || "ShortX_ToolHub"), - lastInitErr: String(logger.lastInitErr || "") - }, - shell: { - useActionFirstDefault: false, - hasShellCommandClass: false, - bridge: { - action: String(app.config.SHELL_BRIDGE_ACTION), - extraCmd: String(app.config.SHELL_BRIDGE_EXTRA_CMD), - extraFrom: String(app.config.SHELL_BRIDGE_EXTRA_FROM), - extraRoot: String(app.config.SHELL_BRIDGE_EXTRA_ROOT), - defaultRoot: !!app.config.SHELL_BRIDGE_DEFAULT_ROOT - } - }, - content: { - maxRows: Number(app.config.CONTENT_MAX_ROWS || 20), - viewerTextSp: Number(app.config.CONTENT_VIEWER_TEXT_SP || 12) - }, - suggestCloseShell: "am broadcast -a " + _closeAction, - suggestTaskerProfile: { - event: "Intent Received", - action: String(app.config.SHELL_BRIDGE_ACTION), - readExtras: [ - { key: String(app.config.SHELL_BRIDGE_EXTRA_CMD), var: "%cmd" }, - { key: String(app.config.SHELL_BRIDGE_EXTRA_ROOT), var: "%root" } - ], - exec: "Run Shell (root=%root) cmd=%cmd" - }, - // ========== 中文摘要（供 ShortX 结果查看）========== - 状态: (startRet && startRet.ok) ? "✅ 启动成功" : "❌ 启动失败", - 悬浮球: (startRet && startRet.ok) ? "已显示" : "未显示", - 关闭指令: "am broadcast -a " + _closeAction, - 按钮数量: String(_btnCount) + " 个", - 面板布局: String(_layout.cols) + " 列 × " + String(_layout.rows) + " 行", - 日志: (_logEnabled ? "📝 已启用" : "📝 已禁用") + " · 保留 " + String(_logDays) + " 天", - 崩溃处理: !!crashHandlerInstalled ? "🛡️ 已安装" : "⚠️ 未安装", - 线程模型: "HandlerThread（WM 专属）", - 消息: (startRet && startRet.msg) ? String(startRet.msg) : "" + var syncInfo = summarizeModuleUpdates(__moduleUpdates); + var loadInfo = summarizeLoadErrors(loadErrors); + var started = !!(startRet && startRet.ok); + var rawMsg = optStr(startRet && startRet.msg); + var out = { + ok: started, + started: started, + msg: started ? (rawMsg ? ("ToolHub 启动成功：" + rawMsg) : "ToolHub 启动成功") : "ToolHub 启动失败", + syncMsg: syncInfo.msg, + updatedCount: syncInfo.count, + updatedModules: syncInfo.modules, + closeAction: optStr(startRet && startRet.closeAction), + layout: startRet && startRet.layout || null }; + if (loadInfo.count > 0) { + out.loadMsg = loadInfo.msg; + out.loadErrors = loadInfo.modules; + } + if (!started) out.err = optStr(startRet && startRet.err) || "未知错误"; + return out; })(); JSON.stringify(__out); diff --git a/code/th_14_panels.js b/code/th_14_panels.js index e5c93c3..3f53f41 100644 --- a/code/th_14_panels.js +++ b/code/th_14_panels.js @@ -671,18 +671,79 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { statusTv: null, searchEt: null, grid: null, + gridScroll: null, pickerWrap: null, toggleBtn: null, clearBtn: null, - pageSize: 20, + pageSize: 0, currentPage: 0, activeTab: "all", tabButtons: {}, pageInfoTv: null, prevBtn: null, - nextBtn: null + nextBtn: null, + pageCols: 4, + pageRows: 0, + cellWidthDp: 76, + cellHeightDp: 92, + cellMarginDp: 4, + lastMeasuredGridHeight: 0 }; + function getShortXPickerClosedLabel() { + return "展开图标库"; + } + + function getShortXPickerOpenedLabel() { + return "收起图标库"; + } + + function scrollShortXGridToTop() { + try { + if (shortxPickerState.gridScroll) { + shortxPickerState.gridScroll.post(new java.lang.Runnable({ + run: function() { + try { shortxPickerState.gridScroll.fullScroll(android.view.View.FOCUS_UP); } catch(eScroll0) {} + try { shortxPickerState.gridScroll.scrollTo(0, 0); } catch(eScroll1) {} + } + })); + } + } catch(eScrollWrap) {} + } + + function resolveShortXPickerPageSize() { + var cols = Number(shortxPickerState.pageCols || 4); + if (cols < 1) cols = 4; + var fallbackHeight = self.dp(520); + var rawHeight = 0; + try { + if (shortxPickerState.gridScroll) rawHeight = Number(shortxPickerState.gridScroll.getHeight() || 0); + } catch(eH0) {} + if (rawHeight <= 0) rawHeight = fallbackHeight; + var cellOuterHeight = self.dp(Number(shortxPickerState.cellHeightDp || 92) + Number(shortxPickerState.cellMarginDp || 4) * 2); + if (cellOuterHeight <= 0) cellOuterHeight = self.dp(100); + var rows = Math.max(1, Math.floor(rawHeight / cellOuterHeight)); + var size = Math.max(cols, rows * cols); + shortxPickerState.pageRows = rows; + shortxPickerState.lastMeasuredGridHeight = rawHeight; + shortxPickerState.pageSize = size; + return size; + } + + function setShortXPickerExpanded(expanded, doRender) { + shortxPickerState.expanded = !!expanded; + if (shortxPickerState.pickerWrap) { + shortxPickerState.pickerWrap.setVisibility(shortxPickerState.expanded ? android.view.View.VISIBLE : android.view.View.GONE); + } + try { + if (shortxPickerState.toggleBtn) shortxPickerState.toggleBtn.setText(shortxPickerState.expanded ? getShortXPickerOpenedLabel() : getShortXPickerClosedLabel()); + } catch(eToggleTxt) {} + if (shortxPickerState.expanded && doRender !== false) { + resolveShortXPickerPageSize(); + renderShortXIconGrid(); + } + } + var shortxQuickRow = new android.widget.LinearLayout(context); shortxQuickRow.setOrientation(android.widget.LinearLayout.HORIZONTAL); shortxQuickRow.setGravity(android.view.Gravity.CENTER_VERTICAL); @@ -716,17 +777,9 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { shortxBtnGap.setLayoutParams(new android.widget.LinearLayout.LayoutParams(self.dp(8), 1)); shortxQuickRow.addView(shortxBtnGap); - var btnBrowseShortXIcon = self.ui.createFlatButton(self, "选择图标", C.primary, function() { + var btnBrowseShortXIcon = self.ui.createFlatButton(self, getShortXPickerClosedLabel(), C.primary, function() { self.touchActivity(); - self.showIconPicker({ - onPick: function(iconName) { - try { - var shortName = self.normalizeShortXIconName(iconName, false); - inputShortXIcon.input.setText(shortName); - updateShortXIconPreview(); - } catch(ePick) {} - } - }); + setShortXPickerExpanded(!shortxPickerState.expanded, true); }); shortxPickerState.toggleBtn = btnBrowseShortXIcon; shortxQuickRow.addView(btnBrowseShortXIcon); @@ -752,7 +805,7 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { shortxPickerState.pickerWrap = shortxPickerWrap; var shortxPickerHead = new android.widget.TextView(context); - shortxPickerHead.setText("ShortX 图标库（支持搜索，点击即回填）"); + shortxPickerHead.setText("ShortX 图标库（分页模式，支持搜索 / 分类 / 点击即回填）"); shortxPickerHead.setTextColor(subTextColor); shortxPickerHead.setTextSize(android.util.TypedValue.COMPLEX_UNIT_SP, 12); shortxPickerHead.setPadding(self.dp(12), self.dp(10), self.dp(12), self.dp(6)); @@ -833,6 +886,7 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { function goShortXPage(delta) { shortxPickerState.currentPage = Math.max(0, Number(shortxPickerState.currentPage || 0) + Number(delta || 0)); + scrollShortXGridToTop(); renderShortXIconGrid(); } @@ -866,6 +920,7 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { shortxPickerState.activeTab = def.key; shortxPickerState.currentPage = 0; applyShortXTabStyles(); + scrollShortXGridToTop(); renderShortXIconGrid(); }); tabBtn.setPadding(self.dp(10), self.dp(4), self.dp(10), self.dp(4)); @@ -883,6 +938,7 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { var shortxGridScrollLp = new android.widget.LinearLayout.LayoutParams(android.widget.LinearLayout.LayoutParams.MATCH_PARENT, self.dp(520)); shortxGridScrollLp.setMargins(self.dp(8), 0, self.dp(8), self.dp(8)); shortxPickerWrap.addView(shortxGridScroll, shortxGridScrollLp); + shortxPickerState.gridScroll = shortxGridScroll; var shortxGrid = new android.widget.GridLayout(context); try { shortxGrid.setColumnCount(4); } catch(eGC0) {} @@ -915,7 +971,7 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { try { if (!shortxPickerState.grid) return; shortxPickerState.grid.removeAllViews(); - try { shortxPickerState.grid.setColumnCount(4); } catch(eColSet) {} + try { shortxPickerState.grid.setColumnCount(Number(shortxPickerState.pageCols || 4)); } catch(eColSet) {} var icons = self.getShortXIconCatalog(); shortxPickerState.iconList = icons; var query = ""; @@ -935,7 +991,7 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { filtered.push(item); } } - var pageSize = Number(shortxPickerState.pageSize || 20); + var pageSize = resolveShortXPickerPageSize(); if (pageSize < 1) pageSize = 20; var totalPages = filtered.length > 0 ? Math.ceil(filtered.length / pageSize) : 1; if (shortxPickerState.currentPage >= totalPages) shortxPickerState.currentPage = totalPages - 1; @@ -948,13 +1004,13 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { var errMsg = self._shortxIconCatalogError ? String(self._shortxIconCatalogError) : "未知原因"; shortxPickerState.statusTv.setText("ShortX 图标反射失败/为空：" + errMsg); } else if (!query) { - shortxPickerState.statusTv.setText("分类[" + shortxPickerState.activeTab + "] 共 " + filtered.length + " 个，当前第 " + (shortxPickerState.currentPage + 1) + "/" + totalPages + " 页。"); + shortxPickerState.statusTv.setText("分类[" + shortxPickerState.activeTab + "] 共 " + filtered.length + " 个，每页 " + pageSize + " 个（" + shortxPickerState.pageRows + " 行 × " + shortxPickerState.pageCols + " 列），当前第 " + (shortxPickerState.currentPage + 1) + "/" + totalPages + " 页。"); } else { - shortxPickerState.statusTv.setText("分类[" + shortxPickerState.activeTab + "] 搜索 [" + query + "] 命中 " + totalMatch + " 个，当前第 " + (shortxPickerState.currentPage + 1) + "/" + totalPages + " 页。"); + shortxPickerState.statusTv.setText("分类[" + shortxPickerState.activeTab + "] 搜索 [" + query + "] 命中 " + totalMatch + " 个，每页 " + pageSize + " 个，当前第 " + (shortxPickerState.currentPage + 1) + "/" + totalPages + " 页。"); } } if (shortxPickerState.pageInfoTv) { - shortxPickerState.pageInfoTv.setText((filtered.length > 0 ? (shortxPickerState.currentPage + 1) : 0) + " / " + totalPages + " · " + filtered.length + "项"); + shortxPickerState.pageInfoTv.setText((filtered.length > 0 ? (shortxPickerState.currentPage + 1) : 0) + " / " + totalPages + " · " + filtered.length + "项 · 每页" + pageSize + "个"); } try { shortxPickerState.prevBtn.setEnabled(shortxPickerState.currentPage > 0); } catch(ePrev) {} try { shortxPickerState.nextBtn.setEnabled(shortxPickerState.currentPage < totalPages - 1); } catch(eNext) {} @@ -968,9 +1024,9 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { cell.setGravity(android.view.Gravity.CENTER_HORIZONTAL); cell.setPadding(self.dp(8), self.dp(8), self.dp(8), self.dp(8)); var lp = new android.widget.GridLayout.LayoutParams(); - lp.width = self.dp(76); - lp.height = self.dp(92); - lp.setMargins(self.dp(4), self.dp(4), self.dp(4), self.dp(4)); + lp.width = self.dp(Number(shortxPickerState.cellWidthDp || 76)); + lp.height = self.dp(Number(shortxPickerState.cellHeightDp || 92)); + lp.setMargins(self.dp(Number(shortxPickerState.cellMarginDp || 4)), self.dp(Number(shortxPickerState.cellMarginDp || 4)), self.dp(Number(shortxPickerState.cellMarginDp || 4)), self.dp(Number(shortxPickerState.cellMarginDp || 4))); cell.setLayoutParams(lp); var isSelected = selectedShort && selectedShort === String(entry.shortName); cell.setBackground(self.ui.createRoundDrawable(self.withAlpha(isSelected ? C.primary : cardColor, isSelected ? 0.18 : 0.96), self.dp(12))); @@ -999,9 +1055,8 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { self.touchActivity(); try { inputShortXIcon.input.setText(String(entry.shortName)); } catch(eSetI) {} updateShortXIconPreview(); - shortxPickerState.expanded = false; - if (shortxPickerState.pickerWrap) shortxPickerState.pickerWrap.setVisibility(android.view.View.GONE); - try { if (shortxPickerState.toggleBtn) shortxPickerState.toggleBtn.setText("图标库"); } catch(eSetT) {} + scrollShortXGridToTop(); + setShortXPickerExpanded(false, false); } })); shortxPickerState.grid.addView(cell); @@ -1016,6 +1071,7 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { shortxSearchEt.addTextChangedListener(new JavaAdapter(android.text.TextWatcher, { afterTextChanged: function(s) { shortxPickerState.currentPage = 0; + scrollShortXGridToTop(); renderShortXIconGrid(); }, beforeTextChanged: function(s, st, c, a) {}, @@ -1031,6 +1087,19 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { })); } catch(eTwIcon1) {} + try { + shortxGridScroll.getViewTreeObserver().addOnGlobalLayoutListener(new android.view.ViewTreeObserver.OnGlobalLayoutListener({ + onGlobalLayout: function() { + if (!shortxPickerState.expanded) return; + var oldSize = Number(shortxPickerState.pageSize || 0); + var newSize = resolveShortXPickerPageSize(); + if (newSize > 0 && newSize !== oldSize) { + shortxPickerState.currentPage = 0; + renderShortXIconGrid(); + } + } + })); + } catch(eGridLayoutWatch) {} // # ShortX 图标颜色（默认跟随主题） var defaultTint = targetBtn.iconTint || ""; if (!defaultTint) { @@ -1063,7 +1132,7 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { shortxPickerWrap.setVisibility(android.view.View.GONE); inputShortXIconTint.view.setVisibility(android.view.View.GONE); shortxPickerState.expanded = false; - try { if (shortxPickerState.toggleBtn) shortxPickerState.toggleBtn.setText("图标库"); } catch(eBt0) {} + try { if (shortxPickerState.toggleBtn) shortxPickerState.toggleBtn.setText(getShortXPickerClosedLabel()); } catch(eBt0) {} // 清空另一种方式的值 inputShortXIcon.input.setText(""); inputShortXIconTint.input.setText(""); @@ -1072,10 +1141,6 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { inputShortXIcon.view.setVisibility(android.view.View.VISIBLE); shortxQuickRow.setVisibility(android.view.View.VISIBLE); inputShortXIconTint.view.setVisibility(android.view.View.VISIBLE); - // 不再展开内联面板 - shortxPickerState.expanded = false; - if (shortxPickerState.pickerWrap) shortxPickerWrap.setVisibility(android.view.View.GONE); - try { if (shortxPickerState.toggleBtn) shortxPickerState.toggleBtn.setText("选择图标"); } catch(eBt1) {} // 清空另一种方式的值 inputIconPath.input.setText(""); // # ShortX 图标颜色默认跟随主题 @@ -1087,7 +1152,7 @@ FloatBallAppWM.prototype.buildButtonEditorPanelView = function() { } } catch(e) {} updateShortXIconPreview(); - renderShortXIconGrid(); + setShortXPickerExpanded(true, true); } }