Skip to content

Commit ac77c6c

Browse files
committed
升级 sdk
1 parent 9535c24 commit ac77c6c

File tree

2 files changed

+13
-30
lines changed

2 files changed

+13
-30
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ dependencies {
7979
implementation libs.androidx.core.ktx
8080
implementation libs.kotlinx.coroutines.android
8181
implementation libs.gson
82-
implementation 'com.tencent.iot.video:video-device-android:1.0.8-wakeup-SNAPSHOT'
82+
implementation 'com.tencent.iot.video:video-device-android:1.0.8.01-wakeup-SNAPSHOT'
8383
}

app/src/main/java/com/example/ivdemo/WakeupActivity.kt

Lines changed: 12 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,16 @@ import androidx.lifecycle.lifecycleScope
2020
import com.tencent.iot.twcall.R
2121
import com.tencent.iot.twcall.databinding.ActivityWakeupBinding
2222
import com.tencent.iot.video.device.OnnxKwsBridge
23-
import com.tencent.iot.video.device.callback.IvDeviceCallback
2423
import com.tencent.iot.video.device.model.WakeupResult
25-
import com.tencent.iotvideo.link.util.updateOperate
26-
import kotlinx.coroutines.Dispatchers
2724
import kotlinx.coroutines.launch
2825
import java.io.File
2926
import java.io.FileOutputStream
3027
import java.math.BigDecimal
3128
import java.util.concurrent.Executors
3229

3330
private 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

Comments
 (0)