eric/aerologic-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: 手机适配分支 feature/phone-ui-adaptation 合入 main，平板与 5.5 寸手机统一在主干开发

Browse Source 
合并原则：业务层以 main 平板为准，手机端只做 UI 适配。
- 冲突布局：平板改动三方合并进 layout-sw600dp/，手机布局保留并补齐主干新增业务
- Bean/ViewModel 冲突取平板业务逻辑（计重托盘联动、开始计重运抵重量自动计算、
  出港查询 dateState、仓库入/出库件数重量、清仓备注等），手机仅保留展示字段
- 主干新功能同步到手机：运抵海关放行/分单号筛选/回执走 getResponse、删除申报；
  出库交接装机状态与允许装机/配运；出港移库详情与编辑共用 IntExpMoveEditActivity；
  出入港仓库清仓备注、出库弹框件数重量、进港仓库 pcLabel；ULD 所在港/位置
- 新增手机变体：出库/入库/清仓/配运/删除申报弹框、移库详情编辑页、海关回执页；
  PhoneBottomBar 增次操作按钮
- 手机对齐平板：去掉 likeNo 与平板没有的筛选入参、恢复平板默认查询日期，
  补齐平板表单/筛选项与操作入口；移除手机专属 IntExpMoveDetailActivity
- CLAUDE.md 记录单分支约定与「业务以平板为准」规则，CHANGELOG 补合并记录

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
YANG JIANKUAN
2026-10-11 21:20:03 -07:00
parent 871fa4c5ce 42647c2136
commit 131eb031ba
356 changed files with 44711 additions and 13385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
module_hangban/src/main/debug/AndroidManifest.xml
View File

@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.lukouguoji.hangban">
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Aerologic">
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="userLandscape"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.lukouguoji.hangban">
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Aerologic">
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="unspecified"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>

64
module_hangban/src/main/release/AndroidManifest.xml
View File

@@ -1,33 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.lukouguoji.hangban">
<application>
<activity
android:name=".activity.HangBanQueryInfoActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="userLandscape"
android:exported="false" />
<activity
android:name=".activity.HangBanQueryActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="userLandscape"
android:exported="false" />
<activity
android:name=".page.query.list.HbQueryListActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="userLandscape"
android:exported="false" />
<activity
android:name=".page.edit.HbFlightEditActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="userLandscape"
android:exported="false" />
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="userLandscape"
android:exported="true" />
</application>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.lukouguoji.hangban">
<application>
<activity
android:name=".activity.HangBanQueryInfoActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="unspecified"
android:exported="false" />
<activity
android:name=".activity.HangBanQueryActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="unspecified"
android:exported="false" />
<activity
android:name=".page.query.list.HbQueryListActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="unspecified"
android:exported="false" />
<activity
android:name=".page.edit.HbFlightEditActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="unspecified"
android:exported="false" />
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden"
android:screenOrientation="unspecified"
android:exported="true" />
</application>
</manifest>