diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt index 67a10043d9..a13bd5b52f 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/camera/RoadVideoDialog.kt @@ -87,6 +87,7 @@ class RoadVideoDialog(context: Context) : BaseFloatDialog(context), LifecycleObs private fun playVideo(ip: String) { roadVideoPB.visibility = View.VISIBLE + tvCameraDesc.visibility = View.GONE CallerMonitorManager.openCameraStream(ip, { flvUrl -> gsyVideoPlay(flvUrl) }) { @@ -120,8 +121,13 @@ class RoadVideoDialog(context: Context) : BaseFloatDialog(context), LifecycleObs } SimpleVideoPlayer.PLAY_EVT_PLAY_BEGIN -> { + if (!isShowing) return roadVideoPB.visibility = View.GONE roadVideoPlayer.visibility = View.VISIBLE + if (curPlayIndex >= 0 && curPlayIndex < infList.size) { + tvCameraDesc.visibility = View.VISIBLE + tvCameraDesc.text = infList[curPlayIndex].headingDesc + } } else -> { CallerLogger.w("${SceneConstant.M_HMI}$TAG", "播放视频异常,event is:$event") diff --git a/core/function-impl/mogo-core-function-map/src/main/assets/database/t_device.db b/core/function-impl/mogo-core-function-map/src/main/assets/database/t_device.db index 802a03ad1c..cba81ffce3 100644 Binary files a/core/function-impl/mogo-core-function-map/src/main/assets/database/t_device.db and b/core/function-impl/mogo-core-function-map/src/main/assets/database/t_device.db differ diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverviewDb.kt b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverviewDb.kt index bc46d19669..555fd59913 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverviewDb.kt +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/overview/OverviewDb.kt @@ -4,9 +4,11 @@ import android.content.Context import androidx.room.Database import androidx.room.Room import androidx.room.RoomDatabase +import androidx.room.migration.Migration +import androidx.sqlite.db.SupportSQLiteDatabase import com.mogo.eagle.core.data.map.Infrastructure -@Database(entities = [Infrastructure::class], version = 1, exportSchema = false) +@Database(entities = [Infrastructure::class], version = 2, exportSchema = false) abstract class OverviewDb: RoomDatabase() { abstract fun overviewDao(): OverviewDao @@ -14,12 +16,18 @@ abstract class OverviewDb: RoomDatabase() { private const val DB_PATH = "database/t_device.db" private const val INTERNAL_DB_NAME = "t_device.db" + private val MIGRATION_1_2 = object : Migration(1, 2) { + override fun migrate(database: SupportSQLiteDatabase) { + } + } + private var db: OverviewDb? = null fun getDb(context: Context): OverviewDb { if (db == null) { db = Room.databaseBuilder(context.applicationContext, OverviewDb::class.java, INTERNAL_DB_NAME) .createFromAsset(DB_PATH) + .addMigrations(MIGRATION_1_2) .fallbackToDestructiveMigration() .build() } diff --git a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/OverviewMapFragment.java b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/OverviewMapFragment.java index 3695bc8b95..e8a3d3bf49 100644 --- a/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/OverviewMapFragment.java +++ b/core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/smp/OverviewMapFragment.java @@ -106,10 +106,6 @@ public class OverviewMapFragment extends BaseFragment if (mAMapCustomView != null) { mAMapCustomView.onResume(); } - Map> map = InfStructureManager.INSTANCE.getPathData(); - if (!map.isEmpty()) { - mAMapCustomView.drawInfMarkers(map); - } } @Override diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/Infrastructure.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/Infrastructure.kt index ee99d0cd0b..2a85887249 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/Infrastructure.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/map/Infrastructure.kt @@ -26,5 +26,11 @@ data class Infrastructure( var heading: Int, @ColumnInfo(name = "geohash") - var geoHash: String? + var geoHash: String?, + + @ColumnInfo(name = "heading_desc") + var headingDesc: String?, + + @ColumnInfo(name = "name") + var deviceName: String? ) \ No newline at end of file