Skip to content

Commit 442d354

Browse files
committed
add network change listener
1 parent 9c27d98 commit 442d354

4 files changed

Lines changed: 66 additions & 2 deletions

File tree

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
package="com.frank.ffmpeg">
55

6+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
67
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
78
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
89
<uses-permission android:name="android.permission.CAMERA" />

‎app/src/main/java/com/frank/ffmpeg/activity/LiveActivity.kt‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package com.frank.ffmpeg.activity
22

33
import android.annotation.SuppressLint
4+
import android.content.IntentFilter
45
import android.media.AudioFormat
6+
import android.net.ConnectivityManager
57
import android.os.Bundle
68
import android.os.Handler
79
import android.os.Message
@@ -14,6 +16,8 @@ import android.widget.Toast
1416
import android.widget.ToggleButton
1517

1618
import com.frank.ffmpeg.R
19+
import com.frank.ffmpeg.handler.ConnectionReceiver
20+
import com.frank.ffmpeg.listener.OnNetworkChangeListener
1721
import com.frank.live.camera2.Camera2Helper
1822
import com.frank.live.listener.LiveStateChangeListener
1923
import com.frank.live.param.AudioParam
@@ -25,9 +29,12 @@ import com.frank.live.LivePusherNew
2529
* Created by frank on 2018/1/28.
2630
*/
2731

28-
class LiveActivity : BaseActivity(), CompoundButton.OnCheckedChangeListener, LiveStateChangeListener {
32+
open class LiveActivity : BaseActivity(), CompoundButton.OnCheckedChangeListener, LiveStateChangeListener, OnNetworkChangeListener {
2933
private var textureView: SurfaceView? = null
3034
private var livePusher: LivePusherNew? = null
35+
private var isPushing = false
36+
private var connectionReceiver: ConnectionReceiver? = null
37+
3138
@SuppressLint("HandlerLeak")
3239
private val mHandler = object : Handler() {
3340
override fun handleMessage(msg: Message) {
@@ -50,6 +57,7 @@ class LiveActivity : BaseActivity(), CompoundButton.OnCheckedChangeListener, Liv
5057
hideActionBar()
5158
initView()
5259
initPusher()
60+
registerBroadcast(this)
5361
}
5462

5563
private fun initView() {
@@ -75,13 +83,22 @@ class LiveActivity : BaseActivity(), CompoundButton.OnCheckedChangeListener, Liv
7583
livePusher!!.setPreviewDisplay(textureView!!.holder)
7684
}
7785

86+
private fun registerBroadcast(networkChangeListener: OnNetworkChangeListener) {
87+
connectionReceiver = ConnectionReceiver(networkChangeListener)
88+
val intentFilter = IntentFilter()
89+
intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION)
90+
registerReceiver(connectionReceiver, intentFilter)
91+
}
92+
7893
override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) {
7994
when (buttonView.id) {
8095
R.id.btn_live//start or stop living
8196
-> if (isChecked) {
8297
livePusher!!.startPush(LIVE_URL, this)
98+
isPushing = true
8399
} else {
84100
livePusher!!.stopPush()
101+
isPushing = false
85102
}
86103
R.id.btn_mute//mute or not
87104
-> {
@@ -101,8 +118,15 @@ class LiveActivity : BaseActivity(), CompoundButton.OnCheckedChangeListener, Liv
101118
override fun onDestroy() {
102119
super.onDestroy()
103120
if (livePusher != null) {
121+
if (isPushing) {
122+
isPushing = false
123+
livePusher?.stopPush()
124+
}
104125
livePusher!!.release()
105126
}
127+
if (connectionReceiver != null) {
128+
unregisterReceiver(connectionReceiver)
129+
}
106130
}
107131

108132
override fun onViewClick(view: View) {
@@ -115,10 +139,18 @@ class LiveActivity : BaseActivity(), CompoundButton.OnCheckedChangeListener, Liv
115139

116140
}
117141

142+
override fun onNetworkChange() {
143+
Toast.makeText(this, "network is not available", Toast.LENGTH_SHORT).show()
144+
if (livePusher != null && isPushing) {
145+
livePusher?.stopPush()
146+
isPushing = false
147+
}
148+
}
149+
118150
companion object {
119151

120152
private val TAG = LiveActivity::class.java.simpleName
121-
private const val LIVE_URL = "rtmp://192.168.1.3/live/stream"
153+
private const val LIVE_URL = "rtmp://192.168.31.212/live/stream"
122154
private const val MSG_ERROR = 100
123155
}
124156
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.frank.ffmpeg.handler
2+
3+
import android.content.BroadcastReceiver
4+
import android.content.Context
5+
import android.content.Intent
6+
import android.net.ConnectivityManager
7+
import com.frank.ffmpeg.listener.OnNetworkChangeListener
8+
9+
class ConnectionReceiver(networkChangeListener: OnNetworkChangeListener) : BroadcastReceiver() {
10+
11+
var networkChangeListener :OnNetworkChangeListener ?= networkChangeListener
12+
13+
override fun onReceive(context: Context?, intent: Intent?) {
14+
15+
if (ConnectivityManager.CONNECTIVITY_ACTION == intent?.action) {
16+
val connectivityManager : ConnectivityManager = context?.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
17+
val activeNetworkInfo = connectivityManager.activeNetworkInfo
18+
if (activeNetworkInfo == null || !activeNetworkInfo.isAvailable) {
19+
networkChangeListener?.onNetworkChange()
20+
}
21+
22+
}
23+
}
24+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.frank.ffmpeg.listener
2+
3+
interface OnNetworkChangeListener {
4+
5+
fun onNetworkChange()
6+
7+
}

0 commit comments

Comments
 (0)