事件

build.gradle

@@ -1,128 +1,8 @@
-//buildscript {
-//    /**
-//     * Kotlin统一版本
-//     */
-//    ext.kotlin_version = '1.3.21'
-//
-//    /**
-//     * Aop编制版本
-//     */
-//    ext.aspectj_version = '1.8.9'
-//
-//    /**
-//     * 是否开启单独Module编译
-//     */
-//    ext.componentTag = false
-//
-//    /**
-//     * 路由注解处理器版本
-//     */
-//    ext.router_version = '1.0.2'
-//
-//    /**
-//     * kawo组件化框架版本
-//     */
-//    ext.kawo_version = '1.0.9'
-//
-//    /**
-//     * SDK最小支持版本
-//     */
-//    ext.min_sdk_version = 26
-//
-//    /**
-//     * SDK目标支持版本
-//     */
-//    ext.target_sdk_version = 28
-//
-//    /**
-//     * SDK编译版本
-//     */
-//    ext.build_tools_version = "26.0.2"
-//
-//    /**
-//     * 支持库版本
-//     */
-//    ext.support_library_version = "26.0.1"
-//
-//    /**
-//     * APP版本码
-//     */
-//    ext.app_version_code = 1
-//
-//    /**
-//     * APP版本号
-//     */
-//    ext.app_version = "1.0"
-//
-//    /**
-//     * 项目依赖库
-//     */
-//    dependencies {
-//        repositories {
-//            /**
-//             * 依赖仓储
-//             */
-//            maven { url 'https://maven.aliyun.com/repository/public' }
-//            maven { url 'https://maven.aliyun.com/repository/google'}
-//            maven { url 'https://jitpack.io' }
-//        }
-//        /**
-//         * Gradle插件
-//         */
-//        classpath 'com.android.tools.build:gradle:3.0.1'
-//
-//        /**
-//         * Kawo组件化插件
-//         */
-//        classpath "com.enation.geamtear.gradle:kawo:$kawo_version"
-//
-//        /**
-//         * KotlinGradle插件
-//         */
-//        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-//
-//        /**
-//         * Kotlin辅助工具
-//         */
-//        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
-//
-//        /**
-//         * Aop埋点相关
-//         */
-//        classpath "org.aspectj:aspectjtools:$aspectj_version"
-//    }
-//    repositories {
-//        mavenCentral()
-//    }
-//}
-///**
-// * 统一依赖仓储
-// */
-//allprojects {
-//    repositories {
-//        maven { url 'https://maven.aliyun.com/repository/public' }
-//        maven { url 'https://maven.aliyun.com/repository/google'}
-//        maven { url 'https://jitpack.io' }
-//    }
-//    tasks.withType(Javadoc) { // 新增
-//        options.addStringOption('Xdoclint:none', '-quiet')
-//        options.addStringOption('encoding', 'UTF-8')
-//    }
-//}
-//
-///**
-// *  清除Build配置时 删除根目录Build文件夹
-// */
-//task clean(type: Delete) {
-//    delete rootProject.buildDir
-//}
-
-
 buildscript {
     /**
      * Kotlin统一版本
      */
-    ext.kotlin_version = '1.2.40'
+    ext.kotlin_version = '1.3.21'
 
     /**
      * Aop编制版本
@@ -147,7 +27,7 @@ buildscript {
     /**
      * SDK最小支持版本
      */
-    ext.min_sdk_version = 17
+    ext.min_sdk_version = 26
 
     /**
      * SDK目标支持版本
@@ -182,9 +62,9 @@ buildscript {
             /**
              * 依赖仓储
              */
-            jcenter()
-            mavenCentral()
-            google()
+            maven { url 'https://maven.aliyun.com/repository/public' }
+            maven { url 'https://maven.aliyun.com/repository/google'}
+            maven { url 'https://jitpack.io' }
         }
         /**
          * Gradle插件
@@ -212,7 +92,7 @@ buildscript {
         classpath "org.aspectj:aspectjtools:$aspectj_version"
     }
     repositories {
-        google()
+        mavenCentral()
     }
 }
 /**
@@ -220,13 +100,13 @@ buildscript {
  */
 allprojects {
     repositories {
-        jcenter()
-        mavenCentral()
-        google()
-
-        maven { url 'https://dl.bintray.com/geamtear/maven' }
-        maven { url "https://jitpack.io" }
-
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://maven.aliyun.com/repository/google'}
+        maven { url 'https://jitpack.io' }
+    }
+    tasks.withType(Javadoc) { // 新增
+        options.addStringOption('Xdoclint:none', '-quiet')
+        options.addStringOption('encoding', 'UTF-8')
     }
 }
 
@@ -236,5 +116,3 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
-
-

home/src/main/AndroidManifest.xml

@@ -12,6 +12,8 @@
         <activity android:name=".activity.WatchHomeActivity" />
         <activity android:name=".activity.WatchContractsActivity" />
         <activity android:name=".activity.WatchCallRecordsActivity" />
+        <activity android:name="com.wdkl.ncs.android.component.home.activity.RTCVoipAudioRingingActivity" />
+        <activity android:name="com.wdkl.ncs.android.component.home.activity.RTCVoipAudioActivity" />
 
         <service android:name="com.starrtc.demo.demo.service.KeepLiveService">
             <intent-filter>

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchCallRecordsActivity.kt

@@ -8,6 +8,8 @@ import com.alibaba.android.vlayout.DelegateAdapter
 import com.alibaba.android.vlayout.VirtualLayoutManager
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
+import com.google.gson.FieldNamingPolicy
+import com.google.gson.GsonBuilder
 import com.scwang.smartrefresh.layout.footer.ClassicsFooter
 import com.wdkl.ncs.android.component.home.R
 import com.wdkl.ncs.android.component.home.adapter.WatchCallRecordsItemAdapter
@@ -22,6 +24,8 @@ import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchActivityPresent
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchCallRecordsFragmentPresenter
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
 import com.wdkl.ncs.android.middleware.model.vo.WatchContactsVO
+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.TcpModel
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.watch_activity_call_records.*
@@ -30,7 +34,7 @@ import org.greenrobot.eventbus.ThreadMode
 
 
 @Router(path = "/watch/callrecords")
-class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter, WatchActivityCallRecordsBinding>(), WatchCallRecordsFragmentContract.View {
+class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter, WatchActivityCallRecordsBinding>(), WatchCallRecordsFragmentContract.View,  View.OnClickListener {
 
 
     var TAG = WatchCallRecordsActivity::class.java.getSimpleName()
@@ -56,6 +60,7 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
      var all = "ALL"
      var initiator = "INITATOR"
      var action: String? = null
+    var receivedData :WatchContactsVO? = null
 
 
     override fun getLayId(): Int {
@@ -79,6 +84,7 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
         call_records_recyv.layoutManager = virtualLayoutManager
         call_records_recyv.adapter = delegateAdapter
 
+        receivedData = intent.getSerializableExtra("data") as WatchContactsVO?
         action = intent.getStringExtra("action")
         customerId = intent.getStringExtra("customer_id")
         if (action == all) {
@@ -89,10 +95,26 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
         }else {
             call_relyout.visibility = View.VISIBLE
             presenter.loadFloor(initiator, 1, 30,Constants.ids.toInt(),customerId.toInt())
+            call_relyout.setOnClickListener{
+                Log.i(TAG, "call_relyout click 111")
+                var tcpModel = VoiceUtil.voiceCall(Integer.parseInt(Constants.ids),21)
+                TcpClient.getInstance().sendMsg(tcpModel.toJson())
+            }
+        }
+    }
+
+    override fun onClick(p0: View) {
+        when (p0.id) {
+            R.id.call_relyout -> {
+                Log.i(TAG, "call_relyout click 222")
+                var tcpModel = VoiceUtil.voiceCall(Integer.parseInt(Constants.ids),receivedData?.deviceId)
+                TcpClient.getInstance().sendMsg(tcpModel.toJson())
+            }
         }
     }
 
     override fun bindEvent() {
+
     }
 
     override fun destory() {
@@ -140,10 +162,20 @@ class WatchCallRecordsActivity : BaseActivity<WatchCallRecordsFragmentPresenter,
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
-        var messageEvent = messageEvent.getMessage() as TcpModel
-//        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
-//            Log.e(TAG,"收到tcp消息")
-//        }
+        if (messageEvent.type == 1){
+            var tcpModel = messageEvent.getMessage() as TcpModel
+            //data 是 InteractionVO
+            var gson = GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES).create()
+            var interactionVO = gson.fromJson(tcpModel.data.toString(), InteractionVO::class.java)
+            //界面呈现
+            AppTool.Time.delay(300){
+                var intent = Intent()
+                intent.setClass(this,RTCVoipAudioActivity::class.java)
+                intent.putExtra("targetId", interactionVO.toSipId)
+                intent.putExtra("TcpModel",tcpModel)
+                startActivity(intent)
+            }
+        }
     }
 
 }

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchContractsActivity.kt

@@ -91,13 +91,13 @@ class WatchContractsActivity : BaseActivity<WatchActivityPresenter, WatchContact
 
         adapter.setOnItemClickListener { data, position ->
             //todo 临时写的测试语音通话功能
-
-
             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", "INITATOR")
             intent.putExtra("customer_id", ""+customerId)
             startActivity(intent)

home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHomeActivity.kt

@@ -2,9 +2,11 @@ package com.wdkl.ncs.android.component.home.activity
 
 import android.content.Intent
 import android.graphics.Color
+import android.util.Log
 import android.view.View
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
+import com.google.gson.Gson
 import com.wdkl.ncs.android.component.home.R
 import com.wdkl.ncs.android.component.home.databinding.WatchActivityHomeBinding
 import com.wdkl.ncs.android.component.home.launch.HomeLaunch
@@ -14,10 +16,19 @@ import com.wdkl.ncs.android.lib.utils.push
 import com.wdkl.ncs.android.lib.utils.showMessage
 import com.wdkl.ncs.android.middleware.logic.contract.home.WatchHomeActivityContract
 import com.wdkl.ncs.android.middleware.logic.presenter.home.WatchHomeActivityPresenter
+<<<<<<< HEAD
 import com.wdkl.ncs.android.middleware.tcp.TcpClient
+=======
+import com.wdkl.ncs.android.middleware.model.vo.InteractionVO
+import com.wdkl.ncs.android.middleware.tcp.TcpClient
+import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
+>>>>>>> 71a42c92efd855c2d6a4127d6a0cd4980eb7601d
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpType
 import com.wdkl.ncs.android.middleware.utils.MessageEvent
 import kotlinx.android.synthetic.main.watch_activity_home.*
+import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 
@@ -39,11 +50,17 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
 
         Thread ( Runnable {
             run {
+<<<<<<< HEAD
                 TcpClient.getInstance().init("192.168.1.138", 5080, 9)
 //                TcpClient.getInstance().init("47.106.200.55", 5080, 9)
             }
         }).start()
 
+=======
+                TcpClient.getInstance().init("192.168.1.138",5080,10)
+            }
+        }).start()
+>>>>>>> 71a42c92efd855c2d6a4127d6a0cd4980eb7601d
     }
 
     override fun bindEvent() {
@@ -98,11 +115,74 @@ class WatchHomeActivity : BaseActivity<WatchHomeActivityPresenter, WatchActivity
         }
     }
 
+
+    // ====================================== 处理tcp
+    var calling :Boolean=false
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
-        var messageEvent = messageEvent.getMessage() as TcpModel
-//        if(messageEvent.getAction() === TcpAction.EventAction.KEY_CLICK){
-//            Log.e(TAG,"收到tcp消息")
-//        }
+        if (messageEvent.type == 1) {
+            return
+        }
+
+        var tcpModel = messageEvent.getMessage() as TcpModel
+        var responseTcpModel :TcpModel
+
+        when (tcpModel.getType()) {
+            TcpType.CALLBACK -> if (tcpModel.getAction() === TcpAction.CallbackAction.SUCCESS) {
+                //todo: 刷新呼叫记录列表
+
+            } else if (tcpModel.getAction() === TcpAction.CallbackAction.FAILED) {
+                //呼叫失败
+            }
+            TcpType.VOICE -> if (tcpModel.getAction() === TcpAction.VoiceAction.CALL) { //语音呼入
+                val interactionVO = Gson().fromJson<InteractionVO>(tcpModel.getData().toString(), InteractionVO::class.java)
+                //判断当前是否通话
+                // 通话中
+                if (calling) {
+                    responseTcpModel = VoiceUtil.voiceCalling(tcpModel.getToId(), tcpModel.getFromId(), interactionVO.getId())
+                    //给服务器发送正在通话中 tcp
+                    TcpClient.getInstance().sendMsg(responseTcpModel.toJson())
+                } else {
+                    responseTcpModel = VoiceUtil.voiceSuccess(tcpModel.getToId(), tcpModel.getFromId(), interactionVO.getId())
+                    TcpClient.getInstance().sendMsg(responseTcpModel.toJson())
+
+                    //界面呈现
+                    AppTool.Time.delay(300){
+                        var intent = Intent()
+                        intent.setClass(this,RTCVoipAudioRingingActivity::class.java)
+                        intent.putExtra("targetId", interactionVO.fromSipId)
+                        intent.putExtra("TcpModel",tcpModel)
+                        startActivity(intent)
+                    }
+                }
+            } else if (tcpModel.getAction() === TcpAction.VoiceAction.ACCEPT) { //我方呼出，对方接受
+                //todo:调用通话中界面；建立数据通话
+            } else if (tcpModel.getAction() === TcpAction.VoiceAction.REJECT) { //我方呼出，对方拒绝
+                //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方拒绝并停留3秒，结束至正常界面
+
+            } else if (tcpModel.getAction() === TcpAction.VoiceAction.CALLING) { //我方呼出，对方通话中
+                //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方占线并停留3秒，结束至正常界面；更新左侧
+
+            } else if (tcpModel.getAction() === TcpAction.VoiceAction.FAILED) { //我方呼出，对方不在线，设备离线或其它错误
+                //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方离线并停留3秒，结束至正常界面；更新左侧
+
+            } else if (tcpModel.getAction() === TcpAction.VoiceAction.HANDOFF) { //对方挂断，不论我方呼出或呼入
+                //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方已挂断并停留3秒，结束至正常界面；更新左侧
+
+            } else if (tcpModel.getAction() === TcpAction.VoiceAction.SUCCESS) {
+                //todo 更新呼出的TcpModel，data放置vo
+            }
+            TcpType.VIDEO -> {
+            }
+            TcpType.IM -> if (tcpModel.getAction() === TcpAction.IMAction.MSG) {
+                //todo: 使用通话中界面，显示有语音留言，停留3秒，结束至正常界面
+
+            }
+            TcpType.EVENT -> if (tcpModel.getAction() === TcpAction.EventAction.KEY_CLICK) { //有新事件过来
+                //todo: 服务端通过data给出具体的事件名称放置data。使用通话中界面，显示事件名称，停留3秒，结束至正常界面
+                Log.e(TAG, "收到事件tcp")
+            }
+        }
     }
 }

home/src/main/code/com/wdkl/ncs/android/component/home/util/NetHelper.java

@@ -323,6 +323,7 @@ public class NetHelper {
                 mac = tryGetWifiMac();
             }
         } catch (Exception e) {
+            e.printStackTrace();
         }
         return mac;
     }

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/UrlManager.kt

@@ -54,7 +54,7 @@ interface UrlManager {
 private class DevUrlManager : UrlManager{
 
     override val base: String
-        get() = "http://47.106.200.55"
+        get() = "http://192.168.1.138"
 
     override val device_url: String
         get() = "${base}:8006/"

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/channel/DeviceChannel.java

@@ -6,6 +6,7 @@ import com.google.gson.Gson;
 import com.wdkl.ncs.android.middleware.model.vo.InteractionVO;
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction;
+import com.wdkl.ncs.android.middleware.tcp.enums.TcpType;
 import com.wdkl.ncs.android.middleware.utils.MessageEvent;
 
 import org.greenrobot.eventbus.EventBus;
@@ -25,90 +26,10 @@ public class DeviceChannel {
 
         Log.e(TAG,"DeviceChannel "+tcpModel.getType());
 
-        switch (tcpModel.getType()){
-            case CALLBACK:
-                if(tcpModel.getAction()== TcpAction.CallbackAction.SUCCESS){
-                    //todo: 刷新呼叫记录列表
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                }else if(tcpModel.getAction()== TcpAction.CallbackAction.FAILED){
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                }
-                break;
-            case VOICE:
-                if (tcpModel.getAction()== TcpAction.VoiceAction.CALL){ //语音呼入
-                    InteractionVO interactionVO = new Gson().fromJson(tcpModel.getData().toString(), InteractionVO.class);
-                    //todo: 判断当前是否通话
-                    // 通话中
-                    if (calling){
-                        responseTcpModel = VoiceUtil.voiceCalling(tcpModel.getToId(), tcpModel.getFromId(),interactionVO.getId());
-                        //todo 给服务器发送正在通话中 tcp
-                        return responseTcpModel;
-                    } else {
-                        responseTcpModel = VoiceUtil.voiceSuccess(tcpModel.getToId(), tcpModel.getFromId(),interactionVO.getId());
-                        //todo: 通话中界面展现，data中服务器传过来呼入名称；从接口重新获取左侧数据
-                        EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                        return responseTcpModel;
-                    }
-                } else if (tcpModel.getAction()== TcpAction.VoiceAction.ACCEPT){ //我方呼出，对方接受
-                    //todo: 通话中界面更新；建立数据通话
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                } else if (tcpModel.getAction()== TcpAction.VoiceAction.REJECT){ //我方呼出，对方拒绝
-                    //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方拒绝并停留3秒，结束至正常界面；更新左侧
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                } else if (tcpModel.getAction()== TcpAction.VoiceAction.CALLING){ //我方呼出，对方通话中
-                    //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方占线并停留3秒，结束至正常界面；更新左侧
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                } else if (tcpModel.getAction()== TcpAction.VoiceAction.FAILED){ //我方呼出，对方不在线，设备离线或其它错误
-                    //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方离线并停留3秒，结束至正常界面；更新左侧
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                } else if (tcpModel.getAction()== TcpAction.VoiceAction.HANDOFF){ //对方挂断，不论我方呼出或呼入
-                    //todo: 清掉呼出的TcpModel，通话中界面更新 --- 显示对方已挂断并停留3秒，结束至正常界面；更新左侧
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                }else if(tcpModel.getAction()== TcpAction.VoiceAction.SUCCESS){
-                    //todo 这个是自己点击了分机的呼叫 服务器返回给我数据 以供我 挂断时传输呼叫记录的id 因为分机
-                    //在点击呼叫之前 是没有呼叫记录的
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                }
-                break;
-            case VIDEO:
-                break;
-            case IM:
-                if (tcpModel.getAction()== TcpAction.IMAction.MSG){
-                    //todo: 从接口重新获取左侧数据；使用通话中界面，显示有语音留言，停留3秒，结束至正常界面
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                } else if (tcpModel.getAction()== TcpAction.IMAction.MSG_READ){ //语音已读取
-                    //todo: 从data得到语音id；更新左侧，注意这里不使用通话中界面提示已读
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                }
-                break;
-            case EVENT:
-                if (tcpModel.getAction()== TcpAction.EventAction.KEY_CLICK){ //有新事件过来
-                    //todo: 服务端通过data给出具体的事件名称放置data。从接口重新获取左侧数据；使用通话中界面，显示事件名称，停留3秒，结束至正常界面
-                    Log.e(TAG,"收到事件tcp");
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-
-                } else if (tcpModel.getAction()== TcpAction.EventAction.RESPONSE){ //事件已处理，仅分机用
-                    //todo: 从data得到事件id，使用通话中界面，显示事件名称及已响应字样，停留3秒，结束至正常界面；更新左侧
-                    Log.e(TAG,"");
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                    Log.e(TAG,"收到事件已处理tcp");
-                }
-                break;
-            case DATA:
-                if (tcpModel.getAction()== TcpAction.DataAction.REFRESH){
-                    //todo: 通过data判断刷新何种数据
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                }else if(tcpModel.getAction()== TcpAction.DataAction.INTERACTION){
-                    //todo: 刷新呼叫记录列表
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                }
-                break;
-            case DEVICE:
-                if (tcpModel.getAction()== TcpAction.DeviceAction.RESTART){
-                    //todo:重启设备
-                    EventBus.getDefault().post(new MessageEvent(tcpModel,0));
-                }
-                break;
+        if (tcpModel.getType()== TcpType.VOICE && tcpModel.getAction()==TcpAction.VoiceAction.SUCCESS){
+            EventBus.getDefault().post(new MessageEvent(tcpModel, 1));
+        } else {
+            EventBus.getDefault().post(new MessageEvent(tcpModel, 0));
         }
 
         return responseTcpModel;

starRTC/src/main/java/com/starrtc/demo/demo/MLOC.java

@@ -33,7 +33,7 @@ public class MLOC {
     public static Context appContext;
     public static String userId = "";
     //原有demo外网地址
-    public static String SERVER_HOST                = "demo.starrtc.com";
+    public static String SERVER_HOST                = "47.106.200.55";
 
 
     //自己局域网服务地址