<优化呼叫列表显示，增加回拨功能>

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constants.kt

@@ -33,6 +33,9 @@ class Constants {
         val EVENT_CALL_STATE = 0x02
 
         val EVENT_TCP_STATE = 0x03
+
+        //刷新呼叫记录
+        val EVENT_REFRESH_CALL_LIST = 0x04
     }
 
 

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -64,6 +64,7 @@ import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.activity_nurse_home.*
 import kotlinx.android.synthetic.main.right_list.*
+import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
@@ -671,6 +672,8 @@ fun call(tyte:Int){
                             VoiceUtil.rejectAudioCall(Integer.parseInt(Constants.ids), Constants.fromId, Constants.interactionId)
                             CallDialogHelper.dismissCallDialog()
                         })
+
+                        EventBus.getDefault().post(MessageEvent(0, Constants.EVENT_REFRESH_CALL_LIST))
                     } else if (tcpModel.getAction() == TcpAction.VoiceAction.ACCEPT) {//对方接受语音
                         Log.e(TAG, "对方接受语音" + tcpModel.toJson())
                         Constants.interactionId = interactionVO.id
@@ -722,6 +725,8 @@ fun call(tyte:Int){
                         }, View.OnClickListener {
                             //来电拒接
                         })
+
+                        EventBus.getDefault().post(MessageEvent(0, Constants.EVENT_REFRESH_CALL_LIST))
                     }
                 }
             }

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/RegisterActivity.kt

@@ -253,7 +253,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
-        var messageEvent = messageEvent.getMessage() as TcpModel
+//        var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //            Log.e(TAG,"收到tcp消息")
 //        }

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/adapter/CallRecordsItemAdapter.kt

@@ -6,6 +6,7 @@ import android.view.ViewGroup
 import com.alibaba.android.vlayout.LayoutHelper
 import com.alibaba.android.vlayout.layout.LinearLayoutHelper
 import com.wdkl.ncs.android.component.nursehome.R
+import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.AdapterCallRecordsItemBinding
 import com.wdkl.ncs.android.component.nursehome.util.TimeTransition
 import com.wdkl.ncs.android.lib.adapter.BaseDelegateAdapter
@@ -13,6 +14,7 @@ import com.wdkl.ncs.android.lib.utils.BaseRecyclerViewHolder
 import com.wdkl.ncs.android.middleware.model.dos.CallingHistoryDO
 import com.wdkl.ncs.android.middleware.model.vo.CallingHistoryVO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
+import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
 
 /**
  * 呼叫记录适配器
@@ -58,17 +60,46 @@ class CallRecordsItemAdapter(val data:ArrayList<InteractionVO>) : BaseDelegateAd
         holder?.bind { binding ->
             val itemData = getItem(position)
 
-            Log.i("callRecord","actionDirectionType: " + itemData.actionDirectionType);
-            //判断是呼入还是呼出 1 分机到主机 2主机到分机
-            if (itemData.actionDirectionType == 1) {
-                binding.sickbedTv.text = itemData.toFrameFullName
-                binding.nameTv.text = itemData.toMemberName
-            } else if (itemData.actionDirectionType == 2 || itemData.actionDirectionType == 3) {
-                binding.sickbedTv.text = itemData.fromFrameFullName
-                binding.nameTv.text = itemData.fromMemberName
+            if (itemData.createDate != null) {
+                binding.processingTimeTv.text = TimeTransition().stampToDateTime(itemData.createDate * 1000)
             }
 
-            binding.callDurationTv.text = TimeTransition().stampToTime(itemData.actionStart * 1000)
+            //是否已处理
+            if (itemData.actionEnd != null) {
+                //判断是呼入还是呼出 1 分机到主机 2主机到分机
+                if (itemData.actionDirectionType == 1) {
+                    binding.sickbedTv.text = itemData.fromFrameFullName
+                    binding.nameTv.text = itemData.fromMemberName
+                    binding.callStatusImagev.setImageResource(R.drawable.hu_ru_yi_jie)
+                } else if (itemData.actionDirectionType == 2 || itemData.actionDirectionType == 3) {
+                    binding.sickbedTv.text = itemData.toFrameFullName
+                    binding.nameTv.text = itemData.toMemberName
+                    binding.callStatusImagev.setImageResource(R.drawable.hu_chu_yi_jie)
+                }
+                binding.callListReply.visibility = View.GONE
+            } else {
+                //判断是呼入还是呼出 1 分机到主机 2主机到分机
+                if (itemData.actionDirectionType == 1) {
+                    binding.sickbedTv.text = itemData.fromFrameFullName
+                    binding.nameTv.text = itemData.fromMemberName
+                    binding.callStatusImagev.setImageResource(R.drawable.hu_ru_wei_jie)
+                } else if (itemData.actionDirectionType == 2 || itemData.actionDirectionType == 3) {
+                    binding.sickbedTv.text = itemData.toFrameFullName
+                    binding.nameTv.text = itemData.toMemberName
+                    binding.callStatusImagev.setImageResource(R.drawable.hu_chu_wei_jie)
+                }
+                binding.callListReply.visibility = View.VISIBLE
+            }
+
+            binding.callListReply.setOnClickListener {
+                if (itemData.actionDirectionType == 1 && itemData.fromDeviceId != null && itemData.fromDeviceId != Constants.ids!!.toInt()) {
+                    VoiceUtil.startAudioCall(Integer.parseInt(Constants.ids), itemData.fromDeviceId)
+                    Constants.call_type = 0
+                } else if (itemData.actionDirectionType == 2 && itemData.toDeviceId != null && itemData.toDeviceId != Constants.ids!!.toInt()) {
+                    VoiceUtil.startAudioCall(Integer.parseInt(Constants.ids), itemData.toDeviceId)
+                    Constants.call_type = 0
+                }
+            }
         }
     }
 

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/BedsInTheWardFragment.kt

@@ -118,7 +118,7 @@ class BedsInTheWardFragment : BaseFragment<BedsInTheWardPresenter, FragmentBedsI
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
 //        Log.e(TAG,"收到tcp消息")
-        var messageEvent = messageEvent.getMessage() as TcpModel
+//        var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //
 //            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/BroadcastFragment.kt

@@ -326,7 +326,7 @@ class BroadcastFragment : BaseFragment<BroadcastPresenter, FragmentBroadcastBind
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
 //        Log.e(TAG,"收到tcp消息")
-        var messageEvent = messageEvent.getMessage() as TcpModel
+//        var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //
 //            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/CallRecordsFragment.kt

@@ -56,6 +56,13 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
 
     private var eventName = ""
 
+    //加载历史记录条数
+    private val pageSize: Int = 15
+    //数据的初始页数
+    private var page: Int = 1
+    //查询历史记录类型
+    private var listType: Int = 1
+
 
     /**
      * @author LDD
@@ -98,8 +105,8 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
         listView.layoutManager = virtualLayoutManager
         listView.adapter = delegateAdapter
 
-        presenter.loadFloor(1, 30, Constants.part_id, 0,eventName)
-        presenter.getEventdata()
+        presenter.loadFloor(page, pageSize, Constants.part_id, listType, eventName)
+        //presenter.getEventdata()
 
     }
 
@@ -109,12 +116,20 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
     override fun onClick(p0: View) {
         when(p0.id){
             R.id.no_answer_calls_linlyout -> {
-                showMessage("点击了未接通话")
-
+                //showMessage("点击了未接通话")
+                call_records_imagev.visibility = View.GONE
+                no_answer_calls_imagev.visibility = View.VISIBLE
+                page = 1
+                listType = 1
+                presenter.loadFloor(page, pageSize, Constants.part_id, listType, eventName)
             }
             R.id.call_records_linlyout -> {
-                showMessage("点击了通话记录")
-                callRecords()
+                //showMessage("点击了通话记录")
+                no_answer_calls_imagev.visibility = View.GONE
+                call_records_imagev.visibility = View.VISIBLE
+                page = 1
+                listType = 0
+                presenter.loadFloor(page, pageSize, Constants.part_id, listType, eventName)
             }
             R.id.other_linlyout -> {
 
@@ -148,7 +163,7 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
             //showMessage(data.customer_name)
             //mListener?.displayPersondalInformation(data)
         }
-//        configRefresh()
+        configRefresh()
     }
 
     /**
@@ -239,17 +254,33 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
 //        }
 //
 
-        if (data.size >0){
-            adapter.data.clear()
-            for (item in data) {
-                if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
-                    adapter.data.add(item)
+        refresh.finishRefresh()
+        if (page == 1) {
+            refresh.resetNoMoreData()
+            if (data.size > 0) {
+                adapter.data.clear()
+                for (item in data) {
+                    if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
+                        adapter.data.add(item)
+                    }
                 }
+                Log.i("abc1"," " + adapter.data.size);
+                adapter.notifyDataSetChanged()
+            }
+            refresh.finishLoadMore()
+        } else {
+            if (data.size > 0) {
+                for (item in data) {
+                    if (item.actionDirectionType == 1 || item.actionDirectionType == 2 || item.actionDirectionType == 3) {
+                        adapter.data.add(item)
+                    }
+                }
+                adapter.notifyDataSetChanged()
+                refresh.finishLoadMore()
+            } else {
+                refresh.finishLoadMoreWithNoMoreData()
             }
-            Log.i("abc1"," " + adapter.data.size);
-            adapter.notifyDataSetChanged()
         }
-        refresh.finishLoadMore()
 
     }
 
@@ -275,7 +306,16 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
      * @Note   配置刷新监听处理
      */
     private fun configRefresh(){
-
+        //下拉刷新
+        mViewDataBinding.refresh.setOnRefreshListener {
+            page = 1
+            presenter.loadFloor(page, pageSize, Constants.part_id, listType, eventName)
+        }
+        //上拉加载更多
+        mViewDataBinding.refresh.setOnLoadMoreListener {
+            page += 1
+            presenter.loadFloor(page, pageSize, Constants.part_id, listType, eventName)
+        }
     }
     /**
      * @author LDD
@@ -304,11 +344,9 @@ class CallRecordsFragment: BaseFragment<CallRecordsFragmentPresenter, FragmentCa
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
-//        Log.e(TAG,"收到tcp消息")
-//        var messageEvent = messageEvent.getMessage() as TcpModel
-//        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
-//
-//            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())
-//        }
+        if (messageEvent.type == Constants.EVENT_REFRESH_CALL_LIST) {
+            page = 1
+            presenter.loadFloor(page, pageSize, Constants.part_id, listType, eventName)
+        }
     }
 }

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/DoctorHostFragment.kt

@@ -172,7 +172,7 @@ class DoctorHostFragment: BaseFragment<DoctorHostPresenter, FragmentDoctorHostBi
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
 //        Log.e(TAG,"收到tcp消息")
-        var messageEvent = messageEvent.getMessage() as TcpModel
+//        var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //
 //            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/InpatientWardFragment.kt

@@ -132,7 +132,7 @@ class InpatientWardFragment : BaseFragment<InpatientWardPresenter, FragmentInpat
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
 //        Log.e(TAG,"收到tcp消息")
-        var messageEvent = messageEvent.getMessage() as TcpModel
+//        var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //
 //            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/NurseMoveFragment.kt

@@ -173,7 +173,7 @@ class NurseMoveFragment : BaseFragment<NurseMovePresenter,FragmentNurseMoveBindi
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
 //        Log.e(TAG,"收到tcp消息")
-        var messageEvent = messageEvent.getMessage() as TcpModel
+//        var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //
 //            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/OtherHostFragment.kt

@@ -130,7 +130,7 @@ class OtherHostFragment : BaseFragment<OtherHostPresenter,FragmentOtherHostBindi
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
 //        Log.e(TAG,"收到tcp消息")
-        var messageEvent = messageEvent.getMessage() as TcpModel
+//        var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //
 //            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/SickbedFragment.kt

@@ -101,7 +101,7 @@ class SickbedFragment:BaseFragment<SickbedPresenter,FragmentSickbedBinding>(),Si
  @Subscribe(threadMode = ThreadMode.MAIN)
  fun onMoonEvent(messageEvent: MessageEvent) {
 //        Log.e(TAG,"收到tcp消息")
-  var messageEvent = messageEvent.getMessage() as TcpModel
+//  var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //
 //            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/SystemSettingsFragment.kt

@@ -457,7 +457,7 @@ class SystemSettingsFragment:BaseFragment<SystemSettingsPresenter,FragmentSystem
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
 //        Log.e(TAG,"收到tcp消息")
-        var messageEvent = messageEvent.getMessage() as TcpModel
+//        var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //
 //            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/TrustManagementFragment.kt

@@ -74,7 +74,7 @@ class TrustManagementFragment:BaseFragment<TrustManagementPresenter,FragmentTrus
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
 //        Log.e(TAG,"收到tcp消息")
-        var messageEvent = messageEvent.getMessage() as TcpModel
+//        var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //
 //            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/fragment/VisitManagementFragment.kt

@@ -163,7 +163,7 @@ class VisitManagementFragment: BaseFragment<VisitManagementPresenter,FragmentVis
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
 //        Log.e(TAG,"收到tcp消息")
-        var messageEvent = messageEvent.getMessage() as TcpModel
+//        var messageEvent = messageEvent.getMessage() as TcpModel
 //        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
 //
 //            Log.e(TAG,"收到tcp消息"+messageEvent.toJson())

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/util/TimeTransition.kt

@@ -19,6 +19,10 @@ class TimeTransition {
         return TimeStampToTime(s,"HH:mm:ss")
     }
 
+    fun stampToDateTime(s:Long):String{
+        return TimeStampToTime(s,"MM-dd HH:mm")
+    }
+
     /**
      * 时间戳转时间 不带时区
      */

nursehome/src/main/res/layout/adapter_call_records_item.xml

@@ -3,53 +3,152 @@
 
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="54dp"
-        android:padding="6dp">
-
-        <ImageView
-            android:id="@+id/tab_imagev"
-            android:layout_width="6dp"
-            android:layout_height="6dp"
-            android:layout_centerVertical="true"
-            android:background="#000000"
-            android:visibility="gone"/>
+        android:layout_height="wrap_content"
+        android:background="#ffffff"
+        android:layout_marginTop="6px"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp">
 
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_toRightOf="@+id/tab_imagev"
-            android:layout_marginLeft="4dp"
+            android:id="@+id/tab_linyout"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="9px"
+            android:layout_centerVertical="true"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/sickbed_tv"
+            <ImageView
+                android:id="@+id/tab_imagev"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="---"
-                android:textSize="16sp" />
+                android:src="@drawable/lai_dian_tou_xiang_bg" />
 
-            <TextView
-                android:id="@+id/name_tv"
+            <ImageView
+                android:id="@+id/call_status_imagev"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="--"
-                android:textSize="12sp" />
-
+                android:layout_marginTop="2px"
+                android:src="@drawable/hu_ru_wei_jie" />
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/call_duration_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
-            android:text="--"
-            android:textSize="12sp" />
-
-        <View
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/color_white"
-            android:layout_alignParentBottom="true"/>
+            android:layout_height="match_parent"
+            android:layout_marginTop="4px"
+            android:layout_marginRight="9px"
+            android:layout_toRightOf="@+id/tab_linyout">
+
+            <RelativeLayout
+                android:id="@+id/room_name_linlyout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="6px">
+
+                <TextView
+                    android:id="@+id/sickbed_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textSize="14px" />
+
+                <TextView
+                    android:id="@+id/call_time_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text=""
+                    android:textSize="12px"
+                    android:visibility="gone"/>
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/nursing_project_relalyout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/room_name_linlyout"
+                android:layout_marginLeft="6px"
+                android:layout_marginTop="4px"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textSize="14px" />
+
+                <TextView
+                    android:id="@+id/call_list_reply"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:layout_alignParentRight="true"
+                    android:drawableLeft="@drawable/hu_jiao"
+                    android:drawablePadding="6px"
+                    android:textSize="14px"
+                    android:text="回拨" />
+
+                <LinearLayout
+                    android:id="@+id/incident_linlyou"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:orientation="horizontal"
+                    android:visibility="gone">
+
+                    <ImageView
+                        android:id="@+id/treatment_state_imagev"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="6px"
+                        android:src="@drawable/yi_chu_li" />
+
+
+                    <TextView
+                        android:id="@+id/project_tv"
+                        android:layout_width="59px"
+                        android:layout_height="20px"
+                        android:gravity="center"
+                        android:text=""
+                        android:background="@drawable/sp_event_handled"
+                        android:textSize="12px" />
+
+                    <ImageView
+                        android:id="@+id/play_tv"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/wei_bo_fang"
+                        android:gravity="center" />
+
+                </LinearLayout>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/nursing_project_relalyout"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="4px"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/conductor_name_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="10px"
+                    android:text=""
+                    android:textSize="12px"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/processing_time_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=""
+                    android:textSize="12px" />
+            </LinearLayout>
+        </RelativeLayout>
     </RelativeLayout>
 </layout>

nursehome/src/main/res/layout/fragment_call_records.xml

@@ -22,13 +22,12 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:orientation="vertical"
-                android:visibility="gone">
+                android:orientation="vertical">
                 <TextView
                     android:id="@+id/no_answer_calls_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="未接通话"
+                    android:text="未接"
                     android:textSize="14px" />
                 <ImageView
                     android:id="@+id/no_answer_calls_imagev"
@@ -51,7 +50,7 @@
                     android:id="@+id/call_records_tv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="历史记录"
+                    android:text="所有"
                     android:textSize="14px" />
                 <ImageView
                     android:id="@+id/call_records_imagev"

webrtc/src/main/java/com/wdkl/core/voip/CallSingleActivity.java

@@ -22,6 +22,7 @@ import com.wdkl.core.base.BaseActivity;
 import com.wdkl.ncs.android.component.nursehome.common.Constants;
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel;
 import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil;
+import com.wdkl.ncs.android.middleware.utils.MessageEvent;
 import com.wdkl.permission.Permissions;
 import com.wdkl.skywebrtc.CallSession;
 import com.wdkl.skywebrtc.EnumType;
@@ -29,6 +30,8 @@ import com.wdkl.skywebrtc.SkyEngineKit;
 import com.wdkl.skywebrtc.except.NotInitializedException;
 import com.wdkl.webrtc.R;
 
+import org.greenrobot.eventbus.EventBus;
+
 import java.util.UUID;
 
 
@@ -293,5 +296,6 @@ public class CallSingleActivity extends BaseActivity implements CallSession.Call
         super.onDestroy();
         DeviceChannel.calling = false;
         VoiceUtil.handoffAudioCall(Integer.parseInt(Constants.Companion.getIds()), Constants.Companion.getFromId(), Constants.Companion.getInteractionId());
+        EventBus.getDefault().post(new MessageEvent(0, Constants.Companion.getEVENT_REFRESH_CALL_LIST()));
     }
 }

webrtc/src/main/res/layout/fragment_audio.xml

@@ -26,6 +26,7 @@
             android:layout_width="120dp"
             android:layout_height="120dp"
             android:layout_marginTop="80dp"
+            android:scaleType="centerInside"
             android:src="@drawable/av_default_header" />
 
         <TextView

webrtc/src/main/res/layout/fragment_video.xml

@@ -43,7 +43,7 @@
                 android:layout_width="60dp"
                 android:layout_height="60dp"
                 android:adjustViewBounds="true"
-                android:scaleType="centerCrop"
+                android:scaleType="centerInside"
                 android:src="@drawable/av_default_header" />
 
             <LinearLayout