Merge branch 'main' of http://39.98.150.180/wangming/Food-Labeling-Management-Platform

杨鑫
2 parents abb6bea5 dbc9750f
Showing 30 changed files with 2512 additions and 483 deletions
label-template-template-1773988794039 (1).json
美国版/Food Labeling Management App UniApp/src/locales/en.ts
美国版/Food Labeling Management App UniApp/src/locales/zh.ts
美国版/Food Labeling Management App UniApp/src/manifest.json
美国版/Food Labeling Management App UniApp/src/pages/labels/bluetooth.vue
美国版/Food Labeling Management App UniApp/src/pages/labels/preview.vue
美国版/Food Labeling Management App UniApp/src/pages/more/printers.vue
美国版/Food Labeling Management App UniApp/src/utils/print/bluetoothPermissions.ts
美国版/Food Labeling Management App UniApp/src/utils/print/bluetoothTool.js
美国版/Food Labeling Management App UniApp/src/utils/print/drivers/d320fax.ts
美国版/Food Labeling Management App UniApp/src/utils/print/drivers/genericTsc.ts
美国版/Food Labeling Management App UniApp/src/utils/print/drivers/gpR3.ts
美国版/Food Labeling Management App UniApp/src/utils/print/manager/driverRegistry.ts
美国版/Food Labeling Management App UniApp/src/utils/print/manager/printerManager.ts
美国版/Food Labeling Management App UniApp/src/utils/print/printerConnection.ts
美国版/Food Labeling Management App UniApp/src/utils/print/protocols/escPosBuilder.ts
美国版/Food Labeling Management App UniApp/src/utils/print/protocols/tscProtocol.ts
美国版/Food Labeling Management App UniApp/src/utils/print/types/printer.ts
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/RbacRole/RbacRoleGetOutputDto.cs
美国版/Food Labeling Management Code/Yi.Abp.Net8/module/food-labeling-us/FoodLabeling.Application.Contracts/Dtos/TeamMember/TeamMemberAssignedLocationDto.cs
+{
+  "id": "template-1773988794039",
+  "name": "未命名模板",
+  "labelType": "PRICE",
+  "unit": "inch",
+  "width": 4,
+  "height": 6,
+  "appliedLocation": "ALL",
+  "showRuler": true,
+  "showGrid": true,
+  "elements": [
+    {
+      "id": "el-1773989351080-vqc03nr",
+      "type": "IMAGE",
+      "x": 32,
+      "y": 24,
+      "width": 60,
+      "height": 60,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "src": "",
+        "scaleMode": "contain"
+      }
+    },
+    {
+      "id": "el-1773989452538-0ejrxoe",
+      "type": "TEXT_STATIC",
+      "x": 32,
+      "y": 104,
+      "width": 120,
+      "height": 24,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "text": "文本",
+        "fontFamily": "Arial",
+        "fontSize": 14,
+        "fontWeight": "normal",
+        "textAlign": "left"
+      }
+    },
+    {
+      "id": "el-1773989466493-ibbroio",
+      "type": "QRCODE",
+      "x": 32,
+      "y": 136,
+      "width": 80,
+      "height": 80,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "data": "https://example.com",
+        "errorLevel": "M"
+      }
+    },
+    {
+      "id": "el-1773989469008-f1l39qj",
+      "type": "BARCODE",
+      "x": 0,
+      "y": 224,
+      "width": 160,
+      "height": 48,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "barcodeType": "CODE128",
+        "data": "123456789",
+        "showText": true,
+        "orientation": "horizontal"
+      }
+    },
+    {
+      "id": "el-1773989473436-j7fdeh2",
+      "type": "BLANK",
+      "x": 32,
+      "y": 288,
+      "width": 48,
+      "height": 32,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {}
+    },
+    {
+      "id": "el-1773989483341-ifwcyjj",
+      "type": "TEXT_PRICE",
+      "x": 152,
+      "y": 24,
+      "width": 80,
+      "height": 24,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "text": "0.00",
+        "prefix": "￥",
+        "decimal": 2,
+        "fontFamily": "Arial",
+        "fontSize": 14,
+        "fontWeight": "bold",
+        "textAlign": "right"
+      }
+    },
+    {
+      "id": "el-1773989498031-e4d61j8",
+      "type": "IMAGE",
+      "x": 192,
+      "y": 56,
+      "width": 60,
+      "height": 60,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "src": "",
+        "scaleMode": "contain"
+      }
+    },
+    {
+      "id": "el-1773989505076-1lxccx7",
+      "type": "TEXT_PRODUCT",
+      "x": 200,
+      "y": 136,
+      "width": 120,
+      "height": 24,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "text": "商品名",
+        "fontFamily": "Arial",
+        "fontSize": 14,
+        "fontWeight": "normal",
+        "textAlign": "left"
+      }
+    },
+    {
+      "id": "el-1773989509805-ax3392v",
+      "type": "TEXT_STATIC",
+      "x": 192,
+      "y": 160,
+      "width": 120,
+      "height": 24,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "text": "文本",
+        "fontFamily": "Arial",
+        "fontSize": 14,
+        "fontWeight": "normal",
+        "textAlign": "left"
+      }
+    },
+    {
+      "id": "el-1773989512993-xt8bg7q",
+      "type": "QRCODE",
+      "x": 184,
+      "y": 184,
+      "width": 80,
+      "height": 80,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "data": "https://example.com",
+        "errorLevel": "M"
+      }
+    },
+    {
+      "id": "el-1773989525383-eji8p2s",
+      "type": "BARCODE",
+      "x": 0,
+      "y": 288,
+      "width": 160,
+      "height": 48,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "barcodeType": "CODE128",
+        "data": "123456789",
+        "showText": true,
+        "orientation": "horizontal"
+      }
+    },
+    {
+      "id": "el-1773989540159-dr2avdf",
+      "type": "NUTRITION",
+      "x": 184,
+      "y": 280,
+      "width": 200,
+      "height": 120,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "calories": 120,
+        "fat": "5g",
+        "protein": "3g",
+        "carbs": "10g",
+        "layout": "standard"
+      }
+    },
+    {
+      "id": "el-1773989549679-mcxrdnw",
+      "type": "TEXT_PRICE",
+      "x": 24,
+      "y": 352,
+      "width": 80,
+      "height": 24,
+      "rotation": "horizontal",
+      "border": "none",
+      "config": {
+        "text": "0.00",
+        "prefix": "￥",
+        "decimal": 2,
+        "fontFamily": "Arial",
+        "fontSize": 14,
+        "fontWeight": "bold",
+        "textAlign": "right"
+      }
+    }
+  ]
+}
 \ No newline at end of file
@@ -53,6 +53,11 @@ export default {
     connectFail: 'Connection failed',
     bleNotAvailable: 'Bluetooth not available',
     noDevices: 'No devices found',
+    pairedDevices: 'Paired Devices',
+    noPairedDevices: 'No paired Bluetooth devices',
+    classic: 'Classic',
+    ble: 'BLE',
+    dual: 'Dual',
     printer1: { name: 'Kitchen Printer #1', location: 'Main Kitchen' },
     printer2: { name: 'Kitchen Printer #2', location: 'Main Kitchen' },
     printer3: { name: 'Prep Area Printer', location: 'Prep Station' },
@@ -53,6 +53,11 @@ export default {
     connectFail: '连接失败',
     bleNotAvailable: '蓝牙未开启或不可用',
     noDevices: '未发现设备',
+    pairedDevices: '已配对设备',
+    noPairedDevices: '没有已配对的蓝牙设备',
+    classic: '经典',
+    ble: '低功耗',
+    dual: '双模',
     printer1: { name: '厨房打印机 #1', location: '主厨房' },
     printer2: { name: '厨房打印机 #2', location: '主厨房' },
     printer3: { name: '准备区打印机', location: '准备站' },
@@ -2,8 +2,8 @@
     "name" : "food.labeling",
     "appid" : "__UNI__1BFD76D",
     "description" : "",
-    "versionName" : "1.0.1",
-    "versionCode" : 101,
+    "versionName" : "1.0.3",
+    "versionCode" : 103,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -18,8 +18,9 @@
         },
         /* 模块配置 */
         "modules" : {
-            "Bluetooth" : {},
-            "Camera" : {}
+            "Camera" : {},
+            "Barcode" : {},
+            "Bluetooth" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -43,6 +44,10 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_SCAN\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_CONNECT\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADVERTISE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
                     "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>"
                 ]
             },
@@ -42,6 +42,20 @@
         <text class="error-text">{{ errorMsg }}</text>
       </view>
+      <view class="debug-card">
+        <text class="debug-title">Debug Status</text>
+        <text class="debug-item">Current Mode: {{ debugInfo.currentMode }}</text>
+        <text class="debug-item">Classic Module: {{ debugInfo.classicModuleReady ? 'Ready' : 'Not Ready' }}</text>
+        <text class="debug-item">Paired Count: {{ debugInfo.pairedCount }}</text>
+        <text class="debug-item">Virtual BT Printer: {{ debugInfo.foundVirtualPrinter ? 'Found' : 'Not Found' }}</text>
+        <text class="debug-item">Classic Scan: {{ debugInfo.lastClassicEvent }}</text>
+        <text class="debug-item">BLE Scan: {{ debugInfo.lastBleEvent }}</text>
+        <text v-if="debugInfo.lastBleError" class="debug-item debug-error">{{ debugInfo.lastBleError }}</text>
+        <text v-if="debugInfo.locationServiceRequired" class="debug-item debug-warn">
+          Android system Location service is OFF. Turn it on before BLE scan.
+        </text>
+      </view>
+
       <!-- Connected -->
       <view v-if="connectedDevice" class="connected-card">
         <view class="connected-header">
@@ -153,26 +167,21 @@ import AppIcon from &#39;../../components/AppIcon.vue&#39;
 import SideMenu from '../../components/SideMenu.vue'
 import LocationPicker from '../../components/LocationPicker.vue'
 import { getStatusBarHeight } from '../../utils/statusBar'
+import classicBluetooth from '../../utils/print/bluetoothTool.js'
 import {
   getPrinterType,
-  getBluetoothConnection,
-  setBluetoothConnection,
-  setBuiltinPrinter,
   clearPrinter,
-  sendToPrinter,
   type PrinterType,
 } from '../../utils/print/printerConnection'
-import { buildTestTscLabel } from '../../utils/print/tscLabelBuilder'
-
-function getClassicBluetooth () {
-  try {
-    // @ts-ignore - dynamic require for native plugin
-    const m = require('../../utils/print/bluetoothTool.js')
-    return m?.default ?? null
-  } catch {
-    return null
-  }
-}
+import { ensureBluetoothPermissions } from '../../utils/print/bluetoothPermissions'
+import {
+  connectBluetoothPrinter,
+  describeDiscoveredPrinter,
+  disconnectCurrentPrinter,
+  getCurrentPrinterSummary,
+  testPrintCurrentPrinter,
+  useBuiltinPrinter,
+} from '../../utils/print/manager/printerManager'
 const statusBarHeight = getStatusBarHeight()
 const isMenuOpen = ref(false)
@@ -181,6 +190,17 @@ const connectingId = ref(&#39;&#39;)
 const errorMsg = ref('')
 const btAdapterReady = ref(false)
 const printerType = ref<PrinterType | ''>(getPrinterType() || 'bluetooth')
+const currentPrinter = ref(getCurrentPrinterSummary())
+const debugInfo = ref({
+  currentMode: 'none',
+  classicModuleReady: false,
+  pairedCount: 0,
+  foundVirtualPrinter: false,
+  lastClassicEvent: 'idle',
+  lastBleEvent: 'idle',
+  lastBleError: '',
+  locationServiceRequired: false,
+})
 interface BtDevice {
   deviceId: string
@@ -192,14 +212,26 @@ interface BtDevice {
 const devices = ref<BtDevice[]>([])
 const discoveredIds = new Set<string>()
+function refreshCurrentPrinter () {
+  currentPrinter.value = getCurrentPrinterSummary()
+  debugInfo.value.currentMode = currentPrinter.value.type || 'none'
+}
+
+function hasPreferredClassicDeviceInList () {
+  return devices.value.some((item: any) => {
+    const name = String(item?.name || '').toLowerCase()
+    const type = String(item?.type || '').toLowerCase()
+    return name.includes('virtual bt printer') || type === 'classic' || type === 'dual'
+  })
+}
+
 const connectedDevice = computed(() => {
-  const type = getPrinterType()
-  if (printerType.value === 'builtin' && type === 'builtin') {
-    return { name: 'Built-in Printer', deviceId: 'builtin' }
+  const summary = currentPrinter.value
+  if (printerType.value === 'builtin' && summary.type === 'builtin') {
+    return { name: summary.displayName, deviceId: summary.deviceId }
   }
-  if (printerType.value === 'bluetooth' && type === 'bluetooth') {
-    const conn = getBluetoothConnection()
-    if (conn) return { name: conn.deviceName, deviceId: conn.deviceId }
+  if (printerType.value === 'bluetooth' && summary.type === 'bluetooth') {
+    return { name: summary.displayName, deviceId: summary.deviceId }
   }
   return null
 })
@@ -208,6 +240,7 @@ function switchType (type: &#39;bluetooth&#39; | &#39;builtin&#39;) {
   printerType.value = type
   if (type === 'bluetooth' && getPrinterType() === 'builtin') {
     clearPrinter()
+    refreshCurrentPrinter()
   }
 }
@@ -234,37 +267,24 @@ const initBluetooth = (): Promise&lt;void&gt; =&gt; {
   })
 }
-const startDiscovery = () => {
+const startBleScan = () => {
   uni.startBluetoothDevicesDiscovery({
     allowDuplicatesKey: false,
     success: () => {
       isScanning.value = true
       errorMsg.value = ''
+      debugInfo.value.lastBleEvent = 'scan running'
     },
     fail: (err: any) => {
-      isScanning.value = false
-      errorMsg.value = 'Scan failed: ' + (err.errMsg || 'Unknown error')
+      console.error('BLE startBluetoothDevicesDiscovery fail:', err)
+      debugInfo.value.lastBleEvent = 'scan failed'
+      debugInfo.value.lastBleError = err?.errMsg || 'BLE scan failed'
+      if (err?.errCode === 10016 || err?.code === 10016) {
+        debugInfo.value.locationServiceRequired = true
+        errorMsg.value = 'Bluetooth scan failed: Android system Location service is turned off.'
+      }
     },
   })
-  // 同时启动经典蓝牙扫描（发现 d320fax_295c 等未配对设备，不过滤任何设备）
-  // #ifdef APP-PLUS
-  const classic = getClassicBluetooth()
-  if (classic && classic.startClassicDiscovery) {
-    classic.startClassicDiscovery(
-      (dev: { name: string; deviceId: string; type: string }) => {
-        if (discoveredIds.has(dev.deviceId)) return
-        discoveredIds.add(dev.deviceId)
-        devices.value.push({
-          deviceId: dev.deviceId,
-          name: dev.name || 'Unknown',
-          type: (dev.type as BtDevice['type']) || 'classic',
-        })
-        devices.value.sort((a, b) => (b.RSSI || -100) - (a.RSSI || -100))
-      },
-      () => { /* 经典蓝牙扫描完成 */ },
-    )
-  }
-  // #endif
 }
 const stopDiscovery = () => {
@@ -274,7 +294,7 @@ const stopDiscovery = () =&gt; {
     },
   })
   // #ifdef APP-PLUS
-  const classic = getClassicBluetooth()
+  const classic = classicBluetooth
   if (classic && classic.cancelClassicDiscovery) classic.cancelClassicDiscovery()
   // #endif
 }
@@ -286,12 +306,12 @@ const onDeviceFound = (res: any) =&gt; {
     const name = (d.localName || d.name || '').trim()
     const displayName = name || 'Unknown Device'
     discoveredIds.add(d.deviceId)
-    devices.value.push({
+    devices.value.push(describeDiscoveredPrinter({
       deviceId: d.deviceId,
       name: displayName,
       RSSI: d.RSSI,
       type: 'ble',
-    })
+    }))
   }
   devices.value.sort((a, b) => (b.RSSI || -100) - (a.RSSI || -100))
 }
@@ -305,12 +325,12 @@ function mergeCachedBleDevices () {
         if (discoveredIds.has(d.deviceId)) continue
         const name = (d.localName || d.name || '').trim()
         discoveredIds.add(d.deviceId)
-        devices.value.push({
+        devices.value.push(describeDiscoveredPrinter({
           deviceId: d.deviceId,
           name: name || 'Unknown Device',
           RSSI: d.RSSI,
           type: 'ble',
-        })
+        }))
       }
       if (list.length > 0) devices.value.sort((a, b) => (b.RSSI || -100) - (a.RSSI || -100))
     },
@@ -319,60 +339,65 @@ function mergeCachedBleDevices () {
 function addPairedDevices () {
   // #ifdef APP-PLUS
-  const classic = getClassicBluetooth()
+  const classic = classicBluetooth
   if (!classic || !classic.getPairedDevices) return
   try {
     const paired = classic.getPairedDevices()
+    debugInfo.value.pairedCount = (paired || []).length
+    debugInfo.value.foundVirtualPrinter = (paired || []).some((item: any) => String(item?.name || '').toLowerCase().includes('virtual bt printer'))
     for (const p of paired) {
       if (discoveredIds.has(p.deviceId)) continue
       discoveredIds.add(p.deviceId)
-      devices.value.push({
+      devices.value.push(describeDiscoveredPrinter({
         deviceId: p.deviceId,
-        name: p.name || 'Unknown',
+        name: p.name || 'Unknown Device',
         type: p.type || 'classic',
-      })
+      }))
     }
     if (paired.length > 0) {
+      debugInfo.value.lastClassicEvent = 'paired devices loaded'
       devices.value.sort((a, b) => (b.RSSI || -100) - (a.RSSI || -100))
+    } else {
+      debugInfo.value.lastClassicEvent = 'no paired devices'
     }
   } catch (e) {
     console.error('addPairedDevices error:', e)
+    debugInfo.value.lastClassicEvent = 'load paired devices failed'
   }
   // #endif
 }
-function findWriteCharacteristic (deviceId: string): Promise<{ serviceId: string; characteristicId: string } | null> {
-  return new Promise((resolve) => {
-    uni.getBLEDeviceServices({
-      deviceId,
-      success: (sres) => {
-        const services = sres.services || []
-        const tryNext = (idx: number) => {
-          if (idx >= services.length) {
-            resolve(null)
-            return
-          }
-          const serviceId = services[idx].uuid
-          uni.getBLEDeviceCharacteristics({
-            deviceId,
-            serviceId,
-            success: (cres) => {
-              const chars = cres.characteristics || []
-              const writeChar = chars.find((c: any) => c.properties && c.properties.write)
-              if (writeChar) {
-                resolve({ serviceId, characteristicId: writeChar.uuid })
-                return
-              }
-              tryNext(idx + 1)
-            },
-            fail: () => tryNext(idx + 1),
-          })
-        }
-        tryNext(0)
-      },
-      fail: () => resolve(null),
-    })
-  })
+function startClassicScan () {
+  // #ifdef APP-PLUS
+  const classic = classicBluetooth
+  if (classic && classic.startClassicDiscovery) {
+    try {
+      classic.startClassicDiscovery(
+        (dev: { name: string; deviceId: string; type: string }) => {
+          debugInfo.value.lastClassicEvent = 'device found'
+          if (discoveredIds.has(dev.deviceId)) return
+          discoveredIds.add(dev.deviceId)
+          devices.value.push(describeDiscoveredPrinter({
+            deviceId: dev.deviceId,
+            name: dev.name || 'Unknown Device',
+            type: (dev.type as BtDevice['type']) || 'classic',
+          }))
+          devices.value.sort((a, b) => (b.RSSI || -100) - (a.RSSI || -100))
+        },
+        () => {
+          debugInfo.value.lastClassicEvent = 'scan finished'
+        },
+      )
+      isScanning.value = true
+      debugInfo.value.lastClassicEvent = 'scan running'
+    } catch (e) {
+      console.error('Classic discovery failed', e)
+      debugInfo.value.lastClassicEvent = 'scan failed'
+    }
+  } else {
+    debugInfo.value.lastClassicEvent = 'classic module unavailable'
+  }
+  // #endif
 }
 const handleScan = async () => {
@@ -383,15 +408,30 @@ const handleScan = async () =&gt; {
   errorMsg.value = ''
   devices.value = []
   discoveredIds.clear()
+  debugInfo.value.lastBleError = ''
+  debugInfo.value.locationServiceRequired = false
+  debugInfo.value.lastClassicEvent = 'starting'
+  debugInfo.value.lastBleEvent = 'starting'
+
   try {
-    if (!btAdapterReady.value) {
-      await initBluetooth()
+    const permissionResult = await ensureBluetoothPermissions({ scan: true, connect: true })
+    if (!permissionResult.ok) {
+      errorMsg.value = permissionResult.message || 'Bluetooth permission denied.'
+      return
     }
+    await initBluetooth()
+
     addPairedDevices()
-    mergeCachedBleDevices()
-    if (devices.value.length > 0) {
-      uni.showToast({ title: `Found ${devices.value.length} device(s)`, icon: 'none' })
+    startClassicScan()
+
+    if (hasPreferredClassicDeviceInList()) {
+      isScanning.value = false
+      debugInfo.value.lastBleEvent = 'skipped (paired classic device found)'
+      uni.showToast({ title: 'Using paired classic Bluetooth devices', icon: 'none' })
+      return
     }
+
+    mergeCachedBleDevices()
     await new Promise<void>((resolve) => {
       uni.getLocation({
         type: 'wgs84',
@@ -399,13 +439,15 @@ const handleScan = async () =&gt; {
         fail: () => resolve(),
       })
     })
-    startDiscovery()
+    startBleScan()
     uni.showToast({ title: 'Scanning...', icon: 'none' })
     setTimeout(() => {
       if (isScanning.value) stopDiscovery()
     }, 20000)
   } catch (_) {
-    // error set in initBluetooth
+    if (!isScanning.value && devices.value.length === 0) {
+      errorMsg.value = 'Bluetooth scan failed. Check if Bluetooth is enabled.'
+    }
   }
 }
@@ -416,77 +458,27 @@ const handleConnect = async (dev: BtDevice) =&gt; {
   if (isScanning.value) stopDiscovery()
-  // 经典蓝牙：classic、dual、unknown（部分设备如 D320FAX 可能误报为 unknown，也尝试经典连接）
-  const useClassic = dev.type === 'classic' || dev.type === 'dual' || dev.type === 'unknown'
-
-  if (useClassic) {
-    // #ifdef APP-PLUS
-    const classic = getClassicBluetooth()
-    if (classic && classic.connDevice) {
-      classic.connDevice(dev.deviceId, (ok: boolean) => {
-        connectingId.value = ''
-        if (ok) {
-          setBluetoothConnection({
-            deviceId: dev.deviceId,
-            deviceName: dev.name,
-            deviceType: 'classic',
-          })
-          uni.showToast({ title: 'Connected!', icon: 'success' })
-        } else {
-          errorMsg.value = 'Connection failed. For D320FAX, ensure Virtual BT Printer is paired in system Bluetooth.'
-        }
-      })
-    } else {
-      connectingId.value = ''
-      errorMsg.value = 'Classic Bluetooth not available. Ensure app is running on the device (not simulator).'
-    }
-    // #endif
-    // #ifndef APP-PLUS
+  const permissionResult = await ensureBluetoothPermissions({ connect: true })
+  if (!permissionResult.ok) {
     connectingId.value = ''
-    errorMsg.value = 'Classic Bluetooth requires the app.'
-    // #endif
+    errorMsg.value = permissionResult.message || 'Bluetooth permission denied.'
     return
   }
-  uni.createBLEConnection({
-    deviceId: dev.deviceId,
-    timeout: 10000,
-    success: async () => {
-      try {
-        const write = await findWriteCharacteristic(dev.deviceId)
-        if (!write) {
-          errorMsg.value = 'No writable characteristic found. This device may not support printing.'
-          connectingId.value = ''
-          return
-        }
-        setBluetoothConnection({
-          deviceId: dev.deviceId,
-          deviceName: dev.name,
-          serviceId: write.serviceId,
-          characteristicId: write.characteristicId,
-          deviceType: 'ble',
-          mtu: 20,
-        })
-        connectingId.value = ''
-        uni.showToast({ title: 'Connected!', icon: 'success' })
-      } catch (e: any) {
-        errorMsg.value = (e && e.message) ? e.message : 'Connection failed'
-        connectingId.value = ''
-      }
-    },
-    fail: (err: any) => {
-      connectingId.value = ''
-      if (err.errCode === -1) {
-        uni.showToast({ title: 'Already connected', icon: 'success' })
-      } else {
-        errorMsg.value = 'Connection failed: ' + (err.errMsg || 'Try again')
-      }
-    },
-  })
+  try {
+    await connectBluetoothPrinter(dev)
+    refreshCurrentPrinter()
+    connectingId.value = ''
+    uni.showToast({ title: 'Connected!', icon: 'success' })
+  } catch (e: any) {
+    errorMsg.value = (e && e.message) ? e.message : 'Connection failed'
+    connectingId.value = ''
+  }
 }
 const handleUseBuiltin = () => {
-  setBuiltinPrinter()
+  useBuiltinPrinter()
+  refreshCurrentPrinter()
   uni.showToast({ title: 'Using built-in printer', icon: 'success' })
 }
@@ -495,8 +487,7 @@ const handleTestPrint = async () =&gt; {
   if (testPrinting.value) return
   testPrinting.value = true
   try {
-    const data = buildTestTscLabel()
-    await sendToPrinter(data, (p) => {
+    await testPrintCurrentPrinter((p) => {
       if (p < 100) uni.showLoading({ title: `Printing ${p}%`, mask: true })
     })
     uni.hideLoading()
@@ -523,30 +514,14 @@ const handleTestPrint = async () =&gt; {
   }
 }
-const handleDisconnect = () => {
-  const type = getPrinterType()
-  const deviceId = uni.getStorageSync('btDeviceId')
-  const deviceType = uni.getStorageSync('btDeviceType')
-  if (type === 'bluetooth' && deviceType === 'classic') {
-    // #ifdef APP-PLUS
-    const classic = getClassicBluetooth()
-    if (classic && classic.disConnDevice) classic.disConnDevice()
-    // #endif
-  }
-  clearPrinter()
-  if (type === 'bluetooth' && deviceId && deviceType !== 'classic') {
-    uni.closeBLEConnection({
-      deviceId,
-      complete: () => {
-        uni.showToast({ title: 'Disconnected', icon: 'none' })
-      },
-    })
-  } else {
-    uni.showToast({ title: 'Disconnected', icon: 'none' })
-  }
+const handleDisconnect = async () => {
+  await disconnectCurrentPrinter()
+  refreshCurrentPrinter()
+  uni.showToast({ title: 'Disconnected', icon: 'none' })
 }
 onMounted(() => {
+  debugInfo.value.classicModuleReady = !!classicBluetooth
   uni.onBluetoothDeviceFound(onDeviceFound)
   uni.onBluetoothAdapterStateChange((res: any) => {
     if (!res.available) {
@@ -559,11 +534,22 @@ onMounted(() =&gt; {
     }
   })
   printerType.value = getPrinterType() || 'bluetooth'
+  refreshCurrentPrinter()
 })
 onUnmounted(() => {
   if (isScanning.value) stopDiscovery()
-  uni.offBluetoothDeviceFound()
+  try {
+    if (typeof uni.offBluetoothDeviceFound === 'function') {
+      uni.offBluetoothDeviceFound()
+    }
+  } catch (_) {}
+  try {
+    if (typeof uni.offBluetoothAdapterStateChange === 'function') {
+      uni.offBluetoothAdapterStateChange()
+    }
+  } catch (_) {}
+  uni.closeBluetoothAdapter({ complete: () => {} })
 })
 </script>
@@ -883,6 +869,37 @@ onUnmounted(() =&gt; {
   gap: 12rpx;
 }
+.debug-card {
+  background: #fff7ed;
+  border: 1rpx solid #fed7aa;
+  border-radius: 20rpx;
+  padding: 24rpx;
+  margin-bottom: 24rpx;
+  display: flex;
+  flex-direction: column;
+  gap: 8rpx;
+}
+
+.debug-title {
+  font-size: 28rpx;
+  font-weight: 700;
+  color: #9a3412;
+}
+
+.debug-item {
+  font-size: 22rpx;
+  color: #7c2d12;
+}
+
+.debug-error {
+  color: #b91c1c;
+}
+
+.debug-warn {
+  color: #92400e;
+  font-weight: 600;
+}
+
 .device-tag {
   display: inline-block;
   font-size: 20rpx;
@@ -118,8 +118,7 @@ import SideMenu from &#39;../../components/SideMenu.vue&#39;
 import LocationPicker from '../../components/LocationPicker.vue'
 import { getStatusBarHeight } from '../../utils/statusBar'
 import { generateNextLabelId } from '../../utils/printLog'
-import { getPrinterType, getBluetoothConnection, sendToPrinter } from '../../utils/print/printerConnection'
-import { buildTscLabel } from '../../utils/print/tscLabelBuilder'
+import { getCurrentPrinterSummary, printLabelForCurrentPrinter } from '../../utils/print/manager/printerManager'
 import chickenLabelImg from '../../static/chicken-lable.png'
 const statusBarHeight = getStatusBarHeight()
@@ -161,16 +160,9 @@ const displayProductName = computed(() =&gt; {
 })
 onShow(() => {
-  const type = getPrinterType()
-  const conn = type === 'bluetooth' ? getBluetoothConnection() : null
-  btConnected.value = (type === 'bluetooth' && conn) || type === 'builtin'
-  if (type === 'builtin') {
-    btDeviceName.value = 'Built-in Printer'
-  } else if (conn) {
-    btDeviceName.value = conn.deviceName || ''
-  } else {
-    btDeviceName.value = ''
-  }
+  const summary = getCurrentPrinterSummary()
+  btConnected.value = summary.type === 'bluetooth' || summary.type === 'builtin'
+  btDeviceName.value = summary.displayName || ''
 })
 interface ProductData {
@@ -245,13 +237,12 @@ const handlePrint = async () =&gt; {
   }
   isPrinting.value = true
   try {
-    const data = buildTscLabel({
+    await printLabelForCurrentPrinter({
       productName: displayProductName.value,
       labelId: labelId.value,
       printQty: printQty.value,
       extraLine: lastEdited.value,
-    })
-    await sendToPrinter(data, (percent) => {
+    }, (percent) => {
       if (percent >= 100) return
       uni.showLoading({ title: `Printing ${percent}%`, mask: true })
     })
@@ -265,8 +256,8 @@ const handlePrint = async () =&gt; {
     const msg = (e && e.message) ? e.message : 'Print failed'
     if (msg === 'BUILTIN_PLUGIN_NOT_FOUND' || (msg && msg.indexOf('Built-in printer') !== -1)) {
       uni.showModal({
-        title: 'Use Bluetooth Mode',
-        content: 'For GP-D320FAX, go to Printer settings, switch to Bluetooth mode and tap Scan to connect (e.g. d320fax_295c or Virtual BT Printer). Built-in mode needs custom app packaging.',
+        title: 'Built-in Print Not Available',
+        content: 'This device does not support TCP built-in printing. Please switch to Bluetooth mode: go to Printer Settings, tap Scan, and connect to your printer (look for a device name like "Virtual BT Printer" or your printer model). You may need to pair it first in Android Bluetooth settings.',
         confirmText: 'Printer Settings',
         cancelText: 'Cancel',
         success: (res) => {
@@ -21,6 +21,20 @@
         <text class="badge-text">{{ t('printers.connected') }}</text>
       </view>
+      <view class="debug-card">
+        <text class="debug-title">Debug Status</text>
+        <text class="debug-item">Current Mode: {{ debugInfo.currentMode }}</text>
+        <text class="debug-item">Classic Module: {{ debugInfo.classicModuleReady ? 'Ready' : 'Not Ready' }}</text>
+        <text class="debug-item">Paired Count: {{ debugInfo.pairedCount }}</text>
+        <text class="debug-item">Virtual BT Printer: {{ debugInfo.foundVirtualPrinter ? 'Found' : 'Not Found' }}</text>
+        <text class="debug-item">Classic Scan: {{ debugInfo.lastClassicEvent }}</text>
+        <text class="debug-item">BLE Scan: {{ debugInfo.lastBleEvent }}</text>
+        <text v-if="debugInfo.lastBleError" class="debug-item debug-error">{{ debugInfo.lastBleError }}</text>
+        <text v-if="debugInfo.locationServiceRequired" class="debug-item debug-warn">
+          Android system Location service is OFF. Turn it on in device settings before BLE scan.
+        </text>
+      </view>
+
       <!-- Connected Device -->
       <view v-if="currentType" class="printer-card connected">
         <view class="printer-icon"><AppIcon name="printer" size="md" color="white" /></view>
@@ -45,6 +59,29 @@
         <button class="btn-connect">{{ t('printers.connect') }}</button>
       </view>
+      <!-- Paired Devices -->
+      <!-- #ifdef APP-PLUS -->
+      <view class="section-header">
+        <text class="section-title">{{ t('printers.pairedDevices') }}</text>
+      </view>
+
+      <view v-for="d in pairedDevices" :key="'paired-' + d.deviceId" class="printer-card device-item" @click="connectBt(d)">
+        <view class="printer-icon"><AppIcon name="bluetooth" size="md" color="blue" /></view>
+        <view class="printer-info">
+          <text class="printer-name">{{ d.name || 'Unknown Device' }}</text>
+          <text class="printer-loc">{{ d.deviceId }}</text>
+        </view>
+        <view class="device-meta">
+          <text class="device-type-tag" :class="'tag-' + (d.type || 'ble')">{{ getTypeLabel(d.type) }}</text>
+          <button class="btn-connect" :disabled="isConnecting">{{ t('printers.connect') }}</button>
+        </view>
+      </view>
+
+      <view v-if="pairedDevices.length === 0" class="empty-state">
+        <text class="empty-text">{{ t('printers.noPairedDevices') }}</text>
+      </view>
+      <!-- #endif -->
+
       <!-- Bluetooth Scanning Area -->
       <view class="section-header">
         <text class="section-title">{{ t('printers.nearby') }}</text>
@@ -62,7 +99,10 @@
           <text class="printer-name">{{ d.name || 'Unknown Device' }}</text>
           <text class="printer-loc">{{ d.deviceId }}</text>
         </view>
-        <button class="btn-connect" :disabled="isConnecting">{{ t('printers.connect') }}</button>
+        <view class="device-meta">
+          <text v-if="d.type && d.type !== 'unknown'" class="device-type-tag" :class="'tag-' + d.type">{{ getTypeLabel(d.type) }}</text>
+          <button class="btn-connect" :disabled="isConnecting">{{ t('printers.connect') }}</button>
+        </view>
       </view>
       <view v-if="devices.length === 0 && !isScanning" class="empty-state">
@@ -79,178 +119,290 @@ import { ref, onMounted, onUnmounted } from &#39;vue&#39;
 import { useI18n } from 'vue-i18n'
 import AppIcon from '../../components/AppIcon.vue'
 import SideMenu from '../../components/SideMenu.vue'
+import classicBluetooth from '../../utils/print/bluetoothTool.js'
+import { ensureBluetoothPermissions } from '../../utils/print/bluetoothPermissions'
 import {
-  getPrinterType,
-  getBluetoothConnection,
-  setBluetoothConnection,
-  setBuiltinPrinter,
-  clearPrinter,
-  sendToPrinter,
-  isBuiltinConnected
-} from '../../utils/print/printerConnection'
-import { buildTestTscLabel } from '../../utils/print/tscLabelBuilder'
+  connectBluetoothPrinter,
+  describeDiscoveredPrinter,
+  disconnectCurrentPrinter,
+  getCurrentPrinterSummary,
+  testPrintCurrentPrinter,
+  useBuiltinPrinter,
+} from '../../utils/print/manager/printerManager'
 const { t } = useI18n()
 const isMenuOpen = ref(false)
-// 状态管理
-const currentType = ref(getPrinterType())
-const currentBt = ref(getBluetoothConnection())
+const currentType = ref<'' | 'bluetooth' | 'builtin'>('')
+const currentBt = ref<any>(null)
 const isScanning = ref(false)
 const devices = ref<any[]>([])
+const pairedDevices = ref<any[]>([])
 const isConnecting = ref(false)
+const debugInfo = ref({
+  currentMode: 'none',
+  classicModuleReady: false,
+  pairedCount: 0,
+  foundVirtualPrinter: false,
+  lastClassicEvent: 'idle',
+  lastBleEvent: 'idle',
+  lastBleError: '',
+  locationServiceRequired: false,
+})
+let bleListenerRegistered = false
-// Refresh current state
 const refreshStatus = () => {
-  currentType.value = getPrinterType()
-  currentBt.value = getBluetoothConnection()
+  const summary = getCurrentPrinterSummary()
+  currentType.value = summary.type
+  debugInfo.value.currentMode = summary.type || 'none'
+  currentBt.value = summary.type === 'bluetooth'
+    ? {
+        deviceName: summary.displayName,
+        deviceId: summary.deviceId,
+        deviceType: summary.deviceType,
+        driverName: summary.driverName,
+        protocol: summary.protocol,
+      }
+    : null
+}
+
+const getTypeLabel = (type?: string) => {
+  switch (type) {
+    case 'classic': return t('printers.classic')
+    case 'ble': return t('printers.ble')
+    case 'dual': return t('printers.dual')
+    default: return t('printers.ble')
+  }
+}
+
+const normalizeDeviceName = (device: any) => {
+  return (device?.localName || device?.name || '').trim() || 'Unknown Device'
+}
+
+const hasPreferredClassicDevice = () => {
+  return pairedDevices.value.some((item: any) => {
+    const name = String(item?.name || '').toLowerCase()
+    const type = String(item?.type || '').toLowerCase()
+    return name.includes('virtual bt printer') || type === 'classic' || type === 'dual'
+  })
+}
+
+const addDeviceDedup = (device: any) => {
+  const described = describeDiscoveredPrinter(device)
+  const existing = devices.value.find(d => d.deviceId === device.deviceId)
+  if (!existing) {
+    devices.value.push(described)
+    return
+  }
+  Object.assign(existing, described)
+}
+
+// #ifdef APP-PLUS
+const loadPairedDevices = () => {
+  try {
+    const list = classicBluetooth.getPairedDevices()
+    debugInfo.value.pairedCount = (list || []).length
+    debugInfo.value.foundVirtualPrinter = (list || []).some((item: any) => String(item?.name || '').toLowerCase().includes('virtual bt printer'))
+    pairedDevices.value = (list || []).map((item: any) => ({
+      ...describeDiscoveredPrinter(item),
+      name: normalizeDeviceName(item),
+    }))
+    debugInfo.value.lastClassicEvent = pairedDevices.value.length > 0 ? 'paired devices loaded' : 'no paired devices'
+  } catch (e) {
+    console.error('Failed to load paired devices', e)
+    pairedDevices.value = []
+    debugInfo.value.pairedCount = 0
+    debugInfo.value.foundVirtualPrinter = false
+    debugInfo.value.lastClassicEvent = 'load paired devices failed'
+  }
 }
+// #endif
-// 蓝牙搜索
-const startScan = () => {
+function mergeCachedBleDevices () {
+  uni.getBluetoothDevices({
+    success: (res: any) => {
+      const list = res.devices || []
+      list.forEach((device: any) => {
+        addDeviceDedup({
+          ...device,
+          name: normalizeDeviceName(device),
+          type: device.type || 'ble',
+        })
+      })
+    },
+  })
+}
+
+const startScan = async () => {
   if (isScanning.value) return
-  
+
   devices.value = []
-  isScanning.value = true
-  
+  debugInfo.value.lastBleError = ''
+  debugInfo.value.locationServiceRequired = false
+  debugInfo.value.lastClassicEvent = 'starting'
+  debugInfo.value.lastBleEvent = 'starting'
+
+  const permissionResult = await ensureBluetoothPermissions({ scan: true, connect: true })
+  if (!permissionResult.ok) {
+    uni.showToast({ title: permissionResult.message || t('printers.bleNotAvailable'), icon: 'none' })
+    return
+  }
+
   uni.openBluetoothAdapter({
     success: () => {
+      // #ifdef APP-PLUS
+      loadPairedDevices()
+      try {
+        classicBluetooth.startClassicDiscovery(
+          (device: any) => {
+            debugInfo.value.lastClassicEvent = 'device found'
+            addDeviceDedup({
+              ...device,
+              name: normalizeDeviceName(device),
+            })
+          },
+          () => {
+            debugInfo.value.lastClassicEvent = 'scan finished'
+          }
+        )
+        debugInfo.value.lastClassicEvent = 'scan running'
+      } catch (e) {
+        console.error('Classic discovery failed', e)
+        debugInfo.value.lastClassicEvent = 'scan failed'
+      }
+      // #endif
+      isScanning.value = true
+
+      if (hasPreferredClassicDevice()) {
+        debugInfo.value.lastBleEvent = 'skipped (paired classic device found)'
+        return
+      }
+
+      mergeCachedBleDevices()
+      if (!bleListenerRegistered) {
+        bleListenerRegistered = true
+        uni.onBluetoothDeviceFound((res) => {
+          res.devices.forEach(device => {
+            addDeviceDedup({
+              ...device,
+              name: normalizeDeviceName(device),
+              type: 'ble',
+            })
+          })
+        })
+      }
       uni.startBluetoothDevicesDiscovery({
         allowDuplicatesKey: false,
         success: () => {
-          uni.onBluetoothDeviceFound((res) => {
-            res.devices.forEach(device => {
-              if (device.name && !devices.value.find(d => d.deviceId === device.deviceId)) {
-                devices.value.push(device)
-              }
-            })
-          })
+          debugInfo.value.lastBleEvent = 'scan running'
         },
         fail: (err) => {
-          isScanning.value = false
-          uni.showToast({ title: t('printers.bleNotAvailable'), icon: 'none' })
+          console.error('BLE startBluetoothDevicesDiscovery fail:', err)
+          debugInfo.value.lastBleEvent = 'scan failed'
+          debugInfo.value.lastBleError = err?.errMsg || 'BLE scan failed'
+          if (err?.errCode === 10016 || err?.code === 10016) {
+            debugInfo.value.locationServiceRequired = true
+            debugInfo.value.lastBleError = 'BLE scan failed: system Location service is turned off.'
+            uni.showToast({
+              title: 'Turn on system Location service first',
+              icon: 'none',
+              duration: 2500,
+            })
+          }
         }
       })
     },
     fail: (err) => {
-      isScanning.value = false
-      uni.showToast({ title: t('printers.bleNotAvailable'), icon: 'none' })
+      console.error('openBluetoothAdapter fail:', err)
+      if (devices.value.length === 0 && pairedDevices.value.length === 0) {
+        uni.showToast({ title: t('printers.bleNotAvailable'), icon: 'none' })
+      }
     }
   })
 }
 const stopScan = () => {
   isScanning.value = false
+  debugInfo.value.lastClassicEvent = 'stopped'
+  debugInfo.value.lastBleEvent = 'stopped'
   uni.stopBluetoothDevicesDiscovery({
-    success: () => console.log('Stop scan success'),
-    fail: (err) => console.error('Stop scan fail', err)
+    success: () => console.log('Stop BLE scan success'),
+    fail: (err) => console.error('Stop BLE scan fail', err)
   })
+  // #ifdef APP-PLUS
+  try {
+    classicBluetooth.cancelClassicDiscovery()
+  } catch (e) {
+    console.error('Cancel classic discovery failed', e)
+  }
+  // #endif
 }
-// 连接蓝牙设备
-const connectBt = (device: any) => {
+const connectBt = async (device: any) => {
   if (isConnecting.value) return
   isConnecting.value = true
   stopScan()
-  
-  uni.showLoading({ title: t('printers.connecting') })
-  
-  uni.createBLEConnection({
-    deviceId: device.deviceId,
-    success: () => {
-      uni.getBLEDeviceServices({
-        deviceId: device.deviceId,
-        success: (res) => {
-          // 这里简化处理：寻找第一个包含写权限的特征值
-          // 实际项目中可能需要根据特定 UUID 匹配，官方示例中是遍历寻找
-          findWriteCharacteristic(device.deviceId, res.services, device.name)
-        },
-        fail: (err) => {
-          isConnecting.value = false
-          uni.hideLoading()
-          uni.showToast({ title: t('printers.connectFail'), icon: 'none' })
-        }
-      })
-    },
-    fail: (err) => {
-      isConnecting.value = false
-      uni.hideLoading()
-      uni.showToast({ title: t('printers.connectFail'), icon: 'none' })
-    }
-  })
-}
-const findWriteCharacteristic = (deviceId: string, services: any[], deviceName: string) => {
-  let found = false
-  let serviceIdx = 0
-  
-  const nextService = () => {
-    if (serviceIdx >= services.length || found) {
-      if (!found) {
-        isConnecting.value = false
-        uni.hideLoading()
-        uni.showToast({ title: 'No write characteristic found', icon: 'none' })
-      }
-      return
-    }
-    
-    const service = services[serviceIdx++]
-    uni.getBLEDeviceCharacteristics({
-      deviceId,
-      serviceId: service.uuid,
-      success: (res) => {
-        const char = res.characteristics.find(c => c.properties.write)
-        if (char) {
-          found = true
-          setBluetoothConnection({
-            deviceId,
-            deviceName,
-            serviceId: service.uuid,
-            characteristicId: char.uuid,
-            deviceType: 'ble'
-          })
-          currentType.value = 'bluetooth'
-          currentBt.value = getBluetoothConnection()
-          isConnecting.value = false
-          uni.hideLoading()
-          uni.showToast({ title: t('printers.connectSuccess') })
-        } else {
-          nextService()
-        }
-      },
-      fail: () => nextService()
-    })
+  const permissionResult = await ensureBluetoothPermissions({ connect: true })
+  if (!permissionResult.ok) {
+    isConnecting.value = false
+    uni.showToast({ title: permissionResult.message || t('printers.connectFail'), icon: 'none' })
+    return
+  }
+
+  uni.showLoading({ title: t('printers.connecting') })
+  try {
+    await connectBluetoothPrinter(device)
+    refreshStatus()
+    uni.hideLoading()
+    uni.showToast({ title: t('printers.connectSuccess') })
+  } catch (e) {
+    uni.hideLoading()
+    uni.showToast({ title: t('printers.connectFail'), icon: 'none' })
+  } finally {
+    isConnecting.value = false
   }
-  
-  nextService()
 }
-// 连接内置打印机
 const connectBuiltin = () => {
-  setBuiltinPrinter()
-  currentType.value = 'builtin'
+  useBuiltinPrinter()
+  refreshStatus()
   uni.showToast({ title: t('printers.connectSuccess') })
 }
-// 断开连接
-const disconnect = () => {
-  clearPrinter()
-  currentType.value = ''
-  currentBt.value = null
+const disconnect = async () => {
+  await disconnectCurrentPrinter()
+  refreshStatus()
   uni.showToast({ title: t('printers.disconnected') })
 }
-// 测试打印
 const doTestPrint = async () => {
   try {
-    const data = buildTestTscLabel()
+    if (currentType.value === 'builtin') {
+      uni.showModal({
+        title: 'Current Mode is Built-in',
+        content: 'This handheld device is currently using Built-in mode. Please disconnect it, then connect "Virtual BT Printer" from the Paired Devices list and test print again.',
+        showCancel: false,
+      })
+      return
+    }
     uni.showLoading({ title: t('labels.print.printing') })
-    await sendToPrinter(data)
+    await testPrintCurrentPrinter()
     uni.hideLoading()
     uni.showToast({ title: t('printers.testPrintSuccess') })
   } catch (e: any) {
     uni.hideLoading()
-    uni.showToast({ title: t('printers.testPrintFail') + ': ' + e.message, icon: 'none' })
+    const msg = (e && e.message) ? e.message : 'Print failed'
+    if (msg.indexOf('Built-in printer') !== -1 || msg === 'BUILTIN_PLUGIN_NOT_FOUND') {
+      uni.showModal({
+        title: 'Print Failed',
+        content: 'Built-in TCP printing is not available on this device. Please switch to Bluetooth mode and scan for your printer. Check Android Bluetooth settings to pair with "Virtual BT Printer" or your printer model first.',
+        confirmText: 'OK',
+        showCancel: false,
+      })
+    } else {
+      uni.showToast({ title: t('printers.testPrintFail') + ': ' + msg, icon: 'none' })
+    }
   }
 }
@@ -265,10 +417,23 @@ const goBack = () =&gt; {
 onMounted(() => {
   refreshStatus()
+  debugInfo.value.classicModuleReady = !!classicBluetooth
+  // #ifdef APP-PLUS
+  loadPairedDevices()
+  // #endif
 })
 onUnmounted(() => {
   if (isScanning.value) stopScan()
+  if (bleListenerRegistered) {
+    bleListenerRegistered = false
+    try {
+      if (typeof uni.offBluetoothDeviceFound === 'function') {
+        uni.offBluetoothDeviceFound()
+      }
+    } catch (_) {}
+  }
+  uni.closeBluetoothAdapter({ complete: () => {} })
 })
 </script>
@@ -288,6 +453,11 @@ onUnmounted(() =&gt; {
 .info-badge { display: flex; align-items: center; gap: 12rpx; margin-bottom: 32rpx; }
 .badge-num { font-size: 40rpx; font-weight: 700; color: var(--theme-primary); }
 .badge-text { font-size: 28rpx; color: #6b7280; }
+.debug-card { background: #fff7ed; border: 1rpx solid #fed7aa; border-radius: 20rpx; padding: 24rpx; margin-bottom: 24rpx; display: flex; flex-direction: column; gap: 8rpx; }
+.debug-title { font-size: 28rpx; font-weight: 700; color: #9a3412; }
+.debug-item { font-size: 22rpx; color: #7c2d12; }
+.debug-error { color: #b91c1c; }
+.debug-warn { color: #92400e; font-weight: 600; }
 .printer-card { background: #fff; padding: 32rpx; border-radius: 24rpx; margin-bottom: 24rpx; display: flex; align-items: center; gap: 24rpx; box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.05); border: 1rpx solid #f3f4f6; }
 .printer-card.connected { background: var(--theme-primary); border: none; }
 .printer-card.connected .printer-name, .printer-card.connected .printer-loc, .printer-card.connected .printer-status { color: #fff; }
@@ -316,4 +486,10 @@ onUnmounted(() =&gt; {
 .empty-state { padding: 80rpx 0; text-align: center; }
 .empty-text { font-size: 28rpx; color: #9ca3af; }
+
+.device-meta { display: flex; flex-direction: column; align-items: flex-end; gap: 12rpx; flex-shrink: 0; }
+.device-type-tag { display: inline-block; padding: 4rpx 16rpx; font-size: 20rpx; border-radius: 8rpx; font-weight: 500; }
+.tag-ble { background: #eff6ff; color: #3b82f6; }
+.tag-classic { background: #fef3c7; color: #d97706; }
+.tag-dual { background: #ecfdf5; color: #059669; }
 </style>
+export interface BluetoothPermissionResult {
+  ok: boolean
+  message?: string
+}
+
+function normalizePermissionName (permission: string): string {
+  return String(permission || '').split('.').pop() || String(permission || '')
+}
+
+function formatDeniedMessage (permissions: string[]): string {
+  if (!permissions.length) return 'Bluetooth permission denied.'
+  return 'Please allow Bluetooth permissions: ' + permissions.map(normalizePermissionName).join(', ')
+}
+
+function requestAndroidPermissions (permissions: string[]): Promise<BluetoothPermissionResult> {
+  return new Promise((resolve) => {
+    // #ifdef APP-PLUS
+    try {
+      if (typeof plus === 'undefined' || !plus.android || !permissions.length) {
+        resolve({ ok: true })
+        return
+      }
+      plus.android.requestPermissions(
+        permissions,
+        (resultObj: any) => {
+          const deniedPresent = Array.isArray(resultObj?.deniedPresent) ? resultObj.deniedPresent : []
+          const deniedAlways = Array.isArray(resultObj?.deniedAlways) ? resultObj.deniedAlways : []
+          const denied = [...deniedPresent, ...deniedAlways]
+          if (denied.length > 0) {
+            resolve({
+              ok: false,
+              message: formatDeniedMessage(denied),
+            })
+            return
+          }
+          resolve({ ok: true })
+        },
+        () => {
+          resolve({
+            ok: false,
+            message: 'Failed to request Bluetooth permissions.',
+          })
+        }
+      )
+      return
+    } catch (e: any) {
+      resolve({
+        ok: false,
+        message: e?.message || 'Failed to request Bluetooth permissions.',
+      })
+      return
+    }
+    // #endif
+    resolve({ ok: true })
+  })
+}
+
+export async function ensureBluetoothPermissions (options?: {
+  scan?: boolean
+  connect?: boolean
+}): Promise<BluetoothPermissionResult> {
+  const { scan = false, connect = false } = options || {}
+
+  // #ifdef APP-PLUS
+  try {
+    if (typeof plus === 'undefined' || !plus.android) {
+      return { ok: true }
+    }
+    const Build = plus.android.importClass('android.os.Build')
+    const sdkInt = Number(Build.VERSION.SDK_INT || 0)
+
+    const permissions = new Set<string>()
+    if (sdkInt >= 31) {
+      if (scan) permissions.add('android.permission.BLUETOOTH_SCAN')
+      if (scan || connect) permissions.add('android.permission.BLUETOOTH_CONNECT')
+      if (scan) permissions.add('android.permission.ACCESS_FINE_LOCATION')
+    } else if (scan) {
+      permissions.add('android.permission.ACCESS_FINE_LOCATION')
+      permissions.add('android.permission.ACCESS_COARSE_LOCATION')
+    }
+
+    return await requestAndroidPermissions(Array.from(permissions))
+  } catch (e: any) {
+    return {
+      ok: false,
+      message: e?.message || 'Bluetooth permission check failed.',
+    }
+  }
+  // #endif
+
+  return { ok: true }
+}
 /**
- * 经典蓝牙工具（仅 Android APP-PLUS）
- * 用于佳博 D320FAX 等一体机的 Virtual BT Printer 连接
- * 支持 RFCOMM 回退连接（部分设备需要）
+ * 经典蓝牙工具（Android APP-PLUS）
+ * 兼容官方 UniApp SDK 经典蓝牙实现，并补充当前项目需要的简化调用：
+ * - getPairedDevices()
+ * - startClassicDiscovery(onDeviceFound, onDiscoveryFinished)
+ * - cancelClassicDiscovery()
+ * - connDevice(address, callback)
+ * - disConnDevice()
+ * - sendByteData(byteData)
  */
+
 // #ifdef APP-PLUS
-function getAdapter () {
-  if (typeof plus === 'undefined' || !plus.android) return null
-  const BluetoothAdapter = plus.android.importClass('android.bluetooth.BluetoothAdapter')
-  return BluetoothAdapter.getDefaultAdapter()
-}
+let BluetoothAdapter = plus.android.importClass('android.bluetooth.BluetoothAdapter')
+let Intent = plus.android.importClass('android.content.Intent')
+let IntentFilter = plus.android.importClass('android.content.IntentFilter')
+let BluetoothDevice = plus.android.importClass('android.bluetooth.BluetoothDevice')
+let UUID = plus.android.importClass('java.util.UUID')
+let Toast = plus.android.importClass('android.widget.Toast')
+let MY_UUID = UUID.fromString('00001101-0000-1000-8000-00805F9B34FB')
+
+let invoke = plus.android.invoke
+let btAdapter = BluetoothAdapter.getDefaultAdapter()
+let activity = plus.android.runtimeMainActivity()
+
+let btSocket = null
+let btInStream = null
+let btOutStream = null
+let setIntervalId = 0
+
+let btFindReceiver = null
+let btStatusReceiver = null
+// #endif
-function getActivity () {
-  return typeof plus !== 'undefined' ? plus.android.runtimeMainActivity() : null
+function normalizeDeviceType (deviceType) {
+  if (deviceType === 1) return 'classic'
+  if (deviceType === 2) return 'ble'
+  if (deviceType === 3) return 'dual'
+  return 'unknown'
 }
-function showToast (msg) {
+function fallbackRfcommSocket (device, insecure = false) {
   try {
-    const activity = getActivity()
-    if (activity) {
-      const Toast = plus.android.importClass('android.widget.Toast')
-      Toast.makeText(activity, String(msg), Toast.LENGTH_SHORT).show()
-    }
-  } catch (_) {}
+    const cls = invoke(device, 'getClass')
+    const intClass = plus.android.importClass('java.lang.Integer').TYPE
+    const methodName = insecure ? 'createInsecureRfcommSocket' : 'createRfcommSocket'
+    const method = invoke(cls, 'getMethod', methodName, intClass)
+    return invoke(method, 'invoke', device, 1)
+  } catch (e) {
+    console.error('RFCOMM fallback failed:', e)
+    return null
+  }
 }
-function getInvoke () {
-  return typeof plus !== 'undefined' && plus.android ? plus.android.invoke : null
+function getErrorMessage (error) {
+  if (!error) return 'Unknown error'
+  if (typeof error === 'string') return error
+  return String(error.message || error.errMsg || error)
 }
-function getMyUuid () {
-  if (typeof plus === 'undefined' || !plus.android) return null
-  return plus.android.importClass('java.util.UUID').fromString('00001101-0000-1000-8000-00805F9B34FB')
+
+function normalizeWriteByte (value) {
+  const byte = Number(value) || 0
+  return byte & 0xff
+}
+
+function normalizeWriteChunk (byteData, start, end) {
+  const out = []
+  for (let i = start; i < end; i++) {
+    const value = normalizeWriteByte(byteData[i])
+    if (value >= 128) {
+      out.push(value - 256)
+    } else {
+      out.push(value)
+    }
+  }
+  return out
+}
+
+function createSocketCandidates (device) {
+  return [
+    {
+      name: 'secure-service-record',
+      create: () => invoke(device, 'createRfcommSocketToServiceRecord', MY_UUID),
+    },
+    {
+      name: 'insecure-service-record',
+      create: () => invoke(device, 'createInsecureRfcommSocketToServiceRecord', MY_UUID),
+    },
+    {
+      name: 'secure-channel-1',
+      create: () => fallbackRfcommSocket(device, false),
+    },
+    {
+      name: 'insecure-channel-1',
+      create: () => fallbackRfcommSocket(device, true),
+    },
+  ]
 }
-let btSocket = null
-let btInStream = null
-let btOutStream = null
-let btFindReceiver = null
-// #endif
 var blueToothTool = {
-  state: { bluetoothEnable: false, readThreadState: false },
+  state: {
+    bluetoothEnable: false,
+    bluetoothState: '',
+    discoveryDeviceState: false,
+    readThreadState: false,
+    connectionState: 'idle',
+    lastAddress: '',
+    lastSocketStrategy: '',
+    lastError: '',
+    lastSendError: '',
+    outputReady: false,
+    lastSendMode: 'idle',
+  },
+  options: {
+    listenBTStatusCallback: function (state) {},
+    discoveryDeviceCallback: function (newDevice) {},
+    discoveryFinishedCallback: function () {},
+    readDataCallback: function (dataByteArr) {},
+    connExceptionCallback: function (e) {},
+  },
+  init (setOptions) {
+    Object.assign(this.options, setOptions || {})
+    this.state.bluetoothEnable = this.getBluetoothStatus()
+    this.listenBluetoothStatus()
+  },
+  setErrorState (message, type = 'general') {
+    const text = String(message || '')
+    this.state.lastError = text
+    if (type === 'send') {
+      this.state.lastSendError = text
+    }
+  },
+  clearErrorState () {
+    this.state.lastError = ''
+    this.state.lastSendError = ''
+  },
   shortToast (msg) {
     // #ifdef APP-PLUS
-    showToast(msg)
+    try {
+      if (activity) Toast.makeText(activity, String(msg), Toast.LENGTH_SHORT).show()
+    } catch (_) {}
     // #endif
   },
+  isSupportBluetooth () {
+    // #ifdef APP-PLUS
+    return btAdapter != null
+    // #endif
+    return false
+  },
   getBluetoothStatus () {
     // #ifdef APP-PLUS
-    const btAdapter = getAdapter()
     return btAdapter != null && btAdapter.isEnabled()
     // #endif
     return false
   },
-  /** 获取已配对设备（含 Virtual BT Printer / D320FAX） */
+  turnOnBluetooth () {
+    // #ifdef APP-PLUS
+    if (btAdapter == null) {
+      this.shortToast('Bluetooth not available')
+      return
+    }
+    if (!btAdapter.isEnabled()) {
+      if (activity == null) {
+        this.shortToast('Activity not available')
+        return
+      }
+      let intent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
+      activity.startActivityForResult(intent, 1)
+      return
+    }
+    this.shortToast('Bluetooth already enabled')
+    // #endif
+  },
+  turnOffBluetooth () {
+    // #ifdef APP-PLUS
+    if (btAdapter != null && btAdapter.isEnabled()) {
+      btAdapter.disable()
+    }
+    if (btFindReceiver != null) {
+      try { activity.unregisterReceiver(btFindReceiver) } catch (_) {}
+      btFindReceiver = null
+    }
+    this.state.bluetoothEnable = false
+    this.cancelDiscovery()
+    this.closeBtSocket()
+    // #endif
+  },
   getPairedDevices () {
     // #ifdef APP-PLUS
-    const pairedDevices = []
+    let pairedDevices = []
     try {
-      const btAdapter = getAdapter()
-      if (!btAdapter || !btAdapter.isEnabled()) {
-        this.shortToast('Bluetooth is off')
-        return pairedDevices
-      }
-      const bonded = btAdapter.getBondedDevices()
-      if (!bonded) return pairedDevices
-      const inv = getInvoke()
-      if (!inv) return pairedDevices
-      const it = inv(bonded, 'iterator')
-      while (inv(it, 'hasNext')) {
-        const device = inv(it, 'next')
-        const deviceType = inv(device, 'getType')
-        const deviceId = inv(device, 'getAddress')
-        let deviceName = inv(device, 'getName')
-        if (deviceName == null) deviceName = ''
-        deviceName = String(deviceName).trim() || 'Unknown Device'
-        let typeStr = 'unknown'
-        if (deviceType === 1) typeStr = 'classic'
-        else if (deviceType === 2) typeStr = 'ble'
-        else if (deviceType === 3) typeStr = 'dual'
-        pairedDevices.push({ name: deviceName, deviceId: String(deviceId), type: typeStr })
+      if (btAdapter == null || !btAdapter.isEnabled()) return pairedDevices
+      let pairedDevicesAndroid = btAdapter.getBondedDevices()
+      if (!pairedDevicesAndroid) return pairedDevices
+      let it = invoke(pairedDevicesAndroid, 'iterator')
+      while (invoke(it, 'hasNext')) {
+        let device = invoke(it, 'next')
+        let deviceType = invoke(device, 'getType')
+        let deviceId = invoke(device, 'getAddress')
+        let deviceName = invoke(device, 'getName')
+        pairedDevices.push({
+          name: deviceName != null ? String(deviceName).trim() || 'Unknown Device' : 'Unknown Device',
+          deviceId: String(deviceId || ''),
+          type: normalizeDeviceType(deviceType),
+        })
       }
     } catch (e) {
       console.error('getPairedDevices error:', e)
@@ -86,156 +210,360 @@ var blueToothTool = {
     // #endif
     return []
   },
-  /** 经典蓝牙扫描（发现未配对设备，如 d320fax_295c）— 不过滤任何设备 */
-  startClassicDiscovery (onDeviceFound, onDiscoveryFinished) {
+  discoveryNewDevice () {
     // #ifdef APP-PLUS
-    const btAdapter = getAdapter()
-    const activity = getActivity()
-    if (!btAdapter || !btAdapter.isEnabled() || !activity) return
-    if (btFindReceiver) {
-      try { activity.unregisterReceiver(btFindReceiver) } catch (_) {}
+    if (btAdapter == null || !btAdapter.isEnabled() || activity == null) return
+    if (btFindReceiver != null) {
+      try { activity.unregisterReceiver(btFindReceiver) } catch (e) { console.error(e) }
       btFindReceiver = null
+      this.cancelDiscovery()
     }
-    if (btAdapter.isDiscovering()) btAdapter.cancelDiscovery()
-    const BluetoothAdapter = plus.android.importClass('android.bluetooth.BluetoothAdapter')
-    const BluetoothDevice = plus.android.importClass('android.bluetooth.BluetoothDevice')
-    const IntentFilter = plus.android.importClass('android.content.IntentFilter')
-    const inv = getInvoke()
+    let options = this.options
     btFindReceiver = plus.android.implements('io.dcloud.android.content.BroadcastReceiver', {
-      onReceive (context, intent) {
-        const action = intent.getAction()
+      onReceive: function (context, intent) {
+        plus.android.importClass(context)
+        plus.android.importClass(intent)
+        let action = intent.getAction()
         if (BluetoothDevice.ACTION_FOUND === action) {
-          const device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE)
+          let device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE)
           if (!device) return
-          const deviceType = inv(device, 'getType')
-          const deviceId = String(inv(device, 'getAddress') || '')
-          let deviceName = inv(device, 'getName')
-          if (deviceName == null) deviceName = ''
-          deviceName = String(deviceName).trim() || 'Unknown Device'
-          let typeStr = 'unknown'
-          if (deviceType === 1) typeStr = 'classic'
-          else if (deviceType === 2) typeStr = 'ble'
-          else if (deviceType === 3) typeStr = 'dual'
-          if (onDeviceFound) onDeviceFound({ name: deviceName, deviceId, type: typeStr })
+          let deviceType = invoke(device, 'getType')
+          let deviceId = invoke(device, 'getAddress')
+          let deviceName = invoke(device, 'getName')
+          let newDevice = {
+            name: deviceName != null ? String(deviceName).trim() || 'Unknown Device' : 'Unknown Device',
+            deviceId: String(deviceId || ''),
+            type: normalizeDeviceType(deviceType),
+          }
+          options.discoveryDeviceCallback && options.discoveryDeviceCallback(newDevice)
         }
         if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED === action) {
-          try { activity.unregisterReceiver(btFindReceiver) } catch (_) {}
-          btFindReceiver = null
-          if (onDiscoveryFinished) onDiscoveryFinished()
+          blueToothTool.cancelDiscovery()
+          options.discoveryFinishedCallback && options.discoveryFinishedCallback()
         }
       },
     })
-    const filter = new IntentFilter()
+    let filter = new IntentFilter()
     filter.addAction(BluetoothDevice.ACTION_FOUND)
     filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED)
     activity.registerReceiver(btFindReceiver, filter)
     btAdapter.startDiscovery()
+    this.state.discoveryDeviceState = true
     // #endif
   },
-  /** 停止经典蓝牙扫描 */
-  cancelClassicDiscovery () {
+  startClassicDiscovery (onDeviceFound, onDiscoveryFinished) {
+    this.init({
+      discoveryDeviceCallback: onDeviceFound || function () {},
+      discoveryFinishedCallback: onDiscoveryFinished || function () {},
+    })
+    this.discoveryNewDevice()
+  },
+  listenBluetoothStatus () {
     // #ifdef APP-PLUS
-    const btAdapter = getAdapter()
-    const activity = getActivity()
-    if (btAdapter && btAdapter.isDiscovering()) btAdapter.cancelDiscovery()
-    if (btFindReceiver && activity) {
-      try { activity.unregisterReceiver(btFindReceiver) } catch (_) {}
-      btFindReceiver = null
+    if (activity == null) return
+    if (btStatusReceiver != null) {
+      try { activity.unregisterReceiver(btStatusReceiver) } catch (e) { console.error(e) }
+      btStatusReceiver = null
+    }
+    btStatusReceiver = plus.android.implements('io.dcloud.android.content.BroadcastReceiver', {
+      onReceive: (context, intent) => {
+        plus.android.importClass(context)
+        plus.android.importClass(intent)
+        let action = intent.getAction()
+        if (action === BluetoothAdapter.ACTION_STATE_CHANGED) {
+          let blueState = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, 0)
+          let stateStr = ''
+          switch (blueState) {
+            case BluetoothAdapter.STATE_TURNING_ON:
+              stateStr = 'STATE_TURNING_ON'
+              break
+            case BluetoothAdapter.STATE_ON:
+              stateStr = 'STATE_ON'
+              this.state.bluetoothEnable = true
+              break
+            case BluetoothAdapter.STATE_TURNING_OFF:
+              stateStr = 'STATE_TURNING_OFF'
+              break
+            case BluetoothAdapter.STATE_OFF:
+              stateStr = 'STATE_OFF'
+              this.state.bluetoothEnable = false
+              break
+          }
+          this.state.bluetoothState = stateStr
+          this.options.listenBTStatusCallback && this.options.listenBTStatusCallback(stateStr)
+        }
+      },
+    })
+    let filter = new IntentFilter()
+    filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED)
+    activity.registerReceiver(btStatusReceiver, filter)
+    if (this.state.bluetoothEnable) {
+      this.options.listenBTStatusCallback && this.options.listenBTStatusCallback('STATE_ON')
     }
     // #endif
   },
-  /** 连接经典蓝牙设备（含 D320FAX Virtual BT Printer，支持 RFCOMM 回退） */
   connDevice (address, callback) {
     // #ifdef APP-PLUS
+    this.cancelDiscovery()
     if (btSocket != null) this.closeBtSocket()
     this.state.readThreadState = false
-    const btAdapter = getAdapter()
-    if (!btAdapter) {
+    this.state.connectionState = 'connecting'
+    this.state.lastAddress = String(address || '')
+    this.state.outputReady = false
+    this.clearErrorState()
+
+    if (btAdapter == null) {
       this.shortToast('Bluetooth not available')
-      if (callback) callback(false)
-      return false
-    }
-    const inv = getInvoke()
-    const uuid = getMyUuid()
-    if (!inv || !uuid) {
-      this.shortToast('Bluetooth not ready')
-      if (callback) callback(false)
+      this.state.connectionState = 'error'
+      this.setErrorState('Bluetooth not available')
+      callback && callback(false)
       return false
     }
     try {
-      const device = inv(btAdapter, 'getRemoteDevice', address)
-      btSocket = inv(device, 'createRfcommSocketToServiceRecord', uuid)
-    } catch (e) {
-      console.warn('createRfcommSocketToServiceRecord failed, try fallback:', e)
-      try {
-        const device = inv(btAdapter, 'getRemoteDevice', address)
-        const cls = inv(device, 'getClass')
-        const intClass = plus.android.importClass('java.lang.Integer').TYPE
-        const m = inv(cls, 'getMethod', 'createRfcommSocket', intClass)
-        btSocket = inv(m, 'invoke', device, 1)
-      } catch (e2) {
-        console.error('RFCOMM fallback failed:', e2)
-        this.shortToast('Connect failed')
-        if (callback) callback(false)
+      let device = invoke(btAdapter, 'getRemoteDevice', address)
+      const candidates = createSocketCandidates(device)
+      let socket = null
+      let lastError = null
+      for (let i = 0; i < candidates.length; i++) {
+        const candidate = candidates[i]
+        try {
+          socket = candidate.create()
+          if (socket) {
+            this.state.lastSocketStrategy = candidate.name
+            break
+          }
+        } catch (e) {
+          lastError = e
+          console.warn('create socket failed:', candidate.name, e)
+        }
+      }
+      btSocket = socket
+      if (!btSocket) {
+        this.state.connectionState = 'error'
+        this.setErrorState(lastError ? getErrorMessage(lastError) : 'Unable to create Bluetooth socket')
+        callback && callback(false)
         return false
       }
+    } catch (e) {
+      console.error(e)
+      this.state.connectionState = 'error'
+      this.setErrorState(getErrorMessage(e))
+      callback && callback(false)
+      return false
     }
+
     try {
-      inv(btSocket, 'connect')
-      btInStream = inv(btSocket, 'getInputStream')
-      btOutStream = inv(btSocket, 'getOutputStream')
-      this.state.readThreadState = true
-      this.shortToast('Connected')
-      if (callback) callback(true)
+      invoke(btSocket, 'connect')
+      const streamReady = this.readData()
+      if (!streamReady) {
+        throw new Error(this.state.lastError || 'Bluetooth output stream not ready')
+      }
+      this.state.connectionState = 'connected'
+      this.shortToast('Classic Bluetooth connected')
+      callback && callback(true)
     } catch (e) {
-      try { btSocket.close() } catch (_) {}
-      btSocket = null
-      this.shortToast('Connect failed')
-      if (callback) callback(false)
+      console.error(e)
+      this.state.connectionState = 'error'
+      this.setErrorState(getErrorMessage(e))
+      callback && callback(false)
+      try {
+        btSocket.close()
+        btSocket = null
+      } catch (e1) {
+        console.error(e1)
+      }
+      btInStream = null
+      btOutStream = null
       return false
     }
     return true
     // #endif
-    if (callback) callback(false)
+    callback && callback(false)
     return false
   },
   disConnDevice () {
     // #ifdef APP-PLUS
-    this.closeBtSocket()
+    if (btSocket != null) this.closeBtSocket()
     this.state.readThreadState = false
-    this.shortToast('Disconnected')
     // #endif
   },
   closeBtSocket () {
     // #ifdef APP-PLUS
     this.state.readThreadState = false
-    if (btSocket) {
-      try { btSocket.close() } catch (_) {}
-      btSocket = null
-      btInStream = null
-      btOutStream = null
+    this.state.outputReady = false
+    this.state.connectionState = 'idle'
+    clearInterval(setIntervalId)
+    setIntervalId = 0
+    if (!btSocket) return
+    try {
+      btSocket.close()
+    } catch (e) {
+      console.error(e)
     }
+    btSocket = null
+    btInStream = null
+    btOutStream = null
     // #endif
   },
-  sendByteData (byteData) {
+  cancelDiscovery () {
+    // #ifdef APP-PLUS
+    if (btAdapter != null && btAdapter.isDiscovering()) {
+      btAdapter.cancelDiscovery()
+    }
+    if (btFindReceiver != null && activity != null) {
+      try { activity.unregisterReceiver(btFindReceiver) } catch (_) {}
+      btFindReceiver = null
+    }
+    this.state.discoveryDeviceState = false
+    // #endif
+  },
+  cancelClassicDiscovery () {
+    this.cancelDiscovery()
+  },
+  readData () {
+    // #ifdef APP-PLUS
+    if (!btSocket) {
+      this.shortToast('Please connect Bluetooth device first.')
+      this.state.connectionState = 'error'
+      this.setErrorState('Please connect Bluetooth device first.')
+      return false
+    }
+    try {
+      btInStream = invoke(btSocket, 'getInputStream')
+      btOutStream = invoke(btSocket, 'getOutputStream')
+    } catch (e) {
+      console.error(e)
+      this.setErrorState(getErrorMessage(e))
+      this.closeBtSocket()
+      return false
+    }
+    this.read()
+    this.state.readThreadState = true
+    this.state.outputReady = !!btOutStream
+    return true
+    // #endif
+    return false
+  },
+  read () {
+    // #ifdef APP-PLUS
+    clearInterval(setIntervalId)
+    setIntervalId = setInterval(() => {
+      if (this.state.readThreadState) {
+        let start = new Date().getTime()
+        let dataArr = []
+        try {
+          while (btInStream && invoke(btInStream, 'available') !== 0) {
+            let data = invoke(btInStream, 'read')
+            dataArr.push(data)
+            let current = new Date().getTime()
+            if (current - start > 20) break
+          }
+        } catch (e) {
+          this.state.readThreadState = false
+          this.state.connectionState = 'error'
+          this.setErrorState(getErrorMessage(e))
+          this.options.connExceptionCallback && this.options.connExceptionCallback(e)
+        }
+        if (dataArr.length > 0) {
+          this.options.readDataCallback && this.options.readDataCallback(dataArr)
+        }
+      }
+    }, 40)
+    // #endif
+  },
+  sendData (dataStr) {
     // #ifdef APP-PLUS
     if (!btOutStream) {
+      this.shortToast('Output stream not ready')
+      return false
+    }
+    let bytes = invoke(dataStr, 'getBytes', 'gb18030')
+    try {
+      this.sendByteData(bytes)
+    } catch (e) {
+      return false
+    }
+    return true
+    // #endif
+    return false
+  },
+  sendByteData (byteData) {
+    // #ifdef APP-PLUS
+    if (!this.ensureConnection(this.state.lastAddress)) {
       this.shortToast('Not connected')
       return false
     }
     try {
-      const CHUNK_SIZE = 4096
+      const CHUNK_SIZE = 512
+      this.state.lastSendMode = 'chunk-write'
+      this.state.lastSendError = ''
       for (let i = 0; i < byteData.length; i += CHUNK_SIZE) {
-        const chunk = byteData.slice(i, i + CHUNK_SIZE)
-        btOutStream.write(chunk)
+        const chunk = normalizeWriteChunk(byteData, i, Math.min(i + CHUNK_SIZE, byteData.length))
+        try {
+          btOutStream.write(chunk)
+        } catch (writeChunkError) {
+          this.state.lastSendMode = 'byte-write-fallback'
+          for (let j = 0; j < chunk.length; j++) {
+            invoke(btOutStream, 'write', normalizeWriteByte(chunk[j]))
+          }
+        }
       }
+      invoke(btOutStream, 'flush')
       return true
     } catch (e) {
+      const message = getErrorMessage(e)
+      console.error('sendByteData failed:', e)
+      this.setErrorState(message, 'send')
+      this.state.connectionState = 'error'
       return false
     }
     // #endif
     return false
-  }
+  },
+  isSocketConnected () {
+    // #ifdef APP-PLUS
+    if (!btSocket) return false
+    try {
+      return !!invoke(btSocket, 'isConnected')
+    } catch (_) {
+      return false
+    }
+    // #endif
+    return false
+  },
+  ensureConnection (address) {
+    // #ifdef APP-PLUS
+    const targetAddress = String(address || this.state.lastAddress || '')
+    if (targetAddress) {
+      this.state.lastAddress = targetAddress
+    }
+    if (btOutStream && this.isSocketConnected()) {
+      this.state.outputReady = true
+      return true
+    }
+    if (!targetAddress) {
+      this.setErrorState('Bluetooth address missing')
+      return false
+    }
+    let connected = false
+    this.connDevice(targetAddress, (ok) => {
+      connected = !!ok
+    })
+    return connected && !!btOutStream
+    // #endif
+    return false
+  },
+  getLastError () {
+    return this.state.lastSendError || this.state.lastError || ''
+  },
+  getDebugState () {
+    return {
+      ...this.state,
+      socketConnected: this.isSocketConnected(),
+      outputReady: !!btOutStream,
+      inputReady: !!btInStream,
+    }
+  },
 }
 export default blueToothTool
+import { buildTscLabelData, buildTscTestPrintData } from '../protocols/tscProtocol'
+import type { PrinterCandidate, PrinterDriver } from '../types/printer'
+
+const KEYWORDS = [
+  'd320fax',
+  'd320fx',
+  'virtual bt printer',
+  'gp-d320fax',
+]
+
+function score (device: PrinterCandidate): number {
+  const text = `${device.name || ''} ${device.deviceId || ''}`.toLowerCase()
+  let total = 0
+  KEYWORDS.forEach((keyword) => {
+    if (text.includes(keyword)) total += 40
+  })
+  return total
+}
+
+export const d320faxDriver: PrinterDriver = {
+  key: 'd320fax',
+  brand: 'Gprinter',
+  model: 'D320FAX/D320FX',
+  displayName: 'Gprinter D320FAX',
+  protocol: 'tsc',
+  preferredConnection: 'classic',
+  preferredBleMtu: 20,
+  keywords: KEYWORDS,
+  matches (device) {
+    return score(device)
+  },
+  resolveConnectionType () {
+    return 'classic'
+  },
+  buildTestPrintData () {
+    return buildTscTestPrintData()
+  },
+  buildLabelData (payload) {
+    return buildTscLabelData(payload)
+  },
+}
+import { buildTscLabelData, buildTscTestPrintData } from '../protocols/tscProtocol'
+import type { PrinterCandidate, PrinterDriver } from '../types/printer'
+
+const GENERIC_TSC_KEYWORDS = [
+  'printer', 'print', 'label', 'tsc', 'zebra', 'brother', 'epson', 'godex',
+  'citizen', 'ql-', 'zd', 'zt', 'ttp', 'tdp', 'bt printer', 'virtual bt printer',
+]
+
+function scoreByKeywords (device: PrinterCandidate, keywords: string[]): number {
+  const text = `${device.name || ''} ${device.deviceId || ''}`.toLowerCase()
+  let score = 0
+  keywords.forEach((keyword) => {
+    if (text.includes(keyword)) score += 10
+  })
+  return score
+}
+
+export const genericTscDriver: PrinterDriver = {
+  key: 'generic-tsc',
+  brand: 'Generic',
+  model: 'TSC',
+  displayName: 'Generic TSC Printer',
+  protocol: 'tsc',
+  preferredBleMtu: 20,
+  keywords: GENERIC_TSC_KEYWORDS,
+  matches (device) {
+    return scoreByKeywords(device, GENERIC_TSC_KEYWORDS)
+  },
+  resolveConnectionType (device) {
+    return device.type === 'ble' ? 'ble' : 'classic'
+  },
+  buildTestPrintData () {
+    return buildTscTestPrintData()
+  },
+  buildLabelData (payload) {
+    return buildTscLabelData(payload)
+  },
+}
+import { buildEscPosLabelData, buildEscPosTestPrintData } from '../protocols/escPosBuilder'
+import type { PrinterCandidate, PrinterDriver } from '../types/printer'
+
+const KEYWORDS = [
+  'gp-r3',
+  'gp r3',
+  'gpr3',
+]
+
+function score (device: PrinterCandidate): number {
+  const text = `${device.name || ''} ${device.deviceId || ''}`.toLowerCase()
+  let total = 0
+  KEYWORDS.forEach((keyword) => {
+    if (text.includes(keyword)) total += 60
+  })
+  if (text.includes('gprinter')) total += 10
+  return total
+}
+
+export const gpR3Driver: PrinterDriver = {
+  key: 'gp-r3',
+  brand: 'Gprinter',
+  model: 'GP-R3',
+  displayName: 'Gprinter GP-R3',
+  protocol: 'esc',
+  preferredConnection: 'classic',
+  preferredBleMtu: 20,
+  keywords: KEYWORDS,
+  matches (device) {
+    return score(device)
+  },
+  resolveConnectionType (device) {
+    if (device.type === 'ble') return 'ble'
+    return 'classic'
+  },
+  buildTestPrintData () {
+    return buildEscPosTestPrintData()
+  },
+  buildLabelData (payload) {
+    return buildEscPosLabelData(payload)
+  },
+}
+import { d320faxDriver } from '../drivers/d320fax'
+import { genericTscDriver } from '../drivers/genericTsc'
+import { gpR3Driver } from '../drivers/gpR3'
+import type { PrinterCandidate, PrinterDriver, ResolvedPrinterCandidate } from '../types/printer'
+
+const printerDrivers: PrinterDriver[] = [
+  gpR3Driver,
+  d320faxDriver,
+  genericTscDriver,
+]
+
+export function getPrinterDrivers (): PrinterDriver[] {
+  return printerDrivers
+}
+
+export function getPrinterDriverByKey (key?: string): PrinterDriver {
+  return printerDrivers.find(driver => driver.key === key) || genericTscDriver
+}
+
+export function resolvePrinterDriver (device: PrinterCandidate): PrinterDriver {
+  let bestDriver: PrinterDriver = genericTscDriver
+  let bestScore = -1
+  printerDrivers.forEach((driver) => {
+    const score = driver.matches(device)
+    if (score > bestScore) {
+      bestScore = score
+      bestDriver = driver
+    }
+  })
+  return bestDriver
+}
+
+export function describePrinterCandidate (device: PrinterCandidate): ResolvedPrinterCandidate {
+  const driver = resolvePrinterDriver(device)
+  return {
+    ...device,
+    driverKey: driver.key,
+    driverName: driver.displayName,
+    protocol: driver.protocol,
+    resolvedType: driver.resolveConnectionType(device),
+  }
+}
+import {
+  clearPrinter,
+  getBluetoothConnection,
+  getCurrentPrinterDriverKey,
+  getPrinterType,
+  sendToPrinter,
+  setBluetoothConnection,
+  setBuiltinPrinter,
+} from '../printerConnection'
+import classicBluetooth from '../bluetoothTool.js'
+import { describePrinterCandidate, getPrinterDriverByKey, resolvePrinterDriver } from './driverRegistry'
+import type {
+  CurrentPrinterSummary,
+  LabelPrintPayload,
+  PrinterCandidate,
+  PrinterDriver,
+} from '../types/printer'
+
+function connectClassicBluetooth (device: PrinterCandidate, driver: PrinterDriver): Promise<void> {
+  return new Promise((resolve, reject) => {
+    // #ifdef APP-PLUS
+    const classic = classicBluetooth
+    if (!classic || !classic.connDevice) {
+      reject(new Error('Classic Bluetooth not available. Ensure app is running on the device.'))
+      return
+    }
+    classic.connDevice(device.deviceId, (ok: boolean) => {
+      if (!ok) {
+        reject(new Error('Classic Bluetooth connection failed.'))
+        return
+      }
+      setBluetoothConnection({
+        deviceId: device.deviceId,
+        deviceName: device.name || 'Bluetooth Printer',
+        deviceType: 'classic',
+        driverKey: driver.key,
+        mtu: driver.preferredBleMtu || 20,
+      })
+      resolve()
+    })
+    // #endif
+    // #ifndef APP-PLUS
+    reject(new Error('Classic Bluetooth requires the app.'))
+    // #endif
+  })
+}
+
+function findBleWriteCharacteristic (deviceId: string): Promise<{ serviceId: string; characteristicId: string } | null> {
+  return new Promise((resolve) => {
+    uni.getBLEDeviceServices({
+      deviceId,
+      success: (serviceRes) => {
+        const services = serviceRes.services || []
+        const next = (index: number) => {
+          if (index >= services.length) {
+            resolve(null)
+            return
+          }
+          const serviceId = services[index].uuid
+          uni.getBLEDeviceCharacteristics({
+            deviceId,
+            serviceId,
+            success: (charRes) => {
+              const target = (charRes.characteristics || []).find((item: any) => item.properties && item.properties.write)
+              if (target) {
+                resolve({
+                  serviceId,
+                  characteristicId: target.uuid,
+                })
+                return
+              }
+              next(index + 1)
+            },
+            fail: () => next(index + 1),
+          })
+        }
+        next(0)
+      },
+      fail: () => resolve(null),
+    })
+  })
+}
+
+function connectBlePrinter (device: PrinterCandidate, driver: PrinterDriver): Promise<void> {
+  const finalizeExistingBleConnection = async () => {
+    const write = await findBleWriteCharacteristic(device.deviceId)
+    if (!write) {
+      throw new Error('No writable characteristic found. This device may not support printing.')
+    }
+    setBluetoothConnection({
+      deviceId: device.deviceId,
+      deviceName: device.name || 'Bluetooth Printer',
+      serviceId: write.serviceId,
+      characteristicId: write.characteristicId,
+      deviceType: 'ble',
+      mtu: driver.preferredBleMtu || 20,
+      driverKey: driver.key,
+    })
+  }
+
+  return new Promise((resolve, reject) => {
+    uni.createBLEConnection({
+      deviceId: device.deviceId,
+      timeout: 10000,
+      success: async () => {
+        try {
+          await finalizeExistingBleConnection()
+          resolve()
+        } catch (e: any) {
+          reject(e)
+        }
+      },
+      fail: (err: any) => {
+        if (err?.errCode === -1) {
+          finalizeExistingBleConnection().then(() => resolve()).catch(reject)
+        } else {
+          reject(new Error(err?.errMsg || 'BLE connection failed.'))
+        }
+      },
+    })
+  })
+}
+
+export async function connectBluetoothPrinter (device: PrinterCandidate): Promise<PrinterDriver> {
+  const driver = resolvePrinterDriver(device)
+  const resolvedType = driver.resolveConnectionType(device)
+  if (resolvedType === 'classic') {
+    await connectClassicBluetooth(device, driver)
+  } else {
+    await connectBlePrinter(device, driver)
+  }
+  return driver
+}
+
+export function useBuiltinPrinter (driverKey = 'generic-tsc') {
+  setBuiltinPrinter(driverKey)
+}
+
+export function getCurrentPrinterDriver (): PrinterDriver {
+  const type = getPrinterType()
+  const storedKey = getCurrentPrinterDriverKey()
+  if (storedKey) return getPrinterDriverByKey(storedKey)
+  if (type === 'bluetooth') {
+    const connection = getBluetoothConnection()
+    if (connection) {
+      return resolvePrinterDriver({
+        deviceId: connection.deviceId,
+        name: connection.deviceName,
+        type: connection.deviceType,
+      })
+    }
+  }
+  return getPrinterDriverByKey('generic-tsc')
+}
+
+export function getCurrentPrinterSummary (): CurrentPrinterSummary {
+  const type = getPrinterType()
+  const driver = getCurrentPrinterDriver()
+  if (type === 'builtin') {
+    return {
+      type,
+      displayName: 'Built-in Printer',
+      deviceId: 'builtin',
+      driverKey: driver.key,
+      driverName: driver.displayName,
+      protocol: driver.protocol,
+      deviceType: '',
+    }
+  }
+  if (type === 'bluetooth') {
+    const connection = getBluetoothConnection()
+    if (connection) {
+      return {
+        type,
+        displayName: connection.deviceName || driver.displayName,
+        deviceId: connection.deviceId,
+        driverKey: driver.key,
+        driverName: driver.displayName,
+        protocol: driver.protocol,
+        deviceType: connection.deviceType,
+      }
+    }
+  }
+  return {
+    type: '',
+    displayName: '',
+    deviceId: '',
+    driverKey: driver.key,
+    driverName: driver.displayName,
+    protocol: driver.protocol,
+    deviceType: '',
+  }
+}
+
+export async function testPrintCurrentPrinter (onProgress?: (percent: number) => void): Promise<PrinterDriver> {
+  const driver = getCurrentPrinterDriver()
+  await sendToPrinter(driver.buildTestPrintData(), onProgress)
+  return driver
+}
+
+export async function printLabelForCurrentPrinter (
+  payload: LabelPrintPayload,
+  onProgress?: (percent: number) => void
+): Promise<PrinterDriver> {
+  const driver = getCurrentPrinterDriver()
+  await sendToPrinter(driver.buildLabelData(payload), onProgress)
+  return driver
+}
+
+export function describeDiscoveredPrinter (device: PrinterCandidate) {
+  return describePrinterCandidate(device)
+}
+
+export function disconnectCurrentPrinter (): Promise<void> {
+  return new Promise((resolve) => {
+    const type = getPrinterType()
+    const connection = getBluetoothConnection()
+
+    if (type === 'bluetooth' && connection?.deviceType === 'classic') {
+      // #ifdef APP-PLUS
+      try {
+        const classic = classicBluetooth
+        if (classic && classic.disConnDevice) classic.disConnDevice()
+      } catch (e) {
+        console.error('Disconnect classic bluetooth failed', e)
+      }
+      // #endif
+      clearPrinter()
+      resolve()
+      return
+    }
+
+    clearPrinter()
+    if (type === 'bluetooth' && connection?.deviceId) {
+      uni.closeBLEConnection({
+        deviceId: connection.deviceId,
+        complete: () => resolve(),
+      })
+      return
+    }
+    resolve()
+  })
+}
 /**
  * 打印机连接与下发：蓝牙(BLE) / 一体机(TCP localhost)
  */
+import type { ActiveBtDeviceType, PrinterType } from './types/printer'
+import classicBluetooth from './bluetoothTool.js'
 const STORAGE_PRINTER_TYPE = 'printerType'
 const STORAGE_BT_DEVICE_ID = 'btDeviceId'
@@ -9,9 +11,11 @@ const STORAGE_BT_SERVICE_ID = &#39;btServiceId&#39;
 const STORAGE_BT_CHARACTERISTIC_ID = 'btCharacteristicId'
 const STORAGE_BT_DEVICE_TYPE = 'btDeviceType' // 'ble' | 'classic'
 const STORAGE_BLE_MTU = 'bleMTU'
+const STORAGE_BUILTIN_PORT = 'builtinPort'
+const STORAGE_PRINTER_DRIVER_KEY = 'printerDriverKey'
-export type PrinterType = 'bluetooth' | 'builtin'
-export type BtDeviceType = 'ble' | 'classic'
+const BUILTIN_PROBE_PORTS = [9100, 4000, 9000, 6000]
+export type BtDeviceType = ActiveBtDeviceType
 export const PrinterStorageKeys = {
   type: STORAGE_PRINTER_TYPE,
@@ -21,6 +25,7 @@ export const PrinterStorageKeys = {
   btCharacteristicId: STORAGE_BT_CHARACTERISTIC_ID,
   btDeviceType: STORAGE_BT_DEVICE_TYPE,
   bleMTU: STORAGE_BLE_MTU,
+  driverKey: STORAGE_PRINTER_DRIVER_KEY,
 } as const
 export function setPrinterType (type: PrinterType) {
@@ -34,6 +39,7 @@ export function setBluetoothConnection (info: {
   characteristicId?: string
   deviceType?: BtDeviceType
   mtu?: number
+  driverKey?: string
 }) {
   uni.setStorageSync(STORAGE_PRINTER_TYPE, 'bluetooth')
   uni.setStorageSync(STORAGE_BT_DEVICE_ID, info.deviceId)
@@ -42,10 +48,12 @@ export function setBluetoothConnection (info: {
   uni.setStorageSync(STORAGE_BT_CHARACTERISTIC_ID, info.characteristicId || '')
   uni.setStorageSync(STORAGE_BT_DEVICE_TYPE, info.deviceType || 'ble')
   uni.setStorageSync(STORAGE_BLE_MTU, info.mtu != null ? info.mtu : BLE_MTU_DEFAULT)
+  uni.setStorageSync(STORAGE_PRINTER_DRIVER_KEY, info.driverKey || '')
 }
-export function setBuiltinPrinter () {
+export function setBuiltinPrinter (driverKey = 'generic-tsc') {
   uni.setStorageSync(STORAGE_PRINTER_TYPE, 'builtin')
+  uni.setStorageSync(STORAGE_PRINTER_DRIVER_KEY, driverKey)
 }
 export function clearPrinter () {
@@ -56,6 +64,8 @@ export function clearPrinter () {
   uni.removeStorageSync(STORAGE_BT_CHARACTERISTIC_ID)
   uni.removeStorageSync(STORAGE_BT_DEVICE_TYPE)
   uni.removeStorageSync(STORAGE_BLE_MTU)
+  uni.removeStorageSync(STORAGE_BUILTIN_PORT)
+  uni.removeStorageSync(STORAGE_PRINTER_DRIVER_KEY)
 }
 const BLE_MTU_DEFAULT = 20
@@ -64,6 +74,10 @@ export function getPrinterType (): PrinterType | &#39;&#39; {
   return (uni.getStorageSync(STORAGE_PRINTER_TYPE) as PrinterType) || ''
 }
+export function getCurrentPrinterDriverKey (): string {
+  return String(uni.getStorageSync(STORAGE_PRINTER_DRIVER_KEY) || '')
+}
+
 export function getBluetoothConnection (): {
   deviceId: string
   deviceName: string
@@ -182,20 +196,31 @@ function sendViaClassic (
   }
   return new Promise((resolve, reject) => {
     try {
-      const classicBluetooth = (require('./bluetoothTool.js') as any).default
       if (!classicBluetooth) {
         reject(new Error('Classic Bluetooth not available'))
         return
       }
-      const sendData = data.map((byte) => {
-        const b = byte & 0xff
-        if (b >= 128) return b % 128 - 128
-        return b
-      })
+      const ready = typeof classicBluetooth.ensureConnection === 'function'
+        ? classicBluetooth.ensureConnection(conn.deviceId)
+        : true
+      if (!ready) {
+        const errorMessage = typeof classicBluetooth.getLastError === 'function'
+          ? classicBluetooth.getLastError()
+          : ''
+        reject(new Error(errorMessage || 'Classic Bluetooth connection is not ready'))
+        return
+      }
+
+      const sendData = data.map((byte) => byte & 0xff)
       const ok = classicBluetooth.sendByteData(sendData)
       if (onProgress) onProgress(100)
       if (ok) resolve()
-      else reject(new Error('Classic Bluetooth send failed'))
+      else {
+        const errorMessage = typeof classicBluetooth.getLastError === 'function'
+          ? classicBluetooth.getLastError()
+          : ''
+        reject(new Error(errorMessage || 'Classic Bluetooth send failed'))
+      }
     } catch (e: any) {
       reject(e)
     }
@@ -219,24 +244,46 @@ function sendViaBuiltin (data: number[]): Promise&lt;void&gt; {
     const hexStr = Array.from(uint8)
       .map(b => ('0' + (b & 0xff).toString(16)).slice(-2))
       .join('')
-    return new Promise((resolve, reject) => {
-      moeTcp.connect({ ip: '127.0.0.1', port: 9100 }, (res: string) => {
-        try {
-          const r = typeof res === 'string' ? JSON.parse(res) : res
-          if (r.code !== 1) {
-            reject(new Error(r.msg || 'Built-in printer connection failed'))
-            return
-          }
-          moeTcp.sendHexStr({ message: hexStr })
-          setTimeout(() => {
+
+    const savedPort = parseInt(uni.getStorageSync(STORAGE_BUILTIN_PORT)) || 0
+    const ports = savedPort > 0
+      ? [savedPort, ...BUILTIN_PROBE_PORTS.filter(p => p !== savedPort)]
+      : [...BUILTIN_PROBE_PORTS]
+
+    function tryPort (idx: number): Promise<void> {
+      if (idx >= ports.length) {
+        return Promise.reject(new Error(
+          'Built-in printer: all ports failed (tried ' + BUILTIN_PROBE_PORTS.join(', ') +
+          '). Check if the printer service is running on this device.'
+        ))
+      }
+      const port = ports[idx]
+      return new Promise((resolve, reject) => {
+        console.log('[builtin] trying 127.0.0.1:' + port)
+        moeTcp.connect({ ip: '127.0.0.1', port }, (res: string) => {
+          try {
+            const r = typeof res === 'string' ? JSON.parse(res) : res
+            if (r.code !== 1) {
+              console.log('[builtin] port ' + port + ' failed: ' + (r.msg || ''))
+              try { moeTcp.disconnect() } catch (_) {}
+              tryPort(idx + 1).then(resolve).catch(reject)
+              return
+            }
+            console.log('[builtin] connected on port ' + port)
+            uni.setStorageSync(STORAGE_BUILTIN_PORT, String(port))
+            moeTcp.sendHexStr({ message: hexStr })
+            setTimeout(() => {
+              try { moeTcp.disconnect() } catch (_) {}
+              resolve()
+            }, 300)
+          } catch (e) {
             try { moeTcp.disconnect() } catch (_) {}
-            resolve()
-          }, 300)
-        } catch (e) {
-          reject(e)
-        }
+            tryPort(idx + 1).then(resolve).catch(reject)
+          }
+        })
       })
-    })
+    }
+    return tryPort(0)
   } catch (e) {
     return Promise.reject(e)
   }
+import type { LabelPrintPayload } from '../types/printer'
+
+function stringToBytes (str: string): number[] {
+  const out: number[] = []
+  for (let i = 0; i < str.length; i++) {
+    let c = str.charCodeAt(i)
+    if (c < 0x80) {
+      out.push(c)
+    } else if (c < 0x800) {
+      out.push(0xc0 | (c >> 6), 0x80 | (c & 0x3f))
+    } else if (c < 0xd800 || c >= 0xe000) {
+      out.push(0xe0 | (c >> 12), 0x80 | ((c >> 6) & 0x3f), 0x80 | (c & 0x3f))
+    } else {
+      i++
+      const c2 = str.charCodeAt(i)
+      const u = ((c & 0x3ff) << 10) + (c2 & 0x3ff) + 0x10000
+      out.push(
+        0xf0 | (u >> 18),
+        0x80 | ((u >> 12) & 0x3f),
+        0x80 | ((u >> 6) & 0x3f),
+        0x80 | (u & 0x3f)
+      )
+    }
+  }
+  return out
+}
+
+function appendText (out: number[], text: string) {
+  const bytes = stringToBytes(text)
+  for (let i = 0; i < bytes.length; i++) out.push(bytes[i])
+}
+
+function appendLine (out: number[], text = '') {
+  appendText(out, text)
+  out.push(0x0a)
+}
+
+function appendAlign (out: number[], align: 0 | 1 | 2) {
+  out.push(0x1b, 0x61, align)
+}
+
+function appendBold (out: number[], bold: boolean) {
+  out.push(0x1b, 0x45, bold ? 1 : 0)
+}
+
+function appendSize (out: number[], width = 0, height = 0) {
+  const value = ((width & 0x07) << 4) | (height & 0x07)
+  out.push(0x1d, 0x21, value)
+}
+
+function createEscDocument (builder: (out: number[]) => void): number[] {
+  const out: number[] = []
+  out.push(0x1b, 0x40)
+  builder(out)
+  out.push(0x1b, 0x64, 0x04)
+  return out
+}
+
+export function buildEscPosTestPrintData (): number[] {
+  return createEscDocument((out) => {
+    appendAlign(out, 1)
+    appendBold(out, true)
+    appendSize(out, 1, 1)
+    appendLine(out, 'TEST PRINT')
+    appendBold(out, false)
+    appendSize(out, 0, 0)
+    appendLine(out, 'GP-R3 / ESC-POS')
+    appendLine(out, 'Food Label System')
+    appendLine(out, '-----------------------------')
+    appendLine(out, 'Connection OK')
+    appendLine(out, 'Protocol OK')
+    appendLine(out, '-----------------------------')
+  })
+}
+
+export function buildEscPosLabelData (payload: LabelPrintPayload): number[] {
+  const {
+    productName,
+    labelId,
+    printQty = 1,
+    category = '',
+    extraLine = '',
+  } = payload
+
+  return createEscDocument((out) => {
+    appendAlign(out, 1)
+    appendBold(out, true)
+    appendSize(out, 1, 1)
+    appendLine(out, 'FOOD LABEL')
+    appendBold(out, false)
+    appendSize(out, 0, 0)
+    appendLine(out, '-----------------------------')
+    appendLine(out, 'Product: ' + productName)
+    if (category) appendLine(out, 'Category: ' + category)
+    appendLine(out, 'Label ID: ' + labelId)
+    if (extraLine) appendLine(out, extraLine)
+    appendLine(out, 'Qty: ' + String(printQty))
+    appendLine(out, '-----------------------------')
+  })
+}
+import type { LabelPrintPayload } from '../types/printer'
+import { buildTestTscLabel, buildTscLabel } from '../tscLabelBuilder'
+
+export function buildTscTestPrintData (): number[] {
+  return buildTestTscLabel()
+}
+
+export function buildTscLabelData (payload: LabelPrintPayload): number[] {
+  return buildTscLabel(payload)
+}
+export type PrinterType = 'bluetooth' | 'builtin'
+export type BtDeviceType = 'ble' | 'classic' | 'dual' | 'unknown'
+export type ActiveBtDeviceType = 'ble' | 'classic'
+export type PrinterProtocol = 'tsc' | 'esc'
+
+export interface PrinterCandidate {
+  deviceId: string
+  name: string
+  RSSI?: number
+  type?: BtDeviceType
+}
+
+export interface LabelPrintPayload {
+  productName: string
+  labelId: string
+  printQty?: number
+  widthMm?: number
+  heightMm?: number
+  category?: string
+  extraLine?: string
+}
+
+export interface PrinterDriver {
+  key: string
+  brand: string
+  model: string
+  displayName: string
+  protocol: PrinterProtocol
+  preferredConnection?: ActiveBtDeviceType
+  preferredBleMtu?: number
+  keywords: string[]
+  matches: (device: PrinterCandidate) => number
+  resolveConnectionType: (device: PrinterCandidate) => ActiveBtDeviceType
+  buildTestPrintData: () => number[]
+  buildLabelData: (payload: LabelPrintPayload) => number[]
+}
+
+export interface ResolvedPrinterCandidate extends PrinterCandidate {
+  driverKey: string
+  driverName: string
+  protocol: PrinterProtocol
+  resolvedType: ActiveBtDeviceType
+}
+
+export interface CurrentPrinterSummary {
+  type: PrinterType | ''
+  displayName: string
+  deviceId: string
+  driverKey: string
+  driverName: string
+  protocol: PrinterProtocol
+  deviceType?: ActiveBtDeviceType | ''
+}
@@ -5,5 +5,9 @@ namespace FoodLabeling.Application.Contracts.Dtos.RbacRole;
 /// </summary>
 public class RbacRoleGetOutputDto : RbacRoleGetListOutputDto
 {
+    /// <summary>
+    /// 该角色已分配的菜单权限ID列表
+    /// </summary>
+    public List<string> MenuIds { get; set; } = new();
 }
+namespace FoodLabeling.Application.Contracts.Dtos.TeamMember;
+
+public class TeamMemberAssignedLocationDto
+{
+    public string Id { get; set; } = string.Empty;
+
+    public string LocationCode { get; set; } = string.Empty;
+
+    public string LocationName { get; set; } = string.Empty;
+}
+
+namespace FoodLabeling.Application.Contracts.Dtos.TeamMember;
+
+public class TeamMemberCreateInputVo
+{
+    public string FullName { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 登录账号（建议用邮箱或自定义用户名）
+    /// </summary>
+    public string UserName { get; set; } = string.Empty;
+
+    public string Password { get; set; } = string.Empty;
+
+    public string? Email { get; set; }
+
+    public long? Phone { get; set; }
+
+    public Guid? RoleId { get; set; }
+
+    /// <summary>
+    /// 关联门店（至少1个）
+    /// </summary>
+    public List<string> LocationIds { get; set; } = new();
+
+    public bool State { get; set; } = true;
+}
+
+using Volo.Abp.Application.Dtos;
+
+namespace FoodLabeling.Application.Contracts.Dtos.TeamMember;
+
+/// <summary>
+/// 成员分页查询入参
+/// </summary>
+public class TeamMemberGetListInputVo : PagedAndSortedResultRequestDto
+{
+    /// <summary>
+    /// 关键字（姓名/用户名/邮箱/电话）
+    /// </summary>
+    public string? Keyword { get; set; }
+
+    /// <summary>
+    /// 角色ID（可选）
+    /// </summary>
+    public Guid? RoleId { get; set; }
+
+    /// <summary>
+    /// 门店ID（可选）
+    /// </summary>
+    public string? LocationId { get; set; }
+
+    /// <summary>
+    /// 启用状态（可选）
+    /// </summary>
+    public bool? State { get; set; }
+}
+
+namespace FoodLabeling.Application.Contracts.Dtos.TeamMember;
+
+public class TeamMemberGetListOutputDto
+{
+    public Guid Id { get; set; }
+
+    public string FullName { get; set; } = string.Empty;
+
+    public string UserName { get; set; } = string.Empty;
+
+    public string? Email { get; set; }
+
+    public long? Phone { get; set; }
+
+    public bool State { get; set; }
+
+    /// <summary>
+    /// 角色（当前仅返回第一个）
+    /// </summary>
+    public Guid? RoleId { get; set; }
+
+    public string? RoleName { get; set; }
+
+    public List<TeamMemberAssignedLocationDto> AssignedLocations { get; set; } = new();
+}
+
+namespace FoodLabeling.Application.Contracts.Dtos.TeamMember;
+
+public class TeamMemberGetOutputDto
+{
+    public Guid Id { get; set; }
+
+    public string FullName { get; set; } = string.Empty;
+
+    public string UserName { get; set; } = string.Empty;
+
+    public string? Email { get; set; }
+
+    public long? Phone { get; set; }
+
+    public bool State { get; set; }
+
+    public Guid? RoleId { get; set; }
+
+    public List<string> LocationIds { get; set; } = new();
+
+    public List<TeamMemberAssignedLocationDto> AssignedLocations { get; set; } = new();
+}
+
+namespace FoodLabeling.Application.Contracts.Dtos.TeamMember;
+
+public class TeamMemberUpdateInputVo
+{
+    public string FullName { get; set; } = string.Empty;
+
+    public string UserName { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 为空表示不改密码
+    /// </summary>
+    public string? Password { get; set; }
+
+    public string? Email { get; set; }
+
+    public long? Phone { get; set; }
+
+    public Guid? RoleId { get; set; }
+
+    public List<string> LocationIds { get; set; } = new();
+
+    public bool State { get; set; } = true;
+}
+
+using FoodLabeling.Application.Contracts.Dtos.Common;
+using FoodLabeling.Application.Contracts.Dtos.TeamMember;
+
+namespace FoodLabeling.Application.Contracts.IServices;
+
+public interface ITeamMemberAppService
+{
+    Task<PagedResultWithPageDto<TeamMemberGetListOutputDto>> GetListAsync(TeamMemberGetListInputVo input);
+
+    Task<TeamMemberGetOutputDto> GetAsync(Guid id);
+
+    Task<TeamMemberGetOutputDto> CreateAsync(TeamMemberCreateInputVo input);
+
+    Task<TeamMemberGetOutputDto> UpdateAsync(Guid id, TeamMemberUpdateInputVo input);
+
+    Task DeleteAsync(Guid id);
+}
+
+using SqlSugar;
+
+namespace FoodLabeling.Application.Services.DbModels;
+
+/// <summary>
+/// rolemenu 表映射（兼容字符串类型 RoleId/MenuId）
+/// </summary>
+[SugarTable("rolemenu")]
+public class RoleMenuDbEntity
+{
+    [SugarColumn(IsPrimaryKey = true)]
+    public string Id { get; set; } = string.Empty;
+
+    public string RoleId { get; set; } = string.Empty;
+
+    public string MenuId { get; set; } = string.Empty;
+}
+
+using SqlSugar;
+
+namespace FoodLabeling.Application.Services.DbModels;
+
+/// <summary>
+/// userlocation 表映射（成员-门店关联）
+/// </summary>
+[SugarTable("userlocation")]
+public class UserLocationDbEntity
+{
+    [SugarColumn(IsPrimaryKey = true)]
+    public string Id { get; set; } = string.Empty;
+
+    public bool IsDeleted { get; set; }
+
+    public DateTime CreationTime { get; set; }
+
+    public string? CreatorId { get; set; }
+
+    public string? LastModifierId { get; set; }
+
+    public DateTime? LastModificationTime { get; set; }
+
+    public string UserId { get; set; } = string.Empty;
+
+    public string LocationId { get; set; } = string.Empty;
+
+    public string? ConcurrencyStamp { get; set; }
+}
+
 using FoodLabeling.Application.Contracts.Dtos.RbacRole;
 using FoodLabeling.Application.Contracts.Dtos.Common;
 using FoodLabeling.Application.Contracts.IServices;
+using FoodLabeling.Application.Services.DbModels;
 using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
 using Volo.Abp;
@@ -17,17 +18,20 @@ namespace FoodLabeling.Application.Services;
 /// </summary>
 public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
 {
+    private readonly ISqlSugarDbContext _dbContext;
     private readonly ISqlSugarRepository<RoleAggregateRoot, Guid> _roleRepository;
     private readonly ISqlSugarRepository<RoleMenuEntity> _roleMenuRepository;
     private readonly ISqlSugarRepository<RoleDeptEntity> _roleDeptRepository;
     private readonly ISqlSugarRepository<UserRoleEntity> _userRoleRepository;
     public RbacRoleAppService(
+        ISqlSugarDbContext dbContext,
         ISqlSugarRepository<RoleAggregateRoot, Guid> roleRepository,
         ISqlSugarRepository<RoleMenuEntity> roleMenuRepository,
         ISqlSugarRepository<RoleDeptEntity> roleDeptRepository,
         ISqlSugarRepository<UserRoleEntity> userRoleRepository)
     {
+        _dbContext = dbContext;
         _roleRepository = roleRepository;
         _roleMenuRepository = roleMenuRepository;
         _roleDeptRepository = roleDeptRepository;
@@ -90,6 +94,11 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
             throw new UserFriendlyException("角色不存在");
         }
+        var menuIds = await _dbContext.SqlSugarClient.Queryable<RoleMenuDbEntity>()
+            .Where(x => x.RoleId == id.ToString())
+            .Select(x => x.MenuId)
+            .ToListAsync();
+
         return new RbacRoleGetOutputDto
         {
             Id = entity.Id,
@@ -98,7 +107,8 @@ public class RbacRoleAppService : ApplicationService, IRbacRoleAppService
             Remark = entity.Remark,
             DataScope = (int)entity.DataScope,
             State = entity.State,
-            OrderNum = entity.OrderNum
+            OrderNum = entity.OrderNum,
+            MenuIds = menuIds
         };
     }
+using FoodLabeling.Application.Contracts.Dtos.Common;
+using FoodLabeling.Application.Contracts.Dtos.TeamMember;
+using FoodLabeling.Application.Contracts.IServices;
+using FoodLabeling.Application.Services.DbModels;
+using FoodLabeling.Domain.Entities;
+using SqlSugar;
+using Volo.Abp;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Guids;
+using Yi.Framework.Rbac.Domain.Entities;
+using Yi.Framework.Rbac.Domain.Managers;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace FoodLabeling.Application.Services;
+
+/// <summary>
+/// 成员（Team Member/Manager）服务，对外仅在 food-labeling-us 暴露
+/// </summary>
+public class TeamMemberAppService : ApplicationService, ITeamMemberAppService
+{
+    private readonly ISqlSugarRepository<UserAggregateRoot, Guid> _userRepository;
+    private readonly UserManager _userManager;
+    private readonly ISqlSugarDbContext _dbContext;
+    private readonly IGuidGenerator _guidGenerator;
+
+    public TeamMemberAppService(
+        ISqlSugarRepository<UserAggregateRoot, Guid> userRepository,
+        UserManager userManager,
+        ISqlSugarDbContext dbContext,
+        IGuidGenerator guidGenerator)
+    {
+        _userRepository = userRepository;
+        _userManager = userManager;
+        _dbContext = dbContext;
+        _guidGenerator = guidGenerator;
+    }
+
+    /// <summary>
+    /// 成员分页列表（含角色与已分配门店）
+    /// </summary>
+    public async Task<PagedResultWithPageDto<TeamMemberGetListOutputDto>> GetListAsync(TeamMemberGetListInputVo input)
+    {
+        var pageIndex = input.SkipCount / input.MaxResultCount + 1;
+        var pageSize = input.MaxResultCount;
+        var keyword = input.Keyword?.Trim();
+
+        RefAsync<int> total = 0;
+
+        // 先按 user 表筛选分页，再批量补齐角色与门店
+        var users = await _userRepository._DbQueryable
+            .Where(u => !u.IsDeleted)
+            .WhereIF(!string.IsNullOrWhiteSpace(keyword),
+                u => (u.Name != null && u.Name.Contains(keyword!)) ||
+                     u.UserName.Contains(keyword!) ||
+                     (u.Email != null && u.Email.Contains(keyword!)) ||
+                     (u.Phone != null && u.Phone.ToString()!.Contains(keyword!)))
+            .WhereIF(input.State != null, u => u.State == input.State)
+            .OrderByIF(!string.IsNullOrWhiteSpace(input.Sorting), input.Sorting!)
+            .OrderByDescending(u => u.CreationTime)
+            .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
+
+        var userIds = users.Select(x => x.Id).ToList();
+        var userIdStrings = userIds.Select(x => x.ToString()).ToList();
+
+        // user-role: 仅取第一个角色（原型表格展示单角色）
+        var userRolePairs = await _dbContext.SqlSugarClient.Queryable<UserRoleEntity, RoleAggregateRoot>((ur, r) => ur.RoleId == r.Id)
+            .Where(ur => userIds.Contains(ur.UserId))
+            .Select((ur, r) => new { ur.UserId, r.Id, r.RoleName })
+            .ToListAsync();
+
+        var roleMap = userRolePairs
+            .GroupBy(x => x.UserId)
+            .ToDictionary(g => g.Key, g => g.FirstOrDefault());
+
+        // user-location
+        var userLocations = await _dbContext.SqlSugarClient.Queryable<UserLocationDbEntity>()
+            .Where(x => !x.IsDeleted)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.LocationId), x => x.LocationId == input.LocationId)
+            .Where(x => userIdStrings.Contains(x.UserId))
+            .ToListAsync();
+
+        // 如果按 LocationId 过滤，需要反向过滤掉无关联的 user
+        if (!string.IsNullOrWhiteSpace(input.LocationId))
+        {
+            var allowedUserIds = userLocations.Select(x => x.UserId).ToHashSet();
+            users = users.Where(u => allowedUserIds.Contains(u.Id.ToString())).ToList();
+        }
+
+        var locationIds = userLocations.Select(x => x.LocationId).Distinct().ToList();
+        var locations = await _dbContext.SqlSugarClient.Queryable<LocationAggregateRoot>()
+            .Where(x => !x.IsDeleted)
+            .WhereIF(locationIds.Count > 0, x => locationIds.Contains(x.Id.ToString()))
+            .Select(x => new { x.Id, x.LocationCode, x.LocationName })
+            .ToListAsync();
+        var locationMap = locations.ToDictionary(x => x.Id.ToString(), x => x);
+
+        var assignedMap = userLocations
+            .GroupBy(x => x.UserId)
+            .ToDictionary(
+                g => g.Key,
+                g => g.Select(x =>
+                {
+                    if (locationMap.TryGetValue(x.LocationId, out var loc))
+                    {
+                        return new TeamMemberAssignedLocationDto
+                        {
+                            Id = loc.Id.ToString(),
+                            LocationCode = loc.LocationCode,
+                            LocationName = loc.LocationName
+                        };
+                    }
+                    return null;
+                }).Where(x => x != null).Cast<TeamMemberAssignedLocationDto>().ToList());
+
+        var items = users.Select(u =>
+        {
+            roleMap.TryGetValue(u.Id, out var role);
+            assignedMap.TryGetValue(u.Id.ToString(), out var assigned);
+
+            return new TeamMemberGetListOutputDto
+            {
+                Id = u.Id,
+                FullName = u.Name ?? string.Empty,
+                UserName = u.UserName,
+                Email = u.Email,
+                Phone = u.Phone,
+                State = u.State,
+                RoleId = role?.Id,
+                RoleName = role?.RoleName,
+                AssignedLocations = assigned ?? new List<TeamMemberAssignedLocationDto>()
+            };
+        }).ToList();
+
+        var totalCount = (long)total;
+        return new PagedResultWithPageDto<TeamMemberGetListOutputDto>
+        {
+            PageIndex = pageIndex,
+            PageSize = pageSize,
+            TotalCount = totalCount,
+            TotalPages = (int)Math.Ceiling(totalCount / (double)pageSize),
+            Items = items
+        };
+    }
+
+    /// <summary>
+    /// 成员详情（带门店ID列表）
+    /// </summary>
+    public async Task<TeamMemberGetOutputDto> GetAsync(Guid id)
+    {
+        var user = await _userRepository.GetByIdAsync(id);
+        if (user is null || user.IsDeleted)
+        {
+            throw new UserFriendlyException("成员不存在");
+        }
+
+        var userIdString = id.ToString();
+        var links = await _dbContext.SqlSugarClient.Queryable<UserLocationDbEntity>()
+            .Where(x => !x.IsDeleted && x.UserId == userIdString)
+            .ToListAsync();
+
+        var locationIds = links.Select(x => x.LocationId).Distinct().ToList();
+        var locations = await _dbContext.SqlSugarClient.Queryable<LocationAggregateRoot>()
+            .Where(x => !x.IsDeleted)
+            .WhereIF(locationIds.Count > 0, x => locationIds.Contains(x.Id.ToString()))
+            .Select(x => new { x.Id, x.LocationCode, x.LocationName })
+            .ToListAsync();
+
+        var assigned = locations.Select(x => new TeamMemberAssignedLocationDto
+        {
+            Id = x.Id.ToString(),
+            LocationCode = x.LocationCode,
+            LocationName = x.LocationName
+        }).ToList();
+
+        var role = await _dbContext.SqlSugarClient.Queryable<UserRoleEntity>().FirstAsync(x => x.UserId == id);
+
+        return new TeamMemberGetOutputDto
+        {
+            Id = user.Id,
+            FullName = user.Name ?? string.Empty,
+            UserName = user.UserName,
+            Email = user.Email,
+            Phone = user.Phone,
+            State = user.State,
+            RoleId = role?.RoleId,
+            LocationIds = locationIds,
+            AssignedLocations = assigned
+        };
+    }
+
+    /// <summary>
+    /// 新增成员（同步设置角色与门店）
+    /// </summary>
+    public async Task<TeamMemberGetOutputDto> CreateAsync(TeamMemberCreateInputVo input)
+    {
+        if (input.LocationIds is null || input.LocationIds.Count == 0)
+        {
+            throw new UserFriendlyException("成员必须至少分配一个门店");
+        }
+
+        var user = new UserAggregateRoot(input.UserName.Trim(), input.Password, input.Phone, input.FullName.Trim())
+        {
+            Name = input.FullName.Trim(),
+            Email = input.Email?.Trim(),
+            State = input.State
+        };
+
+        EntityHelper.TrySetId(user, _guidGenerator.Create);
+        user.BuildPassword();
+
+        await _userManager.CreateAsync(user);
+
+        if (input.RoleId != null)
+        {
+            await _userManager.GiveUserSetRoleAsync(new List<Guid> { user.Id }, new List<Guid> { input.RoleId.Value });
+        }
+
+        await UpsertUserLocationsAsync(user.Id, input.LocationIds);
+
+        return await GetAsync(user.Id);
+    }
+
+    /// <summary>
+    /// 编辑成员（同步设置角色与门店）
+    /// </summary>
+    public async Task<TeamMemberGetOutputDto> UpdateAsync(Guid id, TeamMemberUpdateInputVo input)
+    {
+        if (input.LocationIds is null || input.LocationIds.Count == 0)
+        {
+            throw new UserFriendlyException("成员必须至少分配一个门店");
+        }
+
+        var user = await _userRepository.GetByIdAsync(id);
+        if (user is null || user.IsDeleted)
+        {
+            throw new UserFriendlyException("成员不存在");
+        }
+
+        user.Name = input.FullName.Trim();
+        user.UserName = input.UserName.Trim();
+        user.Email = input.Email?.Trim();
+        user.Phone = input.Phone;
+        user.State = input.State;
+
+        if (!string.IsNullOrWhiteSpace(input.Password))
+        {
+            user.EncryPassword.Password = input.Password;
+            user.BuildPassword();
+        }
+
+        await _userRepository.UpdateAsync(user);
+
+        // 角色：覆盖式设置（只保留一个）
+        if (input.RoleId != null)
+        {
+            await _userManager.GiveUserSetRoleAsync(new List<Guid> { id }, new List<Guid> { input.RoleId.Value });
+        }
+        else
+        {
+            await _userManager.GiveUserSetRoleAsync(new List<Guid> { id }, new List<Guid>());
+        }
+
+        await UpsertUserLocationsAsync(id, input.LocationIds);
+
+        return await GetAsync(id);
+    }
+
+    /// <summary>
+    /// 删除成员（逻辑删除 user；并逻辑删除关联表）
+    /// </summary>
+    public async Task DeleteAsync(Guid id)
+    {
+        var user = await _userRepository.GetByIdAsync(id);
+        if (user is null || user.IsDeleted)
+        {
+            return;
+        }
+
+        user.IsDeleted = true;
+        await _userRepository.UpdateAsync(user);
+
+        var userIdString = id.ToString();
+        var currentUserId = CurrentUser?.Id?.ToString();
+        await _dbContext.SqlSugarClient.Updateable<UserLocationDbEntity>()
+            .SetColumns(x => new UserLocationDbEntity
+            {
+                IsDeleted = true,
+                LastModificationTime = DateTime.Now,
+                LastModifierId = currentUserId
+            })
+            .Where(x => x.UserId == userIdString && !x.IsDeleted)
+            .ExecuteCommandAsync();
+    }
+
+    private async Task UpsertUserLocationsAsync(Guid userId, List<string> locationIds)
+    {
+        var now = DateTime.Now;
+        var userIdString = userId.ToString();
+        var wanted = locationIds.Where(x => !string.IsNullOrWhiteSpace(x)).Select(x => x.Trim()).Distinct().ToList();
+        var currentUserId = CurrentUser?.Id?.ToString();
+
+        // 校验门店存在且未删除
+        var validCount = await _dbContext.SqlSugarClient.Queryable<LocationAggregateRoot>()
+            .Where(x => !x.IsDeleted)
+            .Where(x => wanted.Contains(x.Id.ToString()))
+            .CountAsync();
+        if (validCount != wanted.Count)
+        {
+            throw new UserFriendlyException("存在无效门店，请刷新后重试");
+        }
+
+        var existing = await _dbContext.SqlSugarClient.Queryable<UserLocationDbEntity>()
+            .Where(x => x.UserId == userIdString)
+            .ToListAsync();
+
+        var existingActive = existing.Where(x => !x.IsDeleted).ToList();
+        var existingActiveSet = existingActive.Select(x => x.LocationId).ToHashSet();
+
+        // 需要删除的（逻辑删除）
+        var toDelete = existingActive.Where(x => !wanted.Contains(x.LocationId)).ToList();
+        if (toDelete.Count > 0)
+        {
+            var ids = toDelete.Select(x => x.Id).ToList();
+            await _dbContext.SqlSugarClient.Updateable<UserLocationDbEntity>()
+                .SetColumns(x => new UserLocationDbEntity
+                {
+                    IsDeleted = true,
+                    LastModificationTime = now,
+                    LastModifierId = currentUserId
+                })
+                .Where(x => ids.Contains(x.Id))
+                .ExecuteCommandAsync();
+        }
+
+        // 需要新增的
+        var toInsert = wanted.Where(x => !existingActiveSet.Contains(x)).ToList();
+        if (toInsert.Count > 0)
+        {
+            var rows = toInsert.Select(locationId => new UserLocationDbEntity
+            {
+                Id = _guidGenerator.Create().ToString(),
+                IsDeleted = false,
+                CreationTime = now,
+                CreatorId = currentUserId,
+                UserId = userIdString,
+                LocationId = locationId,
+                ConcurrencyStamp = string.Empty
+            }).ToList();
+
+            await _dbContext.SqlSugarClient.Insertable(rows).ExecuteCommandAsync();
+        }
+    }
+}
+