|
@@ -6,12 +6,9 @@ import androidx.core.content.edit
|
|
|
import androidx.lifecycle.ViewModel
|
|
|
import androidx.lifecycle.viewModelScope
|
|
|
import cn.sagacloud.cadengine.OkhttpUtil
|
|
|
-import com.framework.app.DEVICE_ID
|
|
|
-import com.framework.app.IP
|
|
|
+import com.framework.app.*
|
|
|
import com.framework.app.http.FileInfo
|
|
|
import com.framework.app.http.FileUploadInfo
|
|
|
-import com.framework.app.pathDownloadMap
|
|
|
-import com.framework.app.timestamp
|
|
|
import com.framework.app.tools.md5
|
|
|
import com.framework.app.tools.toBytes
|
|
|
import com.framework.mvvm.model.data.*
|
|
@@ -92,11 +89,16 @@ class AdmViewModel(private val repository: AdmRepository) : ViewModel() {
|
|
|
groupCode = "BR",
|
|
|
buildingId = building.id,
|
|
|
uploadFlag = sp.getString(DEVICE_ID, "") ?: "",
|
|
|
- lastDownloadTime = sp.getString(timestamp, "") ?: ""
|
|
|
+ bdtpDownloadTs = sp.getLong("${building.buildingId}.$BDTP_TS", 0L),
|
|
|
+ admDownloadTs = sp.getLong("${building.buildingId}.$ADM_TS", 0L)
|
|
|
)
|
|
|
) {
|
|
|
- println("downloadBuilding save buildingId and Timestamp -> ${it.buildingId}, ${it.timestamp}")
|
|
|
- sp.edit { putString(it.buildingId, it.timestamp) }
|
|
|
+ Log.e(
|
|
|
+ "downloadBuilding",
|
|
|
+ "bdtpDownloadTs:${it.bdtpDownloadTs}, admDownloadTs:${it.admDownloadTs}"
|
|
|
+ )
|
|
|
+ sp.edit { putLong("${it.buildingId}.$BDTP_TS", it.bdtpDownloadTs) }
|
|
|
+ sp.edit { putLong("${it.buildingId}.$ADM_TS", it.admDownloadTs) }
|
|
|
}
|
|
|
}
|
|
|
|