diff --git a/AbilityKit/ability_runtime/application_context.h b/AbilityKit/ability_runtime/application_context.h index 00c5d579d453d5a8c0619d9712f438f26a18565d..ed62cf40293ae91ec6ccbeaefa601c04a514f874 100644 --- a/AbilityKit/ability_runtime/application_context.h +++ b/AbilityKit/ability_runtime/application_context.h @@ -294,19 +294,6 @@ AbilityRuntime_ErrorCode OH_AbilityRuntime_StartSelfUIAbility(AbilityBase_Want * AbilityRuntime_ErrorCode OH_AbilityRuntime_StartSelfUIAbilityWithStartOptions(AbilityBase_Want *want, AbilityRuntime_StartOptions *options); - /** - * @brief Obtain the version code of the application. - * - * @param versionCode The version code of the application. - * @return The error code. - * {@link ABILITY_RUNTIME_ERROR_CODE_NO_ERROR} if the operation is successful. - * {@link ABILITY_RUNTIME_ERROR_CODE_PARAM_INVALID} if the versionCode is null. - * {@link ABILITY_RUNTIME_ERROR_CODE_CONTEXT_NOT_EXIST} if the application context does not exist. - * {@link ABILITY_RUNTIME_ERROR_CODE_GET_APPLICATION_INFO_FAILED} if the application info does not exist. - * @since 21 - */ -AbilityRuntime_ErrorCode OH_AbilityRuntime_ApplicationContextGetVersionCode(int64_t* versionCode); - #ifdef __cplusplus } // extern "C" #endif diff --git a/AbilityKit/ability_runtime/libability_runtime.ndk.json b/AbilityKit/ability_runtime/libability_runtime.ndk.json index f7939128e402a6a67baa4deac6554689b64f434d..6790d7d683b7cd97f6cc22c4bbe81b71f9080e18 100644 --- a/AbilityKit/ability_runtime/libability_runtime.ndk.json +++ b/AbilityKit/ability_runtime/libability_runtime.ndk.json @@ -178,9 +178,5 @@ { "first_introduced": "20", "name": "OH_AbilityRuntime_ApplicationContextGetResourceDir" - }, - { - "first_introduced": "21", - "name": "OH_AbilityRuntime_ApplicationContextGetVersionCode" } ] \ No newline at end of file diff --git a/BasicServicesKit/commonevent/oh_commonevent.h b/BasicServicesKit/commonevent/oh_commonevent.h index d3f16a959a7268aa4bfa0d6b10580c5c0be36b15..a5cca763b88a3edaceb57588159d05487dcbe8a6 100644 --- a/BasicServicesKit/commonevent/oh_commonevent.h +++ b/BasicServicesKit/commonevent/oh_commonevent.h @@ -227,19 +227,19 @@ CommonEvent_ErrCode OH_CommonEvent_UnSubscribe(const CommonEvent_Subscriber* sub const char* OH_CommonEvent_GetEventFromRcvData(const CommonEvent_RcvData* rcvData); /** - * @brief Get event result code from callback data. + * @brief Get event code from callback data. * * @param rcvData Indicates the callback data. - * @return Returns the event of result code, default is 0. + * @return Returns the event of code, default is 0. * @since 12 */ int32_t OH_CommonEvent_GetCodeFromRcvData(const CommonEvent_RcvData* rcvData); /** - * @brief Get event result data from callback data. + * @brief Get event data from callback data. * * @param rcvData Indicates the callback data. - * @return Returns the event of result data, default is null. + * @return Returns the event of data, default is null. * @since 12 */ const char* OH_CommonEvent_GetDataStrFromRcvData(const CommonEvent_RcvData* rcvData); @@ -628,7 +628,7 @@ CommonEvent_ErrCode OH_CommonEvent_SetDoubleArrayToParameters(CommonEvent_Parame const double* value, size_t num); /** - * @brief Publish a standard commen event. + * @brief Publish a commen event. * * @param event Indicates the name of the common event. * @return Returns the error code. @@ -704,39 +704,39 @@ bool OH_CommonEvent_AbortCommonEvent(CommonEvent_Subscriber* subscriber); bool OH_CommonEvent_ClearAbortCommonEvent(CommonEvent_Subscriber* subscriber); /** - * @brief Get result code from an ordered event by a subscriber. + * @brief Get code from an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @return Returns the result code, default is 0. + * @return Returns the code, default is 0. * @since 18 */ int32_t OH_CommonEvent_GetCodeFromSubscriber(const CommonEvent_Subscriber* subscriber); /** - * @brief Set result code to an ordered event by a subscriber. + * @brief Set code to an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @param code Indicates the result code. + * @param code Indicates the code. * @return Returns the result of operation, true means succeeded. * @since 18 */ bool OH_CommonEvent_SetCodeToSubscriber(CommonEvent_Subscriber* subscriber, int32_t code); /** - * @brief Get result data from an ordered event by a subscriber. + * @brief Get data from an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @return Returns the result data, default is null. + * @return Returns the data, default is null. * @since 18 */ const char* OH_CommonEvent_GetDataFromSubscriber(const CommonEvent_Subscriber* subscriber); /** - * @brief Set result data to an ordered event by a subscriber. + * @brief Set data to an ordered event by a subscriber. * * @param subscriber Indicates the subscriber. - * @param data Indicates the result data. - * @param length Indicates the length of result data. + * @param data Indicates the data. + * @param length Indicates the length of data. * @return Returns the result of operation, true means succeeded. * @since 18 */ diff --git a/arkui/ace_engine/native/drag_and_drop.h b/arkui/ace_engine/native/drag_and_drop.h index 15f4de6214044b0b2438c78488e6640e01ba0218..b484cafe18bb4c5fed4f006fbdf4533f130ad11c 100644 --- a/arkui/ace_engine/native/drag_and_drop.h +++ b/arkui/ace_engine/native/drag_and_drop.h @@ -499,7 +499,6 @@ ArkUI_ErrorCode OH_ArkUI_DragEvent_GetDisplayId(ArkUI_DragEvent *event, int32_t * @return Returns the result code. * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs. - * Returns {@link ARKUI_ERROR_CODE_DRAG_DATA_SYNC_FAILED} if the data sync is not allowed or failed. * @since 15 */ int32_t OH_ArkUI_DragEvent_StartDataLoading( diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json index 4a896d6404f7eddd28bb31e6377d17f8828491a0..a741af70523a9894d1e738eaf5f3cb805963710b 100644 --- a/arkui/ace_engine/native/libace.ndk.json +++ b/arkui/ace_engine/native/libace.ndk.json @@ -4066,5 +4066,13 @@ { "first_introduced": "20", "name": "OH_ArkUI_PostUITaskAndWait" + }, + { + "first_introduced": "21", + "name": "OH_ArkUI_NativeModule_RegisterCommonEvent" + }, + { + "first_introduced": "21", + "name": "OH_ArkUI_NativeModule_UnregisterCommonEvent" } ] \ No newline at end of file diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h index ce5b57eb466694a3560506fa7a0111385ae2d37f..df32a038e63751b34c2eff37beb799f0d38948c4 100644 --- a/arkui/ace_engine/native/native_node.h +++ b/arkui/ace_engine/native/native_node.h @@ -4088,25 +4088,19 @@ typedef enum { */ NODE_XCOMPONENT_ID = MAX_NODE_SCOPE_NUM * ARKUI_NODE_XCOMPONENT, /** - * @brief Defines the type of the component. - * This attribute can be set, reset, and obtained as required through APIs. + * @brief Specifies the type of the XComponent component. This attribute is read-only. \n + * The type of the XComponent component must be explicitly set during creation using {@link ARKUI_NODE_XCOMPONENT} or {@link ARKUI_NODE_XCOMPONENT_TEXTURE}, and cannot be modified afterward. \n + * Attempting to change the type through {@link setAttribute} will cause rendering exceptions. * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].i32: type {@link ArkUI_XComponentType}. The default value is ARKUI_XCOMPONENT_TYPE_SURFACE. \n - * \n * Format of the return value {@link ArkUI_AttributeItem}:\n * .value[0].i32: type {@link ArkUI_XComponentType}. \n * */ NODE_XCOMPONENT_TYPE, /** - * @brief Defines the width and height of the component. - * This attribute can be set and obtained as required through APIs. + * @brief Specifies the size of the XComponent component. This attribute is read-only. \n + * Attempting to modify the size through {@link setAttribute} will have no effect. * - * Format of the {@link ArkUI_AttributeItem} parameter for setting the attribute:\n - * .value[0].u32: width, in px. \n - * .value[1].u32: height, in px. \n - * \n * Format of the return value {@link ArkUI_AttributeItem}:\n * .value[0].u32: width, in px. \n * .value[1].u32: height, in px. \n @@ -7322,6 +7316,16 @@ typedef enum { */ NODE_ON_HOVER_MOVE = 29, + /** + * @brief Defines the size change event. + * + * The event will be triggered when the component size changes. + * When the event callback occurs, the {@link ArkUI_NodeEvent} object can be obtained from the + * {@link ArkUI_UIInputEvent} object. \n + * @since 21 + */ + NODE_ON_SIZE_CHANGE = 30, + /** * @brief Triggers onDetectResultUpdate callback * when the text is set to TextDataDetectorConfig and recognized successfully. @@ -10159,6 +10163,36 @@ int32_t OH_ArkUI_PostUITask(ArkUI_ContextHandle context, void* taskData, void (* * @since 20 */ int32_t OH_ArkUI_PostUITaskAndWait(ArkUI_ContextHandle context, void* taskData, void (*task)(void* taskData)); + +/** + * @brief Register common event callback of target node. + * + * @param node The ArkUI-NodeHandle pointer. + * @param eventType Indicates the type of event to set. + * @param userData Indicates the pointer to the custom data. + * @param callback Indicates the event callback function. + * @return Returns the result code. + * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. + * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} Function params is invalid. + * Returns {@link ARKUI_ERROR_CODE_NODE_UNSUPPORTED_EVENT_TYPE} Function parameter eventType is not supported. + * @since 21 + */ +int32_t OH_ArkUI_NativeModule_RegisterCommonEvent(ArkUI_NodeHandle node, ArkUI_NodeEventType eventType, + void* userData, void (*callback)(ArkUI_NodeEvent* event)); + +/** + * @brief Unregister common event callback of target node. + * + * @param node The ArkUI-NodeHandle pointer. + * @param eventType Indicates the type of event to set. + * @return Returns the result code. + * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful. + * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} Function params is invalid. + * Returns {@link ARKUI_ERROR_CODE_NODE_UNSUPPORTED_EVENT_TYPE} Function parameter eventType is not supported. + * @since 21 + */ +int32_t OH_ArkUI_NativeModule_UnregisterCommonEvent(ArkUI_NodeHandle node, ArkUI_NodeEventType eventType); + #ifdef __cplusplus }; #endif diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h index 7cef398b2d6b7cbab8dec555464d44799d0898fa..f7b72cc37d01d1e2fdf67c70598a42194058fb72 100644 --- a/arkui/ace_engine/native/native_type.h +++ b/arkui/ace_engine/native/native_type.h @@ -1356,6 +1356,12 @@ typedef enum { ARKUI_OBJECT_FIT_NONE_AND_ALIGN_BOTTOM, /** Not resized, the image is aligned with the end edge at the bottom of the container. */ ARKUI_OBJECT_FIT_NONE_AND_ALIGN_BOTTOM_END, + /** + * Not resized, and is used in conjunction with NODE_IMAGE_IMAGE_MATRIX. + * + * @since 21 + */ + ARKUI_OBJECT_FIT_NONE_MATRIX, } ArkUI_ObjectFit; /** @@ -2295,6 +2301,11 @@ typedef enum { ARKUI_ERROR_CODE_NODE_EVENT_PARAM_INVALID = 106108, /** The component event does not support return values. */ ARKUI_ERROR_CODE_NODE_EVENT_NO_RETURN = 106109, + /** + * @error The event type is not supported by the node. + * @since 21 + */ + ARKUI_ERROR_CODE_NODE_UNSUPPORTED_EVENT_TYPE = 106110, /** The index value is invalid. */ ARKUI_ERROR_CODE_NODE_INDEX_INVALID = 106200, /** Failed to query route navigation information. */ diff --git a/distributeddatamgr/relational_store/include/data_asset.h b/distributeddatamgr/relational_store/include/data_asset.h index f791cbc9e815b1358fd4bb3b4054f1576b808521..85c4fbdf6ba1a0195c34f30f2a15c36c5465c1fc 100644 --- a/distributeddatamgr/relational_store/include/data_asset.h +++ b/distributeddatamgr/relational_store/include/data_asset.h @@ -326,7 +326,9 @@ Data_Asset *OH_Data_Asset_CreateOne(void); * * @param asset Represents a pointer to an {@link Data_Asset} instance. * @return Returns the status code of the execution. Successful execution returns RDB_OK, - * while failure returns a specific error code. Specific error codes can be referenced {@link OH_Rdb_ErrCode}. + * while failure returns a specific error code. + * {@link RDB_OK} - success. + * Specific error codes can be referenced {@link OH_Rdb_ErrCode}. * @see Data_Asset, OH_Rdb_ErrCode. * @since 11 */ @@ -349,7 +351,9 @@ Data_Asset **OH_Data_Asset_CreateMultiple(uint32_t count); * @param assets Represents a pointer to an {@link Data_Asset} instance. * @param count Represents the count of {@link Data_Asset} to destroy. * @return Returns the status code of the execution. Successful execution returns RDB_OK, - * while failure returns a specific error code. Specific error codes can be referenced {@link OH_Rdb_ErrCode}. + * while failure returns a specific error code. + * {@link RDB_OK} - success. + * Specific error codes can be referenced {@link OH_Rdb_ErrCode}. * @see Data_Asset, OH_Rdb_ErrCode. * @since 11 */ diff --git a/multimedia/av_codec/native_avcapability.h b/multimedia/av_codec/native_avcapability.h index 1d0af06b2b47a70e57f70e5f8440b67e56dd7d56..3c8649510a60c693bee868cff1098b08c40814e9 100644 --- a/multimedia/av_codec/native_avcapability.h +++ b/multimedia/av_codec/native_avcapability.h @@ -84,7 +84,7 @@ typedef enum OH_AVCapabilityFeature { VIDEO_ENCODER_TEMPORAL_SCALABILITY = 0, /** Feature for codec supports long-term reference. It is only used in video encoder. */ VIDEO_ENCODER_LONG_TERM_REFERENCE = 1, - /** Feature for codec supports low latency. It is used in video encoder and video decoder. */ + /** Feature for codec supports low latency. It is only used in video decoder. */ VIDEO_LOW_LATENCY = 2, /** Feature for codec supports B-frame encoding. It is only used in video encoder. * @since 20 diff --git a/multimedia/av_codec/native_avcodec_base.h b/multimedia/av_codec/native_avcodec_base.h index 7745ac2101f9066330942d3bd141a608a2ec70e2..0042b76b4a2da27c3f8f01b44f2254bfe09f2a95 100644 --- a/multimedia/av_codec/native_avcodec_base.h +++ b/multimedia/av_codec/native_avcodec_base.h @@ -944,8 +944,8 @@ extern const char *OH_MD_KEY_VIDEO_PIC_WIDTH; extern const char *OH_MD_KEY_VIDEO_PIC_HEIGHT; /** * @brief Key to enable the low latency mode, value type is int32_t (0 or 1):1 is enabled, 0 otherwise. - * If enabled, the video encoder or video decoder doesn't hold input and output data more than required by - * the codec standards. This is an optional key that applies only to video encoder or video decoder. + * If enabled, the video decoder doesn't hold input and output data more than required by + * the codec standards. This is an optional key that applies only to video decoder. * It is used in configure. * * @syscap SystemCapability.Multimedia.Media.CodecBase diff --git a/multimedia/camera_framework/camera.ndk.json b/multimedia/camera_framework/camera.ndk.json index ff95d61ee10ccdf7ce6e97dad268cb9889d902b4..4c4d03826d245e86b2b7e02812852bcf6c3dbcc2 100644 --- a/multimedia/camera_framework/camera.ndk.json +++ b/multimedia/camera_framework/camera.ndk.json @@ -23,6 +23,18 @@ "first_introduced": "11", "name": "OH_CameraInput_Release" }, + { + "first_introduced": "21", + "name": "OH_CameraInput_IsPhysicalCameraOrientationVariable" + }, + { + "first_introduced": "21", + "name": "OH_CameraInput_GetPhysicalCameraOrientation" + }, + { + "first_introduced": "21", + "name": "OH_CameraInput_UsePhysicalCameraOrientation" + }, { "first_introduced": "11", "name": "OH_CameraManager_RegisterCallback" diff --git a/multimedia/camera_framework/camera_input.h b/multimedia/camera_framework/camera_input.h index a91452d9d46cdef6d27a3e7e68095be23b48bb5e..72a974c9a69da737a5992085e43e91839e5849a5 100644 --- a/multimedia/camera_framework/camera_input.h +++ b/multimedia/camera_framework/camera_input.h @@ -171,6 +171,41 @@ Camera_ErrorCode OH_CameraInput_Close(Camera_Input* cameraInput); */ Camera_ErrorCode OH_CameraInput_Release(Camera_Input* cameraInput); +/** + * @brief Query whether physical camera orientation is variable under different fold status. + * + * @param {CameraInput} cameraInput the {@link Camera_Input} instance. + * @param {bool} isVariable the result of whether physical camera orientation is variable. + * @return {@link #CAMERA_OK} if the method call succeeds. + * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. + * @since 21 + */ +Camera_ErrorCode OH_CameraInput_IsPhysicalCameraOrientationVariable(Camera_Input* cameraInput, bool* isVariable); + +/** + * @brief Get physical camera orientation under current fold status. + * + * @param cameraInput the {@link Camera_Input} instance. + * @param orientation the physical camera orientation of current fold status. + * @return {@link #CAMERA_OK} if the method call succeeds. + * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. + * @since 21 + */ +Camera_ErrorCode OH_CameraInput_GetPhysicalCameraOrientation(Camera_Input* cameraInput, uint32_t* orientation); + +/** + * @brief Choose whether to use the physical camera orientation. + * + * @param cameraInput the {@link Camera_Input} instance. + * @param isUsed the flag of whether to use physical camera orientation. + * @return {@link #CAMERA_OK} if the method call succeeds. + * {@link #CAMERA_INVALID_ARGUMENT} if parameter missing or parameter type incorrect. + * {@link #CAMERA_OPERATION_NOT_ALLOWED} if operation not allowed. + * {@link #CAMERA_SERVICE_FATAL_ERROR} if camera service fatal error. + * @since 21 + */ +Camera_ErrorCode OH_CameraInput_UsePhysicalCameraOrientation(Camera_Input* cameraInput, bool isUsed); + #ifdef __cplusplus } #endif diff --git a/multimodalinput/kits/c/input/oh_input_manager.h b/multimodalinput/kits/c/input/oh_input_manager.h index 7ff7bb1511574ab7bb2c8660dddbef2d7de3161a..32432532486e3b63d97343b4ff66106909c9aa4e 100644 --- a/multimodalinput/kits/c/input/oh_input_manager.h +++ b/multimodalinput/kits/c/input/oh_input_manager.h @@ -1389,7 +1389,7 @@ Input_Result OH_Input_GetAxisEventSourceType(const Input_AxisEvent* axisEvent, I * * @param axisEvent Axis event object. For details, see {@Link Input_AxisEvent}. * @param windowId The windowId for the axis event. - * @return OH_Input_SetAxisEventDisplayY function result code. + * @return OH_Input_SetAxisEventWindowId function result code. * {@link INPUT_SUCCESS} Sets the Y coordinate of the axis event success.\n * {@link INPUT_PARAMETER_ERROR} The axisEvent is NULL.\n * @syscap SystemCapability.MultimodalInput.Input.Core @@ -1402,7 +1402,7 @@ Input_Result OH_Input_SetAxisEventWindowId(Input_AxisEvent* axisEvent, int32_t w * * @param axisEvent Axis event object. For details, see {@Link Input_AxisEvent}. * @param windowId The windowId for the axis event. - * @return OH_Input_GetAxisEventDisplayY function result code. + * @return OH_Input_GetAxisEventWindowId function result code. * {@link INPUT_SUCCESS} Obtains the Y coordinate of the axis event success.\n * {@link INPUT_PARAMETER_ERROR} The axisEvent is NULL or the displayY is NULL.\n * @syscap SystemCapability.MultimodalInput.Input.Core @@ -1415,7 +1415,7 @@ Input_Result OH_Input_GetAxisEventWindowId(const Input_AxisEvent* axisEvent, int * * @param axisEvent Axis event object. For details, see {@Link Input_AxisEvent}. * @param displayId The displayId for the axis event. - * @return OH_Input_SetAxisEventDisplayY function result code. + * @return OH_Input_SetAxisEventDisplayId function result code. * {@link INPUT_SUCCESS} Sets the Y coordinate of the axis event success.\n * {@link INPUT_PARAMETER_ERROR} The axisEvent is NULL.\n * @syscap SystemCapability.MultimodalInput.Input.Core @@ -1428,7 +1428,7 @@ Input_Result OH_Input_SetAxisEventDisplayId(Input_AxisEvent* axisEvent, int32_t * * @param axisEvent Axis event object. For details, see {@Link Input_AxisEvent}. * @param displayId The displayId for the axis event. - * @return OH_Input_GetAxisEventDisplayY function result code. + * @return OH_Input_GetAxisEventDisplayId function result code. * {@link INPUT_SUCCESS} Obtains the Y coordinate of the axis event success.\n * {@link INPUT_PARAMETER_ERROR} The axisEvent is NULL or the displayY is NULL.\n * @syscap SystemCapability.MultimodalInput.Input.Core @@ -1775,7 +1775,7 @@ void OH_Input_SetFinalKey(Input_Hotkey *hotkey, int32_t finalKey); * * @param hotkey Hotkey key object. * @param finalKeyCode Returns the key value of the decorated key. - * @return OH_Input_GetfinalKey status code, specifically, + * @return OH_Input_GetFinalKey status code, specifically, * {@link INPUT_SUCCESS} if the operation is successful;\n * {@link INPUT_PARAMETER_ERROR} The hotkey is NULL or the finalKeyCode is NULL;\n * {@Link INPUT_DEVICE_NOT_SUPPORTED} Capability not supported.\n @@ -1840,7 +1840,7 @@ void OH_Input_SetRepeat(Input_Hotkey* hotkey, bool isRepeat); * * @param hotkey Shortcut key object. * @param isRepeat Whether a key event is repeated. - * @return OH_Input_GetIsRepeat status code, specifically, + * @return OH_Input_GetRepeat status code, specifically, * {@link INPUT_SUCCESS} if the operation is successful;\n * {@link INPUT_PARAMETER_ERROR} otherwise;\n * {@Link INPUT_DEVICE_NOT_SUPPORTED} Capability not supported.\n @@ -2061,7 +2061,7 @@ Input_Result OH_Input_UnregisterDeviceListener(Input_DeviceListener* listener); /** * @brief Unregisters the listener for all device hot swap events. * - * @return OH_Input_UnregisterDeviceListener status code, specifically, + * @return OH_Input_UnregisterDeviceListeners status code, specifically, * {@link INPUT_SUCCESS} if the operation is successful;\n * {@link INPUT_SERVICE_EXCEPTION} if the service is abnormal. * @syscap SystemCapability.MultimodalInput.Input.Core