提交 844f49c6 编写于 作者: DCloud-yinjiacheng's avatar DCloud-yinjiacheng

Merge branch 'dev' into alpha

# Conflicts:
#	uni_modules/uni-usercapturescreen/utssdk/interface.uts
## 1.0.4(2023-03-24)
新增开启/关闭防截屏功能
## 1.0.3(2023-03-17)
修复android平台 部分场景下js可能报错的问题
## 1.0.2(2023-03-16)
修复Android平台在小米设备无法监听的问题 修复Android平台调用uni.onUserCaptureScreen必然会触发回调的问题
## 1.0.1(2022-10-27) ## 1.0.1(2022-10-27)
修改插件描述 修改插件描述
## 1.0.0(2022-10-26) ## 1.0.0(2022-10-26)
......
{ {
"id": "uni-usercapturescreen", "id": "uni-usercapturescreen",
"displayName": "uni-usercapturescreen", "displayName": "uni-usercapturescreen",
"version": "1.0.1", "version": "1.0.4",
"description": "用户主动截屏事件监听", "description": "用户主动截屏事件监听",
"keywords": [ "keywords": [
"截屏" "截屏"
], ],
"repository": "", "repository": "",
"engines": { "engines": {
"HBuilderX": "^3.6.0" "HBuilderX": "^3.7.7"
}, },
"dcloudext": { "dcloudext": {
"type": "uts", "type": "uts",
......
...@@ -13,3 +13,9 @@ ...@@ -13,3 +13,9 @@
用户主动截屏事件。取消事件监听。 用户主动截屏事件。取消事件监听。
> 使用文档:[https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen) > 使用文档:[https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen)
### uni.setUserCaptureScreen
开启/关闭防截屏。
> 使用文档:[https://uniapp.dcloud.net.cn/api/system/capture-screen.html#setusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#setusercapturescreen)
...@@ -19,8 +19,8 @@ export type UserCaptureScreenCallback = (res : OnUserCaptureScreenCallbackResult ...@@ -19,8 +19,8 @@ export type UserCaptureScreenCallback = (res : OnUserCaptureScreenCallbackResult
* *
* @param {UserCaptureScreenCallback} callback * @param {UserCaptureScreenCallback} callback
* @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen * @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen
* @platforms APP-IOS = ^9.0,APP-ANDROID = ^19 * @platforms APP-IOS = ^9.0,APP-ANDROID = ^4.4
* @since 3.6.8 * @since 3.7.7
*/ */
export type OnUserCaptureScreen = (callback : UserCaptureScreenCallback | null) => void export type OnUserCaptureScreen = (callback : UserCaptureScreenCallback | null) => void
...@@ -30,8 +30,8 @@ export type OnUserCaptureScreen = (callback : UserCaptureScreenCallback | null) ...@@ -30,8 +30,8 @@ export type OnUserCaptureScreen = (callback : UserCaptureScreenCallback | null)
* *
* @param {UserCaptureScreenCallback} callback * @param {UserCaptureScreenCallback} callback
* @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen * @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen
* @platforms APP-IOS = ^9.0,APP-ANDROID = ^19 * @platforms APP-IOS = ^9.0,APP-ANDROID = ^4.4
* @since 3.6.8 * @since 3.7.7
*/ */
export type OffUserCaptureScreen = (callback : UserCaptureScreenCallback | null) => void export type OffUserCaptureScreen = (callback : UserCaptureScreenCallback | null) => void
...@@ -47,8 +47,6 @@ export type SetUserCaptureScreenSuccess = { ...@@ -47,8 +47,6 @@ export type SetUserCaptureScreenSuccess = {
export type SetUserCaptureScreenFail = { export type SetUserCaptureScreenFail = {
/** /**
* 错误码 * 错误码
* 0:成功
* -1:permission denied
* 12001:system not support * 12001:system not support
* 12010:system internal error * 12010:system internal error
*/ */
...@@ -112,12 +110,12 @@ export type SetUserCaptureScreenOptions = { ...@@ -112,12 +110,12 @@ export type SetUserCaptureScreenOptions = {
* *
* @param {SetUserCaptureScreenOptions} options * @param {SetUserCaptureScreenOptions} options
* @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#setusercapturescreen * @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#setusercapturescreen
* @platforms APP-IOS = ^13.0,APP-ANDROID = ^19 * @platforms APP-IOS = ^13.0,APP-ANDROID = ^4.4
* @since 3.7.3 * @since 3.7.7
*/ */
export type SetUserCaptureScreen = (options : SetUserCaptureScreenOptions) => void export type SetUserCaptureScreen = (options : SetUserCaptureScreenOptions) => void
interface uni { export interface Uni {
onUserCaptureScreen : OnUserCaptureScreen, onUserCaptureScreen : OnUserCaptureScreen,
offUserCaptureScreen : OffUserCaptureScreen, offUserCaptureScreen : OffUserCaptureScreen,
setUserCaptureScreen : SetUserCaptureScreen setUserCaptureScreen : SetUserCaptureScreen
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册