diff --git a/Android/app/build.gradle b/Android/app/build.gradle index 4aebf94..75c1c1b 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -35,11 +35,11 @@ android { } dependencies { - compile files('libs/irext-web-api.jar') compile 'com.android.support:appcompat-v7:25.3.1' compile 'com.android.support.constraint:constraint-layout:1.0.0-beta4' compile 'com.android.support:design:25.3.1' compile 'com.android.support:support-v4:25.3.1' compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT' compile project(':decodesdk') + compile files('libs/irext-web-api-0.1.1.jar') } diff --git a/Android/app/libs/irext-web-api.jar b/Android/app/libs/irext-web-api-0.1.1.jar similarity index 94% rename from Android/app/libs/irext-web-api.jar rename to Android/app/libs/irext-web-api-0.1.1.jar index a3a4fa9..8dd0d22 100644 Binary files a/Android/app/libs/irext-web-api.jar and b/Android/app/libs/irext-web-api-0.1.1.jar differ diff --git a/Android/app/src/main/java/net/irext/ircontrol/IRApplication.java b/Android/app/src/main/java/net/irext/ircontrol/IRApplication.java index 38bd0f3..5bfaf22 100644 --- a/Android/app/src/main/java/net/irext/ircontrol/IRApplication.java +++ b/Android/app/src/main/java/net/irext/ircontrol/IRApplication.java @@ -21,8 +21,8 @@ public class IRApplication extends com.activeandroid.app.Application { private static final String TAG = IRApplication.class.getSimpleName(); - private static final String ADDRESS = "http://192.168.137.128:8080"; - private static final String APP_NAME = "/irext"; + private static final String ADDRESS = "http://irext.net:8080"; + private static final String APP_NAME = "/irext-server"; public WebAPIs mWeAPIs = WebAPIs.getInstance(ADDRESS, APP_NAME); diff --git a/Android/app/src/main/java/net/irext/ircontrol/ui/fragment/ControlFragment.java b/Android/app/src/main/java/net/irext/ircontrol/ui/fragment/ControlFragment.java index 2d44455..43a18f5 100644 --- a/Android/app/src/main/java/net/irext/ircontrol/ui/fragment/ControlFragment.java +++ b/Android/app/src/main/java/net/irext/ircontrol/ui/fragment/ControlFragment.java @@ -134,13 +134,12 @@ public class ControlFragment extends Fragment implements View.OnClickListener { mCurrentRemoteControl.getRemoteMap() + FileUtils.FILE_NAME_EXT; /* decode SDK - load binary file */ - // int ret = mIRDecode.openBinary(category, mCurrentRemoteControl.getSubCategory(), binFileName); - // Log.d(TAG, "open binary result = " + ret); + int ret = mIRDecode.openBinary(category, mCurrentRemoteControl.getSubCategory(), binFileName); } } public void closeIRBinary() { - // mIRDecode.closeBinary(); + mIRDecode.closeBinary(); } @Nullable @@ -199,8 +198,7 @@ public class ControlFragment extends Fragment implements View.OnClickListener { /* translate key code for AC according to the mapping above */ /* ac status is useless for decoding devices other than AC, it's an optional parameter */ /* change wind dir is an optional parameter, set to 0 as default */ - // return mIRDecode.decodeBinary(inputKeyCode, acStatus, 0); - return null; + return mIRDecode.decodeBinary(inputKeyCode, acStatus, 0); } // control @@ -257,7 +255,9 @@ public class ControlFragment extends Fragment implements View.OnClickListener { ConsumerIrManager irEmitter = (ConsumerIrManager) mParent.getSystemService(Context.CONSUMER_IR_SERVICE); if (irEmitter.hasIrEmitter()) { - irEmitter.transmit(38000, decoded); + if (null != decoded && decoded.length > 0) { + irEmitter.transmit(38000, decoded); + } } } diff --git a/Android/app/src/main/jniLibs/arm64-v8a/libirdecode.so b/Android/app/src/main/jniLibs/arm64-v8a/libirdecode.so index 4123486..bb3650b 100644 Binary files a/Android/app/src/main/jniLibs/arm64-v8a/libirdecode.so and b/Android/app/src/main/jniLibs/arm64-v8a/libirdecode.so differ diff --git a/Android/app/src/main/jniLibs/armeabi-v7a/libirdecode.so b/Android/app/src/main/jniLibs/armeabi-v7a/libirdecode.so index 66da409..bc2c68a 100644 Binary files a/Android/app/src/main/jniLibs/armeabi-v7a/libirdecode.so and b/Android/app/src/main/jniLibs/armeabi-v7a/libirdecode.so differ diff --git a/Android/app/src/main/jniLibs/armeabi/libirdecode.so b/Android/app/src/main/jniLibs/armeabi/libirdecode.so index d8c5771..d65fe4b 100644 Binary files a/Android/app/src/main/jniLibs/armeabi/libirdecode.so and b/Android/app/src/main/jniLibs/armeabi/libirdecode.so differ diff --git a/Android/app/src/main/jniLibs/mips/libirdecode.so b/Android/app/src/main/jniLibs/mips/libirdecode.so index 1b5c0a1..cb9661f 100644 Binary files a/Android/app/src/main/jniLibs/mips/libirdecode.so and b/Android/app/src/main/jniLibs/mips/libirdecode.so differ diff --git a/Android/app/src/main/jniLibs/mips64/libirdecode.so b/Android/app/src/main/jniLibs/mips64/libirdecode.so index f94584e..6518ce7 100644 Binary files a/Android/app/src/main/jniLibs/mips64/libirdecode.so and b/Android/app/src/main/jniLibs/mips64/libirdecode.so differ diff --git a/Android/app/src/main/jniLibs/x86/libirdecode.so b/Android/app/src/main/jniLibs/x86/libirdecode.so index 36f9ad2..67d18e5 100644 Binary files a/Android/app/src/main/jniLibs/x86/libirdecode.so and b/Android/app/src/main/jniLibs/x86/libirdecode.so differ diff --git a/Android/app/src/main/jniLibs/x86_64/libirdecode.so b/Android/app/src/main/jniLibs/x86_64/libirdecode.so index 3f6e601..0082f52 100644 Binary files a/Android/app/src/main/jniLibs/x86_64/libirdecode.so and b/Android/app/src/main/jniLibs/x86_64/libirdecode.so differ diff --git a/Android/app/src/main/res/layout/fragment_control.xml b/Android/app/src/main/res/layout/fragment_control.xml index 864adb8..4a279bd 100644 --- a/Android/app/src/main/res/layout/fragment_control.xml +++ b/Android/app/src/main/res/layout/fragment_control.xml @@ -8,11 +8,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> -