diff --git a/frameworks/js/napi/relationalstore/include/napi_rdb_store.h b/frameworks/js/napi/relationalstore/include/napi_rdb_store.h index 704cc4f9a8dd8441cf6625489046b50b725ae1b4..b9b8408d84bfa405f12662182589da17b593e250 100644 --- a/frameworks/js/napi/relationalstore/include/napi_rdb_store.h +++ b/frameworks/js/napi/relationalstore/include/napi_rdb_store.h @@ -79,14 +79,6 @@ private: static constexpr int MIN_ON_EVENT_ARG_NUM = 2; static constexpr int MAX_ON_EVENT_ARG_NUM = 5; - class NapiCoudSyncCallback : public NapiUvQueue { - public: - explicit NapiCoudSyncCallback(napi_env env, napi_value callback) : NapiUvQueue(env, callback) {} - virtual ~NapiCoudSyncCallback() = default; - - void OnSyncCompelete(const DistributedRdb::Details &details); - }; - napi_value OnRemote(napi_env env, size_t argc, napi_value *argv); napi_value OnLocal(napi_env env, const DistributedRdb::SubscribeOption &option, napi_value callback); napi_value RegisteredObserver(napi_env env, const DistributedRdb::SubscribeOption &option, diff --git a/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp b/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp index 5091991e216cd4d4c947c3dc74c2733a673532a1..a40206bc58838941b3c1d9bdb3b257a2434a0914 100644 --- a/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp +++ b/frameworks/js/napi/relationalstore/src/napi_rdb_const_properties.cpp @@ -99,6 +99,22 @@ static napi_value ExportProgress(napi_env env) return progress; } +static napi_value ExportProgressCode(napi_env env) +{ + napi_value progressCode = nullptr; + napi_create_object(env, &progressCode); + + SET_NAPI_PROPERTY(progressCode, "SUCCESS", 0); + SET_NAPI_PROPERTY(progressCode, "UNKNOWN_ERROR", 1); + SET_NAPI_PROPERTY(progressCode, "NETWORK_ERROR", 2); + SET_NAPI_PROPERTY(progressCode, "CLOUD_DISABLED", 3); + SET_NAPI_PROPERTY(progressCode, "LOCKED_BY_OTHERS", 4); + SET_NAPI_PROPERTY(progressCode, "RECORD_LIMIT_EXCEEDED", 5); + SET_NAPI_PROPERTY(progressCode, "NO_SPACE_FOR_ASSET", 6); + napi_object_freeze(env, progressCode); + return progressCode; +} + static napi_value ExportDistributedType(napi_env env) { napi_value distributedType = nullptr; @@ -162,6 +178,7 @@ napi_status InitConstProperties(napi_env env, napi_value exports) DECLARE_NAPI_PROPERTY("SecurityLevel", ExportSecurityLevel(env)), #endif DECLARE_NAPI_PROPERTY("Progress", ExportProgress(env)), + DECLARE_NAPI_PROPERTY("ProgressCode", ExportProgressCode(env)), DECLARE_NAPI_PROPERTY("DistributedType", ExportDistributedType(env)), DECLARE_NAPI_PROPERTY("AssetStatus", ExportAssetStatus(env)), DECLARE_NAPI_PROPERTY("ChangeType", ExportChangeType(env)), diff --git a/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp b/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp index 56e9cf5efd0d2c6c7fdea35c25ab7011a9a93b3b..67a32421e721eb5b876f47515e32b5c8173e8a62 100644 --- a/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp +++ b/frameworks/js/napi/relationalstore/src/napi_rdb_js_utils.cpp @@ -122,7 +122,7 @@ napi_value Convert2JSValue(napi_env env, const DistributedRdb::Statistic &statis napi_set_named_property(env, jsValue, "total", total); napi_set_named_property(env, jsValue, "success", success); napi_set_named_property(env, jsValue, "failed", failed); - napi_set_named_property(env, jsValue, "untreated", untreated); + napi_set_named_property(env, jsValue, "remained", untreated); return jsValue; } diff --git a/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp b/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp index eeb1b9727123738ed7ffc947e7c832f6f086b68b..3bc9913fb5629a87c1d96ed8f7cd5ae70567fa12 100644 --- a/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp +++ b/frameworks/js/napi/relationalstore/src/napi_rdb_store.cpp @@ -1413,15 +1413,6 @@ napi_value RdbStoreProxy::Notify(napi_env env, napi_callback_info info) RDB_NAPI_ASSERT(env, errCode == E_OK, std::make_shared(errCode)); return nullptr; } - -void RdbStoreProxy::NapiCoudSyncCallback::OnSyncCompelete(const DistributedRdb::Details &details) -{ - LOG_DEBUG("NapiCoudSyncCallback::OnSyncCompelete begin"); - CallFunction([details](napi_env env, int &argc, napi_value *argv) { - argc = 1; - argv[0] = details.empty() ? nullptr : JSUtils::Convert2JSValue(env, details.begin()->second); - }); -} #endif } // namespace RelationalStoreJsKit } // namespace OHOS \ No newline at end of file diff --git a/interfaces/inner_api/rdb/include/rdb_types.h b/interfaces/inner_api/rdb/include/rdb_types.h index 4b99a85b8eed2e66527265493e8b08a965cd1777..2771aab769ff75b10b4701e7eb073c486d89b5c3 100644 --- a/interfaces/inner_api/rdb/include/rdb_types.h +++ b/interfaces/inner_api/rdb/include/rdb_types.h @@ -81,6 +81,16 @@ enum Progress { SYNC_FINISH, }; +enum ProgressCode { + SUCCESS = 0, + UNKNOWN_ERROR, + NETWORK_ERROR, + CLOUD_DISABLED, + LOCKED_BY_OTHERS, + RECORD_LIMIT_EXCEEDED, + NO_SPACE_FOR_ASSET, +}; + struct Statistic { uint32_t total; uint32_t success;