diff --git a/framework/js/ani/ets/@ohos.systemDateTime.ets b/framework/js/ani/ets/@ohos.systemDateTime.ets index 3b9d36dade553d2d38c28787858f9284d5bd80e4..7ba0aab0cbe2549136c65ef18f52acaca9a67bd2 100644 --- a/framework/js/ani/ets/@ohos.systemDateTime.ets +++ b/framework/js/ani/ets/@ohos.systemDateTime.ets @@ -18,41 +18,69 @@ import { BusinessError } from '@ohos.base'; export default namespace systemDateTime { - const SYSTEM_ERROR: number = 401 - - loadLibrary("systemdatetime_ani") - - export native function getTime(isNanoseconds?: boolean): number; - export native function getTimezoneSync(): string; - - export function getTimezone(callback: AsyncCallback): void{ - let p1 = taskpool.execute(getTimezoneSync) - p1.then((e :NullishType) => { - let s = e as string - let error = new BusinessError - if (s === "") { - error.code = SYSTEM_ERROR - } else { - error.code = 0 - } - callback(error, s) - }); - } - - export function getTimezone(): Promise { - let p = new Promise((resolve: (value: string) => void, reject: (error: Object) => void): void => { - let p1 = taskpool.execute(getTimezoneSync); - p1.then((e: NullishType): void => { - let s = e as string - if (s === "") { - let error = new BusinessError - error.code = SYSTEM_ERROR - reject(error) - } else { - resolve(s); - } - }); - }); - return p - } + const SYSTEM_ERROR: number = 401 + + loadLibrary("systemdatetime_ani") + + export function getCurrentTime(isNano: boolean, callback: AsyncCallback): void { + let p1 = taskpool.execute(getTime, isNano) + p1.then((e :NullishType) => { + let error = new BusinessError + error.code = 0 + callback(error, e as number) + }); + } + + export function getCurrentTime(callback: AsyncCallback): void { + let p1 = taskpool.execute(getTime) + p1.then((e :NullishType) => { + let error = new BusinessError + error.code = 0 + callback(error, e as number) + }); + } + + export function getCurrentTime(isNano?: boolean): Promise { + let p = new Promise((resolve: (value: number) => void, reject: (error: Object) => void): void => { + let p1 = taskpool.execute(getTime, isNano); + p1.then((e: NullishType): void => { + resolve(e as number); + }); + }); + return p + } + + export native function getTime(isNanoseconds?: boolean): number; + export native function getTimezoneSync(): string; + + export function getTimezone(callback: AsyncCallback): void{ + let p1 = taskpool.execute(getTimezoneSync) + p1.then((e :NullishType) => { + let s = e as string + let error = new BusinessError + if (s === "") { + error.code = SYSTEM_ERROR + } else { + error.code = 0 + } + callback(error, s) + }); + } + + export function getTimezone(): Promise { + let p = new Promise((resolve: (value: string) => void, reject: (error: Object) => void): void => { + let p1 = taskpool.execute(getTimezoneSync); + p1.then((e: NullishType): void => { + let s = e as string + if (s === "") { + let error = new BusinessError + error.code = SYSTEM_ERROR + reject(error) + } else { + resolve(s); + } + }); + }); + return p + } } diff --git a/framework/js/ani/src/system_date_time_ani.cpp b/framework/js/ani/src/system_date_time_ani.cpp index 1d7786e23a62bad41a0052f96341d6ca0a439942..ac178cd6e454a764270e935448652f159e606104 100644 --- a/framework/js/ani/src/system_date_time_ani.cpp +++ b/framework/js/ani/src/system_date_time_ani.cpp @@ -31,7 +31,6 @@ static ani_long GetRealTime(ani_boolean isNano) struct timespec ts; if (clock_gettime(CLOCK_REALTIME, &ts) < 0) { - std::cerr << "clock_gettime failed" << std::endl; TIME_HILOGE(TIME_MODULE_JS_ANI, "failed clock_gettime, errno: %{public}s", strerror(errno)); return 0; } @@ -52,7 +51,6 @@ static ani_double GetTime([[maybe_unused]] ani_env *env, ani_object booleanObjec } ani_boolean isNano; if (ANI_OK !=env->Object_CallMethodByName_Boolean(booleanObject, "unboxed", nullptr, &isNano)) { - std::cerr << "Object_CallMethodByName_Boolean Fail" << std::endl; TIME_HILOGE(TIME_MODULE_JS_ANI, "Object_CallMethodByName_Boolean Fail"); } return GetRealTime(isNano); @@ -63,7 +61,6 @@ static ani_string GetTimeZone([[maybe_unused]] ani_env *env) std::string timezone; auto status = TimeServiceClient::GetInstance()->GetTimeZone(timezone); if (ANI_OK != status) { - std::cerr << "GetTimeZone failed " << status << std::endl; TIME_HILOGE(TIME_MODULE_JS_ANI, "GetTimeZone failed, errno: %{public}d", status); } ani_string tzCstr; @@ -75,7 +72,6 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) { ani_env *env; if (ANI_OK != vm->GetEnv(ANI_VERSION_1, &env)) { - std::cerr << "Unsupported ANI_VERSION_1" << std::endl; TIME_HILOGE(TIME_MODULE_JS_ANI, "Unsupported ANI_VERSION_1"); return ANI_ERROR; } @@ -83,7 +79,6 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) static const char *namespaceName = "L@ohos/systemDateTime/systemDateTime;"; ani_namespace ns; if (ANI_OK != env->FindNamespace(namespaceName, &ns)) { - std::cerr << "Not found '" << namespaceName << "'" << std::endl; TIME_HILOGE(TIME_MODULE_JS_ANI, "Not found '%{public}s'", namespaceName); return ANI_ERROR; } @@ -94,7 +89,6 @@ ANI_EXPORT ani_status ANI_Constructor(ani_vm *vm, uint32_t *result) }; if (ANI_OK != env->Namespace_BindNativeFunctions(ns, methods.data(), methods.size())) { - std::cerr << "Cannot bind native methods to '" << namespaceName << "'" << std::endl; TIME_HILOGE(TIME_MODULE_JS_ANI, "Cannot bind native methods to '%{public}s'", namespaceName); return ANI_ERROR; };