restaurant/DishMatch
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(config): 更新应用配置和设备方向设置

Browse Source 
- 在InitActivity中添加竖屏显示配置
- 注释掉BaseActivity中的动态屏幕方向逻辑
- 修改应用ID为com.shuwei.dish.match.new
- 将应用名称从菜品配比终端改为配比秤新
- 恢复称重设备端口为/dev/ttyS4
This commit is contained in:
mazengfei
2026-06-04 11:22:03 +08:00
parent 01ff7241cd
commit 14ccc39bfd
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle.kts
+1 -1
View File
@@ -16,7 +16,7 @@ android {
compileSdk = 36 compileSdk = 36
defaultConfig { defaultConfig {
applicationId = "com.shuwei.dish.match" applicationId = "com.shuwei.dish.match.new"
minSdk = 29 minSdk = 29
targetSdk = 36 targetSdk = 36
versionCode = 1 versionCode = 1
app/src/main/AndroidManifest.xml
+1
View File
@@ -46,6 +46,7 @@
android:name=".ui.InitActivity" android:name=".ui.InitActivity"
android:exported="true" android:exported="true"
android:launchMode="singleTask" android:launchMode="singleTask"
android:screenOrientation="portrait"
android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboardHidden|keyboard|navigation|uiMode|locale|layoutDirection|fontScale|density" android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|keyboardHidden|keyboard|navigation|uiMode|locale|layoutDirection|fontScale|density"
tools:ignore="DiscouragedApi,LockedOrientationActivity"> tools:ignore="DiscouragedApi,LockedOrientationActivity">
<intent-filter> <intent-filter>
app/src/main/java/com/shuwei/dish/match/base/BaseActivity.kt
+4 -4
View File
@@ -51,10 +51,10 @@ open class BaseActivity : AppCompatActivity() {
// 提前隐藏系统栏，避免窗口创建时导航栏闪烁 // 提前隐藏系统栏，避免窗口创建时导航栏闪烁
hideSystemBars() hideSystemBars()
// 主设备竖屏，子设备横屏 // 主设备竖屏，子设备横屏
requestedOrientation = if (GlobalData.deviceRole == DeviceRole.MASTER) // requestedOrientation = if (GlobalData.deviceRole == DeviceRole.MASTER)
ActivityInfo.SCREEN_ORIENTATION_PORTRAIT // ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
else // else
ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE // ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
ActivityManager.addActivity(this) ActivityManager.addActivity(this)
binding = ActivityBaseBinding.inflate(layoutInflater) binding = ActivityBaseBinding.inflate(layoutInflater)
if (this !is InitActivity || GlobalData.deviceRole == DeviceRole.SLAVE) { if (this !is InitActivity || GlobalData.deviceRole == DeviceRole.SLAVE) {
app/src/main/java/com/shuwei/dish/match/utils/Weigher2.java
+2 -2
View File
@@ -26,8 +26,8 @@ public class Weigher2 {
public static final int ERR_004 = 1004; public static final int ERR_004 = 1004;
public static final int ERR_PCB_NOT_SUPPORT = 2000; public static final int ERR_PCB_NOT_SUPPORT = 2000;
private static FixedSensorScale mSensorScale; private static FixedSensorScale mSensorScale;
// private static String mDevicePort = "/dev/ttyS4"; private static String mDevicePort = "/dev/ttyS4";
private static String mDevicePort = "/dev/ttyS7"; // private static String mDevicePort = "/dev/ttyS7";
private static boolean mConnect = false; private static boolean mConnect = false;
private static Listener mListener; private static Listener mListener;
app/src/main/res/values/strings.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<resources> <resources>
<string name="app_name">菜品配比终端</string> <string name="app_name">配比秤新</string>
<string name="sp_save_name">dish_match_terminal</string> <string name="sp_save_name">dish_match_terminal</string>
<string name="home_title">菜品配比终端</string> <string name="home_title">菜品配比终端</string>
<string name="home_sub_title">选择菜品模式</string> <string name="home_sub_title">选择菜品模式</string>