From 6c0a0953ef408a87aad9424045b2466541bd057b Mon Sep 17 00:00:00 2001
From: strawmanbobi <strawmanbobi@163.com>
Date: Wed, 11 Mar 2020 22:10:15 +0800
Subject: [PATCH] [soc] updated Android example with algorithm 0.2.5

---
 android-example/app/build.gradle              |  16 ++++++++--------
 android-example/app/release/output.json       |   2 +-
 .../src/main/jniLibs/arm64-v8a/libirdecode.so | Bin 51200 -> 51200 bytes
 .../main/jniLibs/armeabi-v7a/libirdecode.so   | Bin 42676 -> 42676 bytes
 .../app/src/main/jniLibs/x86/libirdecode.so   | Bin 50808 -> 50808 bytes
 .../src/main/jniLibs/x86_64/libirdecode.so    | Bin 51472 -> 51472 bytes
 android-example/decodesdk/build.gradle        |   8 ++++----
 .../java/net/irext/decode/sdk/IRDecode.java   |  12 +++++-------
 android-example/web-api/build.gradle          |  10 +++++-----
 9 files changed, 23 insertions(+), 25 deletions(-)

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 35ede48cb40b3c6aa49238b7cfaa40e0cc7dfe2f..67cb316abb40f3a32a58813beb438be9c6ebaa8e 100644
GIT binary patch
delta 35
tcmV+;0Nnq8kOP2_1F#SR6dS1ES87(Aa}SzorI)k@ic|iUC9@;~+{N|q4&ML(

delta 35
rcmZpez}zr_d4m9x$o#_(_S_V5%6427Eo>ANAL<#gY{F(0raMOg`uq-U

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 d45e952566050ca07c9fe8d257f6bd9c69732404..1140c155f62baa72ae9353e92705b3f0f0bf6fc7 100644
GIT binary patch
delta 35
tcmV+;0Nnqy%>uN|0<hcx6gjIm7n7?u*IDhiEGWp5;Vu1Sn6vN!#H28%5##^>

delta 35
tcmV+;0Nnqy%>uN|0<hcx6ojvlSqrMVcJv8aQf>M>i*;W+ue0z0#H2Dd5lR36

diff --git a/android-example/app/src/main/jniLibs/x86/libirdecode.so b/android-example/app/src/main/jniLibs/x86/libirdecode.so
index 9c7e561cc1e9654e04cd150f8731786d7e08b0a6..f2dcdc0c526954745bc14748d77777f92c3e7ee1 100644
GIT binary patch
delta 35
tcmV+;0Nnrhj05<L1F+ly6l{Ww4$F`DpX*f*R-k!cx9GG!X|wPFh{Qk(5-|V(

delta 35
tcmV+;0Nnrhj05<L1F+ly6jtl^P0)pXR=(2Kw>&U!!ewwSr?c<@h{RCH60raP

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 e7a6641c06ca94a774d093b105b017b40216c4ad..2b1d5e0e19e3de68b156596b7bd6508da2453a3e 100644
GIT binary patch
delta 43
zcmV+`0M!4Gk^_*E1F)z96iAh40Cp8tk-k0yu)uj5ifSMDwUeO%9Fx$<1hd=%G{$*j
B5<CC^

delta 43
zcmV+`0M!4Gk^_*E1F)z96anzI){nl*sG78|!wpSrEKT-YOOv4i9Fx$<1hd=%G{(fV
B6r2D6

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')
 }