浏览代码

@task: separate relation

bai 3 年之前
父节点
当前提交
fc50fb890b

+ 1 - 3
demo/src/main/java/com/framework/mvvm/model/vo/AdmRequest.kt

@@ -8,6 +8,4 @@ data class AdmRequest(
     val uploadFlag: String = "",      // 设备唯一标识
     val bdtpDownloadTs: Long = 0L,    // bdtp数据库下载同步时间戳
     val admDownloadTs: Long = 0L      // adm数据库下载同步时间戳
-)
-
-// 先下项目, 不传buildingId
+)

+ 6 - 2
demo/src/main/java/com/framework/mvvm/mv/AdmViewModel.kt

@@ -77,7 +77,11 @@ class AdmViewModel(private val repository: AdmRepository) : ViewModel() {
     /**
      *  下载建筑数据
      */
-    fun downloadBuilding(sp: SharedPreferences, block: (() -> Unit)? = null) {
+    fun downloadBuilding(
+        sp: SharedPreferences,
+        isOnlyRelation: Boolean = false,
+        block: (() -> Unit)? = null
+    ) {
         viewModelScope.launch(Dispatchers.IO) {
             val buildings = repository.getBuildings()
             println("downloadBuilding will download : ${buildings.size} $buildings")
@@ -87,7 +91,7 @@ class AdmViewModel(private val repository: AdmRepository) : ViewModel() {
                         userId = "bdtp",
                         projectId = building.projectId!!,
                         groupCode = "BR",
-                        buildingId = building.id,
+                        buildingId = if(isOnlyRelation) "" else building.id,
                         uploadFlag = sp.getString(DEVICE_ID, "") ?: "",
                         bdtpDownloadTs = sp.getLong("${building.buildingId}.$BDTP_TS", 0L),
                         admDownloadTs = sp.getLong("${building.buildingId}.$ADM_TS", 0L)

+ 2 - 0
demo/src/main/java/com/sybotan/android/demo/activities/PocActivity.kt

@@ -74,6 +74,8 @@ class PocActivity : BaseActivity(), DIAware {
                     }.create()
                 dialog.show()
             }
+            // 单独下载一边关系数据
+            mVm.downloadBuilding(sp, true)
         }
 
         uploadBtn.setOnClickListener {