Skip to content

U
uni-component

DCloud / uni-component

通知 261
Star 6
Fork 3
U
uni-component
提交 852596eb 编写于 作者: DCloud-yyl's avatar DCloud-yyl
浏览文件
操作

Merge branch 'dev' into alpha 

# Conflicts:
#	uni_modules/uni-video/utssdk/app-ios/index.vue
#	uni_modules/uni-video/utssdk/interface.uts
上级 cc2c4032 4a3ca731
显示空白变更内容
内联 并排
Showing with 1259 addition and 882 deletion
uni_modules/uni-video/utssdk/app-ios/index.vue
浏览文件 @ 852596eb
<template> <template>
<view style="width: 300px;height: 225px;"> <view style="width: 300px;height: 225px;">
<slot /> <slot />
...@@ -418,7 +417,7 @@ ...@@ -418,7 +417,7 @@
stop: function () { stop: function () {
this.present?.stop() this.present?.stop()
}, },
/** /** 
* 显示状态栏，仅在iOS全屏下有效 * 显示状态栏，仅在iOS全屏下有效
*/ */
showStatusBar: function () { showStatusBar: function () {
......
uni_modules/uni-video/utssdk/interface.uts
浏览文件 @ 852596eb
export type CreateVideoContext = (videoId : string.VideoIdString, component ?: ComponentPublicInstance | null) => VideoContext | null; export type CreateVideoContext = (videoId: string.VideoIdString, component?: ComponentPublicInstance | null) => VideoContext | null;
export type Danmu = { export type Danmu = {
/** /**
* 弹幕文字 * 弹幕文字
*/ */
text ?: string | null, text?: string | null,
/** /**
* 弹幕颜色 * 弹幕颜色
*/ */
color ?: string | null, color?: string | null,
/** /**
* 显示时刻 * 显示时刻
*/ */
time ?: number | null time?: number | null
}; };
export type RequestFullScreenOptions = { export type RequestFullScreenOptions = {
...@@ -34,6 +34,48 @@ export type RequestFullScreenOptions = { ...@@ -34,6 +34,48 @@ export type RequestFullScreenOptions = {
* "uniVer": "√", * "uniVer": "√",
* "unixVer": "4.11" * "unixVer": "4.11"
* } * }
* },
* "mp": {
* "weixin": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "4.41"
* },
* "alipay": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "baidu": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "toutiao": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "lark": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "qq": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "kuaishou": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "jd": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* }
* }, * },
* "web": { * "web": {
* "uniVer": "x", * "uniVer": "x",
...@@ -41,7 +83,7 @@ export type RequestFullScreenOptions = { ...@@ -41,7 +83,7 @@ export type RequestFullScreenOptions = {
* } * }
* } * }
*/ */
direction ?: number | null direction?: number | null
}; };
export interface VideoContext { export interface VideoContext {
...@@ -64,6 +106,48 @@ export interface VideoContext { ...@@ -64,6 +106,48 @@ export interface VideoContext {
* "uniVer": "4.23", * "uniVer": "4.23",
* "unixVer": "x" * "unixVer": "x"
* } * }
* },
* "mp": {
* "weixin": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "4.41"
* },
* "alipay": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "baidu": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "toutiao": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "lark": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "qq": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "kuaishou": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "jd": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* }
* }, * },
* "web": { * "web": {
* "uniVer": "√", * "uniVer": "√",
...@@ -72,7 +156,7 @@ export interface VideoContext { ...@@ -72,7 +156,7 @@ export interface VideoContext {
* } * }
* @uniVueVersion 2,3 * @uniVueVersion 2,3
*/ */
play() : void; play(): void;
/** /**
* @description 暂停 * @description 暂停
* @uniPlatform { * @uniPlatform {
...@@ -92,6 +176,48 @@ export interface VideoContext { ...@@ -92,6 +176,48 @@ export interface VideoContext {
* "uniVer": "4.23", * "uniVer": "4.23",
* "unixVer": "x" * "unixVer": "x"
* } * }
* },
* "mp": {
* "weixin": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "4.41"
* },
* "alipay": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "baidu": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "toutiao": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "lark": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "qq": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "kuaishou": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "jd": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* }
* }, * },
* "web": { * "web": {
* "uniVer": "√", * "uniVer": "√",
...@@ -100,7 +226,7 @@ export interface VideoContext { ...@@ -100,7 +226,7 @@ export interface VideoContext {
* } * }
* @uniVueVersion 2,3 * @uniVueVersion 2,3
*/ */
pause() : void; pause(): void;
/** /**
* @description 跳转到指定位置 * @description 跳转到指定位置
* @param {number} position 跳转到指定位置(秒) * @param {number} position 跳转到指定位置(秒)
...@@ -121,6 +247,48 @@ export interface VideoContext { ...@@ -121,6 +247,48 @@ export interface VideoContext {
* "uniVer": "4.23", * "uniVer": "4.23",
* "unixVer": "x" * "unixVer": "x"
* } * }
* },
* "mp": {
* "weixin": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "4.41"
* },
* "alipay": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "baidu": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "toutiao": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "lark": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "qq": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "kuaishou": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "jd": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* }
* }, * },
* "web": { * "web": {
* "uniVer": "√", * "uniVer": "√",
...@@ -129,7 +297,7 @@ export interface VideoContext { ...@@ -129,7 +297,7 @@ export interface VideoContext {
* } * }
* @uniVueVersion 2,3 * @uniVueVersion 2,3
*/ */
seek(position : number) : void; seek(position: number): void;
/** /**
* @description 停止视频 * @description 停止视频
* @uniPlatform { * @uniPlatform {
...@@ -149,6 +317,48 @@ export interface VideoContext { ...@@ -149,6 +317,48 @@ export interface VideoContext {
* "uniVer": "4.23", * "uniVer": "4.23",
* "unixVer": "x" * "unixVer": "x"
* } * }
* },
* "mp": {
* "weixin": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "4.41"
* },
* "alipay": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "baidu": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "toutiao": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "lark": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "qq": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "kuaishou": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "jd": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* }
* }, * },
* "web": { * "web": {
* "uniVer": "√", * "uniVer": "√",
...@@ -157,7 +367,7 @@ export interface VideoContext { ...@@ -157,7 +367,7 @@ export interface VideoContext {
* } * }
* @uniVueVersion 2,3 * @uniVueVersion 2,3
*/ */
stop() : void; stop(): void;
/** /**
* @description 发送弹幕 * @description 发送弹幕
* @param {Danmu} 属性 text, color * @param {Danmu} 属性 text, color
...@@ -178,6 +388,48 @@ export interface VideoContext { ...@@ -178,6 +388,48 @@ export interface VideoContext {
* "uniVer": "4.23", * "uniVer": "4.23",
* "unixVer": "x" * "unixVer": "x"
* } * }
* },
* "mp": {
* "weixin": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "4.41"
* },
* "alipay": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "baidu": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "toutiao": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "lark": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "qq": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "kuaishou": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "jd": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* }
* }, * },
* "web": { * "web": {
* "uniVer": "√", * "uniVer": "√",
...@@ -186,7 +438,7 @@ export interface VideoContext { ...@@ -186,7 +438,7 @@ export interface VideoContext {
* } * }
* @uniVueVersion 2,3 * @uniVueVersion 2,3
*/ */
sendDanmu(danmu : Danmu) : void; sendDanmu(danmu: Danmu): void;
/** /**
* @description 设置倍速播放 * @description 设置倍速播放
* @param {number} rate, 支持倍率 0.5/0.8/1.0/1.25/1.5 * @param {number} rate, 支持倍率 0.5/0.8/1.0/1.25/1.5
...@@ -207,6 +459,48 @@ export interface VideoContext { ...@@ -207,6 +459,48 @@ export interface VideoContext {
* "uniVer": "4.23", * "uniVer": "4.23",
* "unixVer": "x" * "unixVer": "x"
* } * }
* },
* "mp": {
* "weixin": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "4.41"
* },
* "alipay": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "baidu": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "toutiao": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "lark": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "qq": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "kuaishou": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "jd": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* }
* }, * },
* "web": { * "web": {
* "uniVer": "√", * "uniVer": "√",
...@@ -215,7 +509,7 @@ export interface VideoContext { ...@@ -215,7 +509,7 @@ export interface VideoContext {
* } * }
* @uniVueVersion 2,3 * @uniVueVersion 2,3
*/ */
playbackRate(rate : number) : void; playbackRate(rate: number): void;
/** /**
* @description 进入全屏 * @description 进入全屏
* @param {RequestFullScreenOptions} direction, 0|正常竖向, 90|屏幕逆时针90度, -90|屏幕顺时针90度 * @param {RequestFullScreenOptions} direction, 0|正常竖向, 90|屏幕逆时针90度, -90|屏幕顺时针90度
...@@ -236,6 +530,48 @@ export interface VideoContext { ...@@ -236,6 +530,48 @@ export interface VideoContext {
* "uniVer": "4.23", * "uniVer": "4.23",
* "unixVer": "x" * "unixVer": "x"
* } * }
* },
* "mp": {
* "weixin": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "4.41"
* },
* "alipay": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "baidu": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "toutiao": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "lark": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "qq": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "kuaishou": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "jd": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* }
* }, * },
* "web": { * "web": {
* "uniVer": "√", * "uniVer": "√",
...@@ -244,7 +580,7 @@ export interface VideoContext { ...@@ -244,7 +580,7 @@ export interface VideoContext {
* } * }
* @uniVueVersion 2,3 * @uniVueVersion 2,3
*/ */
requestFullScreen(direction ?: RequestFullScreenOptions | null) : void; requestFullScreen(direction?: RequestFullScreenOptions | null): void;
/** /**
* 退出全屏 * 退出全屏
* @description 退出全屏 * @description 退出全屏
...@@ -265,6 +601,48 @@ export interface VideoContext { ...@@ -265,6 +601,48 @@ export interface VideoContext {
* "uniVer": "4.23", * "uniVer": "4.23",
* "unixVer": "x" * "unixVer": "x"
* } * }
* },
* "mp": {
* "weixin": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "4.41"
* },
* "alipay": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "baidu": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "toutiao": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "lark": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "qq": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "kuaishou": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* },
* "jd": {
* "hostVer": "√",
* "uniVer": "√",
* "unixVer": "x"
* }
* }, * },
* "web": { * "web": {
* "uniVer": "√", * "uniVer": "√",
...@@ -273,7 +651,7 @@ export interface VideoContext { ...@@ -273,7 +651,7 @@ export interface VideoContext {
* } * }
* @uniVueVersion 2,3 * @uniVueVersion 2,3
*/ */
exitFullScreen() : void; exitFullScreen(): void;
} }
export interface Uni { export interface Uni {
...@@ -305,7 +683,7 @@ export interface Uni { ...@@ -305,7 +683,7 @@ export interface Uni {
* "weixin": { * "weixin": {
* "hostVer": "√", * "hostVer": "√",
* "uniVer": "√", * "uniVer": "√",
* "unixVer": "x" * "unixVer": "4.41"
* }, * },
* "alipay": { * "alipay": {
* "hostVer": "1.10.0", * "hostVer": "1.10.0",
...@@ -352,7 +730,7 @@ export interface Uni { ...@@ -352,7 +730,7 @@ export interface Uni {
* @tutorial https://doc.dcloud.net.cn/uni-app-x/api/create-video-context.html#createvideocontext * @tutorial https://doc.dcloud.net.cn/uni-app-x/api/create-video-context.html#createvideocontext
* *
*/ */
createVideoContext : CreateVideoContext createVideoContext: CreateVideoContext
} }
/** /**
...@@ -363,35 +741,35 @@ interface UniVideoEvent { ...@@ -363,35 +741,35 @@ interface UniVideoEvent {
/** /**
* 是否冒泡 * 是否冒泡
*/ */
bubbles : boolean bubbles: boolean
/** /**
* 是否可以取消 * 是否可以取消
*/ */
cancelable : boolean cancelable: boolean
/** /**
* 事件类型 * 事件类型
*/ */
type : string type: string
/** /**
* 触发事件的组件 * 触发事件的组件
*/ */
target ?: UniElement | null target?: UniElement | null
/** /**
* 当前组件 * 当前组件
*/ */
currentTarget ?: UniElement | null currentTarget?: UniElement | null
/** /**
* 事件发生时的时间戳 * 事件发生时的时间戳
*/ */
timeStamp : Long timeStamp: Long
/** /**
* 阻止当前事件的进一步传播 * 阻止当前事件的进一步传播
*/ */
stopPropagation() : void stopPropagation(): void
/** /**
* 阻止当前事件的默认行为 * 阻止当前事件的默认行为
*/ */
preventDefault() : void preventDefault(): void
} }
/** /**
...@@ -399,18 +777,18 @@ interface UniVideoEvent { ...@@ -399,18 +777,18 @@ interface UniVideoEvent {
* 播放进度变化时触发 * 播放进度变化时触发
*/ */
export interface UniVideoTimeUpdateEvent extends UniVideoEvent { export interface UniVideoTimeUpdateEvent extends UniVideoEvent {
detail : UniVideoTimeUpdateEventDetail detail: UniVideoTimeUpdateEventDetail
} }
export type UniVideoTimeUpdateEventDetail = { export type UniVideoTimeUpdateEventDetail = {
/** /**
* 当前进度 * 当前进度
*/ */
currentTime : number, currentTime: number,
/** /**
* 总进度 * 总进度
*/ */
duration : number duration: number
} }
/** /**
...@@ -418,18 +796,18 @@ export type UniVideoTimeUpdateEventDetail = { ...@@ -418,18 +796,18 @@ export type UniVideoTimeUpdateEventDetail = {
* 当视频进入和退出全屏是触发 * 当视频进入和退出全屏是触发
*/ */
export interface UniVideoFullScreenChangeEvent extends UniVideoEvent { export interface UniVideoFullScreenChangeEvent extends UniVideoEvent {
detail : UniVideoFullScreenChangeEventDetail detail: UniVideoFullScreenChangeEventDetail
} }
export type UniVideoFullScreenChangeEventDetail = { export type UniVideoFullScreenChangeEventDetail = {
/** /**
* 是否全屏 * 是否全屏
*/ */
fullScreen : boolean, fullScreen: boolean,
/** /**
* 横竖屏，取值 vertical 或 horizontal * 横竖屏，取值 vertical 或 horizontal
*/ */
direction : string direction: string
} }
/** /**
...@@ -437,7 +815,7 @@ export type UniVideoFullScreenChangeEventDetail = { ...@@ -437,7 +815,7 @@ export type UniVideoFullScreenChangeEventDetail = {
* 视频播放出错时触发 * 视频播放出错时触发
*/ */
export interface UniVideoErrorEvent extends UniVideoEvent { export interface UniVideoErrorEvent extends UniVideoEvent {
detail : VideoError detail: VideoError
} }
/** /**
...@@ -449,7 +827,7 @@ export interface UniVideoErrorEvent extends UniVideoEvent { ...@@ -449,7 +827,7 @@ export interface UniVideoErrorEvent extends UniVideoEvent {
export type VideoErrorCode = 100001 | 200001 | 300001 export type VideoErrorCode = 100001 | 200001 | 300001
export interface VideoError extends IUniError { export interface VideoError extends IUniError {
errCode : VideoErrorCode errCode: VideoErrorCode
} }
/** /**
...@@ -457,14 +835,14 @@ export interface VideoError extends IUniError { ...@@ -457,14 +835,14 @@ export interface VideoError extends IUniError {
* 加载进度变化时触发 * 加载进度变化时触发
*/ */
export interface UniVideoProgressEvent extends UniVideoEvent { export interface UniVideoProgressEvent extends UniVideoEvent {
detail : UniVideoProgressEventDetail detail: UniVideoProgressEventDetail
} }
export type UniVideoProgressEventDetail = { export type UniVideoProgressEventDetail = {
/** /**
* 加载进度百分比 * 加载进度百分比
*/ */
buffered : number buffered: number
} }
/** /**
...@@ -472,26 +850,26 @@ export type UniVideoProgressEventDetail = { ...@@ -472,26 +850,26 @@ export type UniVideoProgressEventDetail = {
* 视频播放全屏播放时点击事件 * 视频播放全屏播放时点击事件
*/ */
export interface UniVideoFullScreenClickEvent extends UniVideoEvent { export interface UniVideoFullScreenClickEvent extends UniVideoEvent {
detail : UniVideoFullScreenClickEventDetail detail: UniVideoFullScreenClickEventDetail
} }
export type UniVideoFullScreenClickEventDetail = { export type UniVideoFullScreenClickEventDetail = {
/** /**
* 点击点相对于屏幕左侧边缘的 X 轴坐标 * 点击点相对于屏幕左侧边缘的 X 轴坐标
*/ */
screenX : number, screenX: number,
/** /**
* 点击点相对于屏幕顶部边缘的 Y 轴坐标 * 点击点相对于屏幕顶部边缘的 Y 轴坐标
*/ */
screenY : number, screenY: number,
/** /**
* 屏幕总宽度 * 屏幕总宽度
*/ */
screenWidth : number, screenWidth: number,
/** /**
* 屏幕总高度 * 屏幕总高度
*/ */
screenHeight : number screenHeight: number
} }
/** /**
...@@ -499,14 +877,14 @@ export type UniVideoFullScreenClickEventDetail = { ...@@ -499,14 +877,14 @@ export type UniVideoFullScreenClickEventDetail = {
* 切换播放控件显示隐藏时触发 * 切换播放控件显示隐藏时触发
*/ */
export interface UniVideoControlsToggleEvent extends UniVideoEvent { export interface UniVideoControlsToggleEvent extends UniVideoEvent {
detail : UniVideoControlsToggleEventDetail detail: UniVideoControlsToggleEventDetail
} }
export type UniVideoControlsToggleEventDetail = { export type UniVideoControlsToggleEventDetail = {
/** /**
* 是否显示 * 是否显示
*/ */
show : boolean show: boolean
} }
export type VideoTimeUpdateEvent = UniVideoTimeUpdateEvent export type VideoTimeUpdateEvent = UniVideoTimeUpdateEvent
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或