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

app/build.gradle

@@ -136,6 +136,11 @@ dependencies {
     //带侧滑的自定义列表
     implementation 'com.yanzhenjie.recyclerview:x:1.3.2'
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+
+    // 友盟统计SDK
+    implementation  'com.umeng.umsdk:common:9.4.7'// 必选
+    implementation  'com.umeng.umsdk:asms:1.4.1'// 必选
+    implementation 'com.umeng.umsdk:apm:1.5.2' // U-APM包依赖(必选)
 }
 //允许引用生成的代码
 kapt {

app/src/main/AndroidManifest.xml

@@ -66,6 +66,13 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="um.650bece7b2f6fa00ba573c7a" />
+            </intent-filter>
         </activity>
 
         <activity

app/src/main/assets/omdb_config.json

@@ -35,7 +35,7 @@
 				"zoomMin": 15,
 				"zoomMax": 17,
 				"catch":true,
-				"checkLinkId": true
+				"checkLinkId": false
 			},
 			"2002": {
 				"table": "OMDB_RD_LINK_FUNCTION_CLASS",
@@ -345,19 +345,19 @@
 					{
 						"k": "location",
 						"v": "1",
-						"klib": "location",
+						"klib": "ref",
 						"vlib": "左"
 					},
 					{
 						"k": "location",
 						"v": "2",
-						"klib": "locationlib",
+						"klib": "ref",
 						"vlib": "右"
 					},
 					{
 						"k": "location",
 						"v": "3",
-						"klib": "location",
+						"klib": "ref",
 						"vlib": "上"
 					}
 				]

app/src/main/java/com/navinfo/omqs/OMQSApplication.kt

@@ -9,6 +9,7 @@ import android.view.WindowManager
 import com.navinfo.omqs.tools.FileManager
 import com.navinfo.omqs.ui.manager.TakePhotoManager
 import com.navinfo.omqs.util.NetUtils
+import com.umeng.commonsdk.UMConfigure
 import dagger.hilt.android.HiltAndroidApp
 import org.videolan.vlc.Util
 import java.security.MessageDigest
@@ -21,6 +22,8 @@ class OMQSApplication : Application() {
         Util.getInstance().init(applicationContext)
         NetUtils.getInstance().init(this)
         TakePhotoManager.getInstance().init(this, 1)
+        // 初始化友盟统计
+        UMConfigure.preInit(this,"650bece7b2f6fa00ba573c7a","native")
     }
 
     private fun getKey(inputString: String): String {

app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt

@@ -66,7 +66,7 @@ class RealmOperateHelper() {
         val realm = getSelectTaskRealmInstance()
         val realmList =
             getSelectTaskRealmTools(RenderEntity::class.java, false)
-                .equalTo("table", "OMDB_RD_LINK_KIND")
+                .equalTo("table", DataCodeEnum.OMDB_LINK_DIRECT.name)
                 .greaterThanOrEqualTo("tileX", xStart)
                 .lessThanOrEqualTo("tileX", xEnd)
                 .greaterThanOrEqualTo("tileY", yStart)

app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt

@@ -17,6 +17,7 @@ import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.ActivityLoginBinding
 import com.navinfo.omqs.ui.activity.CheckPermissionsActivity
 import com.navinfo.omqs.ui.activity.map.MainActivity
+import com.umeng.commonsdk.UMConfigure
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -39,6 +40,7 @@ class LoginActivity : CheckPermissionsActivity() {
         binding.activity = this
         initView()
         Log.e("jingo", getScreenParams())
+        UMConfigure.init(this, "650bece7b2f6fa00ba573c7a", "native", UMConfigure.DEVICE_TYPE_PHONE, "")
     }
 
     private fun getScreenParams(): String {

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

@@ -752,6 +752,7 @@ class MainViewModel @Inject constructor(
 
                 if (linkList.isNotEmpty()) {
                     val link = linkList[0]
+
                     val linkId = link.properties[RenderEntity.Companion.LinkTable.linkPid]
                     //看板数据
                     val signList = mutableListOf<SignBean>()
@@ -761,9 +762,14 @@ class MainViewModel @Inject constructor(
                         if (bSelectRoad)
                             mapController.markerHandle.addMarker(point, "selectLink")
                         mapController.lineHandler.showLine(link.geometry)
-                        val lineString: Geometry = GeometryTools.createGeometry(link.geometry)
+
-                        val footAndDistance = GeometryTools.pointToLineDistance(point, lineString)
                         val linePoints = GeometryTools.getGeoPoints(link.geometry)
+                        val direct = link.properties["direct"]
+                        if(direct == "3"){
+                            linePoints.reverse()
+                        }
+
+                        val footAndDistance = GeometryTools.pointToLineDistance(point, GeometryTools.createLineString(linePoints))
                         linePoints.add(
                             footAndDistance.footIndex + 1,
                             GeoPoint(
@@ -771,6 +777,7 @@ class MainViewModel @Inject constructor(
                                 footAndDistance.getCoordinate(0).x
                             )
                         )
+
                         val newLineString = GeometryTools.createLineString(linePoints)
                         linkId?.let {
                             var elementList = realmOperateHelper.queryLinkByLinkPid(it)

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

@@ -35,6 +35,7 @@ import com.permissionx.guolindev.PermissionX
 import dagger.hilt.android.AndroidEntryPoint
 import org.oscim.core.GeoPoint
 import org.oscim.core.MapPosition
+import java.io.File
 import javax.inject.Inject
 
 /**
@@ -177,7 +178,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
                     // 定位到指定位置
                     niMapController.mMapView.vtmMap.animator()
 //                        .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708    ))
-                        .animateTo(GeoPoint(40.09819324139729,116.53123207733361 ))
+                        .animateTo(GeoPoint(40.5016054261786, 115.82381251427815))
                 }
 
                 R.id.personal_center_menu_open_all_layer -> {

app/src/main/java/com/navinfo/omqs/util/SignUtil.kt

@@ -1680,8 +1680,8 @@ class SignUtil {
             } else if (itemGeometry is LineString) {
                 val itemFoot = GeometryTools.pointToLineDistance(
                     GeoPoint(
-                        lineString.coordinates[0].y,
+                        lineString.coordinates[lineString.coordinates.size-1].y,
-                        lineString.coordinates[0].x
+                        lineString.coordinates[lineString.coordinates.size-1].x
                     ), lineString
                 )
                 var dis = GeometryTools.getDistance(

collect-library/src/main/assets/editormarker.xml

@@ -1871,18 +1871,10 @@
 
         <!--可变点限速-->
         <m v="OMDB_SPEEDLIMIT_VAR" >
-            <m k="speedFlag" v="0">
+            <caption fill="#ffffff" k="ref" priority="0" size="12" stroke="#ffffff"
-                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
+                stroke-width="1.0"></caption>
-                    stroke-width="1.0"></caption>
+            <symbol src="assets:omdb/icon_4004_0.svg" symbol-height="42"
-                <symbol src="assets:omdb/icon_4004_0.svg" symbol-height="42"
+                symbol-width="42"></symbol>
-                    symbol-width="42"></symbol>
-            </m>
-            <m k="speedFlag" v="1">
-                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
-                    stroke-width="1.0"></caption>
-                <symbol src="assets:omdb/icon_4004_0.svg" symbol-height="42"
-                    symbol-width="42"></symbol>
-            </m>
         </m>
 
 

collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java

@@ -1470,8 +1470,8 @@ public class GeometryTools {
         double startLatitude = MercatorProjection.tileYToLatitude(tile.tileY, tile.zoomLevel);
         double endLongitude = MercatorProjection.tileXToLongitude(tile.tileX + 1, tile.zoomLevel);
         double endLatitude = MercatorProjection.tileYToLatitude(tile.tileY + 1, tile.zoomLevel);
-        return GeometryTools.createPolygonFromCoords(new Coordinate[]{new Coordinate(startLongitude, startLongitude), new Coordinate(endLongitude, startLatitude),
+        return GeometryTools.createPolygonFromCoords(new Coordinate[]{new Coordinate(startLongitude, startLatitude), new Coordinate(endLongitude, startLatitude),
-                new Coordinate(endLongitude, endLatitude), new Coordinate(startLongitude, endLatitude), new Coordinate(startLongitude, startLongitude)});
+                new Coordinate(endLongitude, endLatitude), new Coordinate(startLongitude, endLatitude), new Coordinate(startLongitude, startLatitude)});
     }
     /**
      * 经纬度转墨卡托

settings.gradle

@@ -6,6 +6,7 @@ pluginManagement {
         maven { url 'https://maven.aliyun.com/repository/public' }
         maven { url 'https://maven.aliyun.com/repository/jcenter' }
         maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://repo1.maven.org/maven2/' }
         maven { url 'https://jitpack.io' }
         mavenCentral()
         google()
@@ -22,6 +23,7 @@ dependencyResolutionManagement {
         maven { url 'https://maven.aliyun.com/repository/public' }
         maven { url 'https://maven.aliyun.com/repository/jcenter' }
         maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://repo1.maven.org/maven2/' }
         maven { url 'https://jitpack.io' }
 
         mavenCentral()