diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 5a7b2af..642eb6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -47,7 +47,7 @@ // const val SERVER_BASE_URL = "http://123.60.215.216:8065/api" const val SERVER_BASE_URL = "http://111.198.10.15:22006" - const val AI_BASE_URL = "http://192.168.10.138:5000" + const val AI_BASE_URL = "http://192.168.10.142:5000" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val AI_SERVER_CONFIG = "aiServerConfig" @@ -69,19 +69,19 @@ //施工交底 val START_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x04, 0x00, 0x98.toByte()) val END_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x05, 0x00, 0x99.toByte()) //作业前检测 val START_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x06, 0x00, 0x9A.toByte()) val END_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x09, 0x00, 0x9D.toByte()) //劳保检测 val START_SUPPLIES_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x01, 0x00, 0x93.toByte()) val START_VIDEO_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x0B, 0x00, 0x9F.toByte()) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 5a7b2af..642eb6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -47,7 +47,7 @@ // const val SERVER_BASE_URL = "http://123.60.215.216:8065/api" const val SERVER_BASE_URL = "http://111.198.10.15:22006" - const val AI_BASE_URL = "http://192.168.10.138:5000" + const val AI_BASE_URL = "http://192.168.10.142:5000" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val AI_SERVER_CONFIG = "aiServerConfig" @@ -69,19 +69,19 @@ //施工交底 val START_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x04, 0x00, 0x98.toByte()) val END_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x05, 0x00, 0x99.toByte()) //作业前检测 val START_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x06, 0x00, 0x9A.toByte()) val END_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x09, 0x00, 0x9D.toByte()) //劳保检测 val START_SUPPLIES_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x01, 0x00, 0x93.toByte()) val START_VIDEO_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x0B, 0x00, 0x9F.toByte()) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt index bc58027..b597348 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt @@ -4,7 +4,7 @@ companion object { const val STATUS_CONNECT_SUCCESS: Byte = 1 //连接成功 const val STATUS_CONNECT_CLOSED: Byte = 0 //关闭连接 - const val STATUS_CONNECT_ERROR: Byte = 0 //连接失败 + const val STATUS_CONNECT_ERROR: Byte = -1 //连接失败 } /** diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 5a7b2af..642eb6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -47,7 +47,7 @@ // const val SERVER_BASE_URL = "http://123.60.215.216:8065/api" const val SERVER_BASE_URL = "http://111.198.10.15:22006" - const val AI_BASE_URL = "http://192.168.10.138:5000" + const val AI_BASE_URL = "http://192.168.10.142:5000" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val AI_SERVER_CONFIG = "aiServerConfig" @@ -69,19 +69,19 @@ //施工交底 val START_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x04, 0x00, 0x98.toByte()) val END_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x05, 0x00, 0x99.toByte()) //作业前检测 val START_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x06, 0x00, 0x9A.toByte()) val END_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x09, 0x00, 0x9D.toByte()) //劳保检测 val START_SUPPLIES_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x01, 0x00, 0x93.toByte()) val START_VIDEO_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x0B, 0x00, 0x9F.toByte()) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt index bc58027..b597348 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt @@ -4,7 +4,7 @@ companion object { const val STATUS_CONNECT_SUCCESS: Byte = 1 //连接成功 const val STATUS_CONNECT_CLOSED: Byte = 0 //关闭连接 - const val STATUS_CONNECT_ERROR: Byte = 0 //连接失败 + const val STATUS_CONNECT_ERROR: Byte = -1 //连接失败 } /** diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt index fde4307..0506fb7 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt @@ -18,6 +18,7 @@ override fun channelInactive(ctx: ChannelHandlerContext) { super.channelInactive(ctx) Log.e(kTag, "channelInactive: 连接断开") + listener?.onServiceStatusConnectChanged(ISocketListener.STATUS_CONNECT_CLOSED) } override fun channelRead0(ctx: ChannelHandlerContext, data: ByteArray?) { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 5a7b2af..642eb6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -47,7 +47,7 @@ // const val SERVER_BASE_URL = "http://123.60.215.216:8065/api" const val SERVER_BASE_URL = "http://111.198.10.15:22006" - const val AI_BASE_URL = "http://192.168.10.138:5000" + const val AI_BASE_URL = "http://192.168.10.142:5000" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val AI_SERVER_CONFIG = "aiServerConfig" @@ -69,19 +69,19 @@ //施工交底 val START_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x04, 0x00, 0x98.toByte()) val END_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x05, 0x00, 0x99.toByte()) //作业前检测 val START_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x06, 0x00, 0x9A.toByte()) val END_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x09, 0x00, 0x9D.toByte()) //劳保检测 val START_SUPPLIES_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x01, 0x00, 0x93.toByte()) val START_VIDEO_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x0B, 0x00, 0x9F.toByte()) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt index bc58027..b597348 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt @@ -4,7 +4,7 @@ companion object { const val STATUS_CONNECT_SUCCESS: Byte = 1 //连接成功 const val STATUS_CONNECT_CLOSED: Byte = 0 //关闭连接 - const val STATUS_CONNECT_ERROR: Byte = 0 //连接失败 + const val STATUS_CONNECT_ERROR: Byte = -1 //连接失败 } /** diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt index fde4307..0506fb7 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt @@ -18,6 +18,7 @@ override fun channelInactive(ctx: ChannelHandlerContext) { super.channelInactive(ctx) Log.e(kTag, "channelInactive: 连接断开") + listener?.onServiceStatusConnectChanged(ISocketListener.STATUS_CONNECT_CLOSED) } override fun channelRead0(ctx: ChannelHandlerContext, data: ByteArray?) { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt index 9e88cc7..00b25a5 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt @@ -34,15 +34,6 @@ private set private var reconnectIntervalTime: Long = 15000 //重连的时间 - //重连时间 - fun setReconnectNum(reconnectNum: Int) { - this.reconnectNum = reconnectNum - } - - fun setReconnectIntervalTime(reconnectIntervalTime: Long) { - this.reconnectIntervalTime = reconnectIntervalTime - } - fun setSocketListener(listener: ISocketListener?) { this.listener = listener } @@ -115,7 +106,6 @@ e.printStackTrace() } finally { connectStatus = false - listener?.onServiceStatusConnectChanged(ISocketListener.STATUS_CONNECT_CLOSED) //STATUS_CONNECT_CLOSED 这我自己定义的 接口标识 if (null != channelFuture) { if (channelFuture.channel() != null && channelFuture.channel().isOpen) { channelFuture.channel().close() diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 5a7b2af..642eb6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -47,7 +47,7 @@ // const val SERVER_BASE_URL = "http://123.60.215.216:8065/api" const val SERVER_BASE_URL = "http://111.198.10.15:22006" - const val AI_BASE_URL = "http://192.168.10.138:5000" + const val AI_BASE_URL = "http://192.168.10.142:5000" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val AI_SERVER_CONFIG = "aiServerConfig" @@ -69,19 +69,19 @@ //施工交底 val START_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x04, 0x00, 0x98.toByte()) val END_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x05, 0x00, 0x99.toByte()) //作业前检测 val START_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x06, 0x00, 0x9A.toByte()) val END_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x09, 0x00, 0x9D.toByte()) //劳保检测 val START_SUPPLIES_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x01, 0x00, 0x93.toByte()) val START_VIDEO_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x0B, 0x00, 0x9F.toByte()) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt index bc58027..b597348 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt @@ -4,7 +4,7 @@ companion object { const val STATUS_CONNECT_SUCCESS: Byte = 1 //连接成功 const val STATUS_CONNECT_CLOSED: Byte = 0 //关闭连接 - const val STATUS_CONNECT_ERROR: Byte = 0 //连接失败 + const val STATUS_CONNECT_ERROR: Byte = -1 //连接失败 } /** diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt index fde4307..0506fb7 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt @@ -18,6 +18,7 @@ override fun channelInactive(ctx: ChannelHandlerContext) { super.channelInactive(ctx) Log.e(kTag, "channelInactive: 连接断开") + listener?.onServiceStatusConnectChanged(ISocketListener.STATUS_CONNECT_CLOSED) } override fun channelRead0(ctx: ChannelHandlerContext, data: ByteArray?) { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt index 9e88cc7..00b25a5 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt @@ -34,15 +34,6 @@ private set private var reconnectIntervalTime: Long = 15000 //重连的时间 - //重连时间 - fun setReconnectNum(reconnectNum: Int) { - this.reconnectNum = reconnectNum - } - - fun setReconnectIntervalTime(reconnectIntervalTime: Long) { - this.reconnectIntervalTime = reconnectIntervalTime - } - fun setSocketListener(listener: ISocketListener?) { this.listener = listener } @@ -115,7 +106,6 @@ e.printStackTrace() } finally { connectStatus = false - listener?.onServiceStatusConnectChanged(ISocketListener.STATUS_CONNECT_CLOSED) //STATUS_CONNECT_CLOSED 这我自己定义的 接口标识 if (null != channelFuture) { if (channelFuture.channel() != null && channelFuture.channel().isOpen) { channelFuture.channel().close() diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt index b33be84..6e309ec 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt @@ -33,10 +33,11 @@ override fun onServiceStatusConnectChanged(statusCode: Byte) { if (statusCode == ISocketListener.STATUS_CONNECT_SUCCESS) { - if (nettyClient.connectStatus) { - Log.d(kTag, "连接成功") - ConstructionCheckActivity.weakReferenceHandler.sendEmptyMessage(2024061801) - } + Log.d(kTag, "onServiceStatusConnectChanged: 连接成功") + ConstructionCheckActivity.weakReferenceHandler.sendEmptyMessage(2024061801) + } else { + Log.d(kTag, "onServiceStatusConnectChanged: 连接失败") + ConstructionCheckActivity.weakReferenceHandler.sendEmptyMessage(2024061802) } } diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 5a7b2af..642eb6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -47,7 +47,7 @@ // const val SERVER_BASE_URL = "http://123.60.215.216:8065/api" const val SERVER_BASE_URL = "http://111.198.10.15:22006" - const val AI_BASE_URL = "http://192.168.10.138:5000" + const val AI_BASE_URL = "http://192.168.10.142:5000" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val AI_SERVER_CONFIG = "aiServerConfig" @@ -69,19 +69,19 @@ //施工交底 val START_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x04, 0x00, 0x98.toByte()) val END_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x05, 0x00, 0x99.toByte()) //作业前检测 val START_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x06, 0x00, 0x9A.toByte()) val END_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x09, 0x00, 0x9D.toByte()) //劳保检测 val START_SUPPLIES_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x01, 0x00, 0x93.toByte()) val START_VIDEO_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x0B, 0x00, 0x9F.toByte()) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt index bc58027..b597348 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt @@ -4,7 +4,7 @@ companion object { const val STATUS_CONNECT_SUCCESS: Byte = 1 //连接成功 const val STATUS_CONNECT_CLOSED: Byte = 0 //关闭连接 - const val STATUS_CONNECT_ERROR: Byte = 0 //连接失败 + const val STATUS_CONNECT_ERROR: Byte = -1 //连接失败 } /** diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt index fde4307..0506fb7 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt @@ -18,6 +18,7 @@ override fun channelInactive(ctx: ChannelHandlerContext) { super.channelInactive(ctx) Log.e(kTag, "channelInactive: 连接断开") + listener?.onServiceStatusConnectChanged(ISocketListener.STATUS_CONNECT_CLOSED) } override fun channelRead0(ctx: ChannelHandlerContext, data: ByteArray?) { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt index 9e88cc7..00b25a5 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt @@ -34,15 +34,6 @@ private set private var reconnectIntervalTime: Long = 15000 //重连的时间 - //重连时间 - fun setReconnectNum(reconnectNum: Int) { - this.reconnectNum = reconnectNum - } - - fun setReconnectIntervalTime(reconnectIntervalTime: Long) { - this.reconnectIntervalTime = reconnectIntervalTime - } - fun setSocketListener(listener: ISocketListener?) { this.listener = listener } @@ -115,7 +106,6 @@ e.printStackTrace() } finally { connectStatus = false - listener?.onServiceStatusConnectChanged(ISocketListener.STATUS_CONNECT_CLOSED) //STATUS_CONNECT_CLOSED 这我自己定义的 接口标识 if (null != channelFuture) { if (channelFuture.channel() != null && channelFuture.channel().isOpen) { channelFuture.channel().close() diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt index b33be84..6e309ec 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt @@ -33,10 +33,11 @@ override fun onServiceStatusConnectChanged(statusCode: Byte) { if (statusCode == ISocketListener.STATUS_CONNECT_SUCCESS) { - if (nettyClient.connectStatus) { - Log.d(kTag, "连接成功") - ConstructionCheckActivity.weakReferenceHandler.sendEmptyMessage(2024061801) - } + Log.d(kTag, "onServiceStatusConnectChanged: 连接成功") + ConstructionCheckActivity.weakReferenceHandler.sendEmptyMessage(2024061801) + } else { + Log.d(kTag, "onServiceStatusConnectChanged: 连接失败") + ConstructionCheckActivity.weakReferenceHandler.sendEmptyMessage(2024061802) } } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt index 3981f5d..a631579 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt @@ -1,6 +1,7 @@ package com.casic.br.operationsite.view import android.content.Intent +import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -64,7 +65,11 @@ override fun initEvent() { binding.connectTcpButton.setOnClickListener { - SocketManager.get.connectTcpServer("192.168.154.158", LocaleConstant.TCP_PORT) + if (isConnected) { + SocketManager.get.close() + } else { + SocketManager.get.connectTcpServer("192.168.10.145", LocaleConstant.TCP_PORT) + } } binding.startCheckButton.setOnClickListener { @@ -226,6 +231,17 @@ override fun handleMessage(msg: Message): Boolean { isConnected = msg.what == 2024061801 + when (msg.what) { + 2024061801 -> { + binding.tcpStateView.setBackgroundColor(Color.GREEN) + binding.connectTcpButton.text = "断开" + } + + 2024061802 -> { + binding.tcpStateView.setBackgroundColor(Color.RED) + binding.connectTcpButton.text = "连接" + } + } return true } diff --git a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt index 5a7b2af..642eb6f 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/LocaleConstant.kt @@ -47,7 +47,7 @@ // const val SERVER_BASE_URL = "http://123.60.215.216:8065/api" const val SERVER_BASE_URL = "http://111.198.10.15:22006" - const val AI_BASE_URL = "http://192.168.10.138:5000" + const val AI_BASE_URL = "http://192.168.10.142:5000" const val DEVICE_CONTROLLER_URL = "https://gbs.ntvgbs.cn/login/" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val AI_SERVER_CONFIG = "aiServerConfig" @@ -69,19 +69,19 @@ //施工交底 val START_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x04, 0x00, 0x98.toByte()) val END_CONSTRUCTION_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x05, 0x00, 0x99.toByte()) //作业前检测 val START_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x06, 0x00, 0x9A.toByte()) val END_ENV_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x09, 0x00, 0x9D.toByte()) //劳保检测 val START_SUPPLIES_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x01, 0x00, 0x93.toByte()) val START_VIDEO_COMMAND = - byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x91.toByte(), 0x01, 0x00, 0x93.toByte()) + byteArrayOf(0xAA.toByte(), 0x01, 0x00, 0x93.toByte(), 0x0B, 0x00, 0x9F.toByte()) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt index bc58027..b597348 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/ISocketListener.kt @@ -4,7 +4,7 @@ companion object { const val STATUS_CONNECT_SUCCESS: Byte = 1 //连接成功 const val STATUS_CONNECT_CLOSED: Byte = 0 //关闭连接 - const val STATUS_CONNECT_ERROR: Byte = 0 //连接失败 + const val STATUS_CONNECT_ERROR: Byte = -1 //连接失败 } /** diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt index fde4307..0506fb7 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketChannelHandle.kt @@ -18,6 +18,7 @@ override fun channelInactive(ctx: ChannelHandlerContext) { super.channelInactive(ctx) Log.e(kTag, "channelInactive: 连接断开") + listener?.onServiceStatusConnectChanged(ISocketListener.STATUS_CONNECT_CLOSED) } override fun channelRead0(ctx: ChannelHandlerContext, data: ByteArray?) { diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt index 9e88cc7..00b25a5 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketClient.kt @@ -34,15 +34,6 @@ private set private var reconnectIntervalTime: Long = 15000 //重连的时间 - //重连时间 - fun setReconnectNum(reconnectNum: Int) { - this.reconnectNum = reconnectNum - } - - fun setReconnectIntervalTime(reconnectIntervalTime: Long) { - this.reconnectIntervalTime = reconnectIntervalTime - } - fun setSocketListener(listener: ISocketListener?) { this.listener = listener } @@ -115,7 +106,6 @@ e.printStackTrace() } finally { connectStatus = false - listener?.onServiceStatusConnectChanged(ISocketListener.STATUS_CONNECT_CLOSED) //STATUS_CONNECT_CLOSED 这我自己定义的 接口标识 if (null != channelFuture) { if (channelFuture.channel() != null && channelFuture.channel().isOpen) { channelFuture.channel().close() diff --git a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt index b33be84..6e309ec 100644 --- a/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/utils/tcp/SocketManager.kt @@ -33,10 +33,11 @@ override fun onServiceStatusConnectChanged(statusCode: Byte) { if (statusCode == ISocketListener.STATUS_CONNECT_SUCCESS) { - if (nettyClient.connectStatus) { - Log.d(kTag, "连接成功") - ConstructionCheckActivity.weakReferenceHandler.sendEmptyMessage(2024061801) - } + Log.d(kTag, "onServiceStatusConnectChanged: 连接成功") + ConstructionCheckActivity.weakReferenceHandler.sendEmptyMessage(2024061801) + } else { + Log.d(kTag, "onServiceStatusConnectChanged: 连接失败") + ConstructionCheckActivity.weakReferenceHandler.sendEmptyMessage(2024061802) } } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt index 3981f5d..a631579 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ConstructionCheckActivity.kt @@ -1,6 +1,7 @@ package com.casic.br.operationsite.view import android.content.Intent +import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -64,7 +65,11 @@ override fun initEvent() { binding.connectTcpButton.setOnClickListener { - SocketManager.get.connectTcpServer("192.168.154.158", LocaleConstant.TCP_PORT) + if (isConnected) { + SocketManager.get.close() + } else { + SocketManager.get.connectTcpServer("192.168.10.145", LocaleConstant.TCP_PORT) + } } binding.startCheckButton.setOnClickListener { @@ -226,6 +231,17 @@ override fun handleMessage(msg: Message): Boolean { isConnected = msg.what == 2024061801 + when (msg.what) { + 2024061801 -> { + binding.tcpStateView.setBackgroundColor(Color.GREEN) + binding.connectTcpButton.text = "断开" + } + + 2024061802 -> { + binding.tcpStateView.setBackgroundColor(Color.RED) + binding.connectTcpButton.text = "连接" + } + } return true } diff --git a/app/src/main/res/layout/activity_construction_check.xml b/app/src/main/res/layout/activity_construction_check.xml index 6ac7c74..8f85baa 100644 --- a/app/src/main/res/layout/activity_construction_check.xml +++ b/app/src/main/res/layout/activity_construction_check.xml @@ -44,6 +44,7 @@ android:textColor="@color/black" />