From 345e8ee26373585febd64112e2db2569cde7db31 Mon Sep 17 00:00:00 2001 From: strawmanbobi Date: Fri, 8 Feb 2019 15:50:00 +0800 Subject: [PATCH] updated decode_jni src according to java package change --- src/ir_decoder/jni/ir_decode_jni.c | 18 ++-- src/ir_decoder/jni/ir_decode_jni.h | 144 ++++++++++++++--------------- 2 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/ir_decoder/jni/ir_decode_jni.c b/src/ir_decoder/jni/ir_decode_jni.c index 779a526..3d7e1f7 100644 --- a/src/ir_decoder/jni/ir_decode_jni.c +++ b/src/ir_decoder/jni/ir_decode_jni.c @@ -19,7 +19,7 @@ Revision log: extern size_t binary_length; extern UINT8 *binary_content; -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irOpen +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irOpen (JNIEnv *env, jobject this_obj, jint category_id, jint sub_cate, jstring file_name) { const char *n_file_name = (*env)->GetStringUTFChars(env, file_name, 0); @@ -34,7 +34,7 @@ JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irOpen return IR_DECODE_SUCCEEDED; } -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irOpenBinary +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irOpenBinary (JNIEnv *env, jobject this_obj, jint category_id, jint sub_cate, jbyteArray binaries, jint bin_length) { @@ -51,7 +51,7 @@ JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irOpenBinary return IR_DECODE_SUCCEEDED; } -JNIEXPORT jintArray JNICALL Java_net_irext_decodesdk_IRDecode_irDecode +JNIEXPORT jintArray JNICALL Java_net_irext_decode_sdk_IRDecode_irDecode (JNIEnv *env, jobject this_obj, jint key_code, jobject jni_ac_status, jint change_wind_direction) { UINT16 user_data[USER_DATA_SIZE]; @@ -105,13 +105,13 @@ JNIEXPORT jintArray JNICALL Java_net_irext_decodesdk_IRDecode_irDecode return result; } -JNIEXPORT void JNICALL Java_net_irext_decodesdk_IRDecode_irClose +JNIEXPORT void JNICALL Java_net_irext_decode_sdk_IRDecode_irClose (JNIEnv *env, jobject this_obj) { ir_close(); } -JNIEXPORT jobject JNICALL Java_net_irext_decodesdk_IRDecode_irACGetTemperatureRange +JNIEXPORT jobject JNICALL Java_net_irext_decode_sdk_IRDecode_irACGetTemperatureRange (JNIEnv *env, jobject this_obj, jint ac_mode) { int tempMin = 0; @@ -137,7 +137,7 @@ JNIEXPORT jobject JNICALL Java_net_irext_decodesdk_IRDecode_irACGetTemperatureRa return temperature_range; } -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedMode +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irACGetSupportedMode (JNIEnv *env, jobject this_obj) { int supported_mode = 0; @@ -145,7 +145,7 @@ JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedMode return supported_mode; } -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedWindSpeed +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irACGetSupportedWindSpeed (JNIEnv *env, jobject this_obj, jint ac_mode) { int supported_wind_speed = 0; @@ -153,7 +153,7 @@ JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedWindSpe return supported_wind_speed; } -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedSwing +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irACGetSupportedSwing (JNIEnv *env, jobject this_obj, jint ac_mode) { int supported_swing = 0; @@ -161,7 +161,7 @@ JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedSwing return supported_swing; } -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedWindDirection +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irACGetSupportedWindDirection (JNIEnv *env, jobject this_obj) { int supported_wind_direction = 0; diff --git a/src/ir_decoder/jni/ir_decode_jni.h b/src/ir_decoder/jni/ir_decode_jni.h index 81458dc..56c8bc3 100644 --- a/src/ir_decoder/jni/ir_decode_jni.h +++ b/src/ir_decoder/jni/ir_decode_jni.h @@ -4,141 +4,141 @@ #elif (defined BOARD_PC) && (defined BOARD_PC_JNI) #include "./include/jni.h" #endif -/* Header for class net_irext_decodesdk_IRDecode */ +/* Header for class net_irext_decode_sdk_IRDecode */ -#ifndef _Included_net_irext_decodesdk_IRDecode -#define _Included_net_irext_decodesdk_IRDecode +#ifndef _Included_net_irext_decode_sdk_IRDecode +#define _Included_net_irext_decode_sdk_IRDecode #ifdef __cplusplus extern "C" { #endif -#undef net_irext_decodesdk_IRDecode_BIND_ABOVE_CLIENT -#define net_irext_decodesdk_IRDecode_BIND_ABOVE_CLIENT 8L -#undef net_irext_decodesdk_IRDecode_BIND_ADJUST_WITH_ACTIVITY -#define net_irext_decodesdk_IRDecode_BIND_ADJUST_WITH_ACTIVITY 128L -#undef net_irext_decodesdk_IRDecode_BIND_ALLOW_OOM_MANAGEMENT -#define net_irext_decodesdk_IRDecode_BIND_ALLOW_OOM_MANAGEMENT 16L -#undef net_irext_decodesdk_IRDecode_BIND_AUTO_CREATE -#define net_irext_decodesdk_IRDecode_BIND_AUTO_CREATE 1L -#undef net_irext_decodesdk_IRDecode_BIND_DEBUG_UNBIND -#define net_irext_decodesdk_IRDecode_BIND_DEBUG_UNBIND 2L -#undef net_irext_decodesdk_IRDecode_BIND_IMPORTANT -#define net_irext_decodesdk_IRDecode_BIND_IMPORTANT 64L -#undef net_irext_decodesdk_IRDecode_BIND_NOT_FOREGROUND -#define net_irext_decodesdk_IRDecode_BIND_NOT_FOREGROUND 4L -#undef net_irext_decodesdk_IRDecode_BIND_WAIVE_PRIORITY -#define net_irext_decodesdk_IRDecode_BIND_WAIVE_PRIORITY 32L -#undef net_irext_decodesdk_IRDecode_CONTEXT_IGNORE_SECURITY -#define net_irext_decodesdk_IRDecode_CONTEXT_IGNORE_SECURITY 2L -#undef net_irext_decodesdk_IRDecode_CONTEXT_INCLUDE_CODE -#define net_irext_decodesdk_IRDecode_CONTEXT_INCLUDE_CODE 1L -#undef net_irext_decodesdk_IRDecode_CONTEXT_RESTRICTED -#define net_irext_decodesdk_IRDecode_CONTEXT_RESTRICTED 4L -#undef net_irext_decodesdk_IRDecode_MODE_APPEND -#define net_irext_decodesdk_IRDecode_MODE_APPEND 32768L -#undef net_irext_decodesdk_IRDecode_MODE_ENABLE_WRITE_AHEAD_LOGGING -#define net_irext_decodesdk_IRDecode_MODE_ENABLE_WRITE_AHEAD_LOGGING 8L -#undef net_irext_decodesdk_IRDecode_MODE_MULTI_PROCESS -#define net_irext_decodesdk_IRDecode_MODE_MULTI_PROCESS 4L -#undef net_irext_decodesdk_IRDecode_MODE_PRIVATE -#define net_irext_decodesdk_IRDecode_MODE_PRIVATE 0L -#undef net_irext_decodesdk_IRDecode_MODE_WORLD_READABLE -#define net_irext_decodesdk_IRDecode_MODE_WORLD_READABLE 1L -#undef net_irext_decodesdk_IRDecode_MODE_WORLD_WRITEABLE -#define net_irext_decodesdk_IRDecode_MODE_WORLD_WRITEABLE 2L -#undef net_irext_decodesdk_IRDecode_START_CONTINUATION_MASK -#define net_irext_decodesdk_IRDecode_START_CONTINUATION_MASK 15L -#undef net_irext_decodesdk_IRDecode_START_FLAG_REDELIVERY -#define net_irext_decodesdk_IRDecode_START_FLAG_REDELIVERY 1L -#undef net_irext_decodesdk_IRDecode_START_FLAG_RETRY -#define net_irext_decodesdk_IRDecode_START_FLAG_RETRY 2L -#undef net_irext_decodesdk_IRDecode_START_NOT_STICKY -#define net_irext_decodesdk_IRDecode_START_NOT_STICKY 2L -#undef net_irext_decodesdk_IRDecode_START_REDELIVER_INTENT -#define net_irext_decodesdk_IRDecode_START_REDELIVER_INTENT 3L -#undef net_irext_decodesdk_IRDecode_START_STICKY -#define net_irext_decodesdk_IRDecode_START_STICKY 1L -#undef net_irext_decodesdk_IRDecode_START_STICKY_COMPATIBILITY -#define net_irext_decodesdk_IRDecode_START_STICKY_COMPATIBILITY 0L +#undef net_irext_decode_sdk_IRDecode_BIND_ABOVE_CLIENT +#define net_irext_decode_sdk_IRDecode_BIND_ABOVE_CLIENT 8L +#undef net_irext_decode_sdk_IRDecode_BIND_ADJUST_WITH_ACTIVITY +#define net_irext_decode_sdk_IRDecode_BIND_ADJUST_WITH_ACTIVITY 128L +#undef net_irext_decode_sdk_IRDecode_BIND_ALLOW_OOM_MANAGEMENT +#define net_irext_decode_sdk_IRDecode_BIND_ALLOW_OOM_MANAGEMENT 16L +#undef net_irext_decode_sdk_IRDecode_BIND_AUTO_CREATE +#define net_irext_decode_sdk_IRDecode_BIND_AUTO_CREATE 1L +#undef net_irext_decode_sdk_IRDecode_BIND_DEBUG_UNBIND +#define net_irext_decode_sdk_IRDecode_BIND_DEBUG_UNBIND 2L +#undef net_irext_decode_sdk_IRDecode_BIND_IMPORTANT +#define net_irext_decode_sdk_IRDecode_BIND_IMPORTANT 64L +#undef net_irext_decode_sdk_IRDecode_BIND_NOT_FOREGROUND +#define net_irext_decode_sdk_IRDecode_BIND_NOT_FOREGROUND 4L +#undef net_irext_decode_sdk_IRDecode_BIND_WAIVE_PRIORITY +#define net_irext_decode_sdk_IRDecode_BIND_WAIVE_PRIORITY 32L +#undef net_irext_decode_sdk_IRDecode_CONTEXT_IGNORE_SECURITY +#define net_irext_decode_sdk_IRDecode_CONTEXT_IGNORE_SECURITY 2L +#undef net_irext_decode_sdk_IRDecode_CONTEXT_INCLUDE_CODE +#define net_irext_decode_sdk_IRDecode_CONTEXT_INCLUDE_CODE 1L +#undef net_irext_decode_sdk_IRDecode_CONTEXT_RESTRICTED +#define net_irext_decode_sdk_IRDecode_CONTEXT_RESTRICTED 4L +#undef net_irext_decode_sdk_IRDecode_MODE_APPEND +#define net_irext_decode_sdk_IRDecode_MODE_APPEND 32768L +#undef net_irext_decode_sdk_IRDecode_MODE_ENABLE_WRITE_AHEAD_LOGGING +#define net_irext_decode_sdk_IRDecode_MODE_ENABLE_WRITE_AHEAD_LOGGING 8L +#undef net_irext_decode_sdk_IRDecode_MODE_MULTI_PROCESS +#define net_irext_decode_sdk_IRDecode_MODE_MULTI_PROCESS 4L +#undef net_irext_decode_sdk_IRDecode_MODE_PRIVATE +#define net_irext_decode_sdk_IRDecode_MODE_PRIVATE 0L +#undef net_irext_decode_sdk_IRDecode_MODE_WORLD_READABLE +#define net_irext_decode_sdk_IRDecode_MODE_WORLD_READABLE 1L +#undef net_irext_decode_sdk_IRDecode_MODE_WORLD_WRITEABLE +#define net_irext_decode_sdk_IRDecode_MODE_WORLD_WRITEABLE 2L +#undef net_irext_decode_sdk_IRDecode_START_CONTINUATION_MASK +#define net_irext_decode_sdk_IRDecode_START_CONTINUATION_MASK 15L +#undef net_irext_decode_sdk_IRDecode_START_FLAG_REDELIVERY +#define net_irext_decode_sdk_IRDecode_START_FLAG_REDELIVERY 1L +#undef net_irext_decode_sdk_IRDecode_START_FLAG_RETRY +#define net_irext_decode_sdk_IRDecode_START_FLAG_RETRY 2L +#undef net_irext_decode_sdk_IRDecode_START_NOT_STICKY +#define net_irext_decode_sdk_IRDecode_START_NOT_STICKY 2L +#undef net_irext_decode_sdk_IRDecode_START_REDELIVER_INTENT +#define net_irext_decode_sdk_IRDecode_START_REDELIVER_INTENT 3L +#undef net_irext_decode_sdk_IRDecode_START_STICKY +#define net_irext_decode_sdk_IRDecode_START_STICKY 1L +#undef net_irext_decode_sdk_IRDecode_START_STICKY_COMPATIBILITY +#define net_irext_decode_sdk_IRDecode_START_STICKY_COMPATIBILITY 0L /* - * Class: net_irext_decodesdk_IRDecode + * Class: net_irext_decode_sdk_IRDecode * Method: irOpen * Signature: II(Ljava/lang/String;) */ -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irOpen +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irOpen (JNIEnv *, jobject, jint, jint, jstring); /* - * Class: net_irext_decodesdk_IRDecode + * Class: net_irext_decode_sdk_IRDecode * Method: irOpenBinary * Signature: II(Ljava/lang/String;) */ -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irOpenBinary +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irOpenBinary (JNIEnv *, jobject, jint, jint, jbyteArray, jint); /* - * Class: net_irext_decodesdk_IRDecode + * Class: net_irext_decode_sdk_IRDecode * Method: irDecode * Signature: I(Lnet/irext/decodesdk/bean/ACStatus;I)[I */ -JNIEXPORT jintArray JNICALL Java_net_irext_decodesdk_IRDecode_irDecode +JNIEXPORT jintArray JNICALL Java_net_irext_decode_sdk_IRDecode_irDecode (JNIEnv *, jobject, jint, jobject, jint); /* - * Class: net_irext_decodesdk_IRDecode + * Class: net_irext_decode_sdk_IRDecode * Method: irClose * Signature: ()V */ -JNIEXPORT void JNICALL Java_net_irext_decodesdk_IRDecode_irClose +JNIEXPORT void JNICALL Java_net_irext_decode_sdk_IRDecode_irClose (JNIEnv *, jobject); /* - * Class: net_irext_decodesdk_IRDecode + * Class: net_irext_decode_sdk_IRDecode * Method: irACGetTemperatureRange * Signature: (I)Lcom/irext/remote/bean/jnibean/TemperatureRange; */ -JNIEXPORT jobject JNICALL Java_net_irext_decodesdk_IRDecode_irACGetTemperatureRange +JNIEXPORT jobject JNICALL Java_net_irext_decode_sdk_IRDecode_irACGetTemperatureRange (JNIEnv *, jobject, jint); /* - * Class: net_irext_decodesdk_IRDecode + * Class: net_irext_decode_sdk_IRDecode * Method: irACGetSupportedMode * Signature: ()I */ -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedMode +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irACGetSupportedMode (JNIEnv *, jobject); /* - * Class: net_irext_decodesdk_IRDecode + * Class: net_irext_decode_sdk_IRDecode * Method: irACGetSupportedWindSpeed * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedWindSpeed +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irACGetSupportedWindSpeed (JNIEnv *, jobject, jint); /* - * Class: net_irext_decodesdk_IRDecode + * Class: net_irext_decode_sdk_IRDecode * Method: irACGetSupportedSwing * Signature: (I)I */ -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedSwing +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irACGetSupportedSwing (JNIEnv *, jobject, jint); /* - * Class: net_irext_decodesdk_IRDecode + * Class: net_irext_decode_sdk_IRDecode * Method: irACGetSupportedWindDirection * Signature: ()I */ -JNIEXPORT jint JNICALL Java_net_irext_decodesdk_IRDecode_irACGetSupportedWindDirection +JNIEXPORT jint JNICALL Java_net_irext_decode_sdk_IRDecode_irACGetSupportedWindDirection (JNIEnv *, jobject); #ifdef __cplusplus } #endif #endif -/* Header for class net_irext_decodesdk_IRDecode_LocalBinder */ +/* Header for class net_irext_decode_sdk_IRDecode_LocalBinder */ -#ifndef _Included_net_irext_decodesdk_IRDecode_LocalBinder -#define _Included_net_irext_decodesdk_IRDecode_LocalBinder +#ifndef _Included_net_irext_decode_sdk_IRDecode_LocalBinder +#define _Included_net_irext_decode_sdk_IRDecode_LocalBinder #ifdef __cplusplus extern "C" { #endif