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

+ 2 - 2
app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.info666.app.infraredRemote"
         minSdk 21
         targetSdk 33
-        versionCode 1
-        versionName "1.0"
+        versionCode 4
+        versionName "1.0.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_icon"
+        android:icon="@mipmap/ic_icon_new"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"

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

@@ -74,7 +74,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         new Thread(()->{
             Message message = new Message();
             try {
-                String result = HttpUtil.get("http://api.info666.com/api/api/v1/appConfig/getAppConfig",10 * 1000);
+                String result = HttpUtil.get("http://ykapi.sh-jh.cn/api/api/v1/appConfig/getAppConfig",10 * 1000);
                 JSONObject jsonObject = JSONObject.parseObject(result);
                 JSONArray jsonArray = jsonObject.getJSONArray("data");
                 message.what = 200;

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

@@ -64,6 +64,7 @@ public class InfraredRemoteActivity extends AppCompatActivity {
         webView.addJavascriptInterface(new ConsumerIrManagerApi(getApplicationContext()), "adIrApi");
         webView.addJavascriptInterface(new JavaScriptInterface(getApplicationContext()), "adApi");
         webView.loadUrl(sp.getString("url","https://www.qq.com"));
+        webView.setWebContentsDebuggingEnabled(true);
     }
 
 

+ 18 - 2
app/src/main/java/com/info666/app/infraredRemote/api/ConsumerIrManagerApi.java

@@ -2,15 +2,20 @@ package com.info666.app.infraredRemote.api;
 
 import android.content.Context;
 import android.os.Build;
+import android.os.Handler;
+import android.os.HandlerThread;
 import android.util.Log;
 import android.webkit.JavascriptInterface;
 
 import com.alibaba.fastjson2.JSON;
 
+import cn.hutool.core.exceptions.ExceptionUtil;
+
 public class ConsumerIrManagerApi {
 
     private ConsumerIrManagerApi instance;
     private android.hardware.ConsumerIrManager service;
+    private Handler mHandler ;
 
     public ConsumerIrManagerApi(Context context) {
         //Android4.4才开始支持红外功能
@@ -18,6 +23,9 @@ public class ConsumerIrManagerApi {
             // 获取系统的红外遥控服务
             service = (android.hardware.ConsumerIrManager) context.getApplicationContext().getSystemService(Context.CONSUMER_IR_SERVICE);
         }
+        HandlerThread handlerThread = new HandlerThread("consumerIrThread");//创建一个handlerThread线程
+        handlerThread.start();//启动该线程
+        mHandler =  new Handler(handlerThread.getLooper());
     }
 
     public ConsumerIrManagerApi getConsumerIrManager(Context context) {
@@ -50,9 +58,17 @@ public class ConsumerIrManagerApi {
      */
     @JavascriptInterface
     public void transmit(int carrierFrequency, int[] pattern) {
-        Log.d("ConsumerIrManagerApi","transmit("+carrierFrequency+","+ JSON.toJSONString(pattern) +")");
         if (service != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            service.transmit(carrierFrequency, pattern);
+            //异步发射
+            try {
+                mHandler.post(()->{
+                    Log.d("ConsumerIrManagerApi","transmit("+carrierFrequency+","+ JSON.toJSONString(pattern) +")");
+                    service.transmit(carrierFrequency, pattern);
+                });
+            }catch (Exception e){
+                e.printStackTrace();
+                Log.e("--红外发射失败--", ExceptionUtil.getSimpleMessage(e));
+            }
         }
     }
 

+ 6 - 23
app/src/main/res/layout/activity_main.xml

@@ -7,31 +7,14 @@
     android:background="@color/white"
     tools:context=".MainActivity">
 
-    <LinearLayout
+    <ImageView
         android:id="@+id/ll_welcome"
+        android:src="@mipmap/img_welcome"
+        android:scaleType="centerCrop"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="220dp"
-        android:paddingRight="50dp"
-        android:paddingLeft="50dp"
-        android:orientation="vertical">
-
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="150dp"
-            android:scaleType="centerInside"
-            android:src="@mipmap/ic_icon"/>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="40dp"
-            android:textSize="20dp"
-            android:gravity="center_horizontal"
-            android:fontFamily="sans-serif-medium"
-            android:text="@string/app_name"/>
-
-    </LinearLayout>
+        android:layout_height="match_parent"
+        >
+    </ImageView>
 
     <LinearLayout
         android:id="@+id/ll_mt"

BIN
app/src/main/res/mipmap-xxhdpi/ic_icon_new.png


BIN
app/src/main/res/mipmap-xxhdpi/img_welcome.jpg