xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Browse Source 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
	vtm
This commit is contained in:
squallzhjch
2023-08-30 14:47:00 +08:00
parent 9fed02564c 4c53144549
commit f5e6a87b9b
13 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
View File

@@ -443,6 +443,8 @@ class ImportPreProcess {
referenceEntity.table = renderEntity.table
referenceEntity.enable = renderEntity.enable
referenceEntity.taskId = renderEntity.taskId
referenceEntity.zoomMin = renderEntity.zoomMin
referenceEntity.zoomMax = renderEntity.zoomMax
// 与原数据使用相同的geometry
referenceEntity.geometry = renderEntity.geometry.toString()
referenceEntity.properties["qi_table"] = renderEntity.table

1
app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
View File

@@ -14,6 +14,7 @@ import com.navinfo.omqs.bean.SysUserBean
import com.navinfo.omqs.http.DefaultResponse
import com.navinfo.omqs.tools.FileManager.Companion.FileUploadStatus
import com.navinfo.omqs.util.DateTimeUtil
import com.navinfo.omqs.util.FileUtils
import io.realm.Realm
import kotlinx.coroutines.*
import java.util.*