Browse Source

改包名,统一成: me.yoqi.android.xx

liuyuqi-dellpc 4 years ago
parent
commit
26bbcdb6a1

+ 10 - 0
README.md

@@ -0,0 +1,10 @@
+## QRCode
+
+安卓二维码扫描(扫码)工具,后续尝试扫身份证,扫银行卡,扫文档等。迁移到github,本仓库不再更新。 https://github.com/jianboy/QRCode
+
+[download it](https://git.yoqi.me/lyq/QRCode/releases).
+
+
+
+
+

+ 2 - 1
app/build.gradle

@@ -19,7 +19,7 @@ android {
     defaultConfig {
     defaultConfig {
         versionCode 13
         versionCode 13
         versionName "1.23"
         versionName "1.23"
-        applicationId "me.yoqi.qrcode"
+        applicationId "me.yoqi.android.qrcode"
         minSdkVersion 14
         minSdkVersion 14
         targetSdkVersion 29
         targetSdkVersion 29
     }
     }
@@ -29,6 +29,7 @@ android {
             minifyEnabled true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
             signingConfig signingConfigs.release
             signingConfig signingConfigs.release
+            multiDexEnabled true
         }
         }
     }
     }
 }
 }

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="me.yoqi.qrcode"
+    package="me.yoqi.android.qrcode"
     android:installLocation="auto"
     android:installLocation="auto"
     android:versionCode="2"
     android:versionCode="2"
     android:versionName="1.0.2">
     android:versionName="1.0.2">
@@ -45,7 +45,7 @@
         android:supportsRtl="true"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         android:theme="@style/AppTheme">
         <activity
         <activity
-            android:name="me.yoqi.qrcode.CaptureActivity"
+            android:name="me.yoqi.android.qrcode.CaptureActivity"
             android:clearTaskOnLaunch="true"
             android:clearTaskOnLaunch="true"
             android:configChanges="orientation|keyboardHidden"
             android:configChanges="orientation|keyboardHidden"
             android:launchMode="singleTop"
             android:launchMode="singleTop"
@@ -112,10 +112,10 @@
                     android:scheme="zxing" />
                     android:scheme="zxing" />
             </intent-filter>
             </intent-filter>
         </activity>
         </activity>
-        <activity android:name="me.yoqi.qrcode.ResultActivity" />
+        <activity android:name="me.yoqi.android.qrcode.ResultActivity" />
 
 
         <service
         <service
-            android:name=".service.QuickStartService"
+            android:name="me.yoqi.android.qrcode.service.QuickStartService"
             android:icon="@drawable/qr"
             android:icon="@drawable/qr"
             android:label="@string/app_name"
             android:label="@string/app_name"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">

+ 1 - 1
app/src/main/java/com/google/zxing/client/android/camera/AutoFocusManager.java

@@ -20,7 +20,7 @@ import android.content.Context;
 import android.hardware.Camera;
 import android.hardware.Camera;
 import android.os.AsyncTask;
 import android.os.AsyncTask;
 import android.util.Log;
 import android.util.Log;
-import me.yoqi.qrcode.Config;
+import me.yoqi.android.qrcode.Config;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collection;

+ 1 - 1
app/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationManager.java

@@ -22,7 +22,7 @@ import android.hardware.Camera;
 import android.util.Log;
 import android.util.Log;
 import android.view.Display;
 import android.view.Display;
 import android.view.WindowManager;
 import android.view.WindowManager;
-import me.yoqi.qrcode.Config;
+import me.yoqi.android.qrcode.Config;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collection;

+ 2 - 2
app/src/main/java/com/google/zxing/client/android/decode/BeepManager.java

@@ -26,8 +26,8 @@ import android.util.Log;
 
 
 import java.io.IOException;
 import java.io.IOException;
 
 
-import me.yoqi.qrcode.Config;
-import me.yoqi.qrcode.R;
+import me.yoqi.android.qrcode.Config;
+import me.yoqi.android.qrcode.R;
 
 
 /**
 /**
  * Manages beeps and vibrations for {@link CaptureActivity}.
  * Manages beeps and vibrations for {@link CaptureActivity}.

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

@@ -16,28 +16,28 @@
 
 
 package com.google.zxing.client.android.decode;
 package com.google.zxing.client.android.decode;
 
 
+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.ActivityNotFoundException;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ResolveInfo;
-import android.provider.Browser;
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.Result;
-import com.google.zxing.client.android.camera.CameraManager;
-
-import me.yoqi.qrcode.CaptureActivity;
-import me.yoqi.qrcode.R;
-
-import android.app.Activity;
-import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Message;
+import android.provider.Browser;
 import android.util.Log;
 import android.util.Log;
 
 
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.Result;
+import com.google.zxing.client.android.camera.CameraManager;
+
 import java.util.Collection;
 import java.util.Collection;
 
 
+import me.yoqi.android.qrcode.CaptureActivity;
+import me.yoqi.android.qrcode.R;
+
 /**
 /**
  * This class handles all the messaging which comprises the state machine for capture.
  * This class handles all the messaging which comprises the state machine for capture.
  * 
  * 

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

@@ -27,8 +27,8 @@ import com.google.zxing.Result;
 import com.google.zxing.client.android.camera.CameraManager;
 import com.google.zxing.client.android.camera.CameraManager;
 import com.google.zxing.common.HybridBinarizer;
 import com.google.zxing.common.HybridBinarizer;
 
 
-import me.yoqi.qrcode.CaptureActivity;
-import me.yoqi.qrcode.R;
+import me.yoqi.android.qrcode.CaptureActivity;
+import me.yoqi.android.qrcode.R;
 
 
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;

+ 2 - 3
app/src/main/java/com/google/zxing/client/android/decode/DecodeThread.java

@@ -20,11 +20,10 @@ import com.google.zxing.BarcodeFormat;
 import com.google.zxing.DecodeHintType;
 import com.google.zxing.DecodeHintType;
 import com.google.zxing.ResultPointCallback;
 import com.google.zxing.ResultPointCallback;
 
 
-import android.content.SharedPreferences;
 import android.os.Handler;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Looper;
-import me.yoqi.qrcode.CaptureActivity;
-import me.yoqi.qrcode.Config;
+import me.yoqi.android.qrcode.CaptureActivity;
+import me.yoqi.android.qrcode.Config;
 
 
 import java.util.Collection;
 import java.util.Collection;
 import java.util.EnumMap;
 import java.util.EnumMap;

+ 1 - 1
app/src/main/java/com/google/zxing/client/android/decode/ViewfinderView.java

@@ -18,7 +18,7 @@ package com.google.zxing.client.android.decode;
 
 
 import com.google.zxing.ResultPoint;
 import com.google.zxing.ResultPoint;
 import com.google.zxing.client.android.camera.CameraManager;
 import com.google.zxing.client.android.camera.CameraManager;
-import me.yoqi.qrcode.R;
+import me.yoqi.android.qrcode.R;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.Resources;

+ 1 - 1
app/src/main/java/com/google/zxing/client/android/result/DefaultResultHandler.java

@@ -5,7 +5,7 @@ import android.widget.Toast;
 
 
 import com.google.zxing.Result;
 import com.google.zxing.Result;
 import com.google.zxing.client.result.ParsedResult;
 import com.google.zxing.client.result.ParsedResult;
-import me.yoqi.qrcode.R;
+import me.yoqi.android.qrcode.R;
 
 
 
 
 public class DefaultResultHandler extends ResultHandler
 public class DefaultResultHandler extends ResultHandler

+ 1 - 1
app/src/main/java/com/google/zxing/client/android/result/ResultHandler.java

@@ -19,7 +19,7 @@ package com.google.zxing.client.android.result;
 import com.google.zxing.Result;
 import com.google.zxing.Result;
 import com.google.zxing.client.result.ParsedResult;
 import com.google.zxing.client.result.ParsedResult;
 import com.google.zxing.client.result.ParsedResultType;
 import com.google.zxing.client.result.ParsedResultType;
-import me.yoqi.qrcode.R;
+import me.yoqi.android.qrcode.R;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog;

+ 1 - 1
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.ParsedResult;
 import com.google.zxing.client.result.ResultParser;
 import com.google.zxing.client.result.ResultParser;
 
 
-import me.yoqi.qrcode.CaptureActivity;
+import me.yoqi.android.qrcode.CaptureActivity;
 
 
 /**
 /**
  * Manufactures Android-specific handlers based on the barcode content's type.
  * Manufactures Android-specific handlers based on the barcode content's type.

+ 1 - 1
app/src/main/java/com/google/zxing/client/android/result/URIResultHandler.java

@@ -18,7 +18,7 @@ package com.google.zxing.client.android.result;
 
 
 import com.google.zxing.client.result.ParsedResult;
 import com.google.zxing.client.result.ParsedResult;
 import com.google.zxing.client.result.URIParsedResult;
 import com.google.zxing.client.result.URIParsedResult;
-import me.yoqi.qrcode.R;
+import me.yoqi.android.qrcode.R;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.widget.Toast;
 import android.widget.Toast;

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

@@ -1,4 +1,4 @@
-package me.yoqi.qrcode;
+package me.yoqi.android.qrcode;
 
 
 import android.Manifest;
 import android.Manifest;
 import android.content.Intent;
 import android.content.Intent;

+ 1 - 1
app/src/main/java/me/yoqi/qrcode/Config.java → app/src/main/java/me/yoqi/android/qrcode/Config.java

@@ -1,4 +1,4 @@
-package me.yoqi.qrcode;
+package me.yoqi.android.qrcode;
 
 
 
 
 public class Config {
 public class Config {

+ 2 - 2
app/src/main/java/me/yoqi/qrcode/ResultActivity.java → app/src/main/java/me/yoqi/android/qrcode/ResultActivity.java

@@ -1,4 +1,4 @@
-package me.yoqi.qrcode;
+package me.yoqi.android.qrcode;
 
 
 import android.annotation.SuppressLint;
 import android.annotation.SuppressLint;
 import android.content.ClipData;
 import android.content.ClipData;
@@ -12,7 +12,7 @@ import android.widget.EditText;
 
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatActivity;
 
 
-import me.yoqi.qrcode.utils.StringUtils;
+import me.yoqi.android.qrcode.utils.StringUtils;
 
 
 public class ResultActivity extends AppCompatActivity {
 public class ResultActivity extends AppCompatActivity {
 
 

+ 2 - 2
app/src/main/java/me/yoqi/qrcode/service/QuickStartService.java → app/src/main/java/me/yoqi/android/qrcode/service/QuickStartService.java

@@ -1,4 +1,4 @@
-package me.yoqi.qrcode.service;
+package me.yoqi.android.qrcode.service;
 
 
 import android.content.Intent;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Build;
@@ -6,7 +6,7 @@ import android.service.quicksettings.TileService;
 
 
 import androidx.annotation.RequiresApi;
 import androidx.annotation.RequiresApi;
 
 
-import me.yoqi.qrcode.CaptureActivity;
+import me.yoqi.android.qrcode.CaptureActivity;
 
 
 /**
 /**
  * 下拉快速启动
  * 下拉快速启动

+ 1 - 1
app/src/main/java/me/yoqi/qrcode/utils/StringUtils.java → app/src/main/java/me/yoqi/android/qrcode/utils/StringUtils.java

@@ -1,4 +1,4 @@
-package me.yoqi.qrcode.utils;
+package me.yoqi.android.qrcode.utils;
 
 
 import java.util.regex.Matcher;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.Pattern;