From 7ec2d3916ac6b8073ed8f3b441f8cd4407872f14 Mon Sep 17 00:00:00 2001 From: TaiwanStar Developer Date: Tue, 16 Jun 2026 09:51:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E5=AF=A6=E4=BD=9C=E9=A6=96?= =?UTF-8?q?=E9=A0=81=E6=A9=9F=E5=8F=B0=E8=B3=87=E8=A8=8A=E5=88=97=EF=BC=8C?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E7=B6=B2=E8=B7=AF=E3=80=81=E6=BA=AB=E5=BA=A6?= =?UTF-8?q?=E5=8F=8A=E5=A4=9A=E5=9C=8B=E8=AA=9E=E8=A8=80=E5=88=87=E6=8F=9B?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smartdevice/ui/FontendActivity.java | 16 +++ .../res/drawable/device_thermostat_24.xml | 9 ++ app/src/main/res/drawable/language_24.xml | 9 ++ .../res/drawable/network_wifi_1_bar_24.xml | 13 ++ app/src/main/res/drawable/network_wifi_24.xml | 9 ++ .../res/drawable/network_wifi_2_bar_24.xml | 13 ++ .../res/drawable/network_wifi_3_bar_24.xml | 13 ++ .../res/drawable/signal_cellular_0_bar_24.xml | 10 ++ .../res/drawable/signal_cellular_1_bar_24.xml | 13 ++ .../res/drawable/signal_cellular_2_bar_24.xml | 13 ++ .../res/drawable/signal_cellular_3_bar_24.xml | 13 ++ .../res/drawable/signal_cellular_4_bar_24.xml | 9 ++ app/src/main/res/layout/activity_fontend.xml | 117 ++++++++++++++++-- 13 files changed, 249 insertions(+), 8 deletions(-) create mode 100644 app/src/main/res/drawable/device_thermostat_24.xml create mode 100644 app/src/main/res/drawable/language_24.xml create mode 100644 app/src/main/res/drawable/network_wifi_1_bar_24.xml create mode 100644 app/src/main/res/drawable/network_wifi_24.xml create mode 100644 app/src/main/res/drawable/network_wifi_2_bar_24.xml create mode 100644 app/src/main/res/drawable/network_wifi_3_bar_24.xml create mode 100644 app/src/main/res/drawable/signal_cellular_0_bar_24.xml create mode 100644 app/src/main/res/drawable/signal_cellular_1_bar_24.xml create mode 100644 app/src/main/res/drawable/signal_cellular_2_bar_24.xml create mode 100644 app/src/main/res/drawable/signal_cellular_3_bar_24.xml create mode 100644 app/src/main/res/drawable/signal_cellular_4_bar_24.xml diff --git a/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java b/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java index 5ae3a4c..400c9d0 100644 --- a/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java +++ b/app/src/main/java/com/unibuy/smartdevice/ui/FontendActivity.java @@ -334,6 +334,11 @@ public class FontendActivity extends AppCompatActivityAbstract implements SaleFl binding.textTemperature.setText(getString(R.string.temp) + ":" + tempStr); getLogs().update("Temperature", String.valueOf(DevXinYuanController.getTemperature()), "℃"); + // 同步更新機台資訊列 + binding.textMachineInfoName.setText(MyApp.getInstance().getMachine().getMachineID()); + // 待日後動態更改：binding.textMachineInfoNetwork.setText(getString(R.string.network) + "：" + networkDevice); + binding.textMachineInfoTemperature.setText(getString(R.string.temp) + ":" + tempStr); + try { // httpAPI.detectHost(); } catch (Exception e) { @@ -387,6 +392,7 @@ public class FontendActivity extends AppCompatActivityAbstract implements SaleFl case SET_NETWORK: getLogs().info("網路：" + message); binding.textNetwork.setText(message); + // 待日後動態更改：binding.textMachineInfoNetwork.setText(message); break; case RESET_SLOTNO: new ResetSlotNo(this).start(); @@ -764,6 +770,12 @@ public class FontendActivity extends AppCompatActivityAbstract implements SaleFl binding.btnswitchlanEn.setVisibility(View.GONE); binding.btnswitchlanJa.setVisibility(View.GONE); binding.btnswitchlanTW.setOnClickListener(v -> showLanguagePicker()); + // 新增：機台資訊列的語言按鈕 + binding.textMachineInfoLang.setOnClickListener(v -> showLanguagePicker()); + // 機台資訊列一動就顯示機台 ID + binding.textMachineInfoName.setText(MyApp.getInstance().getMachine().getMachineID()); + String currentLang = LanguageHelper.getSavedLanguage(this); + binding.textMachineInfoLangText.setText(LanguageHelper.getDisplayName(currentLang)); // 🛠️ 隱藏後門：長按「網路狀態」文字 2 秒進入主控台 final Handler networkHandler = new Handler(); @@ -830,6 +842,10 @@ public class FontendActivity extends AppCompatActivityAbstract implements SaleFl binding.btnswitchlanEn.setVisibility(View.GONE); binding.btnswitchlanJa.setVisibility(View.GONE); binding.btnswitchlanTW.setOnClickListener(v -> showLanguagePicker()); + binding.textMachineInfoLang.setOnClickListener(v -> showLanguagePicker()); + binding.textMachineInfoName.setText(MyApp.getInstance().getMachine().getMachineID()); + String currentLang = LanguageHelper.getSavedLanguage(this); + binding.textMachineInfoLangText.setText(LanguageHelper.getDisplayName(currentLang)); } private void startHeaderReportScheduler() { diff --git a/app/src/main/res/drawable/device_thermostat_24.xml b/app/src/main/res/drawable/device_thermostat_24.xml new file mode 100644 index 0000000..3c067ab --- /dev/null +++ b/app/src/main/res/drawable/device_thermostat_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/language_24.xml b/app/src/main/res/drawable/language_24.xml new file mode 100644 index 0000000..64e09b4 --- /dev/null +++ b/app/src/main/res/drawable/language_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/network_wifi_1_bar_24.xml b/app/src/main/res/drawable/network_wifi_1_bar_24.xml new file mode 100644 index 0000000..f3e42fa --- /dev/null +++ b/app/src/main/res/drawable/network_wifi_1_bar_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/network_wifi_24.xml b/app/src/main/res/drawable/network_wifi_24.xml new file mode 100644 index 0000000..e758a17 --- /dev/null +++ b/app/src/main/res/drawable/network_wifi_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/network_wifi_2_bar_24.xml b/app/src/main/res/drawable/network_wifi_2_bar_24.xml new file mode 100644 index 0000000..e6babc9 --- /dev/null +++ b/app/src/main/res/drawable/network_wifi_2_bar_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/network_wifi_3_bar_24.xml b/app/src/main/res/drawable/network_wifi_3_bar_24.xml new file mode 100644 index 0000000..882112b --- /dev/null +++ b/app/src/main/res/drawable/network_wifi_3_bar_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/signal_cellular_0_bar_24.xml b/app/src/main/res/drawable/signal_cellular_0_bar_24.xml new file mode 100644 index 0000000..3784091 --- /dev/null +++ b/app/src/main/res/drawable/signal_cellular_0_bar_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/signal_cellular_1_bar_24.xml b/app/src/main/res/drawable/signal_cellular_1_bar_24.xml new file mode 100644 index 0000000..a5a503e --- /dev/null +++ b/app/src/main/res/drawable/signal_cellular_1_bar_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/signal_cellular_2_bar_24.xml b/app/src/main/res/drawable/signal_cellular_2_bar_24.xml new file mode 100644 index 0000000..92b4343 --- /dev/null +++ b/app/src/main/res/drawable/signal_cellular_2_bar_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/signal_cellular_3_bar_24.xml b/app/src/main/res/drawable/signal_cellular_3_bar_24.xml new file mode 100644 index 0000000..3fa7354 --- /dev/null +++ b/app/src/main/res/drawable/signal_cellular_3_bar_24.xml @@ -0,0 +1,13 @@ + + + + diff --git a/app/src/main/res/drawable/signal_cellular_4_bar_24.xml b/app/src/main/res/drawable/signal_cellular_4_bar_24.xml new file mode 100644 index 0000000..39af85c --- /dev/null +++ b/app/src/main/res/drawable/signal_cellular_4_bar_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_fontend.xml b/app/src/main/res/layout/activity_fontend.xml index f06946a..c491597 100644 --- a/app/src/main/res/layout/activity_fontend.xml +++ b/app/src/main/res/layout/activity_fontend.xml @@ -17,6 +17,7 @@ android:orientation="horizontal" android:paddingLeft="20dp" android:paddingRight="20dp" + android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -60,7 +61,6 @@ android:id="@+id/relativeLayout" android:layout_width="match_parent" android:layout_height="0dp" - android:layout_marginTop="60dp" android:layout_marginBottom="2dp" android:background="@color/black" app:layout_constraintDimensionRatio="21:9" @@ -72,10 +72,10 @@ android:id="@+id/videoView" android:layout_width="match_parent" android:layout_height="match_parent" + app:resize_mode="zoom" app:show_subtitle_button="true" app:use_artwork="true" - app:use_controller="false" - app:resize_mode="zoom" /> + app:use_controller="false" /> + + + + + + + + + + + + + + + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/machine_info_bar" /> @@ -183,6 +280,7 @@ android:textSize="16sp" android:textStyle="bold" /> + + android:layout_marginEnd="10dp" + android:visibility="gone" /> + android:layout_marginEnd="10dp" + android:visibility="gone" /> + android:textStyle="bold" + android:visibility="gone" /> - \ No newline at end of file +