1.增加二维码扫码支持

2.增加自动更新功能

app/build.gradle

@@ -0,0 +1,49 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    namespace 'com.info666.app.infraredRemote'
+    compileSdk 33
+
+    defaultConfig {
+        applicationId "com.info666.app.infraredRemote"
+        minSdk 21
+        targetSdk 33
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    packagingOptions {
+        exclude 'META-INF/INDEX.LIST'
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation 'com.alibaba.fastjson2:fastjson2:2.0.35.android4'
+    // AndroidX 版本
+    implementation 'com.github.jenly1314:zxing-lite:2.2.1'
+    implementation group: 'cn.hutool', name: 'hutool-core', version: '5.8.20'
+    implementation group: 'cn.hutool', name: 'hutool-http', version: '5.8.20'
+
+}

app/src/main/AndroidManifest.xml

@@ -30,6 +30,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".activity.InfraredRemoteActivity"></activity>
+        <activity android:name=".activity.MyCaptureActivity"></activity>
     </application>
 
 </manifest>

app/src/main/java/com/info666/app/infraredRemote/MainActivity.java

@@ -1,18 +1,37 @@
 package com.info666.app.infraredRemote;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.Toast;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.info666.app.infraredRemote.activity.InfraredRemoteActivity;
+import com.info666.app.infraredRemote.activity.MyCaptureActivity;
+import com.king.zxing.CameraScan;
 
-public class MainActivity extends AppCompatActivity implements View.OnClickListener {
+
+import cn.hutool.http.HttpUtil;
+
+public class MainActivity extends AppCompatActivity implements View.OnClickListener, Handler.Callback {
 
     private SharedPreferences sp;
 
@@ -20,6 +39,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
     private Button btnNext;
 
+    private Handler handler;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -28,7 +49,21 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         etUrl = findViewById(R.id.et_url);
         btnNext = findViewById(R.id.bt_next);
         btnNext.setOnClickListener(this);
+        findViewById(R.id.bt_qrc).setOnClickListener(this);
         etUrl.setText(sp.getString("url","http://ccvadmin.info666.com/ljshxyqy/"));
+        handler = new Handler(this);
+        this.initApp();
+    }
+
+    public void initApp(){
+        new Thread(()->{
+            String result = HttpUtil.get("http://api.info666.com/api/api/v1/appConfig/getAppConfig");
+            JSONObject jsonObject = JSONObject.parseObject(result);
+            JSONArray jsonArray = jsonObject.getJSONArray("data");
+            Message message = new Message();
+            message.obj = jsonArray.getJSONObject(0).toJSONString();
+            handler.sendMessage(message);
+        }).start();
     }
 
 
@@ -44,7 +79,53 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
             editor.commit();
             Intent intent = new Intent(this, InfraredRemoteActivity.class);
             startActivity(intent);
-            super.finish();
+            MainActivity.this.finish();
+        } else if(v.getId() == R.id.bt_qrc){
+            Intent intent = new Intent(this, MyCaptureActivity.class);
+            startActivityForResult(intent,Activity.RESULT_FIRST_USER);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (Activity.RESULT_OK == resultCode) {
+            String msg = data.getStringExtra(CameraScan.SCAN_RESULT);
+            Toast.makeText(this,msg, Toast.LENGTH_LONG).show();
         }
     }
+
+    @Override
+    public boolean handleMessage(@NonNull Message msg) {
+        Log.d("handleMessage",msg.obj.toString());
+        try {
+            JSONObject appData = JSON.parseObject(msg.obj.toString());
+            appData = JSON.parseObject(appData.getString("data"));
+            int appVersion = appData.getInteger("appVersion");
+            String downLoadUrl = appData.getString("downLoadUrl");
+            int versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
+            if(appVersion > versionCode){
+                this.updateApp(downLoadUrl);
+            }
+        } catch (PackageManager.NameNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+        return false;
+    }
+
+    public void updateApp(String downLoadUrl){
+        new AlertDialog.Builder(this)
+            .setTitle(String.format("提示"))
+            .setMessage("有新版本需要更新")
+            .setPositiveButton("升级", (dialog, which) -> {
+                Uri uri = Uri.parse(downLoadUrl);
+                Intent it = new Intent(Intent.ACTION_VIEW,uri);
+                MainActivity.this.startActivity(it);
+                dialog.dismiss();
+            })
+            .setNegativeButton("暂不升级", (dialog, which) -> dialog.dismiss())
+            .create()
+            .show();
+    }
+
 }

app/src/main/java/com/info666/app/infraredRemote/activity/InfraredRemoteActivity.java

@@ -1,21 +1,28 @@
 package com.info666.app.infraredRemote.activity;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
+import android.webkit.JavascriptInterface;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.info666.app.infraredRemote.R;
 import com.info666.app.infraredRemote.api.ConsumerIrManagerApi;
+import com.king.zxing.CameraScan;
 
 import java.lang.reflect.Method;
 
+import cn.hutool.core.convert.Convert;
+
 public class InfraredRemoteActivity extends AppCompatActivity {
     private WebView webView;
 
@@ -54,8 +61,33 @@ public class InfraredRemoteActivity extends AppCompatActivity {
             }
         }
         webView.setWebViewClient(new WebViewClient());
-        webView.addJavascriptInterface(new ConsumerIrManagerApi(getApplicationContext()), "adIrApi");;
+        webView.addJavascriptInterface(new ConsumerIrManagerApi(getApplicationContext()), "adIrApi");
+        webView.addJavascriptInterface(new JavaScriptInterface(getApplicationContext()), "adApi");
         webView.loadUrl(sp.getString("url","https://www.qq.com"));
     }
 
+
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (Activity.RESULT_OK == resultCode) {
+            String msg = data.getStringExtra(CameraScan.SCAN_RESULT);
+            webView.evaluateJavascript(String.format("javascript:_scanCodeCallback(0,'%s');",Convert.strToUnicode(msg)),(str)->{});
+        }
+    }
+
+    public class JavaScriptInterface{
+        private Context context;
+
+        public JavaScriptInterface(Context context){
+            this.context = context;
+        }
+
+        @JavascriptInterface
+        public void startQrCapture(){
+            Intent intent = new Intent(context, MyCaptureActivity.class);
+            startActivityForResult(intent,Activity.RESULT_FIRST_USER);
+        }
+
+    }
+
 }

app/src/main/java/com/info666/app/infraredRemote/activity/MyCaptureActivity.java

@@ -0,0 +1,74 @@
+package com.info666.app.infraredRemote.activity;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+
+import com.google.zxing.Result;
+import com.king.zxing.CameraScan;
+import com.king.zxing.CaptureActivity;
+import com.king.zxing.DecodeConfig;
+import com.king.zxing.DecodeFormatManager;
+import com.king.zxing.analyze.MultiFormatAnalyzer;
+
+public class MyCaptureActivity extends CaptureActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void initCameraScan() {
+        super.initCameraScan();
+        //初始化解码配置
+        DecodeConfig decodeConfig = new DecodeConfig();
+        decodeConfig.setHints(DecodeFormatManager.QR_CODE_HINTS);//如果只有识别二维码的需求，这样设置效率会更高，不设置默认为DecodeFormatManager.DEFAULT_HINTS
+        //在启动预览之前，设置分析器，只识别二维码
+        getCameraScan().setPlayBeep(true)//设置是否播放音效，默认为false
+                .setVibrate(true)//设置是否震动，默认为false
+                .setNeedAutoZoom(false)
+                .setOnScanResultCallback(this)
+                .setAnalyzer(new MultiFormatAnalyzer(decodeConfig));//设置分析器,如果内置实现的一些分析器不满足您的需求，你也可以自定义去实现;//二维码太小时可自动缩放，默认为false
+    }
+
+    @Override
+    public int getLayoutId() {
+        return super.getLayoutId();
+    }
+
+    /**
+     * 扫码结果回调
+     * @param result
+     * @return 返回false表示不拦截，将关闭扫码界面并将结果返回给调用界面；
+     *  返回true表示拦截，需自己处理逻辑。当isAnalyze为true时，默认会继续分析图像（也就是连扫）。
+     *  如果只是想拦截扫码结果回调，并不想继续分析图像（不想连扫），请在拦截扫码逻辑处通过调
+     *  用{@link CameraScan#setAnalyzeImage(boolean)}，
+     *  因为{@link CameraScan#setAnalyzeImage(boolean)}方法能动态控制是否继续分析图像。
+     *
+     */
+    @Override
+    public boolean onScanResultCallback(Result result) {
+        /*
+         * 因为setAnalyzeImage方法能动态控制是否继续分析图像。
+         *
+         * 1. 因为分析图像默认为true，如果想支持连扫，返回true即可。
+         * 当连扫的处理逻辑比较复杂时，请在处理逻辑前调用getCameraScan().setAnalyzeImage(false)，
+         * 来停止分析图像，等逻辑处理完后再调用getCameraScan().setAnalyzeImage(true)来继续分析图像。
+         *
+         * 2. 如果只是想拦截扫码结果回调自己处理逻辑，但并不想继续分析图像（即不想连扫），可通过
+         * 调用getCameraScan().setAnalyzeImage(false)来停止分析图像。
+         */
+        super.onScanResultCallback(result);
+        Intent intent = new Intent();
+        intent.putExtra(CameraScan.SCAN_RESULT,result.getText());
+        setResult(Activity.RESULT_OK,intent);  //返回码标识
+        MyCaptureActivity.this.finish();
+        return false;
+    }
+
+
+}

app/src/main/res/layout/activity_main.xml

@@ -44,4 +44,13 @@
         android:layout_height="wrap_content"
         android:text="打开"></Button>
 
+    <Button
+        android:id="@+id/bt_qrc"
+        android:layout_marginTop="10dp"
+        android:layout_below="@id/bt_next"
+        android:layout_centerHorizontal="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="扫码"></Button>
+
 </RelativeLayout>

settings.gradle

@@ -3,6 +3,7 @@ pluginManagement {
         google()
         mavenCentral()
         gradlePluginPortal()
+        jcenter()
     }
 }
 dependencyResolutionManagement {
@@ -10,6 +11,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
+        jcenter()
     }
 }
 rootProject.name = "infraredRemote"