tret2003/checker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge 12629_fix_scan_card

Browse Source
This commit is contained in:
vtretyakov
2019-04-09 22:55:36 +07:00
parent 2ac86d9fdf 062b96d98a
commit 01563aebe4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/app/src/main/java/com/dinect/checker/ScannerActivity.java
View File

@@ -131,7 +131,7 @@ public class ScannerActivity extends AppCompatActivity implements
@Override @Override
public void handleResult(Result raw) { public void handleResult(Result raw) {
handleBarcode(raw.getText()); handleBarcode(raw.getText(), SearchType.CARD);
scannerView.postDelayed(() -> scannerView.resumeCameraPreview(ScannerActivity.this), SCAN_INTERVAL_PERIOD); scannerView.postDelayed(() -> scannerView.resumeCameraPreview(ScannerActivity.this), SCAN_INTERVAL_PERIOD);
} }
@@ -182,7 +182,7 @@ public class ScannerActivity extends AppCompatActivity implements
private void initManualInput() { private void initManualInput() {
mInputField = findViewById(R.id.manual_input); mInputField = findViewById(R.id.manual_input);
mInputField.setOnEditorActionListener((v, actionId, event) -> { mInputField.setOnEditorActionListener((v, actionId, event) -> {
handleBarcode(v.getText().toString()); handleBarcode(v.getText().toString(), mSearchType);
return false; return false;
}); });
@@ -195,8 +195,8 @@ public class ScannerActivity extends AppCompatActivity implements
} }
} }
public void handleBarcode(final @NonNull String searchString) { public void handleBarcode(final @NonNull String searchString, final @NonNull SearchType searchType) {
mClient.findUser(searchString, mSearchType, new Callback() { mClient.findUser(searchString, searchType, new Callback() {
@Override @Override
public void onFailure(Call call, IOException e) { public void onFailure(Call call, IOException e) {
handleFail(searchString); handleFail(searchString);

6
ios/Runner/ScannerViewController.swift
View File

@@ -260,11 +260,11 @@ import ZXingObjC
func textFieldShouldReturn(_ textField: UITextField) -> Bool { func textFieldShouldReturn(_ textField: UITextField) -> Bool {
print("User from manual input: \(textField.text!)") print("User from manual input: \(textField.text!)")
sendResult(textField.text!) sendResult(textField.text!, buttonState)
return true return true
} }
func sendResult(_ str: String) { func sendResult(_ str: String, _ buttonState: ButtonState) {
platformChannel?.invokeMethod("findUser", arguments: [str, buttonState.searchType], result: { (result: Any?) in platformChannel?.invokeMethod("findUser", arguments: [str, buttonState.searchType], result: { (result: Any?) in
if result is FlutterError { if result is FlutterError {
print("Result is nil (ios code)"); print("Result is nil (ios code)");
@@ -423,7 +423,7 @@ import ZXingObjC
points.append(windowPointValue) points.append(windowPointValue)
} }
print("User from scanner: \(result.text)") print("User from scanner: \(result.text)")
sendResult(result.text) sendResult(result.text, ButtonState.card)
print(result.text) print(result.text)
self.capture.stop() self.capture.stop()
DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(2 * Double(NSEC_PER_SEC)) / Double(NSEC_PER_SEC), execute: {() -> Void in DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + Double(2 * Double(NSEC_PER_SEC)) / Double(NSEC_PER_SEC), execute: {() -> Void in