apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-04 16:22:57 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Android] change welcome page. (#792)

Browse Source 
* Remove redundant code for segmentation.

* Classification Documentation and example improvement.

* Ocr Documentation and example improvement.

* 1.detection、face、seg module add "svPreview.enableCamera();".
2.java/android add fastdepolyUi module.

* examples/vision/ to add OCRv3.

* Modify UI directory name.

* Refresh examples\vision,change OCR README.md

* Update ui module

* Update ui module

* [Android] add enableCamera method.

* [Android] add welcome page.

* [Android] add text：“Power by EasyEdge”.

* [Android] change welcome page.

Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com>
This commit is contained in:
Winter
2022-12-05 10:55:31 +08:00
committed by GitHub
parent ea0bac4061
commit 8b2f2314ca
7 changed files with 91 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
java/android/app/src/main/res/drawable/paddle_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

22
java/android/app/src/main/res/layout/classification_welcome.xml
View File

@@ -24,9 +24,9 @@
android:layout_marginTop="120dp" android:layout_marginTop="120dp"
android:background="@color/colorStartBtn" android:background="@color/colorStartBtn"
android:gravity="center" android:gravity="center"
android:text="FastDeploy-Classification" android:text="Classification"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="25sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/baidu" android:id="@+id/baidu"
@@ -35,7 +35,7 @@
android:layout_below="@id/model_text" android:layout_below="@id/model_text"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:text="百度" android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="22sp" />
@@ -45,9 +45,9 @@
android:layout_below="@id/baidu" android:layout_below="@id/baidu"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="Power by EasyEdge" android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="18sp" />
<Button <Button
@@ -56,14 +56,22 @@
android:layout_height="50dp" android:layout_height="50dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp" android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn" android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity" android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" android:textSize="22sp"
android:onClick="startActivity"/> android:onClick="startActivity"/>
<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

23
java/android/app/src/main/res/layout/detection_welcome.xml
View File

@@ -24,9 +24,9 @@
android:layout_marginTop="120dp" android:layout_marginTop="120dp"
android:background="@color/colorStartBtn" android:background="@color/colorStartBtn"
android:gravity="center" android:gravity="center"
android:text="FastDeploy-Detection" android:text="Detection"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="25sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/baidu" android:id="@+id/baidu"
@@ -35,7 +35,7 @@
android:layout_below="@id/model_text" android:layout_below="@id/model_text"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:text="百度" android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="22sp" />
@@ -45,24 +45,33 @@
android:layout_below="@id/baidu" android:layout_below="@id/baidu"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="Power by EasyEdge" android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="18sp" />
<Button <Button
android:id="@+id/start_ui_activity" android:id="@+id/start_ui_activity"
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp" android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn" android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity" android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" android:textSize="22sp"
android:onClick="startActivity"/> android:onClick="startActivity"/>
<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

22
java/android/app/src/main/res/layout/facedet_welcome.xml
View File

@@ -24,9 +24,9 @@
android:layout_marginTop="120dp" android:layout_marginTop="120dp"
android:background="@color/colorStartBtn" android:background="@color/colorStartBtn"
android:gravity="center" android:gravity="center"
android:text="FastDeploy-FaceDet" android:text="FaceDet"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="25sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/baidu" android:id="@+id/baidu"
@@ -35,7 +35,7 @@
android:layout_below="@id/model_text" android:layout_below="@id/model_text"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:text="百度" android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="22sp" />
@@ -45,9 +45,9 @@
android:layout_below="@id/baidu" android:layout_below="@id/baidu"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="Power by EasyEdge" android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="18sp" />
<Button <Button
@@ -56,14 +56,22 @@
android:layout_height="50dp" android:layout_height="50dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp" android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn" android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity" android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" android:textSize="22sp"
android:onClick="startActivity"/> android:onClick="startActivity"/>
<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

22
java/android/app/src/main/res/layout/keypointdetection_welcome.xml
View File

@@ -24,9 +24,9 @@
android:layout_marginTop="120dp" android:layout_marginTop="120dp"
android:background="@color/colorStartBtn" android:background="@color/colorStartBtn"
android:gravity="center" android:gravity="center"
android:text="FastDeploy-KeyPointDetection" android:text="KeyPointDetection"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="23sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/baidu" android:id="@+id/baidu"
@@ -35,7 +35,7 @@
android:layout_below="@id/model_text" android:layout_below="@id/model_text"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:text="百度" android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="22sp" />
@@ -45,9 +45,9 @@
android:layout_below="@id/baidu" android:layout_below="@id/baidu"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="Power by EasyEdge" android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="18sp" />
<Button <Button
@@ -56,14 +56,22 @@
android:layout_height="50dp" android:layout_height="50dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp" android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn" android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity" android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" android:textSize="22sp"
android:onClick="startActivity"/> android:onClick="startActivity"/>
<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

22
java/android/app/src/main/res/layout/ocr_welcome.xml
View File

@@ -24,9 +24,9 @@
android:layout_marginTop="120dp" android:layout_marginTop="120dp"
android:background="@color/colorStartBtn" android:background="@color/colorStartBtn"
android:gravity="center" android:gravity="center"
android:text="FastDeploy-OCR" android:text="OCR"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="25sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/baidu" android:id="@+id/baidu"
@@ -35,7 +35,7 @@
android:layout_below="@id/model_text" android:layout_below="@id/model_text"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:text="百度" android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="22sp" />
@@ -45,9 +45,9 @@
android:layout_below="@id/baidu" android:layout_below="@id/baidu"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="Power by EasyEdge" android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="18sp" />
<Button <Button
@@ -56,14 +56,22 @@
android:layout_height="50dp" android:layout_height="50dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp" android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn" android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity" android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" android:textSize="22sp"
android:onClick="startActivity"/> android:onClick="startActivity"/>
<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>

22
java/android/app/src/main/res/layout/segmentation_welcome.xml
View File

@@ -24,9 +24,9 @@
android:layout_marginTop="120dp" android:layout_marginTop="120dp"
android:background="@color/colorStartBtn" android:background="@color/colorStartBtn"
android:gravity="center" android:gravity="center"
android:text="FastDeploy-Segmentation" android:text="Segmentation"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="25sp" /> android:textSize="30sp" />
<TextView <TextView
android:id="@+id/baidu" android:id="@+id/baidu"
@@ -35,7 +35,7 @@
android:layout_below="@id/model_text" android:layout_below="@id/model_text"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="20dp" android:layout_marginTop="20dp"
android:text="百度" android:text="百度FastDeploy"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="22sp" />
@@ -45,9 +45,9 @@
android:layout_below="@id/baidu" android:layout_below="@id/baidu"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:text="Power by EasyEdge" android:text="Powered by EasyEdge"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" /> android:textSize="18sp" />
<Button <Button
@@ -56,14 +56,22 @@
android:layout_height="50dp" android:layout_height="50dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="50dp" android:layout_marginBottom="70dp"
android:background="@drawable/round_corner_btn" android:background="@drawable/round_corner_btn"
android:text="@string/start_ui_activity" android:text="@string/start_ui_activity"
android:textColor="@color/colorTextWrite" android:textColor="@color/colorTextWrite"
android:textSize="22sp" android:textSize="22sp"
android:onClick="startActivity"/> android:onClick="startActivity"/>
<ImageView
android:id="@+id/logo"
android:layout_width="95dp"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="10dp"
android:background="@drawable/paddle_logo"
android:scaleType="centerCrop" />
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>