fix(输入法): 优化双端联想排序并消除文字刷新闪烁

android/scripts/build-dictionary.py

@@ -1,5 +1,5 @@
 """Losslessly build the Android SQLite asset from the licensed original V5 trie."""
-import argparse,hashlib,json,pathlib,sqlite3
+import argparse,hashlib,importlib.util,json,pathlib,sqlite3
 APP=pathlib.Path(__file__).resolve().parents[1]
 
 def build(rtos):
@@ -22,6 +22,9 @@ def build(rtos):
     for line in frequency_path.read_text(encoding='utf-8').splitlines():
         parts=line.split(' ')
         if len(parts)>=2 and parts[1].isdigit():frequencies[parts[0]]=int(parts[1])
+    spec=importlib.util.spec_from_file_location('crab_dictionary',rtos/'scripts/convert-dictionary.py')
+    converter=importlib.util.module_from_spec(spec);spec.loader.exec_module(converter)
+    associations=converter.associations(entries,frequencies)
     groups9=['abc','def','ghi','jkl','mno','pqrs','tuv','wxyz'];groups14=['qw','er','ty','ui','op','as','df','gh','jk','l','zx','cv','bn','m']
     map9={ch:str(i+2)for i,group in enumerate(groups9)for ch in group}
     map14={ch:'0123456789abcd'[i]for i,group in enumerate(groups14)for ch in group}
@@ -33,13 +36,15 @@ def build(rtos):
     for index,(key,words)in enumerate(sorted(entries.items()),1):
         db.execute('INSERT INTO entries VALUES(?,?,?,?)',(index,key,''.join(map9[ch]for ch in key),''.join(map14[ch]for ch in key)))
         db.executemany('INSERT INTO words VALUES(?,?,?,?)',[(index,ordinal,word,frequencies.get(word,0))for ordinal,word in enumerate(words)])
-    db.executescript('CREATE INDEX entries_code9 ON entries(code9);CREATE INDEX entries_code14 ON entries(code14);ANALYZE;PRAGMA user_version=1;')
+    db.execute('CREATE TABLE associations(prefix TEXT NOT NULL,word TEXT NOT NULL,frequency INTEGER NOT NULL,PRIMARY KEY(prefix,word)) WITHOUT ROWID')
+    db.executemany('INSERT INTO associations VALUES(?,?,?)',[(prefix,word,frequency)for prefix,rows in associations.items()for word,frequency in rows])
+    db.executescript('CREATE INDEX entries_code9 ON entries(code9);CREATE INDEX entries_code14 ON entries(code14);ANALYZE;PRAGMA user_version=2;')
     db.commit()
     restored={}
     for key,word in db.execute('SELECT e.pinyin,w.word FROM entries e JOIN words w ON w.entry=e.id ORDER BY e.pinyin,w.ordinal'):restored.setdefault(key,[]).append(word)
     assert restored==entries,'Full dictionary round-trip mismatch'
     assert db.execute('PRAGMA integrity_check').fetchone()[0]=='ok';db.close();temporary.replace(target)
-    report={'keys':len(entries),'candidates':sum(map(len,entries.values())),'longest_word':max(len(word)for words in entries.values()for word in words),'sha256':hashlib.sha256(target.read_bytes()).hexdigest(),'bytes':target.stat().st_size,'round_trip':True,'source_files':{name:hashlib.sha256(data).hexdigest()for name,data in sorted(files.items())},'jieba_sha256':hashlib.sha256(frequency_path.read_bytes()).hexdigest()}
+    report={'schema_version':2,'association_prefixes':len(associations),'association_candidates':sum(map(len,associations.values())),'keys':len(entries),'candidates':sum(map(len,entries.values())),'longest_word':max(len(word)for words in entries.values()for word in words),'sha256':hashlib.sha256(target.read_bytes()).hexdigest(),'bytes':target.stat().st_size,'round_trip':True,'source_files':{name:hashlib.sha256(data).hexdigest()for name,data in sorted(files.items())},'jieba_sha256':hashlib.sha256(frequency_path.read_bytes()).hexdigest()}
     (APP/'keyboard/src/main/assets/dictionary-manifest.json').write_text(json.dumps(report,ensure_ascii=False,indent=2)+'\n',encoding='utf-8')
     print(json.dumps({k:v for k,v in report.items()if k!='source_files'},ensure_ascii=False))
 

android/scripts/validate-device.py

@@ -4,6 +4,7 @@ APP=pathlib.Path(__file__).resolve().parents[1]
 
 def main():
     parser=argparse.ArgumentParser(description=__doc__);parser.add_argument('--serial',required=True);parser.add_argument('--output',type=pathlib.Path,required=True)
+    parser.add_argument('--background-regression',action='store_true',help='Run native offscreen component checks without launching an Activity or switching the foreground')
     args=parser.parse_args();args.output.mkdir(parents=True,exist_ok=True)
     def adb(*command,binary=False,timeout=30,retries=3):
         last=None
@@ -14,26 +15,30 @@ def main():
             if command[0]!='install'and'device' not in last.lower()and'closed' not in last.lower():break
             print('Device connection interrupted; retrying this command.',flush=True);time.sleep(1)
         raise RuntimeError(last)
-    apk=APP/'app/build/outputs/apk/release/app-release.apk';test=APP/'app/build/outputs/apk/androidTest/release/app-release-androidTest.apk'
+    apk=APP/'app/build/outputs/apk/release/app-release.apk';test=APP/('keyboard/build/outputs/apk/androidTest/debug/keyboard-debug-androidTest.apk'if args.background_regression else'app/build/outputs/apk/androidTest/release/app-release-androidTest.apk')
     assert apk.is_file()and test.is_file()
     model=adb('shell','getprop','ro.product.model');sdk=adb('shell','getprop','ro.build.version.sdk')
     original=args.output/'original-ime.txt'
     if not original.exists():original.write_text(adb('shell','settings','get','secure','default_input_method')+'\n',encoding='utf-8')
     host=APP/'host/build/outputs/apk/debug/host-debug.apk'
-    for path in [apk,test,host]:print(adb('install','-r',str(path),timeout=90),flush=True)
+    for path in ([test]if args.background_regression else[apk,test,host]):print(adb('install','-r',str(path),timeout=90),flush=True)
     before=adb('shell','settings','get','secure','default_input_method')
     print('Default system IME retained; testing the embedded keyboard only.',flush=True)
-    adb('shell','input','keyevent','224');adb('shell','wm','dismiss-keyguard')
+    if not args.background_regression:adb('shell','input','keyevent','224');adb('shell','wm','dismiss-keyguard')
     # The instrumentation is bounded short acceptance, not a stress/soak run.
-    command=['adb','-s',args.serial,'shell','am','instrument','-w','-r','com.sydxky.crabinput.test/androidx.test.runner.AndroidJUnitRunner']
+    command=['adb','-s',args.serial,'shell','am','instrument','-w','-r']
+    if args.background_regression:command+=['-e','class','com.sydxky.crabinput.SurfaceRegressionTest']
+    command+=[('com.sydxky.crabinput.keyboard.test'if args.background_regression else'com.sydxky.crabinput.test')+'/androidx.test.runner.AndroidJUnitRunner']
     result=subprocess.run(command,stdout=subprocess.PIPE,stderr=subprocess.STDOUT,timeout=240)
     output=result.stdout.decode('utf-8',errors='replace');(args.output/'instrumentation.txt').write_text(output,encoding='utf-8');print(output,flush=True)
-    passed=result.returncode==0 and 'OK (9 tests)'in output and 'FAILURES!!!'not in output
-    report={'model':model,'sdk':sdk,'version':'1.2.2','apk_sha256':hashlib.sha256(apk.read_bytes()).hexdigest(),'instrumentation_tests':9,'embedded_component':True,'system_ime_unchanged':adb('shell','settings','get','secure','default_input_method')==before,'passed':passed}
+    expected=3 if args.background_regression else 9
+    passed=result.returncode==0 and f'OK ({expected} tests)'in output and 'FAILURES!!!'not in output
+    report={'model':model,'sdk':sdk,'version':'1.2.3','release_apk_sha256':hashlib.sha256(apk.read_bytes()).hexdigest(),'instrumentation_tests':expected,'verification_mode':'native_offscreen_component'if args.background_regression else'interactive','interactive_tests_run':not args.background_regression,'component_variant':'debug'if args.background_regression else'release','embedded_component':True,'system_ime_unchanged':adb('shell','settings','get','secure','default_input_method')==before,'passed':passed}
     (args.output/'device-validation.json').write_text(json.dumps(report,indent=2)+'\n',encoding='utf-8')
     assert passed and report['system_ime_unchanged'],'See instrumentation.txt; failed/unfinished cases are not accepted'
-    adb('shell','am','start','-n','com.sydxky.crabinput/.MainActivity');time.sleep(.5)
-    (args.output/'home.png').write_bytes(adb('exec-out','screencap','-p',binary=True))
+    if not args.background_regression:
+        adb('shell','am','start','-n','com.sydxky.crabinput/.MainActivity');time.sleep(.5)
+        (args.output/'home.png').write_bytes(adb('exec-out','screencap','-p',binary=True))
     print(json.dumps(report),flush=True)
 
 if __name__=='__main__':main()