Skip to content

Commit

Permalink
test video 输入页面增加双中转开关和协议选择
Browse files Browse the repository at this point in the history
  • Loading branch information
@neilyhe
neilyhe committed Feb 21, 2025
1 parent 1ab8127 commit bbac993
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 20 deletions.
17 changes: 14 additions & 3 deletions sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoTestInputActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.content.Intent
import android.os.Bundle
import android.text.InputType
import android.view.View
import android.widget.RadioButton
import androidx.core.content.ContextCompat
import com.tencent.iot.explorer.link.core.utils.SharePreferenceUtil
import com.tencent.iot.explorer.link.demo.R
Expand All @@ -16,6 +17,8 @@ import kotlinx.android.synthetic.main.activity_video_input_authorize.product_id_
import kotlinx.android.synthetic.main.activity_video_test_input.btn_paste
import kotlinx.android.synthetic.main.activity_video_test_input.device_name_layout
import kotlinx.android.synthetic.main.activity_video_test_input.p2p_info_layout
import kotlinx.android.synthetic.main.activity_video_test_input.rg_protocol
import kotlinx.android.synthetic.main.activity_video_test_input.swt_cross
import kotlinx.android.synthetic.main.blue_title_layout.iv_back
import kotlinx.android.synthetic.main.blue_title_layout.tv_title
import kotlinx.android.synthetic.main.input_item_layout.view.ev_content
Expand All @@ -25,6 +28,8 @@ import kotlinx.coroutines.MainScope

class VideoTestInputActivity : VideoBaseActivity(), CoroutineScope by MainScope() {

private var isStartCross = false
private var protocol = "auto"
override fun getContentView(): Int {
return R.layout.activity_video_test_input
}
Expand Down Expand Up @@ -82,9 +87,15 @@ class VideoTestInputActivity : VideoBaseActivity(), CoroutineScope by MainScope(
}
}
}
swt_cross.setOnCheckedChangeListener { _, checked ->
isStartCross = checked
}
rg_protocol.setOnCheckedChangeListener { group, checkedId ->
protocol = group.findViewById<RadioButton>(checkedId).tag.toString()
}
}

var loginClickedListener = object : View.OnClickListener {
private var loginClickedListener = object : View.OnClickListener {
override fun onClick(v: View?) {
if (product_id_layout.ev_content.text.isNullOrEmpty()) {
show(getString(R.string.hint_product_id))
Expand Down Expand Up @@ -120,8 +131,8 @@ class VideoTestInputActivity : VideoBaseActivity(), CoroutineScope by MainScope(
intent.putExtra("productId", product_id_layout.ev_content.text.toString())
intent.putExtra("deviceName", device_name_layout.ev_content.text.toString())
intent.putExtra("p2pInfo", p2p_info_layout.ev_content.text.toString())
val bundle = Bundle()
intent.putExtra(VideoConst.VIDEO_CONFIG, bundle)
intent.putExtra("isStartCross", isStartCross)
intent.putExtra("protocol", protocol)
startActivity(intent)
}
}
Expand Down
39 changes: 24 additions & 15 deletions sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoTestActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,23 +77,23 @@ open class VideoTestActivity : VideoBaseActivity(), XP2PCallback, CoroutineScope
private var deviceName: String = ""
private var xp2pInfo: String = ""
private val channel: Int = 0
var urlPrefix = ""
var screenWidth = 0
var screenHeight = 0
var startShowVideoTime = 0L
var showVideoTime = 0L
var connectTime = 0L
var showTip = false
var firstIn = true
val MSG_UPDATE_HUD = 1
var permissions = arrayOf(Manifest.permission.RECORD_AUDIO)
var filePath: String? = null
var audioRecordUtil: AudioRecordUtil? = null
private var urlPrefix = ""
private var screenWidth = 0
private var screenHeight = 0
private var startShowVideoTime = 0L
private var showVideoTime = 0L
private var connectTime = 0L
private var showTip = false
private var firstIn = true
private val MSG_UPDATE_HUD = 1
private var permissions = arrayOf(Manifest.permission.RECORD_AUDIO)
private var filePath: String? = null
private var audioRecordUtil: AudioRecordUtil? = null

@Volatile
var speakAble = false
var audioAble = true
var orientationV = true
private var speakAble = false
private var audioAble = true
private var orientationV = true

private val xP2PAppConfig = XP2PAppConfig().also { appConfig ->
appConfig.appKey =
Expand All @@ -115,6 +115,15 @@ open class VideoTestActivity : VideoBaseActivity(), XP2PCallback, CoroutineScope
productId = intent.getStringExtra("productId")?.toString() ?: ""
deviceName = intent.getStringExtra("deviceName")?.toString() ?: ""
xp2pInfo = intent.getStringExtra("p2pInfo")?.toString() ?: ""
xP2PAppConfig.autoConfigFromDevice = intent.getBooleanExtra("isStartCross", false)
val protocol = intent.getStringExtra("protocol")?.toString() ?: "auto"
if (protocol == "udp") {
xP2PAppConfig.type = XP2PProtocolType.XP2P_PROTOCOL_UDP
} else if (protocol == "tcp") {
xP2PAppConfig.type = XP2PProtocolType.XP2P_PROTOCOL_TCP
} else {
xP2PAppConfig.type = XP2PProtocolType.XP2P_PROTOCOL_AUTO
}
audioRecordUtil = AudioRecordUtil(
this,
"${productId}/${deviceName}",
Expand Down
65 changes: 63 additions & 2 deletions sdkdemo/src/main/res/layout/activity_video_test_input.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
android:id="@+id/btn_paste"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:background="@drawable/btn_rad4_color_e6e6e6"
android:text="粘贴"
android:textStyle="bold"
Expand Down Expand Up @@ -46,20 +47,80 @@
android:layout_height="56dp"
app:layout_constraintTop_toBottomOf="@id/device_name_layout" />

<TextView
android:id="@+id/tv_cross"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="是否开启双中转:"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/p2p_info_layout" />

<Switch
android:id="@+id/swt_cross"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="@+id/tv_cross"
app:layout_constraintStart_toEndOf="@+id/tv_cross"
app:layout_constraintTop_toTopOf="@+id/tv_cross" />

<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="选择协议："
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_cross" />

<RadioGroup
android:id="@+id/rg_protocol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@+id/textView"
app:layout_constraintStart_toEndOf="@+id/textView"
app:layout_constraintTop_toTopOf="@+id/textView">

<RadioButton
android:id="@+id/rb_auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:tag="auto"
android:text="auto" />

<RadioButton
android:id="@+id/rb_udp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tag="udp"
android:text="udp" />

<RadioButton
android:id="@+id/rb_tcp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tag="tcp"
android:text="tcp" />
</RadioGroup>

<Button
android:id="@+id/btn_login"
android:layout_width="match_parent"
android:layout_height="45dp"
android:layout_marginStart="16dp"
android:layout_marginTop="40dp"
android:layout_marginTop="50dp"
android:layout_marginEnd="16dp"
android:background="@drawable/background_blue_btn"
android:text="@string/login"
android:textColor="@color/white"
android:textSize="@dimen/ts_17"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/p2p_info_layout" />
app:layout_constraintTop_toBottomOf="@id/tv_cross" />


</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit bbac993

Please sign in to comment.