|
@@ -20,7 +20,6 @@ import android.text.TextUtils
|
|
|
import android.util.Log
|
|
|
import android.view.KeyEvent
|
|
|
import android.view.View
|
|
|
-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
|
|
@@ -32,7 +31,6 @@ import com.wdkl.ncs.android.component.home.R
|
|
|
import com.wdkl.ncs.android.component.home.SOSEmergencyCallActivity
|
|
|
import com.wdkl.ncs.android.component.home.broadcast.BatteryBroadcastReceiver
|
|
|
import com.wdkl.ncs.android.component.home.databinding.WatchActivityHome2Binding
|
|
|
-import com.wdkl.ncs.android.component.home.databinding.WatchActivityHomeBinding
|
|
|
import com.wdkl.ncs.android.component.home.launch.HomeLaunch
|
|
|
import com.wdkl.ncs.android.component.home.service.APPService
|
|
|
import com.wdkl.ncs.android.component.home.service.TcpHandleService
|
|
@@ -50,7 +48,6 @@ 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
|
|
|
import com.wdkl.ncs.android.middleware.model.dos.AppVersionDO
|
|
|
-import com.wdkl.ncs.android.middleware.model.dos.DeviceDO
|
|
|
import com.wdkl.ncs.android.middleware.model.dos.PartSettingDO
|
|
|
import com.wdkl.ncs.android.middleware.model.dto.TcpSeverDTO
|
|
|
import com.wdkl.ncs.android.middleware.model.vo.DeviceVO
|
|
@@ -111,20 +108,16 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
}
|
|
|
|
|
|
override fun init() {
|
|
|
-// AppTool.SystemUI.showNavigationBar(this,false)
|
|
|
-// AppTool.SystemUI.ImmersiveWithBottomBarColor(this, Color.BLACK)
|
|
|
-
|
|
|
val permissionCheck = ContextCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE)
|
|
|
|
|
|
if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
|
|
|
ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.READ_PHONE_STATE), WRITE_EXTERNAL_STORAGE_REQUEST_CODE)
|
|
|
} else {
|
|
|
- //TODO
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
|
|
|
|
- Constants.imei = Util().getIMEI(this)
|
|
|
- Log.i(TAG, "IMEI " + Util().getIMEI(this))
|
|
|
+ Constants.imei = Util.getIMEI(this)
|
|
|
+ Log.i(TAG, "IMEI " + Util.getIMEI(this))
|
|
|
|
|
|
// Constants.mac = NetHelper.getInstance().macAddress
|
|
|
//Constants.mac = "4C:C0:0A:8E:D6:BB"
|
|
@@ -143,10 +136,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
} catch (e: Exception) {
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}).start()
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
private fun requestPermissions() {
|
|
@@ -158,23 +148,12 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
Manifest.permission.RECORD_AUDIO,
|
|
|
Manifest.permission.READ_PHONE_STATE)).subscribe {
|
|
|
if (it) {
|
|
|
-// Constants.imei = Util().getIMEI(this)
|
|
|
-// Log.e(TAG, "IMEI " + Util().getIMEI(this))
|
|
|
-//
|
|
|
-// Constants.mac = NetHelper.getInstance().macAddress
|
|
|
-// //Constants.mac = "4C:C0:0A:8E:D6:BB"
|
|
|
-// Log.e(TAG, "mac " + Constants.mac)
|
|
|
-// tv_mac_addr.text = "MAC地址: " + Constants.mac + "\n" + "IMEI号:" + Constants.imei
|
|
|
-
|
|
|
-// presenter.loadData(Constants.mac)//传Mac
|
|
|
presenter.loadData(Constants.imei)// 传imei
|
|
|
} else {
|
|
|
showMessage("请重新授权,进入App")
|
|
|
requestPermissions()
|
|
|
}
|
|
|
}.joinManager(disposableManager)
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
private fun regReceiver() {
|
|
@@ -190,8 +169,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
sip_state_tv.setBackgroundColor(Color.parseColor("#00FFFF"))
|
|
|
})
|
|
|
|
|
|
-
|
|
|
-
|
|
|
// webRTC呼叫测试
|
|
|
// var room = UUID.randomUUID().toString() + System.currentTimeMillis()
|
|
|
// var gEngineKit:SkyEngineKit? = null
|
|
@@ -213,12 +190,10 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
runOnUiThread(Runnable {
|
|
|
sip_state_tv.setBackgroundColor(Color.parseColor("#FF0000"))
|
|
|
})
|
|
|
- Log.i(TAG, "webrtc 注册失败")
|
|
|
- Log.i(TAG, "webrtc 注册失败,,,, "+(System.currentTimeMillis()-time))
|
|
|
+ Log.i(TAG, "webrtc 注册失败 "+(System.currentTimeMillis()-time))
|
|
|
if(System.currentTimeMillis()-time >800){
|
|
|
time = System.currentTimeMillis()
|
|
|
Log.i(TAG, "webrtc 注册失败//// "+(System.currentTimeMillis()-time))
|
|
|
-
|
|
|
//
|
|
|
// Log.i(TAG, "webrtc 注册失败... "+(System.currentTimeMillis()-time))
|
|
|
// var intent = Intent(this,WatchRegisterActivity::class.java)
|
|
@@ -231,9 +206,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
SocketManager.getInstance().connect(Urls.WS, Constants.sip_id, 0)
|
|
|
},700)
|
|
|
Looper.loop()
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
private fun unRegReceiver() {
|
|
@@ -256,9 +229,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
override fun destory() {
|
|
|
unRegReceiver()
|
|
|
SpeechUtil.getInstance().release()
|
|
|
-// SipHelperUtil.getInstance(this).unRegisterSip()
|
|
|
-// SipHelper.getInstance().unRegisterSip()
|
|
|
-
|
|
|
//注销webRTC
|
|
|
SocketManager.getInstance().unConnect()
|
|
|
|
|
@@ -267,30 +237,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- override fun render(appInfo: AppVersionDO) {
|
|
|
- Log.d("AppUpdate", "loadAppVersion111 =====>> version_code: " + appInfo.versionCode + ", path: " + appInfo.appPath)
|
|
|
- val newAppVersion = appInfo.versionCode.substring(1)
|
|
|
- Log.d("AppUpdate", "loadAppVersion222 =====>> newAppVersion: " + newAppVersion + ", curAppVersion: " + BuildConfig.VERSION_NAME)
|
|
|
- showMessage("获取版本成功,当前版本: " + BuildConfig.VERSION_NAME + ", 服务器版本: " + newAppVersion)
|
|
|
-
|
|
|
- //服务器版本和当前版本不一致才做升级操作
|
|
|
- if (!BuildConfig.VERSION_NAME.equals(newAppVersion)) {
|
|
|
- Constants.APP_PATH = appInfo.appPath
|
|
|
- AppTool.Time.delay(200) {
|
|
|
- push("/callingbed/update")
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- fun checkAppVersion() {
|
|
|
- Constants.APP_PATH = ""
|
|
|
- //获取APP版本信息,7寸分机type=204
|
|
|
- if (Constants.part_id != null) {
|
|
|
- presenter.getAppVersion(Constants.part_id, 7)
|
|
|
- }
|
|
|
- Log.d("AppUpdate", "checkAppVersion =====>> Constant.PART_ID: " + Constants.part_id)
|
|
|
- }
|
|
|
-
|
|
|
/**
|
|
|
* 返回的设备信息
|
|
|
*/
|
|
@@ -309,10 +255,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
Constants.user_name = data.memberName
|
|
|
Constants.user_role_name = data.roleName
|
|
|
|
|
|
- if (TextUtils.isEmpty(Constants.ids) || TextUtils.isEmpty(Constants.sip_id)
|
|
|
-// || TextUtils.isEmpty(Constants.user_name)
|
|
|
-// || TextUtils.isEmpty(Constants.user_role_name)
|
|
|
- ) {
|
|
|
+ if (TextUtils.isEmpty(Constants.ids) || TextUtils.isEmpty(Constants.sip_id)) {
|
|
|
showMessage("初始化数据时服务器返回数据不全,请联系管理员")
|
|
|
tv_feedback_device_info.text = "初始化数据时服务器返回数据不全,请联系管理员"
|
|
|
return
|
|
@@ -321,12 +264,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
tv_feedback_device_info.text = "初始化tcp连接数据为null"
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
-// //这里的是视频通话有关的
|
|
|
-// AEvent.setHandler(Handler())
|
|
|
-// //这里的是视频通话有关的
|
|
|
-//
|
|
|
-//// initSDK("000100")
|
|
|
initSDK(data.sipId)
|
|
|
presenter.getDeviceSettingData(""+Constants.part_id)
|
|
|
initInterfaceData()
|
|
@@ -344,39 +281,25 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
Constants.heart_beat = tcpSeverDTO.readerIdleTime
|
|
|
|
|
|
startConnectTcpServer()
|
|
|
- showMessage("开始连接TCP服务器...")
|
|
|
+// showMessage("开始连接TCP服务器...")
|
|
|
requestPermissions()
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
private fun startConnectTcpServer() {
|
|
|
Thread(Runnable {
|
|
|
run {
|
|
|
- //TcpClient.getInstance().init("192.168.1.138", 5080, 9)
|
|
|
- //TcpClient.getInstance().init("47.106.200.55", 5080, 9)
|
|
|
-
|
|
|
TcpClient.getInstance().init(Constants.tcp_server, Constants.tcp_port, Constants.heart_beat)
|
|
|
}
|
|
|
}).start()
|
|
|
}
|
|
|
|
|
|
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 intent3 = Intent(this, APPService::class.java)
|
|
|
startService(intent3)
|
|
|
-
|
|
|
-
|
|
|
-// val intent2 = Intent(this, RTCKeepLiveService::class.java)
|
|
|
-// startService(intent2)
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -393,10 +316,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- //开始ping网络,30秒ping一次
|
|
|
-// NetHelper.startNetCheck()
|
|
|
-// //SIP准备工作
|
|
|
-// initSip()
|
|
|
//WEBRTC 语音初始化
|
|
|
// 添加登录回调
|
|
|
SocketManager.getInstance().addUserStateCallback(this)
|
|
@@ -409,7 +328,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
teleManager = (applicationContext.getSystemService(Context.TELEPHONY_SERVICE)) as TelephonyManager
|
|
|
|
|
|
netType = NetHelper.getInstance().getNetworkState(applicationContext)
|
|
|
- Log.i(TAG, "wzlll 网络类型:" + netType)
|
|
|
+ Log.i(TAG, "网络类型:" + netType)
|
|
|
if (netType == NetHelper.NETWORK_2G || netType == NetHelper.NETWORK_3G || netType == NetHelper.NETWORK_4G) {
|
|
|
if (teleManager != null) {
|
|
|
teleManager.listen(object : PhoneStateListener() {
|
|
@@ -420,7 +339,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
if (lastSignal > 0) {
|
|
|
var mobileNetworkSignal = lastSignal
|
|
|
}
|
|
|
- Log.i(TAG, "wifi信号强度:" + lastSignal)
|
|
|
}
|
|
|
}, PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
|
|
|
}
|
|
@@ -436,10 +354,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
//TTS初始化
|
|
|
SpeechUtil.getInstance().init(BaseApplication.appContext)
|
|
|
SpeechUtil.getInstance().startSpeechThread()
|
|
|
-
|
|
|
- //检查版本
|
|
|
-// checkAppVersion()
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -449,10 +363,12 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
Log.i(TAG,"收到设置设备数据 transferDuration"+partSettingDO.transferDuration)
|
|
|
Log.i(TAG,"收到设置设备数据 transferDurationLeader"+partSettingDO.transferDurationLeader)
|
|
|
if(partSettingDO != null&&partSettingDO.transferDuration !=null&&partSettingDO.transferDurationLeader != null){
|
|
|
- if (!Constants.user_role_name!!.contains("护士组长")&& Constants.user_role_name!!.contains("护士")) {
|
|
|
- SettingConfig.setCountdownTime(application, partSettingDO.transferDuration)
|
|
|
- }else if(Constants.user_role_name!!.contains("护士组长")){
|
|
|
- SettingConfig.setCountdownTime(application, partSettingDO.transferDurationLeader)
|
|
|
+ if (Constants.user_role_name != null) {
|
|
|
+ if (!Constants.user_role_name!!.contains("护士组长") && Constants.user_role_name!!.contains("护士")) {
|
|
|
+ SettingConfig.setCountdownTime(application, partSettingDO.transferDuration)
|
|
|
+ } else if (Constants.user_role_name!!.contains("护士组长")) {
|
|
|
+ SettingConfig.setCountdownTime(application, partSettingDO.transferDurationLeader)
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -469,58 +385,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
override fun networkMonitor(state: NetState) {
|
|
|
}
|
|
|
|
|
|
- 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()
|
|
|
-
|
|
|
-// SipHelper.getInstance().sipStartService()
|
|
|
-// SipHelper.getInstance().initSip(this, Constants.sip_ip,Constants.sip_id,Constants.sip_password)
|
|
|
-// SipHelper.getInstance().setSipCallBack(this)
|
|
|
-// SipHelper.getInstance().setSipListner(this)
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
-// /**
|
|
|
-// * 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?) {
|
|
|
-// }
|
|
|
-
|
|
|
/**
|
|
|
* 监听
|
|
|
*/
|
|
@@ -528,10 +392,8 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
when (p0.id) {
|
|
|
R.id.customer_list_linlyout -> {
|
|
|
push("/watch/contacts")
|
|
|
-
|
|
|
}
|
|
|
R.id.call_records_linlyout -> {
|
|
|
-// push("/watch/callrecords")
|
|
|
var intent = Intent(this, WatchCallRecordsActivity::class.java)
|
|
|
intent.putExtra("action", "ALL")
|
|
|
intent.putExtra("customer_id", "")
|
|
@@ -547,12 +409,9 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
intent.putExtra("customer_id", "")
|
|
|
startActivity(intent)
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
R.id.state_linlyout -> {
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
R.id.other_linyout -> {
|
|
|
val intent = Intent(this, WatchUserSettingActivity::class.java)
|
|
|
startActivity(intent)
|
|
@@ -574,55 +433,24 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
}
|
|
|
override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
|
|
|
return if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
|
|
|
-
|
|
|
//不执行父类点击事件
|
|
|
true
|
|
|
} else super.onKeyUp(keyCode, event)
|
|
|
//继续执行父类其他点击事件
|
|
|
}
|
|
|
|
|
|
- // ====================================== 处理tcp
|
|
|
- var calling: Boolean = false
|
|
|
-
|
|
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
|
|
fun onMoonEvent(messageEvent: MessageEvent) {
|
|
|
- Log.e(TAG,""+messageEvent.tag)
|
|
|
-// var tcpModels = messageEvent.getMessage() as TcpModel
|
|
|
-// Log.e(TAG,""+tcpModels.getAction())
|
|
|
- if (messageEvent.tag == 14) {
|
|
|
- //唤醒屏幕并解锁屏幕
|
|
|
- Util().wakeUpAndUnlock(this)
|
|
|
-
|
|
|
- } else if (messageEvent.tag == Constants.EVENT_TCP_APP_UPDATE) {
|
|
|
- //更新APP
|
|
|
- checkAppVersion()
|
|
|
- } else if (messageEvent.tag == Constants.EVENT_SIP_REGISTER_STATUS) {
|
|
|
- var message = messageEvent.getMessage() as String
|
|
|
- Log.i(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"))
|
|
|
-// }
|
|
|
- }
|
|
|
- } else if (messageEvent.tag == Constants.EVENT_INTERNETPING) {
|
|
|
-// SipHelperUtil.getInstance(this).obtainSipInfo()
|
|
|
-
|
|
|
- } else if (messageEvent.tag == Constants.EVENT_UNTREATED_QUANTITY) {
|
|
|
+ if (messageEvent.tag == Constants.EVENT_UNTREATED_QUANTITY) { //电量显示,由广播获取
|
|
|
var message = messageEvent.getMessage() as ArrayList<InteractionVO>
|
|
|
list_item_img_icon_num.text = "" + message.size
|
|
|
-
|
|
|
- } else if (messageEvent.tag == Constants.EVENT_WIFI_RSSI) {
|
|
|
+ } else if (messageEvent.tag == Constants.EVENT_BATTERY_PERCENT) {
|
|
|
var message = messageEvent.getMessage() as Int
|
|
|
if (10 < message && message < 20) {
|
|
|
electric_quantity_tv.text = "" + message
|
|
|
battery_warning_tv.setTextColor(Color.parseColor("#FF3030"))
|
|
|
battery_warning_tv.visibility = View.VISIBLE
|
|
|
battery_warning_tv.text = "低电量,请注意充电"
|
|
|
-
|
|
|
} else if (10 > message) {
|
|
|
electric_quantity_tv.text = "" + message
|
|
|
battery_warning_tv.setTextColor(Color.parseColor("#8B2323"))
|
|
@@ -632,95 +460,9 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
battery_warning_tv.visibility = View.GONE
|
|
|
electric_quantity_tv.text = "" + message
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- } else if (messageEvent.tag == 0) {
|
|
|
- //唤醒屏幕并解锁屏幕
|
|
|
- Util().wakeUpAndUnlock(this)
|
|
|
-
|
|
|
- var tcpModel = messageEvent.getMessage() as TcpModel
|
|
|
- var responseTcpModel: TcpModel
|
|
|
- Log.i(TAG, "" + tcpModel.getType() + " " + tcpModel.getAction())
|
|
|
- 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 {
|
|
|
- Log.i(TAG, "启动接听界面")
|
|
|
- responseTcpModel = VoiceUtil.voiceSuccess(tcpModel.getToId(), tcpModel.getFromId(), interactionVO.getId())
|
|
|
- TcpClient.getInstance().sendMsg(responseTcpModel.toJson())
|
|
|
-
|
|
|
- //界面呈现
|
|
|
- AppTool.Time.delay(300) {
|
|
|
- //rtc
|
|
|
-// var intent = Intent()
|
|
|
-// intent.setClass(this, RTCVoipAudioRingingActivity::class.java)
|
|
|
-// intent.putExtra("targetId", interactionVO.fromSipId)
|
|
|
-// intent.putExtra("TcpModel", tcpModel)
|
|
|
-// startActivity(intent)
|
|
|
-
|
|
|
- //sip
|
|
|
-// var intent = Intent()
|
|
|
-// intent.setClass(this, SipVoipAudioRingingActivity::class.java)
|
|
|
-// intent.putExtra("targetId", interactionVO.fromSipId)
|
|
|
-// intent.putExtra("TcpModel", tcpModel)
|
|
|
-// startActivity(intent)
|
|
|
-
|
|
|
-
|
|
|
- //webRTC
|
|
|
- var intent = Intent()
|
|
|
- intent.setClass(this, WebRTCVoipAudioRingingActivity::class.java)
|
|
|
- intent.putExtra("targetId", interactionVO.fromSipId)
|
|
|
- intent.putExtra("TcpModel", tcpModel)
|
|
|
- startActivity(intent)
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
- } 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.i(TAG, "收到事件tcp")
|
|
|
- }
|
|
|
- TcpType.SOS -> if (tcpModel.getAction() === TcpAction.SOSAction.CALL) {
|
|
|
- Log.i(TAG, "" + tcpModel.getType() + " " + tcpModel.getAction())
|
|
|
-
|
|
|
- var intent = Intent()
|
|
|
- intent.setClass(this, SOSEmergencyCallActivity::class.java)
|
|
|
- intent.putExtra("TcpModel", tcpModel)
|
|
|
- startActivity(intent)
|
|
|
- }
|
|
|
- TcpType.DEVICE -> if (tcpModel.getAction() === TcpAction.DeviceAction.APP_UPDATE) {//更新APP
|
|
|
- checkAppVersion()
|
|
|
- } else if (tcpModel.getAction() === TcpAction.DeviceAction.RESTART) { //刷新数据
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
//WiFi监听
|
|
|
inner class WifiReceiver : BroadcastReceiver() {
|
|
|
override fun onReceive(context: Context, intent: Intent) {
|
|
@@ -728,21 +470,15 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
|
|
|
if (wifiManager != null && netType == NetHelper.NETWORK_WIFI) {
|
|
|
val wifiInfo = wifiManager.getConnectionInfo()
|
|
|
val wifi = wifiInfo.getRssi();//获取wifi信号强度
|
|
|
-// Log.e(TAG,"wifi 信号强度"+wifi)
|
|
|
-
|
|
|
if (wifi > -50 && wifi < 0) {//最强
|
|
|
-// Log.e(TAG, "wzlll 最强")
|
|
|
wifi_rssi_tv.text = "较强"
|
|
|
} else if (wifi > -70 && wifi < -50) {//较强
|
|
|
-// Log.e(TAG, "wzlll 较强")
|
|
|
wifi_rssi_tv.text = "一般"
|
|
|
} else if (wifi > -80 && wifi < -70) {//较弱
|
|
|
-// Log.e(TAG, "wzlll 较弱")
|
|
|
wifi_rssi_tv.text = "微弱"
|
|
|
} else if (wifi > -100 && wifi < -80) {//微弱
|
|
|
-// Log.e(TAG, "wzlll 微弱")
|
|
|
wifi_rssi_tv.setTextColor(Color.parseColor("#FF3030"))
|
|
|
- wifi_rssi_tv.text = "wifi信号较弱,请注意"
|
|
|
+ wifi_rssi_tv.text = "信号较弱,请注意"
|
|
|
}
|
|
|
}
|
|
|
}
|