Build APK with replace.fst (#2254)

@@ -4,7 +4,6 @@ on:
   push:
   push:
     branches:
     branches:
       - apk
       - apk
-      - apk-android-simulate-streaming-asr
 
 
   workflow_dispatch:
   workflow_dispatch:
 
 

@@ -43,6 +43,22 @@ short_name={{ model.short_name }}
 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/${model_name}.tar.bz2
 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/${model_name}.tar.bz2
 tar xvf ${model_name}.tar.bz2
 tar xvf ${model_name}.tar.bz2
 
 
+{% if model.use_hr %}
+  if [ ! -d dict ]; then
+    curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/hr-files/dict.tar.bz2
+    tar xvf dict.tar.bz2
+    rm dict.tar.bz2
+  fi
+
+  if [ ! -f lexicon.txt ]; then
+    curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/hr-files/lexicon.txt
+  fi
+
+  if [ ! -f replace.fst ]; then
+    curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/hr-files/replace.fst
+  fi
+{% endif %}
+
 {{ model.cmd }}
 {{ model.cmd }}
 
 
 rm -rf  *.tar.bz2
 rm -rf  *.tar.bz2
@@ -57,6 +73,10 @@ git checkout .
 pushd android/SherpaOnnxSimulateStreamingAsr/app/src/main/java/com/k2fsa/sherpa/onnx/simulate/streaming/asr
 pushd android/SherpaOnnxSimulateStreamingAsr/app/src/main/java/com/k2fsa/sherpa/onnx/simulate/streaming/asr
 sed -i.bak s/"asrModelType = 15/asrModelType = $type/" ./SimulateStreamingAsr.kt
 sed -i.bak s/"asrModelType = 15/asrModelType = $type/" ./SimulateStreamingAsr.kt
 
 
+{% if model.use_hr %}
+  sed -i.bak s/"useHr = false/useHr = true/" ./SimulateStreamingAsr.kt
+{% endif %}
+
 {% if model.rule_fsts %}
 {% if model.rule_fsts %}
   rule_fsts={{ model.rule_fsts }}
   rule_fsts={{ model.rule_fsts }}
   sed -i.bak s%"asrRuleFsts = null"%"asrRuleFsts = \"$rule_fsts\""% ./MainActivity.kt
   sed -i.bak s%"asrRuleFsts = null"%"asrRuleFsts = \"$rule_fsts\""% ./MainActivity.kt
@@ -92,6 +112,10 @@ for arch in arm64-v8a armeabi-v7a x86_64 x86; do
 done
 done
 
 
 rm -rf ./android/SherpaOnnxSimulateStreamingAsr/app/src/main/assets/$model_name
 rm -rf ./android/SherpaOnnxSimulateStreamingAsr/app/src/main/assets/$model_name
+rm -rf ./android/SherpaOnnxSimulateStreamingAsr/app/src/main/assets/dict
+rm -rf ./android/SherpaOnnxSimulateStreamingAsr/app/src/main/assets/lexicon.txt
+rm -rf ./android/SherpaOnnxSimulateStreamingAsr/app/src/main/assets/replace.fst
+
 {% endfor %}
 {% endfor %}
 
 
 git checkout .
 git checkout .

@@ -45,6 +45,8 @@ class Model:
 
 
     rule_fsts: str = ""
     rule_fsts: str = ""
 
 
+    use_hr: bool = False
+
 
 
 # See get_2nd_models() in ./generate-asr-2pass-apk-script.py
 # See get_2nd_models() in ./generate-asr-2pass-apk-script.py
 def get_models():
 def get_models():
@@ -98,6 +100,7 @@ def get_models():
             lang="zh_en_ko_ja_yue",
             lang="zh_en_ko_ja_yue",
             lang2="中英粤日韩",
             lang2="中英粤日韩",
             short_name="sense_voice",
             short_name="sense_voice",
+            use_hr=True,
             cmd="""
             cmd="""
             pushd $model_name
             pushd $model_name
 
 

@@ -5,6 +5,7 @@
 #include "sherpa-onnx/csrc/offline-source-separation-impl.h"
 #include "sherpa-onnx/csrc/offline-source-separation-impl.h"
 
 
 #include <memory>
 #include <memory>
+
 #if __ANDROID_API__ >= 9
 #if __ANDROID_API__ >= 9
 #include "android/asset_manager.h"
 #include "android/asset_manager.h"
 #include "android/asset_manager_jni.h"
 #include "android/asset_manager_jni.h"