修复局域网遥控按键溢出以及菜单键失效
This commit is contained in:
mtvpls
@@ -4,7 +4,6 @@ import android.app.Activity;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
import android.view.KeyCharacterMap;
|
||||
import android.view.KeyEvent;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
@@ -12,6 +11,7 @@ import android.view.Window;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.FrameLayout;
|
||||
|
||||
import org.json.JSONObject;
|
||||
import org.mozilla.geckoview.GeckoRuntime;
|
||||
import org.mozilla.geckoview.GeckoSession;
|
||||
import org.mozilla.geckoview.GeckoView;
|
||||
@@ -93,57 +93,31 @@ public class MainActivity extends Activity implements RemoteCommandHandler {
|
||||
|
||||
@Override
|
||||
public void onRemoteKey(String key, boolean repeat, String digit) {
|
||||
int keyCode = keyCodeForRemoteKey(key, digit);
|
||||
if (keyCode == KeyEvent.KEYCODE_UNKNOWN) return;
|
||||
mainHandler.post(() -> {
|
||||
if (keyCode == KeyEvent.KEYCODE_BACK) {
|
||||
onBackPressed();
|
||||
return;
|
||||
}
|
||||
dispatchKeyCode(keyCode, repeat);
|
||||
});
|
||||
mainHandler.post(() -> dispatchLocalRemoteKey(key, repeat, digit));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRemoteText(String mode, String text) {
|
||||
mainHandler.post(() -> {
|
||||
String safeMode = mode == null ? "replace" : mode;
|
||||
if ("clear".equals(safeMode) || "replace".equals(safeMode)) {
|
||||
dispatchCtrlA();
|
||||
dispatchKeyCode(KeyEvent.KEYCODE_DEL, false);
|
||||
} else if ("backspace".equals(safeMode)) {
|
||||
dispatchKeyCode(KeyEvent.KEYCODE_DEL, false);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!"clear".equals(safeMode) && text != null && !text.isEmpty()) {
|
||||
dispatchText(text);
|
||||
}
|
||||
});
|
||||
mainHandler.post(() -> dispatchLocalRemoteText(mode, text));
|
||||
}
|
||||
|
||||
private void dispatchKeyCode(int keyCode, boolean repeat) {
|
||||
long now = System.currentTimeMillis();
|
||||
geckoView.dispatchKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_DOWN, keyCode, repeat ? 1 : 0));
|
||||
geckoView.dispatchKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_UP, keyCode, 0));
|
||||
private void dispatchLocalRemoteKey(String key, boolean repeat, String digit) {
|
||||
if (session == null || key == null) return;
|
||||
String script = "javascript:window.dispatchEvent(new CustomEvent('moontv:local-remote-key',{detail:{key:"
|
||||
+ JSONObject.quote(key)
|
||||
+ ",repeat:" + (repeat ? "true" : "false")
|
||||
+ ",digit:" + JSONObject.quote(digit == null ? "" : digit)
|
||||
+ "}}));void(0)";
|
||||
session.loadUri(script);
|
||||
}
|
||||
|
||||
private void dispatchCtrlA() {
|
||||
long now = System.currentTimeMillis();
|
||||
geckoView.dispatchKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A, 0, KeyEvent.META_CTRL_ON));
|
||||
geckoView.dispatchKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_UP, KeyEvent.KEYCODE_A, 0, KeyEvent.META_CTRL_ON));
|
||||
}
|
||||
|
||||
private void dispatchText(String text) {
|
||||
KeyEvent[] events = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD).getEvents(text.toCharArray());
|
||||
if (events != null) {
|
||||
for (KeyEvent event : events) {
|
||||
geckoView.dispatchKeyEvent(event);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
geckoView.dispatchKeyEvent(new KeyEvent(System.currentTimeMillis(), text, KeyCharacterMap.VIRTUAL_KEYBOARD, 0));
|
||||
private void dispatchLocalRemoteText(String mode, String text) {
|
||||
if (session == null) return;
|
||||
String script = "javascript:window.dispatchEvent(new CustomEvent('moontv:local-remote-text',{detail:{mode:"
|
||||
+ JSONObject.quote(mode == null ? "replace" : mode)
|
||||
+ ",text:" + JSONObject.quote(text == null ? "" : text)
|
||||
+ "}}));void(0)";
|
||||
session.loadUri(script);
|
||||
}
|
||||
|
||||
private String withLocalRemoteHash(String url) {
|
||||
|
||||
@@ -241,7 +241,7 @@ public class LocalRemoteServer {
|
||||
private String remoteHtml() {
|
||||
return "<!doctype html><html lang='zh-CN'><head><meta charset='utf-8'><meta name='viewport' content='width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no'>" +
|
||||
"<title>MoonTVPlus 局域网遥控器</title><style>" +
|
||||
":root{color-scheme:dark;--bg:#070816;--panel:rgba(255,255,255,.09);--panel2:rgba(255,255,255,.14);--line:rgba(255,255,255,.16);--text:#f8fafc;--muted:#a5b4fc;--primary:#6366f1;--ok:#fff;--danger:#fb7185}*{box-sizing:border-box}body{margin:0;min-height:100svh;font-family:Inter,system-ui,-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;background:radial-gradient(circle at 20% 0%,#312e81 0,#111827 34%,#070816 100%);color:var(--text);display:flex;align-items:center;justify-content:center;padding:18px}.shell{width:min(430px,100%)}.hero{margin-bottom:14px}.pill{display:inline-flex;gap:8px;align-items:center;border:1px solid var(--line);background:rgba(99,102,241,.16);color:#c7d2fe;border-radius:999px;padding:7px 11px;font-size:12px;font-weight:900}.dot{width:8px;height:8px;border-radius:999px;background:#10b981;box-shadow:0 0 18px #10b981}h1{font-size:clamp(30px,9vw,50px);line-height:.94;margin:14px 0 8px;letter-spacing:-.06em;font-weight:950}.sub{margin:0;color:#cbd5e1;font-size:14px;line-height:1.55}.card{border:1px solid var(--line);background:linear-gradient(180deg,rgba(255,255,255,.13),rgba(255,255,255,.06));box-shadow:0 24px 90px rgba(0,0,0,.42);backdrop-filter:blur(18px);border-radius:30px;padding:18px}.grid{display:grid;grid-template-columns:repeat(3,1fr);gap:12px}.digits{display:grid;grid-template-columns:repeat(5,1fr);gap:8px;margin-top:14px}.btn{min-height:62px;min-width:62px;border:1px solid var(--line);border-radius:22px;background:var(--panel);color:var(--text);font-size:22px;font-weight:950;cursor:pointer;touch-action:none;transition:background .18s,border-color .18s,transform .12s,box-shadow .18s}.btn:active{transform:translateY(1px);background:var(--panel2)}.btn:focus-visible,.send:focus-visible,.textbtn:focus-visible{outline:3px solid #818cf8;outline-offset:2px}.small{min-height:54px;border-radius:18px;font-size:15px}.digit{min-height:44px;border-radius:14px;font-size:18px}.ok{border-radius:999px;background:#f8fafc;color:#0f172a;box-shadow:0 14px 34px rgba(255,255,255,.14)}.spacer{min-height:1px}.textpanel{margin-top:14px;border:1px solid var(--line);border-radius:22px;background:rgba(0,0,0,.18);padding:12px}.label{margin-bottom:8px;color:#cbd5e1;font-size:13px;font-weight:900}.input{width:100%;min-height:82px;resize:none;border:1px solid var(--line);border-radius:16px;background:rgba(255,255,255,.08);color:var(--text);padding:11px 12px;font-size:15px;outline:none}.input:focus{border-color:#818cf8}.actions{display:grid;grid-template-columns:2fr 1fr 1fr;gap:8px;margin-top:8px}.send,.textbtn{min-height:42px;border-radius:14px;border:1px solid var(--line);font-weight:950;cursor:pointer}.send{background:#e11d48;color:#fff;border-color:#fb7185}.textbtn{background:rgba(255,255,255,.08);color:#e2e8f0}.status{margin-top:12px;color:#a5b4fc;font-size:12px;text-align:center}@media (prefers-reduced-motion:reduce){*{transition:none!important}}" +
|
||||
":root{color-scheme:dark;--bg:#070816;--panel:rgba(255,255,255,.09);--panel2:rgba(255,255,255,.14);--line:rgba(255,255,255,.16);--text:#f8fafc;--muted:#a5b4fc;--primary:#6366f1;--ok:#fff;--danger:#fb7185}*{box-sizing:border-box}body{margin:0;min-height:100svh;font-family:Inter,system-ui,-apple-system,BlinkMacSystemFont,'Segoe UI',sans-serif;background:radial-gradient(circle at 20% 0%,#312e81 0,#111827 34%,#070816 100%);color:var(--text);display:flex;align-items:center;justify-content:center;padding:18px}.shell{width:min(430px,100%)}.hero{margin-bottom:14px}.pill{display:inline-flex;gap:8px;align-items:center;border:1px solid var(--line);background:rgba(99,102,241,.16);color:#c7d2fe;border-radius:999px;padding:7px 11px;font-size:12px;font-weight:900}.dot{width:8px;height:8px;border-radius:999px;background:#10b981;box-shadow:0 0 18px #10b981}h1{font-size:clamp(30px,9vw,50px);line-height:.94;margin:14px 0 8px;letter-spacing:-.06em;font-weight:950}.sub{margin:0;color:#cbd5e1;font-size:14px;line-height:1.55}.card{border:1px solid var(--line);background:linear-gradient(180deg,rgba(255,255,255,.13),rgba(255,255,255,.06));box-shadow:0 24px 90px rgba(0,0,0,.42);backdrop-filter:blur(18px);border-radius:30px;padding:18px}.grid{display:grid;grid-template-columns:repeat(3,1fr);gap:12px}.digits{display:grid;grid-template-columns:repeat(5,1fr);gap:8px;margin-top:14px}.btn{min-height:62px;min-width:62px;border:1px solid var(--line);border-radius:22px;background:var(--panel);color:var(--text);font-size:22px;font-weight:950;cursor:pointer;touch-action:none;transition:background .18s,border-color .18s,transform .12s,box-shadow .18s}.btn:active{transform:translateY(1px);background:var(--panel2)}.btn:focus-visible,.send:focus-visible,.textbtn:focus-visible{outline:3px solid #818cf8;outline-offset:2px}.small{min-height:54px;border-radius:18px;font-size:15px}.digit{min-height:44px;min-width:0;border-radius:14px;font-size:18px}.ok{border-radius:999px;background:#f8fafc;color:#0f172a;box-shadow:0 14px 34px rgba(255,255,255,.14)}.spacer{min-height:1px}.textpanel{margin-top:14px;border:1px solid var(--line);border-radius:22px;background:rgba(0,0,0,.18);padding:12px}.label{margin-bottom:8px;color:#cbd5e1;font-size:13px;font-weight:900}.input{width:100%;min-height:82px;resize:none;border:1px solid var(--line);border-radius:16px;background:rgba(255,255,255,.08);color:var(--text);padding:11px 12px;font-size:15px;outline:none}.input:focus{border-color:#818cf8}.actions{display:grid;grid-template-columns:2fr 1fr 1fr;gap:8px;margin-top:8px}.send,.textbtn{min-height:42px;border-radius:14px;border:1px solid var(--line);font-weight:950;cursor:pointer}.send{background:#e11d48;color:#fff;border-color:#fb7185}.textbtn{background:rgba(255,255,255,.08);color:#e2e8f0}.status{margin-top:12px;color:#a5b4fc;font-size:12px;text-align:center}@media (prefers-reduced-motion:reduce){*{transition:none!important}}" +
|
||||
"</style></head><body><main class='shell'><section class='hero'><div class='pill'><span class='dot'></span><span>LAN REMOTE</span></div><h1>电视遥控器</h1><p class='sub'>手机与电视在同一局域网时，可直接控制 MoonTVPlus TV。</p></section><section class='card' aria-label='遥控器按键'><div class='grid'><button class='btn small' data-key='back' aria-label='返回'>↶</button><button class='btn small' data-key='home' aria-label='主页'>⌂</button><button class='btn small' data-key='menu' aria-label='菜单'>☰</button><span class='spacer'></span><button class='btn' data-key='up' aria-label='上'>↑</button><span class='spacer'></span><button class='btn' data-key='left' aria-label='左'>←</button><button class='btn ok' data-key='ok' aria-label='确认'>↵</button><button class='btn' data-key='right' aria-label='右'>→</button><span class='spacer'></span><button class='btn' data-key='down' aria-label='下'>↓</button><span class='spacer'></span></div><div class='digits'>" +
|
||||
"<button class='btn digit' data-digit='1'>1</button><button class='btn digit' data-digit='2'>2</button><button class='btn digit' data-digit='3'>3</button><button class='btn digit' data-digit='4'>4</button><button class='btn digit' data-digit='5'>5</button><button class='btn digit' data-digit='6'>6</button><button class='btn digit' data-digit='7'>7</button><button class='btn digit' data-digit='8'>8</button><button class='btn digit' data-digit='9'>9</button><button class='btn digit' data-digit='0'>0</button></div><div class='textpanel'><div class='label'>文本输入</div><textarea class='input' id='text' rows='3' placeholder='输入后发送到电视端当前输入框'></textarea><div class='actions'><button class='send' id='send'>发送</button><button class='textbtn' id='backspace'>退格</button><button class='textbtn' id='clear'>清空</button></div></div><div class='status' id='status'>正在连接电视...</div></section></main><script>" +
|
||||
"const token=new URLSearchParams(location.search).get('token')||'';const statusEl=document.getElementById('status');let ws;function setStatus(t){statusEl.textContent=t}function connect(){ws=new WebSocket('ws://'+location.host+'/ws?token='+encodeURIComponent(token));ws.onopen=()=>setStatus('已连接');ws.onclose=()=>{setStatus('连接断开，正在重连...');setTimeout(connect,1200)};ws.onerror=()=>setStatus('连接异常，请确认电视与手机在同一局域网')}function send(o){if(ws&&ws.readyState===1)ws.send(JSON.stringify(o))}connect();function key(k,repeat=false,digit){send({version:1,type:'key',command:{key:k,repeat,digit}})}document.querySelectorAll('[data-key]').forEach(btn=>{let timer=null,loop=null;const k=btn.dataset.key;const repeatable=['up','down','left','right'].includes(k);const stop=()=>{clearTimeout(timer);clearInterval(loop);timer=loop=null};btn.addEventListener('pointerdown',e=>{e.preventDefault();key(k,false);if(repeatable){timer=setTimeout(()=>{loop=setInterval(()=>key(k,true),135)},380)}});['pointerup','pointercancel','pointerleave'].forEach(n=>btn.addEventListener(n,stop));});document.querySelectorAll('[data-digit]').forEach(btn=>btn.addEventListener('click',()=>key('digit',false,btn.dataset.digit)));document.getElementById('send').onclick=()=>{const input=document.getElementById('text');send({version:1,type:'text',command:{mode:'replace',text:input.value}});setStatus('文本已发送')};document.getElementById('backspace').onclick=()=>send({version:1,type:'text',command:{mode:'backspace',text:''}});document.getElementById('clear').onclick=()=>{document.getElementById('text').value='';send({version:1,type:'text',command:{mode:'clear',text:''}})};document.getElementById('text').addEventListener('keydown',e=>{if(e.key==='Enter'&&(e.ctrlKey||e.metaKey))document.getElementById('send').click()});" +
|
||||
|
||||
@@ -181,26 +181,19 @@ public class MainActivity extends Activity implements RemoteCommandHandler {
|
||||
return KeyEvent.KEYCODE_UNKNOWN;
|
||||
}
|
||||
|
||||
|
||||
private void dispatchLocalRemoteKey(String key, boolean repeat, String digit) {
|
||||
if (webView == null || key == null) return;
|
||||
String safeKey = key.replace("\\", "\\\\").replace("'", "\\'");
|
||||
String safeDigit = digit == null ? "" : digit.replace("\\", "\\\\").replace("'", "\\'");
|
||||
String script = "window.dispatchEvent(new CustomEvent('moontv:local-remote-key',{detail:{key:'"
|
||||
+ safeKey + "',repeat:" + (repeat ? "true" : "false") + ",digit:'" + safeDigit + "'}}));";
|
||||
webView.evaluateJavascript(script, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onRemoteKey(String key, boolean repeat, String digit) {
|
||||
int keyCode = keyCodeForRemoteKey(key, digit);
|
||||
if (keyCode == KeyEvent.KEYCODE_UNKNOWN) return;
|
||||
mainHandler.post(() -> {
|
||||
if (keyCode == KeyEvent.KEYCODE_BACK) {
|
||||
onBackPressed();
|
||||
return;
|
||||
}
|
||||
long now = System.currentTimeMillis();
|
||||
KeyEvent down = new KeyEvent(now, now, KeyEvent.ACTION_DOWN, keyCode, repeat ? 1 : 0);
|
||||
KeyEvent up = new KeyEvent(now, now, KeyEvent.ACTION_UP, keyCode, 0);
|
||||
if (customView != null) {
|
||||
customView.dispatchKeyEvent(down);
|
||||
customView.dispatchKeyEvent(up);
|
||||
} else if (webView != null) {
|
||||
webView.dispatchKeyEvent(down);
|
||||
webView.dispatchKeyEvent(up);
|
||||
}
|
||||
});
|
||||
mainHandler.post(() -> dispatchLocalRemoteKey(key, repeat, digit));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -67,6 +67,13 @@ export default function TVRemoteReceiver() {
|
||||
} catch {}
|
||||
};
|
||||
|
||||
const onLocalRemoteKey = (event: Event) => {
|
||||
const detail = (event as CustomEvent<TVRemoteKeyCommand>).detail;
|
||||
if (detail?.key) {
|
||||
fireTVRemoteKey(detail);
|
||||
}
|
||||
};
|
||||
|
||||
const onLocalRemoteText = (event: Event) => {
|
||||
const detail = (event as CustomEvent<TVRemoteTextCommand>).detail;
|
||||
if (detail?.mode) {
|
||||
@@ -76,12 +83,14 @@ export default function TVRemoteReceiver() {
|
||||
|
||||
syncLocalRemoteUrl();
|
||||
window.addEventListener('hashchange', syncLocalRemoteUrl);
|
||||
window.addEventListener('moontv:local-remote-key', onLocalRemoteKey);
|
||||
window.addEventListener('moontv:local-remote-text', onLocalRemoteText);
|
||||
|
||||
const auth = getAuthInfoFromBrowserCookie();
|
||||
if (!auth?.username) {
|
||||
return () => {
|
||||
window.removeEventListener('hashchange', syncLocalRemoteUrl);
|
||||
window.removeEventListener('moontv:local-remote-key', onLocalRemoteKey);
|
||||
window.removeEventListener('moontv:local-remote-text', onLocalRemoteText);
|
||||
};
|
||||
}
|
||||
@@ -151,6 +160,7 @@ export default function TVRemoteReceiver() {
|
||||
document.removeEventListener('visibilitychange', onVisibilityChange);
|
||||
window.removeEventListener('focus', updateState);
|
||||
window.removeEventListener('hashchange', syncLocalRemoteUrl);
|
||||
window.removeEventListener('moontv:local-remote-key', onLocalRemoteKey);
|
||||
window.removeEventListener('moontv:local-remote-text', onLocalRemoteText);
|
||||
socket.off('connect', register);
|
||||
socket.off('tv-remote:key');
|
||||
|
||||
Reference in New Issue
Block a user