From 050875db5a08febf41cc8900a386a2ebaf9b17aa Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Fri, 29 Aug 2025 15:46:29 +0800 Subject: [PATCH] number to int another Signed-off-by: zhangzezhong --- .../app_manager/src/ets_app_manager_utils.cpp | 4 +-- .../src/ets_ui_extension_callback.cpp | 2 +- .../src/ets_uri_perm_mgr.cpp | 20 ++++++------- .../ets/@ohos.app.ability.dataUriUtils.ets | 8 +++--- ...@ohos.application.uriPermissionManager.ets | 28 +++++++++---------- .../ets/application/AbilityStartCallback.ets | 2 +- .../ets/ets/application/AppStateData.ets | 4 +-- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/frameworks/ets/ani/app_manager/src/ets_app_manager_utils.cpp b/frameworks/ets/ani/app_manager/src/ets_app_manager_utils.cpp index 5844ad4197b..09116aabbec 100644 --- a/frameworks/ets/ani/app_manager/src/ets_app_manager_utils.cpp +++ b/frameworks/ets/ani/app_manager/src/ets_app_manager_utils.cpp @@ -92,12 +92,12 @@ bool SetAppStateData(ani_env *env, ani_object object, const AppExecFwk::AppState TAG_LOGE(AAFwkTag::APPMGR, "failed status:%{public}d", status); return false; } - status = env->Object_SetFieldByName_Double(object, "uid", static_cast(appStateData.uid)); + status = env->Object_SetFieldByName_Int(object, "uid", appStateData.uid); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "failed status:%{public}d", status); return false; } - status = env->Object_SetFieldByName_Double(object, "state", static_cast(appStateData.state)); + status = env->Object_SetFieldByName_Int(object, "state", appStateData.state); if (status != ANI_OK) { TAG_LOGE(AAFwkTag::APPMGR, "failed status:%{public}d", status); return false; diff --git a/frameworks/ets/ani/ui_extension_callback/src/ets_ui_extension_callback.cpp b/frameworks/ets/ani/ui_extension_callback/src/ets_ui_extension_callback.cpp index d76e078079c..eb55d83275b 100644 --- a/frameworks/ets/ani/ui_extension_callback/src/ets_ui_extension_callback.cpp +++ b/frameworks/ets/ani/ui_extension_callback/src/ets_ui_extension_callback.cpp @@ -75,7 +75,7 @@ void EtsUIExtensionCallback::OnError(int32_t number) TAG_LOGE(AAFwkTag::UI_EXT, "aniMsg String_NewUTF8 failed, status: %{public}d", status); return; } - CallObjectMethod("onError", nullptr, (ani_double)number, aniName, aniMsg); + CallObjectMethod("onError", nullptr, number, aniName, aniMsg); CloseModalUIExtension(); } diff --git a/frameworks/ets/ani/uri_permission_manager/src/ets_uri_perm_mgr.cpp b/frameworks/ets/ani/uri_permission_manager/src/ets_uri_perm_mgr.cpp index 1931ee8a81f..f9018d8bfba 100644 --- a/frameworks/ets/ani/uri_permission_manager/src/ets_uri_perm_mgr.cpp +++ b/frameworks/ets/ani/uri_permission_manager/src/ets_uri_perm_mgr.cpp @@ -38,12 +38,12 @@ constexpr const int32_t ERR_OK = 0; constexpr const int32_t ERR_FAILURE = -1; constexpr const char* NOT_SYSTEM_APP = "The application is not system-app, can not use system-api."; -ani_object CreateDouble(ani_env *env, int32_t res) +ani_object CreateInt(ani_env *env, int32_t res) { if (env == nullptr) { return nullptr; } - static const char *className = "Lstd/core/Double;"; + static const char *className = "Lstd/core/Int;"; ani_class cls; if (ANI_OK != env->FindClass(className, &cls)) { TAG_LOGE(AAFwkTag::URIPERMMGR, "create double error"); @@ -54,12 +54,12 @@ ani_object CreateDouble(ani_env *env, int32_t res) return nullptr; } ani_method ctor; - env->Class_FindMethod(cls, "", "D:V", &ctor); + env->Class_FindMethod(cls, "", "I:V", &ctor); if (ctor == nullptr) { return nullptr; } ani_object obj; - env->Object_New(cls, ctor, &obj, ani_double(res)); + env->Object_New(cls, ctor, &obj, res); return obj; } @@ -92,7 +92,7 @@ static void grantUriPermissionCallbackSync([[maybe_unused]]ani_env *env, AppExecFwk::AsyncCallback(env, callback, EtsErrorUtil::CreateError(env, static_cast(AbilityErrorCode::ERROR_CODE_INVALID_PARAM), "Param appCloneIndex is invalid, the value less than 0."), - CreateDouble(env, ERR_FAILURE)); + CreateInt(env, ERR_FAILURE)); return; } auto selfToken = IPCSkeleton::GetSelfTokenID(); @@ -101,7 +101,7 @@ static void grantUriPermissionCallbackSync([[maybe_unused]]ani_env *env, TAG_LOGE(AAFwkTag::URIPERMMGR, "app not system-app"); etsErrCode = EtsErrorUtil::CreateError(env, static_cast(AbilityErrorCode::ERROR_CODE_NOT_SYSTEM_APP), NOT_SYSTEM_APP); - AppExecFwk::AsyncCallback(env, callback, etsErrCode, CreateDouble(env, ERR_FAILURE)); + AppExecFwk::AsyncCallback(env, callback, etsErrCode, CreateInt(env, ERR_FAILURE)); return; } std::string uriStr = GetStdString(env, uri); @@ -118,7 +118,7 @@ static void grantUriPermissionCallbackSync([[maybe_unused]]ani_env *env, etsErrCode = EtsErrorUtil::CreateErrorByNativeErr(env, errCode); } - AppExecFwk::AsyncCallback(env, callback, etsErrCode, CreateDouble(env, result)); + AppExecFwk::AsyncCallback(env, callback, etsErrCode, CreateInt(env, result)); } static void revokeUriPermissionCallbackSync([[maybe_unused]]ani_env *env, @@ -134,7 +134,7 @@ static void revokeUriPermissionCallbackSync([[maybe_unused]]ani_env *env, AppExecFwk::AsyncCallback(env, callback, EtsErrorUtil::CreateError(env, static_cast(AbilityErrorCode::ERROR_CODE_INVALID_PARAM), "Param appCloneIndex is invalid, the value less than 0."), - CreateDouble(env, ERR_FAILURE)); + CreateInt(env, ERR_FAILURE)); return; } auto selfToken = IPCSkeleton::GetSelfTokenID(); @@ -143,7 +143,7 @@ static void revokeUriPermissionCallbackSync([[maybe_unused]]ani_env *env, TAG_LOGE(AAFwkTag::URIPERMMGR, "app not system-app"); etsErrCode = EtsErrorUtil::CreateError(env, static_cast(AbilityErrorCode::ERROR_CODE_NOT_SYSTEM_APP), NOT_SYSTEM_APP); - AppExecFwk::AsyncCallback(env, callback, etsErrCode, CreateDouble(env, ERR_FAILURE)); + AppExecFwk::AsyncCallback(env, callback, etsErrCode, CreateInt(env, ERR_FAILURE)); return; } std::string uriStr = GetStdString(env, uri); @@ -156,7 +156,7 @@ static void revokeUriPermissionCallbackSync([[maybe_unused]]ani_env *env, result = ERR_FAILURE; etsErrCode = EtsErrorUtil::CreateErrorByNativeErr(env, errCode); } - AppExecFwk::AsyncCallback(env, callback, etsErrCode, CreateDouble(env, result)); + AppExecFwk::AsyncCallback(env, callback, etsErrCode, CreateInt(env, result)); } void EtsUriPermissionManagerInit(ani_env *env) diff --git a/frameworks/ets/ets/@ohos.app.ability.dataUriUtils.ets b/frameworks/ets/ets/@ohos.app.ability.dataUriUtils.ets index 5dfe03105d2..810a61f2e8e 100644 --- a/frameworks/ets/ets/@ohos.app.ability.dataUriUtils.ets +++ b/frameworks/ets/ets/@ohos.app.ability.dataUriUtils.ets @@ -38,7 +38,7 @@ class DataUriError extends Error { } namespace dataUriUtils { - export function getId(uri: string): number { + export function getId(uri: string): double { hilog.debug(domainID, TAG, 'DataUriUtils getId called.'); if (typeof uri !== 'string') { throw new DataUriError(ERROR_CODE_INVALID_PARAM); @@ -51,10 +51,10 @@ namespace dataUriUtils { if (ret === '' || isNaN(Number(ret))) { throw new DataUriError(ERROR_CODE_INVALID_PARAM); } - return Number(ret); + return Number(ret).toDouble(); } - export function attachId(uri: string, id: number): string { + export function attachId(uri: string, id: double): string { hilog.debug(domainID, TAG, 'DataUriUtils attachId called.'); if (typeof uri !== 'string' || typeof id !== 'number') { throw new DataUriError(ERROR_CODE_INVALID_PARAM); @@ -78,7 +78,7 @@ namespace dataUriUtils { return uri.substring(0, index); } - export function updateId(uri: string, id: number): string { + export function updateId(uri: string, id: double): string { hilog.debug(domainID, TAG, 'DataUriUtils updateId called.'); if (typeof uri !== 'string' || typeof id !== 'number') { throw new DataUriError(ERROR_CODE_INVALID_PARAM); diff --git a/frameworks/ets/ets/@ohos.application.uriPermissionManager.ets b/frameworks/ets/ets/@ohos.application.uriPermissionManager.ets index 93bdc519cb1..130df6895f2 100644 --- a/frameworks/ets/ets/@ohos.application.uriPermissionManager.ets +++ b/frameworks/ets/ets/@ohos.application.uriPermissionManager.ets @@ -21,13 +21,13 @@ export default namespace uriPermissionManager { loadLibrary("uri_permission_manager_ani_kit.z"); export native function grantUriPermissionCallbackSync(uri: string, flag: wantConstant.Flags, targetBundleName: string, - appCloneIndex: int, callback: AsyncCallbackWrapper): void; + appCloneIndex: int, callback: AsyncCallbackWrapper): void; export native function revokeUriPermissionCallbackSync(uri: string, targetBundleName: string, appCloneIndex: int, - callback: AsyncCallbackWrapper): void; + callback: AsyncCallbackWrapper): void; - export function grantUriPermission(uri: string, flag: wantConstant.Flags, targetBundleName: string): Promise { - let p:Promise = new Promise((resolve: (data: number)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + export function grantUriPermission(uri: string, flag: wantConstant.Flags, targetBundleName: string): Promise { + let p:Promise = new Promise((resolve: (data: int)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: int | undefined)=>{ if (err === null || err.code === 0) { if (data === undefined) { resolve(-1); @@ -48,7 +48,7 @@ export default namespace uriPermissionManager { export function grantUriPermission(uri: string, flag: wantConstant.Flags, targetBundleName: string, appCloneIndex: int): Promise { let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: int | undefined)=>{ if (err === null || err.code === 0) { resolve(undefined); } else { @@ -64,16 +64,16 @@ export default namespace uriPermissionManager { } export function grantUriPermission(uri: string, flag: wantConstant.Flags, targetBundleName: string, - callback: AsyncCallback): void { - let myCall = new AsyncCallbackWrapper(callback); + callback: AsyncCallback): void { + let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { uriPermissionManager.grantUriPermissionCallbackSync(uri, flag, targetBundleName, 0, myCall); }) } - export function revokeUriPermission(uri: string, targetBundleName: string): Promise { - let p:Promise = new Promise((resolve: (data: number)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + export function revokeUriPermission(uri: string, targetBundleName: string): Promise { + let p:Promise = new Promise((resolve: (data: int)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: int | undefined)=>{ if (err === null || err.code === 0) { if (data === undefined) { resolve(-1); @@ -93,7 +93,7 @@ export default namespace uriPermissionManager { export function revokeUriPermission(uri: string, targetBundleName: string, appCloneIndex: int): Promise { let p:Promise = new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError)=>void):void => { - let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: number | undefined)=>{ + let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: int | undefined)=>{ if (err === null || err.code === 0) { resolve(undefined); } else { @@ -107,8 +107,8 @@ export default namespace uriPermissionManager { return p; } - export function revokeUriPermission(uri: string, targetBundleName: string, callback: AsyncCallback): void { - let myCall = new AsyncCallbackWrapper(callback); + export function revokeUriPermission(uri: string, targetBundleName: string, callback: AsyncCallback): void { + let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { uriPermissionManager.revokeUriPermissionCallbackSync(uri, targetBundleName, 0, myCall); }) diff --git a/frameworks/ets/ets/application/AbilityStartCallback.ets b/frameworks/ets/ets/application/AbilityStartCallback.ets index f80d975985d..672b906044d 100644 --- a/frameworks/ets/ets/application/AbilityStartCallback.ets +++ b/frameworks/ets/ets/application/AbilityStartCallback.ets @@ -18,7 +18,7 @@ import { AbilityResult } from 'ability.abilityResult'; type onResultFn = (parameter: AbilityResult) => void; export default interface AbilityStartCallback { - onError(code: number, name: string, message: string): void; + onError(code: int, name: string, message: string): void; onResult?: onResultFn; } diff --git a/frameworks/ets/ets/application/AppStateData.ets b/frameworks/ets/ets/application/AppStateData.ets index ca1f7eff420..063e9a59e33 100644 --- a/frameworks/ets/ets/application/AppStateData.ets +++ b/frameworks/ets/ets/application/AppStateData.ets @@ -14,8 +14,8 @@ */ export default class AppStateData { bundleName: string = ''; - uid: number; - state: number; + uid: int; + state: int; isSplitScreenMode: boolean; isFloatingWindowMode: boolean; } -- Gitee