hanwenjie 1 год назад
Родитель
Сommit
1cfd45ca36

+ 1 - 1
app/src/main/java/com/info666/app/infraredRemote/MainActivity.java

@@ -28,7 +28,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         etUrl = findViewById(R.id.et_url);
         btnNext = findViewById(R.id.bt_next);
         btnNext.setOnClickListener(this);
-        etUrl.setText(sp.getString("url",""));
+        etUrl.setText(sp.getString("url","http://ccvadmin.info666.com/ljshxyqy/"));
     }
 
 

+ 0 - 2
app/src/main/java/com/info666/app/infraredRemote/activity/InfraredRemoteActivity.java

@@ -1,11 +1,9 @@
 package com.info666.app.infraredRemote.activity;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.PersistableBundle;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;

+ 10 - 5
app/src/main/java/com/info666/app/infraredRemote/api/ConsumerIrManagerApi.java

@@ -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;
     }