This commit is contained in:
shenshiyi2 2024-11-21 15:13:17 +08:00
commit b86a924283
33 changed files with 760 additions and 607 deletions

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef TIME_SERVICE_H
#define TIME_SERVICE_H
/**
* @addtogroup TimeService
* @{
@ -33,6 +30,9 @@
* @since 12
*/
#ifndef TIME_SERVICE_H
#define TIME_SERVICE_H
#include <stdint.h>
#ifdef __cplusplus

View File

@ -918,7 +918,7 @@ OH_NN_ReturnCode OH_NNExecutor_GetInputCount(const OH_NNExecutor *executor, size
* {@link OH_NNExecutor_CreateOutputTensorDesc}. \n
*
* @param executor Pointer to the {@link OH_NNExecutor} instance.
* @param OutputCount Output tensor count returned.
* @param outputCount Output tensor count returned.
* @return Execution result of the function.
* {@link OH_NN_SUCCESS} get output count successfully. The return value is saved in <b>outputCount</b>.\n
* {@link OH_NN_INVALID_PARAMETER} fail to get output count. The possible reason for failure is that

View File

@ -13,13 +13,6 @@
* limitations under the License.
*/
#ifndef OHOS_BACKGROUOND_TASK_MANAGER_TRANSIENT_TASK_API_H
#define OHOS_BACKGROUOND_TASK_MANAGER_TRANSIENT_TASK_API_H
#include <stdint.h>
#include "transient_task_type.h"
/**
* @addtogroup TransientTask
* @{
@ -41,6 +34,13 @@
* @since 13
*/
#ifndef OHOS_BACKGROUOND_TASK_MANAGER_TRANSIENT_TASK_API_H
#define OHOS_BACKGROUOND_TASK_MANAGER_TRANSIENT_TASK_API_H
#include <stdint.h>
#include "transient_task_type.h"
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef OHOS_BACKGROUOND_TASK_MANAGER_TRANSIENT_TASK_TYPE_H
#define OHOS_BACKGROUOND_TASK_MANAGER_TRANSIENT_TASK_TYPE_H
/**
* @addtogroup TransientTask
* @{
@ -36,6 +33,9 @@
* @since 11
*/
#ifndef OHOS_BACKGROUOND_TASK_MANAGER_TRANSIENT_TASK_TYPE_H
#define OHOS_BACKGROUOND_TASK_MANAGER_TRANSIENT_TASK_TYPE_H
#include <stdint.h>
#ifdef __cplusplus

View File

@ -54,5 +54,9 @@
{
"first_introduced": "13",
"name": "OH_Pasteboard_ClearData"
},
{
"first_introduced": "14",
"name": "OH_Pasteboard_GetMimeTypes"
}
]

View File

@ -12,8 +12,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef FILE_MANAGEMENT_ENVIRONMENT_OH_ENVIRONMENT_H
#define FILE_MANAGEMENT_ENVIRONMENT_OH_ENVIRONMENT_H
/**
* @addtogroup Environment
@ -33,6 +31,9 @@
* @since 12
*/
#ifndef FILE_MANAGEMENT_ENVIRONMENT_OH_ENVIRONMENT_H
#define FILE_MANAGEMENT_ENVIRONMENT_OH_ENVIRONMENT_H
#include "error_code.h"
#ifdef __cplusplus

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef FILE_MANAGEMENT_FILEIO_ERROR_CODE_H
#define FILE_MANAGEMENT_FILEIO_ERROR_CODE_H
/**
* @addtogroup FileIO
* @{
@ -33,6 +30,9 @@
* @since 12
*/
#ifndef FILE_MANAGEMENT_FILEIO_ERROR_CODE_H
#define FILE_MANAGEMENT_FILEIO_ERROR_CODE_H
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -12,8 +12,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef FILE_MANAGEMENT_FILEIO_OH_FILEIO_H
#define FILE_MANAGEMENT_FILEIO_OH_FILEIO_H
/**
* @addtogroup FileIO
@ -32,6 +30,9 @@
* @since 12
*/
#ifndef FILE_MANAGEMENT_FILEIO_OH_FILEIO_H
#define FILE_MANAGEMENT_FILEIO_OH_FILEIO_H
#include "error_code.h"
#ifdef __cplusplus

View File

@ -538,7 +538,8 @@ OH_Drawing_ErrorCode OH_Drawing_FontGetPathForGlyph(const OH_Drawing_Font* font,
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param font Indicates the pointer to an <b>OH_Drawing_Font</b> object.
* @param text Indicates the character storage encoded with text encoding.
* @param byteLength Indicates the text length in bytes.
* @param byteLength Indicates to get the byte length of the corresponding text path. If this byte length is greater
* than the byte length of the text string, undefined behavior will occur.
* @param encoding <b>OH_Drawing_TextEncoding</b> Indicates the text encoding.
* @param x Indicates x coordinates of the text.
* @param y Indicates y coordinates of the text.

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef C_INCLUDE_DRAWING_FONT_COLLECTION_H
#define C_INCLUDE_DRAWING_FONT_COLLECTION_H
/**
* @addtogroup Drawing
* @{
@ -40,6 +37,9 @@
* @version 1.0
*/
#ifndef C_INCLUDE_DRAWING_FONT_COLLECTION_H
#define C_INCLUDE_DRAWING_FONT_COLLECTION_H
#include "drawing_text_declaration.h"
#ifdef __cplusplus
@ -59,31 +59,31 @@ OH_Drawing_FontCollection* OH_Drawing_CreateFontCollection(void);
* @brief Releases the memory occupied by an <b>OH_Drawing_FontCollection</b> object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontCollection Indicates the pointer to an <b>OH_Drawing_FontCollection</b> object.
* @param fontCollection Indicates the pointer to an <b>OH_Drawing_FontCollection</b> object.
* @since 8
* @version 1.0
*/
void OH_Drawing_DestroyFontCollection(OH_Drawing_FontCollection*);
void OH_Drawing_DestroyFontCollection(OH_Drawing_FontCollection* fontCollection);
/**
* @brief Disable the font collection fallback.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontCollection Indicates the pointer to an <b>OH_Drawing_FontCollection</b> object.
* @param fontCollection Indicates the pointer to an <b>OH_Drawing_FontCollection</b> object.
* @since 12
* @version 1.0
*/
void OH_Drawing_DisableFontCollectionFallback(OH_Drawing_FontCollection*);
void OH_Drawing_DisableFontCollectionFallback(OH_Drawing_FontCollection* fontCollection);
/**
* @brief Disable the font collection systemfont.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontCollection Indicates the pointer to an <b>OH_Drawing_FontCollection</b> object.
* @param fontCollection Indicates the pointer to an <b>OH_Drawing_FontCollection</b> object.
* @since 12
* @version 1.0
*/
void OH_Drawing_DisableFontCollectionSystemFont(OH_Drawing_FontCollection*);
void OH_Drawing_DisableFontCollectionSystemFont(OH_Drawing_FontCollection* fontCollection);
/**
* @brief Creates an <b>OH_Drawing_FontCollection</b> object with shared usage between
@ -100,11 +100,11 @@ OH_Drawing_FontCollection* OH_Drawing_CreateSharedFontCollection(void);
* @brief Clear font caches.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontCollection Indicates the pointer to an <b>OH_Drawing_FontCollection</b> object.
* @param fontCollection Indicates the pointer to an <b>OH_Drawing_FontCollection</b> object.
* @since 12
* @version 1.0
*/
void OH_Drawing_ClearFontCaches(OH_Drawing_FontCollection*);
void OH_Drawing_ClearFontCaches(OH_Drawing_FontCollection* fontCollection);
#ifdef __cplusplus
}
#endif

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef C_INCLUDE_DRAWING_FONT_MGR_H
#define C_INCLUDE_DRAWING_FONT_MGR_H
/**
* @addtogroup Drawing
* @{
@ -40,6 +37,9 @@
* @version 1.0
*/
#ifndef C_INCLUDE_DRAWING_FONT_MGR_H
#define C_INCLUDE_DRAWING_FONT_MGR_H
#include "drawing_types.h"
#include "drawing_text_typography.h"
#include <stdint.h>
@ -62,34 +62,34 @@ OH_Drawing_FontMgr* OH_Drawing_FontMgrCreate(void);
* @brief Releases the memory occupied by an <b>OH_Drawing_FontMgr</b> object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param drawingFontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @since 12
* @version 1.0
*/
void OH_Drawing_FontMgrDestroy(OH_Drawing_FontMgr*);
void OH_Drawing_FontMgrDestroy(OH_Drawing_FontMgr* drawingFontMgr);
/**
* @brief Gets the count of font families.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param drawingFontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @return Returns the count of font families.
* @since 12
* @version 1.0
*/
int OH_Drawing_FontMgrGetFamilyCount(OH_Drawing_FontMgr*);
int OH_Drawing_FontMgrGetFamilyCount(OH_Drawing_FontMgr* drawingFontMgr);
/**
* @brief Gets the font family name by the index.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param drawingFontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param index Indicates the index to get the font family name.
* @return Returns the font family name corresponding to the index value.
* @since 12
* @version 1.0
*/
char* OH_Drawing_FontMgrGetFamilyName(OH_Drawing_FontMgr*, int index);
char* OH_Drawing_FontMgrGetFamilyName(OH_Drawing_FontMgr* drawingFontMgr, int index);
/**
* @brief Releases the memory occupied by font family name.
@ -105,57 +105,57 @@ void OH_Drawing_FontMgrDestroyFamilyName(char* familyName);
* @brief Creates an <b>OH_Drawing_FontStyleSet</b> object by <b>OH_Drawing_FontMgr</b> object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param drawingFontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param index Indicates the index used to get the font style set object from the font manager object.
* @return Returns the pointer to the <b>OH_Drawing_FontStyleSet</b> object created.
* @since 12
* @version 1.0
*/
OH_Drawing_FontStyleSet* OH_Drawing_FontMgrCreateFontStyleSet(OH_Drawing_FontMgr*, int index);
OH_Drawing_FontStyleSet* OH_Drawing_FontMgrCreateFontStyleSet(OH_Drawing_FontMgr* drawingFontMgr, int index);
/**
* @brief Releases the memory occupied by an <b>OH_Drawing_FontStyleSet</b> object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontStyleSet Indicates the pointer to an <b>OH_Drawing_FontStyleSet</b> object.
* @param drawingFontStyleSet Indicates the pointer to an <b>OH_Drawing_FontStyleSet</b> object.
* @since 12
* @version 1.0
*/
void OH_Drawing_FontMgrDestroyFontStyleSet(OH_Drawing_FontStyleSet*);
void OH_Drawing_FontMgrDestroyFontStyleSet(OH_Drawing_FontStyleSet* drawingFontStyleSet);
/**
* @brief Get the pointer to an <b>OH_Drawing_FontStyleSet</b> object for the given font style set family name.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param drawingFontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param familyName Indicates the family name of a font style set to be matched.
* @return Returns the pointer to the <b>OH_Drawing_FontStyleSet</b> object matched.
* @since 12
* @version 1.0
*/
OH_Drawing_FontStyleSet* OH_Drawing_FontMgrMatchFamily(OH_Drawing_FontMgr*, const char* familyName);
OH_Drawing_FontStyleSet* OH_Drawing_FontMgrMatchFamily(OH_Drawing_FontMgr* drawingFontMgr, const char* familyName);
/**
* @brief Get the pointer to an <b>OH_Drawing_Typeface</b> object based on the given font style and family name.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param drawingFontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param familyName Indicates the family name of a font style set to be matched.
* @param OH_Drawing_FontStyleStruct Indicates an <b>OH_Drawing_FontStyleStruct</b> object.
* @param fontStyle Indicates an <b>OH_Drawing_FontStyleStruct</b> object.
* @return Returns the pointer to the <b>OH_Drawing_Typeface</b> object matched.
* @since 12
* @version 1.0
*/
OH_Drawing_Typeface* OH_Drawing_FontMgrMatchFamilyStyle(OH_Drawing_FontMgr*,
OH_Drawing_Typeface* OH_Drawing_FontMgrMatchFamilyStyle(OH_Drawing_FontMgr* drawingFontMgr,
const char* familyName, OH_Drawing_FontStyleStruct fontStyle);
/**
* @brief Get the pointer to an <b>OH_Drawing_Typeface</b> object for the given character.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param drawingFontMgr Indicates the pointer to an <b>OH_Drawing_FontMgr</b> object.
* @param familyName Indicates the family name of a font style set to be matched.
* @param OH_Drawing_FontStyleStruct Indicates an <b>OH_Drawing_FontStyleStruct</b> object.
* @param fontStyle Indicates an <b>OH_Drawing_FontStyleStruct</b> object.
* @param bcp47 Indicates an array of languages which indicate the language of character.
* @param bcp47Count Indicates the array size of bcp47.
* @param character Indicates a UTF8 value to be matched.
@ -163,33 +163,34 @@ OH_Drawing_Typeface* OH_Drawing_FontMgrMatchFamilyStyle(OH_Drawing_FontMgr*,
* @since 12
* @version 1.0
*/
OH_Drawing_Typeface* OH_Drawing_FontMgrMatchFamilyStyleCharacter(OH_Drawing_FontMgr*, const char* familyName,
OH_Drawing_FontStyleStruct fontStyle, const char* bcp47[], int bcp47Count, int32_t character);
OH_Drawing_Typeface* OH_Drawing_FontMgrMatchFamilyStyleCharacter(OH_Drawing_FontMgr* drawingFontMgr,
const char* familyName, OH_Drawing_FontStyleStruct fontStyle,
const char* bcp47[], int bcp47Count, int32_t character);
/**
* @brief Create a typeface for the given index.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontStyleSet Indicates the pointer to an <b>OH_Drawing_FontStyleSet</b> object.
* @param fontStyleSet Indicates the pointer to an <b>OH_Drawing_FontStyleSet</b> object.
* @param index Indicates the index of the typeface in this fontStyleSet.
* @return If successful, return a pointer to <b>OH_Drawing_Typeface</b> object; if failed, return nullptr.
* @since 12
* @version 1.0
*/
OH_Drawing_Typeface* OH_Drawing_FontStyleSetCreateTypeface(OH_Drawing_FontStyleSet*, int index);
OH_Drawing_Typeface* OH_Drawing_FontStyleSetCreateTypeface(OH_Drawing_FontStyleSet* fontStyleSet, int index);
/**
* @brief Get font style for the specified typeface.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontStyleSet Indicates the pointer to an <b>OH_Drawing_FontStyleSet</b> object.
* @param fontStyleSet Indicates the pointer to an <b>OH_Drawing_FontStyleSet</b> object.
* @param index Indicates the index of the typeface in this fontStyleSet.
* @param styleName Indicates the style name returned.
* @return Return the <b>OH_Drawing_FontStyleStruct<b> structure.
* @since 12
* @version 1.0
*/
OH_Drawing_FontStyleStruct OH_Drawing_FontStyleSetGetStyle(OH_Drawing_FontStyleSet*, int32_t index,
OH_Drawing_FontStyleStruct OH_Drawing_FontStyleSetGetStyle(OH_Drawing_FontStyleSet* fontStyleSet, int32_t index,
char** styleName);
/**
@ -206,25 +207,25 @@ void OH_Drawing_FontStyleSetFreeStyleName(char** styleName);
* @brief Get the closest matching typeface.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontStyleSet Indicates the pointer to an <b>OH_Drawing_FontStyleSet</b> object.
* @param fontStyleSet Indicates the pointer to an <b>OH_Drawing_FontStyleSet</b> object.
* @param fontStyleStruct Indicates the <b>OH_Drawing_FontStyleStruct</b> structure.
* @return A pointer to matched <b>OH_Drawing_Typeface</b>.
* @since 12
* @version 1.0
*/
OH_Drawing_Typeface* OH_Drawing_FontStyleSetMatchStyle(OH_Drawing_FontStyleSet*,
OH_Drawing_Typeface* OH_Drawing_FontStyleSetMatchStyle(OH_Drawing_FontStyleSet* fontStyleSet,
OH_Drawing_FontStyleStruct fontStyleStruct);
/**
* @brief Get the count of typeface.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontStyleSet Indicates the pointer to an <b>OH_Drawing_FontStyleSet</b> object.
* @param fontStyleSet Indicates the pointer to an <b>OH_Drawing_FontStyleSet</b> object.
* @return The count of typeface in this font style set.
* @since 12
* @version 1.0
*/
int OH_Drawing_FontStyleSetCount(OH_Drawing_FontStyleSet*);
int OH_Drawing_FontStyleSetCount(OH_Drawing_FontStyleSet* fontStyleSet);
#ifdef __cplusplus
}

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef C_INCLUDE_DRAWING_REGISTER_FONT_H
#define C_INCLUDE_DRAWING_REGISTER_FONT_H
/**
* @addtogroup Drawing
* @{
@ -40,6 +37,9 @@
* @version 1.0
*/
#ifndef C_INCLUDE_DRAWING_REGISTER_FONT_H
#define C_INCLUDE_DRAWING_REGISTER_FONT_H
#include "drawing_text_declaration.h"
#include "drawing_types.h"

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef C_INCLUDE_DRAWING_TEXT_DECLARATION_H
#define C_INCLUDE_DRAWING_TEXT_DECLARATION_H
/**
* @addtogroup Drawing
* @{
@ -40,6 +37,9 @@
* @version 1.0
*/
#ifndef C_INCLUDE_DRAWING_TEXT_DECLARATION_H
#define C_INCLUDE_DRAWING_TEXT_DECLARATION_H
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -69,69 +69,70 @@ typedef enum {
* font descriptors. If the match fails, return nullptr.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontDescriptor The pointer to the <b>OH_Drawing_FontDescriptor</b> object. It is recommended to
* @param desc The pointer to the <b>OH_Drawing_FontDescriptor</b> object. It is recommended to
* use <b>OH_Drawing_CreateFontDescriptor</b> to obtain a valid <b>OH_Drawing_FontDescriptor</b> instance.
* If you create your own <b>OH_Drawing_FontDescriptor</b> object, ensure that fields not intended for matching are
* set to their default values.
* @param size_t Indicates the count of obtained <b>OH_Drawing_FontDescriptor</b>.
* @param num Indicates the count of obtained <b>OH_Drawing_FontDescriptor</b>.
* @return Returns an array of <b>OH_Drawing_FontDescriptor</b>. Released through the
* <b>OH_Drawing_DestroyFontDescriptors</b> interface after use.
* @since 14
*/
OH_Drawing_FontDescriptor* OH_Drawing_MatchFontDescriptors(OH_Drawing_FontDescriptor*, size_t*);
OH_Drawing_FontDescriptor* OH_Drawing_MatchFontDescriptors(OH_Drawing_FontDescriptor* desc, size_t* num);
/**
* @brief Releases the <b>OH_Drawing_FontDescriptor</b> array.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_FontDescriptor <b>OH_Drawing_FontDescriptor</b> object array.
* @param size_t Represents the number of members of the <b>OH_Drawing_FontDescriptor</b> array.
* @param descriptors <b>OH_Drawing_FontDescriptor</b> object array.
* @param num Represents the number of members of the <b>OH_Drawing_FontDescriptor</b> array.
* @since 14
*/
void OH_Drawing_DestroyFontDescriptors(OH_Drawing_FontDescriptor*, size_t);
void OH_Drawing_DestroyFontDescriptors(OH_Drawing_FontDescriptor* descriptors, size_t num);
/**
* @brief Get the <b>OH_Drawing_FontDescriptor</b> object by the font full name and the font type, supporting generic
* fonts, stylish fonts, and installed fonts.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_String Indicates the full name object <b>OH_Drawing_String</b>.
* @param OH_Drawing_SystemFontType Indicates enumerates of system font type object <b>OH_Drawing_SystemFontType</b>.
* @param fullName Indicates the full name object <b>OH_Drawing_String</b>.
* @param fontType Indicates enumerates of system font type object <b>OH_Drawing_SystemFontType</b>.
* @return Returns the pointer to a font descriptor object <b>OH_Drawing_FontDescriptor</b>.
* @since 14
*/
OH_Drawing_FontDescriptor* OH_Drawing_GetFontDescriptorByFullName(const OH_Drawing_String*, OH_Drawing_SystemFontType);
OH_Drawing_FontDescriptor* OH_Drawing_GetFontDescriptorByFullName(const OH_Drawing_String* fullName,
OH_Drawing_SystemFontType fontType);
/**
* @brief Obtain the corresponding font full name array by the font type.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_SystemFontType Indicates enumerates of system font type object <b>OH_Drawing_SystemFontType</b>.
* @param fontType Indicates enumerates of system font type object <b>OH_Drawing_SystemFontType</b>.
* @return Returns the pointer to full name array object <b>OH_Drawing_Array</b>.
* @since 14
*/
OH_Drawing_Array* OH_Drawing_GetSystemFontFullNamesByType(OH_Drawing_SystemFontType);
OH_Drawing_Array* OH_Drawing_GetSystemFontFullNamesByType(OH_Drawing_SystemFontType fontType);
/**
* @brief Get the specified full name object <b>OH_Drawing_String</b> by index from the
* <b>OH_Drawing_Array</b> object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_Array Indicates an array of full name object <b>OH_Drawing_Array</b>.
* @param size_t The index of full name.
* @param fullNameArray Indicates an array of full name object <b>OH_Drawing_Array</b>.
* @param index The index of full name.
* @return Returns a full name object <b>OH_Drawing_String</b>.
* @since 14
*/
const OH_Drawing_String* OH_Drawing_GetSystemFontFullNameByIndex(OH_Drawing_Array*, size_t);
const OH_Drawing_String* OH_Drawing_GetSystemFontFullNameByIndex(OH_Drawing_Array* fullNameArray, size_t index);
/**
* @brief Releases the memory occupied by an array of font full names.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_Array Indicates an array of full name object <b>OH_Drawing_Array</b>.
* @param fullNameArray Indicates an array of full name object <b>OH_Drawing_Array</b>.
* @since 14
*/
void OH_Drawing_DestroySystemFontFullNames(OH_Drawing_Array*);
void OH_Drawing_DestroySystemFontFullNames(OH_Drawing_Array* fullNameArray);
#ifdef __cplusplus
}

View File

@ -50,7 +50,7 @@ extern "C" {
* @brief Creates an <b>OH_Drawing_LineTypography</b> object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_TypographyCreate Indicates the pointer to an <b>OH_Drawing_TypographyCreate</b> object.
* @param handler Indicates the pointer to an <b>OH_Drawing_TypographyCreate</b> object.
* @return Returns the pointer to the <b>OH_Drawing_LineTypography</b> object created.
* @since 14
*/
@ -60,7 +60,7 @@ OH_Drawing_LineTypography* OH_Drawing_CreateLineTypography(OH_Drawing_Typography
* @brief Releases the memory occupied by an <b>OH_Drawing_LineTypography</b> object.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_LineTypography Indicates the pointer to an <b>OH_Drawing_LineTypography</b> object.
* @param lineTypography Indicates the pointer to an <b>OH_Drawing_LineTypography</b> object.
* @since 14
*/
void OH_Drawing_DestroyLineTypography(OH_Drawing_LineTypography* lineTypography);
@ -69,7 +69,7 @@ void OH_Drawing_DestroyLineTypography(OH_Drawing_LineTypography* lineTypography)
* @brief Calculate the line breakpoint based on the width provided.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_TypographyCreate Indicates the pointer to an <b>OH_Drawing_TypographyCreate</b> object.
* @param lineTypography Indicates the pointer to an <b>OH_Drawing_TypographyCreate</b> object.
* @param startIndex Indicates the starting point for the line-break calculations.
* @param width Indicates the requested line-break width.
* @return Returns the count of the characters from startIndex that would cause the line break.
@ -82,7 +82,7 @@ size_t OH_Drawing_LineTypographyGetLineBreak(OH_Drawing_LineTypography* lineTypo
* @brief Creates a text line object based on the text range provided.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeDrawing
* @param OH_Drawing_LineTypography Indicates the pointer to an <b>OH_Drawing_TypographyCreate</b> object.
* @param lineTypography Indicates the pointer to an <b>OH_Drawing_TypographyCreate</b> object.
* @param startIndex Indicates the starting index of the text range.
* @param count Indicates the characters count of the text range.
* @return Returns the pointer to the <b>OH_Drawing_TextLine</b> object created.

File diff suppressed because it is too large Load Diff

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef C_INCLUDE_EFFECT_FILTER_H
#define C_INCLUDE_EFFECT_FILTER_H
/**
* @addtogroup image
* @{
@ -37,6 +34,9 @@
* @since 12
*/
#ifndef C_INCLUDE_EFFECT_FILTER_H
#define C_INCLUDE_EFFECT_FILTER_H
#include "effect_types.h"
#ifdef __cplusplus
extern "C" {

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef C_INCLUDE_EFFECT_TYPES_H
#define C_INCLUDE_EFFECT_TYPES_H
/**
* @addtogroup image
* @{
@ -37,6 +34,9 @@
* @since 12
*/
#ifndef C_INCLUDE_EFFECT_TYPES_H
#define C_INCLUDE_EFFECT_TYPES_H
#include <stdint.h>
#include <stddef.h>

View File

@ -70,6 +70,19 @@ OH_NativeVSync* OH_NativeVSync_Create(const char* name, unsigned int length);
*/
void OH_NativeVSync_Destroy(OH_NativeVSync* nativeVsync);
/**
* @brief Creates a <b>NativeVsync</b> instance.\n
* A new <b>NativeVsync</b> instance is created each time this function is called.
*
* @syscap SystemCapability.Graphic.Graphic2D.NativeVsync
* @param windowID Indicates the id of the associated window.
* @param name Indicates the vsync connection name.
* @param length Indicates the name's length.
* @return Returns the pointer to the <b>NativeVsync</b> instance created.
* @since 14
* @version 1.0
*/
OH_NativeVSync* OH_NativeVSync_Create_ForAssociatedWindow(uint64_t windowID, const char* name, unsigned int length);
/**
* @brief Request next vsync with callback.
* If you call this interface multiple times in one frame, it will only call the last callback.

View File

@ -13,8 +13,6 @@
* limitations under the License.
*/
#ifndef HIVIEWDFX_HIDEBUG_H
#define HIVIEWDFX_HIDEBUG_H
/**
* @addtogroup HiDebug
* @{
@ -37,6 +35,9 @@
* @since 12
*/
#ifndef HIVIEWDFX_HIDEBUG_H
#define HIVIEWDFX_HIDEBUG_H
#include <stdint.h>
#include "hidebug_type.h"

View File

@ -13,8 +13,6 @@
* limitations under the License.
*/
#ifndef HIVIEWDFX_HIDEBUG_TYPE_H
#define HIVIEWDFX_HIDEBUG_TYPE_H
/**
* @addtogroup HiDebug
* @{
@ -37,6 +35,9 @@
* @since 12
*/
#ifndef HIVIEWDFX_HIDEBUG_TYPE_H
#define HIVIEWDFX_HIDEBUG_TYPE_H
#include <stdint.h>
#ifdef __cplusplus

View File

@ -13,8 +13,6 @@
* limitations under the License.
*/
#ifndef HIVIEWDFX_HILOG_H
#define HIVIEWDFX_HILOG_H
/**
* @addtogroup HiLog
* @{
@ -57,8 +55,14 @@
* Output result:\n
* 05-06 15:01:06.870 1051 1051 W 0201/MY_TAG: Failed to visit <private>, reason:503.\n
*
* @library libhilog.so
* @syscap SystemCapability.HiviewDFX.HiLog
* @since 8
*/
#ifndef HIVIEWDFX_HILOG_H
#define HIVIEWDFX_HILOG_H
#include <stdarg.h>
#include <stdbool.h>

View File

@ -13,8 +13,6 @@
* limitations under the License.
*/
#ifndef HIVIEWDFX_HITRACE_H
#define HIVIEWDFX_HITRACE_H
/**
* @addtogroup Hitrace
* @{
@ -64,6 +62,10 @@
* @syscap SystemCapability.HiviewDFX.HiTrace
* @since 10
*/
#ifndef HIVIEWDFX_HITRACE_H
#define HIVIEWDFX_HITRACE_H
#include <stdint.h>
#include <stdbool.h>

View File

@ -61,7 +61,7 @@ InputMethod_TextAvoidInfo *OH_TextAvoidInfo_Create(double positionY, double heig
/**
* @brief Destroy a {@link InputMethod_TextAvoidInfo} instance.
*
* @param options Represents a pointer to an {@link InputMethod_TextAvoidInfo} instance which will be destroyed.
* @param info Represents a pointer to an {@link InputMethod_TextAvoidInfo} instance which will be destroyed.
* @since 12
*/
void OH_TextAvoidInfo_Destroy(InputMethod_TextAvoidInfo *info);

View File

@ -107,6 +107,63 @@ typedef enum OH_AVErrCode {
* @since 12
*/
AV_ERR_VIDEO_UNSUPPORTED_COLOR_SPACE_CONVERSION = 301,
/**
* @error can not find host, maybe the address of server is incorrect.
* @since 14
*/
AV_ERR_IO_CANNOT_FIND_HOST = 5411001,
/**
* @error network connection timeout.
* @since 14
*/
AV_ERR_IO_CONNECTION_TIMEOUT = 5411002,
/**
* @error failed link due to abnormal network.
* @since 14
*/
AV_ERR_IO_NETWORK_ABNORMAL = 5411003,
/**
* @error failed link due to unavailable network.
* @since 14
*/
AV_ERR_IO_NETWORK_UNAVAILABLE = 5411004,
/**
* @error network permission dennied.
* @since 14
*/
AV_ERR_IO_NO_PERMISSION = 5411005,
/**
* @error the client request parameters are incorrect or exceed the processing capacity.
* @since 14
*/
AV_ERR_IO_NETWORK_ACCESS_DENIED = 5411006,
/**
* @error cannot find available network resources.
* @since 14
*/
AV_ERR_IO_RESOURCE_NOT_FOUND = 5411007,
/**
* @error the server failed to verify the client certificate because the certificate is not carried,
* the certificate is invalid, or the certificate is expired.
* @since 14
*/
AV_ERR_IO_SSL_CLIENT_CERT_NEEDED = 5411008,
/**
* @error the client failed to verify the server certificate because the certificate is not carried,
* the certificate is invalid, or the certificate is expired.
* @since 14
*/
AV_ERR_IO_SSL_CONNECT_FAIL = 5411009,
/**
* @error SSL server cert untrusted.
* @since 14
*/
AV_ERR_IO_SSL_SERVER_CERT_UNTRUSTED = 5411010,
/**
* @error unsupported request due to network protocols.
* @since 14
*/
AV_ERR_IO_UNSUPPORTED_REQUEST = 5411011,
} OH_AVErrCode;
#ifdef __cplusplus

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef OH_INPUT_MANAGER_H
#define OH_INPUT_MANAGER_H
/**
* @addtogroup input
* @{
@ -35,6 +32,9 @@
* @since 12
*/
#ifndef OH_INPUT_MANAGER_H
#define OH_INPUT_MANAGER_H
#include <stdint.h>
#include "oh_axis_type.h"
@ -674,7 +674,7 @@ int32_t OH_Input_GetMouseEventAxisType(const struct Input_MouseEvent* mouseEvent
* @brief Sets the axis value for a mouse axis event.
*
* @param mouseEvent Mouse event object.
* @param axisType Axis value. A positive value means scrolling forward,
* @param axisValue Axis value. A positive value means scrolling forward,
* and a negative number means scrolling backward.
* @syscap SystemCapability.MultimodalInput.Input.Core
* @since 12
@ -704,7 +704,7 @@ void OH_Input_SetMouseEventActionTime(struct Input_MouseEvent* mouseEvent, int64
/**
* @brief Obtains the time when a mouse event occurs.
*
* @param keyEvent Mouse event object.
* @param mouseEvent Mouse event object.
* @return Returns the time when the mouse event occurs.
* @syscap SystemCapability.MultimodalInput.Input.Core
* @since 12
@ -825,7 +825,7 @@ int32_t OH_Input_GetTouchEventDisplayY(const struct Input_TouchEvent* touchEvent
/**
* @brief Sets the time when a touch event occurs.
*
* @param keyEvent Touch event object.
* @param touchEvent Touch event object.
* @param actionTime Time when the touch event occurs.
* @syscap SystemCapability.MultimodalInput.Input.Core
* @since 12
@ -835,7 +835,7 @@ void OH_Input_SetTouchEventActionTime(struct Input_TouchEvent* touchEvent, int64
/**
* @brief Obtains the time when a touch event occurs.
*
* @param keyEvent touch event object.
* @param touchEvent touch event object.
* @return Returns the time when the touch event occurs.
* @syscap SystemCapability.MultimodalInput.Input.Core
* @since 12
@ -1050,7 +1050,7 @@ Input_Result OH_Input_SetAxisEventSourceType(Input_AxisEvent* axisEvent, InputEv
* @brief Obtains the axis event source type.
*
* @param axisEvent Axis event object.
* @param axisEventType Axis event source type. The values are defined in {@link InputEvent_SourceType}.
* @param sourceType Axis event source type. The values are defined in {@link InputEvent_SourceType}.
* @return OH_Input_GetAxisEventSourceType function result code.
* {@link INPUT_SUCCESS} Obtains the axis event source type success.\n
* {@link INPUT_PARAMETER_ERROR} The axisEvent is NULL or the sourceType is NULL.\n

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef OH_KEY_CODE_H
#define OH_KEY_CODE_H
/**
* @addtogroup input
* @{
@ -35,6 +32,9 @@
* @since 12
*/
#ifndef OH_KEY_CODE_H
#define OH_KEY_CODE_H
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef NATIVE_HUKS_API_H
#define NATIVE_HUKS_API_H
/**
* @addtogroup HuksKeyApi
* @{
@ -34,12 +31,18 @@
*
* @brief Defines the Universal Keystore Kit APIs.
*
* @library libhuks_ndk.z.so
* @syscap SystemCapability.Security.Huks
*
* include "huks/include/native_huks_type.h"
* @kit UniversalKeystoreKit
* @since 9
* @version 1.0
*/
#ifndef NATIVE_HUKS_API_H
#define NATIVE_HUKS_API_H
#include "native_huks_type.h"
#ifdef __cplusplus
@ -309,7 +312,7 @@ struct OH_Huks_Result OH_Huks_AnonAttestKeyItem(const struct OH_Huks_Blob *keyAl
* @param handle Indicates the pointer to the handle of the key session obtained.
* This handle is required for subsequent operations, including {@link OH_Huks_UpdateSession},
* {@link OH_Huks_FinishSession}, and {@link OH_Huks_AbortSession}.
* @param challenge Indicates the pointer to the challenge value obtained.
* @param token Indicates the pointer to the token used for key access control.
* @return {@link OH_Huks_ErrCode#OH_HUKS_SUCCESS} 0 - If the operation is successful.
* {@link OH_Huks_ErrCode#OH_HUKS_ERR_CODE_ILLEGAL_ARGUMENT} 401 - If keyAlias or paramSet or handle or
* token is invalid.

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef NATIVE_HUKS_PARAM_H
#define NATIVE_HUKS_PARAM_H
/**
* @addtogroup HuksParamSetApi
* @{
@ -36,12 +33,18 @@
*
* @brief Provides APIs for constructing, using, and destroying parameter sets.
*
* @library libhuks_ndk.z.so
* @syscap SystemCapability.Security.Huks
*
* include "huks/include/native_huks_type.h"
* @kit UniversalKeystoreKit
* @since 9
* @version 1.0
*/
#ifndef NATIVE_HUKS_PARAM_H
#define NATIVE_HUKS_PARAM_H
#include "native_huks_type.h"
#ifdef __cplusplus

View File

@ -13,9 +13,6 @@
* limitations under the License.
*/
#ifndef NATIVE_OH_HUKS_TYPE_H
#define NATIVE_OH_HUKS_TYPE_H
/**
* @addtogroup HuksTypeApi
* @{
@ -33,11 +30,17 @@
*
* @brief Defines the structure and enumeration.
*
* @library libhuks_ndk.z.so
* @syscap SystemCapability.Security.Huks
*
* @kit UniversalKeystoreKit
* @since 9
* @version 1.0
*/
#ifndef NATIVE_OH_HUKS_TYPE_H
#define NATIVE_OH_HUKS_TYPE_H
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>

View File

@ -13,8 +13,14 @@
* limitations under the License.
*/
#ifndef NATIVE_TELEPHONY_DATA_API_H
#define NATIVE_TELEPHONY_DATA_API_H
/**
* @addtogroup Telephony
* @{
*
* @brief Provides C interface for the telephony cellular data.
*
* @since 13
*/
/**
* @file telephony_data.h
@ -27,6 +33,9 @@
* @since 13
*/
#ifndef NATIVE_TELEPHONY_DATA_API_H
#define NATIVE_TELEPHONY_DATA_API_H
#include <stdint.h>
#ifdef __cplusplus
@ -47,3 +56,4 @@ int32_t OH_Telephony_GetDefaultCellularDataSlotId(void);
#endif
#endif // NATIVE_TELEPHONY_DATA_API_H
/** @} */

View File

@ -13,8 +13,14 @@
* limitations under the License.
*/
#ifndef NATIVE_TELEPHONY_RADIO_API_H
#define NATIVE_TELEPHONY_RADIO_API_H
/**
* @addtogroup Telephony
* @{
*
* @brief Provides C interface for the telephony radio.
*
* @since 13
*/
/**
* @file telephony_radio.h
@ -27,6 +33,9 @@
* @since 13
*/
#ifndef NATIVE_TELEPHONY_RADIO_API_H
#define NATIVE_TELEPHONY_RADIO_API_H
#include "telephony_radio_type.h"
#include "stdint.h"
@ -72,3 +81,4 @@ Telephony_RadioResult OH_Telephony_GetNetworkStateForSlot(int32_t slotId, Teleph
#endif
#endif // NATIVE_TELEPHONY_RADIO_API_H
/** @} */

View File

@ -13,8 +13,14 @@
* limitations under the License.
*/
#ifndef NATIVE_TELEPHONY_RADIO_TYPE_H
#define NATIVE_TELEPHONY_RADIO_TYPE_H
/**
* @addtogroup Telephony
* @{
*
* @brief Provides the data structures for the C APIs of the the telephony radio.
*
* @since 13
*/
/**
* @file telephony_radio_type.h
@ -27,6 +33,9 @@
* @since 13
*/
#ifndef NATIVE_TELEPHONY_RADIO_TYPE_H
#define NATIVE_TELEPHONY_RADIO_TYPE_H
#ifdef __cplusplus
extern "C" {
#endif
@ -155,3 +164,4 @@ typedef struct {
#endif
#endif // NATIVE_TELEPHONY_RADIO_TYPE_H
/** @} */