From a8bf952b3bef72e34c4d51993e89f6ec95d5b384 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Wed, 19 Apr 2023 17:26:36 +0800
Subject: [PATCH] merge code

---
 app/src/main/java/com/navinfo/omqs/OMQSApplication.kt         | 1 -
 .../navinfo/collect/library/map/handler/AnimationHandler.kt   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt b/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
index 4ab997ea..b759c788 100644
--- a/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
+++ b/app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
@@ -28,7 +28,6 @@ class OMQSApplication : Application() {
         val password = "encryp".encodeToByteArray().copyInto(ByteArray(64))
         // 70617373776f72640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
         Log.d("OMQSApplication", "密码是： ${byteArrayToHexString(password)}")
-        val password = "password".encodeToByteArray().copyInto(ByteArray(64))
         // 1110000011000010111001101110011011101110110111101110010011001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
         val config = RealmConfiguration.Builder()
             .directory(File(Constant.DATA_PATH))
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt
index 126b0eb7..18593f7e 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt
@@ -1,6 +1,6 @@
 package com.navinfo.collect.library.map.handler
 
-import android.content.Context
+import androidx.appcompat.app.AppCompatActivity
 import com.navinfo.collect.library.map.NIMapView
 import org.oscim.core.GeoPoint
 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) {