diff --git a/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt b/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt new file mode 100644 index 0000000..752ca53 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt @@ -0,0 +1,3 @@ +package com.casic.br.operationsite.model; + +data class DeviceConfigModel(val host: String, val port: Int) \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt b/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt new file mode 100644 index 0000000..752ca53 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt @@ -0,0 +1,3 @@ +package com.casic.br.operationsite.model; + +data class DeviceConfigModel(val host: String, val port: Int) \ No newline at end of file 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 e1454d0..e245ec5 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 @@ -5,6 +5,7 @@ import android.view.SurfaceHolder import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.getChannel +import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.hk.MessageCodeHub import com.casic.br.operationsite.utils.hk.SDKGuider @@ -13,8 +14,10 @@ import com.hikvision.netsdk.NET_DVR_PREVIEWINFO import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.SteeringWheelController +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_hikvision.* class HikVisionActivity : KotlinBaseActivity(), SurfaceHolder.Callback { @@ -29,7 +32,7 @@ private var dChannelNum = 0 private var startDChannel = 0 private var isPreviewSuccess = false - private var HK_NET_IP = "" + private lateinit var hostModel: DeviceConfigModel //手指是否已经从方向控制盘抬起 private var isActionUp = true @@ -41,15 +44,39 @@ } override fun initData() { - + hostModel = getDeviceConfigModels()[0] + configSelectView.text = "${hostModel.host}:${hostModel.port}" } override fun observeRequestState() { } + private fun getDeviceConfigModels(): ArrayList { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.101", 8000)) + return modes + } + override fun initEvent() { - HK_NET_IP = configSpinner.selectedItem.toString() + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 { @@ -125,15 +152,11 @@ } private fun openHikVisionCamera() { - if (HK_NET_IP == "") { - "未选择摄像头，无法打开".show(this) - return - } val deviceItem = SDKGuider.g_sdkGuider.m_comDMGuider.DeviceItem() deviceItem.m_szDevName = "" deviceItem.m_struNetInfo = SDKGuider.g_sdkGuider.m_comDMGuider.DevNetInfo( - HK_NET_IP, - LocaleConstant.HK_NET_PORT, + hostModel.host, + hostModel.port.toString(), LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD ) diff --git a/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt b/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt new file mode 100644 index 0000000..752ca53 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt @@ -0,0 +1,3 @@ +package com.casic.br.operationsite.model; + +data class DeviceConfigModel(val host: String, val port: Int) \ No newline at end of file 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 e1454d0..e245ec5 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 @@ -5,6 +5,7 @@ import android.view.SurfaceHolder import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.getChannel +import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.hk.MessageCodeHub import com.casic.br.operationsite.utils.hk.SDKGuider @@ -13,8 +14,10 @@ import com.hikvision.netsdk.NET_DVR_PREVIEWINFO import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.SteeringWheelController +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_hikvision.* class HikVisionActivity : KotlinBaseActivity(), SurfaceHolder.Callback { @@ -29,7 +32,7 @@ private var dChannelNum = 0 private var startDChannel = 0 private var isPreviewSuccess = false - private var HK_NET_IP = "" + private lateinit var hostModel: DeviceConfigModel //手指是否已经从方向控制盘抬起 private var isActionUp = true @@ -41,15 +44,39 @@ } override fun initData() { - + hostModel = getDeviceConfigModels()[0] + configSelectView.text = "${hostModel.host}:${hostModel.port}" } override fun observeRequestState() { } + private fun getDeviceConfigModels(): ArrayList { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.101", 8000)) + return modes + } + override fun initEvent() { - HK_NET_IP = configSpinner.selectedItem.toString() + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 { @@ -125,15 +152,11 @@ } private fun openHikVisionCamera() { - if (HK_NET_IP == "") { - "未选择摄像头，无法打开".show(this) - return - } val deviceItem = SDKGuider.g_sdkGuider.m_comDMGuider.DeviceItem() deviceItem.m_szDevName = "" deviceItem.m_struNetInfo = SDKGuider.g_sdkGuider.m_comDMGuider.DevNetInfo( - HK_NET_IP, - LocaleConstant.HK_NET_PORT, + hostModel.host, + hostModel.port.toString(), LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD ) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 0f63c93..8807533 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.operationsite.extensions.createStartCommand import com.casic.br.operationsite.extensions.createStopCommand import com.casic.br.operationsite.extensions.initLayoutImmersionBar +import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.netty.SocketManager import com.gyf.immersionbar.ImmersionBar @@ -13,6 +14,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelController +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_methane.* import kotlinx.android.synthetic.main.include_option_title.* @@ -22,7 +24,7 @@ lateinit var weakReferenceHandler: WeakReferenceHandler } - private lateinit var host: List + private lateinit var hostModel: DeviceConfigModel private var isConnectSuccess = false @@ -48,15 +50,45 @@ true } - host = configSpinner.selectedItem.toString().split(":") - SocketManager.get.connectNetty(host[0], host[1].toInt()) + hostModel = getDeviceConfigModels()[0] + configSelectView.text = "${hostModel.host}:${hostModel.port}" + SocketManager.get.connectNetty(hostModel.host, hostModel.port) + } + + private fun getDeviceConfigModels(): ArrayList { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.21", 8000)) + return modes } override fun initEvent() { leftBackView.setOnClickListener { finish() } rightOptionView.setOnClickListener { - SocketManager.get.connectNetty(host[0], host[1].toInt()) + SocketManager.get.connectNetty(hostModel.host, hostModel.port) + } + + netSelectView.setOnClickListener { + + } + + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 : diff --git a/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt b/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt new file mode 100644 index 0000000..752ca53 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt @@ -0,0 +1,3 @@ +package com.casic.br.operationsite.model; + +data class DeviceConfigModel(val host: String, val port: Int) \ No newline at end of file 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 e1454d0..e245ec5 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 @@ -5,6 +5,7 @@ import android.view.SurfaceHolder import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.getChannel +import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.hk.MessageCodeHub import com.casic.br.operationsite.utils.hk.SDKGuider @@ -13,8 +14,10 @@ import com.hikvision.netsdk.NET_DVR_PREVIEWINFO import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.SteeringWheelController +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_hikvision.* class HikVisionActivity : KotlinBaseActivity(), SurfaceHolder.Callback { @@ -29,7 +32,7 @@ private var dChannelNum = 0 private var startDChannel = 0 private var isPreviewSuccess = false - private var HK_NET_IP = "" + private lateinit var hostModel: DeviceConfigModel //手指是否已经从方向控制盘抬起 private var isActionUp = true @@ -41,15 +44,39 @@ } override fun initData() { - + hostModel = getDeviceConfigModels()[0] + configSelectView.text = "${hostModel.host}:${hostModel.port}" } override fun observeRequestState() { } + private fun getDeviceConfigModels(): ArrayList { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.101", 8000)) + return modes + } + override fun initEvent() { - HK_NET_IP = configSpinner.selectedItem.toString() + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 { @@ -125,15 +152,11 @@ } private fun openHikVisionCamera() { - if (HK_NET_IP == "") { - "未选择摄像头，无法打开".show(this) - return - } val deviceItem = SDKGuider.g_sdkGuider.m_comDMGuider.DeviceItem() deviceItem.m_szDevName = "" deviceItem.m_struNetInfo = SDKGuider.g_sdkGuider.m_comDMGuider.DevNetInfo( - HK_NET_IP, - LocaleConstant.HK_NET_PORT, + hostModel.host, + hostModel.port.toString(), LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD ) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 0f63c93..8807533 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.operationsite.extensions.createStartCommand import com.casic.br.operationsite.extensions.createStopCommand import com.casic.br.operationsite.extensions.initLayoutImmersionBar +import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.netty.SocketManager import com.gyf.immersionbar.ImmersionBar @@ -13,6 +14,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelController +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_methane.* import kotlinx.android.synthetic.main.include_option_title.* @@ -22,7 +24,7 @@ lateinit var weakReferenceHandler: WeakReferenceHandler } - private lateinit var host: List + private lateinit var hostModel: DeviceConfigModel private var isConnectSuccess = false @@ -48,15 +50,45 @@ true } - host = configSpinner.selectedItem.toString().split(":") - SocketManager.get.connectNetty(host[0], host[1].toInt()) + hostModel = getDeviceConfigModels()[0] + configSelectView.text = "${hostModel.host}:${hostModel.port}" + SocketManager.get.connectNetty(hostModel.host, hostModel.port) + } + + private fun getDeviceConfigModels(): ArrayList { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.21", 8000)) + return modes } override fun initEvent() { leftBackView.setOnClickListener { finish() } rightOptionView.setOnClickListener { - SocketManager.get.connectNetty(host[0], host[1].toInt()) + SocketManager.get.connectNetty(hostModel.host, hostModel.port) + } + + netSelectView.setOnClickListener { + + } + + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 : 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 1400cba..116ac73 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 @@ -169,7 +169,6 @@ } } }).build().show() - } uploadTextView.setOnClickListener { diff --git a/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt b/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt new file mode 100644 index 0000000..752ca53 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/model/DeviceConfigModel.kt @@ -0,0 +1,3 @@ +package com.casic.br.operationsite.model; + +data class DeviceConfigModel(val host: String, val port: Int) \ No newline at end of file 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 e1454d0..e245ec5 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 @@ -5,6 +5,7 @@ import android.view.SurfaceHolder import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.getChannel +import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.hk.MessageCodeHub import com.casic.br.operationsite.utils.hk.SDKGuider @@ -13,8 +14,10 @@ import com.hikvision.netsdk.NET_DVR_PREVIEWINFO import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.widget.SteeringWheelController +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_hikvision.* class HikVisionActivity : KotlinBaseActivity(), SurfaceHolder.Callback { @@ -29,7 +32,7 @@ private var dChannelNum = 0 private var startDChannel = 0 private var isPreviewSuccess = false - private var HK_NET_IP = "" + private lateinit var hostModel: DeviceConfigModel //手指是否已经从方向控制盘抬起 private var isActionUp = true @@ -41,15 +44,39 @@ } override fun initData() { - + hostModel = getDeviceConfigModels()[0] + configSelectView.text = "${hostModel.host}:${hostModel.port}" } override fun observeRequestState() { } + private fun getDeviceConfigModels(): ArrayList { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.101", 8000)) + return modes + } + override fun initEvent() { - HK_NET_IP = configSpinner.selectedItem.toString() + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 { @@ -125,15 +152,11 @@ } private fun openHikVisionCamera() { - if (HK_NET_IP == "") { - "未选择摄像头，无法打开".show(this) - return - } val deviceItem = SDKGuider.g_sdkGuider.m_comDMGuider.DeviceItem() deviceItem.m_szDevName = "" deviceItem.m_struNetInfo = SDKGuider.g_sdkGuider.m_comDMGuider.DevNetInfo( - HK_NET_IP, - LocaleConstant.HK_NET_PORT, + hostModel.host, + hostModel.port.toString(), LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD ) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 0f63c93..8807533 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.operationsite.extensions.createStartCommand import com.casic.br.operationsite.extensions.createStopCommand import com.casic.br.operationsite.extensions.initLayoutImmersionBar +import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.netty.SocketManager import com.gyf.immersionbar.ImmersionBar @@ -13,6 +14,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelController +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_methane.* import kotlinx.android.synthetic.main.include_option_title.* @@ -22,7 +24,7 @@ lateinit var weakReferenceHandler: WeakReferenceHandler } - private lateinit var host: List + private lateinit var hostModel: DeviceConfigModel private var isConnectSuccess = false @@ -48,15 +50,45 @@ true } - host = configSpinner.selectedItem.toString().split(":") - SocketManager.get.connectNetty(host[0], host[1].toInt()) + hostModel = getDeviceConfigModels()[0] + configSelectView.text = "${hostModel.host}:${hostModel.port}" + SocketManager.get.connectNetty(hostModel.host, hostModel.port) + } + + private fun getDeviceConfigModels(): ArrayList { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.21", 8000)) + return modes } override fun initEvent() { leftBackView.setOnClickListener { finish() } rightOptionView.setOnClickListener { - SocketManager.get.connectNetty(host[0], host[1].toInt()) + SocketManager.get.connectNetty(hostModel.host, hostModel.port) + } + + netSelectView.setOnClickListener { + + } + + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 : 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 1400cba..116ac73 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 @@ -169,7 +169,6 @@ } } }).build().show() - } uploadTextView.setOnClickListener { diff --git a/app/src/main/res/layout/activity_hikvision.xml b/app/src/main/res/layout/activity_hikvision.xml index f30ff20..e217f58 100644 --- a/app/src/main/res/layout/activity_hikvision.xml +++ b/app/src/main/res/layout/activity_hikvision.xml @@ -36,11 +36,15 @@ android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" /> - + android:layout_height="@dimen/titleViewHeight" + android:gravity="center_vertical" + android:paddingHorizontal="@dimen/dp_7" + android:text="请选择" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_16" /> { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.101", 8000)) + return modes + } + override fun initEvent() { - HK_NET_IP = configSpinner.selectedItem.toString() + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 { @@ -125,15 +152,11 @@ } private fun openHikVisionCamera() { - if (HK_NET_IP == "") { - "未选择摄像头，无法打开".show(this) - return - } val deviceItem = SDKGuider.g_sdkGuider.m_comDMGuider.DeviceItem() deviceItem.m_szDevName = "" deviceItem.m_struNetInfo = SDKGuider.g_sdkGuider.m_comDMGuider.DevNetInfo( - HK_NET_IP, - LocaleConstant.HK_NET_PORT, + hostModel.host, + hostModel.port.toString(), LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD ) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 0f63c93..8807533 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.operationsite.extensions.createStartCommand import com.casic.br.operationsite.extensions.createStopCommand import com.casic.br.operationsite.extensions.initLayoutImmersionBar +import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.netty.SocketManager import com.gyf.immersionbar.ImmersionBar @@ -13,6 +14,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelController +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_methane.* import kotlinx.android.synthetic.main.include_option_title.* @@ -22,7 +24,7 @@ lateinit var weakReferenceHandler: WeakReferenceHandler } - private lateinit var host: List + private lateinit var hostModel: DeviceConfigModel private var isConnectSuccess = false @@ -48,15 +50,45 @@ true } - host = configSpinner.selectedItem.toString().split(":") - SocketManager.get.connectNetty(host[0], host[1].toInt()) + hostModel = getDeviceConfigModels()[0] + configSelectView.text = "${hostModel.host}:${hostModel.port}" + SocketManager.get.connectNetty(hostModel.host, hostModel.port) + } + + private fun getDeviceConfigModels(): ArrayList { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.21", 8000)) + return modes } override fun initEvent() { leftBackView.setOnClickListener { finish() } rightOptionView.setOnClickListener { - SocketManager.get.connectNetty(host[0], host[1].toInt()) + SocketManager.get.connectNetty(hostModel.host, hostModel.port) + } + + netSelectView.setOnClickListener { + + } + + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 : 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 1400cba..116ac73 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 @@ -169,7 +169,6 @@ } } }).build().show() - } uploadTextView.setOnClickListener { diff --git a/app/src/main/res/layout/activity_hikvision.xml b/app/src/main/res/layout/activity_hikvision.xml index f30ff20..e217f58 100644 --- a/app/src/main/res/layout/activity_hikvision.xml +++ b/app/src/main/res/layout/activity_hikvision.xml @@ -36,11 +36,15 @@ android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" /> - + android:layout_height="@dimen/titleViewHeight" + android:gravity="center_vertical" + android:paddingHorizontal="@dimen/dp_7" + android:text="请选择" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_16" /> + + + + + + + @@ -50,11 +78,15 @@ android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" /> - + android:layout_height="@dimen/titleViewHeight" + android:gravity="center_vertical" + android:paddingHorizontal="@dimen/dp_7" + android:text="请选择" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_16" /> { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.101", 8000)) + return modes + } + override fun initEvent() { - HK_NET_IP = configSpinner.selectedItem.toString() + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 { @@ -125,15 +152,11 @@ } private fun openHikVisionCamera() { - if (HK_NET_IP == "") { - "未选择摄像头，无法打开".show(this) - return - } val deviceItem = SDKGuider.g_sdkGuider.m_comDMGuider.DeviceItem() deviceItem.m_szDevName = "" deviceItem.m_struNetInfo = SDKGuider.g_sdkGuider.m_comDMGuider.DevNetInfo( - HK_NET_IP, - LocaleConstant.HK_NET_PORT, + hostModel.host, + hostModel.port.toString(), LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD ) diff --git a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt index 0f63c93..8807533 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MethaneActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.operationsite.extensions.createStartCommand import com.casic.br.operationsite.extensions.createStopCommand import com.casic.br.operationsite.extensions.initLayoutImmersionBar +import com.casic.br.operationsite.model.DeviceConfigModel import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.netty.SocketManager import com.gyf.immersionbar.ImmersionBar @@ -13,6 +14,7 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.WeakReferenceHandler import com.pengxh.kt.lite.widget.SteeringWheelController +import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.activity_methane.* import kotlinx.android.synthetic.main.include_option_title.* @@ -22,7 +24,7 @@ lateinit var weakReferenceHandler: WeakReferenceHandler } - private lateinit var host: List + private lateinit var hostModel: DeviceConfigModel private var isConnectSuccess = false @@ -48,15 +50,45 @@ true } - host = configSpinner.selectedItem.toString().split(":") - SocketManager.get.connectNetty(host[0], host[1].toInt()) + hostModel = getDeviceConfigModels()[0] + configSelectView.text = "${hostModel.host}:${hostModel.port}" + SocketManager.get.connectNetty(hostModel.host, hostModel.port) + } + + private fun getDeviceConfigModels(): ArrayList { + val modes = ArrayList() + modes.add(DeviceConfigModel("192.168.10.21", 8000)) + return modes } override fun initEvent() { leftBackView.setOnClickListener { finish() } rightOptionView.setOnClickListener { - SocketManager.get.connectNetty(host[0], host[1].toInt()) + SocketManager.get.connectNetty(hostModel.host, hostModel.port) + } + + netSelectView.setOnClickListener { + + } + + configSelectView.setOnClickListener { + val configModels = getDeviceConfigModels() + val items = ArrayList() + configModels.forEach { + 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 : 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 1400cba..116ac73 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 @@ -169,7 +169,6 @@ } } }).build().show() - } uploadTextView.setOnClickListener { diff --git a/app/src/main/res/layout/activity_hikvision.xml b/app/src/main/res/layout/activity_hikvision.xml index f30ff20..e217f58 100644 --- a/app/src/main/res/layout/activity_hikvision.xml +++ b/app/src/main/res/layout/activity_hikvision.xml @@ -36,11 +36,15 @@ android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" /> - + android:layout_height="@dimen/titleViewHeight" + android:gravity="center_vertical" + android:paddingHorizontal="@dimen/dp_7" + android:text="请选择" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_16" /> + + + + + + + @@ -50,11 +78,15 @@ android:textColor="@color/mainTextColor" android:textSize="@dimen/sp_16" /> - + android:layout_height="@dimen/titleViewHeight" + android:gravity="center_vertical" + android:paddingHorizontal="@dimen/dp_7" + android:text="请选择" + android:textColor="@color/subTextColor" + android:textSize="@dimen/sp_16" /> - - - 192.168.10.101 - - - - 192.168.10.21:8000 - - \ No newline at end of file