fix(输入法): 消除RTOS和Android文字键盘间距

com.sydxky.rtos.inputmethod/tests/client.test.mjs

@@ -2,6 +2,7 @@ import fs from 'node:fs'
 import vm from 'node:vm'
 import assert from 'node:assert/strict'
 import * as engine from '../src/common/ime-engine.js'
+import {normalizeTheme,themeStyles as stylesForTheme} from '../src/common/ime-theme.js'
 const ux=fs.readFileSync(new URL('../src/keyboard/index.ux',import.meta.url),'utf8')
 const source=ux.match(/<script>([\s\S]*?)<\/script>/)[1].replace(/^\s*import .+$/gm,'').replace('export default','module.exports=')
 let count=0
@@ -9,7 +10,7 @@ const closed=[],store=new Map(),timers=new Map();let nextTimer=1,storageFails=fa
 function check(ok,label){assert.ok(ok,label);count++}
 function page(params={}){
  const module={exports:{}}
- vm.runInNewContext(source,{module,console,...engine,router:{close(p,r){closed.push(r)}},storage:{get:k=>store.get(k),set:(k,v)=>{if(storageFails)throw Error('storage full');store.set(k,v)},delete:k=>store.delete(k)},file:{readText:async({uri})=>fs.readFileSync(new URL('../src'+uri,import.meta.url),'utf8')},setTimeout:fn=>{const id=nextTimer++;timers.set(id,fn);return id},clearTimeout:id=>timers.delete(id),setInterval:fn=>{const id=nextTimer++;timers.set(id,fn);return id},clearInterval:id=>timers.delete(id)})
+ vm.runInNewContext(source,{module,console,...engine,normalizeTheme,stylesForTheme,router:{close(p,r){closed.push(r)}},storage:{get:k=>store.get(k),set:(k,v)=>{if(storageFails)throw Error('storage full');store.set(k,v)},delete:k=>store.delete(k)},file:{readText:async({uri})=>fs.readFileSync(new URL('../src'+uri,import.meta.url),'utf8')},setTimeout:fn=>{const id=nextTimer++;timers.set(id,fn);return id},clearTimeout:id=>timers.delete(id),setInterval:fn=>{const id=nextTimer++;timers.set(id,fn);return id},clearInterval:id=>timers.delete(id)})
  const p={...module.exports,...JSON.parse(JSON.stringify(module.exports.data)),...params};delete p.data;p.onInit();return p
 }
 let p=page();check(p.mode==='t9'&&!p.learning,'T9 large keys, learning opt-in')

com.sydxky.rtos.inputmethod/tests/layout.py

@@ -17,12 +17,13 @@ def inspect(path,profile):
     visible_pages(frame['widgets'])
     page=pages[-1]
     circle=profile.startswith('round');width=466 if circle else 390;height=466 if circle else 450
-    failures=[];buttons=[];icons=[]
+    failures=[];buttons=[];icons=[];regions={}
     def visit(node,ancestors=(),px=0,py=0,visible=True):
         g=node['geometry'];x=px+g['x'];y=py+g['y'];w=g['w'];h=g['h']
         visible=visible and node.get('visible',True)
         if not visible:return
         box=[x,y,w,h];kind=node['class'];identifier=node.get('id','')
+        if identifier in ['ime-preview','ime-composition','ime-keypad','ime-candidate-strip']:regions[identifier]=box
         if kind in ['Button','ImageBox','Label']:
             for ancestor in ancestors:
                 ax,ay,aw,ah=ancestor['box']
@@ -36,4 +37,12 @@ def inspect(path,profile):
             (buttons if kind=='Button'else icons).append(record)
         for child in node.get('children',[]):visit(child,ancestors+({'class':kind,'id':identifier,'box':box},),x,y,visible)
     visit(page)
-    return {'page':page.get('id'),'buttons':len(buttons),'icons':len(icons),'max_button_radius':round(max([b['radius']or 0 for b in buttons],default=0),2),'failures':failures,'passed':not failures}
+    gaps={}
+    if 'ime-composition' in regions and 'ime-keypad' in regions:
+        compose=regions['ime-composition'];keys=regions['ime-keypad']
+        gap=keys[1]-compose[1]-compose[3];gaps['composition_to_keys']=gap
+        # Account for the actual visible strip; direct entry may leave at most
+        # one rounding pixel, never an unused candidate-sized band.
+        maximum=(48 if circle else 53)if 'ime-candidate-strip' in regions else 1
+        if gap < -1 or gap > maximum:failures.append({'reason':'extra gap before keyboard','gap':gap,'maximum':maximum})
+    return {'page':page.get('id'),'buttons':len(buttons),'icons':len(icons),'gaps':gaps,'max_button_radius':round(max([b['radius']or 0 for b in buttons],default=0),2),'failures':failures,'passed':not failures}