解决合并冲突

startRTC SIP 功能全去掉

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

@@ -173,7 +173,7 @@ class WatchEventDetailActivity : BaseActivity<WatchHomeActivityPresenter, WatchA
 
             if (tcpModel?.type == TcpType.IM) {
                 event_text.setText("语音留言")
-                event_status_img.setImageResource(com.starrtc.demo.R.drawable.icon_hd_live)
+                event_status_img.setImageResource(R.drawable.icon_hd_live)
                 if (interactionVO?.actionEnd != null) {
                     event_end_text.setText(TimeTransition().stampToDate(interactionVO!!.actionEnd * 1000))
                     //event_status_img.isEnabled = false
@@ -187,7 +187,7 @@ class WatchEventDetailActivity : BaseActivity<WatchHomeActivityPresenter, WatchA
                 if (interactionVO?.actionEnd != null) {
                     event_end_text.setText(TimeTransition().stampToDate(interactionVO!!.actionEnd * 1000))
                     event_status_img.isEnabled = false
-                    event_status_img.setImageResource(com.starrtc.demo.R.drawable.icon_switch_on)
+                    event_status_img.setImageResource(R.drawable.icon_switch_on)
                 }
             } else {
                 call_out_linlyout.visibility = View.GONE
@@ -253,10 +253,10 @@ class WatchEventDetailActivity : BaseActivity<WatchHomeActivityPresenter, WatchA
                     val responseInteractionVO = Gson().fromJson<InteractionVO>(resTcpModel.getData().toString(), InteractionVO::class.java)
 
                     if (tcpModel?.type == TcpType.IM) {
-                        event_status_img.setImageResource(com.starrtc.demo.R.drawable.icon_hd_live_item)
+                        event_status_img.setImageResource(R.drawable.icon_hd_live_item)
                         Toast.makeText(this, "已播放", Toast.LENGTH_SHORT)
                     } else if (tcpModel?.type == TcpType.EVENT) {
-                        event_status_img.setImageResource(com.starrtc.demo.R.drawable.icon_switch_on)
+                        event_status_img.setImageResource(R.drawable.icon_switch_on)
                         Toast.makeText(this, "已响应", Toast.LENGTH_SHORT)
                     }
 

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

@@ -19,10 +19,6 @@ import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
 import com.enation.javashop.net.engine.plugin.permission.RxPermissions
 import com.google.gson.Gson
-import com.starrtc.demo.demo.service.KeepLiveService
-import com.starrtc.demo.utils.AEvent
-import com.vvsip.ansip.IVvsipServiceListener
-import com.vvsip.ansip.VvsipCall
 import com.wdkl.core.consts.Urls
 import com.wdkl.core.socket.IUserState
 import com.wdkl.core.socket.SocketManager
@@ -30,10 +26,6 @@ import com.wdkl.core.voip.VoipEvent
 import com.wdkl.ncs.android.component.home.BuildConfig
 import com.wdkl.ncs.android.component.home.R
 import com.wdkl.ncs.android.component.home.SOSEmergencyCallActivity
-import com.wdkl.ncs.android.component.home.SipUtil.SipCallBack
-import com.wdkl.ncs.android.component.home.SipUtil.SipHelper
-import com.wdkl.ncs.android.component.home.SipUtil.SipHelperUtil
-import com.wdkl.ncs.android.component.home.SipUtil.SipHelperUtil2
 import com.wdkl.ncs.android.component.home.broadcast.BatteryBroadcastReceiver
 import com.wdkl.ncs.android.component.home.databinding.WatchActivityHomeBinding
 import com.wdkl.ncs.android.component.home.launch.HomeLaunch
@@ -89,7 +81,7 @@ import kotlin.math.log
 
 @Router(path = "/watch/home")
 class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivityHomeBinding>(), WatchHomeActivityContract.View, View.OnClickListener, View.OnLongClickListener,
-        SipCallBack, IVvsipServiceListener, IUserState {
+       IUserState {
 
 
     var TAG = WatchHome2Activity::class.java.getSimpleName()
@@ -262,11 +254,11 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
             return
         }
 
-        //这里的是视频通话有关的
-        AEvent.setHandler(Handler())
-        //这里的是视频通话有关的
-
-//        initSDK("000100")
+//        //这里的是视频通话有关的
+//        AEvent.setHandler(Handler())
+//        //这里的是视频通话有关的
+//
+////        initSDK("000100")
         initSDK(data.sipId)
         initInterfaceData()
         showMessage("初始化完成")
@@ -297,12 +289,12 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
     }
 
     private fun initSDK(DeviceSipId: String) {
-        val intent = Intent(this, KeepLiveService::class.java)
-        intent.putExtra("DeviceSipId", DeviceSipId)
-        startService(intent)
-
-        val intent2 = Intent(this, TcpHandleService::class.java)
-        startService(intent2)
+//        val intent = Intent(this, KeepLiveService::class.java)
+//        intent.putExtra("DeviceSipId", DeviceSipId)
+//        startService(intent)
+//
+//        val intent2 = Intent(this, TcpHandleService::class.java)
+//        startService(intent2)
 
 
         val intent3 = Intent(this, APPService::class.java)
@@ -390,12 +382,12 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
     private fun initSip() {
 
 
-        //=============================================Sip启动服务===================================//
-        SipHelperUtil.getInstance(this).sipStartService(Constants.sip_ip, Constants.sip_id, Constants.sip_password)
-        //=============================================SIP状态回调===================================//
-        SipHelperUtil.getInstance(this).setSipCallBack(this)
-        //=============================================SIP服务监听===================================//
-        SipHelperUtil.getInstance(this).obtainSipInfo()
+//        //=============================================Sip启动服务===================================//
+//        SipHelperUtil.getInstance(this).sipStartService(Constants.sip_ip, Constants.sip_id, Constants.sip_password)
+//        //=============================================SIP状态回调===================================//
+//        SipHelperUtil.getInstance(this).setSipCallBack(this)
+//        //=============================================SIP服务监听===================================//
+//        SipHelperUtil.getInstance(this).obtainSipInfo()
 
 //        SipHelper.getInstance().sipStartService()
 //        SipHelper.getInstance().initSip(this, Constants.sip_ip,Constants.sip_id,Constants.sip_password)
@@ -404,40 +396,40 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
     }
 
 
-    /**
-     * sip开始通话    ------------------sip回调操作----------------------
-     */
-    override fun startCall(sipAddress: String?) {
-        SipHelperUtil.getInstance(this).startCall(sipAddress)
-    }
-
-    /**
-     * sip自动接听
-     */
-    override fun autoTalking() {
-        SipHelperUtil.getInstance(this).autoTalking()
-    }
-
-    /**
-     * sip结束通话
-     */
-    override fun endCall() {
-        SipHelperUtil.getInstance(this).endCall()
-    }
-
-    override fun onNewVvsipCallEvent(call: VvsipCall?) {
-        SipHelperUtil.getInstance(this).addCallObject(call)
-    }
-
-    override fun onRemoveVvsipCallEvent(call: VvsipCall?) {
-        SipHelperUtil.getInstance(this).removeCallObject(call)
-    }
-
-    override fun onStatusVvsipCallEvent(call: VvsipCall?) {
-    }
-
-    override fun onRegistrationEvent(rid: Int, remote_uri: String?, code: Int, reason: String?) {
-    }
+//    /**
+//     * sip开始通话    ------------------sip回调操作----------------------
+//     */
+//    override fun startCall(sipAddress: String?) {
+//        SipHelperUtil.getInstance(this).startCall(sipAddress)
+//    }
+//
+//    /**
+//     * sip自动接听
+//     */
+//    override fun autoTalking() {
+//        SipHelperUtil.getInstance(this).autoTalking()
+//    }
+//
+//    /**
+//     * sip结束通话
+//     */
+//    override fun endCall() {
+//        SipHelperUtil.getInstance(this).endCall()
+//    }
+//
+//    override fun onNewVvsipCallEvent(call: VvsipCall?) {
+//        SipHelperUtil.getInstance(this).addCallObject(call)
+//    }
+//
+//    override fun onRemoveVvsipCallEvent(call: VvsipCall?) {
+//        SipHelperUtil.getInstance(this).removeCallObject(call)
+//    }
+//
+//    override fun onStatusVvsipCallEvent(call: VvsipCall?) {
+//    }
+//
+//    override fun onRegistrationEvent(rid: Int, remote_uri: String?, code: Int, reason: String?) {
+//    }
 
     /**
      * 监听
@@ -513,16 +505,16 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
             var message = messageEvent.getMessage() as String
             Log.e(TAG, "收到sip註冊消息 " + message)
             runOnUiThread {
-                if (message.equals(SipHelperUtil.REGISTERING)) {
-                    sip_state_tv.setBackgroundColor(Color.parseColor("#FFFF00"))
-                } else if (message.equals(SipHelperUtil.REGISTERFAIL)) {
-                    sip_state_tv.setBackgroundColor(Color.parseColor("#FF0000"))
-                } else if (message.equals(SipHelperUtil.REGISTERCOM)) {
-                    sip_state_tv.setBackgroundColor(Color.parseColor("#00FFFF"))
-                }
+//                if (message.equals(SipHelperUtil.REGISTERING)) {
+//                    sip_state_tv.setBackgroundColor(Color.parseColor("#FFFF00"))
+//                } else if (message.equals(SipHelperUtil.REGISTERFAIL)) {
+//                    sip_state_tv.setBackgroundColor(Color.parseColor("#FF0000"))
+//                } else if (message.equals(SipHelperUtil.REGISTERCOM)) {
+//                    sip_state_tv.setBackgroundColor(Color.parseColor("#00FFFF"))
+//                }
             }
         } else if (messageEvent.tag == Constants.EVENT_INTERNETPING) {
-            SipHelperUtil.getInstance(this).obtainSipInfo()
+//            SipHelperUtil.getInstance(this).obtainSipInfo()
 
         } else if (messageEvent.tag == Constants.EVENT_UNTREATED_QUANTITY) {
             var message = messageEvent.getMessage() as ArrayList<InteractionVO>