Browse Source

更改包名 com.libs.zxing 改为 me.yoqi.qrcode

liuyuqi-dellpc 6 years ago
parent
commit
a71bbdc114

+ 1 - 1
.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 <projectDescription>
-	<name>ZXingCodeLibs</name>
+	<name>QRCode</name>
 	<comment></comment>
 	<comment></comment>
 	<projects>
 	<projects>
 	</projects>
 	</projects>

+ 2 - 2
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="com.libs.zxing"
+    package="me.yoqi.qrcode"
     android:installLocation="auto"
     android:installLocation="auto"
     android:versionCode="1"
     android:versionCode="1"
     android:versionName="1.0" >
     android:versionName="1.0" >
@@ -55,7 +55,7 @@
         android:label="@string/app_name"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         android:theme="@style/AppTheme" >
         <activity
         <activity
-            android:name="com.libs.zxing.CaptureActivity"
+            android:name="me.yoqi.qrcode.CaptureActivity"
             android:clearTaskOnLaunch="true"
             android:clearTaskOnLaunch="true"
             android:configChanges="orientation|keyboardHidden"
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:screenOrientation="portrait"

+ 1 - 1
res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 <resources>
 
 
-    <string name="app_name">ZXingCodeLibs</string>
+    <string name="app_name">QRCode</string>
     <string name="action_settings">Settings</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
     <string name="hello_world">Hello world!</string>
     
     

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

@@ -20,13 +20,13 @@ 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 java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collection;
 
 
 import com.google.zxing.client.android.common.executor.AsyncTaskExecInterface;
 import com.google.zxing.client.android.common.executor.AsyncTaskExecInterface;
 import com.google.zxing.client.android.common.executor.AsyncTaskExecManager;
 import com.google.zxing.client.android.common.executor.AsyncTaskExecManager;
-import com.libs.zxing.Config;
 
 
 final class AutoFocusManager implements Camera.AutoFocusCallback {
 final class AutoFocusManager implements Camera.AutoFocusCallback {
 
 

+ 1 - 3
src/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 java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collection;
@@ -30,8 +30,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.Comparator;
 import java.util.List;
 import java.util.List;
 
 
-import com.libs.zxing.Config;
-
 /**
 /**
  * A class which deals with reading, parsing, and setting the camera parameters which are used to
  * A class which deals with reading, parsing, and setting the camera parameters which are used to
  * configure the camera hardware.
  * configure the camera hardware.

+ 1 - 1
src/com/google/zxing/client/android/camera/CameraManager.java

@@ -184,7 +184,7 @@ public final class CameraManager
     }
     }
 
 
     /**
     /**
-     * Convenience method for {@link com.google.zxing.client.android.CaptureActivity}
+     * Convenience method for {@link com.google.me.yoqi.qrcode.CaptureActivity}
      */
      */
     public synchronized void setTorch(boolean newSetting){
     public synchronized void setTorch(boolean newSetting){
         if (camera != null)
         if (camera != null)

+ 2 - 2
src/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 com.libs.zxing.Config;
-import com.libs.zxing.R;
+import me.yoqi.qrcode.Config;
+import me.yoqi.qrcode.R;
 
 
 /**
 /**
  * Manages beeps and vibrations for {@link CaptureActivity}.
  * Manages beeps and vibrations for {@link CaptureActivity}.

+ 3 - 2
src/com/google/zxing/client/android/decode/CaptureActivityHandler.java

@@ -23,8 +23,9 @@ import android.provider.Browser;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 import com.google.zxing.Result;
 import com.google.zxing.client.android.camera.CameraManager;
 import com.google.zxing.client.android.camera.CameraManager;
-import com.libs.zxing.CaptureActivity;
-import com.libs.zxing.R;
+
+import me.yoqi.qrcode.CaptureActivity;
+import me.yoqi.qrcode.R;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.Intent;

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

@@ -26,8 +26,9 @@ import com.google.zxing.ReaderException;
 import com.google.zxing.Result;
 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 com.libs.zxing.CaptureActivity;
-import com.libs.zxing.R;
+
+import me.yoqi.qrcode.CaptureActivity;
+import me.yoqi.qrcode.R;
 
 
 import android.os.Bundle;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Handler;

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

@@ -19,12 +19,12 @@ package com.google.zxing.client.android.decode;
 import com.google.zxing.BarcodeFormat;
 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 com.libs.zxing.CaptureActivity;
-import com.libs.zxing.Config;
 
 
 import android.content.SharedPreferences;
 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 java.util.Collection;
 import java.util.Collection;
 import java.util.EnumMap;
 import java.util.EnumMap;

+ 1 - 1
src/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 com.libs.zxing.R;
+import me.yoqi.qrcode.R;
 
 
 import android.content.Context;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.Resources;

+ 1 - 1
src/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 com.libs.zxing.R;
+import me.yoqi.qrcode.R;
 
 
 
 
 public class DefaultResultHandler extends ResultHandler
 public class DefaultResultHandler extends ResultHandler

+ 1 - 1
src/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 com.libs.zxing.R;
+import me.yoqi.qrcode.R;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.AlertDialog;

+ 2 - 1
src/com/google/zxing/client/android/result/ResultHandlerFactory.java

@@ -19,7 +19,8 @@ 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.ResultParser;
 import com.google.zxing.client.result.ResultParser;
-import com.libs.zxing.CaptureActivity;
+
+import me.yoqi.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
src/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 com.libs.zxing.R;
+import me.yoqi.qrcode.R;
 
 
 import android.app.Activity;
 import android.app.Activity;
 import android.widget.Toast;
 import android.widget.Toast;

+ 7 - 2
src/com/libs/zxing/CaptureActivity.java → src/me/yoqi/qrcode/CaptureActivity.java

@@ -1,4 +1,4 @@
-package com.libs.zxing;
+package me.yoqi.qrcode;
 
 
 import java.io.IOException;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collection;
@@ -21,7 +21,6 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.ImageView;
 import android.widget.Toast;
 import android.widget.Toast;
-import me.yoqi.qrcode.ResultActivity;
 
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 import com.google.zxing.Result;
@@ -33,6 +32,12 @@ import com.google.zxing.client.android.decode.InactivityTimer;
 import com.google.zxing.client.android.decode.ViewfinderView;
 import com.google.zxing.client.android.decode.ViewfinderView;
 import com.google.zxing.client.android.result.ResultHandler;
 import com.google.zxing.client.android.result.ResultHandler;
 import com.google.zxing.client.android.result.ResultHandlerFactory;
 import com.google.zxing.client.android.result.ResultHandlerFactory;
+import me.yoqi.qrcode.R;
+import me.yoqi.qrcode.R.color;
+import me.yoqi.qrcode.R.drawable;
+import me.yoqi.qrcode.R.id;
+import me.yoqi.qrcode.R.layout;
+import me.yoqi.qrcode.R.string;
 
 
 /**
 /**
  * 识别二维码 CaptureActivity
  * 识别二维码 CaptureActivity

+ 1 - 1
src/com/libs/zxing/Config.java → src/me/yoqi/qrcode/Config.java

@@ -1,4 +1,4 @@
-package com.libs.zxing;
+package me.yoqi.qrcode;
 
 
 
 
 public class Config
 public class Config

+ 1 - 1
src/me/yoqi/qrcode/ResultActivity.java

@@ -1,6 +1,6 @@
 package me.yoqi.qrcode;
 package me.yoqi.qrcode;
 
 
-import com.libs.zxing.R;
+import me.yoqi.qrcode.R;
 
 
 import android.annotation.SuppressLint;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Activity;