소스 검색

feat merge

lihao1 3 년 전
부모
커밋
3625d64eba
1개의 변경된 파일4개의 추가작업 그리고 16개의 파일을 삭제
  1. 4 16
      demo/src/main/java/com/sybotan/android/demo/viewmodel/ChooseSpaceVM.kt

+ 4 - 16
demo/src/main/java/com/sybotan/android/demo/viewmodel/ChooseSpaceVM.kt

@@ -86,13 +86,8 @@ class ChooseSpaceVM(
                     projectId = projectId,
                     buildingId = buildingId,
                     floorId = floorId,
-                    state = "1",
-                    uploadFlag = null,
+                    state = 1,
                     valid = 1,
-                    creator = null,
-                    creationTime = null,
-                    modifier = null,
-                    modifiedTime = null,
                     objId = deviceId,
                     geomType = "polygon",
                     geom = gson.toJsonTree(geom),
@@ -100,7 +95,7 @@ class ChooseSpaceVM(
                 )
             } else {
                 entity.geom = gson.toJsonTree(geom)
-                entity.state = "1"
+                entity.state = 1
             }
             repo.insServeArea(entity)
             mActivity.finish()
@@ -224,17 +219,10 @@ class ChooseSpaceVM(
                         relValue = null,
                         objFrom = objFrom,
                         objTo = objto,
-                        createApp = null,
-                        updateApp = null,
-                        creator = null,
-                        creationTime = "",
-                        modifiedTime = "",
-                        modifier = null,
                         clientId = null,
                         clientDevice = null,
-                        uploadFlag = null,
-                        deliveryState = null,
-                        valid = 1, d2mState = null, objFromLocalId = null, objToLocalId = null, state = "1"
+                        deliveryState = -1,
+                        valid = 1, d2mState = -1, objFromLocalId = null, objToLocalId = null, state = 1
                     )
                     repo.insRelation(relEntity)
                 }