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

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

Browse Source
This commit is contained in:
qiji4215
2023-09-21 16:14:43 +08:00
parent 575540a03b 0c416fec0d
commit e37d7bc38f
12 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/AndroidManifest.xml
View File

@@ -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

8
app/src/main/assets/omdb_config.json
View File

@@ -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": "上"
}
]

3
app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
View File

@@ -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 {

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

@@ -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)

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

@@ -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 {

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

@@ -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)

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

@@ -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 -> {

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

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