Merge pull request #487 from WinterGeng/gbd_android

[Android] Update fastdeploy Android app ui module
PaddlePaddle · Nov 8, 2022 · 8a0b650 · 8a0b650
2 parents 5e75457 + 16dd478
commit 8a0b650
Show file tree

Hide file tree

Showing 26 changed files with 1,221 additions and 406 deletions.
diff --git a/java/android/app/src/main/AndroidManifest.xml b/java/android/app/src/main/AndroidManifest.xml
@@ -15,14 +15,14 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.baidu.paddle.fastdeploy.app.examples.ocr.MainActivity">
+        <activity android:name=".ocr.OcrMainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
-            android:name="com.baidu.paddle.fastdeploy.app.examples.ocr.SettingsActivity"
+            android:name=".ocr.OcrSettingsActivity"
             android:label="Settings">
         </activity>
     </application>

diff --git a/...c/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java b/...c/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/DetectionMainActivity.java
diff --git a/.../examples/detection/SettingsActivity.java → .../detection/DetectionSettingsActivity.java b/.../examples/detection/SettingsActivity.java → .../detection/DetectionSettingsActivity.java
@@ -10,15 +10,15 @@
 import android.support.v7.app.ActionBar;
 
 import com.baidu.paddle.fastdeploy.app.examples.R;
-import com.baidu.paddle.fastdeploy.app.ui.AppCompatPreferenceActivity;
+import com.baidu.paddle.fastdeploy.app.ui.view.AppCompatPreferenceActivity;
 import com.baidu.paddle.fastdeploy.app.ui.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class SettingsActivity extends AppCompatPreferenceActivity implements
+public class DetectionSettingsActivity extends AppCompatPreferenceActivity implements
         SharedPreferences.OnSharedPreferenceChangeListener {
-    private static final String TAG = SettingsActivity.class.getSimpleName();
+    private static final String TAG = DetectionSettingsActivity.class.getSimpleName();
 
     static public int selectedModelIdx = -1;
     static public String modelDir = "";
@@ -46,7 +46,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // addPreferencesFromResource(R.xml.settings);
         addPreferencesFromResource(R.xml.detection_settings);
         ActionBar supportActionBar = getSupportActionBar();
         if (supportActionBar != null) {

diff --git a/...id/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/MainActivity.java b/...id/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection/MainActivity.java