优化呼叫记录显示，修改角色匹配

android_mobile/src/main/yd_w_qin2_2/code/com/wdkl/ncs/android/component/home/activity/NewEventListActivity.kt

@@ -134,7 +134,7 @@ class NewEventListActivity : BaseActivity<NewEventListPresenter, ActivityEventLi
         Constants.eventList.clear()
     }
 
-    override fun renderData(data: ArrayList<InteractionVO>) {
+    fun renderData(data: ArrayList<InteractionVO>) {
         Log.e(TAG,"返回的数据 "+data.size)
         //data.sortByDescending { it.id }
         //srl_event_list.finishRefresh()

android_mobile/src/main/yd_w_qin2_2/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -46,6 +46,7 @@ import com.wdkl.ncs.android.middleware.model.vo.DeviceVO
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.model.vo.WatchContactVO
 import com.wdkl.ncs.android.middleware.tcp.TcpClientHandler
+import com.wdkl.ncs.android.middleware.tcp.enums.RoleTypeEnum
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import com.wdkl.ncs.android.middleware.utils.ContactHelper
 import com.wdkl.ncs.keepbackground.utils.SpManager
@@ -427,7 +428,8 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         Constants.sipPassword = data.sipPassword
         Constants.memberId = data.memberId
         Constants.userName = data.memberName
-        Constants.userRoleName = data.roleName
+        Constants.roleName = data.roleName
+        Constants.roleId = data.roleId
 
         presenter.getAppVersion(Constants.partId, 7)
         presenter.getWatchContacts(Constants.deviceId)
@@ -466,11 +468,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         } else {
             watch_name_tv.text = Constants.userName
             if (Constants.userName != null) {
-                if (Constants.userRoleName!!.contains("腕表")) {
-                    watch_role_name_tv.text = Constants.userRoleName!!.substring(0, (Constants.userRoleName)!!.indexOf("腕表"))
-                } else {
-                    watch_role_name_tv.text = Constants.userRoleName
-                }
+                watch_role_name_tv.text = Constants.roleName
                 watch_user_phone_tv.text = data.phoneNumber
             }
 
@@ -531,11 +529,13 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         Log.i(TAG, "收到设置设备数据 transferDuration" + partSettingDO.transferDuration)
         Log.i(TAG, "收到设置设备数据 transferDurationLeader" + partSettingDO.transferDurationLeader)
         if (partSettingDO != null && partSettingDO.transferDuration != null && partSettingDO.transferDurationLeader != null) {
-            if (Constants.userRoleName != null) {
-                if (!Constants.userRoleName!!.contains("护士组长") && Constants.userRoleName!!.contains("护士")) {
-                    SettingConfig.setCountdownTime(application, partSettingDO.transferDuration)
-                } else if (Constants.userRoleName!!.contains("护士组长")) {
+            if (Constants.roleId != null) {
+                if (Constants.roleId == RoleTypeEnum.NURSE_HEAD.value()) {
+                    //护士组长
                     SettingConfig.setCountdownTime(application, partSettingDO.transferDurationLeader)
+                } else if (Constants.roleId == RoleTypeEnum.NURSE.value()) {
+                    //护士
+                    SettingConfig.setCountdownTime(application, partSettingDO.transferDuration)
                 }
             }
         }

android_mobile/src/main/yd_w_qin2_2/code/com/wdkl/ncs/android/component/home/adapter/WatchCallRecordsItemAdapter.kt

@@ -74,7 +74,7 @@ class WatchCallRecordsItemAdapter(val data: ArrayList<InteractionVO>) : BaseDele
                 binding.treatmentStateImagev.visibility = View.VISIBLE
                 binding.processingTimeTv.visibility = View.VISIBLE
 
-                //判断是呼入还是呼出 1 分机到主机 2主机到分机
+                //判断是呼入还是呼出
                 if (itemData.fromDeviceMemberId == Constants.memberId){
                     binding.sickbedTv.text = itemData.toFrameFullName
                     binding.nameTv.text = "To: " + itemData.toMemberName
@@ -189,7 +189,11 @@ class WatchCallRecordsItemAdapter(val data: ArrayList<InteractionVO>) : BaseDele
                     binding.playTv.visibility = View.GONE
                     binding.treatmentStateImagev.visibility = View.GONE
                     binding.processingTimeTv.visibility = View.GONE
-
+                } else {
+                    binding.projectTv.visibility = View.GONE
+                    binding.playTv.visibility = View.GONE
+                    binding.treatmentStateImagev.visibility = View.GONE
+                    binding.processingTimeTv.visibility = View.GONE
                 }
             }
 

android_mobile/src/main/yd_w_qin2_2/code/com/wdkl/ncs/android/component/home/service/WdKeepAliveService.kt

@@ -41,10 +41,7 @@ import com.wdkl.ncs.android.middleware.tcp.channel.ChannelImUtil
 import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel
 import com.wdkl.ncs.android.middleware.tcp.channel.ImUtil
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
-import com.wdkl.ncs.android.middleware.tcp.enums.CommunicationEnum
-import com.wdkl.ncs.android.middleware.tcp.enums.DeviceTypeEnum
-import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
-import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
+import com.wdkl.ncs.android.middleware.tcp.enums.*
 import com.wdkl.ncs.android.middleware.utils.CommonUtils
 import com.wdkl.ncs.android.middleware.utils.ContactHelper
 import com.wdkl.ncs.android.middleware.utils.StringUtil
@@ -663,11 +660,13 @@ class WdKeepAliveService : AbsWorkService() {
                     Log.i(TAG, "收到系统设置 " + jsonStr)
                     if (partSettingDO != null) {
                         if (partSettingDO.transferDuration != null && partSettingDO.transferDurationLeader != null) {
-                            if (Constants.userRoleName != null) {
-                                if (!Constants.userRoleName!!.contains("护士组长") && Constants.userRoleName!!.contains("护士")) {
-                                    SettingConfig.setCountdownTime(application, partSettingDO.transferDuration)
-                                } else if (Constants.userRoleName!!.contains("护士组长")) {
+                            if (Constants.roleId != null) {
+                                if (Constants.roleId == RoleTypeEnum.NURSE_HEAD.value()) {
+                                    //护士组长
                                     SettingConfig.setCountdownTime(application, partSettingDO.transferDurationLeader)
+                                } else if (Constants.roleId == RoleTypeEnum.NURSE.value()) {
+                                    //护士
+                                    SettingConfig.setCountdownTime(application, partSettingDO.transferDuration)
                                 }
                             }
                         }

android_mobile/src/main/yd_w_qin2_2/code/com/wdkl/ncs/android/component/home/settingconfig/SettingConfig.java

@@ -9,7 +9,7 @@ public class SettingConfig {
 
     //呼叫转接时间设置
     private static final String KEY_SP_COUNTDOWN_TIME = "KEY_SP_COUNTDOWN_TIME";
-    private static final int CountdownTime = 15;
+    private static final int CountdownTime = 30;
 
     //电话功能类型
     private static final String KEY_SP_VOICE_CALL_TYPE = "KEY_SP_VOICE_CALL_TYPE";

android_mobile/src/main/yd_w_qin2_2/code/com/wdkl/ncs/android/component/home/ui/FragmentAudio.java

@@ -31,6 +31,7 @@ import com.wdkl.ncs.android.middleware.tcp.TcpClient;
 import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil;
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpCallback;
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
+import com.wdkl.ncs.android.middleware.tcp.enums.RoleTypeEnum;
 import com.wdkl.ncs.android.middleware.utils.StringUtil;
 import com.wdkl.rtc.entity.Publisher;
 import com.wdkl.rtc.entity.Room;
@@ -160,8 +161,11 @@ public class FragmentAudio extends SingleCallFragment implements View.OnClickLis
                     showName = interactionVO.getFromFrameFullName() + " " + interactionVO.getFromMemberName();
                     portraitImageView.setImageResource(R.drawable.face_customer);
 
-                    if (!isOutgoing && Constants.Companion.getUserRoleName().contains("护士") || Constants.Companion.getUserRoleName().contains("组长")) {
-                        transLinearLayout.setVisibility(View.VISIBLE);
+                    if (!isOutgoing) {
+                        if (Constants.Companion.getRoleId() != null
+                                /*&& (Constants.Companion.getRoleId() == RoleTypeEnum.NURSE.value() || Constants.Companion.getRoleId() == RoleTypeEnum.NURSE_HEAD.value())*/) {
+                            transLinearLayout.setVisibility(View.VISIBLE);
+                        }
                     }
                 }
                 //是同事

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

@@ -18,7 +18,8 @@ class Constants {
         var memberId:Int? = -1
         var userName: String? = "" //当前用户
         var phoneNumber: String? = "" //本机号码
-        var userRoleName: String? = "" //当前用户的角色
+        var roleName: String? = "" //当前用户的角色
+        var roleId: Int? = -1  //用户角色类型
         var tcpServer: String = ""
         var tcpPort: Int = 5080   //tcp端口
         var heartBeat: Int = 40    //tcp心跳