diff --git a/android-example/app/build.gradle b/android-example/app/build.gradle index 36f6db5..5172b09 100644 --- a/android-example/app/build.gradle +++ b/android-example/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 buildToolsVersion '28.0.3' defaultConfig { applicationId "net.irext.ircontrol" minSdkVersion 19 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 6 versionName '0.2.4' } @@ -30,10 +30,10 @@ android { } dependencies { - compile 'com.android.support:appcompat-v7:27.1.1' - compile 'com.android.support:design:27.1.1' - compile 'com.android.support:support-v4:27.1.1' - compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT' - compile project(':decodesdk') - compile project(':web-api') + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT' + implementation project(':decodesdk') + implementation project(':web-api') } \ No newline at end of file diff --git a/android-example/app/release/output.json b/android-example/app/release/output.json index a5549ae..d2ac806 100644 --- a/android-example/app/release/output.json +++ b/android-example/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"0.2.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"0.2.4","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so b/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so index 35ede48..67cb316 100644 Binary files a/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so and b/android-example/app/src/main/jniLibs/arm64-v8a/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so b/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so index d45e952..1140c15 100644 Binary files a/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so and b/android-example/app/src/main/jniLibs/armeabi-v7a/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/x86/libirdecode.so b/android-example/app/src/main/jniLibs/x86/libirdecode.so index 9c7e561..f2dcdc0 100644 Binary files a/android-example/app/src/main/jniLibs/x86/libirdecode.so and b/android-example/app/src/main/jniLibs/x86/libirdecode.so differ diff --git a/android-example/app/src/main/jniLibs/x86_64/libirdecode.so b/android-example/app/src/main/jniLibs/x86_64/libirdecode.so index e7a6641..2b1d5e0 100644 Binary files a/android-example/app/src/main/jniLibs/x86_64/libirdecode.so and b/android-example/app/src/main/jniLibs/x86_64/libirdecode.so differ diff --git a/android-example/decodesdk/build.gradle b/android-example/decodesdk/build.gradle index 74f5e24..d431073 100644 --- a/android-example/decodesdk/build.gradle +++ b/android-example/decodesdk/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 19 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -18,6 +18,6 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:25.3.1' + api fileTree(include: ['*.jar'], dir: 'libs') + api 'com.android.support:appcompat-v7:28.0.0' } diff --git a/android-example/decodesdk/src/main/java/net/irext/decode/sdk/IRDecode.java b/android-example/decodesdk/src/main/java/net/irext/decode/sdk/IRDecode.java index cd8e8f2..3c3e778 100644 --- a/android-example/decodesdk/src/main/java/net/irext/decode/sdk/IRDecode.java +++ b/android-example/decodesdk/src/main/java/net/irext/decode/sdk/IRDecode.java @@ -18,6 +18,10 @@ public class IRDecode { private static final String TAG = IRDecode.class.getSimpleName(); + static { + System.loadLibrary("irdecode"); + } + private static Object mSync = new Object(); private native String irGetVersion(); @@ -49,12 +53,6 @@ public class IRDecode { return mInstance; } - private IRDecode() { - String libPath = "/data/irext/libirda_decoder.so"; - System.out.println("loading decode library " + libPath); - System.load(libPath); - } - public String getVersion() { return irGetVersion(); } @@ -125,4 +123,4 @@ public class IRDecode { // how many directions supported by specific AC return irACGetSupportedWindDirection(acMode); } -} +} \ No newline at end of file diff --git a/android-example/web-api/build.gradle b/android-example/web-api/build.gradle index 665cd78..0d69142 100644 --- a/android-example/web-api/build.gradle +++ b/android-example/web-api/build.gradle @@ -3,10 +3,10 @@ apply plugin: 'com.android.library' android { signingConfigs { } - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 19 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "0.1.2" } @@ -22,7 +22,7 @@ android { } dependencies { - compile files('libs/gson-2.8.0.jar') - compile files('libs/okhttp-3.7.0.jar') - compile files('libs/okio-1.12.0.jar') + api files('libs/gson-2.8.0.jar') + api files('libs/okhttp-3.7.0.jar') + api files('libs/okio-1.12.0.jar') }