<移除掉startRtc和旧版sip模块>

app/build.gradle

@@ -133,7 +133,7 @@ dependencies {
     compile 'com.android.support.constraint:constraint-layout:1.1.0-beta5'
 
 
-    compile project(':starRTC')
+    //compile project(':starRTC')
 
 }
 

app/src/main/code/com/wdkl/app/ncs/activity/SchemeActivity.kt

@@ -6,7 +6,6 @@ import android.support.v7.app.AppCompatActivity
 import com.enation.javashop.android.jrouter.JRouter
 import com.enation.javashop.android.jrouter.logic.datainfo.Postcard
 import com.enation.javashop.android.jrouter.logic.listener.NavListener
-import com.starrtc.demo.utils.AEvent
 
 /**
  * Created by LDD on 2017/9/10.

nursehome/build.gradle

@@ -106,8 +106,8 @@ dependencies {
      */
     compile 'com.android.support.constraint:constraint-layout:1.1.0-beta5'
 
-    compile project(':starRTC')
-    compile project(':AmDemo_R')
+    //compile project(':starRTC')
+    //compile project(':AmDemo_R')
 
     //web rtc
     compile project(':webrtc')

nursehome/src/main/AndroidManifest.xml

@@ -89,7 +89,7 @@
             android:screenOrientation="landscape"
             android:launchMode="singleTask"/>
 
-        <service
+        <!--<service
             android:name="com.vvsip.ansip.VvsipService"
             android:icon="@drawable/ic_launcher"></service>
 
@@ -98,7 +98,7 @@
             <intent-filter>
                 <action android:name="com.starrtc.demo.service.KeepLiveService" />
             </intent-filter>
-        </service>
+        </service>-->
     </application>
 
 

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -26,9 +26,9 @@ import android.widget.RelativeLayout
 import com.enation.javashop.android.jrouter.external.annotation.Router
 import com.enation.javashop.net.engine.model.NetState
 import com.google.gson.Gson
-import com.starrtc.demo.demo.MLOC
-import com.starrtc.demo.demo.voip.VoipActivity
-import com.starrtc.demo.demo.voip.VoipAudioActivity
+//import com.starrtc.demo.demo.MLOC
+//import com.starrtc.demo.demo.voip.VoipActivity
+//import com.starrtc.demo.demo.voip.VoipAudioActivity
 import com.wdkl.core.consts.Urls
 import com.wdkl.core.socket.IUserState
 import com.wdkl.core.socket.SocketManager
@@ -37,7 +37,7 @@ import com.wdkl.core.voip.SpeechUtil
 import com.wdkl.ncs.android.component.nursehome.BuildConfig
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.SipUtil.SipCallBack
-import com.wdkl.ncs.android.component.nursehome.SipUtil.SipHelperUtil
+//import com.wdkl.ncs.android.component.nursehome.SipUtil.SipHelperUtil
 import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.component.nursehome.databinding.ActivityNurseHomeBinding
 import com.wdkl.ncs.android.component.nursehome.fragment.*
@@ -200,11 +200,11 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
 
     private fun initSip() {
         //=============================================Sip启动服务===================================//
-        SipHelperUtil.getInstance(this).sipStartService()
+        //SipHelperUtil.getInstance(this).sipStartService()
         //=============================================SIP状态回调===================================//
-        SipHelperUtil.getInstance(this).setSipCallBack(this)
+        //SipHelperUtil.getInstance(this).setSipCallBack(this)
         //=============================================SIP服务监听===================================//
-        SipHelperUtil.getInstance(this@NurseHomeActivity).obtainSipInfo()
+        //SipHelperUtil.getInstance(this@NurseHomeActivity).obtainSipInfo()
     }
 
     override fun userLogin() {
@@ -494,7 +494,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
     }
 
 
-fun call(tyte:Int){
+/*fun call(tyte:Int){
     var deviceHostingID = "742226"
     MLOC.saveVoipUserId(this, deviceHostingID)
     Log.e(TAG, "initDataEntity.getDeviceHostingID() " + deviceHostingID)
@@ -509,32 +509,32 @@ fun call(tyte:Int){
         intent.putExtra(VoipAudioActivity.ACTION, VoipAudioActivity.CALLING)
         startActivity(intent)
        }
-  }
+  }*/
 
     /**
      * sip开始通话    ------------------sip回调操作----------------------
      */
     override fun startCall(sipAddress: String?) {
-        SipHelperUtil.getInstance(this).startCall(sipAddress)
+        //SipHelperUtil.getInstance(this).startCall(sipAddress)
     }
 
     /**
      * sip自动接听
      */
     override fun autoTalking() {
-        SipHelperUtil.getInstance(this).autoTalking()
+        //SipHelperUtil.getInstance(this).autoTalking()
     }
 
     /**
      * sip结束通话
      */
     override fun endCall() {
-        SipHelperUtil.getInstance(this).endCall()
+        //SipHelperUtil.getInstance(this).endCall()
     }
 
     fun initiateCall(sipAddress: String, type: String, mac: String) {
         //=============================================SIP拨打电话===================================//
-        SipHelperUtil.getInstance(this).getmSipCallBack().startCall(sipAddress)
+        //SipHelperUtil.getInstance(this).getmSipCallBack().startCall(sipAddress)
 
     }
 
@@ -544,7 +544,7 @@ fun call(tyte:Int){
     fun endCalled() {
         //20171219
         //=============================================SIP结束电话===================================//
-        SipHelperUtil.getInstance(this).getmSipCallBack().endCall()
+        //SipHelperUtil.getInstance(this).getmSipCallBack().endCall()
     }
 
     /**

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/RegisterActivity.kt

@@ -9,7 +9,7 @@ import android.util.Log
 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.starrtc.demo.demo.service.KeepLiveService
+//import com.starrtc.demo.demo.service.KeepLiveService
 import com.wdkl.ncs.android.component.nursehome.R
 import com.wdkl.ncs.android.component.nursehome.databinding.ActivityNurseHomeBinding
 import com.wdkl.ncs.android.component.nursehome.databinding.ActivityRegisterBinding
@@ -19,10 +19,10 @@ import com.wdkl.ncs.android.middleware.logic.contract.nursehome.NurseHomeActivit
 import com.wdkl.ncs.android.middleware.logic.presenter.nursehome.NurseHomeActivityPresenter
 import com.wdkl.ncs.android.middleware.model.ChildCategoryShell
 import io.reactivex.Observable
-import com.starrtc.demo.utils.AEvent
+//import com.starrtc.demo.utils.AEvent
 import com.wdkl.ncs.android.component.nursehome.BuildConfig
 import com.wdkl.ncs.android.component.nursehome.common.Constants
-import com.wdkl.ncs.android.component.nursehome.service.RTCKeepLiveService
+//import com.wdkl.ncs.android.component.nursehome.service.RTCKeepLiveService
 import com.wdkl.ncs.android.component.nursehome.util.NetHelper
 import com.wdkl.ncs.android.lib.utils.*
 import com.wdkl.ncs.android.middleware.logic.contract.nursehome.DeviceContract
@@ -181,7 +181,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
 
 
         //这里的是视频通话有关的
-        AEvent.setHandler(Handler())
+        //AEvent.setHandler(Handler())
         //这里的是视频通话有关的
 
 //        initSDK("000100")
@@ -250,14 +250,14 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
     /**
      * 初始化rtc
      */
-    private fun initSDK(DeviceSipId: String) {
+/*    private fun initSDK(DeviceSipId: String) {
         val intent = Intent(this, KeepLiveService::class.java)
         intent.putExtra("DeviceSipId", DeviceSipId)
         startService(intent)
 
         val intent2 = Intent(this, RTCKeepLiveService::class.java)
         startService(intent2)
-    }
+    }*/
 
 
 

settings.gradle

@@ -1 +1 @@
-include ':app', ':common', ':welcome', ':home', ':resource', ':middleware', ':extra', ':nursehome', ':starRTC', ':AmDemo_R', 'webrtc', 'rtc-chat', 'libwebrtc'
+include ':app', ':common', ':welcome', ':home', ':resource', ':middleware', ':extra', ':nursehome', 'webrtc', 'rtc-chat', 'libwebrtc'