Browse Source

优化呼叫名称显示

weizhengliang 2 years ago
parent
commit
2163f95ce4

+ 21 - 4
home/src/main/code/com/wdkl/ncs/android/component/home/adapter/WatchCallRecordsItemAdapter.kt

@@ -1,5 +1,6 @@
 package com.wdkl.ncs.android.component.home.adapter
 package com.wdkl.ncs.android.component.home.adapter
 
 
+import android.text.TextUtils
 import android.util.Log
 import android.util.Log
 import android.view.View
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup
@@ -76,11 +77,19 @@ class WatchCallRecordsItemAdapter(val data: ArrayList<InteractionVO>) : BaseDele
                 //判断是呼入还是呼出 1 分机到主机 2主机到分机
                 //判断是呼入还是呼出 1 分机到主机 2主机到分机
                 if (itemData.fromDeviceMemberId == Constants.memberId){
                 if (itemData.fromDeviceMemberId == Constants.memberId){
                     binding.sickbedTv.text = itemData.toFrameFullName
                     binding.sickbedTv.text = itemData.toFrameFullName
-                    binding.nameTv.text = "To: " + itemData.toMemberName
+                    if (TextUtils.isEmpty(itemData.toMemberName)) {
+                        binding.nameTv.text = ""
+                    } else {
+                        binding.nameTv.text = "To: " + itemData.toMemberName
+                    }
                     binding.callStatusImagev.setImageResource(R.drawable.hu_chu_yi_jie)
                     binding.callStatusImagev.setImageResource(R.drawable.hu_chu_yi_jie)
                 } else {
                 } else {
                     binding.sickbedTv.text = itemData.fromFrameFullName
                     binding.sickbedTv.text = itemData.fromFrameFullName
-                    binding.nameTv.text = "From: " + itemData.fromMemberName
+                    if (TextUtils.isEmpty(itemData.fromMemberName)) {
+                        binding.nameTv.text = ""
+                    } else {
+                        binding.nameTv.text = "From: " + itemData.fromMemberName
+                    }
                     binding.callStatusImagev.setImageResource(R.drawable.hu_ru_yi_jie)
                     binding.callStatusImagev.setImageResource(R.drawable.hu_ru_yi_jie)
                 }
                 }
 
 
@@ -140,11 +149,19 @@ class WatchCallRecordsItemAdapter(val data: ArrayList<InteractionVO>) : BaseDele
                 //判断是呼入还是呼出 1 分机到主机 2主机到分机
                 //判断是呼入还是呼出 1 分机到主机 2主机到分机
                 if(Constants.memberId != itemData.fromDeviceMemberId){
                 if(Constants.memberId != itemData.fromDeviceMemberId){
                     binding.sickbedTv.text = itemData.fromFrameFullName
                     binding.sickbedTv.text = itemData.fromFrameFullName
-                    binding.nameTv.text = "From: " + itemData.fromMemberName
+                    if (TextUtils.isEmpty(itemData.fromMemberName)) {
+                        binding.nameTv.text = ""
+                    } else {
+                        binding.nameTv.text = "From: " + itemData.fromMemberName
+                    }
                     binding.callStatusImagev.setImageResource(R.drawable.hu_ru_wei_jie)
                     binding.callStatusImagev.setImageResource(R.drawable.hu_ru_wei_jie)
                 }else{
                 }else{
                     binding.sickbedTv.text = itemData.toFrameFullName
                     binding.sickbedTv.text = itemData.toFrameFullName
-                    binding.nameTv.text = "To: " + itemData.toMemberName
+                    if (TextUtils.isEmpty(itemData.toMemberName)) {
+                        binding.nameTv.text = ""
+                    } else {
+                        binding.nameTv.text = "To: " + itemData.toMemberName
+                    }
                     binding.callStatusImagev.setImageResource(R.drawable.hu_chu_wei_jie)
                     binding.callStatusImagev.setImageResource(R.drawable.hu_chu_wei_jie)
                 }
                 }
 
 

+ 5 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/ui/FragmentAudio.java

@@ -153,7 +153,11 @@ public class FragmentAudio extends SingleCallFragment implements View.OnClickLis
             else {
             else {
                 //是客户
                 //是客户
                 if (interactionVO.getFromClerkId() == null) {
                 if (interactionVO.getFromClerkId() == null) {
-                    showName = interactionVO.getFromFrameFullName() + " " + interactionVO.getFromMemberName();
+                    if (TextUtils.isEmpty(interactionVO.getFromMemberName())) {
+                        showName = interactionVO.getFromFrameFullName();
+                    } else {
+                        showName = interactionVO.getFromFrameFullName() + " " + interactionVO.getFromMemberName();
+                    }
                     portraitImageView.setImageResource(R.drawable.face_customer);
                     portraitImageView.setImageResource(R.drawable.face_customer);
 
 
                     if (!isOutgoing && Constants.Companion.getUserRoleName().contains("护士") || Constants.Companion.getUserRoleName().contains("组长")) {
                     if (!isOutgoing && Constants.Companion.getUserRoleName().contains("护士") || Constants.Companion.getUserRoleName().contains("组长")) {