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 a07dfa2..98f2892 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
@@ -4,7 +4,6 @@
import com.casic.br.operationsite.utils.AuthenticationHelper
import com.casic.br.operationsite.utils.LocaleConstant
import com.casic.br.operationsite.utils.RuntimeCache
-import com.google.gson.Gson
import com.google.gson.JsonObject
import com.pengxh.kt.lite.utils.RetrofitFactory
import com.pengxh.kt.lite.utils.SaveKeyValues
@@ -18,7 +17,6 @@
object RetrofitServiceManager {
private const val kTag = "RetrofitServiceManager"
- private val gson by lazy { Gson() }
private val api by lazy {
val httpConfig = SaveKeyValues.getValue(
@@ -143,7 +141,8 @@
lngGCJ02: String,
lngGPS: String,
deviceCode: String,
- projectId: String
+ projectId: String,
+ location: String
): String {
val param = JsonObject()
param.addProperty("latGPS", latGPS)
@@ -154,6 +153,7 @@
param.addProperty("lngGPS", lngGPS)
param.addProperty("deviceCode", deviceCode)
param.addProperty("projectId", projectId)
+ param.addProperty("location", location)
val requestBody = param.toString().toRequestBody(
"application/json;charset=UTF-8".toMediaType()
)
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 a07dfa2..98f2892 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
@@ -4,7 +4,6 @@
import com.casic.br.operationsite.utils.AuthenticationHelper
import com.casic.br.operationsite.utils.LocaleConstant
import com.casic.br.operationsite.utils.RuntimeCache
-import com.google.gson.Gson
import com.google.gson.JsonObject
import com.pengxh.kt.lite.utils.RetrofitFactory
import com.pengxh.kt.lite.utils.SaveKeyValues
@@ -18,7 +17,6 @@
object RetrofitServiceManager {
private const val kTag = "RetrofitServiceManager"
- private val gson by lazy { Gson() }
private val api by lazy {
val httpConfig = SaveKeyValues.getValue(
@@ -143,7 +141,8 @@
lngGCJ02: String,
lngGPS: String,
deviceCode: String,
- projectId: String
+ projectId: String,
+ location: String
): String {
val param = JsonObject()
param.addProperty("latGPS", latGPS)
@@ -154,6 +153,7 @@
param.addProperty("lngGPS", lngGPS)
param.addProperty("deviceCode", deviceCode)
param.addProperty("projectId", projectId)
+ param.addProperty("location", location)
val requestBody = param.toString().toRequestBody(
"application/json;charset=UTF-8".toMediaType()
)
diff --git a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt
index cd7a93f..7ab58ee 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt
@@ -198,7 +198,8 @@
binding.longitudeView.text.toString(),
"",
binding.deviceCodeView.text.toString(),
- RuntimeCache.projectId
+ RuntimeCache.projectId,
+ binding.locationView.text.toString()
)
}
}
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 a07dfa2..98f2892 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
@@ -4,7 +4,6 @@
import com.casic.br.operationsite.utils.AuthenticationHelper
import com.casic.br.operationsite.utils.LocaleConstant
import com.casic.br.operationsite.utils.RuntimeCache
-import com.google.gson.Gson
import com.google.gson.JsonObject
import com.pengxh.kt.lite.utils.RetrofitFactory
import com.pengxh.kt.lite.utils.SaveKeyValues
@@ -18,7 +17,6 @@
object RetrofitServiceManager {
private const val kTag = "RetrofitServiceManager"
- private val gson by lazy { Gson() }
private val api by lazy {
val httpConfig = SaveKeyValues.getValue(
@@ -143,7 +141,8 @@
lngGCJ02: String,
lngGPS: String,
deviceCode: String,
- projectId: String
+ projectId: String,
+ location: String
): String {
val param = JsonObject()
param.addProperty("latGPS", latGPS)
@@ -154,6 +153,7 @@
param.addProperty("lngGPS", lngGPS)
param.addProperty("deviceCode", deviceCode)
param.addProperty("projectId", projectId)
+ param.addProperty("location", location)
val requestBody = param.toString().toRequestBody(
"application/json;charset=UTF-8".toMediaType()
)
diff --git a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt
index cd7a93f..7ab58ee 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt
@@ -198,7 +198,8 @@
binding.longitudeView.text.toString(),
"",
binding.deviceCodeView.text.toString(),
- RuntimeCache.projectId
+ RuntimeCache.projectId,
+ binding.locationView.text.toString()
)
}
}
diff --git a/app/src/main/java/com/casic/br/operationsite/vm/TubeViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/TubeViewModel.kt
index 9ef1c71..dc3a655 100644
--- a/app/src/main/java/com/casic/br/operationsite/vm/TubeViewModel.kt
+++ b/app/src/main/java/com/casic/br/operationsite/vm/TubeViewModel.kt
@@ -27,11 +27,20 @@
lngGCJ02: String,
lngGPS: String,
deviceCode: String,
- projectId: String
+ projectId: String,
+ location: String
) = launch({
loadState.value = LoadState.Loading
val response = RetrofitServiceManager.install(
- latGPS, latGCJ02, operationUserId, imageUrl, lngGCJ02, lngGPS, deviceCode, projectId
+ latGPS,
+ latGCJ02,
+ operationUserId,
+ imageUrl,
+ lngGCJ02,
+ lngGPS,
+ deviceCode,
+ projectId,
+ location
)
when (response.getResponseCode()) {
200 -> loadState.value = LoadState.Success
@@ -47,7 +56,6 @@
})
-
fun getTubeGasHistory(
context: Context,
deviceCode: String,
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 a07dfa2..98f2892 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
@@ -4,7 +4,6 @@
import com.casic.br.operationsite.utils.AuthenticationHelper
import com.casic.br.operationsite.utils.LocaleConstant
import com.casic.br.operationsite.utils.RuntimeCache
-import com.google.gson.Gson
import com.google.gson.JsonObject
import com.pengxh.kt.lite.utils.RetrofitFactory
import com.pengxh.kt.lite.utils.SaveKeyValues
@@ -18,7 +17,6 @@
object RetrofitServiceManager {
private const val kTag = "RetrofitServiceManager"
- private val gson by lazy { Gson() }
private val api by lazy {
val httpConfig = SaveKeyValues.getValue(
@@ -143,7 +141,8 @@
lngGCJ02: String,
lngGPS: String,
deviceCode: String,
- projectId: String
+ projectId: String,
+ location: String
): String {
val param = JsonObject()
param.addProperty("latGPS", latGPS)
@@ -154,6 +153,7 @@
param.addProperty("lngGPS", lngGPS)
param.addProperty("deviceCode", deviceCode)
param.addProperty("projectId", projectId)
+ param.addProperty("location", location)
val requestBody = param.toString().toRequestBody(
"application/json;charset=UTF-8".toMediaType()
)
diff --git a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt
index cd7a93f..7ab58ee 100644
--- a/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/view/InstallEquipmentActivity.kt
@@ -198,7 +198,8 @@
binding.longitudeView.text.toString(),
"",
binding.deviceCodeView.text.toString(),
- RuntimeCache.projectId
+ RuntimeCache.projectId,
+ binding.locationView.text.toString()
)
}
}
diff --git a/app/src/main/java/com/casic/br/operationsite/vm/TubeViewModel.kt b/app/src/main/java/com/casic/br/operationsite/vm/TubeViewModel.kt
index 9ef1c71..dc3a655 100644
--- a/app/src/main/java/com/casic/br/operationsite/vm/TubeViewModel.kt
+++ b/app/src/main/java/com/casic/br/operationsite/vm/TubeViewModel.kt
@@ -27,11 +27,20 @@
lngGCJ02: String,
lngGPS: String,
deviceCode: String,
- projectId: String
+ projectId: String,
+ location: String
) = launch({
loadState.value = LoadState.Loading
val response = RetrofitServiceManager.install(
- latGPS, latGCJ02, operationUserId, imageUrl, lngGCJ02, lngGPS, deviceCode, projectId
+ latGPS,
+ latGCJ02,
+ operationUserId,
+ imageUrl,
+ lngGCJ02,
+ lngGPS,
+ deviceCode,
+ projectId,
+ location
)
when (response.getResponseCode()) {
200 -> loadState.value = LoadState.Success
@@ -47,7 +56,6 @@
})
-
fun getTubeGasHistory(
context: Context,
deviceCode: String,
diff --git a/app/src/main/res/layout/activity_install_equipment.xml b/app/src/main/res/layout/activity_install_equipment.xml
index cef7cbc..6e16d28 100644
--- a/app/src/main/res/layout/activity_install_equipment.xml
+++ b/app/src/main/res/layout/activity_install_equipment.xml
@@ -141,6 +141,19 @@
+
+
+
+
+
+
+
+
+
+ android:text="安\u3000装" />
\ No newline at end of file