Преглед на файлове

@task: not upload if nothing

bai преди 3 години
родител
ревизия
888d894b2f

+ 11 - 0
demo/src/main/java/com/framework/mvvm/model/repository/AdmRepository.kt

@@ -422,10 +422,13 @@ class AdmRepository(
 
             val pipes =
                 pipeDao.getPipeByBuildingId(buildingId).filter { it.state == 0 || it.state == 1 }
+
             val files =
                 fileDao.getFileByBuildingId(buildingId).filter { it.state == 0 || it.state == 1 }
+
             val spaces =
                 spaceDao.getSpaceByBuildingId(buildingId).filter { it.state == 0 || it.state == 1 }
+
             val qrCodes = qrCodeDao.getQrCodeByBuildingId(buildingId)
                 .filter { it.state == 0 || it.state == 1 }
 
@@ -447,6 +450,14 @@ class AdmRepository(
             val areas = serveAreaDao.getAreasByBuildingId(buildingId)
                 .filter { it.state == 0 || it.state == 1 }
 
+            if (pipes.isEmpty() && files.isEmpty() && spaces.isEmpty()
+                && qrCodes.isEmpty() && objects.isEmpty() && relations.isEmpty()
+                && problemArchs.isEmpty() && problemEquips.isEmpty() && areas.isEmpty()
+            ) {
+                Log.e("uploadBuilding","nothing to upload")
+                return
+            }
+
             val clientId = sp.getString(CLIENT_ID, "") ?: ""
 
             val jobId = IdUtil.simpleUUID()

+ 1 - 0
demo/src/main/java/com/framework/mvvm/mv/AdmViewModel.kt

@@ -70,6 +70,7 @@ class AdmViewModel(private val repository: AdmRepository) : ViewModel() {
     fun uploadBuilding(block: (() -> Unit)? = null) {
         viewModelScope.launch(Dispatchers.IO) {
             val buildings = repository.getBuildings()
+            if (buildings.isEmpty()) return@launch
             for (building in buildings) {
                 repository.uploadBuilding(
                     userId = "bdtp",