Skip to content

Commit a2006f2

Browse files
SPSpisoftSPSpisoft
committed
debug Multi-functional
1 parent f51776f commit a2006f2

File tree

7 files changed

+90
-157
lines changed

7 files changed

+90
-157
lines changed

‎app/src/main/java/com/spisoft/spedittext/MainActivity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,8 @@ public void onEvent() {
3434
}
3535
});
3636

37+
final SpsEditText SET2 = findViewById(R.id.set2);
38+
SET2.SetHint("TEST 2");
39+
3740
}
3841
}

‎app/src/main/res/layout/activity_main.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<androidx.constraintlayout.widget.ConstraintLayout
2+
<RelativeLayout
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
@@ -17,5 +17,15 @@
1717
tools:ignore="MissingConstraints">
1818
</com.spisoft.spsedittextview.SpsEditText>
1919

20+
<com.spisoft.spsedittextview.SpsEditText
21+
android:id="@+id/set2"
22+
android:layout_below="@+id/set"
23+
android:background="@drawable/background_button_shape_2"
24+
android:layout_margin="@dimen/sps_lpr_10"
25+
android:padding="@dimen/sps_lpr_5"
26+
android:layout_width="match_parent"
27+
android:layout_height="wrap_content"
28+
tools:ignore="MissingConstraints">
29+
</com.spisoft.spsedittextview.SpsEditText>
2030

21-
</androidx.constraintlayout.widget.ConstraintLayout>
31+
</RelativeLayout>

‎spsedittextview/src/main/AndroidManifest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
<uses-feature android:name="android.hardware.camera.autofocus" />
1111

1212
<application>
13-
<activity android:name=".QrCodeActivity"></activity>
13+
<activity
14+
android:label="QRCode/Barcode Reader"
15+
android:name=".QrCodeActivity">
16+
</activity>
1417
</application>
1518

1619
</manifest>

‎spsedittextview/src/main/java/com/spisoft/spsedittextview/QrCodeActivity.java

Lines changed: 20 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,36 @@
66
import android.content.pm.PackageManager;
77
import android.graphics.Color;
88
import android.hardware.Camera;
9-
import android.os.AsyncTask;
109
import android.os.Bundle;
1110
import android.os.Vibrator;
12-
import android.speech.RecognizerIntent;
1311
import android.view.Menu;
1412
import android.view.MenuItem;
1513
import android.view.View;
1614
import android.view.ViewGroup;
1715
import android.widget.LinearLayout;
18-
import android.widget.TextView;
19-
20-
import androidx.annotation.NonNull;
2116
import androidx.appcompat.app.AppCompatActivity;
2217
import androidx.core.app.ActivityCompat;
23-
24-
import com.google.android.material.snackbar.Snackbar;
25-
26-
import java.util.ArrayList;
27-
28-
import cn.bingoogolapple.photopicker.activity.BGAPhotoPickerActivity;
2918
import cn.bingoogolapple.qrcode.core.QRCodeView;
3019
import cn.bingoogolapple.qrcode.zxing.ZXingView;
3120

21+
import static android.view.View.GONE;
3222
import static com.spisoft.spsedittextview.GlobalCls.buildCounterRecDrawable;
33-
import static com.spisoft.spsedittextview.SpsEditText.RsultQrCode;
23+
import static com.spisoft.spsedittextview.SpsEditText.ResultQrCode;
3424
import static com.spisoft.spsedittextview.SpsEditText.TF_Holo;
35-
import static com.spisoft.spsedittextview.SpsEditText.activityResult;
3625

3726

3827
public class QrCodeActivity extends AppCompatActivity implements QRCodeView.Delegate {
3928

40-
private static final int MY_PERMISSION_REQUEST_CAMERA = 0;
41-
private static final int REQUEST_CODE_CHOOSE_QRCODE_FROM_GALLERY = 777;
42-
4329
private ViewGroup mainLayout;
4430
private MenuItem flashSwitchItem, cameraSwitchItem;
4531
private boolean FlashIsChecked = false;
4632
private int CurrentCamera = Camera.CameraInfo.CAMERA_FACING_BACK;
47-
private TextView TxtName, TxtPrice;
4833
private LinearLayout LlyShow;
4934
private ZXingView mZBarView;
50-
private String _Status_Code = null;
5135

5236
@Override
5337
protected void onSaveInstanceState (Bundle outState) {
5438
super.onSaveInstanceState(outState);
55-
// outState.putCharSequence(EXTRA_STATUS_BARCODE_ACTIVITY, _Status_Code);
5639
}
5740

5841
@Override
@@ -75,9 +58,8 @@ protected void onCreate(Bundle savedInstanceState) {
7558
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
7659
== PackageManager.PERMISSION_GRANTED) {
7760
initQRCodeReaderView();
78-
// } else {
79-
// requestCameraPermission();
8061
}
62+
8163
}
8264

8365
@Override
@@ -111,10 +93,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
11193
if (id == R.id.action_switch_camera) {
11294
mZBarView.stopSpot();
11395
mZBarView.stopCamera();
114-
if(CurrentCamera == Camera.CameraInfo.CAMERA_FACING_BACK)
96+
if(CurrentCamera == Camera.CameraInfo.CAMERA_FACING_BACK) {
11597
CurrentCamera = Camera.CameraInfo.CAMERA_FACING_FRONT;
116-
else
98+
flashSwitchItem.setIcon(buildCounterRecDrawable(QrCodeActivity.this, 0, R.string.ic_holo_flash_on, Color.YELLOW, 0, TF_Holo));
99+
FlashIsChecked = false;
100+
flashSwitchItem.setVisible(false);
101+
}else {
117102
CurrentCamera = Camera.CameraInfo.CAMERA_FACING_BACK;
103+
flashSwitchItem.setVisible(true);
104+
}
118105

119106
mZBarView.startCamera(CurrentCamera);
120107
mZBarView.startSpotAndShowRect();
@@ -123,60 +110,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
123110
return super.onOptionsItemSelected(item);
124111
}
125112

126-
// @Override
127-
// public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
128-
// @NonNull int[] grantResults) {
129-
// if (requestCode != MY_PERMISSION_REQUEST_CAMERA) {
130-
// return;
131-
// }
132-
//
133-
// if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
134-
// Snackbar.make(mainLayout, "Camera permission was granted.", Snackbar.LENGTH_SHORT).show();
135-
// initQRCodeReaderView();
136-
// } else {
137-
// Snackbar.make(mainLayout, "Camera permission request was denied.", Snackbar.LENGTH_SHORT).show();
138-
// }
139-
// }
140-
141-
// private void requestCameraPermission() {
142-
// if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CAMERA)) {
143-
// Snackbar.make(mainLayout, "Camera access is required to display the camera preview.",
144-
// Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() {
145-
// @Override
146-
// public void onClick(View view) {
147-
// ActivityCompat.requestPermissions(QrCodeActivity.this, new String[] {
148-
// Manifest.permission.CAMERA
149-
// }, MY_PERMISSION_REQUEST_CAMERA);
150-
// }
151-
// }).show();
152-
// } else {
153-
// Snackbar.make(mainLayout, "Permission is not available. Requesting camera permission.",
154-
// Snackbar.LENGTH_SHORT).show();
155-
// ActivityCompat.requestPermissions(this, new String[] {
156-
// Manifest.permission.CAMERA
157-
// }, MY_PERMISSION_REQUEST_CAMERA);
158-
// }
159-
// }
160-
161113
private void initQRCodeReaderView() {
162114
View content = getLayoutInflater().inflate(R.layout.content_decoder, mainLayout, true);
163115

164116
mZBarView = findViewById(R.id.zbarview);
165117
mZBarView.setDelegate(this);
166118

167119
LlyShow = content.findViewById(R.id.llyShow);
168-
TxtName = (TextView) content.findViewById(R.id.txt_name);
169-
TxtPrice = (TextView) content.findViewById(R.id.txt_price);
170-
171-
// TxtName.setTypeface(TF_BMitra);
172-
// TxtPrice.setTypeface(TF_Tahoma);
173120
}
174121

175-
// @Override
176-
// protected void onSaveInstanceState(Bundle outState) {
177-
// super.onSaveInstanceState(outState);
178-
// }
179-
180122
private void vibrate() {
181123
Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
182124
vibrator.vibrate(200);
@@ -197,37 +139,30 @@ protected void onDestroy() {
197139
@Override
198140
protected void onStart() {
199141
super.onStart();
200-
// if(_Status_Code != null) {
201-
mZBarView.getScanBoxView().setShowDefaultGridScanLineDrawable(false);
202-
mZBarView.getScanBoxView().setCustomScanLineDrawable(getResources().getDrawable(R.drawable.custom_scan_line));
203-
// mZBarView.getScanBoxView().setBarcodeRectHeight(R.dimen.sps_lpr_sz_100);
204-
mZBarView.getScanBoxView().setAutoZoom(false);
205-
// mZBarView.getScanBoxView().setRectWidth(R.dimen.sps_lpr_sz_100);
206-
mZBarView.getScanBoxView().setAnimTime(100);
207-
// mZBarView.startCamera(Camera.CameraInfo.CAMERA_FACING_FRONT);
208-
// }
209-
mZBarView.startCamera(Camera.CameraInfo.CAMERA_FACING_BACK);
142+
mZBarView.getScanBoxView().setShowDefaultGridScanLineDrawable(false);
143+
mZBarView.getScanBoxView().setCustomScanLineDrawable(getResources().getDrawable(R.drawable.custom_scan_line));
144+
mZBarView.getScanBoxView().setAutoZoom(false);
145+
mZBarView.getScanBoxView().setAnimTime(100);
146+
mZBarView.startCamera(Camera.CameraInfo.CAMERA_FACING_BACK);
210147
mZBarView.startSpotAndShowRect();
211148
}
212149

213150
@Override
214151
public void onScanQRCodeSuccess(String result) {
215152
setTitle(result);
216153
vibrate();
217-
Intent returnIntent = new Intent();
218-
returnIntent.putExtra(RsultQrCode, result);
219-
setResult(Activity.RESULT_OK, returnIntent);
220-
221-
activityResult(result);
222-
finish();
154+
Intent returnIntent = new Intent();
155+
returnIntent.putExtra(ResultQrCode, result);
156+
setResult(Activity.RESULT_OK, returnIntent);
157+
finish();
223158

224159
mZBarView.startSpot();
225160
}
226161

162+
227163
@Override
228164
public void onCameraAmbientBrightnessChanged(boolean isDark) {
229165
String tipText = mZBarView.getScanBoxView().getTipText();
230-
// String ambientBrightnessTip = "\nمحیط تاریک است، لطفا فلش را روشن کنید";
231166
String ambientBrightnessTip = "\n Please on flashlight";
232167
if (isDark) {
233168
if (!tipText.contains(ambientBrightnessTip)) {
@@ -245,21 +180,4 @@ public void onCameraAmbientBrightnessChanged(boolean isDark) {
245180
public void onScanQRCodeOpenCameraError() {
246181
}
247182

248-
// @Override
249-
// protected void onActivityResult(int requestCode, int resultCode, Intent data) {
250-
// super.onActivityResult(requestCode, resultCode, data);
251-
//
252-
// mZBarView.showScanRect();
253-
//
254-
// if (resultCode == RESULT_OK && null != data) {
255-
// ArrayList<String> result = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS);
256-
// activityResult(result.get(0));
257-
// }
258-
//
259-
// if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE_CHOOSE_QRCODE_FROM_GALLERY) {
260-
// final String picturePath = BGAPhotoPickerActivity.getSelectedPhotos(data).get(0);
261-
// mZBarView.decodeQRCode(picturePath);
262-
// }
263-
// }
264-
265183
}

0 commit comments

Comments
 (0)