Merge branch 'develop' into 'master'

修复zxing错误

See merge request SilverBlog/SilverBlog_Android!79

Author: qwe7002

app/src/main/java/com/google/zxing/activity/CaptureActivity.java

@@ -23,7 +23,8 @@
 import com.google.zxing.decoding.CaptureActivityHandler;
 import com.google.zxing.decoding.InactivityTimer;
 import com.google.zxing.view.ViewfinderView;
-import com.reallct.qwe7002.smartblog_client.R;
+
+import org.SilverBlog.client.R;
 
 import java.io.IOException;
 import java.util.Vector;

app/src/main/java/com/google/zxing/decoding/CaptureActivityHandler.java

@@ -25,13 +25,14 @@
 import android.os.Message;
 import android.util.Log;
 
-import com.reallct.qwe7002.smartblog_client.R;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
 import com.google.zxing.activity.CaptureActivity;
 import com.google.zxing.camera.CameraManager;
 import com.google.zxing.view.ViewfinderResultPointCallback;
 
+import org.SilverBlog.client.R;
+
 import java.util.Vector;
 
 

app/src/main/java/com/google/zxing/decoding/DecodeHandler.java

@@ -22,7 +22,6 @@
 import android.os.Message;
 import android.util.Log;
 
-import com.reallct.qwe7002.smartblog_client.R;
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.DecodeHintType;
 import com.google.zxing.MultiFormatReader;
@@ -33,6 +32,8 @@
 import com.google.zxing.camera.PlanarYUVLuminanceSource;
 import com.google.zxing.common.HybridBinarizer;
 
+import org.SilverBlog.client.R;
+
 import java.util.Hashtable;
 
 

app/src/main/java/com/google/zxing/decoding/DecodeThread.java

@@ -30,7 +30,6 @@
 
 /**
  * This thread does all the heavy lifting of decoding the images.
- * �����߳�
  */
 final class DecodeThread extends Thread {
 

app/src/main/java/com/google/zxing/view/ViewfinderView.java

@@ -32,10 +32,11 @@
 import android.util.AttributeSet;
 import android.view.View;
 
-import com.reallct.qwe7002.smartblog_client.R;
 import com.google.zxing.ResultPoint;
 import com.google.zxing.camera.CameraManager;
 
+import org.SilverBlog.client.R;
+
 import java.util.Collection;
 import java.util.HashSet;