修改logo

AndroidManifest.xml

@@ -51,7 +51,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/logo"
+        android:icon="@drawable/logo2"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity

res/layout/activity_result.xml

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
-        android:text="扫描结果为：" />
+        android:text="@string/scan_result" />
 
     <EditText
         android:id="@+id/et_result"
@@ -21,6 +21,6 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="已自动复制到剪切板" />
+        android:text="@string/auto_copy" />
 
 </LinearLayout>

res/values-en/strings.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">QRCode</string>
+    <string name="action_settings">Settings</string>
+    <string name="hello_world">Hello world!</string>
+    
+	<string name="camera_open_notice">You have turned on the lights!</string>
+	<string name="camera_close_notice">You have turned off the lights!</string>
+    
+	<string name="camera_problem">Sorry, there is a problem with your camera. You may need to reboot your device.</string>
+	<string name="framwork_problem">There is a temporary problem with QR code scanning. You reboot and try again.</string>
+	<string name="msg_share_subject_line">This is the content of the barcode I scanned.</string>
+	<string name="msg_default_mms_subject">Hi</string>
+	<string name="msg_intent_failed">Sorry, the required software could not be opened. Barcode content may not be valid.</string>
+	 <string name="button_ok">Sure</string>
+	 <string name="result_uri">URL path</string>
+	 
+	 <string name="button_1">Browser open</string>
+	 <string name="button_2">content</string>
+	 <string name="button_3">Other title</string>
+	 <string name="result_title_default">URL path</string>
+	 
+	 <string name="qrcode_notice">The QR code pattern is placed in the framing frame for automatic scanning.</string>
+	 <string name="openorclose_light">Turn lights on or off</string>
+	 <string name="qrcode_empty"></string>
+	 
+	 <string name="qrcode_open">Open with a browser</string>
+	 
+	 <string name="paramete_error">The parameters are correct, please rescan</string>
+	 <string name="scan_result">The scan result is:</string>
+	 <string name="auto_copy">Had copied to the clipboard</string>
+</resources>

res/values/strings.xml

@@ -28,5 +28,6 @@
 	 <string name="qrcode_open">用浏览器打开</string>
 	 
 	 <string name="paramete_error">参数正确，请重新扫描</string>
-	 
+	 <string name="scan_result">扫描结果为：</string>
+	 <string name="auto_copy">已自动复制到剪切板</string>
 </resources>

src/me/yoqi/qrcode/CaptureActivity.java

@@ -3,6 +3,17 @@ package me.yoqi.qrcode;
 import java.io.IOException;
 import java.util.Collection;
 
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.Result;
+import com.google.zxing.ResultPoint;
+import com.google.zxing.client.android.camera.CameraManager;
+import com.google.zxing.client.android.decode.BeepManager;
+import com.google.zxing.client.android.decode.CaptureActivityHandler;
+import com.google.zxing.client.android.decode.InactivityTimer;
+import com.google.zxing.client.android.decode.ViewfinderView;
+import com.google.zxing.client.android.result.ResultHandler;
+import com.google.zxing.client.android.result.ResultHandlerFactory;
+
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -22,23 +33,6 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.Toast;
 
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.Result;
-import com.google.zxing.ResultPoint;
-import com.google.zxing.client.android.camera.CameraManager;
-import com.google.zxing.client.android.decode.BeepManager;
-import com.google.zxing.client.android.decode.CaptureActivityHandler;
-import com.google.zxing.client.android.decode.InactivityTimer;
-import com.google.zxing.client.android.decode.ViewfinderView;
-import com.google.zxing.client.android.result.ResultHandler;
-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
  *