From 14c6ef80290ad00cae3bde0728d53256371822fe Mon Sep 17 00:00:00 2001 From: aibingbing Date: Fri, 15 Dec 2023 16:30:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=A3=E4=BC=A0=E8=A7=86=E9=A2=91]=20refact?= =?UTF-8?q?or:=20=E5=AE=A3=E4=BC=A0=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?= =?UTF-8?q?=E9=87=8D=E6=9E=84=20step4,=20=E7=9B=B8=E5=85=B3=E7=B1=BB?= =?UTF-8?q?=E5=92=8C=E6=96=87=E4=BB=B6=E9=87=8D=E6=96=B0=E5=91=BD=E5=90=8D?= =?UTF-8?q?=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/module/wigets/media/MediaBean.kt | 16 +- .../wigets/media/MediaDataSourceManager.kt | 136 ++--- .../wigets/media/MediaFileCacheManager.kt | 2 +- .../module/wigets/media/MediaLoopPlayView.kt | 16 +- .../wigets/media/MediaPlayerFragment.kt | 14 +- .../passenger/ui/video/PM2VideoFragment.kt | 4 +- .../ui/widget/video/AdvancePagerAdapter.kt | 6 +- app/build.gradle | 17 +- app/config/MediaUrlConfig.json | 490 ++++++++++++++++++ app/config/tempConfig.json | 490 ------------------ .../mogo/launcher/startup/ConfigStartUp.kt | 4 +- .../core/data/config/FunctionBuildConfig.kt | 5 +- 12 files changed, 603 insertions(+), 597 deletions(-) create mode 100644 app/config/MediaUrlConfig.json delete mode 100644 app/config/tempConfig.json diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaBean.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaBean.kt index dce6c6787a..fc74f766a6 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaBean.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaBean.kt @@ -1,23 +1,23 @@ package com.mogo.och.common.module.wigets.media -data class MediaDataList(val ads: MutableList) +data class MediaDataList(val medias: MutableList) data class MediaItem( - var path: String, - var type: Int, - var cacheImgPath: String, + var fileUrl: String, + var fileType: Int, + var coverImageUrl: String, var title: String ) { companion object { - const val MEDIA_TYPE_IMAGE = 0 - const val MEDIA_TYPE_VIDEO = 1 + const val MEDIA_TYPE_IMAGE = 1 + const val MEDIA_TYPE_VIDEO = 2 } fun isImageType(): Boolean { - return this.type == MEDIA_TYPE_IMAGE + return this.fileType == MEDIA_TYPE_IMAGE } fun isVideoType(): Boolean { - return this.type == MEDIA_TYPE_VIDEO + return this.fileType == MEDIA_TYPE_VIDEO } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt index ecfccc01e9..9a91730a4f 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaDataSourceManager.kt @@ -33,21 +33,23 @@ import java.util.concurrent.ConcurrentHashMap * 2.第二优先级：使用本地数据播放 * 3.请求管理后台数据成功后：间隔10分钟再次检查 */ -object AdDataSourceManager { - private val TAG = AdDataSourceManager::class.java.simpleName +object MediaDataSourceManager { + private val TAG = MediaDataSourceManager::class.java.simpleName private const val RETRY_MAX_COUNT = 5 private var mRetryCount = 0 - private val mNetworkService: IAdNetworkApi = + private val mNetworkService: IMediaNetworkApi = MoGoRetrofitFactory.getInstance(OchCommonConst.getEagleMisUrl()) - .create(IAdNetworkApi::class.java) + .create(IMediaNetworkApi::class.java) private var driverSnCache = "" private val driverSn: String get() { + //TODO +// return "202305107384MW6" val serverToken = CallerTelematicManager.getServerToken() if (serverToken != driverSnCache && serverToken.isNotEmpty()) { driverSnCache = serverToken @@ -60,77 +62,77 @@ object AdDataSourceManager { return AbsMogoApplication.getApp() } - private val mLastAdDataSourceList = mutableListOf() + private val mLastMediaDataSourceList = mutableListOf() - private var mHasEverGetAdDataFromMis = false + private var mHasEverGetMediaDataFromMis = false - private val mAdDataSourceListenerMap: ConcurrentHashMap = + private val mMediaDataSourceListenerMap: ConcurrentHashMap = ConcurrentHashMap() private val getAdDataSourceLoopRunnable = Runnable { - startGetAdDataSourceLoop() + startGetMediaDataSourceLoop() } - fun init(tag: String, dataSourceListener: IAdDataSourceListener) { - if (!mAdDataSourceListenerMap.containsKey(tag)) { - mAdDataSourceListenerMap[tag] = dataSourceListener + fun init(tag: String, dataSourceListener: IMediaDataSourceListener) { + if (!mMediaDataSourceListenerMap.containsKey(tag)) { + mMediaDataSourceListenerMap[tag] = dataSourceListener } - startGetAdDataSourceLoop() + startGetMediaDataSourceLoop() } fun unInit(tag: String) { - removeGetAdDataSourceLoop() - if (mAdDataSourceListenerMap.containsKey(tag)) { - mAdDataSourceListenerMap.remove(tag) + removeGetMediaDataSourceLoop() + if (mMediaDataSourceListenerMap.containsKey(tag)) { + mMediaDataSourceListenerMap.remove(tag) } } @SuppressLint("MissingPermission") - private fun startGetAdDataSourceLoop() { - removeGetAdDataSourceLoop() - // 失败3次，且从来没有从MIS获取配置信息成功过，先试用本地数据播放 - if (mRetryCount == RETRY_MAX_COUNT && !mHasEverGetAdDataFromMis) { - val localAdDataList = getAdDataFromLocalConfig() - updateAdDataSource(localAdDataList) + private fun startGetMediaDataSourceLoop() { + removeGetMediaDataSourceLoop() + // 失败5次，且从来没有从MIS获取配置信息成功过，先试用本地数据播放 + if (mRetryCount == RETRY_MAX_COUNT && !mHasEverGetMediaDataFromMis) { + val localAdDataList = getMediaDataFromLocalConfig() + updateMediaDataSource(localAdDataList) CallerLogger.e(TAG, - "startGetAdDataSourceLoop：失败${mRetryCount}次，先使用本地数据播放" + "startGetMediaDataSourceLoop：失败${mRetryCount}次，先使用本地数据播放" ) } if (driverSn.isBlank()) { - CallerLogger.e(TAG, "startGetAdDataSourceLoop：司机屏sn为空，跳过本次查询" + CallerLogger.e(TAG, "startGetMediaDataSourceLoop：司机屏sn为空，跳过本次查询" ) mRetryCount++ UiThreadHandler.postDelayed(getAdDataSourceLoopRunnable, 1000L) return } if (!NetworkUtils.isConnected()) { - CallerLogger.e(TAG, "startGetAdDataSourceLoop：当前无网络，跳过本次查询" + CallerLogger.e(TAG, "startGetMediaDataSourceLoop：当前无网络，跳过本次查询" ) mRetryCount++ UiThreadHandler.postDelayed(getAdDataSourceLoopRunnable, 1000L) return } - getAdDataFromMis(object : OchCommonServiceCallback { - override fun onSuccess(data: AdDataResp?) { - mHasEverGetAdDataFromMis = true + getMediaDataFromMis(object : OchCommonServiceCallback { + override fun onSuccess(data: MediaDataResp?) { + mHasEverGetMediaDataFromMis = true CallerLogger.e(TAG, - "startGetAdDataSourceLoop：success, 从管理后台获取到数据，AdData=${ + "startGetMediaDataSourceLoop：success, 从管理后台获取到数据，AdData=${ GsonUtils.toJson( data ) }" ) - val newDataList = AdDataResp.toMediaItemList(data?.data) + val newDataList = MediaDataResp.toMediaItemList(data?.data) // 管理平台如果配置数据为空，不更新 if (newDataList.isNotEmpty()) { - if (compareAdDataSource(newDataList)) { - updateAdDataSource(newDataList) + if (compareMediaDataSource(newDataList)) { + updateMediaDataSource(newDataList) CallerLogger.e(TAG, - "startGetAdDataSourceLoop：success, 从管理后台获取到数据，更新数据" + "startGetMediaDataSourceLoop：success, 从管理后台获取到数据，更新数据" ) } else { CallerLogger.e(TAG, - "startGetAdDataSourceLoop：success, 从管理后台获取到数据，数据无变化" + "startGetMediaDataSourceLoop：success, 从管理后台获取到数据，数据无变化" ) } } @@ -140,61 +142,61 @@ object AdDataSourceManager { override fun onFail(code: Int, msg: String?) { CallerLogger.e(TAG, - "startGetAdDataSourceLoop：failed, code=$code, msg=$msg" + "startGetMediaDataSourceLoop：failed, code=$code, msg=$msg" ) mRetryCount++ - val delay = if (mHasEverGetAdDataFromMis) 5000L else 1000L + val delay = if (mHasEverGetMediaDataFromMis) 5000L else 1000L UiThreadHandler.postDelayed(getAdDataSourceLoopRunnable, delay) } override fun onError() { super.onError() - CallerLogger.e(TAG, "startGetAdDataSourceLoop：error, 网络异常" + CallerLogger.e(TAG, "startGetMediaDataSourceLoop：error, 网络异常" ) mRetryCount++ - val delay = if (mHasEverGetAdDataFromMis) 5000L else 1000L + val delay = if (mHasEverGetMediaDataFromMis) 5000L else 1000L UiThreadHandler.postDelayed(getAdDataSourceLoopRunnable, delay) } }) } - private fun removeGetAdDataSourceLoop() { + private fun removeGetMediaDataSourceLoop() { UiThreadHandler.removeCallbacks(getAdDataSourceLoopRunnable) } - private fun getAdDataFromMis(callback: OchCommonServiceCallback) { - CallerLogger.d(TAG, "getAdDataFromMis：准备发送请求，driverSn=$driverSn" + private fun getMediaDataFromMis(callback: OchCommonServiceCallback) { + CallerLogger.d(TAG, "getMediaDataFromMis：准备发送请求，driverSn=$driverSn" ) - mNetworkService.queryAdDataFromMis( + mNetworkService.queryMediaDataFromMis( sn = driverSn, screenType = "2", - ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "getAdDataFromMis")) + ).transformTry().subscribe(OchCommonSubscribeImpl(context, callback, "getMediaDataFromMis")) } - private fun getAdDataFromLocalConfig(): List { + private fun getMediaDataFromLocalConfig(): List { val localAdDataList = mutableListOf() try { val datas: MediaDataList = GsonUtils.fromJson( - FunctionBuildConfig.tempConfig, object : TypeToken() {}.type + FunctionBuildConfig.mediaUrlConfig, object : TypeToken() {}.type ) - localAdDataList.addAll(datas.ads) + localAdDataList.addAll(datas.medias) } catch (e: Exception) { e.printStackTrace() } return localAdDataList } - private fun compareAdDataSource(newDataList: List): Boolean { - if (mLastAdDataSourceList.isEmpty() && newDataList.isNotEmpty()) { + private fun compareMediaDataSource(newDataList: List): Boolean { + if (mLastMediaDataSourceList.isEmpty() && newDataList.isNotEmpty()) { return true } - if (mLastAdDataSourceList.size != newDataList.size) { + if (mLastMediaDataSourceList.size != newDataList.size) { return true } try { newDataList.forEachIndexed { index, rotationItem -> - val oldIndexItem = mLastAdDataSourceList[index] - if (rotationItem?.path != oldIndexItem?.path) { + val oldIndexItem = mLastMediaDataSourceList[index] + if (rotationItem?.fileUrl != oldIndexItem?.fileUrl) { return true } } @@ -204,31 +206,31 @@ object AdDataSourceManager { return false } - private fun updateAdDataSource(newDataList: List) { - mLastAdDataSourceList.clear() - mLastAdDataSourceList.addAll(newDataList) - mAdDataSourceListenerMap.forEach { + private fun updateMediaDataSource(newDataList: List) { + mLastMediaDataSourceList.clear() + mLastMediaDataSourceList.addAll(newDataList) + mMediaDataSourceListenerMap.forEach { val listener = it.value - listener.onAdDataSourceChanged(newDataList) + listener.onMediaDataSourceChanged(newDataList) } } } -interface IAdDataSourceListener { - fun onAdDataSourceChanged(list: List) +interface IMediaDataSourceListener { + fun onMediaDataSourceChanged(list: List) } -interface IAdNetworkApi { +interface IMediaNetworkApi { @Headers("Content-type:application/json;charset=UTF-8") @GET("/platform/biz/adv/screen/advs") - fun queryAdDataFromMis( + fun queryMediaDataFromMis( @Query("sn") sn: String, @Query("screenType") screenType: String - ): Observable + ): Observable } -data class AdData( +data class MediaData( var id: String?, var title: String?, //素材标题 var brand: String?, @@ -239,15 +241,15 @@ data class AdData( var apply_screen: Int = 0 //应用屏幕类型: 1司机屏幕 2乘客屏 ) -data class AdDataResp(val data: List) : BaseData() { +data class MediaDataResp(val data: List) : BaseData() { companion object { - fun toMediaItemList(adDataList: List?): List { + fun toMediaItemList(mediaDataList: List?): List { val rotationItemList = mutableListOf() - adDataList?.forEach { + mediaDataList?.forEach { val rotationItem = MediaItem( - path = if (TextUtils.isEmpty(it.file_path)) "" else "${it.file_path}", - type = if (it.file_type == 1) MEDIA_TYPE_VIDEO else MEDIA_TYPE_IMAGE, - cacheImgPath = if (TextUtils.isEmpty(it.cover_path)) "" else "${it.cover_path}", + fileUrl = if (TextUtils.isEmpty(it.file_path)) "" else "${it.file_path}", + fileType = if (it.file_type == 1) MEDIA_TYPE_VIDEO else MEDIA_TYPE_IMAGE, + coverImageUrl = if (TextUtils.isEmpty(it.cover_path)) "" else "${it.cover_path}", title = if (TextUtils.isEmpty(it.title)) "" else "${it.title}" ) rotationItemList.add(rotationItem) diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaFileCacheManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaFileCacheManager.kt index 56bd0274dc..9d10106a5e 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaFileCacheManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaFileCacheManager.kt @@ -13,7 +13,7 @@ import java.io.File /** * 宣传视频文件本地缓存管理类 * 1, 统一了本地缓存文件的存放目录 - * 2，统一了本地缓存文件的命名，base64编码 + * 2，统一了本地缓存文件的命名，md5编码 */ object MediaFileCacheManager { diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt index 73f6b4eb5b..922cfa01dc 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaLoopPlayView.kt @@ -140,14 +140,14 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter private fun addItemView(item: MediaItem) { if (item.isImageType()) { val imageView = AdvanceImageView(mContext) - imageView.initImageUrlData(item.path) + imageView.initImageUrlData(item.fileUrl) mItemViewList.add(imageView) } else if (item.isVideoType()) { val videoView = AdvanceVideoView(mContext) - videoView.initVideoUrlData(item.path, item.cacheImgPath) + videoView.initVideoUrlData(item.fileUrl, item.coverImageUrl) mItemViewList.add(videoView) } else { - CallerLogger.d(MediaLoopPlayView.TAG, "addItemView 不支持的文件类型：${item.type}") + CallerLogger.d(MediaLoopPlayView.TAG, "addItemView 不支持的文件类型：${item.fileType}") } } @@ -162,7 +162,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter if (mItemViewList[currentPosition] is AdvanceVideoView) { CallerLogger.d( MediaLoopPlayView.TAG, - "startLoopPlay: AdvanceVideoView, url=${currentMediaItem.path}" + "startLoopPlay: AdvanceVideoView, url=${currentMediaItem.fileUrl}" ) val videoView = mItemViewList[currentPosition] as AdvanceVideoView videoView.setThumbImageViewVisible() @@ -170,7 +170,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter } else if (mItemViewList[currentPosition] is AdvanceImageView) { CallerLogger.d( MediaLoopPlayView.TAG, - "startLoopPlay: AdvanceImageView, url=${currentMediaItem.path}" + "startLoopPlay: AdvanceImageView, url=${currentMediaItem.fileUrl}" ) val imageView = mItemViewList[currentPosition] as AdvanceImageView imageView.displayImage() @@ -178,7 +178,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter } else { CallerLogger.d( MediaLoopPlayView.TAG, - "startLoopPlay 不支持的文件类型：${currentMediaItem.type}, url=${currentMediaItem.path}" + "startLoopPlay 不支持的文件类型：${currentMediaItem.fileType}, url=${currentMediaItem.fileUrl}" ) } } @@ -245,7 +245,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter val currentItemView = mItemViewList[currentPosition] CallerLogger.d( MediaLoopPlayView.TAG, - "playNextItemView, currentPosition=$currentPosition, type=${currentMediaItem.type}, url=${currentMediaItem.path}" + "playNextItemView, currentPosition=$currentPosition, type=${currentMediaItem.fileType}, url=${currentMediaItem.fileUrl}" ) if (currentItemView is AdvanceVideoView) { currentItemView.onVideoReset() @@ -254,7 +254,7 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter currentItemView.clearLocalErrorVideo() } if (mItemViewList.size == 1) { - currentItemView.startPlay(currentMediaItem.path) + currentItemView.startPlay(currentMediaItem.fileUrl) return } } diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerFragment.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerFragment.kt index d0a81c9f48..4e8bdfa75d 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerFragment.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/media/MediaPlayerFragment.kt @@ -14,7 +14,7 @@ import kotlinx.android.synthetic.main.fragment_video_player.imageVideoRotationVi * @date: 2022/4/12 */ class MediaPlayerFragment : - MvpFragment() { + MvpFragment() { companion object { private val TAG = MediaPlayerFragment::class.java.simpleName @@ -26,8 +26,8 @@ class MediaPlayerFragment : return R.layout.fragment_video_player } - override fun createPresenter(): VideoPlayerPresenter { - return VideoPlayerPresenter(this) + override fun createPresenter(): MediaPlayerPresenter { + return MediaPlayerPresenter(this) } override fun getTagName(): String { @@ -36,8 +36,8 @@ class MediaPlayerFragment : override fun initViews() { MediaFileCacheManager.createFileCacheDir(MainMoGoApplication.getApp().applicationContext) - AdDataSourceManager.init(TAG, object : IAdDataSourceListener { - override fun onAdDataSourceChanged(list: List) { + MediaDataSourceManager.init(TAG, object : IMediaDataSourceListener { + override fun onMediaDataSourceChanged(list: List) { val isNewData = arrayListOf.isNotEmpty() CallerLogger.d( TAG, "onAdDataSourceChanged：isNewData=$isNewData, list=${GsonUtils.toJson(list)}" @@ -66,10 +66,10 @@ class MediaPlayerFragment : } override fun onDestroy() { - AdDataSourceManager.unInit(TAG) + MediaDataSourceManager.unInit(TAG) super.onDestroy() } } -class VideoPlayerPresenter(view: MediaPlayerFragment?) : +class MediaPlayerPresenter(view: MediaPlayerFragment?) : Presenter(view) \ No newline at end of file diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt index 68ce9ef24e..c42ef8645b 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt +++ b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/video/PM2VideoFragment.kt @@ -55,8 +55,8 @@ class PM2VideoFragment : try { arrayListOf.clear() - var datas: MediaDataList = GsonUtils.fromJson(FunctionBuildConfig.tempConfig,object : TypeToken() {}.type) - arrayListOf.addAll(datas.ads) + var datas: MediaDataList = GsonUtils.fromJson(FunctionBuildConfig.mediaUrlConfig,object : TypeToken() {}.type) + arrayListOf.addAll(datas.medias) } catch (e: Exception) { e.printStackTrace() } diff --git a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt index 8f10841bf4..63dc9a15aa 100644 --- a/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt +++ b/OCH/shuttle/passenger/src/m2/java/com/mogo/och/bus/passenger/ui/widget/video/AdvancePagerAdapter.kt @@ -86,13 +86,13 @@ class AdvancePagerAdapter(context: Context, viewPager: ViewPager) : PagerAdapter } private fun addView(item: MediaItem) { - if (item.type == 1) { // 表示视频 + if (item.fileType == 1) { // 表示视频 val videoView = AdvanceVideoView(mContext) - videoView.setVideoPath(item.path,item.cacheImgPath) + videoView.setVideoPath(item.fileUrl,item.coverImageUrl) viewList.add(videoView) } else { // 表示图片 val imageView = AdvanceImageView(mContext) - imageView.setImagePath(item.path) + imageView.setImagePath(item.fileUrl) viewList.add(imageView) } } diff --git a/app/build.gradle b/app/build.gradle index b2792e571b..8b03050831 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -148,26 +148,26 @@ android { dimension "project" buildConfigField 'boolean', 'secure', "true" buildConfigField 'String', 'URLs', "\"${readFileToJson("mogo").replace("\"", "\\\"")}\"" - buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("mogo").replace("\"", "\\\"")}\"" + buildConfigField 'String', 'mediaUrlConfig', "\"${readMediaUrlConfigFromJsonFile("mogo").replace("\"", "\\\"")}\"" } yantai { dimension "project" buildConfigField 'boolean', 'secure', "false" buildConfigField 'String', 'URLs', "\"${readFileToJson("yantai").replace("\"", "\\\"")}\"" - buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("yantai").replace("\"", "\\\"")}\"" + buildConfigField 'String', 'mediaUrlConfig', "\"${readMediaUrlConfigFromJsonFile("yantai").replace("\"", "\\\"")}\"" } dali { dimension "project" buildConfigField 'boolean', 'secure', "false" buildConfigField 'String', 'URLs', "\"${readFileToJson("dali").replace("\"", "\\\"")}\"" - buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("dali").replace("\"", "\\\"")}\"" + buildConfigField 'String', 'mediaUrlConfig', "\"${readMediaUrlConfigFromJsonFile("dali").replace("\"", "\\\"")}\"" } saas { dimension "project" buildConfigField 'boolean', 'secure', "false" buildConfigField 'String', 'URLs', "\"${readFileToJson("saas").replace("\"", "\\\"")}\"" - buildConfigField 'String', 'tempConfig', "\"${readFileToJsonTemp("saas").replace("\"", "\\\"")}\"" + buildConfigField 'String', 'mediaUrlConfig', "\"${readMediaUrlConfigFromJsonFile("saas").replace("\"", "\\\"")}\"" } // 配置网络环境，QA、线上、演示 qa { @@ -395,10 +395,15 @@ def variantName() { } -Object readFileToJsonTemp(env){ +/** + * 读取各车型宣传视频本地配置 + * @param env + * @return + */ +Object readMediaUrlConfigFromJsonFile(env){ try { // 加载config.json 文件 - File file = new File("${rootDir}/app/config/tempConfig.json") + File file = new File("${rootDir}/app/config/MediaUrlConfig.json") def jsonSlurper = new JsonSlurper() // 解析json def config = jsonSlurper.parse(file) diff --git a/app/config/MediaUrlConfig.json b/app/config/MediaUrlConfig.json new file mode 100644 index 0000000000..70bdfb3c61 --- /dev/null +++ b/app/config/MediaUrlConfig.json @@ -0,0 +1,490 @@ +{ + "mogo": { + "shuttlepassengerochjl": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "fileType": 1, + "coverImageUrl": "", + "title": "2" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "title": "3" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "4" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "5" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "6" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "7" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "8" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "fileType": 1, + "coverImageUrl": "", + "title": "9" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "title": "10" + } + ] + }, + "buspassengerochjl": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "fileType": 1, + "coverImageUrl": "", + "title": "2" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "title": "3" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "4" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "5" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "6" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "7" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "8" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "fileType": 1, + "coverImageUrl": "", + "title": "9" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "title": "10" + } + ] + }, + "shuttlepassengerochm2": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "fileType": 2, + "coverImageUrl": "", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "fileType": 2, + "coverImageUrl": "", + "title": "2" + } + ] + } + }, + "dali": { + "shuttlepassengerochjl": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "fileType": 1, + "coverImageUrl": "", + "title": "2" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "title": "3" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "4" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "5" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "6" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "7" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "8" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "fileType": 1, + "coverImageUrl": "", + "title": "9" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "title": "10" + } + ] + }, + "buspassengerochjl": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "fileType": 1, + "coverImageUrl": "", + "title": "2" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "title": "3" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "4" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "5" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "6" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "7" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "8" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "fileType": 1, + "coverImageUrl": "", + "title": "9" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "title": "10" + } + ] + }, + "shuttlepassengerochm2": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "fileType": 2, + "coverImageUrl": "", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "fileType": 2, + "coverImageUrl": "", + "title": "2" + } + ] + } + }, + "yantai": { + "shuttlepassengerochjl": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", + "title": "2" + } + ] + }, + "buspassengerochjl": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", + "title": "2" + } + ] + }, + "shuttlepassengerochm2": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "fileType": 2, + "coverImageUrl": "", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "fileType": 2, + "coverImageUrl": "", + "title": "2" + } + ] + } + }, + "saas": { + "shuttlepassengerochjl": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "fileType": 1, + "coverImageUrl": "", + "title": "2" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "title": "3" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "4" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "5" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "6" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "7" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "8" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "fileType": 1, + "coverImageUrl": "", + "title": "9" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "title": "10" + } + ] + }, + "buspassengerochjl": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "fileType": 1, + "coverImageUrl": "", + "title": "2" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", + "title": "3" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "4" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "5" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", + "title": "6" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "7" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", + "fileType": 1, + "coverImageUrl": "", + "title": "8" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "fileType": 1, + "coverImageUrl": "", + "title": "9" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", + "fileType": 2, + "coverImageUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", + "title": "10" + } + ] + }, + "shuttlepassengerochm2": { + "medias": [ + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "fileType": 2, + "coverImageUrl": "", + "title": "1" + }, + { + "fileUrl": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", + "fileType": 2, + "coverImageUrl": "", + "title": "2" + } + ] + } + } +} diff --git a/app/config/tempConfig.json b/app/config/tempConfig.json deleted file mode 100644 index fc00dcab9a..0000000000 --- a/app/config/tempConfig.json +++ /dev/null @@ -1,490 +0,0 @@ -{ - "mogo": { - "shuttlepassengerochjl": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", - "type": 0, - "cacheImgPath": "", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "type": 0, - "cacheImgPath": "", - "title": "2" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "title": "3" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "type": 0, - "cacheImgPath": "", - "title": "4" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "5" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "6" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", - "type": 0, - "cacheImgPath": "", - "title": "7" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", - "type": 0, - "cacheImgPath": "", - "title": "8" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "type": 0, - "cacheImgPath": "", - "title": "9" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "title": "10" - } - ] - }, - "buspassengerochjl": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", - "type": 0, - "cacheImgPath": "", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "type": 0, - "cacheImgPath": "", - "title": "2" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "title": "3" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "type": 0, - "cacheImgPath": "", - "title": "4" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "5" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "6" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", - "type": 0, - "cacheImgPath": "", - "title": "7" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", - "type": 0, - "cacheImgPath": "", - "title": "8" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "type": 0, - "cacheImgPath": "", - "title": "9" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "title": "10" - } - ] - }, - "shuttlepassengerochm2": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", - "type": 1, - "cacheImgPath": "", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", - "type": 1, - "cacheImgPath": "", - "title": "2" - } - ] - } - }, - "dali": { - "shuttlepassengerochjl": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", - "type": 0, - "cacheImgPath": "", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "type": 0, - "cacheImgPath": "", - "title": "2" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "title": "3" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "type": 0, - "cacheImgPath": "", - "title": "4" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "5" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "6" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", - "type": 0, - "cacheImgPath": "", - "title": "7" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", - "type": 0, - "cacheImgPath": "", - "title": "8" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "type": 0, - "cacheImgPath": "", - "title": "9" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "title": "10" - } - ] - }, - "buspassengerochjl": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", - "type": 0, - "cacheImgPath": "", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "type": 0, - "cacheImgPath": "", - "title": "2" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "title": "3" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "type": 0, - "cacheImgPath": "", - "title": "4" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "5" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "6" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", - "type": 0, - "cacheImgPath": "", - "title": "7" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", - "type": 0, - "cacheImgPath": "", - "title": "8" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "type": 0, - "cacheImgPath": "", - "title": "9" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "title": "10" - } - ] - }, - "shuttlepassengerochm2": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", - "type": 1, - "cacheImgPath": "", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", - "type": 1, - "cacheImgPath": "", - "title": "2" - } - ] - } - }, - "yantai": { - "shuttlepassengerochjl": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", - "title": "2" - } - ] - }, - "buspassengerochjl": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681210971943/yangmadou.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1680774790614/yangmadao_photo.jpg", - "title": "2" - } - ] - }, - "shuttlepassengerochm2": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", - "type": 1, - "cacheImgPath": "", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", - "type": 1, - "cacheImgPath": "", - "title": "2" - } - ] - } - }, - "saas": { - "shuttlepassengerochjl": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", - "type": 0, - "cacheImgPath": "", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "type": 0, - "cacheImgPath": "", - "title": "2" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "title": "3" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "type": 0, - "cacheImgPath": "", - "title": "4" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "5" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "6" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", - "type": 0, - "cacheImgPath": "", - "title": "7" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", - "type": 0, - "cacheImgPath": "", - "title": "8" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "type": 0, - "cacheImgPath": "", - "title": "9" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "title": "10" - } - ] - }, - "buspassengerochjl": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357256102/1.jpg", - "type": 0, - "cacheImgPath": "", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "type": 0, - "cacheImgPath": "", - "title": "2" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357557335/3.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357382357/2.png", - "title": "3" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "type": 0, - "cacheImgPath": "", - "title": "4" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357834634/5.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "5" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676358660379/6.m4v", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676357598483/4.jpg", - "title": "6" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360154589/7.jpg", - "type": 0, - "cacheImgPath": "", - "title": "7" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360185500/8.jpg", - "type": 0, - "cacheImgPath": "", - "title": "8" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "type": 0, - "cacheImgPath": "", - "title": "9" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360274126/10.mp4", - "type": 1, - "cacheImgPath": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1676360224773/9.png", - "title": "10" - } - ] - }, - "shuttlepassengerochm2": { - "ads": [ - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", - "type": 1, - "cacheImgPath": "", - "title": "1" - }, - { - "path": "https://img.zhidaohulian.com/fileServer/online_car_hailing/1681716116231/6923474a99a1983c9a0410ad3357888d.mov", - "type": 1, - "cacheImgPath": "", - "title": "2" - } - ] - } - } -} 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 df60093489..6d0db996c1 100644 --- a/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt @@ -46,8 +46,8 @@ object ConfigStartUp { FunctionBuildConfig.urlJson = GsonUtils.fromJson(BuildConfig.URLs, UrlConfig::class.java) //不能启动自动驾驶的档位 FunctionBuildConfig.unableLaunchAutopilotGear = BuildConfig.UNABLE_LAUNCH_AUTOPILOT_GEAR - // 临时配置json - FunctionBuildConfig.tempConfig = BuildConfig.tempConfig + // 各车型宣传视频本地配置json + FunctionBuildConfig.mediaUrlConfig = BuildConfig.mediaUrlConfig //是否支持Patch升级 FunctionBuildConfig.isSupportPatchUpgrade = BuildConfig.IS_SUPPORT_PATCH_UPGRADE diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt index 5345c8a129..fe245caf17 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt @@ -109,13 +109,12 @@ object FunctionBuildConfig { var appIdentityMode = "Taxi_Driver_Base" /** - * 临时配置json + * 各车型宣传视频本地配置 * 广告json - * */ @Volatile @JvmField - var tempConfig = "" + var mediaUrlConfig = "" /**