From 48026236ea2cfcc53661734b903efb5a017812f7 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 17 Feb 2023 20:25:44 +0800 Subject: [PATCH 01/17] =?UTF-8?q?[M2=20=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E7=AC=AC=E4=B8=89=E4=BD=8D=E5=9B=BA=E5=AE=9A1]=201.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 37794b3bc5..e511177c92 100644 --- a/gradle.properties +++ b/gradle.properties @@ -93,8 +93,8 @@ WEBSOCKET_VERSION=1.1.7 applicationId=com.mogo.launcer applicationName=IntelligentPilot # RoboBus司机端：2.5.1；RoboTaxi司机端：2.5.1；RoboTaxi乘客端：1.0.0 -versionCode=1002000 -versionName=1.0.2 +versionCode=1001000 +versionName=1.0.1 ################# 新架构模块Maven版本管理 ################# MOGO_CORE_FUNCTION_HMI_VERSION=0.0.58.10 From e05cff855952b2c66a82bcb806dedb17e46712db Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Mon, 20 Feb 2023 20:06:15 +0800 Subject: [PATCH 02/17] =?UTF-8?q?[M2]=E8=A7=86=E9=A2=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/ui/PM2BaseFragment.kt | 17 ++++- .../ui/widget/video/AdvanceGSYVideoPlayer.kt | 2 + .../ui/widget/video/AdvancePagerAdapter.kt | 10 +-- .../ui/widget/video/AdvanceVideoView.kt | 66 ++++++------------- 4 files changed, 42 insertions(+), 53 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt index 4a66ef787d..d6107cd423 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/PM2BaseFragment.kt @@ -1,5 +1,7 @@ package com.mogo.och.bus.passenger.ui +import android.provider.Settings +import android.view.Surface import com.mogo.commons.mvp.MvpFragment import com.mogo.och.bus.passenger.R import com.mogo.och.bus.passenger.presenter.PM2Presenter @@ -25,8 +27,21 @@ class PM2BaseFragment : } override fun initViews() { + //横竖屏 + setScreenDirection() + //隐藏小地图 - initFragment(); + initFragment() + } + + private fun setScreenDirection() { + var ro = Settings.System.getInt(context?.contentResolver, + Settings.System.USER_ROTATION,Surface.ROTATION_270) + if (ro != Surface.ROTATION_270){ + ro = Surface.ROTATION_270 + } + Settings.System.putInt(context?.contentResolver, + Settings.System.USER_ROTATION,ro) } /** diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt index 8d1bf3c0b9..d6dd2227b8 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt @@ -64,5 +64,7 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { setViewShowState( mLockScreen, GONE ) + + setIsTouchWiget(false) } } \ No newline at end of file diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt index ed7df77713..4164f09e74 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt @@ -85,7 +85,6 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter private fun addView(item: RotationItem) { if (item.type == 1) { // 表示视频 val videoView = AdvanceVideoView(mContext) - videoView.setCacheImageView(item.cacheImgPath) videoView.setVideoPath(item.path) viewList.add(videoView) } else { // 表示图片 @@ -129,7 +128,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter if (viewList[mViewPager.currentItem] is AdvanceVideoView) { val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) - videoView.setCacheImageView(dataList[mViewPager.currentItem].cacheImgPath) + videoView.setCacheImageView() videoView.setVideo(gsySampleCallBack,mViewPager.currentItem) } else if (viewList[mViewPager.currentItem] is AdvanceImageView) { @@ -148,15 +147,16 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter Logger.d("onPageScrollStateChanged", "onPrepared") val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) UiThreadHandler.postDelayed({ + Logger.d("onPageScrollStateChanged", "cacheImg gone") videoView.setCacheImageViewGone() - },2000) + },1000) } override fun onAutoComplete(url: String?, vararg objects: Any?) { Logger.d("onPageScrollStateChanged", "onAutoComplete()") val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) videoView.onVideoReset() - videoView.setCacheImageView(dataList[mViewPager.currentItem].cacheImgPath) + videoView.setCacheImageView() goNextItemView() } @@ -165,7 +165,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter Logger.d("onPageScrollStateChanged", "onPlayError()") val videoView = (viewList[mViewPager.currentItem] as AdvanceVideoView) videoView.onVideoReset() - videoView.setCacheImageView(dataList[mViewPager.currentItem].cacheImgPath) + videoView.setCacheImageView() goNextItemView() } } diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt index c9908a567a..842764ef4e 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt @@ -7,7 +7,9 @@ import android.widget.ImageView import android.widget.RelativeLayout import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions +import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.BitmapHelper +import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.bus.passenger.R import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack @@ -63,28 +65,30 @@ class AdvanceVideoView @JvmOverloads constructor( fun setVideoPath(path: String) { this.path = path // BitmapHelper.getVideoThumbnail(path) /*获取第一帧图*/ - cacheImage?.let { - Glide.with(context).load(BitmapHelper.getVideoThumbnail(path)) - .apply(RequestOptions().placeholder(R.drawable.m2_p_video_holder).centerCrop()) - .into(it) -// it.setImageBitmap(BitmapHelper.getVideoThumbnail(path)) - } + cacheImage?.visibility = VISIBLE + Thread{ + var bitmap = BitmapHelper.getVideoThumbnail(path) + Logger.d("onPageScrollStateChanged", "setVideoPath") + ThreadUtils.runOnUiThread { + Logger.d("onPageScrollStateChanged", "bitmap加载") + cacheImage?.let { + Glide.with(context).load(bitmap) + .apply( + RequestOptions().placeholder(R.drawable.m2_p_video_holder).centerCrop() + ) + .into(it) + } + } + }.start() } @SuppressLint("CheckResult") - fun setCacheImageView(imgPath: String) { - -// cacheImage?.let { -// Glide.with(context) -// .load(imgPath) -// .apply(RequestOptions().placeholder(R.drawable.m2_p_video_holder).centerCrop()) -// .into(it) -// } - + fun setCacheImageView() { cacheImage?.visibility = VISIBLE } fun setVideo(onCompletionListener: GSYSampleCallBack,position: Int) { + Logger.d("onPageScrollStateChanged", "setVideoPlay") gsyVideoOptionBuilder = GSYVideoOptionBuilder() gsyVideoOptionBuilder?.setUrl(path) ?.setPlayTag(path + position) @@ -116,36 +120,4 @@ class AdvanceVideoView @JvmOverloads constructor( videoViewPlayer?.startPlayLogic() } } - - /** - * 加载首帧，作为视频缓存显示的图片 - */ -// private fun loadCacheImage(){ -// Thread { -// var retriever = MediaMetadataRetriever() -// var bitmap: Bitmap? = null -// try { -// if (path?.contains("http") == true){ -// retriever.setDataSource(path, HashMap()) -// }else{ -// retriever.setDataSource(path) -// } -// bitmap = retriever.frameAtTime -// }catch (ex: Exception){ -// ex.printStackTrace() -// }finally { -// try { -// retriever.release() -// }catch (e: RuntimeException){ -// e.printStackTrace() -// } -// } -// -// if (bitmap != null) { -// UiThreadHandler.post { -// setCacheImageView(bitmap) -// } -// } -// } -// } } \ No newline at end of file From d1fac54bc81a79337bc35d3f112c930ed979d88d Mon Sep 17 00:00:00 2001 From: xinfengkun Date: Wed, 1 Mar 2023 15:40:17 +0800 Subject: [PATCH 03/17] =?UTF-8?q?[m1]=E6=B8=85=E6=89=AB=E8=BD=A6=E6=94=BE?= =?UTF-8?q?=E5=BC=80=E6=A1=A3=E4=BD=8D=E9=99=90=E5=88=B6=EF=BC=8C=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/productFlavors/fOchSweeper.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/productFlavors/fOchSweeper.gradle b/app/productFlavors/fOchSweeper.gradle index 730ae5e818..273ff178c0 100644 --- a/app/productFlavors/fOchSweeper.gradle +++ b/app/productFlavors/fOchSweeper.gradle @@ -51,6 +51,6 @@ project.android.productFlavors { buildConfigField 'boolean', 'IS_MULTI_DISPLAY', 'false' //清扫车不能启动自驾的档位 - buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'new java.util.HashSet(){{add(chassis.Chassis.GearPosition.GEAR_N);}}' + buildConfigField 'java.util.Set', 'UNABLE_LAUNCH_AUTOPILOT_GEAR', 'null' } } \ No newline at end of file From 2ac38d689b88b3c2905371b0878ca807778ec868 Mon Sep 17 00:00:00 2001 From: pangfan Date: Wed, 1 Mar 2023 15:41:52 +0800 Subject: [PATCH 04/17] =?UTF-8?q?[M2-P=20v1.0.0]=E5=AE=A3=E4=BC=A0?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E5=85=A8=E5=B1=8F=E6=92=AD=E6=94=BE=EF=BC=88?= =?UTF-8?q?=E6=8B=89=E4=BC=B8=E9=93=BA=E6=BB=A1=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt index 7af0ea8fb7..0a55e1b913 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt @@ -3,6 +3,7 @@ package com.mogo.och.bus.passenger.ui.widget.video import android.content.Context import android.util.AttributeSet import com.shuyu.gsyvideoplayer.utils.Debuger +import com.shuyu.gsyvideoplayer.utils.GSYVideoType import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer /** @@ -16,6 +17,7 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { init { hideWidget() + GSYVideoType.setShowType(com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL) } override fun hideAllWidget() { From 0b862f636379c029607152f2ef6f9aa1c4b9971a Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 2 Mar 2023 14:48:04 +0800 Subject: [PATCH 05/17] =?UTF-8?q?[M2]=201=E3=80=81=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=96=B9=E5=BC=8F=202=E3=80=81=E8=B5=B0?= =?UTF-8?q?=E9=A9=AC=E7=81=AF=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/widget/video/AdvanceGSYVideoPlayer.kt | 27 ++++++++++--------- .../common/module/wigets/MarqueeTextView.java | 2 +- .../mogo/launcher/startup/ConfigStartUp.kt | 9 ++++++- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt index 0a55e1b913..2cb70cebd6 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceGSYVideoPlayer.kt @@ -17,7 +17,8 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { init { hideWidget() - GSYVideoType.setShowType(com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL) + GSYVideoType.setShowType(GSYVideoType.SCREEN_MATCH_FULL) + GSYVideoType.setRenderType(GSYVideoType.GLSURFACE) } override fun hideAllWidget() { @@ -50,19 +51,19 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { } private fun hideWidget(){ - setViewShowState(mBottomContainer, GONE) - setViewShowState(mProgressBar, GONE) - setViewShowState(mCurrentTimeTextView, GONE) - setViewShowState(mTotalTimeTextView, GONE) - setViewShowState(mBottomProgressBar, GONE) - setViewShowState(mBackButton, GONE) - setViewShowState(mStartButton, GONE) + setViewShowState(mBottomContainer, INVISIBLE) + setViewShowState(mProgressBar, INVISIBLE) + setViewShowState(mCurrentTimeTextView, INVISIBLE) + setViewShowState(mTotalTimeTextView, INVISIBLE) + setViewShowState(mBottomProgressBar, INVISIBLE) + setViewShowState(mBackButton, INVISIBLE) + setViewShowState(mStartButton, INVISIBLE) - setViewShowState(mTopContainer, GONE) + setViewShowState(mTopContainer, INVISIBLE) - setViewShowState(mLoadingProgressBar, GONE) + setViewShowState(mLoadingProgressBar, INVISIBLE) setViewShowState( - mLockScreen, GONE + mLockScreen, INVISIBLE ) setIsTouchWiget(false) @@ -75,7 +76,7 @@ class AdvanceGSYVideoPlayer: StandardGSYVideoPlayer { } fun setCacheImageViewGone() { - setViewShowState(mThumbImageViewLayout, GONE) - setViewShowState(mThumbImageView, GONE) + setViewShowState(mThumbImageViewLayout, INVISIBLE) + setViewShowState(mThumbImageView, INVISIBLE) } } \ No newline at end of file diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java index 884d504338..bc1d6a489b 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java @@ -21,7 +21,7 @@ public class MarqueeTextView extends androidx.appcompat.widget.AppCompatTextView /** * 自定义 gap */ - private float mCustomGap = 0.3f; + private float mCustomGap = 0.5f; /** * 是否使用自定义 gap */ diff --git a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt index d952367b9b..38a764668a 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -91,10 +91,17 @@ object ConfigStartUp { HdMapBuildConfig.currentCarVrIconRes = R.raw.huanwei } else if (AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode)){ HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache + } else if (AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode)){ + HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache + } else if (AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)){ + HdMapBuildConfig.currentCarVrIconRes = R.raw.xiaobache } if (AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)) { - if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) { + if (AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode) || + AppIdentityModeUtils.isShuttle(FunctionBuildConfig.appIdentityMode) + || AppIdentityModeUtils.isM1(FunctionBuildConfig.appIdentityMode) || + AppIdentityModeUtils.isM2(FunctionBuildConfig.appIdentityMode)) { //是否显示 限速UI HmiBuildConfig.isShowLimitingVelocityView = false //白天模式 From 8ebc0268e0dae70381fcf175243c0c2cf29ceb1a Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 2 Mar 2023 15:35:08 +0800 Subject: [PATCH 06/17] =?UTF-8?q?[M2]=20=E5=A4=84=E7=90=86=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/widget/video/AdvancePagerAdapter.kt | 44 +++++++------------ .../ui/widget/video/AdvanceVideoView.kt | 17 ++----- 2 files changed, 20 insertions(+), 41 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt index d3e4753941..78b5726da8 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt @@ -5,7 +5,10 @@ import android.view.View import android.view.ViewGroup import androidx.viewpager.widget.PagerAdapter import androidx.viewpager.widget.ViewPager +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d import com.mogo.eagle.core.utilcode.mogo.logger.Logger +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.CountDownTimer import com.shuyu.gsyvideoplayer.listener.GSYSampleCallBack /** @@ -26,7 +29,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter private var current = 0 private val time = 5000 private var pause = false - private var thread: Thread? = null + private var countDownTimer: CountDownTimer? = null fun setData(list: MutableList) { if (list.isEmpty()) return @@ -174,34 +177,21 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter } private fun startTimer() { - if (null != thread && !thread?.isInterrupted!!) { - Logger.d(ImageAndVideoRotation.TAG, "thread.interrupt()") - thread?.interrupt() - thread = null + if (countDownTimer != null){ + countDownTimer?.cancel() + countDownTimer = null } - thread = Thread { - while (null != thread && !thread?.isInterrupted!!) { - try { - Logger.d(ImageAndVideoRotation.TAG, "sleep") - Thread.sleep(1000) - if (viewList[mViewPager.currentItem] is AdvanceImageView) { - Logger.d(ImageAndVideoRotation.TAG, "增加1s") - current += 1000 - }else{ - break - } - if (current >= time) { - Logger.d(ImageAndVideoRotation.TAG, "5s到，跳转") - goNextItemView() - current = 0 - break - } - } catch (e: InterruptedException) { - e.printStackTrace() - } + countDownTimer = object : CountDownTimer(5000,1000){ + override fun onTick(millisUntilFinished: Long) { + d(SceneConstant.M_BUS_P + "startTimer", "倒计时秒 = ${millisUntilFinished/1000}" ) } - } - thread?.start() + + override fun onFinish() { + d(ImageAndVideoRotation.TAG+ "startTimer", "5s到，跳转") + goNextItemView() + } + + }.start() } /** diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt index d28037cc68..33c84d9efe 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvanceVideoView.kt @@ -14,6 +14,7 @@ import com.mogo.eagle.core.utilcode.breakpoint.utils.DownloadUtils import com.mogo.eagle.core.utilcode.mogo.logger.Logger import com.mogo.eagle.core.utilcode.util.BitmapHelper import com.mogo.eagle.core.utilcode.util.FileUtils +import com.mogo.eagle.core.utilcode.util.ThreadPoolService import com.mogo.eagle.core.utilcode.util.ThreadUtils import com.mogo.och.bus.passenger.R import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder @@ -87,7 +88,7 @@ class AdvanceVideoView @JvmOverloads constructor( // BitmapHelper.getVideoThumbnail(path) /*获取第一帧图*/ cacheImage?.setImageResource(R.drawable.m2_p_video_holder) setCacheImageViewVisible() - Thread { + ThreadPoolService.execute { var bitmap = BitmapHelper.getVideoThumbnail(fileNetPath) Logger.d(ImageAndVideoRotation.TAG, "setVideoPath") ThreadUtils.runOnUiThread { @@ -103,19 +104,7 @@ class AdvanceVideoView @JvmOverloads constructor( .into(it) } } - }.start() -// Logger.d(ImageAndVideoRotation.TAG, "bitmap加载") -// cacheImage?.let { -// Glide.with(context).load(cacheImageUrl) -// .apply( -// RequestOptions().placeholder(R.drawable.m2_p_video_holder) -// .error(R.drawable.m2_p_video_holder) -// .fallback(R.drawable.m2_p_video_holder) -// .centerCrop() -// ) -// .into(it) -// } -// videoViewPlayer?.thumbImageView = cacheImage + } } fun clearLocalErrorVideo(){ From 3769f191c089ee538b8a9b407ff87778680a69ea Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 2 Mar 2023 21:37:32 +0800 Subject: [PATCH 07/17] =?UTF-8?q?[M2]=20=E5=A4=84=E7=90=86=E8=BD=AE?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mogo/och/bus/passenger/model/PM2DrivingModel.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt index 33369c39d8..51a719c2e1 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt @@ -290,11 +290,10 @@ class PM2DrivingModel private constructor() { PM2ServiceManager.queryDriverSiteByCoordinate(it, object : OchCommonServiceCallback{ override fun onSuccess(data: PM2RoutesResponse?) { - if (data?.result === routesResult) { - return - } + if (data == null || data.result == null + ||data.result.equals(routesResult)) return - if (data?.result?.sites === null) { + if (data.result.sites == null) { d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate ===== 没有路线") routesResult = null mNextStationIndex = 0 From 6f76e38ec296b3a245e5a99bb44ae210d2af5e6d Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 3 Mar 2023 11:27:30 +0800 Subject: [PATCH 08/17] [2.13.0-arch-opt] fix bug of npc --- .../mogo-map/src/main/java/com/mogo/map/AMapWrapper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java index 5692ae6ac3..c9cd8b2ffb 100644 --- a/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java +++ b/libraries/mogo-map/src/main/java/com/mogo/map/AMapWrapper.java @@ -120,6 +120,9 @@ public class AMapWrapper implements IMogoMap { if (!checkAMap()) { return; } + if(optionsArrayList == null || optionsArrayList.size() == 0){ + return; + } ArrayList markerOptionsArrayList = new ArrayList<>(); optionsArrayList.forEach((s, trackedObject) -> { MarkerSimpleData markerOptions = ObjectUtils.fromTrafficData(trackedObject); @@ -127,6 +130,9 @@ public class AMapWrapper implements IMogoMap { markerOptionsArrayList.add(markerOptions); } }); + if(markerOptionsArrayList.size() == 0){ + return; + } long time = markerOptionsArrayList.get(0).getTime(); MarkerHelper.INSTANCE.updateBatchMarkerPositon(markerOptionsArrayList, false, FunctionBuildConfig.isBeautyMode ? 8.0f : 0f, 1, time, 1); } From a8a0ff0ffd6e3156bcdb093916a552837c1866c7 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 3 Mar 2023 12:19:25 +0800 Subject: [PATCH 09/17] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[?= =?UTF-8?q?=201=E3=80=81=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E5=9B=A0=E8=BF=9E=E6=8E=A5=E5=B1=8F=E5=B9=95=E6=A0=91=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=8D=E5=A4=9F=E5=AF=BC=E8=87=B4=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt index 878e1127c9..060abda7b6 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt @@ -39,7 +39,7 @@ object MultiDisplayUtils { // 获取除了内置屏幕（主屏幕）的其它屏幕 val displays = mDisplayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION) // 初始化新的集合进行接收排序后的屏幕信息,防止数组越界初始化列表相同的集合，集合中会有null，需要在使用判断，null即没有连接屏幕 - var displaysList = arrayOfNulls(lcd_sub_port_six_lcd_mode.size) + var displaysList = arrayOf() Log.d(TAG, "displays:$displays") // 判断副屏个数 @@ -67,10 +67,10 @@ object MultiDisplayUtils { // 处理EB5副屏幕 else { if (mDisplayManager.displays.isNotEmpty()) { - displaysList = arrayOfNulls(1) // EB5目前副屏幕ID为固定4096 for (i in mDisplayManager.displays.indices) { if (mDisplayManager.displays[i].displayId == 4096) { + displaysList = arrayOfNulls(1) displaysList[0] = mDisplayManager.displays[i] } } From 3605f62e6c1ec3f623356d8a5768c698e26fdd9a Mon Sep 17 00:00:00 2001 From: renwj Date: Fri, 3 Mar 2023 12:21:30 +0800 Subject: [PATCH 10/17] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=E6=8D=95?= =?UTF-8?q?=E8=8E=B7aispeech=E7=9B=B8=E5=85=B3=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/launcher/lancet/CrashFix.kt | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/app/src/main/java/com/mogo/launcher/lancet/CrashFix.kt b/app/src/main/java/com/mogo/launcher/lancet/CrashFix.kt index 09ae7d1c42..698e5e07b5 100644 --- a/app/src/main/java/com/mogo/launcher/lancet/CrashFix.kt +++ b/app/src/main/java/com/mogo/launcher/lancet/CrashFix.kt @@ -29,4 +29,25 @@ class CrashFix { null } } + + /** + * https://console.volcengine.com/apmplus/app/crash/detail/java/bb387ccd9c1a3c6ad2ede4e6f501a5e7?aid=302368&date=%7B%22granularity%22%3A%221h%22%2C%22duration%22%3A%22recently%22%2C%22range%22%3A%221w%22%7D&filters=%7B%22type%22%3A%22and%22%2C%22sub_conditions%22%3A%5B%7B%22dimension%22%3A%22os%22%2C%22op%22%3A%22in%22%2C%22type%22%3A%22expression%22%2C%22values%22%3A%5B%22Android%22%5D%7D%5D%7D&org_id=2100068151&os=Android&page_number=6&status=%5B%22pending%22%2C%22processing%22%2C%22solved%22%2C%22reopen%22%5D + * java.lang.IllegalArgumentException: Invalid audio buffer size. + * at android.media.AudioTrack.audioBuffSizeCheck(AudioTrack.java:1857) + at android.media.AudioTrack.(AudioTrack.java:812) + at android.media.AudioTrack.(AudioTrack.java:754) + at android.media.AudioTrack.(AudioTrack.java:708) + at android.media.AudioTrack.(AudioTrack.java:649) + at com.aispeech.lite.tts.a.a(SourceFile:70) + */ + @Insert + @TargetClass("com.aispeech.lite.tts.a") + @TargetMethod(methodName = "a") + fun fixAiSpeechCrash(context: Context, arg1: Int, arg2: Int) { + try { + Origin.callVoid() + } catch (t: Throwable) { + t.printStackTrace() + } + } } \ No newline at end of file From aea12d173a04c72f267cf845939c6a390a02b10b Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 3 Mar 2023 12:19:25 +0800 Subject: [PATCH 11/17] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[?= =?UTF-8?q?=201=E3=80=81=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=B1=8F=E5=B9=95?= =?UTF-8?q?=E5=9B=A0=E8=BF=9E=E6=8E=A5=E5=B1=8F=E5=B9=95=E6=A0=91=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=B8=8D=E5=A4=9F=E5=AF=BC=E8=87=B4=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- .../com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt index 878e1127c9..060abda7b6 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/util/MultiDisplayUtils.kt @@ -39,7 +39,7 @@ object MultiDisplayUtils { // 获取除了内置屏幕（主屏幕）的其它屏幕 val displays = mDisplayManager.getDisplays(DisplayManager.DISPLAY_CATEGORY_PRESENTATION) // 初始化新的集合进行接收排序后的屏幕信息,防止数组越界初始化列表相同的集合，集合中会有null，需要在使用判断，null即没有连接屏幕 - var displaysList = arrayOfNulls(lcd_sub_port_six_lcd_mode.size) + var displaysList = arrayOf() Log.d(TAG, "displays:$displays") // 判断副屏个数 @@ -67,10 +67,10 @@ object MultiDisplayUtils { // 处理EB5副屏幕 else { if (mDisplayManager.displays.isNotEmpty()) { - displaysList = arrayOfNulls(1) // EB5目前副屏幕ID为固定4096 for (i in mDisplayManager.displays.indices) { if (mDisplayManager.displays[i].displayId == 4096) { + displaysList = arrayOfNulls(1) displaysList[0] = mDisplayManager.displays[i] } } From 60c33ac0894a39582faa60912c6b5e2ac68a8f83 Mon Sep 17 00:00:00 2001 From: donghongyu Date: Fri, 3 Mar 2023 14:37:03 +0800 Subject: [PATCH 12/17] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20[Change]=20[?= =?UTF-8?q?=201=E3=80=81=E8=A7=A3=E5=86=B3=E5=B0=91=E5=BC=95=E7=94=A8impor?= =?UTF-8?q?t=20android.content.Context=20]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: donghongyu --- app/src/main/java/com/mogo/launcher/lancet/CrashFix.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/mogo/launcher/lancet/CrashFix.kt b/app/src/main/java/com/mogo/launcher/lancet/CrashFix.kt index 698e5e07b5..73d69c4931 100644 --- a/app/src/main/java/com/mogo/launcher/lancet/CrashFix.kt +++ b/app/src/main/java/com/mogo/launcher/lancet/CrashFix.kt @@ -1,6 +1,7 @@ package com.mogo.launcher.lancet import android.content.ComponentName +import android.content.Context import android.content.Intent import androidx.annotation.* import com.knightboost.lancet.api.Origin From 8d0d82459f145181becc5c40015c76a02e783f83 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 3 Mar 2023 14:41:28 +0800 Subject: [PATCH 13/17] =?UTF-8?q?[M2]=20=E5=A4=84=E7=90=86=E5=81=B6?= =?UTF-8?q?=E7=8E=B0=E7=BB=93=E6=9D=9F=E8=AE=A2=E5=8D=95=E4=B9=98=E5=AE=A2?= =?UTF-8?q?=E5=B1=8F=E4=B8=8D=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bus/passenger/model/PM2DrivingModel.kt | 29 +++++++++++++------ .../common/module/wigets/MarqueeTextView.java | 14 +++++++++ 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt index 51a719c2e1..be783c6187 100644 --- a/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt +++ b/OCH/mogo-och-bus-passenger/src/m2/java/com/mogo/och/bus/passenger/model/PM2DrivingModel.kt @@ -290,18 +290,21 @@ class PM2DrivingModel private constructor() { PM2ServiceManager.queryDriverSiteByCoordinate(it, object : OchCommonServiceCallback{ override fun onSuccess(data: PM2RoutesResponse?) { - if (data == null || data.result == null - ||data.result.equals(routesResult)) return - if (data.result.sites == null) { - d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate ===== 没有路线") - routesResult = null - mNextStationIndex = 0 - isGoingToNextStation = false - startOrStopCalculateRouteInfo(false) - mDrivingInfoCallback?.showNoTaskView(true) + if (data == null || data.result == null){ + if (routesResult != null) { + routesResult == null + updateLocalOrder() + d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= result is null") + return + } return } + if (data.result != null && data.result.equals(routesResult)){ + d(SceneConstant.M_BUS_P+TAG, "queryDriverSiteByCoordinate= not update") + return + } + routesResult = data.result updatePassengerRouteInfo(data.result) } @@ -321,6 +324,14 @@ class PM2DrivingModel private constructor() { } } + private fun updateLocalOrder(){ + routesResult = null + mNextStationIndex = 0 + isGoingToNextStation = false + startOrStopCalculateRouteInfo(false) + mDrivingInfoCallback?.showNoTaskView(true) + } + private fun updatePassengerRouteInfo(result: PM2RoutesResult) { mDrivingInfoCallback?.updateLine(result.name, result.runningDur) if (result.sites != null) { diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java index bc1d6a489b..8b141d5ded 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/MarqueeTextView.java @@ -2,6 +2,7 @@ package com.mogo.och.common.module.wigets; import android.content.Context; import android.content.res.TypedArray; +import android.graphics.Rect; import android.util.AttributeSet; import android.view.ViewDebug; import android.widget.TextView; @@ -50,6 +51,19 @@ public class MarqueeTextView extends androidx.appcompat.widget.AppCompatTextView return true; } + @Override + protected void onFocusChanged(boolean focused, int direction, Rect previouslyFocusedRect) { + if (focused) + super.onFocusChanged(true, direction, previouslyFocusedRect); + + } + + @Override + public void onWindowFocusChanged(boolean hasWindowFocus) { + if (hasWindowFocus){} + super.onWindowFocusChanged(true); + } + @Override @ViewDebug.ExportedProperty public boolean isSelected() { From a0bcbb5cb8c134cb440e285b44038ad84a30bab1 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 3 Mar 2023 14:56:52 +0800 Subject: [PATCH 14/17] =?UTF-8?q?[m1]=20[1.1.2]=20[dimension=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/productFlavors/fMultiDisplaySweeper.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/productFlavors/fMultiDisplaySweeper.gradle b/app/productFlavors/fMultiDisplaySweeper.gradle index fbfd08b1e7..4dddc88a45 100644 --- a/app/productFlavors/fMultiDisplaySweeper.gradle +++ b/app/productFlavors/fMultiDisplaySweeper.gradle @@ -13,7 +13,7 @@ project.android.productFlavors { versionName rootProject.versionName // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId - dimension "product" + dimension "vehicle" // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '2' From e8a5f2097d63247de587a41b29897544ab8da7b0 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Fri, 3 Mar 2023 15:16:33 +0800 Subject: [PATCH 15/17] [m1] [1.1.2] [merge error] --- app/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a4c55b2902..9a6715972d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -256,17 +256,14 @@ android { qa { dimension "env" buildConfigField 'int', 'NET_ENV', '2' - buildConfigField 'String', 'URLs', "\"${readFileToJson("qa").replace("\"", "\\\"")}\"" } online { dimension "env" buildConfigField 'int', 'NET_ENV', '3' - buildConfigField 'String', 'URLs', "\"${readFileToJson("online").replace("\"", "\\\"")}\"" } demo { dimension "env" buildConfigField 'int', 'NET_ENV', '4' - buildConfigField 'String', 'URLs', "\"${readFileToJson("demo").replace("\"", "\\\"")}\"" } } From 2d6bb763dbe4ac98cf3f23fd27bd5a3f338b6b2b Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 3 Mar 2023 15:31:23 +0800 Subject: [PATCH 16/17] =?UTF-8?q?[M2]=20=E6=89=BE=E5=9B=9EtelematicConstan?= =?UTF-8?q?t=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eagle/core/data/telematic/TelematicConstant.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/telematic/TelematicConstant.kt diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/telematic/TelematicConstant.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/telematic/TelematicConstant.kt new file mode 100644 index 0000000000..77d0714557 --- /dev/null +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/telematic/TelematicConstant.kt @@ -0,0 +1,12 @@ +package com.mogo.eagle.core.data.telematic + +/** + * @author: wangmingjun + * @date: 2023/3/3 + * 供网约车司乘屏通信使用 + */ +class TelematicConstant { + companion object { + const val BUSINESS_STRING = 100 + } +} \ No newline at end of file From 7bca36646fb98e86e09a8c719287c01396ec8f16 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 3 Mar 2023 17:19:57 +0800 Subject: [PATCH 17/17] =?UTF-8?q?[M2]=20=E6=89=BE=E5=9B=9EtelematicConstan?= =?UTF-8?q?t=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/urlConfig.json | 24 ++++++++++++++----- .../com/mogo/eagle/core/data/app/UrlConfig.kt | 6 ++++- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/app/urlConfig.json b/app/urlConfig.json index ee3e7c4ede..b66863a05a 100644 --- a/app/urlConfig.json +++ b/app/urlConfig.json @@ -5,21 +5,27 @@ "shuttle_url": "https://och-driver-qa.zhidaozhixing.com", "passport_url": "", "socket_base_url": "", - "socket_tech_url": "" + "socket_tech_url": "", + "eagle_mis_url": "", + "eagle_dns_url": "" }, "online": { "och_url": "http://tech.zhidaohulian.com", "shuttle_url": "https://och-driver.zhidaozhixing.com", "passport_url": "", "socket_base_url": "", - "socket_tech_url": "" + "socket_tech_url": "", + "eagle_mis_url": "", + "eagle_dns_url": "" }, "demo": { "och_url": "http://tech-dev.zhidaohulian.com", "shuttle_url": "https://och-driver-dev.zhidaozhixing.com", "passport_url": "", "socket_base_url": "", - "socket_tech_url": "" + "socket_tech_url": "", + "eagle_mis_url": "", + "eagle_dns_url": "" } }, "dali": { @@ -28,21 +34,27 @@ "shuttle_url": "https://och-a.zhidaozhixing.com", "passport_url": "https://och-a.zhidaozhixing.com/arch/passport/", "socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/", - "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/" + "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/", + "eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/", + "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/" }, "online": { "och_url": "https://och-a.zhidaozhixing.com", "shuttle_url": "https://och-a.zhidaozhixing.com", "passport_url": "https://och-a.zhidaozhixing.com/arch/passport/", "socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/", - "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/" + "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/", + "eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/", + "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/" }, "demo": { "och_url": "https://och-a.zhidaozhixing.com", "shuttle_url": "https://och-a.zhidaozhixing.com", "passport_url": "https://och-a.zhidaozhixing.com/arch/passport/", "socket_base_url": "https://och-a.zhidaozhixing.com/arch/push/", - "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/" + "socket_tech_url": "https://och-a.zhidaozhixing.com/arch/", + "eagle_mis_url": "http://eagle-mis-a.zhidaozhixing.com/", + "eagle_dns_url": "http://eagle-dns-a.zhidaozhixing.com/" } } } diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt index 1a2ad74df2..3e34c7a397 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/app/UrlConfig.kt @@ -12,5 +12,9 @@ data class UrlConfig( @SerializedName("socket_base_url") val socketBaseUrl: String, @SerializedName("socket_tech_url") - val socketTechUrl: String + val socketTechUrl: String, + @SerializedName("eagle_mis_url") + val eagleMisUrl: String, + @SerializedName("eagle_dns_url") + val eagleDnsUrl: String ) \ No newline at end of file