更新签名

app/build.gradle

@@ -14,14 +14,16 @@ android {
             storePassword keystoreProperties['storePassword']
         }
     }
-    compileSdkVersion 32
+    compileSdk 33
 
     defaultConfig {
-        versionCode 10013
-        versionName "1.2.3"
-        applicationId "me.yoqi.android.qrcode"
-        minSdkVersion 16
-        targetSdkVersion 32
+        versionCode 10016
+        versionName "1.2.6"
+        applicationId "me.yoqi.qrcode"
+        minSdkVersion 21
+        targetSdk 34
+        signingConfig signingConfigs.release
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -36,7 +38,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation project(":utils")
     //     implementation 'me.dm7.barcodescanner:zxing:1.9'
     //implementation 'cn.bingoogolapple:bga-qrcode-zbar:1.2.5'

app/src/main/AndroidManifest.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="me.yoqi.android.qrcode"
-    android:installLocation="auto"
-    android:versionCode="2"
-    android:versionName="1.0.2">
+    android:installLocation="auto">
 
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FLASHLIGHT" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
 
     <!-- Don't require camera, as this requires a rear camera. This allows it to work on the Nexus 7 -->
     <uses-feature
@@ -46,7 +46,8 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name="me.yoqi.android.qrcode.CaptureActivity"
+            android:name="me.yoqi.qrcode.CaptureActivity"
+            android:exported="true"
             android:clearTaskOnLaunch="true"
             android:configChanges="orientation|keyboardHidden"
             android:launchMode="singleTop"
@@ -113,11 +114,12 @@
                     android:scheme="zxing" />
             </intent-filter>
         </activity>
-        <activity android:name="me.yoqi.android.qrcode.ui.ResultActivity"/>
+        <activity android:name="me.yoqi.android.qrcode.ui.ResultActivity" />
         <activity android:name=".ui.HistoryActivity" />
 
         <service
             android:name="me.yoqi.android.qrcode.service.QuickStartService"
+            android:exported="true"
             android:icon="@drawable/qr"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">

app/src/main/java/com/google/zxing/client/android/decode/CaptureActivityHandler.java

@@ -35,7 +35,7 @@ import com.google.zxing.client.android.camera.CameraManager;
 
 import java.util.Collection;
 
-import me.yoqi.android.qrcode.CaptureActivity;
+import me.yoqi.qrcode.CaptureActivity;
 import me.yoqi.android.qrcode.R;
 
 /**

app/src/main/java/com/google/zxing/client/android/decode/DecodeHandler.java

@@ -24,10 +24,9 @@ import com.google.zxing.MultiFormatReader;
 import com.google.zxing.PlanarYUVLuminanceSource;
 import com.google.zxing.ReaderException;
 import com.google.zxing.Result;
-import com.google.zxing.client.android.camera.CameraManager;
 import com.google.zxing.common.HybridBinarizer;
 
-import me.yoqi.android.qrcode.CaptureActivity;
+import me.yoqi.qrcode.CaptureActivity;
 import me.yoqi.android.qrcode.R;
 
 import android.os.Bundle;

app/src/main/java/com/google/zxing/client/android/decode/DecodeThread.java

@@ -22,7 +22,7 @@ import com.google.zxing.ResultPointCallback;
 
 import android.os.Handler;
 import android.os.Looper;
-import me.yoqi.android.qrcode.CaptureActivity;
+import me.yoqi.qrcode.CaptureActivity;
 import me.yoqi.android.qrcode.Config;
 
 import java.util.Collection;

app/src/main/java/com/google/zxing/client/android/result/ResultHandlerFactory.java

@@ -20,7 +20,7 @@ import com.google.zxing.Result;
 import com.google.zxing.client.result.ParsedResult;
 import com.google.zxing.client.result.ResultParser;
 
-import me.yoqi.android.qrcode.CaptureActivity;
+import me.yoqi.qrcode.CaptureActivity;
 
 /**
  * Manufactures Android-specific handlers based on the barcode content's type.

app/src/main/java/me/yoqi/android/qrcode/service/QuickStartService.java

@@ -7,7 +7,7 @@ import android.service.quicksettings.TileService;
 
 import androidx.annotation.RequiresApi;
 
-import me.yoqi.android.qrcode.CaptureActivity;
+import me.yoqi.qrcode.CaptureActivity;
 import me.yoqi.android.utils.SPUtils;
 import me.yoqi.android.utils.ui.SimplexToast;
 

app/src/main/java/me/yoqi/android/qrcode/ui/tab/BankCardScanActivity.java

@@ -1,14 +1,10 @@
 package yoqi.me.qrcode.activity;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
+import android.widget.Toolbar;
 
-import yoqi.me.qrcode.R;
-
+import androidx.appcompat.app.AppCompatActivity;
 /**
  * 银行卡扫描
  */
@@ -17,18 +13,18 @@ public class BankCardScanActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_bank_card_scan);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
+//        setContentView(R.layout.activity_bank_card_scan);
+//        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+//        setSupportActionBar(toolbar);
+//
+//        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+//        fab.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+//                        .setAction("Action", null).show();
+//            }
+//        });
     }
 
 }

app/src/main/java/me/yoqi/android/qrcode/ui/tab/GenerateQRCodectivity.java

@@ -1,13 +1,10 @@
 package yoqi.me.qrcode.activity;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 
-import yoqi.me.qrcode.R;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 /**
  * 生成二维码
@@ -17,18 +14,18 @@ public class GenerateQRCodectivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_generatectivity);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
+//        setContentView(R.layout.activity_generatectivity);
+//        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+//        setSupportActionBar(toolbar);
+//
+//        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+//        fab.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+//                        .setAction("Action", null).show();
+//            }
+//        });
     }
 
 }

app/src/main/java/me/yoqi/android/qrcode/ui/tab/IDCardScanActivity.java

@@ -1,13 +1,10 @@
 package yoqi.me.qrcode.activity;
 
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+
 import android.view.View;
 
-import yoqi.me.qrcode.R;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * 身份证扫描
@@ -17,18 +14,18 @@ public class IDCardScanActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_idcard);
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
+//        setContentView(R.layout.activity_idcard);
+//        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+//        setSupportActionBar(toolbar);
+//
+//        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+//        fab.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
+//                        .setAction("Action", null).show();
+//            }
+//        });
     }
 
 }

app/src/main/java/me/yoqi/android/qrcode/CaptureActivity.java → app/src/main/java/me/yoqi/qrcode/CaptureActivity.java

@@ -1,4 +1,4 @@
-package me.yoqi.android.qrcode;
+package me.yoqi.qrcode;
 
 import android.Manifest;
 import android.content.Intent;
@@ -37,6 +37,8 @@ import com.google.zxing.client.android.result.ResultHandlerFactory;
 import java.io.IOException;
 import java.util.Collection;
 
+import me.yoqi.android.qrcode.Config;
+import me.yoqi.android.qrcode.R;
 import me.yoqi.android.qrcode.ui.ResultActivity;
 
 /**

build.gradle

@@ -2,7 +2,7 @@
 buildscript {
     repositories {
         google()
-        maven{url'http://maven.aliyun.com/nexus/content/groups/public/'}
+        maven{url'https://maven.aliyun.com/nexus/content/groups/public/'}
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.2.2'
@@ -12,6 +12,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        maven{url'http://maven.aliyun.com/nexus/content/groups/public/'}
+        maven{url'https://maven.aliyun.com/nexus/content/groups/public/'}
     }
 }

keystore.properties

@@ -1,4 +1,4 @@
-storeFile=C:\\Users\\liuyuqi\\OneDrive\\cert\\android\\coding-android-sign-dev.jks
+storeFile=QRCode.jks
 keyAlias=key0
-keyPassword=coding321
-storePassword=coding321
+keyPassword=gUkZ4BBp
+storePassword=gUkZ4BBp