Merge remote-tracking branch 'origin/dygraph' into dy1

19eb7eb8 · Leif · 0afe6c32 · 03b7daa5 · 19eb7eb8 · 19eb7eb8
Commit 19eb7eb8 authored Sep 03, 2021 by Leif
20 changed files
--- a/deploy/android_demo/app/src/main/cpp/predictor_output.h
+++ b/deploy/android_demo/app/src/main/cpp/predictor_output.h
--- a/deploy/android_demo/app/src/main/cpp/preprocess.cpp
+++ b/deploy/android_demo/app/src/main/cpp/preprocess.cpp
--- a/deploy/android_demo/app/src/main/cpp/preprocess.h
+++ b/deploy/android_demo/app/src/main/cpp/preprocess.h
--- a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/AppCompatPreferenceActivity.java
+++ b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/AppCompatPreferenceActivity.java
--- a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/MainActivity.java
+++ b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/MainActivity.java
--- a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/MiniActivity.java
+++ b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/MiniActivity.java
--- a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/OCRPredictorNative.java
+++ b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/OCRPredictorNative.java
--- a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/OcrResultModel.java
+++ b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/OcrResultModel.java
--- a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/Predictor.java
+++ b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/Predictor.java
--- a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/SettingsActivity.java
+++ b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/SettingsActivity.java
--- a/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/Utils.java
+++ b/deploy/android_demo/app/src/main/java/com/baidu/paddle/lite/demo/ocr/Utils.java
--- a/deploy/android_demo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/deploy/android_demo/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
--- a/deploy/android_demo/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/deploy/android_demo/app/src/main/res/drawable/ic_launcher_background.xml
--- a/deploy/android_demo/app/src/main/res/layout/activity_main.xml
+++ b/deploy/android_demo/app/src/main/res/layout/activity_main.xml
--- a/deploy/android_demo/app/src/main/res/layout/activity_mini.xml
+++ b/deploy/android_demo/app/src/main/res/layout/activity_mini.xml
--- a/deploy/android_demo/app/src/main/res/menu/menu_action_options.xml
+++ b/deploy/android_demo/app/src/main/res/menu/menu_action_options.xml
--- a/deploy/android_demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/deploy/android_demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>
\ No newline at end of file
--- a/deploy/android_demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/deploy/android_demo/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
--- a/deploy/android_demo/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/deploy/android_demo/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/deploy/android_demo/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
+++ b/deploy/android_demo/app/src/main/res/mipmap-hdpi/ic_launcher_round.png