From 14ccc39bfd07704db5240910741ae2b9650d0bc8 Mon Sep 17 00:00:00 2001 From: mazengfei <331023091@qq.com> Date: Thu, 4 Jun 2026 11:22:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(config):=20=E6=9B=B4=E6=96=B0=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E9=85=8D=E7=BD=AE=E5=92=8C=E8=AE=BE=E5=A4=87=E6=96=B9?= =?UTF-8?q?=E5=90=91=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在InitActivity中添加竖屏显示配置 - 注释掉BaseActivity中的动态屏幕方向逻辑 - 修改应用ID为com.shuwei.dish.match.new - 将应用名称从菜品配比终端改为配比秤新 - 恢复称重设备端口为/dev/ttyS4 --- app/build.gradle.kts | 2 +- app/src/main/AndroidManifest.xml | 1 + .../main/java/com/shuwei/dish/match/base/BaseActivity.kt | 8 ++++---- .../main/java/com/shuwei/dish/match/utils/Weigher2.java | 4 ++-- app/src/main/res/values/strings.xml | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 44465cd..6693815 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -16,7 +16,7 @@ android { compileSdk = 36 defaultConfig { - applicationId = "com.shuwei.dish.match" + applicationId = "com.shuwei.dish.match.new" minSdk = 29 targetSdk = 36 versionCode = 1 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 74063f3..1ada003 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -46,6 +46,7 @@ android:name=".ui.InitActivity" android:exported="true" android:launchMode="singleTask" + android:screenOrientation="portrait" android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboardHidden|keyboard|navigation|uiMode|locale|layoutDirection|fontScale|density" tools:ignore="DiscouragedApi,LockedOrientationActivity"> diff --git a/app/src/main/java/com/shuwei/dish/match/base/BaseActivity.kt b/app/src/main/java/com/shuwei/dish/match/base/BaseActivity.kt index 5ede779..86b4724 100644 --- a/app/src/main/java/com/shuwei/dish/match/base/BaseActivity.kt +++ b/app/src/main/java/com/shuwei/dish/match/base/BaseActivity.kt @@ -51,10 +51,10 @@ open class BaseActivity : AppCompatActivity() { // 提前隐藏系统栏，避免窗口创建时导航栏闪烁 hideSystemBars() // 主设备竖屏，子设备横屏 - requestedOrientation = if (GlobalData.deviceRole == DeviceRole.MASTER) - ActivityInfo.SCREEN_ORIENTATION_PORTRAIT - else - ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE +// requestedOrientation = if (GlobalData.deviceRole == DeviceRole.MASTER) +// ActivityInfo.SCREEN_ORIENTATION_PORTRAIT +// else +// ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE ActivityManager.addActivity(this) binding = ActivityBaseBinding.inflate(layoutInflater) if (this !is InitActivity || GlobalData.deviceRole == DeviceRole.SLAVE) { diff --git a/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java b/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java index d702508..19ccbd9 100644 --- a/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java +++ b/app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java @@ -26,8 +26,8 @@ public class Weigher2 { public static final int ERR_004 = 1004; public static final int ERR_PCB_NOT_SUPPORT = 2000; private static FixedSensorScale mSensorScale; -// private static String mDevicePort = "/dev/ttyS4"; - private static String mDevicePort = "/dev/ttyS7"; + private static String mDevicePort = "/dev/ttyS4"; +// private static String mDevicePort = "/dev/ttyS7"; private static boolean mConnect = false; private static Listener mListener; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dbc8f79..bfc8f12 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - 菜品配比终端 + 配比秤新 dish_match_terminal 菜品配比终端 选择菜品模式