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

Conflicts: app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
2023-10-30 10:34:42 +08:00
parent 1dc4e807cc 1c5a8f542b
commit db2ecd45be
11 changed files with 1521 additions and 1547 deletions
--- a/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryToolsKt.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryToolsKt.kt
@@ -49,7 +49,6 @@ class GeometryToolsKt {
                    }
                }
            }
-            println("YGeometry-time:" + (System.currentTimeMillis() - startTime))
        }

        /**
@@ -93,7 +92,6 @@ class GeometryToolsKt {
                    }
                }
            }
-            println("XGeometry-time:" + (System.currentTimeMillis() - startTime))
        }

        fun getMasterPoint(wkt: String): String {