Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Android] Update fastdeploy Android app ui module #487

Merged
merged 9 commits into from
Nov 8, 2022

Conversation

WinterGeng
Copy link
Contributor

1.Move EasyEdge Ui code to fastdeploy;
2.Add photo recognition, real-time recognition, album selection recognition, detail page display and other functions.

2.Add photo recognition, real-time recognition, album selection recognition, detail page display and other functions.
@CLAassistant
Copy link

CLAassistant commented Nov 3, 2022

CLA assistant check
All committers have signed the CLA.

@DefTruth DefTruth self-requested a review November 3, 2022 03:00
@DefTruth DefTruth changed the title Move EasyEdge Ui code to fastdeploy [Android] Move EasyEdge Ui code to fastdeploy Nov 3, 2022
@@ -1,6 +1,6 @@
<resources>
<!-- Default App name -->
<string name="app_name">FastDeploy PicoDet</string>
<string name="app_name">EasyEdge</string>
<!-- Other App name -->
<string name="detection_app_name">FastDeploy PicoDet</string>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里的App相关的name都先改成EasyEdge

@@ -1,6 +1,6 @@
<resources>
<!-- Default App name -->
<string name="app_name">FastDeploy PicoDet</string>
<string name="app_name">EasyEdge</string>
<!-- Other App name -->
<string name="detection_app_name">FastDeploy PicoDet</string>
<string name="ocr_app_name">FastDeploy PP-OCRv2</string>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

同上

@@ -1,163 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里是把camera也切换成新ui中的camera的吗?那原来的CameraSurfaceView是否还有必要保留?不需要的话就把原来的代码删除吧

</LinearLayout>
</com.baidu.paddle.fastdeploy.app.ui.layout.ActionBarLayout>

<!-- 时实-->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

实时,错别字

@@ -46,8 +46,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// addPreferencesFromResource(R.xml.settings);
addPreferencesFromResource(R.xml.detection_settings);
addPreferencesFromResource(R.xml.settings);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个detection的Preferences,应该从 detection_settings.xml 里读入,还是要分不同的场景 settings.xml是默认的,但是不同的examples是不同场景

@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

layout里面的布局,都统一按照examples里面的场景来命名吧,比如:

default_result_page.xml  # 默认
detection_result_page.xml # 目标检测
ocr_result_page.xml # OCR
classification_result_page.xml # 分类
....

其他 layout命名按照同样的规范修改,比如:

result_table_popvivew.xml是用于detection的,就命名成 detection_result_table_popvivew.xml

@DefTruth DefTruth changed the title [Android] Move EasyEdge Ui code to fastdeploy [Android] Update fastdeploy Android app ui module Nov 7, 2022

/**
* Created by ruanshimin on 2018/5/13.
*/
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

检查一下这些类似的注释,先不用保留,后面这些代码也可能修改

@@ -1,6 +1,6 @@
<resources>
<!-- Default App name -->
<string name="app_name">FastDeploy PicoDet</string>
<string name="app_name">EasyEdge</string>
<!-- Other App name -->
<string name="detection_app_name">FastDeploy PicoDet</string>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里的app name要改成EasyEdge

@DefTruth DefTruth merged commit 8a0b650 into PaddlePaddle:develop Nov 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants