From 9481bbf3f14e8f084ba38e4d37d4ce918edb9ef9 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Tue, 19 Aug 2025 16:42:17 +0200 Subject: [PATCH] Vod chat button fix, default settings in devportal --- app/src/main/assets/devportal/index.html | 24 +++++++++++++++++-- .../mainactivity/main/VideoDetailView.kt | 3 +-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/app/src/main/assets/devportal/index.html b/app/src/main/assets/devportal/index.html index 9ae84f5a..47bf94c7 100644 --- a/app/src/main/assets/devportal/index.html +++ b/app/src/main/assets/devportal/index.html @@ -1022,15 +1022,35 @@ return x.value }); + + let settingsToUse = __DEV_SETTINGS ?? {}; + if (true) { + for (let setting of this.Plugin?.currentPlugin?.settings) { + if (typeof settingsToUse[setting.variable] == "undefined") { + switch (setting?.type?.toLowerCase()) { + case "boolean": + settingsToUse[setting.variable] = setting.default === 'true'; + break; + case "dropdown": + let dropDownIndex = parseInt(setting.default); + if (dropDownIndex) { + settingsToUse[setting.variable] = setting.options[dropDownIndex]; + } + break; + } + } + } + } + if(name == "enable") { if(parameterVals.length > 0) parameterVals[0] = this.Plugin.currentPlugin; else parameterVals.push(this.Plugin.currentPlugin); if(parameterVals.length > 1) - parameterVals[1] = __DEV_SETTINGS; + parameterVals[1] = settingsToUse; else - parameterVals.push(__DEV_SETTINGS); + parameterVals.push(settingsToUse); } const func = source[name]; diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt index 006da03a..bc5b9a49 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/VideoDetailView.kt @@ -1005,8 +1005,7 @@ class VideoDetailView : ConstraintLayout { } } _slideUpOverlay?.hide(); - } else null, - if(video is JSVideoDetails && (video as JSVideoDetails).hasVODEvents()) + } else if(video is JSVideoDetails && (video as JSVideoDetails).hasVODEvents()) RoundButton(context, R.drawable.ic_chat, context.getString(R.string.vod_chat), TAG_VODCHAT) { video?.let { try {