diff --git a/libraryzxing/src/main/java/com/baozi/Zxing/CaptureActivity.java b/libraryzxing/src/main/java/com/baozi/Zxing/CaptureActivity.java index ff95ad2..a1fbd37 100644 --- a/libraryzxing/src/main/java/com/baozi/Zxing/CaptureActivity.java +++ b/libraryzxing/src/main/java/com/baozi/Zxing/CaptureActivity.java @@ -63,9 +63,7 @@ public class CaptureActivity extends Activity implements Callback, OnClickListen private ImageView mo_scanner_light; private boolean isShowHistory; - /** - * Called when the activity is first created. - */ + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -81,10 +79,6 @@ public void onCreate(Bundle savedInstanceState) { hasSurface = false; inactivityTimer = new InactivityTimer(this); - //初始化动画 - initAnimation(); - - } private void initAnimation() { @@ -125,6 +119,9 @@ private void initView() { mo_scanner_histroy.setVisibility(View.VISIBLE); } + //初始化动画 + initAnimation(); + } boolean flag = true; @@ -187,7 +184,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { private void analysisImage(final String photoPath) { if (TextUtils.isEmpty(photoPath)) { - Toast.makeText(this, "获取图片失败", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, R.string.libraryzxing_get_pic_fail, Toast.LENGTH_SHORT).show(); return; } new Thread(new Runnable() { @@ -198,7 +195,7 @@ public void run() { @Override public void run() { if (TextUtils.isEmpty(result)) { - Toast.makeText(CaptureActivity.this, "图片格式错误", Toast.LENGTH_SHORT).show(); + Toast.makeText(CaptureActivity.this, R.string.libraryzxing_get_pic_fail, Toast.LENGTH_SHORT).show(); } else { // 数据返回 Intent data = new Intent(); @@ -298,8 +295,7 @@ public Handler getHandler() { } public void drawViewfinder() { - // viewfinderView.drawViewfinder(); - + viewfinderView.drawViewfinder(); } public void handleDecode(final Result result, Bitmap barcode) { @@ -315,9 +311,6 @@ public void handleDecode(final Result result, Bitmap barcode) { private void initBeepSound() { if (playBeep && mediaPlayer == null) { - // The volume on STREAM_SYSTEM is not adjustable, and users found it - // too loud, - // so we now play on the music stream. setVolumeControlStream(AudioManager.STREAM_MUSIC); mediaPlayer = new MediaPlayer(); mediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); @@ -349,9 +342,6 @@ private void playBeepSoundAndVibrate() { } } - /** - * When the beep has finished playing, rewind to queue up another one. - */ private final OnCompletionListener beepListener = new OnCompletionListener() { public void onCompletion(MediaPlayer mediaPlayer) { mediaPlayer.seekTo(0); diff --git a/libraryzxing/src/main/res/values/strings.xml b/libraryzxing/src/main/res/values/strings.xml index 739c518..9091860 100644 --- a/libraryzxing/src/main/res/values/strings.xml +++ b/libraryzxing/src/main/res/values/strings.xml @@ -1,8 +1,6 @@ - + - - BaoziZxing - Hello world! - Settings - + libraryZxing + 获取图片失败 + 图片格式错误