diff --git a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt index 1cf7086f97..d56339caac 100644 --- a/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt +++ b/OCH/charter/driver/src/main/java/com/magic/mogo/och/charter/presenter/DriverM1Presenter.kt @@ -179,6 +179,8 @@ class DriverM1Presenter(view: DriverM1Fragment?) : OPERATION_ROAD_SIDE_TYPE ) } + + else -> {} } } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt index f8e32bbe53..3d3aaa95c4 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/lockview/LockAndUnlockView.kt @@ -145,6 +145,8 @@ class LockAndUnlockView : ConstraintLayout, LockManager.LockStatusCallback { LockManager.LockStatus.UNLOCK -> { aciv_screen_lock.setImageResource(R.drawable.charter_p_unlock) } + + else -> {} } aciv_screen_lock_bg?.setImageResource(R.drawable.charter_p_normal) } diff --git a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt index ae9595ea57..1e515485c9 100644 --- a/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt +++ b/OCH/charter/passenger/src/main/java/com/mogo/och/charter/passenger/ui/video/ConsultVideoPlayer.kt @@ -8,6 +8,7 @@ import android.os.Build import android.util.AttributeSet import android.util.TypedValue import android.view.Gravity +import android.view.MotionEvent import android.view.Surface import android.view.View import android.view.ViewGroup @@ -166,7 +167,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { } } - override fun touchDoubleUp() { + override fun touchDoubleUp(e: MotionEvent?) { } @@ -185,24 +186,24 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { } override fun setProgressAndTime( - progress: Int, - secProgress: Int, - currentTime: Int, - totalTime: Int, - forceChange: Boolean + progress: Long, + secProgress: Long, + currentTime: Long, + totalTime: Long, + forceChange: Boolean ) { super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange) CallerLogger.d(TAG,"setProgressAndTime￥${progress}-${secProgress}-${currentTime}") //时间显示 - currentTimeTextView.text = TimeTransformUtils.stringForTimeWithHours(currentTime) - totalTimeTextView.text = TimeTransformUtils.stringForTimeWithHours(totalTime) + currentTimeTextView.text = TimeTransformUtils.stringForTimeWithHours(currentTime.toInt()) + totalTimeTextView.text = TimeTransformUtils.stringForTimeWithHours(totalTime.toInt()) if(currentTime>=totalTime-3000){// this.currentTime = -1 }else{ - this.currentTime = currentTime + this.currentTime = currentTime.toInt() } - if (progress != 0) { - mProgressBar?.progress = progress + if (progress != 0L) { + mProgressBar?.progress = progress.toInt() } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt index 8ff026fbd6..75e51ad8d8 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/dialog/CommonFeedbackDialog.kt @@ -37,6 +37,8 @@ class CommonFeedbackDialog : BaseFloatDialog, LifecycleObserver { Status.fail -> { ivFeedbackStatus.setImageResource(R.drawable.common_feedback_fail) } + + else -> {} } RxUtils.createSubscribe(1_000) { hide() diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt index eb947263f0..66b5cdaf12 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/SeekBarView.kt @@ -175,6 +175,8 @@ class SeekBarView : ConstraintLayout, VisualViewModel.IVisualCallback { duration = 100 }.start() } + + else -> {} } } diff --git a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt index ff3264072c..e3a859bf8d 100644 --- a/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt +++ b/OCH/common/common/src/main/java/com/mogo/och/common/module/wigets/map/switchvisual/VisualViewModel.kt @@ -88,6 +88,8 @@ class VisualViewModel : ViewModel(), Visualangle.UnChange -> { viewCallback?.setUnableChange() } + + else -> {} } } diff --git a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/MyDataBase.kt b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/MyDataBase.kt index 90fe034a91..c99ef83a5f 100644 --- a/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/MyDataBase.kt +++ b/OCH/offline/driver/src/main/java/com/mogo/och/offline/repository/db/MyDataBase.kt @@ -26,10 +26,6 @@ import com.mogo.och.offline.repository.db.dao.TaskSiteDataDao @Database(entities = [ContrailDataBean::class, LineDataBean::class, SiteDataBean::class, TaskSiteDataBean::class, TaskDataBean::class], version = 6) abstract class MyDataBase : RoomDatabase() { - override fun getOpenHelper(): SupportSQLiteOpenHelper { - return super.getOpenHelper() - } - private val dbRepositorys = mutableListOf() override fun close() { diff --git a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt index 44be020c57..e26a5283e4 100644 --- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt +++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/db/MyDataBase.kt @@ -36,10 +36,6 @@ import java.io.File @Database(entities = [ContrailDataBean::class, LineDataBean::class, SiteDataBean::class, TaskDataBean::class, TaskSiteDataBean::class, EventDataBean::class, WriteOffDataBean::class], version = 6) abstract class MyDataBase : RoomDatabase() { - override fun getOpenHelper(): SupportSQLiteOpenHelper { - return super.getOpenHelper() - } - private val dbRepositorys = mutableListOf() override fun close() { diff --git a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt index eb7e97b19e..6d6dc2e174 100644 --- a/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt +++ b/OCH/sweeper/driver/src/main/java/com/mogo/och/sweeper/cloud/util/SweeperCloudTaskUtils.kt @@ -370,6 +370,8 @@ object SweeperCloudTaskUtils { builder.rightStr = "" VoiceNotice.showNotice("云端异常结束任务") } + + else -> {} } builder.countDownTime = 10 builder.listener = listener diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt index b04955fe6e..c6d6bde595 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/itinerarycurrent/ItineraryCurrentView.kt @@ -194,6 +194,8 @@ class ItineraryCurrentView: ConstraintLayout, ItineraryCurrentModel.SwtichLineVi taskAndOrderUiState.isStart ) } + + else -> {} } } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomBar.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomBar.kt index 100bdd8888..8eb68433b4 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomBar.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/bottom/BottomBar.kt @@ -57,6 +57,8 @@ class BottomBar @JvmOverloads constructor( SelectView.VIDEO -> { actv_video.setBagVisable(visibility) } + + else -> {} } } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt index 1f1a938879..33324eade2 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/widget/ConsultVideoPlayer.kt @@ -8,6 +8,7 @@ import android.os.Build import android.util.AttributeSet import android.util.TypedValue import android.view.Gravity +import android.view.MotionEvent import android.view.Surface import android.view.View import android.view.ViewGroup @@ -168,7 +169,7 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { } } - override fun touchDoubleUp() { + override fun touchDoubleUp(e: MotionEvent?) { } @@ -215,23 +216,23 @@ class ConsultVideoPlayer : StandardGSYVideoPlayer { } override fun setProgressAndTime( - progress: Int, - secProgress: Int, - currentTime: Int, - totalTime: Int, - forceChange: Boolean + progress: Long, + secProgress: Long, + currentTime: Long, + totalTime: Long, + forceChange: Boolean ) { super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange) //时间显示 - currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime) - totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime) + currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime.toInt()) + totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime.toInt()) if(currentTime>=totalTime-3000){// this.currentTime = -1 }else{ - this.currentTime = currentTime + this.currentTime = currentTime.toInt() } - if (progress != 0) { - mProgressBar?.progress = progress + if (progress != 0L) { + mProgressBar?.progress = progress.toInt() } } diff --git a/app/build.gradle b/app/build.gradle index 7fd93e04ef..b13c097417 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -172,6 +172,12 @@ repositories { } dependencies { + configurations { + all { + exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx' + } + } + implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.arouter diff --git a/build.gradle b/build.gradle index a181b4f700..3bae515ebd 100644 --- a/build.gradle +++ b/build.gradle @@ -17,6 +17,7 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } maven { url "https://artifact.bytedance.com/repository/Volcengine/" } maven { url "https://artifact.bytedance.com/repository/byteX/" } + maven { url 'https://jitpack.io' } gradlePluginPortal() // mavenCentral() google() @@ -62,7 +63,7 @@ allprojects { maven { url 'https://maven.aliyun.com/repository/jcenter' } maven { url 'https://plugins.gradle.org/m2/' } // mavenCentral() - + maven { url 'https://jitpack.io' } maven { url "https://artifact.bytedance.com/repository/Volcengine/" } diff --git a/config.gradle b/config.gradle index c5566f1532..e6ea98f23f 100644 --- a/config.gradle +++ b/config.gradle @@ -81,9 +81,9 @@ ext { kotlinstdlib : "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}", //探路使用的直播组件 - videoarmv7 : "com.shuyu:gsyVideoPlayer-armv7a:7.1.2", - videoarm64 : "com.shuyu:gsyVideoPlayer-arm64:7.1.2", - videojava : "com.shuyu:gsyVideoPlayer-java:7.1.2", + videoarmv7 : "com.github.CarGuo.GSYVideoPlayer:gsyvideoplayer-armv7a:10.0.0", + videoarm64 : "com.github.CarGuo.GSYVideoPlayer:gsyvideoplayer-arm64:10.0.0", + videojava : "com.github.CarGuo.GSYVideoPlayer:gsyvideoplayer-java:10.0.0", eventbus : "org.greenrobot:eventbus:3.3.1", videoprocessor : "com.zhidao.video:video-processor:1.0.2.1", livesdk : "com.tencent.liteavsdk:LiteAVSDK_Smart:7.4.9211", @@ -103,15 +103,15 @@ ext { litezxing : "com.google.zxing:litezxing:1.0.29.8", // android - room - androidxroomruntime : "androidx.room:room-runtime:2.4.2", - androidxroomcompiler : "androidx.room:room-compiler:2.4.2", - androidxroomktx : "androidx.room:room-ktx:2.4.2", + androidxroomruntime : "androidx.room:room-runtime:2.6.1", + androidxroomcompiler : "androidx.room:room-compiler:2.6.1", + androidxroomktx : "androidx.room:room-ktx:2.6.1", // androidx-lifecycle-process androidxlifecycleprocess : "androidx.lifecycle:lifecycle-process:2.4.0", androidxlifecycleservice : "androidx.lifecycle:lifecycle-service:2.4.0", // rxjava2 with room - roomRxjava : 'androidx.room:room-rxjava2:2.4.2', + roomRxjava : 'androidx.room:room-rxjava2:2.6.1', circleimageview : "de.hdodenhof:circleimageview:3.0.1", //plugin diff --git a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index 1011bed827..f9a5574ab0 100644 --- a/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-datacenter/src/main/java/com/mogo/eagle/core/function/datacenter/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -243,6 +243,8 @@ class MoGoAdasMsgConnectStatusListenerImpl : ) resetArgs() } + + else -> {} } AppConfigInfo.connectStatusDescribe = connectStatusDescribe CallerAutoPilotStatusListenerManager.getAutoPilotStatusInfo().ipcConnStatus = status diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/db/dao/IUpgradeRecordDao.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/db/dao/IUpgradeRecordDao.kt index e9a75d7be6..e774847ce1 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/db/dao/IUpgradeRecordDao.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/db/dao/IUpgradeRecordDao.kt @@ -2,8 +2,8 @@ package com.zhjt.mogo_core_function_devatools.upgrade.provider.db.dao import androidx.room.Dao import androidx.room.Insert -import androidx.room.OnConflictStrategy.IGNORE -import androidx.room.OnConflictStrategy.REPLACE +import androidx.room.OnConflictStrategy.Companion.IGNORE +import androidx.room.OnConflictStrategy.Companion.REPLACE import androidx.room.Query import androidx.room.Transaction import com.zhjt.mogo_core_function_devatools.upgrade.provider.db.vo.* diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/db/vo/Vo.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/db/vo/Vo.kt index f454491560..b27468887e 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/db/vo/Vo.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/upgrade/provider/db/vo/Vo.kt @@ -1,7 +1,7 @@ package com.zhjt.mogo_core_function_devatools.upgrade.provider.db.vo import androidx.room.* -import androidx.room.ForeignKey.CASCADE +import androidx.room.ForeignKey.Companion.CASCADE import com.mogo.eagle.core.utilcode.util.* @Entity(tableName = "records") diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt index 84829e2696..6d560f5c8e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/NoticeCheckDialog.kt @@ -232,6 +232,10 @@ class NoticeCheckDialog(context: Context) : BaseFloatDialog(context), LifecycleO complete(firstBitmap, path) } + override fun onComplete(url: String?, vararg objects: Any?) { + + } + override fun onClickResume(url: String, vararg objects: Any) { thumbnailImageView!!.visibility = View.GONE playImageView!!.visibility = View.GONE diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt index 63f4e35681..cdbbc58f73 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/notice/traffic/NoticeTrafficDialog.kt @@ -276,6 +276,10 @@ class NoticeTrafficDialog : BaseFloatDialog, LifecycleObserver { complete(firstBitmap) } + override fun onComplete(url: String?, vararg objects: Any?) { + + } + override fun onClickResume(url: String, vararg objects: Any) { thumbnailImage!!.visibility = View.GONE playImageView!!.visibility = View.GONE diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt index 3239ff5131..0252565ead 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/StatusSummaryView.kt @@ -197,6 +197,8 @@ class StatusSummaryView @JvmOverloads constructor(context: Context, attrs: Attri AdasConstants.IpcConnectionStatus.SERVER_DISCONNECTED -> { pair = Pair("域控主动断开连接", true) } + + else -> {} } UiThreadHandler.post { if (data.size < 5 || pair == null) return@post diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt index 4aa032b2cb..26165cba8e 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ColdStartView.kt @@ -231,6 +231,8 @@ class ColdStartView @JvmOverloads constructor( AdasConstants.IpcConnectionStatus.SERVER_DISCONNECTED ->{ showIPCConnectFailView("域控主动断开连接，建议重启车辆并上报问题") } + + else -> {} } } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectStatusView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectStatusView.kt index b03e6c6491..74514a8de5 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectStatusView.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/ConnectStatusView.kt @@ -168,6 +168,8 @@ class ConnectStatusView @JvmOverloads constructor( .setForegroundColor(Color.RED) adasSpan.create() } + + else -> {} } } } diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt index 0b63e45df9..0b6b466610 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleSmallVideoPlayer.kt @@ -80,11 +80,11 @@ class NoticeSimpleSmallVideoPlayer : StandardGSYVideoPlayer { } override fun setProgressAndTime( - progress: Int, - secProgress: Int, - currentTime: Int, - totalTime: Int, - forceChange: Boolean + progress: Long, + secProgress: Long, + currentTime: Long, + totalTime: Long, + forceChange: Boolean ) { super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange) mBottomContainer?.visibility = View.VISIBLE @@ -92,11 +92,11 @@ class NoticeSimpleSmallVideoPlayer : StandardGSYVideoPlayer { start.visibility = View.VISIBLE fullscreen.visibility = View.GONE //时间显示 - currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime) - totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime) + currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime.toInt()) + totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime.toInt()) - if (progress != 0) { - mProgressBar?.progress = progress + if (progress != 0L) { + mProgressBar?.progress = progress.toInt() } } diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt index c89a65f341..ff116297ae 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/NoticeSimpleVideoPlayer.kt @@ -81,11 +81,11 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer { } override fun setProgressAndTime( - progress: Int, - secProgress: Int, - currentTime: Int, - totalTime: Int, - forceChange: Boolean + progress: Long, + secProgress: Long, + currentTime: Long, + totalTime: Long, + forceChange: Boolean ) { super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange) mBottomContainer?.visibility = View.VISIBLE @@ -93,11 +93,11 @@ class NoticeSimpleVideoPlayer : StandardGSYVideoPlayer { start.visibility = View.VISIBLE fullscreen.visibility = View.GONE //时间显示 - currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime) - totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime) + currentTimeTextView.text = TimeTransformUtils.stringForTime(currentTime.toInt()) + totalTimeTextView.text = TimeTransformUtils.stringForTime(totalTime.toInt()) - if (progress != 0) { - mProgressBar?.progress = progress + if (progress != 0L) { + mProgressBar?.progress = progress.toInt() } } diff --git a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt index 192d5a9140..3c5ed1dfcb 100644 --- a/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt +++ b/core/mogo-core-res/src/main/java/com/mogo/eagle/core/widget/media/video/SimpleVideoPlayer.kt @@ -3,6 +3,7 @@ package com.mogo.eagle.core.widget.media.video import android.annotation.SuppressLint import android.content.Context import android.util.AttributeSet +import android.view.MotionEvent import android.view.Surface import android.view.View import android.widget.ImageView @@ -75,15 +76,15 @@ open class SimpleVideoPlayer : StandardGSYVideoPlayer { } override fun setProgressAndTime( - progress: Int, - secProgress: Int, - currentTime: Int, - totalTime: Int, + progress: Long, + secProgress: Long, + currentTime: Long, + totalTime: Long, forceChange: Boolean ) { super.setProgressAndTime(progress, secProgress, currentTime, totalTime, forceChange) - if (progress != 0) { - mProgressBar?.progress = progress + if (progress != 0L) { + mProgressBar?.progress = progress.toInt() } } @@ -220,18 +221,18 @@ open class SimpleVideoPlayer : StandardGSYVideoPlayer { } } - override fun touchDoubleUp() { + override fun touchDoubleUp(e: MotionEvent?) { if (enableDoubleClick) { - super.touchDoubleUp() + super.touchDoubleUp(e) } } override fun showProgressDialog( deltaX: Float, seekTime: String?, - seekTimePosition: Int, + seekTimePosition: Long, totalTime: String?, - totalTimeDuration: Int + totalTimeDuration: Long ) { if (enableshowProgressDialog) { super.showProgressDialog( diff --git a/gradle/ext.gradle b/gradle/ext.gradle index 5576dc6070..4df532044a 100644 --- a/gradle/ext.gradle +++ b/gradle/ext.gradle @@ -1,6 +1,6 @@ ext { gradle_version = '3.5.4' - kotlin_plugin_version = '1.5.30' + kotlin_plugin_version = '1.7.20' plugin_version = '10.0.10_mogo' service_chain_version = '5.3.14' lancetx_version = '20.10.2' diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/MapDataWrapper.kt b/libraries/mogo-map/src/main/java/com/mogo/map/MapDataWrapper.kt index 329c89bdff..23cc8109b3 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/MapDataWrapper.kt +++ b/libraries/mogo-map/src/main/java/com/mogo/map/MapDataWrapper.kt @@ -341,7 +341,7 @@ object MapDataWrapper : IMogoData { MapDataApi.getBusStation(routeList, object : IResult { override fun result(code: Int, result: RoutePath?) { result?.steps?.forEach { - it?.busStations.forEach { + it?.busStations?.forEach { val busStation = BusStation( it.busStationPoints, it.id.toLong(),