|
@@ -5,8 +5,10 @@ import android.content.Context
|
|
import android.content.Intent
|
|
import android.content.Intent
|
|
import android.content.pm.PackageManager
|
|
import android.content.pm.PackageManager
|
|
import android.graphics.Color
|
|
import android.graphics.Color
|
|
|
|
+import android.os.Bundle
|
|
import android.provider.Settings
|
|
import android.provider.Settings
|
|
import android.support.v4.app.ActivityCompat
|
|
import android.support.v4.app.ActivityCompat
|
|
|
|
+import android.support.v4.app.Fragment
|
|
import android.support.v4.content.ContextCompat
|
|
import android.support.v4.content.ContextCompat
|
|
import android.telephony.PhoneStateListener
|
|
import android.telephony.PhoneStateListener
|
|
import android.telephony.SignalStrength
|
|
import android.telephony.SignalStrength
|
|
@@ -23,15 +25,15 @@ import com.google.gson.Gson
|
|
import com.wdkl.core.consts.Urls
|
|
import com.wdkl.core.consts.Urls
|
|
import com.wdkl.core.socket.IUserState
|
|
import com.wdkl.core.socket.IUserState
|
|
import com.wdkl.core.socket.SocketManager
|
|
import com.wdkl.core.socket.SocketManager
|
|
-import com.wdkl.core.voip.CallMultiActivity
|
|
|
|
import com.wdkl.ncs.android.component.home.BuildConfig
|
|
import com.wdkl.ncs.android.component.home.BuildConfig
|
|
import com.wdkl.ncs.android.component.home.R
|
|
import com.wdkl.ncs.android.component.home.R
|
|
import com.wdkl.ncs.android.component.home.broadcast.BatteryBroadcastReceiver
|
|
import com.wdkl.ncs.android.component.home.broadcast.BatteryBroadcastReceiver
|
|
import com.wdkl.ncs.android.component.home.databinding.ActivityHomeBinding
|
|
import com.wdkl.ncs.android.component.home.databinding.ActivityHomeBinding
|
|
|
|
+import com.wdkl.ncs.android.component.home.fragment.VisitFragment
|
|
import com.wdkl.ncs.android.component.home.launch.HomeLaunch
|
|
import com.wdkl.ncs.android.component.home.launch.HomeLaunch
|
|
import com.wdkl.ncs.android.component.home.service.TcpHandleService
|
|
import com.wdkl.ncs.android.component.home.service.TcpHandleService
|
|
import com.wdkl.ncs.android.component.home.service.TcpHandleService.instance.updateLastTime
|
|
import com.wdkl.ncs.android.component.home.service.TcpHandleService.instance.updateLastTime
|
|
-import com.wdkl.ncs.android.component.home.service.WdKeepAliveService
|
|
|
|
|
|
+//import com.wdkl.ncs.android.component.home.service.WdKeepAliveService
|
|
import com.wdkl.ncs.android.component.home.util.CallDialogHelper
|
|
import com.wdkl.ncs.android.component.home.util.CallDialogHelper
|
|
import com.wdkl.ncs.android.component.home.util.NetHelper
|
|
import com.wdkl.ncs.android.component.home.util.NetHelper
|
|
import com.wdkl.ncs.android.component.home.util.SpeechUtil
|
|
import com.wdkl.ncs.android.component.home.util.SpeechUtil
|
|
@@ -54,10 +56,11 @@ import com.wdkl.ncs.android.middleware.tcp.channel.VoiceUtil
|
|
import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel
|
|
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.TcpAction
|
|
import com.wdkl.ncs.android.middleware.utils.MessageEvent
|
|
import com.wdkl.ncs.android.middleware.utils.MessageEvent
|
|
-import com.wdkl.ncs.keepbackground.work.DaemonEnv
|
|
|
|
|
|
+import com.wdkl.skywebrtc.SkyEngineKit
|
|
import io.reactivex.Observable
|
|
import io.reactivex.Observable
|
|
import kotlinx.android.synthetic.main.activity_home.*
|
|
import kotlinx.android.synthetic.main.activity_home.*
|
|
import kotlinx.android.synthetic.main.activity_register.*
|
|
import kotlinx.android.synthetic.main.activity_register.*
|
|
|
|
+import org.greenrobot.eventbus.EventBus
|
|
import org.greenrobot.eventbus.Subscribe
|
|
import org.greenrobot.eventbus.Subscribe
|
|
import org.greenrobot.eventbus.ThreadMode
|
|
import org.greenrobot.eventbus.ThreadMode
|
|
|
|
|
|
@@ -76,6 +79,8 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
|
|
|
|
|
|
private lateinit var loadingDialog: LoadingDialog
|
|
private lateinit var loadingDialog: LoadingDialog
|
|
|
|
|
|
|
|
+ var currentFragment: Fragment? = null
|
|
|
|
+
|
|
override fun getLayId(): Int {
|
|
override fun getLayId(): Int {
|
|
return R.layout.activity_home
|
|
return R.layout.activity_home
|
|
}
|
|
}
|
|
@@ -96,7 +101,7 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
|
|
loadingDialog = CommonTool.createLoadingDialog(this, R.layout.custom_loading,R.id.loadding_image)
|
|
loadingDialog = CommonTool.createLoadingDialog(this, R.layout.custom_loading,R.id.loadding_image)
|
|
|
|
|
|
//保活守护进程
|
|
//保活守护进程
|
|
- //DaemonEnv.init(this);
|
|
|
|
|
|
+ //DaemonEnv.init(this)
|
|
//請求用戶忽略电池优化
|
|
//請求用戶忽略电池优化
|
|
// val reason = "轨迹跟踪服务的持续运行"
|
|
// val reason = "轨迹跟踪服务的持续运行"
|
|
// DaemonEnv.whiteListMatters(this, reason)
|
|
// DaemonEnv.whiteListMatters(this, reason)
|
|
@@ -125,6 +130,7 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
|
|
}
|
|
}
|
|
|
|
|
|
Constants.imei = Util.getIMEI(this)
|
|
Constants.imei = Util.getIMEI(this)
|
|
|
|
+ //Constants.imei = "860475031573358"
|
|
Log.i(TAG, "IMEI " + Constants.imei)
|
|
Log.i(TAG, "IMEI " + Constants.imei)
|
|
Log.i(TAG, "mac " + Constants.mac)
|
|
Log.i(TAG, "mac " + Constants.mac)
|
|
tv_device_imei.text = Constants.imei
|
|
tv_device_imei.text = Constants.imei
|
|
@@ -137,7 +143,7 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
|
|
presenter.getTcpServerHost()
|
|
presenter.getTcpServerHost()
|
|
})
|
|
})
|
|
try {
|
|
try {
|
|
- Thread.sleep(3000)
|
|
|
|
|
|
+ Thread.sleep(5000)
|
|
} catch (e: Exception) {
|
|
} catch (e: Exception) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -318,14 +324,14 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
|
|
releaseReceiver()
|
|
releaseReceiver()
|
|
}
|
|
}
|
|
|
|
|
|
- override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
|
|
|
|
|
|
+ /*override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
|
|
Log.i(TAG, "keyup keyCode " + keyCode)
|
|
Log.i(TAG, "keyup keyCode " + keyCode)
|
|
return if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
|
|
return if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
|
|
//不执行父类点击事件
|
|
//不执行父类点击事件
|
|
true
|
|
true
|
|
} else super.onKeyUp(keyCode, event)
|
|
} else super.onKeyUp(keyCode, event)
|
|
//继续执行父类其他点击事件
|
|
//继续执行父类其他点击事件
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
override fun bindEvent() {
|
|
override fun bindEvent() {
|
|
}
|
|
}
|
|
@@ -336,7 +342,7 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
|
|
//loadingDialog.dismiss()
|
|
//loadingDialog.dismiss()
|
|
val tcpModel = messageEvent.getMessage() as TcpModel
|
|
val tcpModel = messageEvent.getMessage() as TcpModel
|
|
var interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
var interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
-
|
|
|
|
|
|
+ Log.e(TAG, "收到tcp消息" + tcpModel.getType() + " " + tcpModel.getAction() + ", data: " + tcpModel.data.toString())
|
|
when (tcpModel.action){
|
|
when (tcpModel.action){
|
|
TcpAction.VideoAction.CALLING->{
|
|
TcpAction.VideoAction.CALLING->{
|
|
DeviceChannel.calling = false
|
|
DeviceChannel.calling = false
|
|
@@ -380,13 +386,41 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
|
|
|
|
|
|
TcpAction.VideoAction.VIDEO_IN_CALL-> {
|
|
TcpAction.VideoAction.VIDEO_IN_CALL-> {
|
|
Constants.fromId = tcpModel.fromId
|
|
Constants.fromId = tcpModel.fromId
|
|
|
|
+ Constants.visitHostId = tcpModel.fromId
|
|
DeviceChannel.calling = true
|
|
DeviceChannel.calling = true
|
|
Constants.interactionId = interactionVO.id
|
|
Constants.interactionId = interactionVO.id
|
|
CallDialogHelper.dismissCallDialog()
|
|
CallDialogHelper.dismissCallDialog()
|
|
|
|
|
|
|
|
+ //先和主机视频请求探视,得到允许后方可和分机视频
|
|
|
|
+ /*currentFragment = VisitFragment()
|
|
|
|
+ var bundle = Bundle()
|
|
|
|
+ bundle.putBoolean("out_going", true)
|
|
|
|
+ bundle.putString("show_text", "呼叫中")
|
|
|
|
+ bundle.putString("target_id", interactionVO.fromSipId)
|
|
|
|
+ currentFragment?.arguments = bundle
|
|
|
|
+ supportFragmentManager.beginTransaction()
|
|
|
|
+ .add(R.id.frame_visit, currentFragment)
|
|
|
|
+ .commit()
|
|
|
|
+ watch_activity_home_linyout.visibility = View.GONE*/
|
|
|
|
+
|
|
// 加入房间
|
|
// 加入房间
|
|
|
|
+ /*currentFragment = VisitingFragment()
|
|
|
|
+ var bundle = Bundle()
|
|
|
|
+ bundle.putString("roomId", "visit-room-" + Constants.interactionId)
|
|
|
|
+ currentFragment?.arguments = bundle
|
|
|
|
+ supportFragmentManager.beginTransaction()
|
|
|
|
+ .add(R.id.frame_visit, currentFragment)
|
|
|
|
+ .commit()
|
|
|
|
+ watch_activity_home_linyout.visibility = View.GONE
|
|
|
|
+
|
|
val roomId = "visit-room-" + Constants.interactionId
|
|
val roomId = "visit-room-" + Constants.interactionId
|
|
- CallMultiActivity.openActivity(activity, roomId, false)
|
|
|
|
|
|
+ CallMultiActivity.openActivity(activity, roomId, false)*/
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ TcpAction.VideoAction.VIDEO_ON -> {
|
|
|
|
+ Constants.fromId = tcpModel.fromId
|
|
|
|
+ DeviceChannel.calling = true
|
|
|
|
+ Constants.interactionId = interactionVO.id
|
|
}
|
|
}
|
|
|
|
|
|
TcpAction.VideoAction.REJECT->{
|
|
TcpAction.VideoAction.REJECT->{
|
|
@@ -394,7 +428,39 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
|
|
DeviceChannel.calling = false
|
|
DeviceChannel.calling = false
|
|
CallDialogHelper.dismissCallDialog()
|
|
CallDialogHelper.dismissCallDialog()
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ TcpAction.VideoAction.HANDOFF -> {
|
|
|
|
+ if (SkyEngineKit.Instance().currentSession != null) {
|
|
|
|
+ SkyEngineKit.Instance().endCall()
|
|
|
|
+ }
|
|
|
|
+ if (currentFragment != null) {
|
|
|
|
+ supportFragmentManager.beginTransaction()
|
|
|
|
+ .remove(currentFragment)
|
|
|
|
+ .commit()
|
|
|
|
+ currentFragment = null
|
|
|
|
+ }
|
|
|
|
+ watch_activity_home_linyout.visibility = View.VISIBLE
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ } else if (messageEvent.tag == Constants.BACK_TO_MAIN_MSG) {
|
|
|
|
+ if (currentFragment != null) {
|
|
|
|
+ supportFragmentManager.beginTransaction()
|
|
|
|
+ .remove(currentFragment)
|
|
|
|
+ .commit()
|
|
|
|
+ currentFragment = null
|
|
}
|
|
}
|
|
|
|
+ watch_activity_home_linyout.visibility = View.VISIBLE
|
|
|
|
+ } else if (messageEvent.tag == Constants.VISIT_MSG) {
|
|
|
|
+ currentFragment = VisitFragment()
|
|
|
|
+ var bundle = Bundle()
|
|
|
|
+ bundle.putBoolean("out_going", false)
|
|
|
|
+ bundle.putString("show_text", "连接中")
|
|
|
|
+ bundle.putString("target_id", Constants.inviteId)
|
|
|
|
+ currentFragment?.arguments = bundle
|
|
|
|
+ supportFragmentManager.beginTransaction()
|
|
|
|
+ .add(R.id.frame_visit, currentFragment)
|
|
|
|
+ .commit()
|
|
|
|
+ watch_activity_home_linyout.visibility = View.GONE
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|