uview-plus 3.8.126 → 3.8.128

package/components/u-upload/u-upload.vue

@@ -441,6 +441,19 @@
 					index: index == null ? this.fileList.length : index,
 				};
 			},
+			// 组装uni.uploadFile的文件参数。
+			// H5下选择结果里带的是真实File对象，直接交给uni.uploadFile；否则它只能拿blob:
+			// 地址再读回二进制，而部分webview（如微信内置浏览器）读blob:会拿到空内容，
+			// 上传就会失败（uploadFile:fail file error）。#801
+			uploadFileParams(item, name = 'file') {
+				// #ifdef H5
+				const raw = item.file || item.tempFile
+				if (typeof Blob !== 'undefined' && raw instanceof Blob) {
+					return { name, files: [{ name, file: raw }] }
+				}
+				// #endif
+				return { name, filePath: item.url }
+			},
 			async onAfterRead(file) {
 				const {
 					maxSize,
@@ -511,8 +524,7 @@
 								}
 								var uploadTask = uni.uploadFile({
 									url: res0.data.params.host,
-									filePath: lists[j].url,
-									name: 'file',
+									...this.uploadFileParams(lists[j]),
 									// fileType: 'video', // 仅支付宝小程序，且必填。
 									// header: header,
 									formData: formData,
@@ -556,8 +568,7 @@
 								// 服务器本机上传
 								var uploadTask = uni.uploadFile({
 									url: this.autoUploadApi,
-									filePath: lists[j].url,
-									name: 'file',
+									...this.uploadFileParams(lists[j]),
 									// fileType: 'video', // 仅支付宝小程序，且必填。
 									header: this.autoUploadHeader,
 									success: (uploadFileRes) => {

package/components/u-upload/utils.js

@@ -42,7 +42,10 @@ function formatVideo(res) {
 			height: res.height || 0, // APP 2.1.0+、H5、微信小程序、京东小程序
 			// #ifdef H5
 			name: res.name,
-			file: res
+			// chooseVideo 在H5已经返回了真实的File对象（res.tempFile），必须把它透出来，
+			// 和formatImage/formatMedia/formatFile保持一致。否则调用方只剩blob:地址可用，
+			// 而部分webview（如微信内置浏览器）读blob:会拿到空内容，视频就传不上去。#801
+			file: res.tempFile || res
 			// #endif
 			// #ifndef H5
 			name: res.tempFilePath.split('/').pop() + '.mp4',

package/components/u-video/danmaku.js

@@ -0,0 +1,97 @@
+/**
+ * u-video 弹幕引擎的纯逻辑部分（归一化、时间游标、轨道分配）。
+ * 与 video-utils.js 一样不引入 uni / vue，方便 Node 端直接做行为断言。
+ */
+
+// 同一轨道上两条弹幕之间的最小像素间隔
+const TRACK_GAP = 20
+
+const DANMU_TYPES = ['scroll', 'top', 'bottom']
+
+export function normalizeDanmuItem(item) {
+    const danmu = typeof item === 'string' ? { text: item } : (item || {})
+    const time = Number(danmu.time)
+    return {
+        text: danmu.text === undefined || danmu.text === null ? '' : String(danmu.text),
+        color: danmu.color || '',
+        time: Number.isFinite(time) && time > 0 ? time : 0,
+        type: DANMU_TYPES.includes(danmu.type) ? danmu.type : 'scroll'
+    }
+}
+
+// 按出现时间升序排列，播放过程中只需要向后推进游标
+export function normalizeDanmuList(list) {
+    if (!Array.isArray(list)) return []
+    return list
+        .map(normalizeDanmuItem)
+        .filter((item) => item.text !== '')
+        .sort((a, b) => a.time - b.time)
+}
+
+// 二分查找第一条「时间点不早于 time」的弹幕，拖动进度条后用它重置游标
+export function findDanmuCursor(list, time) {
+    if (!Array.isArray(list) || !list.length) return 0
+    const target = Number(time)
+    let low = 0
+    let high = list.length
+    while (low < high) {
+        const middle = (low + high) >> 1
+        if (list[middle].time < target) {
+            low = middle + 1
+        } else {
+            high = middle
+        }
+    }
+    return low
+}
+
+// 粗略估算弹幕宽度：中文按一个字宽，其余按 0.55 字宽
+export function estimateDanmuWidth(text, fontSize) {
+    const size = Number(fontSize) > 0 ? Number(fontSize) : 14
+    const content = String(text === undefined || text === null ? '' : text)
+    let units = 0
+    for (const char of content) {
+        units += char.charCodeAt(0) > 0x2e80 ? 1 : 0.55
+    }
+    return Math.ceil(units * size) + size
+}
+
+export function createDanmuState() {
+    return { tracks: [] }
+}
+
+export function resetDanmuState(state) {
+    if (state) state.tracks = []
+    return state
+}
+
+/**
+ * 取一条空闲轨道，全部占用时返回 -1（该条弹幕直接丢弃）。
+ * 滚动弹幕在尾巴完全进场后即可复用轨道；hold 用于顶/底部固定弹幕。
+ */
+export function acquireDanmuTrack(state, options = {}) {
+    const {
+        now = 0,
+        itemWidth = 0,
+        containerWidth = 0,
+        duration = 8,
+        trackCount = 1,
+        hold = 0
+    } = options
+    if (!state) return -1
+    const total = Math.max(1, Math.floor(trackCount))
+    let busyFor = Number(hold)
+    if (!Number.isFinite(busyFor) || busyFor <= 0) {
+        const distance = Number(containerWidth) + Number(itemWidth)
+        const speed = distance > 0 ? distance / (Number(duration) * 1000) : 0
+        busyFor = speed > 0 ? (Number(itemWidth) + TRACK_GAP) / speed : 0
+    }
+    for (let index = 0; index < total; index++) {
+        const freeAt = state.tracks[index]
+        if (freeAt === undefined || now >= freeAt) {
+            state.tracks[index] = now + busyFor
+            return index
+        }
+    }
+    return -1
+}

package/components/u-video/props.js

@@ -0,0 +1,205 @@
+import { defineMixin } from '../../libs/vue'
+import { registerComponentProps } from '../../libs/config/props.js'
+import VideoDefaultProps from './video'
+
+const defProps = registerComponentProps(VideoDefaultProps)
+
+export const props = defineMixin({
+    props: {
+        // 视频地址，传了 episodes 时作为兜底地址
+        src: {
+            type: String,
+            default: () => defProps.video.src
+        },
+        // 封面图
+        poster: {
+            type: String,
+            default: () => defProps.video.poster
+        },
+        title: {
+            type: String,
+            default: () => defProps.video.title
+        },
+        width: {
+            type: [String, Number],
+            default: () => defProps.video.width
+        },
+        height: {
+            type: [String, Number],
+            default: () => defProps.video.height
+        },
+        radius: {
+            type: [String, Number],
+            default: () => defProps.video.radius
+        },
+        objectFit: {
+            type: String,
+            default: () => defProps.video.objectFit
+        },
+        autoplay: {
+            type: Boolean,
+            default: () => defProps.video.autoplay
+        },
+        loop: {
+            type: Boolean,
+            default: () => defProps.video.loop
+        },
+        muted: {
+            type: Boolean,
+            default: () => defProps.video.muted
+        },
+        initialTime: {
+            type: [String, Number],
+            default: () => defProps.video.initialTime
+        },
+        // 自绘控制层总开关
+        controls: {
+            type: Boolean,
+            default: () => defProps.video.controls
+        },
+        showCenterPlayBtn: {
+            type: Boolean,
+            default: () => defProps.video.showCenterPlayBtn
+        },
+        showFullscreenBtn: {
+            type: Boolean,
+            default: () => defProps.video.showFullscreenBtn
+        },
+        showBack: {
+            type: Boolean,
+            default: () => defProps.video.showBack
+        },
+        backIcon: {
+            type: String,
+            default: () => defProps.video.backIcon
+        },
+        autoHide: {
+            type: [String, Number],
+            default: () => defProps.video.autoHide
+        },
+        showLock: {
+            type: Boolean,
+            default: () => defProps.video.showLock
+        },
+        // 倍速
+        showRate: {
+            type: Boolean,
+            default: () => defProps.video.showRate
+        },
+        rate: {
+            type: [String, Number],
+            default: () => defProps.video.rate
+        },
+        rateList: {
+            type: Array,
+            default: () => defProps.video.rateList
+        },
+        // 音量
+        showVolume: {
+            type: Boolean,
+            default: () => defProps.video.showVolume
+        },
+        volume: {
+            type: [String, Number],
+            default: () => defProps.video.volume
+        },
+        // 弹幕
+        enableDanmu: {
+            type: Boolean,
+            default: () => defProps.video.enableDanmu
+        },
+        danmuList: {
+            type: Array,
+            default: () => defProps.video.danmuList
+        },
+        danmuBtn: {
+            type: Boolean,
+            default: () => defProps.video.danmuBtn
+        },
+        danmuOpen: {
+            type: Boolean,
+            default: () => defProps.video.danmuOpen
+        },
+        danmuColor: {
+            type: String,
+            default: () => defProps.video.danmuColor
+        },
+        danmuFontSize: {
+            type: [String, Number],
+            default: () => defProps.video.danmuFontSize
+        },
+        danmuDuration: {
+            type: [String, Number],
+            default: () => defProps.video.danmuDuration
+        },
+        danmuArea: {
+            type: String,
+            default: () => defProps.video.danmuArea
+        },
+        danmuOpacity: {
+            type: [String, Number],
+            default: () => defProps.video.danmuOpacity
+        },
+        danmuMax: {
+            type: [String, Number],
+            default: () => defProps.video.danmuMax
+        },
+        // 选集
+        episodes: {
+            type: Array,
+            default: () => defProps.video.episodes
+        },
+        episodeIndex: {
+            type: [String, Number],
+            default: () => defProps.video.episodeIndex
+        },
+        episodeColumns: {
+            type: [String, Number],
+            default: () => defProps.video.episodeColumns
+        },
+        autoNext: {
+            type: Boolean,
+            default: () => defProps.video.autoNext
+        },
+        // 广告
+        ads: {
+            type: Array,
+            default: () => defProps.video.ads
+        },
+        // 原生手势
+        enableProgressGesture: {
+            type: Boolean,
+            default: () => defProps.video.enableProgressGesture
+        },
+        pageGesture: {
+            type: Boolean,
+            default: () => defProps.video.pageGesture
+        },
+        vslideGesture: {
+            type: Boolean,
+            default: () => defProps.video.vslideGesture
+        },
+        direction: {
+            type: [String, Number],
+            default: () => defProps.video.direction
+        },
+        autoPauseIfNavigate: {
+            type: Boolean,
+            default: () => defProps.video.autoPauseIfNavigate
+        },
+        autoPauseIfOpenNative: {
+            type: Boolean,
+            default: () => defProps.video.autoPauseIfOpenNative
+        },
+        videoId: {
+            type: String,
+            default: () => defProps.video.videoId
+        },
+        activeColor: {
+            type: String,
+            default: () => defProps.video.activeColor
+        }
+    }
+})
+
+export default props