diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 84ac96a..a966f73 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,7 +63,6 @@
-
-
(addAll(hostModel.host, hostModel.port.toString()))
+ configButton.setOnClickListener {
+ val region = regionView.getConfirmedPoints()
+ val data = region.reformatFloatArray()
+
+ //发送数据的时候需要断开视频
+ regionViewModel.postRegion("11,12", "#FF0000", data)
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 84ac96a..a966f73 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,7 +63,6 @@
-
(addAll(hostModel.host, hostModel.port.toString()))
+ configButton.setOnClickListener {
+ val region = regionView.getConfirmedPoints()
+ val data = region.reformatFloatArray()
+
+ //发送数据的时候需要断开视频
+ regionViewModel.postRegion("11,12", "#FF0000", data)
}
}
diff --git a/app/src/main/java/com/casic/br/operationsite/view/VideoRegionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/VideoRegionActivity.kt
deleted file mode 100644
index 33f6970..0000000
--- a/app/src/main/java/com/casic/br/operationsite/view/VideoRegionActivity.kt
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.casic.br.operationsite.view
-
-import android.graphics.PixelFormat
-import android.util.Log
-import android.view.SurfaceHolder
-import androidx.lifecycle.ViewModelProvider
-import com.casic.br.operationsite.R
-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.utils.LocaleConstant
-import com.casic.br.operationsite.utils.hk.MessageCodeHub
-import com.casic.br.operationsite.utils.hk.SDKGuider
-import com.casic.br.operationsite.vm.RegionViewModel
-import com.gyf.immersionbar.ImmersionBar
-import com.hikvision.netsdk.NET_DVR_PREVIEWINFO
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.Constant
-import kotlinx.android.synthetic.main.activity_video_region.*
-import kotlinx.android.synthetic.main.include_base_title.leftBackView
-import kotlinx.android.synthetic.main.include_base_title.titleView
-import kotlinx.android.synthetic.main.include_option_title.*
-
-class VideoRegionActivity : KotlinBaseActivity(), SurfaceHolder.Callback {
-
- private val kTag = "VideoRegionActivity"
- private val context = this@VideoRegionActivity
- private var previewHandle = -1
- private var selectChannel = -1
- private var returnUserID = -1
- private var aChannelNum = 0
- private var startAChannel = 0
- private var dChannelNum = 0
- private var startDChannel = 0
- private var isPreviewSuccess = false
- private lateinit var params: ArrayList
- private lateinit var regionViewModel: RegionViewModel
-
- override fun initData() {
- params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
-
- regionViewModel = ViewModelProvider(this)[RegionViewModel::class.java]
- regionViewModel.postResult.observe(this) {
- if (it.code == 200) {
- "区域配置成功".show(this)
- finish()
- }
- }
- }
-
- override fun initEvent() {
- openCameraButton.setOnClickListener {
- openHikVisionCamera(params[0], params[1])
- }
-
- closeCameraButton.setOnClickListener {
- if (!SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlay_Stop_jni(previewHandle)) {
- return@setOnClickListener
- }
- previewHandle = -1
- isPreviewSuccess = false
-
- regionView.clearRoutePath()
- }
-
- configButton.setOnClickListener {
- val region = regionView.getConfirmedPoints()
- val data = region.reformatFloatArray()
-
- //发送数据的时候需要断开视频
- regionViewModel.postRegion("11,12", "#FF0000", data)
- }
- }
-
- override fun initLayoutView(): Int = R.layout.activity_video_region
-
- override fun observeRequestState() {
-
- }
-
- override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false)
- .statusBarColor(R.color.mainThemeColor).init()
- initLayoutImmersionBar(rootView)
-
- leftBackView.setOnClickListener { finish() }
- titleView.text = "区域规划"
- rightOptionView.text = "重画"
- rightOptionView.setOnClickListener {
- regionView.clearRoutePath()
- }
- }
-
- 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(
- host, port, LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD
- )
- if (deviceItem.m_szDevName.isEmpty()) {
- deviceItem.m_szDevName = deviceItem.m_struNetInfo.m_szIp
- }
-
- val loginV40Jna = SDKGuider.g_sdkGuider.m_comDMGuider.login_v40_jna(
- deviceItem.m_szDevName, deviceItem.m_struNetInfo
- )
- if (loginV40Jna) {
- //配置设备通道
- try {
- val deviceInfo = SDKGuider.g_sdkGuider.m_comDMGuider.devList[0]
- returnUserID = deviceInfo.m_lUserID
-
- aChannelNum = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byChanNum.toInt()
- startAChannel =
- deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byStartChan.toInt()
-
- dChannelNum = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byIPChanNum +
- deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byHighDChanNum * 256
- startDChannel =
- deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byStartChan.toInt()
-
- var iAnalogStartChan = startAChannel
- var iDigitalStartChan = startDChannel
-
- val channelList = ArrayList()
-
- for (i in 0 until aChannelNum) {
- channelList.add("ACamera_$iAnalogStartChan")
- iAnalogStartChan++
- }
-
- for (i in 0 until dChannelNum) {
- channelList.add("DCamera_$iDigitalStartChan")
- iDigitalStartChan++
- }
- selectChannel = Integer.valueOf(channelList[0].getChannel())
-
- val streamList = ArrayList()
- streamList.add("main_stream")
- streamList.add("sub_stream")
- streamList.add("third_stream")
-
- //开始预览
- if (previewHandle != -1) {
- SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlay_Stop_jni(previewHandle)
- }
- val strutPlayInfo = NET_DVR_PREVIEWINFO()
- strutPlayInfo.lChannel = selectChannel
- strutPlayInfo.dwStreamType = 1
- strutPlayInfo.bBlocked = 1
- strutPlayInfo.hHwnd = videoSurfaceView.holder
- previewHandle = SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlay_V40_jni(
- returnUserID, strutPlayInfo, null
- )
- if (previewHandle < 0) {
- Log.d(
- kTag,
- "configDevice: NET_DVR_RealPlay_V40 fail, Err:${MessageCodeHub.getErrorCode()}"
- )
- return
- }
- isPreviewSuccess = true
- } catch (e: IndexOutOfBoundsException) {
- e.printStackTrace()
- }
- }
- }
-
- override fun surfaceCreated(holder: SurfaceHolder) {
- videoSurfaceView.holder.setFormat(PixelFormat.TRANSLUCENT)
- if (-1 == previewHandle) {
- return
- }
- val surface = holder.surface
- if (surface.isValid) {
- if (-1 == SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlaySurfaceChanged_jni(
- previewHandle, 0, holder
- )
- ) {
- Log.d(kTag, "surfaceCreated: ${MessageCodeHub.getErrorCode()}")
- }
- }
- }
-
- override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-
- }
-
- override fun surfaceDestroyed(holder: SurfaceHolder) {
- if (-1 == previewHandle) {
- return
- }
- if (holder.surface.isValid) {
- if (-1 == SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlaySurfaceChanged_jni(
- previewHandle, 0, null
- )
- ) {
- Log.d(kTag, "surfaceCreated: ${MessageCodeHub.getErrorCode()}")
- }
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 84ac96a..a966f73 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,7 +63,6 @@
-
(addAll(hostModel.host, hostModel.port.toString()))
+ configButton.setOnClickListener {
+ val region = regionView.getConfirmedPoints()
+ val data = region.reformatFloatArray()
+
+ //发送数据的时候需要断开视频
+ regionViewModel.postRegion("11,12", "#FF0000", data)
}
}
diff --git a/app/src/main/java/com/casic/br/operationsite/view/VideoRegionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/VideoRegionActivity.kt
deleted file mode 100644
index 33f6970..0000000
--- a/app/src/main/java/com/casic/br/operationsite/view/VideoRegionActivity.kt
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.casic.br.operationsite.view
-
-import android.graphics.PixelFormat
-import android.util.Log
-import android.view.SurfaceHolder
-import androidx.lifecycle.ViewModelProvider
-import com.casic.br.operationsite.R
-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.utils.LocaleConstant
-import com.casic.br.operationsite.utils.hk.MessageCodeHub
-import com.casic.br.operationsite.utils.hk.SDKGuider
-import com.casic.br.operationsite.vm.RegionViewModel
-import com.gyf.immersionbar.ImmersionBar
-import com.hikvision.netsdk.NET_DVR_PREVIEWINFO
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.Constant
-import kotlinx.android.synthetic.main.activity_video_region.*
-import kotlinx.android.synthetic.main.include_base_title.leftBackView
-import kotlinx.android.synthetic.main.include_base_title.titleView
-import kotlinx.android.synthetic.main.include_option_title.*
-
-class VideoRegionActivity : KotlinBaseActivity(), SurfaceHolder.Callback {
-
- private val kTag = "VideoRegionActivity"
- private val context = this@VideoRegionActivity
- private var previewHandle = -1
- private var selectChannel = -1
- private var returnUserID = -1
- private var aChannelNum = 0
- private var startAChannel = 0
- private var dChannelNum = 0
- private var startDChannel = 0
- private var isPreviewSuccess = false
- private lateinit var params: ArrayList
- private lateinit var regionViewModel: RegionViewModel
-
- override fun initData() {
- params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
-
- regionViewModel = ViewModelProvider(this)[RegionViewModel::class.java]
- regionViewModel.postResult.observe(this) {
- if (it.code == 200) {
- "区域配置成功".show(this)
- finish()
- }
- }
- }
-
- override fun initEvent() {
- openCameraButton.setOnClickListener {
- openHikVisionCamera(params[0], params[1])
- }
-
- closeCameraButton.setOnClickListener {
- if (!SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlay_Stop_jni(previewHandle)) {
- return@setOnClickListener
- }
- previewHandle = -1
- isPreviewSuccess = false
-
- regionView.clearRoutePath()
- }
-
- configButton.setOnClickListener {
- val region = regionView.getConfirmedPoints()
- val data = region.reformatFloatArray()
-
- //发送数据的时候需要断开视频
- regionViewModel.postRegion("11,12", "#FF0000", data)
- }
- }
-
- override fun initLayoutView(): Int = R.layout.activity_video_region
-
- override fun observeRequestState() {
-
- }
-
- override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false)
- .statusBarColor(R.color.mainThemeColor).init()
- initLayoutImmersionBar(rootView)
-
- leftBackView.setOnClickListener { finish() }
- titleView.text = "区域规划"
- rightOptionView.text = "重画"
- rightOptionView.setOnClickListener {
- regionView.clearRoutePath()
- }
- }
-
- 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(
- host, port, LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD
- )
- if (deviceItem.m_szDevName.isEmpty()) {
- deviceItem.m_szDevName = deviceItem.m_struNetInfo.m_szIp
- }
-
- val loginV40Jna = SDKGuider.g_sdkGuider.m_comDMGuider.login_v40_jna(
- deviceItem.m_szDevName, deviceItem.m_struNetInfo
- )
- if (loginV40Jna) {
- //配置设备通道
- try {
- val deviceInfo = SDKGuider.g_sdkGuider.m_comDMGuider.devList[0]
- returnUserID = deviceInfo.m_lUserID
-
- aChannelNum = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byChanNum.toInt()
- startAChannel =
- deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byStartChan.toInt()
-
- dChannelNum = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byIPChanNum +
- deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byHighDChanNum * 256
- startDChannel =
- deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byStartChan.toInt()
-
- var iAnalogStartChan = startAChannel
- var iDigitalStartChan = startDChannel
-
- val channelList = ArrayList()
-
- for (i in 0 until aChannelNum) {
- channelList.add("ACamera_$iAnalogStartChan")
- iAnalogStartChan++
- }
-
- for (i in 0 until dChannelNum) {
- channelList.add("DCamera_$iDigitalStartChan")
- iDigitalStartChan++
- }
- selectChannel = Integer.valueOf(channelList[0].getChannel())
-
- val streamList = ArrayList()
- streamList.add("main_stream")
- streamList.add("sub_stream")
- streamList.add("third_stream")
-
- //开始预览
- if (previewHandle != -1) {
- SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlay_Stop_jni(previewHandle)
- }
- val strutPlayInfo = NET_DVR_PREVIEWINFO()
- strutPlayInfo.lChannel = selectChannel
- strutPlayInfo.dwStreamType = 1
- strutPlayInfo.bBlocked = 1
- strutPlayInfo.hHwnd = videoSurfaceView.holder
- previewHandle = SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlay_V40_jni(
- returnUserID, strutPlayInfo, null
- )
- if (previewHandle < 0) {
- Log.d(
- kTag,
- "configDevice: NET_DVR_RealPlay_V40 fail, Err:${MessageCodeHub.getErrorCode()}"
- )
- return
- }
- isPreviewSuccess = true
- } catch (e: IndexOutOfBoundsException) {
- e.printStackTrace()
- }
- }
- }
-
- override fun surfaceCreated(holder: SurfaceHolder) {
- videoSurfaceView.holder.setFormat(PixelFormat.TRANSLUCENT)
- if (-1 == previewHandle) {
- return
- }
- val surface = holder.surface
- if (surface.isValid) {
- if (-1 == SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlaySurfaceChanged_jni(
- previewHandle, 0, holder
- )
- ) {
- Log.d(kTag, "surfaceCreated: ${MessageCodeHub.getErrorCode()}")
- }
- }
- }
-
- override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-
- }
-
- override fun surfaceDestroyed(holder: SurfaceHolder) {
- if (-1 == previewHandle) {
- return
- }
- if (holder.surface.isValid) {
- if (-1 == SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlaySurfaceChanged_jni(
- previewHandle, 0, null
- )
- ) {
- Log.d(kTag, "surfaceCreated: ${MessageCodeHub.getErrorCode()}")
- }
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_hikvision.xml b/app/src/main/res/layout/activity_hikvision.xml
index 8b4f9fc..0771e04 100644
--- a/app/src/main/res/layout/activity_hikvision.xml
+++ b/app/src/main/res/layout/activity_hikvision.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
+
-
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/dp_7">
+
+
+
+
+
-
-
-
-
-
-
+ android:text="配置区域范围" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 84ac96a..a966f73 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -63,7 +63,6 @@
-
(addAll(hostModel.host, hostModel.port.toString()))
+ configButton.setOnClickListener {
+ val region = regionView.getConfirmedPoints()
+ val data = region.reformatFloatArray()
+
+ //发送数据的时候需要断开视频
+ regionViewModel.postRegion("11,12", "#FF0000", data)
}
}
diff --git a/app/src/main/java/com/casic/br/operationsite/view/VideoRegionActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/VideoRegionActivity.kt
deleted file mode 100644
index 33f6970..0000000
--- a/app/src/main/java/com/casic/br/operationsite/view/VideoRegionActivity.kt
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.casic.br.operationsite.view
-
-import android.graphics.PixelFormat
-import android.util.Log
-import android.view.SurfaceHolder
-import androidx.lifecycle.ViewModelProvider
-import com.casic.br.operationsite.R
-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.utils.LocaleConstant
-import com.casic.br.operationsite.utils.hk.MessageCodeHub
-import com.casic.br.operationsite.utils.hk.SDKGuider
-import com.casic.br.operationsite.vm.RegionViewModel
-import com.gyf.immersionbar.ImmersionBar
-import com.hikvision.netsdk.NET_DVR_PREVIEWINFO
-import com.pengxh.kt.lite.base.KotlinBaseActivity
-import com.pengxh.kt.lite.extensions.show
-import com.pengxh.kt.lite.utils.Constant
-import kotlinx.android.synthetic.main.activity_video_region.*
-import kotlinx.android.synthetic.main.include_base_title.leftBackView
-import kotlinx.android.synthetic.main.include_base_title.titleView
-import kotlinx.android.synthetic.main.include_option_title.*
-
-class VideoRegionActivity : KotlinBaseActivity(), SurfaceHolder.Callback {
-
- private val kTag = "VideoRegionActivity"
- private val context = this@VideoRegionActivity
- private var previewHandle = -1
- private var selectChannel = -1
- private var returnUserID = -1
- private var aChannelNum = 0
- private var startAChannel = 0
- private var dChannelNum = 0
- private var startDChannel = 0
- private var isPreviewSuccess = false
- private lateinit var params: ArrayList
- private lateinit var regionViewModel: RegionViewModel
-
- override fun initData() {
- params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!!
-
- regionViewModel = ViewModelProvider(this)[RegionViewModel::class.java]
- regionViewModel.postResult.observe(this) {
- if (it.code == 200) {
- "区域配置成功".show(this)
- finish()
- }
- }
- }
-
- override fun initEvent() {
- openCameraButton.setOnClickListener {
- openHikVisionCamera(params[0], params[1])
- }
-
- closeCameraButton.setOnClickListener {
- if (!SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlay_Stop_jni(previewHandle)) {
- return@setOnClickListener
- }
- previewHandle = -1
- isPreviewSuccess = false
-
- regionView.clearRoutePath()
- }
-
- configButton.setOnClickListener {
- val region = regionView.getConfirmedPoints()
- val data = region.reformatFloatArray()
-
- //发送数据的时候需要断开视频
- regionViewModel.postRegion("11,12", "#FF0000", data)
- }
- }
-
- override fun initLayoutView(): Int = R.layout.activity_video_region
-
- override fun observeRequestState() {
-
- }
-
- override fun setupTopBarLayout() {
- ImmersionBar.with(this).statusBarDarkFont(false)
- .statusBarColor(R.color.mainThemeColor).init()
- initLayoutImmersionBar(rootView)
-
- leftBackView.setOnClickListener { finish() }
- titleView.text = "区域规划"
- rightOptionView.text = "重画"
- rightOptionView.setOnClickListener {
- regionView.clearRoutePath()
- }
- }
-
- 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(
- host, port, LocaleConstant.HK_NET_USERNAME, LocaleConstant.HK_NET_PASSWORD
- )
- if (deviceItem.m_szDevName.isEmpty()) {
- deviceItem.m_szDevName = deviceItem.m_struNetInfo.m_szIp
- }
-
- val loginV40Jna = SDKGuider.g_sdkGuider.m_comDMGuider.login_v40_jna(
- deviceItem.m_szDevName, deviceItem.m_struNetInfo
- )
- if (loginV40Jna) {
- //配置设备通道
- try {
- val deviceInfo = SDKGuider.g_sdkGuider.m_comDMGuider.devList[0]
- returnUserID = deviceInfo.m_lUserID
-
- aChannelNum = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byChanNum.toInt()
- startAChannel =
- deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byStartChan.toInt()
-
- dChannelNum = deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byIPChanNum +
- deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byHighDChanNum * 256
- startDChannel =
- deviceInfo.m_struDeviceInfoV40_jna.struDeviceV30.byStartChan.toInt()
-
- var iAnalogStartChan = startAChannel
- var iDigitalStartChan = startDChannel
-
- val channelList = ArrayList()
-
- for (i in 0 until aChannelNum) {
- channelList.add("ACamera_$iAnalogStartChan")
- iAnalogStartChan++
- }
-
- for (i in 0 until dChannelNum) {
- channelList.add("DCamera_$iDigitalStartChan")
- iDigitalStartChan++
- }
- selectChannel = Integer.valueOf(channelList[0].getChannel())
-
- val streamList = ArrayList()
- streamList.add("main_stream")
- streamList.add("sub_stream")
- streamList.add("third_stream")
-
- //开始预览
- if (previewHandle != -1) {
- SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlay_Stop_jni(previewHandle)
- }
- val strutPlayInfo = NET_DVR_PREVIEWINFO()
- strutPlayInfo.lChannel = selectChannel
- strutPlayInfo.dwStreamType = 1
- strutPlayInfo.bBlocked = 1
- strutPlayInfo.hHwnd = videoSurfaceView.holder
- previewHandle = SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlay_V40_jni(
- returnUserID, strutPlayInfo, null
- )
- if (previewHandle < 0) {
- Log.d(
- kTag,
- "configDevice: NET_DVR_RealPlay_V40 fail, Err:${MessageCodeHub.getErrorCode()}"
- )
- return
- }
- isPreviewSuccess = true
- } catch (e: IndexOutOfBoundsException) {
- e.printStackTrace()
- }
- }
- }
-
- override fun surfaceCreated(holder: SurfaceHolder) {
- videoSurfaceView.holder.setFormat(PixelFormat.TRANSLUCENT)
- if (-1 == previewHandle) {
- return
- }
- val surface = holder.surface
- if (surface.isValid) {
- if (-1 == SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlaySurfaceChanged_jni(
- previewHandle, 0, holder
- )
- ) {
- Log.d(kTag, "surfaceCreated: ${MessageCodeHub.getErrorCode()}")
- }
- }
- }
-
- override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-
- }
-
- override fun surfaceDestroyed(holder: SurfaceHolder) {
- if (-1 == previewHandle) {
- return
- }
- if (holder.surface.isValid) {
- if (-1 == SDKGuider.g_sdkGuider.m_comPreviewGuider.RealPlaySurfaceChanged_jni(
- previewHandle, 0, null
- )
- ) {
- Log.d(kTag, "surfaceCreated: ${MessageCodeHub.getErrorCode()}")
- }
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_hikvision.xml b/app/src/main/res/layout/activity_hikvision.xml
index 8b4f9fc..0771e04 100644
--- a/app/src/main/res/layout/activity_hikvision.xml
+++ b/app/src/main/res/layout/activity_hikvision.xml
@@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
-
+
-
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/dp_7">
+
+
+
+
+
-
-
-
-
-
-
+ android:text="配置区域范围" />
diff --git a/app/src/main/res/layout/activity_video_region.xml b/app/src/main/res/layout/activity_video_region.xml
deleted file mode 100644
index 35a7996..0000000
--- a/app/src/main/res/layout/activity_video_region.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file