Skip to content

Commit b58c06a

Browse files
SPSpisoftSPSpisoft
committed
add control
1 parent b0c7968 commit b58c06a

File tree

10 files changed

+254
-116
lines changed

10 files changed

+254
-116
lines changed

‎app/build.gradle

+6
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,10 @@ dependencies {
2727
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
2828

2929
implementation project(path: ':spsedittextview')
30+
// compile('com.github.hotchemi:permissionsdispatcher:3.1.0')
31+
// annotationProcessor 'com.github.hotchemi:permissionsdispatcher-processor:3.1.0'
32+
// compile('com.github.hotchemi:permissionsdispatcher:3.1.0')
33+
// annotationProcessor 'com.github.hotchemi:permissionsdispatcher-processor:3.1.0'
34+
// compile('com.github.hotchemi:permissionsdispatcher:3.1.0') { exclude module: 'support-v13' }
35+
// annotationProcessor 'com.github.hotchemi:permissionsdispatcher-processor:3.1.0'
3036
}

‎app/src/main/AndroidManifest.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="com.spisoft.spedittext">
45

56
<application
@@ -8,7 +9,8 @@
89
android:label="@string/app_name"
910
android:roundIcon="@mipmap/ic_launcher_round"
1011
android:supportsRtl="true"
11-
android:theme="@style/AppTheme">
12+
android:theme="@style/AppTheme"
13+
tools:ignore="GoogleAppIndexingWarning">
1214
<activity android:name=".MainActivity">
1315
<intent-filter>
1416
<action android:name="android.intent.action.MAIN" />

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

+18
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,31 @@
22

33
import androidx.appcompat.app.AppCompatActivity;
44

5+
import android.annotation.SuppressLint;
56
import android.os.Bundle;
7+
import android.view.View;
8+
import android.widget.Toast;
9+
10+
import com.spisoft.spsedittextview.SpsEditText;
611

712
public class MainActivity extends AppCompatActivity {
813

914
@Override
1015
protected void onCreate(Bundle savedInstanceState) {
1116
super.onCreate(savedInstanceState);
1217
setContentView(R.layout.activity_main);
18+
19+
SpsEditText SET = findViewById(R.id.set);
20+
SET.SetHint("TEST");
21+
SET.SetUses(this, true, true);
22+
// SET.SetBorder(getResources().getDrawable(R.drawable.background_button_shape_1),10);
23+
View bb = SET.ButtonPlusView("AA");
24+
bb.setOnClickListener(new View.OnClickListener() {
25+
@Override
26+
public void onClick(View v) {
27+
Toast.makeText(MainActivity.this,"SSSS",Toast.LENGTH_SHORT).show();
28+
}
29+
});
30+
1331
}
1432
}

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

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
tools:context=".MainActivity">
99

1010
<com.spisoft.spsedittextview.SpsEditText
11+
android:id="@+id/set"
1112
android:layout_width="match_parent"
1213
android:layout_height="wrap_content"
1314
tools:ignore="MissingConstraints">

‎spsedittextview/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ dependencies {
3838
implementation 'cn.bingoogolapple:bga-baseadapter:1.2.9@aar'
3939
implementation 'cn.bingoogolapple:bga-flowlayout:1.0.0@aar'
4040
implementation 'com.google.android.material:material:1.0.0'
41+
implementation 'com.karumi:dexter:6.0.0'
4142
}

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

+66-75
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.os.AsyncTask;
1010
import android.os.Bundle;
1111
import android.os.Vibrator;
12+
import android.speech.RecognizerIntent;
1213
import android.view.Menu;
1314
import android.view.MenuItem;
1415
import android.view.View;
@@ -22,19 +23,22 @@
2223

2324
import com.google.android.material.snackbar.Snackbar;
2425

26+
import java.util.ArrayList;
27+
2528
import cn.bingoogolapple.photopicker.activity.BGAPhotoPickerActivity;
2629
import cn.bingoogolapple.qrcode.core.QRCodeView;
2730
import cn.bingoogolapple.qrcode.zxing.ZXingView;
2831

2932
import static com.spisoft.spsedittextview.GlobalCls.buildCounterRecDrawable;
33+
import static com.spisoft.spsedittextview.SpsEditText.RsultQrCode;
3034
import static com.spisoft.spsedittextview.SpsEditText.TF_Holo;
35+
import static com.spisoft.spsedittextview.SpsEditText.activityResult;
3136

3237

33-
public class QrCodeActivity extends AppCompatActivity
34-
implements ActivityCompat.OnRequestPermissionsResultCallback, QRCodeView.Delegate {
38+
public class QrCodeActivity extends AppCompatActivity implements QRCodeView.Delegate {
3539

3640
private static final int MY_PERMISSION_REQUEST_CAMERA = 0;
37-
private static final int REQUEST_CODE_CHOOSE_QRCODE_FROM_GALLERY = 666;
41+
private static final int REQUEST_CODE_CHOOSE_QRCODE_FROM_GALLERY = 777;
3842

3943
private ViewGroup mainLayout;
4044
private MenuItem flashSwitchItem, cameraSwitchItem;
@@ -66,32 +70,13 @@ protected void onCreate(Bundle savedInstanceState) {
6670
super.onCreate(savedInstanceState);
6771
setContentView(R.layout.activity_decoder);
6872

69-
// if (savedInstanceState == null) {
70-
// Intent mIntent = getIntent();
71-
// if(mIntent == null) {
72-
// _Status_Code = null;
73-
// } else {
74-
// _Status_Code = mIntent.getStringExtra(EXTRA_STATUS_BARCODE_ACTIVITY);
75-
// }
76-
// } else {
77-
// _Status_Code = savedInstanceState.getString(EXTRA_STATUS_BARCODE_ACTIVITY,"");
78-
// }
79-
//
80-
//
81-
// if(_Status_Code != null){
82-
// if(_Status_Code.equals(BARCPDE_READER_PLACE))
83-
// setTitle("جانمایی کالا");
84-
// if(_Status_Code.equals(BARCPDE_READER_BARCODE))
85-
// setTitle("بارکد کالا");
86-
// }
87-
8873
mainLayout = (ViewGroup) findViewById(R.id.main_layout);
8974

9075
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA)
9176
== PackageManager.PERMISSION_GRANTED) {
9277
initQRCodeReaderView();
93-
} else {
94-
requestCameraPermission();
78+
// } else {
79+
// requestCameraPermission();
9580
}
9681
}
9782

@@ -138,40 +123,40 @@ public boolean onOptionsItemSelected(MenuItem item) {
138123
return super.onOptionsItemSelected(item);
139124
}
140125

141-
@Override
142-
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
143-
@NonNull int[] grantResults) {
144-
if (requestCode != MY_PERMISSION_REQUEST_CAMERA) {
145-
return;
146-
}
147-
148-
if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
149-
Snackbar.make(mainLayout, "Camera permission was granted.", Snackbar.LENGTH_SHORT).show();
150-
initQRCodeReaderView();
151-
} else {
152-
Snackbar.make(mainLayout, "Camera permission request was denied.", Snackbar.LENGTH_SHORT).show();
153-
}
154-
}
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+
// }
155140

156-
private void requestCameraPermission() {
157-
if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CAMERA)) {
158-
Snackbar.make(mainLayout, "Camera access is required to display the camera preview.",
159-
Snackbar.LENGTH_INDEFINITE).setAction("OK", new View.OnClickListener() {
160-
@Override
161-
public void onClick(View view) {
162-
ActivityCompat.requestPermissions(QrCodeActivity.this, new String[] {
163-
Manifest.permission.CAMERA
164-
}, MY_PERMISSION_REQUEST_CAMERA);
165-
}
166-
}).show();
167-
} else {
168-
Snackbar.make(mainLayout, "Permission is not available. Requesting camera permission.",
169-
Snackbar.LENGTH_SHORT).show();
170-
ActivityCompat.requestPermissions(this, new String[] {
171-
Manifest.permission.CAMERA
172-
}, MY_PERMISSION_REQUEST_CAMERA);
173-
}
174-
}
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+
// }
175160

176161
private void initQRCodeReaderView() {
177162
View content = getLayoutInflater().inflate(R.layout.content_decoder, mainLayout, true);
@@ -212,15 +197,15 @@ protected void onDestroy() {
212197
@Override
213198
protected void onStart() {
214199
super.onStart();
215-
if(_Status_Code != null) {
200+
// if(_Status_Code != null) {
216201
mZBarView.getScanBoxView().setShowDefaultGridScanLineDrawable(false);
217202
mZBarView.getScanBoxView().setCustomScanLineDrawable(getResources().getDrawable(R.drawable.custom_scan_line));
218203
// mZBarView.getScanBoxView().setBarcodeRectHeight(R.dimen.sps_lpr_sz_100);
219-
mZBarView.getScanBoxView().setAutoZoom(true);
204+
mZBarView.getScanBoxView().setAutoZoom(false);
220205
// mZBarView.getScanBoxView().setRectWidth(R.dimen.sps_lpr_sz_100);
221206
mZBarView.getScanBoxView().setAnimTime(100);
222207
// mZBarView.startCamera(Camera.CameraInfo.CAMERA_FACING_FRONT);
223-
}
208+
// }
224209
mZBarView.startCamera(Camera.CameraInfo.CAMERA_FACING_BACK);
225210
mZBarView.startSpotAndShowRect();
226211
}
@@ -230,8 +215,10 @@ public void onScanQRCodeSuccess(String result) {
230215
setTitle(result);
231216
vibrate();
232217
Intent returnIntent = new Intent();
233-
returnIntent.putExtra("result", result);
218+
returnIntent.putExtra(RsultQrCode, result);
234219
setResult(Activity.RESULT_OK, returnIntent);
220+
221+
activityResult(result);
235222
finish();
236223

237224
mZBarView.startSpot();
@@ -240,7 +227,8 @@ public void onScanQRCodeSuccess(String result) {
240227
@Override
241228
public void onCameraAmbientBrightnessChanged(boolean isDark) {
242229
String tipText = mZBarView.getScanBoxView().getTipText();
243-
String ambientBrightnessTip = "\nمحیط تاریک است، لطفا فلش را روشن کنید";
230+
// String ambientBrightnessTip = "\nمحیط تاریک است، لطفا فلش را روشن کنید";
231+
String ambientBrightnessTip = "\n Please on flashlight";
244232
if (isDark) {
245233
if (!tipText.contains(ambientBrightnessTip)) {
246234
mZBarView.getScanBoxView().setTipText(tipText + ambientBrightnessTip);
@@ -257,18 +245,21 @@ public void onCameraAmbientBrightnessChanged(boolean isDark) {
257245
public void onScanQRCodeOpenCameraError() {
258246
}
259247

260-
@Override
261-
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
262-
super.onActivityResult(requestCode, resultCode, data);
263-
264-
mZBarView.showScanRect();
265-
266-
if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_CODE_CHOOSE_QRCODE_FROM_GALLERY) {
267-
final String picturePath = BGAPhotoPickerActivity.getSelectedPhotos(data).get(0);
268-
mZBarView.decodeQRCode(picturePath);
269-
270-
}
271-
}
272-
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+
// }
273264

274265
}

0 commit comments

Comments
 (0)