lvmengandClaude Sonnet 4.6
b6389be898
- 修复 getCookFoodById/deleteCookFood/markSubmittedAndDelete 查询条件缺少 dinnerType， 导致同一 foodId 跨餐次保存时误判已存在、主记录和主辅材数据丢失的问题； 查询键由三元组（canteenId+foodId+cookMode）升级为四元组（+dinnerType） - SamplingModeActivity 构建 FoodRecord 时补充 dinnerType，确保删除操作能精确定位餐次 - SubmitFoodActivity 制作中模式下从数据库加载 goodsList 时预填充调料到 adapter， isCooking=false 时同样预填充前一页面带入的调料数据 - dm_cook_food 表新增 submitState 字段（DB v13），区分手动删除与接口提交删除 - 提交成功后改用 markSubmittedAndDelete 替代 deleteCookFoodAndGoods，正确置 submitState=1 - InitActivity onDestroy 不再停止秤服务，避免进程存活期间秤数据中断 - GoodsItem.isItemClicked 统一改为 isClicked，PrepareFoodActivity 食材选中逻辑同步更新 - AndroidManifest InitActivity 增加 singleTask 及 configChanges 配置 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
143 lines
6.7 KiB
XML
143 lines
6.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools">
|
|
<!-- android:sharedUserId="android.uid.system" -->
|
|
<uses-feature android:name="android.hardware.usb.host" />
|
|
|
|
<uses-feature
|
|
android:name="android.hardware.camera"
|
|
android:required="false" />
|
|
|
|
<uses-permission android:name="android.permission.INTERNET" />
|
|
<uses-permission android:name="android.permission.CAMERA" />
|
|
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
|
|
<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
|
|
tools:ignore="ProtectedPermissions" />
|
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
|
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
|
|
tools:ignore="ScopedStorage" />
|
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
|
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
|
|
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
|
|
|
|
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
|
|
|
<supports-screens
|
|
android:anyDensity="true"
|
|
android:largeScreens="true"
|
|
android:normalScreens="true"
|
|
android:resizeable="true"
|
|
android:smallScreens="true" />
|
|
|
|
<application
|
|
android:name=".base.BaseApp"
|
|
android:allowBackup="true"
|
|
android:dataExtractionRules="@xml/data_extraction_rules"
|
|
android:fullBackupContent="@xml/backup_rules"
|
|
android:icon="@mipmap/ic_logo512"
|
|
android:label="@string/app_name"
|
|
android:networkSecurityConfig="@xml/network_security_config"
|
|
android:roundIcon="@mipmap/ic_logo512"
|
|
android:supportsRtl="true"
|
|
android:theme="@style/Theme.DishMatch"
|
|
android:usesCleartextTraffic="true">
|
|
|
|
<activity
|
|
android:name=".ui.InitActivity"
|
|
android:exported="true"
|
|
android:launchMode="singleTask"
|
|
android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboardHidden|keyboard|navigation|uiMode|locale|layoutDirection|fontScale|density"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity">
|
|
<intent-filter>
|
|
<action android:name="android.intent.action.MAIN" />
|
|
|
|
<category android:name="android.intent.category.LAUNCHER" />
|
|
</intent-filter>
|
|
</activity>
|
|
<activity android:name=".ui.HomeActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
android:screenOrientation="portrait"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
|
|
<activity
|
|
android:name=".ui.CookingModeActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
android:launchMode="singleTask"
|
|
android:screenOrientation="portrait"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
<activity
|
|
android:name=".ui.PrepareFoodActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
android:screenOrientation="portrait"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
<!-- <activity-->
|
|
<!-- android:name=".ui.DishSamplingActivity"-->
|
|
<!-- android:theme="@style/Theme.DishMatch.NoSplash"-->
|
|
<!-- android:screenOrientation="portrait"-->
|
|
<!-- tools:ignore="DiscouragedApi,LockedOrientationActivity" />-->
|
|
<activity
|
|
android:name=".ui.SamplingModeActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
android:launchMode="singleTask"
|
|
android:screenOrientation="portrait"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
<!-- <activity-->
|
|
<!-- android:name=".ui.SubmitDishActivity"-->
|
|
<!-- android:screenOrientation="portrait"-->
|
|
<!-- tools:ignore="DiscouragedApi,LockedOrientationActivity" />-->
|
|
<!-- <activity-->
|
|
<!-- android:name=".ui.DeviceSettingActivity"-->
|
|
<!-- android:launchMode="singleTask"-->
|
|
<!-- android:screenOrientation="portrait"-->
|
|
<!-- tools:ignore="DiscouragedApi,LockedOrientationActivity" />-->
|
|
<activity
|
|
android:name=".ui.FoodSearchActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
android:screenOrientation="portrait"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
<!-- <activity android:name="com.shuwei.dish.match.ui.DeviceConfigActivity"-->
|
|
<!-- android:theme="@style/Theme.DishMatch.NoSplash" />-->
|
|
<activity android:name="com.shuwei.dish.match.ui.SettingActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
android:screenOrientation="portrait"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
<activity android:name="com.shuwei.dish.match.ui.SubmitFoodActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash" />
|
|
<activity
|
|
android:name="com.shuwei.dish.match.ui.MasterScaleActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
android:screenOrientation="portrait"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
<activity
|
|
android:name="com.shuwei.dish.match.ui.SingleFragmentActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
<activity
|
|
android:name="com.shuwei.dish.match.ui.FoodRecognizeActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
android:screenOrientation="portrait"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
<activity
|
|
android:name="com.shuwei.dish.match.ui.CollectedFoodActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
android:screenOrientation="portrait"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
<activity
|
|
android:name="com.shuwei.dish.match.ui.SlaveActivity"
|
|
android:theme="@style/Theme.DishMatch.NoSplash"
|
|
android:launchMode="singleTask"
|
|
android:screenOrientation="landscape"
|
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
|
|
|
<receiver
|
|
android:name=".utils.BootReceiver"
|
|
android:enabled="true"
|
|
android:exported="true">
|
|
<intent-filter>
|
|
<action android:name="android.intent.action.BOOT_COMPLETED"/>
|
|
</intent-filter>
|
|
</receiver>
|
|
|
|
</application>
|
|
|
|
</manifest> |