append Merge branch 'develop' into gbd_android

This commit is contained in:
DefTruth
2022-11-07 20:25:30 +08:00
committed by WinterGeng
46 changed files with 1388 additions and 298 deletions

View File

@@ -15,14 +15,14 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".detection.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=".detection.SettingsActivity"
android:name=".ocr.OcrSettingsActivity"
android:label="Settings">
</activity>
</application>