|
@@ -129,7 +129,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
private var broadcastChannelId: String = ""
|
|
|
private var playing = false
|
|
|
|
|
|
- private var sleepCountdown = false
|
|
|
+ /*private var sleepCountdown = false
|
|
|
private val updateHandler: Handler = object : Handler(Looper.getMainLooper()) {
|
|
|
override fun handleMessage(msg: Message) {
|
|
|
//熄屏时间到,当前是夜晚且亮度为0则切换到黑屏界面
|
|
@@ -160,7 +160,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
|
|
|
fun turnScreenOff() {
|
|
|
black_view.visibility = View.VISIBLE
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
override fun getLayId(): Int {
|
|
|
return R.layout.callingbed2_main_lay
|
|
@@ -221,7 +221,12 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
Utils.setStatusBarDisable(activity, Utils.STATUS_BAR_DISABLE_EXPAND)
|
|
|
|
|
|
//保持屏幕常亮
|
|
|
- AppTool.Setting.setScreenOffTimeOut2(applicationContext, 2147483647)
|
|
|
+ //AppTool.Setting.setScreenOffTimeOut2(applicationContext, 2147483647)
|
|
|
+
|
|
|
+ //亮屏
|
|
|
+ AppUtil.wakeUp(activity)
|
|
|
+ //设置默认熄屏时间为1分钟
|
|
|
+ AppTool.Setting.setScreenOffTimeOut(applicationContext, Constant.SLEEP_MINUTE)
|
|
|
|
|
|
checkServer()
|
|
|
|
|
@@ -416,7 +421,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
}
|
|
|
|
|
|
private fun switchFragment(id: Int, fragment: Fragment, tag: String) {
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
|
|
|
supportFragmentManager.beginTransaction()
|
|
|
.replace(id, fragment, tag)
|
|
@@ -425,8 +430,8 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
}
|
|
|
|
|
|
private fun addCallFragment(fragment: Fragment) {
|
|
|
- cancelSleep()
|
|
|
- black_view.visibility = View.GONE
|
|
|
+ //cancelSleep()
|
|
|
+ //black_view.visibility = View.GONE
|
|
|
|
|
|
//先切换到首页
|
|
|
if (!mainFragment.equals(curFragment)) {
|
|
@@ -461,15 +466,15 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
}
|
|
|
|
|
|
override fun bindEvent() {
|
|
|
- black_view.setOnClickListener {
|
|
|
+ /*black_view.setOnClickListener {
|
|
|
resetSleepTime()
|
|
|
black_view.visibility = View.GONE
|
|
|
return@setOnClickListener
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
tv_btn_home.setOnClickListener {
|
|
|
//重置黑屏时间
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
|
|
|
//首页
|
|
|
if (!mainFragment.equals(curFragment)) {
|
|
@@ -479,7 +484,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
|
|
|
tv_btn_more.setOnClickListener {
|
|
|
//重置黑屏时间
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
|
|
|
//更多
|
|
|
if (!qrFragment.equals(curFragment)) {
|
|
@@ -489,7 +494,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
|
|
|
tv_btn_advice.setOnClickListener {
|
|
|
//重置黑屏时间
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
|
|
|
//医嘱
|
|
|
if (!adviceFragment.equals(curFragment)) {
|
|
@@ -499,7 +504,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
|
|
|
tv_btn_cost.setOnClickListener {
|
|
|
//重置黑屏时间
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
|
|
|
//费用
|
|
|
if (!costFragment.equals(curFragment)) {
|
|
@@ -509,7 +514,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
|
|
|
tv_btn_support.setOnClickListener {
|
|
|
//重置黑屏时间
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
|
|
|
//增援
|
|
|
if (Constant.TCP_CONNECTED) {
|
|
@@ -532,7 +537,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
|
|
|
tv_btn_voice_call.setOnClickListener {
|
|
|
//重置黑屏时间
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
|
|
|
val time = System.currentTimeMillis()
|
|
|
if (time - clickTime > 2000) {
|
|
@@ -561,7 +566,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
|
|
|
tv_broadcast_stop.setOnClickListener {
|
|
|
//重置黑屏时间
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
|
|
|
broadcastOn = false
|
|
|
stopBroadcast(true)
|
|
@@ -569,7 +574,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
|
|
|
tv_broadcast_state.setOnClickListener {
|
|
|
//重置黑屏时间
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
|
|
|
if (playing) {
|
|
|
pauseBroadcast()
|
|
@@ -581,7 +586,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
seekbar_bc_volume.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener{
|
|
|
override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
|
|
|
//重置黑屏时间
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
}
|
|
|
|
|
|
override fun onStartTrackingTouch(seekBar: SeekBar?) {
|
|
@@ -646,7 +651,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
override fun onResume() {
|
|
|
super.onResume()
|
|
|
//重置黑屏时间
|
|
|
- resetSleepTime()
|
|
|
+ //resetSleepTime()
|
|
|
}
|
|
|
|
|
|
override fun destory() {
|
|
@@ -660,7 +665,10 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
handler.removeCallbacksAndMessages(null)
|
|
|
SoundPoolManager.getInstance().release()
|
|
|
stopBroadcast(false)
|
|
|
- cancelSleep()
|
|
|
+ //cancelSleep()
|
|
|
+
|
|
|
+ //亮屏
|
|
|
+ AppUtil.wakeUp(activity)
|
|
|
}
|
|
|
|
|
|
//数据加载错误
|
|
@@ -794,9 +802,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
|
|
|
Constant.SLEEP_MINUTE = partSetting.sleepSecondsBed
|
|
|
Constant.NIGHT_BRIGHTNESS = partSetting.nightLight
|
|
|
- if (sleepCountdown) {
|
|
|
+ /*if (sleepCountdown) {
|
|
|
resetSleepTime()
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
VoiceManagerUtil.setCallVoice(activity, partSetting.dayBedVol)
|
|
|
} catch (ex: Exception) {
|
|
@@ -900,8 +908,8 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
showMessage("current version: " + BuildConfig.VERSION_NAME + "_" + BuildConfig.VERSION_CODE + ", new version: " + newAppVersion + "_" + appInfo.versionNo)
|
|
|
|
|
|
if (BuildConfig.VERSION_CODE < appInfo.versionNo) {
|
|
|
- cancelSleep()
|
|
|
- black_view.visibility = View.GONE
|
|
|
+ //cancelSleep()
|
|
|
+ //black_view.visibility = View.GONE
|
|
|
|
|
|
if (!Constant.APP_UPDATING) {
|
|
|
//showMessage("即将升级...")
|
|
@@ -933,6 +941,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
override fun run() {
|
|
|
try {
|
|
|
initDevice()
|
|
|
+
|
|
|
+ //容错处理,设置熄屏时间
|
|
|
+ setScreenOffTime()
|
|
|
} catch (e: Exception) {
|
|
|
//
|
|
|
}
|
|
@@ -974,24 +985,26 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
//buffer[0],buffer[6]: 手柄按键;
|
|
|
//buffer[5]: 面板呼叫键;
|
|
|
//buffer[8]: 面板挂断键;
|
|
|
- if (black_view.visibility == View.VISIBLE) {
|
|
|
+ //if (black_view.visibility == View.VISIBLE) {
|
|
|
if (buffer[0].toInt() == 1 || buffer[0].toInt() == 2
|
|
|
|| buffer[5].toInt() == 1 || buffer[5].toInt() == 2
|
|
|
|| buffer[6].toInt() == 1 || buffer[6].toInt() == 2) {
|
|
|
|
|
|
- runOnUiThread {
|
|
|
+ AppUtil.wakeUp(activity)
|
|
|
+ /*runOnUiThread {
|
|
|
cancelSleep()
|
|
|
black_view.visibility = View.GONE
|
|
|
- }
|
|
|
+ }*/
|
|
|
} else if (buffer[8].toInt() == 1 || buffer[8].toInt() == 2) {
|
|
|
- runOnUiThread {
|
|
|
+ AppUtil.wakeUp(activity)
|
|
|
+ /*runOnUiThread {
|
|
|
cancelSleep()
|
|
|
black_view.visibility = View.GONE
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
return
|
|
|
}
|
|
|
- }
|
|
|
+ //}
|
|
|
|
|
|
//测试模式
|
|
|
if (testFragment == curFragment) {
|
|
@@ -1153,6 +1166,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
startBroadcast()
|
|
|
}
|
|
|
}, 2000)
|
|
|
+
|
|
|
+ //退出通话,重新设置熄屏时间
|
|
|
+ setScreenOffTime()
|
|
|
}
|
|
|
|
|
|
//Sip注册状态
|
|
@@ -1182,9 +1198,12 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
if (tcpModel.getType() == TcpType.VOICE) {
|
|
|
if (tcpModel.data != null) {
|
|
|
if (tcpModel.action == TcpAction.VoiceAction.CALL || tcpModel.action == TcpAction.VoiceAction.VCALL) {
|
|
|
- if (black_view.visibility == View.VISIBLE) {
|
|
|
+ /*if (black_view.visibility == View.VISIBLE) {
|
|
|
black_view.visibility = View.GONE
|
|
|
- }
|
|
|
+ }*/
|
|
|
+
|
|
|
+ //亮屏
|
|
|
+ AppUtil.wakeUp(activity)
|
|
|
|
|
|
val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
|
Constant.fromId = tcpModel.fromId
|
|
@@ -1246,6 +1265,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
SOSHelper.sosStop()
|
|
|
}
|
|
|
} else if (tcpModel.type == TcpType.BROADCAST) {
|
|
|
+ //亮屏
|
|
|
+ AppUtil.wakeUp(activity)
|
|
|
+
|
|
|
if (tcpModel.action == TcpAction.BroadcastAction.START) {
|
|
|
if (Constant.TCP_CONNECTED && !TextUtils.isEmpty(Constant.SIP_ID)) {
|
|
|
if (tcpModel.data != null && !broadcastOn) {
|
|
@@ -1266,6 +1288,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
} else if (tcpModel.type == TcpType.DEVICE) {
|
|
|
//检查APP版本
|
|
|
if (tcpModel.getAction() == TcpAction.DeviceAction.APP_UPDATE) {
|
|
|
+ //亮屏
|
|
|
+ AppUtil.wakeUp(activity)
|
|
|
+
|
|
|
checkAppVersion()
|
|
|
} else if (tcpModel.action == TcpAction.DeviceAction.RESTART) {
|
|
|
//收到重启app指令,若当前处于正常待机状态则直接重启app,否则等待通话结束再重启
|
|
@@ -1327,6 +1352,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
|
|
|
//探视
|
|
|
if (tcpModel.type == TcpType.VIDEO) {
|
|
|
+ //亮屏
|
|
|
+ AppUtil.wakeUp(activity)
|
|
|
+
|
|
|
val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
|
|
|
if (tcpModel.action == TcpAction.VideoAction.VIDEO_INVITE_JOIN) {
|
|
|
if (Constant.CALL_STATE != Constant.CALL_STANDBY) {
|
|
@@ -1617,7 +1645,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
Constant.day_state = 1
|
|
|
}
|
|
|
|
|
|
- if (Constant.day_state == 1 && Constant.NIGHT_BRIGHTNESS == 0) {
|
|
|
+ /*if (Constant.day_state == 1 && Constant.NIGHT_BRIGHTNESS == 0) {
|
|
|
//夜晚
|
|
|
if (!Constant.IS_RECORDING && !sleepCountdown && skyCallFragment == null && black_view.visibility == View.GONE) {
|
|
|
black_view.visibility = View.VISIBLE
|
|
@@ -1627,6 +1655,16 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
if (black_view.visibility == View.VISIBLE) {
|
|
|
black_view.visibility = View.GONE
|
|
|
}
|
|
|
+ }*/
|
|
|
+
|
|
|
+
|
|
|
+ if (Constant.day_state == 0) {
|
|
|
+ //白天亮屏
|
|
|
+ AppUtil.wakeUp(activity)
|
|
|
+ }
|
|
|
+
|
|
|
+ if (forceSet) {
|
|
|
+ setScreenOffTime()
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1651,4 +1689,21 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ override fun keepScreenOn(): Boolean {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+
|
|
|
+ private fun setScreenOffTime() {
|
|
|
+ //如果当前是夜晚模式且亮度为0则设置自动熄屏
|
|
|
+ if (Constant.NIGHT_BRIGHTNESS == 0 && Constant.day_state == 1 && !Constant.IS_RECORDING && skyCallFragment == null) {
|
|
|
+ //根据服务器设置自动熄屏时间
|
|
|
+ Log.d(TAG, "set screen off timeout: ${Constant.SLEEP_MINUTE}")
|
|
|
+ AppTool.Setting.setScreenOffTimeOut(applicationContext, Constant.SLEEP_MINUTE)
|
|
|
+ } else {
|
|
|
+ //屏幕常亮
|
|
|
+ Log.d(TAG, "keep screen on")
|
|
|
+ AppTool.Setting.setScreenOffTimeOut2(applicationContext, 2147483647)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|