diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 86ede00..4c4455a 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentDeviceControllerBinding +import com.casic.br.operationsite.service.CameraInspectionService import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.view.DeviceControlActivity import com.casic.br.operationsite.vm.DeviceViewModel @@ -91,7 +92,7 @@ } binding.addPointButton.setOnClickListener { - + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.ADD_POINT_CODE) } binding.getPointsButton.setOnClickListener { diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 86ede00..4c4455a 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentDeviceControllerBinding +import com.casic.br.operationsite.service.CameraInspectionService import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.view.DeviceControlActivity import com.casic.br.operationsite.vm.DeviceViewModel @@ -91,7 +92,7 @@ } binding.addPointButton.setOnClickListener { - + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.ADD_POINT_CODE) } binding.getPointsButton.setOnClickListener { diff --git a/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt b/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt index ebdfd81..f052148 100644 --- a/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt +++ b/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt @@ -48,10 +48,6 @@ override fun handleMessage(msg: Message): Boolean { when (msg.what) { - LocaleConstant.CONNECT_TCP_CODE -> { - tcpClient.start() - } - LocaleConstant.QUERY_METHANE_STATE_CODE -> { tcpClient.sendMessage(CommandCreator.queryMethaneState()) } @@ -155,6 +151,10 @@ CommandCreator.setServerConfig(params[0].toString(), params[1].toString()) ) } + + LocaleConstant.CONNECT_TCP_CODE -> { + tcpClient.start() + } } return true } @@ -174,11 +174,11 @@ super.onCreate() val name = "${resources.getString(R.string.app_name)}前台服务" val channel = NotificationChannel( - "foreground_running_service_channel", name, NotificationManager.IMPORTANCE_HIGH + "socket_connection_service_channel", name, NotificationManager.IMPORTANCE_HIGH ) - channel.description = "Channel for Foreground Running Service" + channel.description = "Channel for socket connection service" notificationManager.createNotificationChannel(channel) - notificationBuilder = NotificationCompat.Builder(this, "foreground_running_service_channel") + notificationBuilder = NotificationCompat.Builder(this, "socket_connection_service_channel") .setSmallIcon(R.mipmap.ic_launcher) .setContentTitle("通讯服务连接中...") .setContentText("为降低被系统杀死的概率,请勿关闭此通知") diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 86ede00..4c4455a 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentDeviceControllerBinding +import com.casic.br.operationsite.service.CameraInspectionService import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.view.DeviceControlActivity import com.casic.br.operationsite.vm.DeviceViewModel @@ -91,7 +92,7 @@ } binding.addPointButton.setOnClickListener { - + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.ADD_POINT_CODE) } binding.getPointsButton.setOnClickListener { diff --git a/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt b/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt index ebdfd81..f052148 100644 --- a/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt +++ b/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt @@ -48,10 +48,6 @@ override fun handleMessage(msg: Message): Boolean { when (msg.what) { - LocaleConstant.CONNECT_TCP_CODE -> { - tcpClient.start() - } - LocaleConstant.QUERY_METHANE_STATE_CODE -> { tcpClient.sendMessage(CommandCreator.queryMethaneState()) } @@ -155,6 +151,10 @@ CommandCreator.setServerConfig(params[0].toString(), params[1].toString()) ) } + + LocaleConstant.CONNECT_TCP_CODE -> { + tcpClient.start() + } } return true } @@ -174,11 +174,11 @@ super.onCreate() val name = "${resources.getString(R.string.app_name)}前台服务" val channel = NotificationChannel( - "foreground_running_service_channel", name, NotificationManager.IMPORTANCE_HIGH + "socket_connection_service_channel", name, NotificationManager.IMPORTANCE_HIGH ) - channel.description = "Channel for Foreground Running Service" + channel.description = "Channel for socket connection service" notificationManager.createNotificationChannel(channel) - notificationBuilder = NotificationCompat.Builder(this, "foreground_running_service_channel") + notificationBuilder = NotificationCompat.Builder(this, "socket_connection_service_channel") .setSmallIcon(R.mipmap.ic_launcher) .setContentTitle("通讯服务连接中...") .setContentText("为降低被系统杀死的概率,请勿关闭此通知") 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 dd89794..f3be4c8 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 @@ -61,10 +61,10 @@ val GENDER = arrayListOf("男", "女") - const val TCP_PORT = 333 + const val TCP_PORT = 333 //安全树甲烷端口 + const val CAMERA_TCP_PORT = 52487 //安全树球机巡航点端口 const val PLAY_RTSP_CODE = 20241001 - const val CONNECT_TCP_CODE = 20251001 /** * Handler Request Code @@ -113,6 +113,12 @@ const val SET_BOARD_WIFI_CONFIG_RESPONSE_CODE = 20241014 const val SET_BOARD_SERVER_CONFIG_RESPONSE_CODE = 20241015 + const val CONNECT_TCP_CODE = 20251001 + const val CONNECT_CAMERA_TCP_CODE = 20251002 + const val ADD_POINT_CODE = 20251003 + const val DELETE_POINT_CODE = 20251004 + const val QUERY_POINT_CODE = 20251005 + /*** * SP Key * */ diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 86ede00..4c4455a 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -7,6 +7,7 @@ import android.view.ViewGroup import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.databinding.FragmentDeviceControllerBinding +import com.casic.br.operationsite.service.CameraInspectionService import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.view.DeviceControlActivity import com.casic.br.operationsite.vm.DeviceViewModel @@ -91,7 +92,7 @@ } binding.addPointButton.setOnClickListener { - + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.ADD_POINT_CODE) } binding.getPointsButton.setOnClickListener { diff --git a/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt b/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt index ebdfd81..f052148 100644 --- a/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt +++ b/app/src/main/java/com/casic/br/operationsite/service/SocketConnectionService.kt @@ -48,10 +48,6 @@ override fun handleMessage(msg: Message): Boolean { when (msg.what) { - LocaleConstant.CONNECT_TCP_CODE -> { - tcpClient.start() - } - LocaleConstant.QUERY_METHANE_STATE_CODE -> { tcpClient.sendMessage(CommandCreator.queryMethaneState()) } @@ -155,6 +151,10 @@ CommandCreator.setServerConfig(params[0].toString(), params[1].toString()) ) } + + LocaleConstant.CONNECT_TCP_CODE -> { + tcpClient.start() + } } return true } @@ -174,11 +174,11 @@ super.onCreate() val name = "${resources.getString(R.string.app_name)}前台服务" val channel = NotificationChannel( - "foreground_running_service_channel", name, NotificationManager.IMPORTANCE_HIGH + "socket_connection_service_channel", name, NotificationManager.IMPORTANCE_HIGH ) - channel.description = "Channel for Foreground Running Service" + channel.description = "Channel for socket connection service" notificationManager.createNotificationChannel(channel) - notificationBuilder = NotificationCompat.Builder(this, "foreground_running_service_channel") + notificationBuilder = NotificationCompat.Builder(this, "socket_connection_service_channel") .setSmallIcon(R.mipmap.ic_launcher) .setContentTitle("通讯服务连接中...") .setContentText("为降低被系统杀死的概率,请勿关闭此通知") 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 dd89794..f3be4c8 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 @@ -61,10 +61,10 @@ val GENDER = arrayListOf("男", "女") - const val TCP_PORT = 333 + const val TCP_PORT = 333 //安全树甲烷端口 + const val CAMERA_TCP_PORT = 52487 //安全树球机巡航点端口 const val PLAY_RTSP_CODE = 20241001 - const val CONNECT_TCP_CODE = 20251001 /** * Handler Request Code @@ -113,6 +113,12 @@ const val SET_BOARD_WIFI_CONFIG_RESPONSE_CODE = 20241014 const val SET_BOARD_SERVER_CONFIG_RESPONSE_CODE = 20241015 + const val CONNECT_TCP_CODE = 20251001 + const val CONNECT_CAMERA_TCP_CODE = 20251002 + const val ADD_POINT_CODE = 20251003 + const val DELETE_POINT_CODE = 20251004 + const val QUERY_POINT_CODE = 20251005 + /*** * SP Key * */ diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt index c1b3402..b6f3685 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlActivity.kt @@ -16,6 +16,7 @@ import com.casic.br.operationsite.fragments.DeviceControllerFragment import com.casic.br.operationsite.fragments.MethaneMonitorFragment import com.casic.br.operationsite.fragments.VoiceSettingsFragment +import com.casic.br.operationsite.service.CameraInspectionService import com.casic.br.operationsite.service.SocketConnectionService import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.VideoPlayerManager @@ -69,6 +70,10 @@ Intent(this, SocketConnectionService::class.java).apply { startService(this) } + + Intent(this, CameraInspectionService::class.java).apply { + startService(this) + } weakReferenceHandler = WeakReferenceHandler(this) binding.viewPager.adapter = TabPageViewAdapter(