Merge branch 'master' of ssh://github.com/irext/examples

android-example/app/.gitignore

@@ -1 +1,3 @@
 /build
+/debug
+/release

android-example/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "net.irext.ircontrol"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 4
-        versionName '0.2.0'
+        versionCode 6
+        versionName '0.2.2'
     }
     buildTypes {
         release {

android-example/app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"0.2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"0.2.2","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

android-example/build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

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 int irOpen(int category, int subCate, String fileName);
@@ -47,12 +51,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 int openFile(int category, int subCate, String fileName) {
         return irOpen(category, subCate, fileName);
     }