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

 Conflicts:

	vtm

app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

@@ -471,11 +471,11 @@ class MainViewModel @Inject constructor(
     private suspend fun captureItem(point: GeoPoint) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             val itemList = realmOperateHelper.queryElement(
-                point = GeometryTools.createPoint(
+                GeometryTools.createPoint(
                     point.longitude,
                     point.latitude
                 ),
-                buffer = 2.0
+                buffer = 1.0, catchAll = false
             )
 
             if (itemList.size == 1) {

app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt

@@ -23,6 +23,7 @@ class ItemAdapter(private var itemListener: ((Int, RenderEntity) -> Unit?)? = nu
         val binding = holder.viewBinding as AdapterItemBinding
         var renderEntity = data[position]
         binding.root.isSelected = selectPosition == position
+        binding.itemIndex.text = (position+1).toString()
         binding.name.text = DataCodeEnum.findTableNameByCode(renderEntity.code)
         binding.root.setOnClickListener {
             if (selectPosition != position) {

app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt

@@ -129,7 +129,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
                     // 定位到指定位置
                     niMapController.mMapView.vtmMap.animator()
 //                        .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708    ))
-                        .animateTo(GeoPoint( 40.480633792652746, 115.99816629572948 ))
+                        .animateTo(GeoPoint( 40.50755634913162,115.80235967728436 ))
                 }
                 R.id.personal_center_menu_open_all_layer -> {
                     MapParamUtils.setDataLayerEnum(DataLayerEnum.SHOW_ALL_LAYERS)