diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index af89afc..edc0ebe 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import android.view.ViewGroup import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.lifecycleScope import com.amap.api.maps.CoordinateConverter import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -38,6 +39,8 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import java.io.File @@ -116,7 +119,9 @@ val latitude = lat.toDouble() val longitude = lng.toDouble() if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) { - DataBaseManager.get.insertMapWellCache(well) + lifecycleScope.launch(Dispatchers.IO) { + DataBaseManager.get.insertMapWellCache(well) + } } } } @@ -138,7 +143,9 @@ endLat.toDouble(), endLng.toDouble() ) ) { - DataBaseManager.get.insertMapPipeCache(dot) + lifecycleScope.launch(Dispatchers.IO) { + DataBaseManager.get.insertMapPipeCache(dot) + } } } } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index af89afc..edc0ebe 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import android.view.ViewGroup import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.lifecycleScope import com.amap.api.maps.CoordinateConverter import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -38,6 +39,8 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import java.io.File @@ -116,7 +119,9 @@ val latitude = lat.toDouble() val longitude = lng.toDouble() if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) { - DataBaseManager.get.insertMapWellCache(well) + lifecycleScope.launch(Dispatchers.IO) { + DataBaseManager.get.insertMapWellCache(well) + } } } } @@ -138,7 +143,9 @@ endLat.toDouble(), endLng.toDouble() ) ) { - DataBaseManager.get.insertMapPipeCache(dot) + lifecycleScope.launch(Dispatchers.IO) { + DataBaseManager.get.insertMapPipeCache(dot) + } } } } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 82bef29..65e1f11 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -318,8 +318,6 @@ */ @GET("/pipeline/appList") suspend fun getPipeline( - @Header("token") token: String, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Header("token") token: String ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index af89afc..edc0ebe 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import android.view.ViewGroup import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.lifecycleScope import com.amap.api.maps.CoordinateConverter import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -38,6 +39,8 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import java.io.File @@ -116,7 +119,9 @@ val latitude = lat.toDouble() val longitude = lng.toDouble() if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) { - DataBaseManager.get.insertMapWellCache(well) + lifecycleScope.launch(Dispatchers.IO) { + DataBaseManager.get.insertMapWellCache(well) + } } } } @@ -138,7 +143,9 @@ endLat.toDouble(), endLng.toDouble() ) ) { - DataBaseManager.get.insertMapPipeCache(dot) + lifecycleScope.launch(Dispatchers.IO) { + DataBaseManager.get.insertMapPipeCache(dot) + } } } } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 82bef29..65e1f11 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -318,8 +318,6 @@ */ @GET("/pipeline/appList") suspend fun getPipeline( - @Header("token") token: String, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Header("token") token: String ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 4050067..646253a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -299,6 +299,6 @@ * 管线位置数据 */ suspend fun getPipeline(): String { - return api.getPipeline(AuthenticationHelper.token!!, 2000, 1) + return api.getPipeline(AuthenticationHelper.token!!) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index af89afc..edc0ebe 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import android.view.ViewGroup import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.lifecycleScope import com.amap.api.maps.CoordinateConverter import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -38,6 +39,8 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import java.io.File @@ -116,7 +119,9 @@ val latitude = lat.toDouble() val longitude = lng.toDouble() if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) { - DataBaseManager.get.insertMapWellCache(well) + lifecycleScope.launch(Dispatchers.IO) { + DataBaseManager.get.insertMapWellCache(well) + } } } } @@ -138,7 +143,9 @@ endLat.toDouble(), endLng.toDouble() ) ) { - DataBaseManager.get.insertMapPipeCache(dot) + lifecycleScope.launch(Dispatchers.IO) { + DataBaseManager.get.insertMapPipeCache(dot) + } } } } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 82bef29..65e1f11 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -318,8 +318,6 @@ */ @GET("/pipeline/appList") suspend fun getPipeline( - @Header("token") token: String, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Header("token") token: String ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 4050067..646253a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -299,6 +299,6 @@ * 管线位置数据 */ suspend fun getPipeline(): String { - return api.getPipeline(AuthenticationHelper.token!!, 2000, 1) + return api.getPipeline(AuthenticationHelper.token!!) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PipelineViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PipelineViewModel.kt index d82fa8e..88bbb92 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/PipelineViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/PipelineViewModel.kt @@ -20,10 +20,10 @@ val response = RetrofitServiceManager.getPipeline() val responseCode = response.getResponseCode() if (responseCode == 200) { - loadState.value = LoadState.Success lineResult.value = gson.fromJson( response, object : TypeToken() {}.type ) + loadState.value = LoadState.Success } else { loadState.value = LoadState.Fail } diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index af89afc..edc0ebe 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -11,6 +11,7 @@ import android.view.ViewGroup import androidx.core.content.FileProvider import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.lifecycleScope import com.amap.api.maps.CoordinateConverter import com.casic.app.smartwell.BuildConfig import com.casic.app.smartwell.R @@ -38,6 +39,8 @@ import com.pengxh.kt.lite.utils.SaveKeyValues import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.pengxh.kt.lite.widget.dialog.BottomActionSheet +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch import java.io.File @@ -116,7 +119,9 @@ val latitude = lat.toDouble() val longitude = lng.toDouble() if (CoordinateConverter.isAMapDataAvailable(latitude, longitude)) { - DataBaseManager.get.insertMapWellCache(well) + lifecycleScope.launch(Dispatchers.IO) { + DataBaseManager.get.insertMapWellCache(well) + } } } } @@ -138,7 +143,9 @@ endLat.toDouble(), endLng.toDouble() ) ) { - DataBaseManager.get.insertMapPipeCache(dot) + lifecycleScope.launch(Dispatchers.IO) { + DataBaseManager.get.insertMapPipeCache(dot) + } } } } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 82bef29..65e1f11 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -318,8 +318,6 @@ */ @GET("/pipeline/appList") suspend fun getPipeline( - @Header("token") token: String, - @Query("limit") limit: Int, - @Query("offset") offset: Int + @Header("token") token: String ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index 4050067..646253a 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -299,6 +299,6 @@ * 管线位置数据 */ suspend fun getPipeline(): String { - return api.getPipeline(AuthenticationHelper.token!!, 2000, 1) + return api.getPipeline(AuthenticationHelper.token!!) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/vm/PipelineViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PipelineViewModel.kt index d82fa8e..88bbb92 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/PipelineViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/PipelineViewModel.kt @@ -20,10 +20,10 @@ val response = RetrofitServiceManager.getPipeline() val responseCode = response.getResponseCode() if (responseCode == 200) { - loadState.value = LoadState.Success lineResult.value = gson.fromJson( response, object : TypeToken() {}.type ) + loadState.value = LoadState.Success } else { loadState.value = LoadState.Fail } diff --git a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index 4eb9050..34a7451 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -139,10 +139,10 @@ val response = RetrofitServiceManager.getWellList() val responseCode = response.getResponseCode() if (responseCode == 200) { - loadState.value = LoadState.Success totalWellModel.value = gson.fromJson( response, object : TypeToken() {}.type ) + loadState.value = LoadState.Success } else { loadState.value = LoadState.Fail }