From 3b025dcba94a77604d148265bb490e719eeaa790 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 22 Dec 2025 14:38:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json                 | 17 ++++++++-------
 src/pages/bluetooth/bluetooth.vue | 35 ++++---------------------------
 2 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index ac92300..b5eeddc 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -1,8 +1,8 @@
 {
-    "name" : "搅拌器控制",
+    "name" : "MixerControl",
     "appid" : "__UNI__0373DF9",
-    "description" : "搅拌器控制软件",
-    "versionName" : "1.1.0",
+    "description" : "MixerControl",
+    "versionName" : "1.2.0",
     "versionCode" : "100",
     "transformPx" : false,
     /* 5+App特有相关 */
@@ -55,10 +55,10 @@
             "sdkConfigs" : {},
             "icons" : {
                 "android" : {
-                    "hdpi" : "mixer.png",
-                    "xhdpi" : "mixer.png",
-                    "xxhdpi" : "mixer.png",
-                    "xxxhdpi" : "mixer.png"
+                    "hdpi" : "mixerControlE.png",
+                    "xhdpi" : "mixerControlE.png",
+                    "xxhdpi" : "mixerControlE.png",
+                    "xxxhdpi" : "mixerControlE.png"
                 }
             }
         }
@@ -85,5 +85,6 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "3"
+    "vueVersion" : "3",
+    "locale" : "en"
 }
diff --git a/src/pages/bluetooth/bluetooth.vue b/src/pages/bluetooth/bluetooth.vue
index 6ad1ec5..39084b3 100644
--- a/src/pages/bluetooth/bluetooth.vue
+++ b/src/pages/bluetooth/bluetooth.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="bluetooth-page">
     <!-- Navigation Bar -->
-    <uni-navbar title="Mixer Device Connection" :border="false" background-color="rgba(102, 126, 234, 0.9)" color="#fff" />
+    <uni-navbar title="Mixer Connection" :border="false" background-color="rgba(102, 126, 234, 0.9)" color="#fff" />
     
     <view class="bluetooth-container">
 
@@ -44,17 +44,7 @@
       </u-button>
     </view>
     
-    <!-- Preview Button -->
-    <view class="preview-button-wrapper">
-      <u-button 
-        type="success" 
-        plain
-        @click="previewMixerPage"
-      >
-        <uni-icons type="eye" color="#52c41a" size="20" style="margin-right: 8rpx;"></uni-icons>
-        Preview Mixer Page
-      </u-button>
-    </view>
+
 
 
     <!-- Device List -->
@@ -991,30 +981,13 @@ const getBLEDeviceCharacteristicsSync = (deviceId, serviceId) => {
 }
 
 // 预览控制页面（模拟设备数据）
-const previewMixerPage = () => {
-  const fakeDevice = {
-    deviceId: 'preview-fake-id',
-    name: '预览测试设备',
-    localName: 'Preview Device',
-    RSSI: -50
-  }
-  
-  const fakeBleInfo = {
-    serviceId: 'fake-service-id',
-    characteristicId: 'fake-char-id',
-    notifyCharacteristicId: 'fake-notify-id'
-  }
-  
-  const url = buildMixerPageUrl(fakeDevice, fakeBleInfo)
-  console.log('🎨 预览跳转:', url)
-  uni.navigateTo({ url })
-}
+
 
 // 构造跳转到 mixer 页面的 URL（带蓝牙信息）
 const buildMixerPageUrl = (device, bleInfo) => {
   const params = {
     deviceId: device.deviceId,
-    deviceName: encodeURIComponent(device.name || device.localName || '未命名设备')
+    deviceName: encodeURIComponent(device.name || device.localName || 'Unnamed Device')
   }
   
   // 添加蓝牙服务和特征值信息