diff --git a/frameworks/ets/taihe/author/src/ohos.sensor.impl.cpp b/frameworks/ets/taihe/author/src/ohos.sensor.impl.cpp index 13f7cdbf792b941bda0b81fc98eaea52a8444e0c..bf59043de13d8e99b2dbc40f06816b7783ad04ef 100644 --- a/frameworks/ets/taihe/author/src/ohos.sensor.impl.cpp +++ b/frameworks/ets/taihe/author/src/ohos.sensor.impl.cpp @@ -1481,9 +1481,18 @@ void OffColor(optional_view opq) // Since there macros are auto-generate, lint will cause false positive. // NOLINTBEGIN TH_EXPORT_CPP_API_getRotationMatrixSyncGrav(getRotationMatrixSyncGrav); +TH_EXPORT_CPP_API_GetRotationMatrixWithCallback(getRotationMatrixSyncGrav); +TH_EXPORT_CPP_API_GetRotationMatrixReturnsPromise(getRotationMatrixSyncGrav); TH_EXPORT_CPP_API_getOrientationSync(getOrientationSync); +TH_EXPORT_CPP_API_GetOrientationWithCallback(getOrientationSync); +TH_EXPORT_CPP_API_GetOrientationReturnsPromise(getOrientationSync); TH_EXPORT_CPP_API_getRotationMatrixSync(getRotationMatrixSync); +TH_EXPORT_CPP_API_GetRotationMatrixWithCallback_chinast_1(getRotationMatrixSync); +TH_EXPORT_CPP_API_GetRotationMatrixReturnsPromise_chinast_1(getRotationMatrixSync); + TH_EXPORT_CPP_API_getSensorListSync(getSensorListSync); +TH_EXPORT_CPP_API_GetSensorListMethodWithCallback(getSensorListSync); +TH_EXPORT_CPP_API_GetSensorListReturnsPromise(getSensorListSync); TH_EXPORT_CPP_API_OnWearDetection(OnWearDetection); TH_EXPORT_CPP_API_OnceWearDetection(OnceWearDetection); TH_EXPORT_CPP_API_OffWearDetection(OffWearDetection); diff --git a/frameworks/ets/taihe/idl/ohos.sensor.taihe b/frameworks/ets/taihe/idl/ohos.sensor.taihe index 7681850a1484b0917503d61c1a55c796ff572066..9f268e09b5c89da43346b8b4d649f40e218ebe1d 100644 --- a/frameworks/ets/taihe/idl/ohos.sensor.taihe +++ b/frameworks/ets/taihe/idl/ohos.sensor.taihe @@ -1345,10 +1345,14 @@ struct Options { * @syscap SystemCapability.Sensors.Sensor * @since 9 */ -@gen_async("getRotationMatrix") -@gen_promise("getRotationMatrix") -function getRotationMatrixSyncGrav(gravity: Array, geomagnetic: Array): RotationMatrixResponse; + +@static_overload("getRotationMatrix") +@async +function GetRotationMatrixWithCallback(gravity: Array, geomagnetic: Array): RotationMatrixResponse; +@static_overload("getRotationMatrix") +@promise +function GetRotationMatrixReturnsPromise(gravity: Array, geomagnetic: Array): RotationMatrixResponse; /** * Computes the device's orientation based on the rotation matrix. * @param { Array } rotationMatrix - rotationMatrix Indicates the rotation matrix. @@ -1359,9 +1363,13 @@ function getRotationMatrixSyncGrav(gravity: Array, geomagnetic: Array) * @syscap SystemCapability.Sensors.Sensor * @since 9 */ -@gen_async("getOrientation") -@gen_promise("getOrientation") -function getOrientationSync(rotationMatrix: Array): Array; + +@static_overload("getOrientation") +@async +function GetOrientationWithCallback(rotationMatrix: Array): Array; +@static_overload("getOrientation") +@promise +function GetOrientationReturnsPromise(rotationMatrix: Array): Array; /** * Convert rotation vector to rotation matrix. @@ -1373,9 +1381,13 @@ function getOrientationSync(rotationMatrix: Array): Array; * @syscap SystemCapability.Sensors.Sensor * @since 9 */ -@gen_async("getRotationMatrix") -@gen_promise("getRotationMatrix") -function getRotationMatrixSync(rotationVector: Array): Array; + +@static_overload("getRotationMatrix") +@async +function GetRotationMatrixWithCallback_chinast_1(rotationVector: Array): Array; +@static_overload("getRotationMatrix") +@promise +function GetRotationMatrixReturnsPromise_chinast_1(rotationVector: Array): Array; /** * Obtains all sensor information on the device. @@ -1386,9 +1398,13 @@ function getRotationMatrixSync(rotationVector: Array): Array; * @syscap SystemCapability.Sensors.Sensor * @since 9 */ -@gen_async("getSensorList") -@gen_promise("getSensorList") -function getSensorListSync(): Array; +@static_overload("getSensorList") +@async +function GetSensorListMethodWithCallback(): Array; +@static_overload("getSensorList") +@promise +function GetSensorListReturnsPromise(): Array; + @!sts_inject(""" function on(type: string, callback: (arg0 : Object) => void, options?: Options) { @@ -1474,92 +1490,162 @@ function getSensorListSync(): Array; } } """) -function OnWearDetection(f: (info: WearDetectionResponse) => void, opq: Opaque, options: Optional); -function OnceWearDetection(f: (info: WearDetectionResponse) => void, opq: Opaque); -function OffWearDetection(opq: Optional); - -function OnSignificantMotion(f: (info: SignificantMotionResponse) => void, opq: Opaque, options: Optional); -function OnceSignificantMotion(f: (info: SignificantMotionResponse) => void, opq: Opaque); -function OffSignificantMotion(opq: Optional); - -function OnRotationVector(f: (info: RotationVectorResponse) => void, opq: Opaque, options: Optional); -function OnceRotationVector(f: (info: RotationVectorResponse) => void, opq: Opaque); -function OffRotationVector(opq: Optional); - -function OnProximity(f: (info: ProximityResponse) => void, opq: Opaque, options: Optional); -function OnceProximity(f: (info: ProximityResponse) => void, opq: Opaque); -function OffProximity(opq: Optional); - -function OnPedometerDetection(f: (info: PedometerDetectionResponse) => void, opq: Opaque, options: Optional); -function OncePedometerDetection(f: (info: PedometerDetectionResponse) => void, opq: Opaque); -function OffPedometerDetection(opq: Optional); - -function OnPedometer(f: (info: PedometerResponse) => void, opq: Opaque, options: Optional); -function OncePedometer(f: (info: PedometerResponse) => void, opq: Opaque); -function OffPedometer(opq: Optional); - -function OnOrientation(f: (info: OrientationResponse) => void, opq: Opaque, options: Optional); -function OnceOrientation(f: (info: OrientationResponse) => void, opq: Opaque); -function OffOrientation(opq: Optional); - -function OnMagneticFieldUncalibrated(f: (info: MagneticFieldUncalibratedResponse) => void, opq: Opaque, options: Optional); -function OnceMagneticFieldUncalibrated(f: (info: MagneticFieldUncalibratedResponse) => void, opq: Opaque); -function OffMagneticFieldUncalibrated(opq: Optional); - -function OnMagneticField(f: (info: MagneticFieldResponse) => void, opq: Opaque, options: Optional); -function OnceMagneticField(f: (info: MagneticFieldResponse) => void, opq: Opaque); -function OffMagneticField(opq: Optional); - -function OnLinearAccelerometer(f: (info: LinearAccelerometerResponse) => void, opq: Opaque, options: Optional); -function OnceLinearAccelerometer(f: (info: LinearAccelerometerResponse) => void, opq: Opaque); -function OffLinearAccelerometer(opq: Optional); - -function OnHumidity(f: (info: HumidityResponse) => void, opq: Opaque, options: Optional); -function OnceHumidity(f: (info: HumidityResponse) => void, opq: Opaque); -function OffHumidity(opq: Optional); - -function OnHeartRate(f: (info: HeartRateResponse) => void, opq: Opaque, options: Optional); -function OnceHeartRate(f: (info: HeartRateResponse) => void, opq: Opaque); -function OffHeartRate(opq: Optional); - -function OnHall(f: (info: HallResponse) => void, opq: Opaque, options: Optional); -function OnceHall(f: (info: HallResponse) => void, opq: Opaque); -function OffHall(opq: Optional); - -function OnGyroscopeUncalibrated(f: (info: GyroscopeUncalibratedResponse) => void, opq: Opaque, options: Optional); -function OnceGyroscopeUncalibrated(f: (info: GyroscopeUncalibratedResponse) => void, opq: Opaque); -function OffGyroscopeUncalibrated(opq: Optional); - -function OnGyroscope(f: (info: GyroscopeResponse) => void, opq: Opaque, options: Optional); -function OnceGyroscope(f: (info: GyroscopeResponse) => void, opq: Opaque); -function OffGyroscope(opq: Optional); - -function OnGravity(f: (info: GravityResponse) => void, opq: Opaque, options: Optional); -function OnceGravity(f: (info: GravityResponse) => void, opq: Opaque); -function OffGravity(opq: Optional); - -function OnBarometer(f: (info: BarometerResponse) => void, opq: Opaque, options: Optional); -function OnceBarometer(f: (info: BarometerResponse) => void, opq: Opaque); -function OffBarometer(opq: Optional); - -function OnAmbientTemperature(f: (info: AmbientTemperatureResponse) => void, opq: Opaque, options: Optional); -function OnceAmbientTemperature(f: (info: AmbientTemperatureResponse) => void, opq: Opaque); -function OffAmbientTemperature(opq: Optional); - -function OnAmbientLight(f: (info: LightResponse) => void, opq: Opaque, options: Optional); -function OnceAmbientLight(f: (info: LightResponse) => void, opq: Opaque); -function OffAmbientLight(opq: Optional); - -function OnAccelerometerUncalibrated(f: (info: AccelerometerUncalibratedResponse) => void, opq: Opaque, options: Optional); -function OnceAccelerometerUncalibrated(f: (info: AccelerometerUncalibratedResponse) => void, opq: Opaque); -function OffAccelerometerUncalibrated(opq: Optional); - -function OnAccelerometer(f: (info: AccelerometerResponse) => void, opq: Opaque, options: Optional); -function OnceAccelerometer(f: (info: AccelerometerResponse) => void, opq: Opaque); -function OffAccelerometer(opq: Optional); - -function OnSar(f: (info: SarResponse) => void, opq: Opaque, options: Optional); -function OffSar(opq: Optional); -function OnColor(f: (info: ColorResponse) => void, opq: Opaque, options: Optional); -function OffColor(opq: Optional); \ No newline at end of file +@static_overload("on") +function OnWearDetection(type: string ,f: (info: WearDetectionResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceWearDetection(type: string ,f: (info: WearDetectionResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffWearDetection(type: string ,opq:Optional<@sys_type("Function1") Opaque>); + +@static_overload("on") +function OnSignificantMotion(type: string ,f: (info: SignificantMotionResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceSignificantMotion(type: string ,f: (info: SignificantMotionResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffSignificantMotion(type: string ,opq:Optional<@sys_type("Function2") Opaque>); + +@static_overload("on") +function OnRotationVector(type: string ,f: (info: RotationVectorResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceRotationVector(type: string ,f: (info: RotationVectorResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffRotationVector(type: string ,opq:Optional<@sys_type("Function3") Opaque>); + +@static_overload("on") +function OnProximity(type: string ,f: (info: ProximityResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceProximity(type: string ,f: (info: ProximityResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffProximity(type: string ,opq:Optional<@sys_type("Function4") Opaque>); + +@static_overload("on") +function OnPedometerDetection(type: string ,f: (info: PedometerDetectionResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OncePedometerDetection(type: string ,f: (info: PedometerDetectionResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffPedometerDetection(type: string ,opq:Optional<@sys_type("Function5") Opaque>); + +@static_overload("on") +function OnPedometer(type: string ,f: (info: PedometerResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OncePedometer(type: string ,f: (info: PedometerResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffPedometer(type: string ,opq:Optional<@sys_type("Function6") Opaque>); + +@static_overload("on") +function OnOrientation(type: string ,f: (info: OrientationResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceOrientation(type: string ,f: (info: OrientationResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffOrientation(type: string ,opq:Optional<@sys_type("Function7") Opaque>); + +@static_overload("on") +function OnMagneticFieldUncalibrated(type: string ,f: (info: MagneticFieldUncalibratedResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceMagneticFieldUncalibrated(type: string ,f: (info: MagneticFieldUncalibratedResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffMagneticFieldUncalibrated(type: string ,opq:Optional<@sys_type("Function8") Opaque>); + +@static_overload("on") +function OnMagneticField(type: string ,f: (info: MagneticFieldResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceMagneticField(type: string ,f: (info: MagneticFieldResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffMagneticField(type: string ,opq:Optional<@sys_type("Function9") Opaque>); + +@static_overload("on") +function OnLinearAccelerometer(type: string ,f: (info: LinearAccelerometerResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceLinearAccelerometer(type: string ,f: (info: LinearAccelerometerResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffLinearAccelerometer(type: string ,opq:Optional<@sys_type("Function10") Opaque>); + +@static_overload("on") +function OnHumidity(type: string ,f: (info: HumidityResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceHumidity(type: string ,f: (info: HumidityResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffHumidity(type: string ,opq:Optional<@sys_type("Function11") Opaque>); + +@static_overload("on") +function OnHeartRate(type: string ,f: (info: HeartRateResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceHeartRate(type: string ,f: (info: HeartRateResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffHeartRate(type: string ,opq:Optional<@sys_type("Function12") Opaque>); + +@static_overload("on") +function OnHall(type: string ,f: (info: HallResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceHall(type: string ,f: (info: HallResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffHall(type: string ,opq:Optional<@sys_type("Function13") Opaque>); + +@static_overload("on") +function OnGyroscopeUncalibrated(type: string ,f: (info: GyroscopeUncalibratedResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceGyroscopeUncalibrated(type: string ,f: (info: GyroscopeUncalibratedResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffGyroscopeUncalibrated(type: string ,opq:Optional<@sys_type("Function14") Opaque>); + + +@static_overload("on") +function OnGyroscope(type: string ,f: (info: GyroscopeResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceGyroscope(type: string ,f: (info: GyroscopeResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffGyroscope(type: string ,opq:Optional<@sys_type("Function15") Opaque>); + +@static_overload("on") +function OnGravity(type: string ,f: (info: GravityResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceGravity(type: string ,f: (info: GravityResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffGravity(type: string ,opq:Optional<@sys_type("Function16") Opaque>); + +@static_overload("on") +function OnBarometer(type: string ,f: (info: BarometerResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceBarometer(type: string ,f: (info: BarometerResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffBarometer(type: string ,opq:Optional<@sys_type("Function17") Opaque>); + +@static_overload("on") +function OnAmbientTemperature(type: string ,f: (info: AmbientTemperatureResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceAmbientTemperature(type: string ,f: (info: AmbientTemperatureResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffAmbientTemperature(type: string ,opq:Optional<@sys_type("Function18") Opaque>); + + +@static_overload("on") +function OnAmbientLight(type: string ,f: (info: LightResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceAmbientLight(type: string ,f: (info: LightResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffAmbientLight(type: string ,opq:Optional<@sys_type("Function19") Opaque>); + +@static_overload("on") +function OnAccelerometerUncalibrated(type: string ,f: (info: AccelerometerUncalibratedResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceAccelerometerUncalibrated(type: string ,f: (info: AccelerometerUncalibratedResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffAccelerometerUncalibrated(type: string ,opq:Optional<@sys_type("Function20") Opaque>); + +@static_overload("on") +function OnAccelerometer(type: string ,f: (info: AccelerometerResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("once") +function OnceAccelerometer(type: string ,f: (info: AccelerometerResponse) => void, @sts_last opq: Opaque); +@static_overload("off") +function OffAccelerometer(type: string ,opq:Optional<@sys_type("Function21") Opaque>); + +@static_overload("on") +function OnSar(type: string ,f: (info: SarResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("off") +function OffSar(type: string ,opq:Optional<@sys_type("Function22") Opaque>); + +@static_overload("on") +function OnColor(type: string ,f: (info: ColorResponse) => void, @sts_last opq: Opaque, options: Optional); +@static_overload("off") +function OffColor(type: string ,opq:Optional<@sys_type("Function23") Opaque>); \ No newline at end of file