Browse Source

#探视请求记录也显示

weizhengliang 3 years ago
parent
commit
88898cf93f

+ 12 - 2
nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/adapter/CallRecordsItemAdapter.kt

@@ -69,6 +69,16 @@ class CallRecordsItemAdapter(val data:ArrayList<InteractionVO>) : BaseDelegateAd
                 binding.processingTimeTv.text = TimeTransition.stampToDateTime(itemData.createDate * 1000)
             }
 
+            //探视记录
+            if (TcpType.VIDEO.name == itemData.actionType) {
+                binding.sickbedTv.text = itemData.fromFrameFullName
+                binding.nameTv.text = "探视请求"
+                binding.callStatusImagev.visibility = View.GONE
+                binding.tabImagev.setImageResource(R.drawable.lai_dian_tou_xiang_bg)
+                binding.callListReply.visibility = View.GONE
+                binding.callSosReply.visibility = View.GONE
+            }
+
             //是否已处理
             if (itemData.actionEnd != null) {
                 binding.processingTimeTv.text = TimeTransition.stampToDateTime(itemData.actionEnd * 1000)
@@ -80,7 +90,7 @@ class CallRecordsItemAdapter(val data:ArrayList<InteractionVO>) : BaseDelegateAd
                     binding.nameTv.text = "紧急呼叫"
                     binding.callStatusImagev.visibility = View.GONE
                     binding.tabImagev.setImageResource(R.drawable.ic_sos)
-                } else {
+                } else if (TcpType.VOICE.name == itemData.actionType) {
                     binding.callStatusImagev.visibility = View.VISIBLE
                     binding.tabImagev.setImageResource(R.drawable.lai_dian_tou_xiang_bg)
                     //判断是呼入还是呼出 1 分机到主机 2主机到分机
@@ -106,7 +116,7 @@ class CallRecordsItemAdapter(val data:ArrayList<InteractionVO>) : BaseDelegateAd
                     binding.tabImagev.setImageResource(R.drawable.ic_sos)
                     binding.callListReply.visibility = View.GONE
                     binding.callSosReply.visibility = View.VISIBLE
-                } else {
+                } else if (TcpType.VOICE.name == itemData.actionType) {
                     binding.callStatusImagev.visibility = View.VISIBLE
                     binding.tabImagev.setImageResource(R.drawable.lai_dian_tou_xiang_bg)
                     //判断是呼入还是呼出 1 分机到主机 2主机到分机

+ 4 - 10
nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/CallRecordsFragment.kt

@@ -145,11 +145,8 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
             adapter.data.clear()
             if (data.size > 0) {
                 for (item in data) {
-                    //只有普通呼叫和紧急呼叫加入呼叫列表
-                    if (TcpType.SOS.name == item.actionType || TcpType.VOICE.name == item.actionType) {
-                        if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
-                            adapter.data.add(item)
-                        }
+                    if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
+                        adapter.data.add(item)
                     }
                 }
                 Log.i("abc1"," " + adapter.data.size);
@@ -159,11 +156,8 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
         } else {
             if (data.size > 0) {
                 for (item in data) {
-                    //只有普通呼叫和紧急呼叫加入呼叫列表
-                    if (TcpType.SOS.name == item.actionType || TcpType.VOICE.name == item.actionType) {
-                        if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
-                            adapter.data.add(item)
-                        }
+                    if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
+                        adapter.data.add(item)
                     }
                 }
                 adapter.notifyDataSetChanged()