From e4e8866ad673873fad58ac832e4d7eeddbbe6fa0 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 21 Apr 2023 15:06:19 +0800 Subject: [PATCH 1/4] merge code --- .../omqs/ui/activity/map/MainActivity.kt | 9 +++--- .../omqs/ui/activity/map/MainViewModel.kt | 6 ++-- .../collect/library/map/NIMapController.kt | 4 +-- .../map/handler/LayerManagerHandler.kt | 28 +++++++++---------- .../map/handler/LocationLayerHandler.kt | 4 +-- 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index afd789f6..26fd39ad 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -47,7 +47,8 @@ class MainActivity : BaseActivity() { this, binding.mainActivityMap, null, - Constant.MAP_PATH + Constant.MAP_PATH, + Constant.DATA_PATH+ SystemConstant.USER_ID+"/trace.sqlite" ) //关联生命周期 binding.lifecycleOwner = this @@ -69,8 +70,7 @@ class MainActivity : BaseActivity() { binding!!.viewModel!!.addSaveTrace(it) binding!!.viewModel!!.startSaveTraceThread(this) }) - //显示轨迹图层 - mapController.layerManagerHandler.showNiLocationLayer(Constant.DATA_PATH+ SystemConstant.USER_ID+"/trace.sqlite") + mapController.layerManagerHandler.showNiLocationLayer() } override fun onPause() { @@ -100,7 +100,8 @@ class MainActivity : BaseActivity() { * 打开相机预览 */ fun openCamera() { - binding!!.viewModel!!.onClickCameraButton(this) + //显示轨迹图层 + //binding!!.viewModel!!.onClickCameraButton(this) } /** diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index bc08d68e..4f278673 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -17,6 +17,7 @@ import com.navinfo.omqs.ui.dialog.CommonDialog import com.navinfo.omqs.ui.manager.TakePhotoManager import dagger.hilt.android.lifecycle.HiltViewModel import io.realm.RealmSet +import org.oscim.core.GeoPoint import org.videolan.libvlc.LibVlcUtil import java.util.* import javax.inject.Inject @@ -84,10 +85,7 @@ class MainViewModel @Inject constructor( if(niLocationList!=null&&niLocationList.size>0){ var niLocation = niLocationList[0] - var doubleArray = doubleArrayOf() - doubleArray[0] = niLocation.longitude - doubleArray[1] = niLocation.latitude - val geometry = GeometryTools.createGeometry(doubleArray) + val geometry = GeometryTools.createGeometry(GeoPoint(niLocation.latitude,niLocation.longitude)) val tileX = RealmSet() GeometryToolsKt.getTileXByGeometry(geometry.toString(), tileX) val tileY = RealmSet() diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapController.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapController.kt index 74c6bc92..8a172a47 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapController.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/NIMapController.kt @@ -25,9 +25,9 @@ class NIMapController { lateinit var viewportHandler: ViewportHandler lateinit var measureLayerHandler: MeasureLayerHandler - fun init(context: AppCompatActivity, mapView: NIMapView, options: NIMapOptions? = null, mapPath: String) { + fun init(context: AppCompatActivity, mapView: NIMapView, options: NIMapOptions? = null, mapPath: String, tracePath: String) { Constant.MAP_PATH = mapPath - layerManagerHandler = LayerManagerHandler(context, mapView) + layerManagerHandler = LayerManagerHandler(context, mapView, tracePath) locationLayerHandler = LocationLayerHandler(context, mapView) animationHandler = AnimationHandler(context, mapView) markerHandle = MarkHandler(context, mapView) diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt index b337e478..7546a491 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt @@ -45,11 +45,10 @@ import java.util.* /** * Layer 操作 */ -open class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView) : - BaseHandler(context, mapView) { +open class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePath: String) : BaseHandler(context, mapView) { private var baseGroupLayer // 用于盛放所有基础底图的图层组，便于统一管理 : GroupLayer? = null - + protected val mTracePath:String = tracePath /** * 默认文字颜色 */ @@ -101,6 +100,13 @@ open class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView) : //初始化之间数据图层 initQsRecordDataLayer() mMapView.vtmMap.updateMap() + + mapLifeNiLocationTileSource = MapLifeNiLocationTileSource(mContext, mTracePath) + + vectorNiLocationTileLayer = VectorTileLayer(mMapView.vtmMap, mapLifeNiLocationTileSource) + + labelNiLocationLayer = LabelLayer(mMapView.vtmMap, vectorNiLocationTileLayer, LabelTileLoaderHook(), 15) + // initMapLifeSource() } @@ -206,7 +212,7 @@ open class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView) : var list = mutableListOf() val realm = Realm.getDefaultInstance() realm.executeTransaction { - val objects =realm.where().findAll() + val objects = realm.where().findAll() list = realm.copyFromRealm(objects) } realm.close() @@ -515,18 +521,10 @@ open class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView) : } //显示轨迹图层 - fun showNiLocationLayer(dbName: String?) { - if (mapLifeNiLocationTileSource == null) { - mapLifeNiLocationTileSource = MapLifeNiLocationTileSource(mContext, dbName) + fun showNiLocationLayer() { + if(labelNiLocationLayer!=null){ + addLayer(labelNiLocationLayer, NIMapView.LAYER_GROUPS.VECTOR) } - if (vectorNiLocationTileLayer == null) { - vectorNiLocationTileLayer = VectorTileLayer(mMapView.vtmMap, mapLifeNiLocationTileSource) - } - if (labelNiLocationLayer == null) { - labelNiLocationLayer = - LabelLayer(mMapView.vtmMap, vectorNiLocationTileLayer, LabelTileLoaderHook(), 15) - } - addLayer(labelNiLocationLayer, NIMapView.LAYER_GROUPS.VECTOR) } //隐藏轨迹图层 diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LocationLayerHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LocationLayerHandler.kt index c23a35f8..5c65013b 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LocationLayerHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LocationLayerHandler.kt @@ -57,9 +57,7 @@ class LocationLayerHandler(context: AppCompatActivity, mapView: NIMapView) : Bas //获取定位类型、定位错误返回码，具体信息可参照类参考中BDLocation类中的说明 val errorCode = it.locType mCurrentLocation = it - mLocationLayer.setPosition( - it.latitude, it.longitude, it.radius - ) + mLocationLayer.setPosition(it.latitude, it.longitude, it.radius) Log.e("qj","location==${it.longitude}==errorCode===$errorCode===${it.locTypeDescription}") if(niLocationListener!=null){ getCurrentNiLocation()?.let { it1 -> niLocationListener.call(it1) } From 121cac3a278e58ec89806410acb1c52e0091428b Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Fri, 21 Apr 2023 15:07:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2Link=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/db/RealmOperateHelper.kt | 23 ++++++++++++++++-- .../personalcenter/PersonalCenterViewModel.kt | 3 ++- navinfo.jks | Bin 2066 -> 4095 bytes 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt index e4b1d608..899b4ea3 100644 --- a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt @@ -15,6 +15,7 @@ import org.locationtech.spatial4j.distance.DistanceUtils import org.oscim.core.GeoPoint import org.oscim.core.MercatorProjection import javax.inject.Inject +import kotlin.streams.toList class RealmOperateHelper() { @@ -28,18 +29,36 @@ class RealmOperateHelper() { * @param order 是否需要排序 * */ suspend fun queryLink(point: Point, buffer: Double = DEFAULT_BUFFER, bufferType: BUFFER_TYPE = DEFAULT_BUFFER_TYPE, order: Boolean = false): MutableList { + val result = mutableListOf() withContext(Dispatchers.IO) { val polygon = getPolygonFromPoint(point, buffer, bufferType) // 根据polygon查询相交的tile号 val tileXSet = mutableSetOf() + tileXSet.toString() GeometryToolsKt.getTileXByGeometry(polygon.toString(), tileXSet) val tileYSet = mutableSetOf() GeometryToolsKt.getTileYByGeometry(polygon.toString(), tileYSet) + // 对tileXSet和tileYSet查询最大最小值 + val xStart = tileXSet.stream().min(Comparator.naturalOrder()).orElse(null) + val xEnd = tileXSet.stream().max(Comparator.naturalOrder()).orElse(null) + val yStart = tileYSet.stream().min(Comparator.naturalOrder()).orElse(null) + val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null) // 查询realm中对应tile号的数据 - Realm.getDefaultInstance().where(RenderEntity::class.java).equalTo("table", "HAD_LINK") + val realmList = Realm.getDefaultInstance().where(RenderEntity::class.java) + .equalTo("table", "HAD_LINK") + .and() + .rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd") + .findAll() + // 将获取到的数据和查询的polygon做相交，只返回相交的数据 + val queryResult = realmList?.stream()?.filter { + polygon.intersects(GeometryTools.createGeometry(it.geometry)) + }?.toList() + queryResult?.let { + result.addAll(queryResult) + } } - return mutableListOf() + return result } private fun getPolygonFromPoint(point: Point, buffer: Double = DEFAULT_BUFFER, bufferType: BUFFER_TYPE = DEFAULT_BUFFER_TYPE): Polygon { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt index 1318e3fe..4ea75e6b 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt @@ -224,7 +224,8 @@ class PersonalCenterViewModel @Inject constructor( fun readRealmData() { viewModelScope.launch(Dispatchers.IO) { - realmOperateHelper.queryLink(GeometryTools.createPoint(115.685817,28.62759)) + val result = realmOperateHelper.queryLink(GeometryTools.createPoint(115.685817,28.62759)) + Log.d("xiaoyan", result.size.toString()) } } } \ No newline at end of file diff --git a/navinfo.jks b/navinfo.jks index 28de488bb1bb1cef36b6d6d3dd05025caf34a629..5be224fe00413796de7a972d577c0fa70494c10b 100644 GIT binary patch delta 2023 zcmVFvyYrlf9+t2%bwNStx8?N{oHZ!;9+3Zm)Gmg zg-yBY*e9l*%eiZ-+1o9?sU=;(^r#G7zUXxhaWu|ju5^5VXlab5${n~we%CYi40zR* zI}k1jW~NfS5@dCoQfO4H)sB9PydyJUj0 zy@k_LMg*Lba$5NSd!pcdRB6AuEI^>wK993$AQME8=~Gd07t4v zK8kcOwGRP*t+s4e+x2)P0?|m^>Qpj*CRgUal?%jIS!iB+M{qxCLjjX@crUJCO11Z- z|Mlo8%RwO85Ny%qgD%@PZtbWqv)S8+cxQBY9i_}!JRPY%)@(@{y$r{12>=#@SsvlQ2<>kUA^A`nj z%>(%9%>Z4ZtPQ}uQ(QZivlj_?vC5ibj##74H_=zQ0+`-)wj8>;JBPD7?ZrgW<5fM> zcg{5E)HLuL33ctXleTww+W&4=*%QP1VMyMS!3>N4n{>~6Zt@hq7khm_W;?6ex#{13 z*d3D>FNh<6^z6X-(JgCByc~mp1!77Rz%fnUnb^~T?@KxEeFvY5H48-n3A~0bqoNA_ zT&RYWTld9#WW~ zBWax!;hpuqeUP(rvrm42Q-WVHA%~>*}SKw zd{@cZQ(FJrVX<3m4}{{NVj)R3j*iXC^CqGM0!A5F-RtM)rZ@ZHAW5Rx4E@S9!hf1i z0v^rCh>w8%JJ23y`{9i7pSuRF%3@7luPOIS>1nf=v73F(q7=MnqUQK!5v@dj`BP`D zxxwFjO*1Dvuxo5`yd{|_ikn9(=?s`DaRn7kQ(@~A((Z9p5Kr?b4{r`4ND2^Tcb%`A zUR54Cmo1d7rHNr zjL!6GO~}CL&|2NguAzk83L>>EZQZc91~O^FD9w5MF`tl3*;xa(5DvgssAI4zvn7zA zBwU>=s(XZD^PF}hqPysrz!Q8(QTj`X@xUNkbpsIgo>yu_v`fGU7o0BL79#UkKj+ihF1_>&L zNQUHr*e^JtUE_zEJaZPr1Tdbu@lRc3T9qU*EShZmLP$+6vL2ISe_r?9 z{v7&2nuyWCAPjO1O%+PWF|+Fqa9Rz{^^6wbTrJE<8H zuorl(eh;gKNmK=)sxHE%BCnY&&}V@cLEc7!JAz0HSEq?mpcGhH^Xy!ie}aAENXOA|AtX#1jx+%1~GIl@x^r^~274!ms zbq)t40%Zm#xSJ@-pN$J3WJH@etl8T4VsT}0BI0@m1nWt9yU#tC@Q zD%$9WOs#`2HQm#~K#Hk|KrQ{cQ_qwbu*kZFipWR+G-!VUiGSqCcmiT967KSIXK;j7 zZgodDM9{LqYc4!x%av>7b)egXTk=|R9@t+)KCuk)2NbTm4ZER%fz_Nk+3<-8{hsy? Fum*k~rE>rP delta 43 zcmew_KS_Y+-`jt085kItfS7UfPxepjBAcDhX Date: Fri, 21 Apr 2023 16:42:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20Realm=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/db/RealmOperateHelper.kt | 91 +++++++++++++++++-- .../personalcenter/PersonalCenterViewModel.kt | 5 +- .../library/data/entity/RenderEntity.kt | 9 ++ .../collect/library/utils/GeometryTools.java | 15 +++ 4 files changed, 112 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt index 899b4ea3..ced6dcb2 100644 --- a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt @@ -26,9 +26,9 @@ class RealmOperateHelper() { * @param point 点位经纬度信息 * @param buffer 点位的外扩距离 * @param bufferType 点位外扩距离的单位： 米-Meter，像素-PIXEL - * @param order 是否需要排序 + * @param sort 是否需要排序 * */ - suspend fun queryLink(point: Point, buffer: Double = DEFAULT_BUFFER, bufferType: BUFFER_TYPE = DEFAULT_BUFFER_TYPE, order: Boolean = false): MutableList { + suspend fun queryLink(point: Point, buffer: Double = DEFAULT_BUFFER, bufferType: BUFFER_TYPE = DEFAULT_BUFFER_TYPE, sort: Boolean = false): MutableList { val result = mutableListOf() withContext(Dispatchers.IO) { val polygon = getPolygonFromPoint(point, buffer, bufferType) @@ -52,21 +52,100 @@ class RealmOperateHelper() { .findAll() // 将获取到的数据和查询的polygon做相交，只返回相交的数据 val queryResult = realmList?.stream()?.filter { - polygon.intersects(GeometryTools.createGeometry(it.geometry)) + polygon.intersects(it.wkt) }?.toList() queryResult?.let { result.addAll(queryResult) } + if (sort) { + result.clear() + result.addAll(sortRenderEntity(point, result)) + } + } + return result + } + /** + * 根据当前点位查询匹配的除Link外的其他要素数据 + * @param point 点位经纬度信息 + * @param buffer 点位的外扩距离 + * @param bufferType 点位外扩距离的单位： 米-Meter，像素-PIXEL + * @param sort 是否需要排序 + * */ + suspend fun queryElement(point: Point, buffer: Double = DEFAULT_BUFFER, bufferType: BUFFER_TYPE = DEFAULT_BUFFER_TYPE, sort: Boolean = false): MutableList { + val result = mutableListOf() + withContext(Dispatchers.IO) { + val polygon = getPolygonFromPoint(point, buffer, bufferType) + // 根据polygon查询相交的tile号 + val tileXSet = mutableSetOf() + tileXSet.toString() + GeometryToolsKt.getTileXByGeometry(polygon.toString(), tileXSet) + val tileYSet = mutableSetOf() + GeometryToolsKt.getTileYByGeometry(polygon.toString(), tileYSet) + + // 对tileXSet和tileYSet查询最大最小值 + val xStart = tileXSet.stream().min(Comparator.naturalOrder()).orElse(null) + val xEnd = tileXSet.stream().max(Comparator.naturalOrder()).orElse(null) + val yStart = tileYSet.stream().min(Comparator.naturalOrder()).orElse(null) + val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null) + // 查询realm中对应tile号的数据 + val realmList = Realm.getDefaultInstance().where(RenderEntity::class.java) + .notEqualTo("table", "HAD_LINK") + .and() + .rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd") + .findAll() + // 将获取到的数据和查询的polygon做相交，只返回相交的数据 + val queryResult = realmList?.stream()?.filter { + polygon.intersects(it.wkt) + }?.toList() + queryResult?.let { + result.addAll(queryResult) + } + if (sort) { + result.clear() + result.addAll(sortRenderEntity(point, result)) + } } return result } + /** + * 根据linkPid查询关联的要素（除去Link数据） + * @param point 点位经纬度信息 + * @param buffer 点位的外扩距离 + * @param bufferType 点位外扩距离的单位： 米-Meter，像素-PIXEL + * @param sort 是否需要排序 + * */ + suspend fun queryLinkByLinkPid(linkPid: String): MutableList { + val result = mutableListOf() + withContext(Dispatchers.IO) { + val realmList = Realm.getDefaultInstance().where(RenderEntity::class.java) + .notEqualTo("table", "HAD_LINK") + .and() + .equalTo("properties['LINK_PID']", linkPid) + .findAll() + result.addAll(realmList) + } + return result + } + + /** + * 根据给定的点位对数据排序 + * @param point 点位经纬度信息 + * @param unSortList 未排序的数据 + * @return 排序后的数据 + * */ + fun sortRenderEntity(point: Point, unSortList: MutableList): List { + val sortList = unSortList.stream().sorted { renderEntity, renderEntity2 -> + val near = point.distance(renderEntity.wkt) - point.distance(renderEntity2.wkt) + if (near<0) -1 else 1 + }.toList() + return sortList + } + private fun getPolygonFromPoint(point: Point, buffer: Double = DEFAULT_BUFFER, bufferType: BUFFER_TYPE = DEFAULT_BUFFER_TYPE): Polygon { // 首先计算当前点位的buffer组成的geometry val wkt: Polygon = if (bufferType == BUFFER_TYPE.METER) { // 如果单位是米 - // 计算米和地球角度之间的关系，在Spatial4J中，经度和纬度的单位是度，而不是米。因此，将距离从米转换为度需要使用一个转换因子，这个转换因子是由地球的周长和360度之间的比例计算得出的。 - // 在这个例子中，使用的转换因子是111000.0，这是因为地球的周长约为40075公里，而每个经度的距离大约是地球周长的1/360，因此每个经度的距离约为111.32公里 - val distanceDegrees = DistanceUtils.dist2Degrees(buffer, DistanceUtils.EARTH_MEAN_RADIUS_KM) * 111000.0 + val distanceDegrees = GeometryTools.convertDistanceToDegree(buffer, point.y) // 计算外扩矩形 BufferOp.bufferOp(point, distanceDegrees) as Polygon } else { // 如果单位是像素，需要根据当前屏幕像素计算出经纬度变化 diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt index 4ea75e6b..cfad6b4f 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt @@ -224,8 +224,9 @@ class PersonalCenterViewModel @Inject constructor( fun readRealmData() { viewModelScope.launch(Dispatchers.IO) { - val result = realmOperateHelper.queryLink(GeometryTools.createPoint(115.685817,28.62759)) - Log.d("xiaoyan", result.size.toString()) +// val result = realmOperateHelper.queryLink(GeometryTools.createPoint(115.685817,28.62759)) + val result = realmOperateHelper.queryLinkByLinkPid("84206617008217069") + Log.d("xiaoyan", result.toString()) } } } \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt index 2627658d..b4842cb2 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt @@ -6,6 +6,7 @@ import com.navinfo.collect.library.utils.GeometryToolsKt import io.realm.RealmDictionary import io.realm.RealmObject import io.realm.RealmSet +import io.realm.annotations.Ignore import io.realm.annotations.PrimaryKey import org.locationtech.jts.geom.Coordinate import org.locationtech.jts.geom.Geometry @@ -28,7 +29,15 @@ open class RenderEntity(): RealmObject() { // 根据geometry自动计算当前要素的x-tile和y-tile GeometryToolsKt.getTileXByGeometry(value, tileX) GeometryToolsKt.getTileYByGeometry(value, tileY) + // 根据传入的geometry文本，自动转换为Geometry对象 + try { + wkt = GeometryTools.createGeometry(value) + } catch (e: Exception) { + + } } + @Ignore + var wkt: Geometry? = null var properties: RealmDictionary = RealmDictionary() val tileX: RealmSet = RealmSet() // x方向的tile编码 val tileY: RealmSet = RealmSet() // y方向的tile编码 diff --git a/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java b/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java index 8f4c3411..e9cd2426 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java @@ -1566,4 +1566,19 @@ public class GeometryTools { return earthRadiusMeters * acos; // 最终结果 } + + /** + * 将平面坐标系中的距离（以米为单位）转换为地理坐标系中的角度（以度为单位） + * + * @param distance 平面坐标系中的距离（单位：米） + * @param latitude 点的纬度（单位：度） + * @return 对应的地理坐标系中的距离（单位：度） + */ + private static final double EARTH_RADIUS = 6371000.0; + public static double convertDistanceToDegree(double distance, double latitude) { + double radianDistance = distance / EARTH_RADIUS; + double radianLatitude = Math.toRadians(latitude); + double radianDegree = 2 * Math.asin(Math.sin(radianDistance / 2) / Math.cos(radianLatitude)); + return Math.toDegrees(radianDegree); + } } From 8e4f8459d59beacf8ac68483b2cb5085240d74c7 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 21 Apr 2023 17:20:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=B8=B2=E6=9F=93=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/navinfo/omqs/OMQSApplication.kt | 4 --- .../omqs/ui/activity/map/MainActivity.kt | 4 --- .../omqs/ui/activity/map/MainViewModel.kt | 2 +- .../src/main/assets/editormarker.xml | 19 +++++++++++ .../data/dao/impl/MapLifeDataBase.java | 8 +---- .../library/data/dao/impl}/TraceDataBase.java | 5 +-- .../library/data/handler/BaseDataHandler.kt | 6 ++-- .../data/handler/DataNiLocationHandler.kt | 11 ++++--- .../data/handler/DataProjectHandler.kt | 5 +-- .../map/handler/LayerManagerHandler.kt | 32 +++++++++++++------ .../map/source/MapLifeNiLocationDecoder.java | 2 +- .../MapLifeNiLocationTileDataSource.java | 7 ++-- .../source/MapLifeNiLocationTileSource.java | 2 ++ 13 files changed, 65 insertions(+), 42 deletions(-) rename {app/src/main/java/com/navinfo/omqs/db => collect-library/src/main/java/com/navinfo/collect/library/data/dao/impl}/TraceDataBase.java (98%) diff --git a/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt b/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt index 85afd8be..bd145e45 100644 --- a/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt +++ b/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt @@ -2,8 +2,6 @@ package com.navinfo.omqs import android.app.Application import android.util.Log -import com.navinfo.collect.library.data.dao.impl.MapLifeDataBase -import com.navinfo.omqs.db.TraceDataBase import com.navinfo.omqs.tools.FileManager import com.navinfo.omqs.ui.manager.TakePhotoManager import com.navinfo.omqs.util.NetUtils @@ -11,9 +9,7 @@ import dagger.hilt.android.HiltAndroidApp import org.videolan.vlc.Util import io.realm.Realm import io.realm.RealmConfiguration -import kotlinx.coroutines.launch import java.io.File -import java.math.BigInteger import java.security.MessageDigest @HiltAndroidApp diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index 26fd39ad..8312a50d 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -1,20 +1,16 @@ package com.navinfo.omqs.ui.activity.map import android.os.Bundle -import android.util.Log import androidx.activity.viewModels import androidx.core.view.WindowCompat import androidx.databinding.DataBindingUtil -import com.blankj.utilcode.util.ToastUtils import androidx.lifecycle.lifecycleScope -import androidx.lifecycle.viewModelScope import androidx.navigation.findNavController import com.navinfo.collect.library.map.NIMapController import com.navinfo.collect.library.map.handler.NiLocationListener import com.navinfo.omqs.Constant import com.navinfo.omqs.R import com.navinfo.omqs.databinding.ActivityMainBinding -import com.navinfo.omqs.db.TraceDataBase import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager import com.navinfo.omqs.system.SystemConstant import com.navinfo.omqs.ui.activity.BaseActivity diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 4f278673..f7a2c187 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -5,13 +5,13 @@ import android.content.DialogInterface import android.util.Log import androidx.lifecycle.ViewModel import com.blankj.utilcode.util.ToastUtils +import com.navinfo.collect.library.data.dao.impl.TraceDataBase import com.navinfo.collect.library.data.entity.NiLocation import com.navinfo.collect.library.map.NIMapController import com.navinfo.collect.library.utils.GeometryTools import com.navinfo.collect.library.utils.GeometryToolsKt import com.navinfo.omqs.Constant import com.navinfo.omqs.R -import com.navinfo.omqs.db.TraceDataBase import com.navinfo.omqs.system.SystemConstant import com.navinfo.omqs.ui.dialog.CommonDialog import com.navinfo.omqs.ui.manager.TakePhotoManager diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 1cbff96f..7ca48369 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1530,4 +1530,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/dao/impl/MapLifeDataBase.java b/collect-library/src/main/java/com/navinfo/collect/library/data/dao/impl/MapLifeDataBase.java index bb98e07a..382f7ea1 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/dao/impl/MapLifeDataBase.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/dao/impl/MapLifeDataBase.java @@ -10,7 +10,6 @@ import androidx.sqlite.db.SupportSQLiteDatabase; import com.navinfo.collect.library.data.entity.CheckManager; import com.navinfo.collect.library.data.entity.Element; import com.navinfo.collect.library.data.entity.LayerManager; -import com.navinfo.collect.library.data.entity.NiLocation; import com.navinfo.collect.library.data.entity.Project; import com.navinfo.collect.library.data.entity.TileElement; import com.tencent.wcdb.database.SQLiteCipherSpec; @@ -25,7 +24,7 @@ import com.tencent.wcdb.room.db.WCDBDatabase; import java.util.ArrayList; import java.util.List; -@Database(entities = {Element.class, TileElement.class, LayerManager.class, Project.class, NiLocation.class, CheckManager.class},version = 1, exportSchema = false) +@Database(entities = {Element.class, TileElement.class, LayerManager.class, Project.class, CheckManager.class},version = 1, exportSchema = false) public abstract class MapLifeDataBase extends RoomDatabase { // marking the instance as volatile to ensure atomic access to the variable /** @@ -38,11 +37,6 @@ public abstract class MapLifeDataBase extends RoomDatabase { */ public abstract IElementDao getElementDao(); - /** - * 地图坐标库类 - */ - public abstract INiLocationDao getNiLocationDao(); - /** * 图层要素数据库类 */ diff --git a/app/src/main/java/com/navinfo/omqs/db/TraceDataBase.java b/collect-library/src/main/java/com/navinfo/collect/library/data/dao/impl/TraceDataBase.java similarity index 98% rename from app/src/main/java/com/navinfo/omqs/db/TraceDataBase.java rename to collect-library/src/main/java/com/navinfo/collect/library/data/dao/impl/TraceDataBase.java index 99d2ae2c..99e861bd 100644 --- a/app/src/main/java/com/navinfo/omqs/db/TraceDataBase.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/dao/impl/TraceDataBase.java @@ -1,14 +1,15 @@ -package com.navinfo.omqs.db; +package com.navinfo.collect.library.data.dao.impl; import android.content.Context; import android.os.AsyncTask; import android.util.Log; + import androidx.annotation.NonNull; import androidx.room.Database; import androidx.room.Room; import androidx.room.RoomDatabase; import androidx.sqlite.db.SupportSQLiteDatabase; -import com.navinfo.collect.library.data.dao.impl.INiLocationDao; + import com.navinfo.collect.library.data.entity.NiLocation; import com.tencent.wcdb.database.SQLiteCipherSpec; import com.tencent.wcdb.database.SQLiteDatabase; diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/handler/BaseDataHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/handler/BaseDataHandler.kt index e6064283..35a47e72 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/handler/BaseDataHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/handler/BaseDataHandler.kt @@ -1,9 +1,9 @@ package com.navinfo.collect.library.data.handler import android.content.Context -import com.navinfo.collect.library.data.dao.impl.MapLifeDataBase +import androidx.room.RoomDatabase -open class BaseDataHandler(context: Context, dataBase: MapLifeDataBase) { +open class BaseDataHandler(context: Context, dataBase: RoomDatabase) { protected val mContext: Context = context; - protected val mDataBase: MapLifeDataBase = dataBase; + protected val mDataBase: RoomDatabase = dataBase; } \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataNiLocationHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataNiLocationHandler.kt index 5415baee..d5e82ce4 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataNiLocationHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataNiLocationHandler.kt @@ -8,6 +8,7 @@ import android.os.Handler import android.os.Looper import android.util.Log import com.navinfo.collect.library.data.dao.impl.MapLifeDataBase +import com.navinfo.collect.library.data.dao.impl.TraceDataBase import com.navinfo.collect.library.data.entity.* import com.navinfo.collect.library.data.entity.DataLayerItemType.* import com.navinfo.collect.library.utils.GeometryTools @@ -25,7 +26,7 @@ import kotlin.concurrent.thread open class -DataNiLocationHandler(context: Context, dataBase: MapLifeDataBase) : +DataNiLocationHandler(context: Context, dataBase: TraceDataBase) : BaseDataHandler(context, dataBase) { /** @@ -58,11 +59,11 @@ DataNiLocationHandler(context: Context, dataBase: MapLifeDataBase) : } } - val niLocationLoad = mDataBase.niLocationDao.find(niLocation.id); + val niLocationLoad = (mDataBase as TraceDataBase).niLocationDao.find(niLocation.id); if(niLocationLoad!=null){ - mDataBase.niLocationDao.update(niLocation) + (mDataBase as TraceDataBase).niLocationDao.update(niLocation) }else{ - mDataBase.niLocationDao.insert(niLocation) + (mDataBase as TraceDataBase).niLocationDao.insert(niLocation) } Handler(Looper.getMainLooper()).post { callback.invoke(true, "") @@ -89,7 +90,7 @@ DataNiLocationHandler(context: Context, dataBase: MapLifeDataBase) : "uuid=?", arrayOf("'${niLocation.id}'") ) - mDataBase.niLocationDao.delete(niLocation); + (mDataBase as TraceDataBase).niLocationDao.delete(niLocation); } catch (e: Throwable) { Handler(Looper.getMainLooper()).post { callback.invoke(false, "${e.message}") diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataProjectHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataProjectHandler.kt index e1bf43c5..72f12d81 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataProjectHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataProjectHandler.kt @@ -4,6 +4,7 @@ import android.content.Context import android.os.Handler import android.os.Looper import com.navinfo.collect.library.data.dao.impl.MapLifeDataBase +import com.navinfo.collect.library.data.dao.impl.TraceDataBase import com.navinfo.collect.library.data.entity.Project import kotlin.concurrent.thread @@ -22,7 +23,7 @@ open class DataProjectHandler(context: Context, dataBase: MapLifeDataBase) : ) { thread(start = true) { try { - mDataBase.projectManagerDao.insert(project) + (mDataBase as MapLifeDataBase).projectManagerDao.insert(project) Handler(Looper.getMainLooper()).post { callback.invoke(true, "") } @@ -41,7 +42,7 @@ open class DataProjectHandler(context: Context, dataBase: MapLifeDataBase) : */ fun getProjectList(callback: (list: List) -> Unit) { thread(start = true) { - val list = mDataBase.projectManagerDao.findList(); + val list = (mDataBase as MapLifeDataBase).projectManagerDao.findList(); Handler(Looper.getMainLooper()).post { callback.invoke(list) } diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt index 7546a491..0bd7b965 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt @@ -10,7 +10,6 @@ import androidx.lifecycle.lifecycleScope import com.navinfo.collect.library.R import com.navinfo.collect.library.data.entity.QsRecordBean import com.navinfo.collect.library.map.NIMapView -import com.navinfo.collect.library.map.NIMapView.LAYER_GROUPS import com.navinfo.collect.library.map.cluster.ClusterMarkerItem import com.navinfo.collect.library.map.cluster.ClusterMarkerRenderer import com.navinfo.collect.library.map.layers.MyItemizedLayer @@ -96,10 +95,6 @@ open class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tr private fun initMap() { loadBaseMap() - mMapView.switchTileVectorLayerTheme(NIMapView.MAP_THEME.DEFAULT) - //初始化之间数据图层 - initQsRecordDataLayer() - mMapView.vtmMap.updateMap() mapLifeNiLocationTileSource = MapLifeNiLocationTileSource(mContext, mTracePath) @@ -107,7 +102,24 @@ open class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tr labelNiLocationLayer = LabelLayer(mMapView.vtmMap, vectorNiLocationTileLayer, LabelTileLoaderHook(), 15) -// initMapLifeSource() + if(vectorNiLocationTileLayer!=null){ + addLayer(vectorNiLocationTileLayer,NIMapView.LAYER_GROUPS.BASE) + } + if(labelNiLocationLayer!=null){ + addLayer(labelNiLocationLayer, NIMapView.LAYER_GROUPS.BASE) + } + + vectorNiLocationTileLayer.isEnabled = false + labelNiLocationLayer.isEnabled = false + + mMapView.switchTileVectorLayerTheme(NIMapView.MAP_THEME.DEFAULT) + + //初始化之间数据图层 + initQsRecordDataLayer() + + mMapView.vtmMap.updateMap() + + } @@ -522,14 +534,14 @@ open class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tr //显示轨迹图层 fun showNiLocationLayer() { - if(labelNiLocationLayer!=null){ - addLayer(labelNiLocationLayer, NIMapView.LAYER_GROUPS.VECTOR) - } + vectorNiLocationTileLayer.isEnabled = true + labelNiLocationLayer.isEnabled = true } //隐藏轨迹图层 fun hideNiLocationLayer() { - removeLayer(labelNiLocationLayer) + vectorNiLocationTileLayer.isEnabled = false + labelNiLocationLayer.isEnabled = false } } diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationDecoder.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationDecoder.java index 631f9259..abb33510 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationDecoder.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationDecoder.java @@ -90,7 +90,7 @@ public class MapLifeNiLocationDecoder extends TileDecoder { } if(count==0){ properties.put("nav_style","symbol_object_line"); - parseGeometry(layerName, GeometryTools.createGeometry("LINESTRING (116.245567 40.073475, 116.245855 40.072811, 116.24706 40.073034)"), properties); + parseGeometry(layerName, GeometryTools.createGeometry("LINESTRING (116.245859 40.073475, 116.245855 40.073477)"), properties); } // if(count%55==0){ // Log.e("qj","decode==geometry==symbol_track_point"+geometry.toString()+String.valueOf(anyNum)); diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationTileDataSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationTileDataSource.java index 7bad0cfe..52909ec7 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationTileDataSource.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationTileDataSource.java @@ -6,6 +6,7 @@ import android.util.Log; import androidx.annotation.RequiresApi; import com.navinfo.collect.library.data.dao.impl.MapLifeDataBase; +import com.navinfo.collect.library.data.dao.impl.TraceDataBase; import com.navinfo.collect.library.data.entity.Element; import com.navinfo.collect.library.data.entity.NiLocation; import org.oscim.core.MapElement; @@ -43,16 +44,16 @@ public class MapLifeNiLocationTileDataSource implements ITileDataSource { // 获取tile对应的坐标范围 if (tile.zoomLevel >= 10 && tile.zoomLevel <= 20) { - int m = 20 - tile.zoomLevel; + int m = 21 - tile.zoomLevel; int xStart = (int) tile.tileX << m; int xEnd = (int) ((tile.tileX + 1) << m); int yStart = (int) tile.tileY << m; int yEnd = (int) ((tile.tileY + 1) << m); List list = null; if(mEndTime!=0){ - list = MapLifeDataBase.getDatabase(mCon, dbName).getNiLocationDao().timeTofindList(xStart, xEnd, yStart, yEnd,mStartTime,mEndTime); + list = TraceDataBase.getDatabase(mCon, dbName).getNiLocationDao().timeTofindList(xStart, xEnd, yStart, yEnd,mStartTime,mEndTime); }else{ - list = MapLifeDataBase.getDatabase(mCon, dbName).getNiLocationDao().findList(xStart, xEnd, yStart, yEnd); + list = TraceDataBase.getDatabase(mCon, dbName).getNiLocationDao().findList(xStart, xEnd, yStart, yEnd); } Log.e("qj","query"+(list==null?0:list.size())+"==="+xStart+"==="+xEnd+"==="+yStart+"==="+yEnd); diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationTileSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationTileSource.java index 2b1f4be4..d169bb12 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationTileSource.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/MapLifeNiLocationTileSource.java @@ -5,6 +5,8 @@ import android.content.Context; import org.oscim.tiling.ITileDataSource; import org.oscim.tiling.TileSource; +import java.util.Date; + public class MapLifeNiLocationTileSource extends TileSource { private Context mCon; private String dbName;