فهرست منبع

默认开启呼叫转移,设备类型为护士主机时不能查看床位记录

weizhengliang 3 سال پیش
والد
کامیت
33e3b5e29f

+ 1 - 1
home/src/main/code/com/wdkl/ncs/android/component/home/activity/NewCallListActivity.kt

@@ -141,7 +141,7 @@ class NewCallListActivity : BaseToolActivity(), NewCallItemAdapter.CallClickList
         WdKeepAliveService.mNewCallListActive = true
 
         //启动线程处理呼叫转移
-        if (true) {
+        if (Constants.supportTrans) {
             startLoopTransfer()
         }
     }

+ 12 - 18
home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchContactsActivity.kt

@@ -97,26 +97,20 @@ class WatchContactsActivity : BaseActivity<WatchActivityPresenter, WatchContacts
             presenter.loadData(1, Constants.deviceId)
         }
 
-        adapter.setOnItemClickListener { data, position ->
-//            adapter.setThisPosition(position)
-//            adapter.notifyDataSetChanged()
-
-            //todo 临时写的测试语音通话功能
-            var customerId = data.customerId
-            if(data.customerId == null){
-                customerId = 0
+        if (Constants.deviceType != 1) {
+            adapter.setOnItemClickListener { data, position ->
+                var customerId = data.customerId
+                if (data.customerId == null) {
+                    customerId = 0
+                }
+                val watchContactsVO: WatchContactsVO = data
+                var intent = Intent(this, WatchCallRecordsActivity::class.java)
+                intent.putExtra("data", watchContactsVO)
+                intent.putExtra("action", "CUSTOMER_RECORDS")
+                intent.putExtra("customer_id", "" + customerId)
+                startActivity(intent)
             }
-            val watchContactsVO :WatchContactsVO = data
-            var intent = Intent(this, WatchCallRecordsActivity::class.java)
-            intent.putExtra("data", watchContactsVO)
-            intent.putExtra("action", "CUSTOMER_RECORDS")
-            intent.putExtra("customer_id", ""+customerId)
-            startActivity(intent)
-
         }
-
-
-
     }
 
     override fun render(data: ArrayList<WatchContactsVO>) {

+ 3 - 1
middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constants.kt

@@ -45,7 +45,9 @@ class Constants {
         //来电呼叫列表
         var newCallList = ArrayList<TcpModel>()
         //是否支持语音通话
-        val supportCall = true
+        val supportCall = false
+        //是否支持呼叫转移
+        var supportTrans = true
 
         //手机通话方式: 默认网络
         var phoneType = CommunicationEnum.NET_WORK.value()