From 8b73ceb053a95a6e3147d01507527dfc6b33aa45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E7=82=9C=E6=9D=B0?= Date: Tue, 17 Jun 2025 13:40:42 +0000 Subject: [PATCH 1/3] update zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 秦炜杰 --- .../application-dev/media/drm/drm-arkts-dev-guide.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md b/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md index 9d743ff0ad6..99f44359f21 100644 --- a/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md +++ b/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md @@ -70,7 +70,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， mediaKeySystem.generateKeySystemRequest().then(async (drmRequest: drm.ProvisionRequest) => { console.info("generateKeySystemRequest success", drmRequest.data, drmRequest.defaultURL); }).catch((err:BusinessError) =>{ - console.info("generateKeySystemRequest err end", err.code); + console.error("generateKeySystemRequest err end", err.code); }); } else { console.info("The certificate already exists."); @@ -80,7 +80,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， mediaKeySystem.processKeySystemResponse(provisionResponseByte).then(() => { console.info("processKeySystemResponse success"); }).catch((err:BusinessError) =>{ - console.info("processKeySystemResponse err end", err.code); + console.error("processKeySystemResponse err end", err.code); }); ``` @@ -162,10 +162,10 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， mediaKeySession.processMediaKeyResponse(licenseResponse).then((mediaKeyId: Uint8Array) => { console.info("processMediaKeyResponse success"); }).catch((err:BusinessError) =>{ - console.info("processMediaKeyResponse err end", err.code); + console.error("processMediaKeyResponse err end", err.code); }); }).catch((err:BusinessError) =>{ - console.info("generateMediaKeyRequest err end", err.code); + console.error("generateMediaKeyRequest err end", err.code); }); // 离线媒体密钥请求和响应。 let offlineMediaKeyId: Uint8Array; @@ -177,10 +177,10 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， offlineMediaKeyId = new Uint8Array(mediaKeyId); console.info("processMediaKeyResponse success"); }).catch((err:BusinessError) =>{ - console.info("processMediaKeyResponse err end", err.code); + console.error("processMediaKeyResponse err end", err.code); }); }).catch((err:BusinessError) =>{ - console.info("generateMediaKeyRequest err end", err.code); + console.error("generateMediaKeyRequest err end", err.code); }); ``` -- Gitee From 8935bc5ab30c0e4ed7981b465b77a9cd12271439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E7=82=9C=E6=9D=B0?= Date: Mon, 23 Jun 2025 00:56:39 +0000 Subject: [PATCH 2/3] Revert "update zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md." This reverts commit 8b73ceb053a95a6e3147d01507527dfc6b33aa45. --- .../application-dev/media/drm/drm-arkts-dev-guide.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md b/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md index 99f44359f21..9d743ff0ad6 100644 --- a/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md +++ b/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md @@ -70,7 +70,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， mediaKeySystem.generateKeySystemRequest().then(async (drmRequest: drm.ProvisionRequest) => { console.info("generateKeySystemRequest success", drmRequest.data, drmRequest.defaultURL); }).catch((err:BusinessError) =>{ - console.error("generateKeySystemRequest err end", err.code); + console.info("generateKeySystemRequest err end", err.code); }); } else { console.info("The certificate already exists."); @@ -80,7 +80,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， mediaKeySystem.processKeySystemResponse(provisionResponseByte).then(() => { console.info("processKeySystemResponse success"); }).catch((err:BusinessError) =>{ - console.error("processKeySystemResponse err end", err.code); + console.info("processKeySystemResponse err end", err.code); }); ``` @@ -162,10 +162,10 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， mediaKeySession.processMediaKeyResponse(licenseResponse).then((mediaKeyId: Uint8Array) => { console.info("processMediaKeyResponse success"); }).catch((err:BusinessError) =>{ - console.error("processMediaKeyResponse err end", err.code); + console.info("processMediaKeyResponse err end", err.code); }); }).catch((err:BusinessError) =>{ - console.error("generateMediaKeyRequest err end", err.code); + console.info("generateMediaKeyRequest err end", err.code); }); // 离线媒体密钥请求和响应。 let offlineMediaKeyId: Uint8Array; @@ -177,10 +177,10 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， offlineMediaKeyId = new Uint8Array(mediaKeyId); console.info("processMediaKeyResponse success"); }).catch((err:BusinessError) =>{ - console.error("processMediaKeyResponse err end", err.code); + console.info("processMediaKeyResponse err end", err.code); }); }).catch((err:BusinessError) =>{ - console.error("generateMediaKeyRequest err end", err.code); + console.info("generateMediaKeyRequest err end", err.code); }); ``` -- Gitee From aea145bfcd24a1221c901b21c1a468a56f12c66b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E7=82=9C=E6=9D=B0?= <2293480377@qq.com> Date: Mon, 23 Jun 2025 09:33:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?DRM=E6=97=A5=E5=BF=97=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../media/drm/drm-arkts-dev-guide.md | 24 +++++++++---------- .../drm/drm-avplayer-arkts-integration.md | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md b/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md index 9d743ff0ad6..729c14cf1a6 100644 --- a/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md +++ b/zh-cn/application-dev/media/drm/drm-arkts-dev-guide.md @@ -50,7 +50,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， ```ts mediaKeySystem.on('keySystemRequired', (eventInfo: drm.EventInfo) => { - console.log('keySystemRequired' + 'extra:' + eventInfo.extraInfo + ' data:' + eventInfo.info); + console.info('keySystemRequired' + 'extra:' + eventInfo.extraInfo + ' data:' + eventInfo.info); // 设备DRM证书请求与处理。 }); ``` @@ -70,7 +70,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， mediaKeySystem.generateKeySystemRequest().then(async (drmRequest: drm.ProvisionRequest) => { console.info("generateKeySystemRequest success", drmRequest.data, drmRequest.defaultURL); }).catch((err:BusinessError) =>{ - console.info("generateKeySystemRequest err end", err.code); + console.error("generateKeySystemRequest err end", err.code); }); } else { console.info("The certificate already exists."); @@ -80,7 +80,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， mediaKeySystem.processKeySystemResponse(provisionResponseByte).then(() => { console.info("processKeySystemResponse success"); }).catch((err:BusinessError) =>{ - console.info("processKeySystemResponse err end", err.code); + console.error("processKeySystemResponse err end", err.code); }); ``` @@ -100,7 +100,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， ```ts mediaKeySession.on('keyRequired', (eventInfo: drm.EventInfo) => { - console.log('keyRequired' + 'info:' + eventInfo.info + ' extraInfo:' + eventInfo.extraInfo); + console.info('keyRequired' + 'info:' + eventInfo.info + ' extraInfo:' + eventInfo.extraInfo); // 媒体密钥请求与处理。 }); ``` @@ -109,7 +109,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， ```ts mediaKeySession.on('keyExpired', (eventInfo: drm.EventInfo) => { - console.log('keyExpired' + 'info:' + eventInfo.info + ' extraInfo:' + eventInfo.extraInfo); + console.info('keyExpired' + 'info:' + eventInfo.info + ' extraInfo:' + eventInfo.extraInfo); }); ``` @@ -117,7 +117,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， ```ts mediaKeySession.on('expirationUpdate', (eventInfo: drm.EventInfo) => { - console.log('expirationUpdate' + 'info:' + eventInfo.info + ' extraInfo:' + eventInfo.extraInfo); + console.info('expirationUpdate' + 'info:' + eventInfo.info + ' extraInfo:' + eventInfo.extraInfo); }); ``` @@ -126,7 +126,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， ```ts mediaKeySession.on('keysChange', (keyInfo : drm.KeysInfo[], newKeyAvailable:boolean) => { for(let i = 0; i < keyInfo.length; i++){ - console.log('keysChange' + 'info:' + keyInfo[i].keyId + ' extraInfo:' + keyInfo[i].value); + console.info('keysChange' + 'info:' + keyInfo[i].keyId + ' extraInfo:' + keyInfo[i].value); } }); ``` @@ -162,10 +162,10 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， mediaKeySession.processMediaKeyResponse(licenseResponse).then((mediaKeyId: Uint8Array) => { console.info("processMediaKeyResponse success"); }).catch((err:BusinessError) =>{ - console.info("processMediaKeyResponse err end", err.code); + console.error("processMediaKeyResponse err end", err.code); }); }).catch((err:BusinessError) =>{ - console.info("generateMediaKeyRequest err end", err.code); + console.error("generateMediaKeyRequest err end", err.code); }); // 离线媒体密钥请求和响应。 let offlineMediaKeyId: Uint8Array; @@ -177,10 +177,10 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， offlineMediaKeyId = new Uint8Array(mediaKeyId); console.info("processMediaKeyResponse success"); }).catch((err:BusinessError) =>{ - console.info("processMediaKeyResponse err end", err.code); + console.error("processMediaKeyResponse err end", err.code); }); }).catch((err:BusinessError) =>{ - console.info("generateMediaKeyRequest err end", err.code); + console.error("generateMediaKeyRequest err end", err.code); }); ``` @@ -188,7 +188,7 @@ DRM Kit提供MediaKeySystem实现DRM证书管理、DRM许可证管理功能， ```ts mediaKeySession.restoreOfflineMediaKeys(offlineMediaKeyId).then(() => { - console.log("restoreOfflineMediaKeys success."); + console.info("restoreOfflineMediaKeys success."); }).catch((err: BusinessError) => { console.error(`restoreOfflineMediaKeys: ERROR: ${err}`); }); diff --git a/zh-cn/application-dev/media/drm/drm-avplayer-arkts-integration.md b/zh-cn/application-dev/media/drm/drm-avplayer-arkts-integration.md index 49c36354bd5..81c5e9d759c 100644 --- a/zh-cn/application-dev/media/drm/drm-avplayer-arkts-integration.md +++ b/zh-cn/application-dev/media/drm/drm-avplayer-arkts-integration.md @@ -68,10 +68,10 @@ mediaKeySession.processMediaKeyResponse(licenseResponse).then((mediaKeyId: Uint8Array) => { console.info("processMediaKeyResponse success"); }).catch((err:BusinessError) =>{ - console.info("processMediaKeyResponse err end", err.code); + console.error("processMediaKeyResponse err end", err.code); }); }).catch((err:BusinessError) =>{ - console.info("generateMediaKeyRequest err end", err.code); + console.error("generateMediaKeyRequest err end", err.code); }); ``` -- Gitee