@@ -20,18 +20,16 @@ import androidx.lifecycle.lifecycleScope
2020import com.tencent.iot.twcall.R
2121import com.tencent.iot.twcall.databinding.ActivityWakeupBinding
2222import com.tencent.iot.video.device.OnnxKwsBridge
23- import com.tencent.iot.video.device.callback.IvDeviceCallback
2423import com.tencent.iot.video.device.model.WakeupResult
25- import com.tencent.iotvideo.link.util.updateOperate
26- import kotlinx.coroutines.Dispatchers
2724import kotlinx.coroutines.launch
2825import java.io.File
2926import java.io.FileOutputStream
3027import java.math.BigDecimal
3128import java.util.concurrent.Executors
3229
3330private const val REQUEST_RECORD_AUDIO_PERMISSION = 200
34- class WakeupActivity : AppCompatActivity (), OnnxKwsBridge.OnWakeupListener, IvDeviceCallback {
31+
32+ class WakeupActivity : AppCompatActivity (), OnnxKwsBridge.OnWakeupListener {
3533
3634 private val TAG = WakeupActivity ::class .java.simpleName
3735
@@ -194,8 +192,8 @@ class WakeupActivity : AppCompatActivity(), OnnxKwsBridge.OnWakeupListener, IvDe
194192
195193 Log .i(TAG , " Start to initialize model" )
196194
197- onnxKwsBridge .setOnWakeupListener(this @WakeupActivity)
198- onnxKwsBridge .setOnRecordingSpeakListener { isSpeaking, buffer ->
195+ OnnxKwsBridge .getInstance() .setOnWakeupListener(this @WakeupActivity)
196+ OnnxKwsBridge .getInstance() .setOnRecordingSpeakListener { isSpeaking, buffer ->
199197 savePcmFile(isSpeaking, buffer)
200198 runOnUiThread {
201199 localSpeechSpectrum.updateSpectrumEffect(buffer.map { it.toFloat() }
@@ -208,16 +206,11 @@ class WakeupActivity : AppCompatActivity(), OnnxKwsBridge.OnWakeupListener, IvDe
208206 }
209207 }
210208 onnxKwsBridge.init (this @WakeupActivity, productId, deviceName, deviceKey)
211- onnxKwsBridge.setIvDeviceCallback(this @WakeupActivity)
212209 Log .i(TAG , " Finished initializing model" )
213210 }
214211 }
215212
216213 private fun onclick () {
217- if (! onnxKwsBridge.isInitState) {
218- Toast .makeText(this , " 未初始化完成" , Toast .LENGTH_SHORT ).show()
219- return
220- }
221214 if (! isRecording) {
222215 binding.recordButton.setText(R .string.stop)
223216 isRecording = true
@@ -313,9 +306,15 @@ class WakeupActivity : AppCompatActivity(), OnnxKwsBridge.OnWakeupListener, IvDe
313306 return bArray
314307 }
315308
316- override fun onFail (errMsg : String? ) {
309+ override fun onStartSuccess (msg : String? ) {
310+ lifecycleScope.launch {
311+ Toast .makeText(this @WakeupActivity, msg, Toast .LENGTH_SHORT ).show()
312+ }
313+ }
314+
315+ override fun onStartFail (errMsg : String? ) {
317316 lifecycleScope.launch {
318- Toast .makeText(this @WakeupActivity,errMsg,Toast .LENGTH_SHORT ).show()
317+ Toast .makeText(this @WakeupActivity, errMsg, Toast .LENGTH_SHORT ).show()
319318 }
320319 }
321320
@@ -344,20 +343,4 @@ class WakeupActivity : AppCompatActivity(), OnnxKwsBridge.OnWakeupListener, IvDe
344343 super .onDestroy()
345344 onnxKwsBridge.destroy()
346345 }
347-
348- override fun onOnline (netDateTime : Long ) {
349- lifecycleScope.launch(Dispatchers .Main ) {
350- binding.recordButton.updateOperate(true )
351- }
352- }
353-
354- override fun onOffline (status : Int ) {
355- lifecycleScope.launch(Dispatchers .Main ) {
356- binding.recordButton.updateOperate(false )
357- }
358- }
359-
360- override fun onModuleStatus (moduleStatus : Int ) {
361-
362- }
363346}
0 commit comments