|
|
@@ -124,43 +124,43 @@ public class OperationPresenter extends BasePresenter<IOperationView> {
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
- /*.filter(base64String -> {
|
|
|
- // 图片base64不为空才继续,否则直接忽略,没有任何回调会被调用
|
|
|
- return !TextUtils.isEmpty(base64String);
|
|
|
- })*/
|
|
|
- .flatMap(photoBase64 -> {
|
|
|
- Map<String, Object> requestParams = new HashMap<>();
|
|
|
- requestParams.put("request_id", "035992000119071904311742_" + DateTool.getRequestId());
|
|
|
- requestParams.put("appid", "10233937");
|
|
|
- requestParams.put("image", photoBase64);
|
|
|
- Map<String, Object> options = new HashMap<>();
|
|
|
- options.put("scene", scene);
|
|
|
- requestParams.put("options", options);
|
|
|
-
|
|
|
- // 发送识别请求
|
|
|
- return RetrofitHelper.getInstance()
|
|
|
- .getRequestApi(ApiService.class)
|
|
|
- .getOcrResult(requestParams);
|
|
|
- })
|
|
|
- .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
|
|
|
- .subscribe(new BaseObserver<OcrResult>() {
|
|
|
- @Override
|
|
|
- public void onSuccess(OcrResult result) {
|
|
|
- if (getView() != null) {
|
|
|
- getView().dismissLoading();
|
|
|
- getView().onOcrResult(result);
|
|
|
- }
|
|
|
- }
|
|
|
+ /*.filter(base64String -> {
|
|
|
+ // 图片base64不为空才继续,否则直接忽略,没有任何回调会被调用
|
|
|
+ return !TextUtils.isEmpty(base64String);
|
|
|
+ })*/
|
|
|
+ .flatMap(photoBase64 -> {
|
|
|
+ Map<String, Object> requestParams = new HashMap<>();
|
|
|
+ requestParams.put("request_id", "035992000119071904311742_" + DateTool.getRequestId());
|
|
|
+ requestParams.put("appid", "10233937");
|
|
|
+ requestParams.put("image", photoBase64);
|
|
|
+ Map<String, Object> options = new HashMap<>();
|
|
|
+ options.put("scene", scene);
|
|
|
+ requestParams.put("options", options);
|
|
|
+
|
|
|
+ // 发送识别请求
|
|
|
+ return RetrofitHelper.getInstance()
|
|
|
+ .getRequestApi(ApiService.class)
|
|
|
+ .getOcrResult(requestParams);
|
|
|
+ })
|
|
|
+ .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
|
|
|
+ .subscribe(new BaseObserver<OcrResult>() {
|
|
|
+ @Override
|
|
|
+ public void onSuccess(OcrResult result) {
|
|
|
+ if (getView() != null) {
|
|
|
+ getView().dismissLoading();
|
|
|
+ getView().onOcrResult(result);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- @Override
|
|
|
- public void onFailure(Throwable e, String errMsg) {
|
|
|
- // 装饰器模式
|
|
|
- if (getView() != null) {
|
|
|
- getView().dismissLoading();
|
|
|
- getView().onOcrResult(null);
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
+ @Override
|
|
|
+ public void onFailure(Throwable e, String errMsg) {
|
|
|
+ // 装饰器模式
|
|
|
+ if (getView() != null) {
|
|
|
+ getView().dismissLoading();
|
|
|
+ getView().onOcrResult(null);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
public void startOcrFromFile(Context context, byte[] rawPhotoBytes, int[] rectData, File file, String scene, boolean isScreenLandscape) {
|
|
|
@@ -274,43 +274,43 @@ public class OperationPresenter extends BasePresenter<IOperationView> {
|
|
|
}
|
|
|
}
|
|
|
})
|
|
|
- /*.filter(base64String -> {
|
|
|
- // 图片base64不为空才继续,否则直接忽略,没有任何回调会被调用
|
|
|
- return !TextUtils.isEmpty(base64String);
|
|
|
- })*/
|
|
|
- .flatMap(photoBase64 -> {
|
|
|
- Map<String, Object> requestParams = new HashMap<>();
|
|
|
- requestParams.put("request_id", "035992000119071904311742_" + DateTool.getRequestId());
|
|
|
- requestParams.put("appid", "10233937");
|
|
|
- requestParams.put("image", photoBase64);
|
|
|
- Map<String, Object> options = new HashMap<>();
|
|
|
- options.put("scene", scene);
|
|
|
- requestParams.put("options", options);
|
|
|
-
|
|
|
- // 发送识别请求
|
|
|
- return RetrofitHelper.getInstance()
|
|
|
- .getRequestApi(ApiService.class)
|
|
|
- .getOcrResult(requestParams);
|
|
|
- })
|
|
|
- .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
|
|
|
- .subscribe(new BaseObserver<OcrResult>() {
|
|
|
- @Override
|
|
|
- public void onSuccess(OcrResult result) {
|
|
|
- if (getView() != null) {
|
|
|
- getView().dismissLoading();
|
|
|
- getView().onOcrResult(result);
|
|
|
- }
|
|
|
- }
|
|
|
+ /*.filter(base64String -> {
|
|
|
+ // 图片base64不为空才继续,否则直接忽略,没有任何回调会被调用
|
|
|
+ return !TextUtils.isEmpty(base64String);
|
|
|
+ })*/
|
|
|
+ .flatMap(photoBase64 -> {
|
|
|
+ Map<String, Object> requestParams = new HashMap<>();
|
|
|
+ requestParams.put("request_id", "035992000119071904311742_" + DateTool.getRequestId());
|
|
|
+ requestParams.put("appid", "10233937");
|
|
|
+ requestParams.put("image", photoBase64);
|
|
|
+ Map<String, Object> options = new HashMap<>();
|
|
|
+ options.put("scene", scene);
|
|
|
+ requestParams.put("options", options);
|
|
|
+
|
|
|
+ // 发送识别请求
|
|
|
+ return RetrofitHelper.getInstance()
|
|
|
+ .getRequestApi(ApiService.class)
|
|
|
+ .getOcrResult(requestParams);
|
|
|
+ })
|
|
|
+ .subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread())
|
|
|
+ .subscribe(new BaseObserver<OcrResult>() {
|
|
|
+ @Override
|
|
|
+ public void onSuccess(OcrResult result) {
|
|
|
+ if (getView() != null) {
|
|
|
+ getView().dismissLoading();
|
|
|
+ getView().onOcrResult(result);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- @Override
|
|
|
- public void onFailure(Throwable e, String errMsg) {
|
|
|
- // 装饰器模式
|
|
|
- if (getView() != null) {
|
|
|
- getView().dismissLoading();
|
|
|
- getView().onOcrResult(null);
|
|
|
- }
|
|
|
- }
|
|
|
- });
|
|
|
+ @Override
|
|
|
+ public void onFailure(Throwable e, String errMsg) {
|
|
|
+ // 装饰器模式
|
|
|
+ if (getView() != null) {
|
|
|
+ getView().dismissLoading();
|
|
|
+ getView().onOcrResult(null);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
|