|
@@ -6,6 +6,7 @@ import android.os.Bundle
|
|
|
import android.util.Log
|
|
|
import android.view.View
|
|
|
import android.widget.TextView
|
|
|
+import androidx.recyclerview.widget.ItemTouchHelper
|
|
|
import androidx.recyclerview.widget.RecyclerView
|
|
|
import com.alibaba.android.vlayout.DelegateAdapter
|
|
|
import com.alibaba.android.vlayout.VirtualLayoutManager
|
|
@@ -29,9 +30,11 @@ import com.wdkl.ncs.android.middleware.common.Constants
|
|
|
import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
|
|
|
import com.wdkl.ncs.android.middleware.tcp.TcpClient
|
|
|
import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
|
|
|
+import com.wdkl.ncs.android.middleware.tcp.channel.OtherUtil
|
|
|
import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
|
|
|
import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
|
|
|
import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum
|
|
|
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
|
|
|
import org.greenrobot.eventbus.EventBus
|
|
|
import org.greenrobot.eventbus.Subscribe
|
|
|
import org.greenrobot.eventbus.ThreadMode
|
|
@@ -73,6 +76,38 @@ class NewCallListActivity : BaseToolActivity(), NewCallItemAdapter.CallClickList
|
|
|
recyclerView.layoutManager = virtualLayoutManager
|
|
|
recyclerView.adapter = delegateAdapter
|
|
|
|
|
|
+ //滑动消除
|
|
|
+ /*val touchCallback: ItemTouchHelper.Callback =
|
|
|
+ object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
|
|
|
+ override fun onMove(
|
|
|
+ recyclerView: RecyclerView,
|
|
|
+ viewHolder: RecyclerView.ViewHolder,
|
|
|
+ target: RecyclerView.ViewHolder
|
|
|
+ ): Boolean {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+
|
|
|
+ override fun onSwiped(
|
|
|
+ viewHolder: RecyclerView.ViewHolder,
|
|
|
+ direction: Int
|
|
|
+ ) {
|
|
|
+ //停止铃声及语音播报
|
|
|
+ SpeechUtil.getInstance().stopSpeak()
|
|
|
+ RingPlayHelper.stopRingTone()
|
|
|
+
|
|
|
+ val pos = viewHolder.adapterPosition
|
|
|
+ val tcpModel = adapter.data.get(pos)
|
|
|
+ val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
|
+ val callTcp = VoiceUtil.voiceReject(tcpModel.tid, Constants.deviceId, interactionVO.fromDeviceId, interactionVO.id)
|
|
|
+ TcpClient.getInstance().sendMsg(callTcp.toJson())
|
|
|
+
|
|
|
+ //移除该条呼叫
|
|
|
+ removeCall(interactionVO)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ val itemTouchHelper = ItemTouchHelper(touchCallback)
|
|
|
+ itemTouchHelper.attachToRecyclerView(recyclerView)*/
|
|
|
+
|
|
|
//ring up
|
|
|
RingPlayHelper.playRingTone(BaseApplication.appContext, R.raw.ring_tone, true)
|
|
|
|
|
@@ -81,6 +116,7 @@ class NewCallListActivity : BaseToolActivity(), NewCallItemAdapter.CallClickList
|
|
|
if (Constants.supportCall) {
|
|
|
adapter.setOnItemClickListener { data, position ->
|
|
|
SpeechUtil.getInstance().stopSpeak()
|
|
|
+ RingPlayHelper.stopRingTone()
|
|
|
val interactionVO = Gson().fromJson(data.data.toString(), InteractionVO::class.java)
|
|
|
var roomId: String
|
|
|
if (interactionVO.fromDeviceType == DeviceTypeEnum.SIMULATE_BED_DEVICE.value()) {
|
|
@@ -119,6 +155,7 @@ class NewCallListActivity : BaseToolActivity(), NewCallItemAdapter.CallClickList
|
|
|
} else {
|
|
|
adapter.setOnItemClickListener { data, position ->
|
|
|
SpeechUtil.getInstance().stopSpeak()
|
|
|
+ RingPlayHelper.stopRingTone()
|
|
|
val interactionVO = Gson().fromJson(data.data.toString(), InteractionVO::class.java)
|
|
|
val callTcp = VoiceUtil.voiceReject(data.tid, Constants.deviceId, interactionVO.fromDeviceId, interactionVO.id)
|
|
|
TcpClient.getInstance().sendMsg(callTcp.toJson())
|