瀏覽代碼

宿舍端主机通话记录中的回拨开启

weizhengliang 6 月之前
父節點
當前提交
dfd1f9f84e

+ 6 - 6
android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/dorm/adapter/DormCallRecordsItemAdapter.kt

@@ -114,12 +114,12 @@ class DormCallRecordsItemAdapter(val activity: Activity, var data: ArrayList<Int
                             //呼出已接听
                             binding.imgCallType.setImageResource(R.drawable.ic_records_call)
                             binding.callRecordsItemTitle.text = "您邀请  " + roleName + "  语音通话,  已接听"
-                            binding.btnRecordsAction.text = "通话"
+                            binding.btnRecordsAction.text = "回拨"
                         } else {
                             //呼出未接听
                             binding.imgCallType.setImageResource(R.drawable.ic_records_miss_call)
                             binding.callRecordsItemTitle.text = "您邀请  " + roleName + "  语音通话,  未接听"
-                            binding.btnRecordsAction.text = "通话"
+                            binding.btnRecordsAction.text = "回拨"
                         }
                     } else {
                         //其他设备呼入记录
@@ -135,11 +135,11 @@ class DormCallRecordsItemAdapter(val activity: Activity, var data: ArrayList<Int
                         if (itemData.actionEnd != null && itemData.actionAccept != null) {
                             binding.imgCallType.setImageResource(R.drawable.ic_records_call)
                             binding.callRecordsItemTitle.text = roleName + "  邀请您  语音通话,  已接听"
-                            binding.btnRecordsAction.text = "通话"
+                            binding.btnRecordsAction.text = "回拨"
                         } else {
                             binding.imgCallType.setImageResource(R.drawable.ic_records_miss_call)
                             binding.callRecordsItemTitle.text = roleName + "  邀请您 语音通话,  未接听"
-                            binding.btnRecordsAction.text = "通话"
+                            binding.btnRecordsAction.text = "回拨"
                         }
                     }
 
@@ -208,7 +208,7 @@ class DormCallRecordsItemAdapter(val activity: Activity, var data: ArrayList<Int
                 binding.btnRecordsAction.setOnClickListener {
                     if (TcpType.VOICE.name == itemData.actionType || TcpType.VIDEO.name == itemData.actionType) {
                         //拨打语音
-                        /*if (itemData.fromDeviceId == Constant.DEVICE_ID) {
+                        if (itemData.fromDeviceId == Constant.DEVICE_ID) {
                             //自己呼出的,再次呼出
                             if (!TextUtils.isEmpty(itemData.data)) {
                                 val roleType = JSON.parseObject(itemData.data).getString("roleType")
@@ -225,7 +225,7 @@ class DormCallRecordsItemAdapter(val activity: Activity, var data: ArrayList<Int
                         } else {
                             //对方呼入,直接呼叫对方
                             actionClickListener?.onCallDevice(itemData.fromDeviceId)
-                        }*/
+                        }
                     } else if (TcpType.IM.name == itemData.actionType) {
                         showMessage("播放语音")
                         MediaPlayHelper.getInstance().stopMusic(false)

+ 1 - 1
android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/receiver/NetWorkChangeReceiver.kt

@@ -18,7 +18,7 @@ class NetWorkChangeReceiver : BroadcastReceiver() {
             val wifiState = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE, -1)
             if (wifiState == WifiManager.WIFI_STATE_ENABLED) {
                 //打开wifi
-                Log.e(TAG, "打开wifi...")
+                Log.e(TAG, "监听到打开wifi...")
                 EventBus.getDefault().post(MessageEvent("wifi", Constant.EVENT_WIFI_ENABLE))
             }
         }

+ 1 - 1
android_host/src/main/java/com/wdkl/ncs/android/component/nursehome/util/NetworkUtils.java

@@ -318,7 +318,7 @@ public class NetworkUtils {
         } else {
             //无网络连接,判断是否开启了wifi,如开启了则尝试自动连接
             boolean wifiState = NetworkUtils.getWifiStatus(context);
-            Log.e(TAG, "network unavailable...$wifiState");
+            Log.e(TAG, "network unavailable..." + wifiState);
             if (wifiState) {
                 NetworkUtils.connectWifi(context, "");
             }