diff --git a/app/src/main/assets/DeviceParameter.json b/app/src/main/assets/DeviceParameter.json index 650e097..90efdc9 100644 --- a/app/src/main/assets/DeviceParameter.json +++ b/app/src/main/assets/DeviceParameter.json @@ -1,7 +1,7 @@ [ { "deviceName": "AQS001", - "wifi": "YTJ010001_5G", + "wifi": "YTJ_010001_5G", "pwd": "abcd1234", "cameraIp": "192.168.10.151" }, diff --git a/app/src/main/assets/DeviceParameter.json b/app/src/main/assets/DeviceParameter.json index 650e097..90efdc9 100644 --- a/app/src/main/assets/DeviceParameter.json +++ b/app/src/main/assets/DeviceParameter.json @@ -1,7 +1,7 @@ [ { "deviceName": "AQS001", - "wifi": "YTJ010001_5G", + "wifi": "YTJ_010001_5G", "pwd": "abcd1234", "cameraIp": "192.168.10.151" }, diff --git a/app/src/main/java/com/casic/br/operationsite/utils/VideoPlayerManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/VideoPlayerManager.kt index 0bb0050..3746ced 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/VideoPlayerManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/VideoPlayerManager.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.utils -import android.view.View import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.model.VideoOptionModel import com.shuyu.gsyvideoplayer.utils.GSYVideoType @@ -71,10 +70,6 @@ GSYVideoManager.instance().optionModelList = list GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_16_9) - - videoPlayer.titleTextView.visibility = View.GONE - videoPlayer.backButton.visibility = View.GONE - videoPlayer.fullscreenButton.visibility = View.GONE videoPlayer.isReleaseWhenLossAudio = false videoPlayer.setUp(url, false, "") } diff --git a/app/src/main/assets/DeviceParameter.json b/app/src/main/assets/DeviceParameter.json index 650e097..90efdc9 100644 --- a/app/src/main/assets/DeviceParameter.json +++ b/app/src/main/assets/DeviceParameter.json @@ -1,7 +1,7 @@ [ { "deviceName": "AQS001", - "wifi": "YTJ010001_5G", + "wifi": "YTJ_010001_5G", "pwd": "abcd1234", "cameraIp": "192.168.10.151" }, diff --git a/app/src/main/java/com/casic/br/operationsite/utils/VideoPlayerManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/VideoPlayerManager.kt index 0bb0050..3746ced 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/VideoPlayerManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/VideoPlayerManager.kt @@ -1,6 +1,5 @@ package com.casic.br.operationsite.utils -import android.view.View import com.shuyu.gsyvideoplayer.GSYVideoManager import com.shuyu.gsyvideoplayer.model.VideoOptionModel import com.shuyu.gsyvideoplayer.utils.GSYVideoType @@ -71,10 +70,6 @@ GSYVideoManager.instance().optionModelList = list GSYVideoType.setShowType(GSYVideoType.SCREEN_TYPE_16_9) - - videoPlayer.titleTextView.visibility = View.GONE - videoPlayer.backButton.visibility = View.GONE - videoPlayer.fullscreenButton.visibility = View.GONE videoPlayer.isReleaseWhenLossAudio = false videoPlayer.setUp(url, false, "") } diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index 8141c65..b037b0a 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -1,16 +1,18 @@ package com.casic.br.operationsite.view import android.annotation.SuppressLint -import android.content.Context import android.net.ConnectivityManager import android.net.Network import android.net.NetworkCapabilities import android.net.NetworkRequest +import android.net.wifi.WifiConfiguration +import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build import android.os.Bundle import android.util.Log import android.view.MotionEvent +import android.view.View import android.widget.LinearLayout import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R @@ -25,6 +27,7 @@ import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.getScreenWidth +import com.pengxh.kt.lite.extensions.getSystemService import com.pengxh.kt.lite.extensions.readAssetsFile import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.ActivityStackManager @@ -37,9 +40,10 @@ private val kTag = "DeviceControlByNativeActivity" private val context = this private val gson by lazy { Gson() } + private val connectivityManager by lazy { getSystemService() } + private val wifiManager by lazy { getSystemService()!! } private lateinit var deviceParams: List private lateinit var deviceViewModel: DeviceViewModel - private var connectivityManager: ConnectivityManager? = null private var speed = 5 @SuppressLint("ClickableViewAccessibility") @@ -68,6 +72,13 @@ val rtsp = "rtsp://${parameter.cameraIp}:554/h265/ch1/sub/av_stream" VideoPlayerManager.setGSYVideoPlayerOptions(binding.rtspPlayerView, rtsp) + Log.d(kTag, "wifi: ${parameter.wifi}, pwd: ${parameter.pwd}") + + if (!wifiManager.isWifiEnabled) { + "请先打开设备WiFi".show(context) + return + } + //连接WiFi if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { val specifier = WifiNetworkSpecifier.Builder() @@ -81,9 +92,16 @@ .setNetworkSpecifier(specifier) .build() - connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) - as ConnectivityManager connectivityManager?.requestNetwork(request, networkCallback) + } else { + //Android 10 以下 + val wifiConfig = WifiConfiguration() + wifiConfig.SSID = parameter.wifi + wifiConfig.preSharedKey = parameter.pwd + val networkId = wifiManager.addNetwork(wifiConfig) + wifiManager.disconnect() + wifiManager.enableNetwork(networkId, true) + wifiManager.reconnect() } } }).build().show() @@ -178,6 +196,9 @@ params.width = videoWidth params.height = videoHeight.toInt() binding.rtspPlayerView.layoutParams = params + binding.rtspPlayerView.titleTextView.visibility = View.GONE + binding.rtspPlayerView.backButton.visibility = View.GONE + binding.rtspPlayerView.fullscreenButton.visibility = View.GONE binding.currentSpeedView.text = "速度：${speed}" }