diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 8659606..89f506e 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -6,7 +6,6 @@ import android.net.Network import android.net.NetworkCapabilities import android.net.NetworkRequest -import android.net.wifi.ScanResult import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build @@ -17,7 +16,6 @@ import com.casic.br.operationsite.extensions.getChannel import com.casic.br.operationsite.extensions.initLayoutImmersionBar import com.casic.br.operationsite.extensions.reformatFloatArray -import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.DeviceType import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.RuntimeCache @@ -43,7 +41,8 @@ private val context = this@HikVisionActivity private val hkSDK by lazy { HCNetSDK.getInstance() } private val wifiManager by lazy { applicationContext.getSystemService() } - private val wifiModels = ArrayList() + private val wifiSsids = ArrayList() + private val cameraItems = ArrayList() private var previewHandle = -1 private var selectChannel = -1 private var returnUserID = -1 @@ -53,7 +52,6 @@ private var startDChannel = 0 private var isPreviewSuccess = false private var connectivityManager: ConnectivityManager? = null - private lateinit var hostModel: DeviceConfigModel private lateinit var regionViewModel: RegionViewModel //手指是否已经从方向控制盘抬起 @@ -76,17 +74,17 @@ override fun initData() { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.CAMERA) { - hostModel = it - configSelectView.text = "${hostModel.host}:${hostModel.port}" + cameraItems.add("${it.host}:${it.port}") + configSelectView.text = cameraItems[0] } } //获取wifi列表 - wifiModels.clear() + wifiSsids.clear() wifiManager?.scanResults?.forEach { res -> //只要YTJ-010002 if (res.SSID == "YTJ-010002") { - wifiModels.add(res) + wifiSsids.add(res.SSID) } } @@ -106,25 +104,31 @@ override fun initEvent() { leftBackView.setOnClickListener { finish() } - netSelectView.setOnClickListener { - val items = ArrayList() - wifiModels.forEach { res -> - items.add(res.SSID) - } - + configSelectView.setOnClickListener { BottomActionSheet.Builder() .setContext(this) - .setActionItemTitle(items) + .setActionItemTitle(cameraItems) .setItemTextColor(R.color.mainThemeColor.convertColor(this)) .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { override fun onActionItemClick(position: Int) { - netSelectView.text = items[position] - val wifiModel = wifiModels[position] + configSelectView.text = cameraItems[position] + } + }).build().show() + } + + netSelectView.setOnClickListener { + BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(wifiSsids) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + netSelectView.text = wifiSsids[position] //连接wifi if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { val specifier = WifiNetworkSpecifier.Builder() - .setSsid(wifiModel.SSID) + .setSsid(wifiSsids[position]) .setWpa2Passphrase(LocaleConstant.WIFI_PASSWORD) .build() @@ -143,27 +147,6 @@ }).build().show() } - configSelectView.setOnClickListener { - val configModels = RuntimeCache.deviceModels - val items = ArrayList() - configModels.forEach { - if (it.deviceType == DeviceType.CAMERA) { - items.add("${it.host}:${it.port}") - } - } - - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(items) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = items[position] - hostModel = configModels[position] - } - }).build().show() - } - wheelController.setOnWheelTouchListener(object : SteeringWheelController.OnWheelTouchListener { override fun onActionTurnUp(dir: SteeringWheelController.Direction) { @@ -188,7 +171,8 @@ if (isPreviewSuccess) { closeHikVisionCamera() } else { - openHikVisionCamera() + val split = configSelectView.text.split(":") + openHikVisionCamera(split[0], split[1]) } } } @@ -256,14 +240,11 @@ isPreviewSuccess = false } - private fun openHikVisionCamera() { + private fun openHikVisionCamera(host: String, port: String) { val deviceItem = SDKGuider.g_sdkGuider.m_comDMGuider.DeviceItem() deviceItem.m_szDevName = "" deviceItem.m_struNetInfo = SDKGuider.g_sdkGuider.m_comDMGuider.DevNetInfo( - hostModel.host, - hostModel.port.toString(), - LocaleConstant.HK_NET_USERNAME, - LocaleConstant.HK_NET_PASSWORD + host, port, LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD ) if (deviceItem.m_szDevName.isEmpty()) { deviceItem.m_szDevName = deviceItem.m_struNetInfo.m_szIp diff --git a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt index 8659606..89f506e 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/HikVisionActivity.kt @@ -6,7 +6,6 @@ import android.net.Network import android.net.NetworkCapabilities import android.net.NetworkRequest -import android.net.wifi.ScanResult import android.net.wifi.WifiManager import android.net.wifi.WifiNetworkSpecifier import android.os.Build @@ -17,7 +16,6 @@ import com.casic.br.operationsite.extensions.getChannel import com.casic.br.operationsite.extensions.initLayoutImmersionBar import com.casic.br.operationsite.extensions.reformatFloatArray -import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.DeviceType import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.RuntimeCache @@ -43,7 +41,8 @@ private val context = this@HikVisionActivity private val hkSDK by lazy { HCNetSDK.getInstance() } private val wifiManager by lazy { applicationContext.getSystemService() } - private val wifiModels = ArrayList() + private val wifiSsids = ArrayList() + private val cameraItems = ArrayList() private var previewHandle = -1 private var selectChannel = -1 private var returnUserID = -1 @@ -53,7 +52,6 @@ private var startDChannel = 0 private var isPreviewSuccess = false private var connectivityManager: ConnectivityManager? = null - private lateinit var hostModel: DeviceConfigModel private lateinit var regionViewModel: RegionViewModel //手指是否已经从方向控制盘抬起 @@ -76,17 +74,17 @@ override fun initData() { RuntimeCache.deviceModels.forEach { if (it.deviceType == DeviceType.CAMERA) { - hostModel = it - configSelectView.text = "${hostModel.host}:${hostModel.port}" + cameraItems.add("${it.host}:${it.port}") + configSelectView.text = cameraItems[0] } } //获取wifi列表 - wifiModels.clear() + wifiSsids.clear() wifiManager?.scanResults?.forEach { res -> //只要YTJ-010002 if (res.SSID == "YTJ-010002") { - wifiModels.add(res) + wifiSsids.add(res.SSID) } } @@ -106,25 +104,31 @@ override fun initEvent() { leftBackView.setOnClickListener { finish() } - netSelectView.setOnClickListener { - val items = ArrayList() - wifiModels.forEach { res -> - items.add(res.SSID) - } - + configSelectView.setOnClickListener { BottomActionSheet.Builder() .setContext(this) - .setActionItemTitle(items) + .setActionItemTitle(cameraItems) .setItemTextColor(R.color.mainThemeColor.convertColor(this)) .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { override fun onActionItemClick(position: Int) { - netSelectView.text = items[position] - val wifiModel = wifiModels[position] + configSelectView.text = cameraItems[position] + } + }).build().show() + } + + netSelectView.setOnClickListener { + BottomActionSheet.Builder() + .setContext(this) + .setActionItemTitle(wifiSsids) + .setItemTextColor(R.color.mainThemeColor.convertColor(this)) + .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { + override fun onActionItemClick(position: Int) { + netSelectView.text = wifiSsids[position] //连接wifi if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { val specifier = WifiNetworkSpecifier.Builder() - .setSsid(wifiModel.SSID) + .setSsid(wifiSsids[position]) .setWpa2Passphrase(LocaleConstant.WIFI_PASSWORD) .build() @@ -143,27 +147,6 @@ }).build().show() } - configSelectView.setOnClickListener { - val configModels = RuntimeCache.deviceModels - val items = ArrayList() - configModels.forEach { - if (it.deviceType == DeviceType.CAMERA) { - items.add("${it.host}:${it.port}") - } - } - - BottomActionSheet.Builder() - .setContext(this) - .setActionItemTitle(items) - .setItemTextColor(R.color.mainThemeColor.convertColor(this)) - .setOnActionSheetListener(object : BottomActionSheet.OnActionSheetListener { - override fun onActionItemClick(position: Int) { - configSelectView.text = items[position] - hostModel = configModels[position] - } - }).build().show() - } - wheelController.setOnWheelTouchListener(object : SteeringWheelController.OnWheelTouchListener { override fun onActionTurnUp(dir: SteeringWheelController.Direction) { @@ -188,7 +171,8 @@ if (isPreviewSuccess) { closeHikVisionCamera() } else { - openHikVisionCamera() + val split = configSelectView.text.split(":") + openHikVisionCamera(split[0], split[1]) } } } @@ -256,14 +240,11 @@ isPreviewSuccess = false } - private fun openHikVisionCamera() { + private fun openHikVisionCamera(host: String, port: String) { val deviceItem = SDKGuider.g_sdkGuider.m_comDMGuider.DeviceItem() deviceItem.m_szDevName = "" deviceItem.m_struNetInfo = SDKGuider.g_sdkGuider.m_comDMGuider.DevNetInfo( - hostModel.host, - hostModel.port.toString(), - LocaleConstant.HK_NET_USERNAME, - LocaleConstant.HK_NET_PASSWORD + host, port, LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD ) if (deviceItem.m_szDevName.isEmpty()) { deviceItem.m_szDevName = deviceItem.m_struNetInfo.m_szIp diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index 963c092..44c578f 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -117,6 +117,14 @@ } } } +// RuntimeCache.deviceModels.add( +// DeviceConfigModel( +// "", +// DeviceType.GAS, +// "192.168.10.21", +// 8000 +// ) +// ) } }