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

merge code

Browse Source
This commit is contained in:
qiji4215
2023-04-19 17:26:36 +08:00
parent ab1fe0acc0
commit a8bf952b3b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,6 @@ class OMQSApplication : Application() {
val password = "encryp".encodeToByteArray().copyInto(ByteArray(64)) val password = "encryp".encodeToByteArray().copyInto(ByteArray(64))
// 70617373776f72640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 // 70617373776f72640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
Log.d("OMQSApplication", "密码是： ${byteArrayToHexString(password)}") Log.d("OMQSApplication", "密码是： ${byteArrayToHexString(password)}")
val password = "password".encodeToByteArray().copyInto(ByteArray(64))
// 1110000011000010111001101110011011101110110111101110010011001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 // 1110000011000010111001101110011011101110110111101110010011001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
val config = RealmConfiguration.Builder() val config = RealmConfiguration.Builder()
.directory(File(Constant.DATA_PATH)) .directory(File(Constant.DATA_PATH))

4
collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt
View File

@@ -1,6 +1,6 @@
package com.navinfo.collect.library.map.handler package com.navinfo.collect.library.map.handler
import android.content.Context import androidx.appcompat.app.AppCompatActivity
import com.navinfo.collect.library.map.NIMapView import com.navinfo.collect.library.map.NIMapView
import org.oscim.core.GeoPoint import org.oscim.core.GeoPoint
import org.oscim.core.MapPosition import org.oscim.core.MapPosition
@@ -8,7 +8,7 @@ import org.oscim.core.MapPosition
/** /**
* 控制地图状态相关操作 * 控制地图状态相关操作
*/ */
open class AnimationHandler(context: Context, mapView: NIMapView) : open class AnimationHandler(context: AppCompatActivity, mapView: NIMapView) :
BaseHandler(context, mapView) { BaseHandler(context, mapView) {