diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index e5bdea2..78c5c03 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,9 @@ /** * 设置区域 * */ - suspend fun setVideoRegion(position: ArrayList): String { + suspend fun setVideoRegion(deviceCode: String, position: ArrayList): String { val param = JsonObject() + param.addProperty("deviceCode", deviceCode) param.addProperty("position", position.toJson()) val requestBody = param.toString().toRequestBody( diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index e5bdea2..78c5c03 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,9 @@ /** * 设置区域 * */ - suspend fun setVideoRegion(position: ArrayList): String { + suspend fun setVideoRegion(deviceCode: String, position: ArrayList): String { val param = JsonObject() + param.addProperty("deviceCode", deviceCode) param.addProperty("position", position.toJson()) val requestBody = param.toString().toRequestBody( 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 27e859e..e2a34cf 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 @@ -49,7 +49,7 @@ ) } - // const val SERVER_BASE_URL = "http://123.60.215.216:8065/api" +// const val SERVER_BASE_URL = "http://192.168.9.99:8085" const val SERVER_BASE_URL = "http://139.198.19.235:22006" //一体机DeviceMonitor程序TCP Server IP地址 diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index e5bdea2..78c5c03 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,9 @@ /** * 设置区域 * */ - suspend fun setVideoRegion(position: ArrayList): String { + suspend fun setVideoRegion(deviceCode: String, position: ArrayList): String { val param = JsonObject() + param.addProperty("deviceCode", deviceCode) param.addProperty("position", position.toJson()) val requestBody = param.toString().toRequestBody( 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 27e859e..e2a34cf 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 @@ -49,7 +49,7 @@ ) } - // const val SERVER_BASE_URL = "http://123.60.215.216:8065/api" +// const val SERVER_BASE_URL = "http://192.168.9.99:8085" const val SERVER_BASE_URL = "http://139.198.19.235:22006" //一体机DeviceMonitor程序TCP Server IP地址 diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index f6acb68..30fc847 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -201,7 +201,7 @@ binding.setVideoRegionButton.setOnClickListener { val region = binding.regionView.getConfirmedRegion() - regionViewModel.setVideoRegion(region) + regionViewModel.setVideoRegion("YTJ_010001", region) } binding.leftButton.setOnTouchListener { _, event -> diff --git a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt index e5bdea2..78c5c03 100644 --- a/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/br/operationsite/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,9 @@ /** * 设置区域 * */ - suspend fun setVideoRegion(position: ArrayList): String { + suspend fun setVideoRegion(deviceCode: String, position: ArrayList): String { val param = JsonObject() + param.addProperty("deviceCode", deviceCode) param.addProperty("position", position.toJson()) val requestBody = param.toString().toRequestBody( 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 27e859e..e2a34cf 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 @@ -49,7 +49,7 @@ ) } - // const val SERVER_BASE_URL = "http://123.60.215.216:8065/api" +// const val SERVER_BASE_URL = "http://192.168.9.99:8085" const val SERVER_BASE_URL = "http://139.198.19.235:22006" //一体机DeviceMonitor程序TCP Server IP地址 diff --git a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt index f6acb68..30fc847 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/DeviceControlByNativeActivity.kt @@ -201,7 +201,7 @@ binding.setVideoRegionButton.setOnClickListener { val region = binding.regionView.getConfirmedRegion() - regionViewModel.setVideoRegion(region) + regionViewModel.setVideoRegion("YTJ_010001", region) } binding.leftButton.setOnTouchListener { _, event -> diff --git a/app/src/main/java/com/casic/br/operationsite/vm/RegionViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/RegionViewModel.kt index 721eab8..add0784 100644 --- a/app/src/main/java/com/casic/br/operationsite/vm/RegionViewModel.kt +++ b/app/src/main/java/com/casic/br/operationsite/vm/RegionViewModel.kt @@ -10,8 +10,8 @@ val setVideoRegionResult = MutableLiveData() - fun setVideoRegion(position: ArrayList) = launch({ - val response = RetrofitServiceManager.setVideoRegion(position) + fun setVideoRegion(deviceCode: String, position: ArrayList) = launch({ + val response = RetrofitServiceManager.setVideoRegion(deviceCode, position) setVideoRegionResult.value = response.getResponseCode() == 200 }, { it.printStackTrace()