|
@@ -2,8 +2,11 @@ package com.info666.app.infraredRemote.api;
|
|
|
|
|
|
import android.content.Context;
|
|
|
import android.os.Build;
|
|
|
+import android.util.Log;
|
|
|
import android.webkit.JavascriptInterface;
|
|
|
|
|
|
+import com.alibaba.fastjson2.JSON;
|
|
|
+
|
|
|
public class ConsumerIrManagerApi {
|
|
|
|
|
|
private ConsumerIrManagerApi instance;
|
|
@@ -32,7 +35,7 @@ public class ConsumerIrManagerApi {
|
|
|
@JavascriptInterface
|
|
|
public boolean hasIrEmitter() {
|
|
|
//android4.4及以上版本&有红外功能
|
|
|
- if (service != null) {
|
|
|
+ if (service != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
|
|
|
return service.hasIrEmitter();
|
|
|
}
|
|
|
//android4.4以下及4.4以上没红外功能
|
|
@@ -47,7 +50,8 @@ public class ConsumerIrManagerApi {
|
|
|
*/
|
|
|
@JavascriptInterface
|
|
|
public void transmit(int carrierFrequency, int[] pattern) {
|
|
|
- if (service != null) {
|
|
|
+ Log.d("ConsumerIrManagerApi","transmit("+carrierFrequency+","+ JSON.toJSONString(pattern) +")");
|
|
|
+ if (service != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
|
|
|
service.transmit(carrierFrequency, pattern);
|
|
|
}
|
|
|
}
|
|
@@ -58,9 +62,10 @@ public class ConsumerIrManagerApi {
|
|
|
* @return
|
|
|
*/
|
|
|
@JavascriptInterface
|
|
|
- public android.hardware.ConsumerIrManager.CarrierFrequencyRange[] getCarrierFrequencies() {
|
|
|
- if (service != null) {
|
|
|
- return service.getCarrierFrequencies();
|
|
|
+ public String getCarrierFrequencies() {
|
|
|
+ Log.d("ConsumerIrManagerApi","getCarrierFrequencies()");
|
|
|
+ if (service != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
|
|
|
+ return JSON.toJSONString(service.getCarrierFrequencies());
|
|
|
}
|
|
|
return null;
|
|
|
}
|