diff --git a/.gitignore b/.gitignore
index fffe2006..0e03f346 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,3 +56,7 @@ node_modules/
 # 误入库的运行日志：lego 未配置日志路径时会在工作目录写 ./log，
 # 本地跑一次服务或 go test 就被覆写一次，制造无意义 diff。
 apps/services/comm/log
+
+# gin 子系统的运行日志：本地跑服务时按时间戳滚动生成（多为 0 字节），
+# 与 apps/services/comm/log 同一性质，不进版本管理。
+apps/services/lego/sys/gin/log-*.log
diff --git a/apps/admin/app/pages/appversion.vue b/apps/admin/app/pages/appversion.vue
new file mode 100644
index 00000000..0752c276
--- /dev/null
+++ b/apps/admin/app/pages/appversion.vue
@@ -0,0 +1,254 @@
+<template>
+  <div>
+    <!-- 顶部 -->
+    <div class="flex items-center justify-between mb-5 flex-wrap gap-3">
+      <div>
+        <h2 class="text-lg font-semibold text-slate-800">版本控制</h2>
+        <p class="text-xs text-slate-400 mt-1">
+          按应用配置线上版本、强制更新与送审版本。<b>整个应用一套，不分渠道</b>——各商店的下载地址可在「渠道分发」里单独覆盖。
+        </p>
+      </div>
+      <div class="flex items-center gap-3">
+        <span class="text-sm text-slate-500">应用</span>
+        <select v-model="scopeApp" class="select select-bordered select-sm" @change="load">
+          <option value="">全局默认（所有应用兜底）</option>
+          <option v-for="a in scopeApps" :key="a" :value="a">{{ a }}</option>
+        </select>
+      </div>
+    </div>
+
+    <div v-if="!scopeApp" class="scope-tip">
+      当前是<b>全局默认</b>作用域：这里配的对所有应用生效；某个应用单独配了，则以应用的为准。
+    </div>
+
+    <div class="ver-wrap">
+      <!-- 左：表单 -->
+      <div class="card">
+        <section class="ed-section">
+          <div class="ed-section-title">线上版本</div>
+          <div class="grid grid-cols-2 gap-3">
+            <div>
+              <span class="ed-label">当前线上版本</span>
+              <input v-model="form.version" class="input input-bordered input-sm w-full" placeholder="如 1.0.1" />
+              <p class="ed-hint">高于客户端本机版本时提示「有新版本」。填客户端上报的净版本号，<b>不含构建号</b>（<code>1.0.1</code> 而不是 <code>1.0.1+5</code>）。</p>
+            </div>
+            <div>
+              <span class="ed-label">送审版本号</span>
+              <input v-model="form.review_version" class="input input-bordered input-sm w-full" placeholder="过审后清空" />
+              <p class="ed-hint">客户端上报的版本正好等于它时，会隐藏未过审的功能。</p>
+            </div>
+          </div>
+        </section>
+
+        <section class="ed-section">
+          <div class="ed-section-title">强制更新</div>
+          <label class="flex items-center gap-2 text-sm cursor-pointer">
+            <input v-model="form.force_update" type="checkbox" class="checkbox checkbox-sm checkbox-primary" />
+            <span>开启强制更新</span>
+          </label>
+          <div v-if="form.force_update" class="pl-7 mt-2">
+            <span class="ed-label">最低支持版本（必填）</span>
+            <input v-model="form.min_version" class="input input-bordered input-sm w-full" placeholder="如 1.0.0" />
+            <p class="ed-hint">
+              低于这个版本的客户端会弹出<b>不可关闭</b>的升级框，无法继续使用。
+              不填等于开了强更却挡不住任何人。
+            </p>
+          </div>
+          <p v-if="versionWarn" class="ed-warn">⚠ {{ versionWarn }}</p>
+        </section>
+
+        <section class="ed-section">
+          <div class="ed-section-title">下载与说明</div>
+          <span class="ed-label">默认下载地址</span>
+          <input v-model="form.address" class="input input-bordered input-sm w-full" placeholder="应用商店链接或 apk 直链" />
+          <p class="ed-hint">
+            <b>各商店链接不一样</b>，这里填的是兜底值；华为/小米/App Store 等请在
+            <NuxtLink class="link" to="/channels">渠道分发</NuxtLink>
+            里给对应渠道填「本渠道下载地址」，渠道填了就以渠道的为准。
+          </p>
+          <div class="mt-3">
+            <span class="ed-label">更新日志</span>
+            <textarea v-model="form.changelog" class="textarea textarea-bordered w-full text-xs" rows="4" placeholder="本次更新内容，会下发给客户端在升级框里展示" />
+          </div>
+        </section>
+
+        <div class="ed-footer">
+          <button class="btn btn-ghost btn-sm" :disabled="submitting" @click="load">重置</button>
+          <button class="btn btn-primary btn-sm text-white" :disabled="submitting" @click="save">保存</button>
+        </div>
+      </div>
+
+      <!-- 右：判定预览。版本比较是这块最容易出错的地方，直接把结论摆出来 -->
+      <div class="card preview">
+        <div class="ed-section-title">判定预览</div>
+        <p class="text-xs text-slate-400 mb-3">输入一个客户端版本号，看它会被判成什么。与服务端 comm.CompareVersion 同一套逐段整数比较。</p>
+        <input v-model="probe" class="input input-bordered input-sm w-full" placeholder="如 1.0.1" />
+        <div class="probe-list">
+          <div class="probe-row">
+            <span>有更新可用</span>
+            <span class="badge" :class="probeResult.need ? 'on' : 'off'">{{ probeResult.need ? '是' : '否' }}</span>
+          </div>
+          <div class="probe-row">
+            <span>必须更新（阻断使用）</span>
+            <span class="badge" :class="probeResult.force ? 'warn' : 'off'">{{ probeResult.force ? '是' : '否' }}</span>
+          </div>
+          <div class="probe-row">
+            <span>处于审核期</span>
+            <span class="badge" :class="probeResult.reviewing ? 'on' : 'off'">{{ probeResult.reviewing ? '是' : '否' }}</span>
+          </div>
+        </div>
+        <p v-if="!probe.trim()" class="ed-hint mt-3">
+          客户端没上报版本号时三项<b>一律为否</b>——拿不到版本就判强更会把所有老客户端挡在门外。
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted } from 'vue'
+import { useApi } from '~/composables/useApi'
+import { useToast } from '~/composables/useToast'
+
+definePageMeta({ title: '版本控制' })
+
+interface AppRelease {
+  version: string
+  min_version: string
+  force_update: boolean
+  changelog: string
+  address: string
+  review_version: string
+}
+
+const { webApi, consoleApi } = useApi()
+const { success, error } = useToast()
+
+const scopeApp = ref('')
+const scopeApps = ref<string[]>([])
+const submitting = ref(false)
+const probe = ref('')
+
+function emptyForm(): AppRelease {
+  return { version: '', min_version: '', force_update: false, changelog: '', address: '', review_version: '' }
+}
+const form = reactive<AppRelease>(emptyForm())
+
+// 与后端 comm.CompareVersion 同语义：切掉构建号、逐段按整数比、短的补 0、段内取前导数字。
+// 后台这份只用于即时提示，真正的判定在服务端——两边不一致时以服务端为准。
+function cmpVer(a: string, b: string): number {
+  const as = a.split('+')[0]!.trim().split('.')
+  const bs = b.split('+')[0]!.trim().split('.')
+  const n = Math.max(as.length, bs.length)
+  for (let i = 0; i < n; i++) {
+    const x = parseInt(as[i] ?? '0') || 0
+    const y = parseInt(bs[i] ?? '0') || 0
+    if (x !== y) return x < y ? -1 : 1
+  }
+  return 0
+}
+
+const versionWarn = computed(() => {
+  if (form.force_update && !form.min_version.trim()) {
+    return '开启强制更新时必须填「最低支持版本」，否则挡不住任何人'
+  }
+  if (form.min_version.trim() && form.version.trim() && cmpVer(form.min_version, form.version) > 0) {
+    return '「最低支持版本」高于「当前线上版本」，会把所有线上用户判定为需强更却无更高版本可更'
+  }
+  return ''
+})
+
+// 与服务端 evalChannelUpgrade 逐条对齐（含「强更必然意味着有更新」这条兜底）
+const probeResult = computed(() => {
+  const v = probe.value.trim()
+  if (!v) return { need: false, force: false, reviewing: false }
+  const need = !!form.version.trim() && cmpVer(v, form.version) < 0
+  const force = form.force_update && !!form.min_version.trim() && cmpVer(v, form.min_version) < 0
+  const reviewing = !!form.review_version.trim() && cmpVer(v, form.review_version) === 0
+  return { need: need || force, force, reviewing }
+})
+
+// 应用名来源：应用中心的应用表 + 部署注册表（兜底老数据）；无权读这两张表时改走 api_getmyapps。
+async function loadScopeApps() {
+  const names = new Set<string>()
+  const [products, deploys] = await Promise.all([
+    consoleApi<Array<{ name: string }>>('products/list', {}).catch(() => [] as Array<{ name: string }>),
+    consoleApi<Array<{ app_name?: string; name: string }>>('apps/list', {}).catch(() => [] as Array<{ app_name?: string; name: string }>),
+  ])
+  ;(products ?? []).forEach((p) => p.name && names.add(p.name))
+  ;(deploys ?? []).forEach((d) => (d.app_name || d.name) && names.add(d.app_name || d.name))
+  if (!names.size) {
+    try {
+      const d = await webApi<{ apps: Array<{ name: string; app_name?: string }> }>('getmyapps', {})
+      ;(d?.apps ?? []).forEach((a) => {
+        const n = a.app_name || a.name
+        if (n) names.add(n)
+      })
+    } catch {
+      // 拿不到就只剩「全局默认」，不阻断页面
+    }
+  }
+  scopeApps.value = [...names].sort()
+}
+
+async function load() {
+  try {
+    const d = await webApi<{ item: AppRelease }>('getapprelease', { app_name: scopeApp.value })
+    Object.assign(form, emptyForm(), d?.item ?? {})
+  } catch (e: any) {
+    error(e?.message ?? '加载失败')
+    Object.assign(form, emptyForm())
+  }
+}
+
+async function save() {
+  if (versionWarn.value) { error(versionWarn.value); return }
+  submitting.value = true
+  try {
+    // 只提交版本这一组字段：游客登录配置和它同一行，整行提交会把对方清空。
+    await webApi('saveappversion', {
+      app_name: scopeApp.value,
+      version: form.version,
+      min_version: form.min_version,
+      force_update: form.force_update,
+      changelog: form.changelog,
+      address: form.address,
+      review_version: form.review_version,
+    })
+    success('保存成功')
+    await load()
+  } catch (e: any) {
+    error(e?.message ?? '保存失败')
+  } finally {
+    submitting.value = false
+  }
+}
+
+onMounted(async () => {
+  await loadScopeApps()
+  await load()
+})
+</script>
+
+<style scoped>
+.scope-tip { background: #f8fafc; border: 1px solid #e2e8f0; color: #475569; font-size: 12px; padding: 8px 12px; border-radius: 10px; margin-bottom: 16px; }
+.ver-wrap { display: grid; gap: 16px; grid-template-columns: minmax(0, 2fr) minmax(260px, 1fr); align-items: start; }
+@media (max-width: 900px) { .ver-wrap { grid-template-columns: 1fr; } }
+.card { background: #fff; border: 1px solid #eef2f7; border-radius: 14px; padding: 18px 20px; }
+.ed-section { padding-bottom: 16px; margin-bottom: 16px; border-bottom: 1px solid #f1f5f9; }
+.ed-section:last-of-type { border-bottom: 0; margin-bottom: 0; }
+.ed-section-title { font-size: 13px; font-weight: 700; color: #334155; margin-bottom: 10px; }
+.ed-label { display: block; font-size: 12px; color: #64748b; margin-bottom: 4px; }
+.ed-hint { font-size: 11px; color: #94a3b8; margin-top: 4px; line-height: 1.6; }
+.ed-warn { font-size: 12px; color: #b45309; background: #fffbeb; border: 1px solid #fde68a; border-radius: 8px; padding: 6px 10px; margin-top: 10px; }
+.ed-footer { display: flex; justify-content: flex-end; gap: 8px; padding-top: 14px; border-top: 1px solid #f1f5f9; }
+.preview { position: sticky; top: 16px; }
+.probe-list { margin-top: 12px; display: flex; flex-direction: column; gap: 8px; }
+.probe-row { display: flex; align-items: center; justify-content: space-between; font-size: 12px; color: #475569; }
+.badge { font-size: 11px; font-weight: 700; padding: 2px 10px; border-radius: 8px; }
+.badge.on { background: #dcfce7; color: #059669; }
+.badge.warn { background: #ffe4e6; color: #be123c; }
+.badge.off { background: #f1f5f9; color: #94a3b8; }
+.link { color: #4f46e5; text-decoration: underline; }
+code { background: #f1f5f9; padding: 0 4px; border-radius: 4px; }
+</style>
diff --git a/apps/admin/app/pages/channels.vue b/apps/admin/app/pages/channels.vue
index 1dda54dd..11ebb8dd 100644
--- a/apps/admin/app/pages/channels.vue
+++ b/apps/admin/app/pages/channels.vue
@@ -5,7 +5,15 @@
       <div>
         <h2 class="text-lg font-semibold text-slate-800">渠道分发</h2>
         <p class="text-xs text-slate-400 mt-1">
-          管理各应用在各分发渠道上的版本、强制更新与能力开关。支付渠道在这里控制「开放哪几种支付入口」，商户凭据在应用的业务功能配置里填。
+          管理各应用在各分发渠道上<b>因渠道而异</b>的东西：本渠道下载地址、上架状态、支付渠道、是否允许跳过设备绑定。
+          支付渠道在这里控制「开放哪几种支付入口」，商户凭据在应用的业务功能配置里填。
+        </p>
+        <p class="text-xs text-slate-400 mt-1">
+          版本号 / 强制更新 / 送审版本去
+          <NuxtLink class="link" to="/appversion">服务配置 → 版本控制</NuxtLink>，
+          游客登录开关去
+          <NuxtLink class="link" to="/guestaccess">服务配置 → 游客显隐控制</NuxtLink>
+          —— 那两组是整个应用一套的，不分渠道。
         </p>
       </div>
       <div class="flex items-center gap-3">
@@ -52,26 +60,7 @@
             <span class="status-badge" :style="statusStyle(c.status)">{{ statusLabel(c.status) }}</span>
           </div>
 
-          <div class="ver-row">
-            <div class="ver-box">
-              <span class="ver-label">线上版本</span>
-              <span class="ver-val">{{ c.version || '—' }}</span>
-            </div>
-            <div class="ver-box">
-              <span class="ver-label">最低支持</span>
-              <span class="ver-val" :class="{ warn: c.force_update }">{{ c.min_version || '—' }}</span>
-            </div>
-            <div v-if="c.review_version" class="ver-box">
-              <span class="ver-label">审核中</span>
-              <span class="ver-val review">{{ c.review_version }}</span>
-            </div>
-          </div>
-
           <div class="flex flex-wrap items-center gap-1.5 mt-2">
-            <span v-if="c.force_update" class="flag flag-warn">强制更新</span>
-            <span v-if="c.tourists" class="flag" :class="{ 'flag-warn': !c.touristsversion }">
-              {{ c.touristsversion ? `游客登录 仅 ${c.touristsversion}` : '游客登录 未填版本(不生效)' }}
-            </span>
             <span v-if="c.allowskipdevicebinding" class="flag">可跳过绑定</span>
             <span v-if="!c.enable" class="flag flag-off">已停用</span>
           </div>
@@ -86,7 +75,9 @@
             >{{ payLabel(p) }}{{ payMissing(p) ? ' ⚠' : '' }}</span>
           </div>
 
-          <div v-if="c.address" class="text-[11px] text-slate-400 mt-2 truncate">{{ c.address }}</div>
+          <div class="text-[11px] mt-2 truncate" :class="c.address ? 'text-slate-400' : 'text-slate-300'">
+            {{ c.address || '未填本渠道地址 · 用应用默认' }}
+          </div>
         </div>
 
         <!-- 该组里尚未配置的渠道，点一下直接建 -->
@@ -139,59 +130,28 @@
         </section>
 
         <section class="ed-section">
-          <div class="ed-section-title">版本</div>
-          <div class="grid grid-cols-3 gap-3">
-            <div>
-              <span class="ed-label">当前线上版本</span>
-              <input v-model="form.version" class="input input-bordered input-sm w-full" placeholder="如 1.4.2" />
-            </div>
-            <div>
-              <span class="ed-label">最低支持版本</span>
-              <input v-model="form.min_version" class="input input-bordered input-sm w-full" placeholder="低于它的客户端需更新" />
-            </div>
-            <div>
-              <span class="ed-label">审核中版本</span>
-              <input v-model="form.review_version" class="input input-bordered input-sm w-full" placeholder="过审后清空" />
-            </div>
-          </div>
-          <label class="flex items-center gap-2 text-sm cursor-pointer mt-3">
-            <input v-model="form.force_update" type="checkbox" class="checkbox checkbox-sm checkbox-primary" />
-            <span>强制更新</span>
-            <span class="text-xs text-slate-400">低于「最低支持版本」的客户端必须更新才能继续使用</span>
-          </label>
-          <p v-if="versionWarn" class="ed-warn">⚠ {{ versionWarn }}</p>
-          <div class="mt-3">
-            <span class="ed-label">下载地址</span>
-            <input v-model="form.address" class="input input-bordered input-sm w-full" placeholder="应用商店链接或 apk 直链" />
-          </div>
-          <div class="mt-3">
-            <span class="ed-label">更新日志</span>
-            <textarea v-model="form.changelog" class="textarea textarea-bordered w-full text-xs" rows="3" placeholder="本次更新内容，会下发给客户端展示" />
-          </div>
+          <div class="ed-section-title">本渠道下载地址</div>
+          <input v-model="form.address" class="input input-bordered input-sm w-full" placeholder="本商店的下载链接，留空则用应用默认地址" />
+          <p class="ed-tip">
+            客户端点「立即更新」时直接打开这个地址，所以<b>必须是本渠道自己的商店链接</b>——
+            华为、小米、App Store 各不相同，填错会把用户引到别家商店。
+            留空则回退到
+            <NuxtLink class="link" to="/appversion">版本控制</NuxtLink>
+            里配的「默认下载地址」。
+          </p>
         </section>
 
         <section class="ed-section">
           <div class="ed-section-title">能力开关</div>
-          <div class="flex flex-col gap-2">
-            <label class="flex items-center gap-2 text-sm cursor-pointer">
-              <input v-model="form.tourists" type="checkbox" class="checkbox checkbox-sm checkbox-primary" />
-              <span>允许游客登录</span>
-            </label>
-            <div v-if="form.tourists" class="pl-7">
-              <span class="ed-label">生效版本（必填）</span>
-              <input v-model="form.touristsversion" class="input input-bordered input-sm w-full" placeholder="如 1.0.2，只有这一版的客户端能看到游客登录" />
-              <p class="text-xs text-slate-400 mt-1">
-                白名单语义：<b>只有填在这里的版本可见，其余版本一律隐藏</b>。
-                送审场景就是只给正在过审的那一版开。版本号要与客户端上报的一致（不含构建号，如 <code>1.0.2</code>）。
-                留空等于所有版本都看不到入口——要全部隐藏请直接取消上面的勾选。
-              </p>
-              <p v-if="touristsWarn" class="ed-warn">⚠ {{ touristsWarn }}</p>
-            </div>
-            <label class="flex items-center gap-2 text-sm cursor-pointer">
-              <input v-model="form.allowskipdevicebinding" type="checkbox" class="checkbox checkbox-sm checkbox-primary" />
-              <span>允许跳过设备绑定</span>
-            </label>
-          </div>
+          <label class="flex items-center gap-2 text-sm cursor-pointer">
+            <input v-model="form.allowskipdevicebinding" type="checkbox" class="checkbox checkbox-sm checkbox-primary" />
+            <span>允许跳过设备绑定</span>
+          </label>
+          <p class="ed-tip">
+            游客登录开关已移到
+            <NuxtLink class="link" to="/guestaccess">服务配置 → 游客显隐控制</NuxtLink>
+            （按应用配，不分渠道）。
+          </p>
         </section>
 
         <section class="ed-section">
@@ -235,20 +195,17 @@ import { useToast } from '~/composables/useToast'
 
 definePageMeta({ title: '渠道分发' })
 
+// 与后端 comm.ChannelApp 一一对应。
+// ⚠️ 版本号 / 最低支持版本 / 强制更新 / 更新日志 / 送审版本 / 游客登录开关**不在这里**：
+// 它们是「整个应用一套」的，已搬到 app_release（服务配置 → 版本控制 / 游客显隐控制）。
+// 别再加回来——按渠道各存一份意味着同一个开关有 8 处能改而客户端只读一处。
 interface ChannelApp {
   row_id: number
   app_name: string
   channel: number
-  version: string
-  min_version: string
-  force_update: boolean
-  changelog: string
   address: string
-  review_version: string
   status: number
   description: string
-  tourists: boolean
-  touristsversion: string
   allowskipdevicebinding: boolean
   paychannels: string
   enable: boolean
@@ -310,9 +267,8 @@ const submitting = ref(false)
 
 function emptyForm(): ChannelApp {
   return {
-    row_id: 0, app_name: '', channel: 0, version: '', min_version: '', force_update: false,
-    changelog: '', address: '', review_version: '', status: 1, description: '',
-    tourists: false, touristsversion: '', allowskipdevicebinding: false, paychannels: '', enable: true,
+    row_id: 0, app_name: '', channel: 0, address: '', status: 1, description: '',
+    allowskipdevicebinding: false, paychannels: '', enable: true,
   }
 }
 const form = reactive<ChannelApp>(emptyForm())
@@ -348,36 +304,6 @@ const payWarnings = computed(() => {
   return Object.keys(map).map((k) => ({ key: k, label: payLabel(k), channels: map[k]! }))
 })
 
-// 游客登录版本限定的提示：这里只提示，真正的拦截在后端 saveChannelApp（前端提示挡不住直接调接口）。
-const touristsWarn = computed(() => {
-  if (!form.tourists) return ''
-  const v = (form.touristsversion || '').trim()
-  if (!v) return '开启游客登录必须填生效版本，留空等于所有版本都看不到入口'
-  if (form.version.trim() && cmpVer(v, form.version) > 0) {
-    return '生效版本高于「当前线上版本」，目前线上没有任何一版客户端能看到游客登录入口'
-  }
-  return ''
-})
-
-const versionWarn = computed(() => {
-  if (form.force_update && !form.min_version.trim()) return '开启强制更新时必须填「最低支持版本」，否则挡不住任何人'
-  if (form.min_version.trim() && form.version.trim() && cmpVer(form.min_version, form.version) > 0) {
-    return '「最低支持版本」高于「当前线上版本」，会把所有线上用户判定为需强更却无更高版本可更'
-  }
-  return ''
-})
-// 与后端 comm.CompareVersion 同语义：逐段按整数比，短的补 0
-function cmpVer(a: string, b: string): number {
-  const as = a.trim().split('.'), bs = b.trim().split('.')
-  const n = Math.max(as.length, bs.length)
-  for (let i = 0; i < n; i++) {
-    const x = parseInt(as[i] ?? '0') || 0
-    const y = parseInt(bs[i] ?? '0') || 0
-    if (x !== y) return x < y ? -1 : 1
-  }
-  return 0
-}
-
 // ===== 加载 =====
 async function loadScopeApps() {
   try {
@@ -438,11 +364,6 @@ function togglePay(key: string) {
 
 async function save() {
   if (!form.channel) { error('请选择分发渠道'); return }
-  if (versionWarn.value) { error(versionWarn.value); return }
-  // 关掉游客登录时顺手清空生效版本：输入框在关掉后是隐藏的，留着旧值会被后端的
-  // 「填了版本必须勾选开关」校验挡下，用户看不到是哪一项有问题。
-  if (!form.tourists) form.touristsversion = ''
-  if (touristsWarn.value) { error(touristsWarn.value); return }
   submitting.value = true
   try {
     await webApi('savechannelapp', { ...form, app_name: scopeApp.value })
@@ -484,15 +405,8 @@ onMounted(async () => {
 .ch-empty:hover { border-color: #c7d2fe; background: #f8fafc; }
 
 .status-badge { font-size: 10px; font-weight: 700; padding: 2px 8px; border-radius: 6px; white-space: nowrap; }
-.ver-row { display: flex; gap: 14px; margin-top: 10px; flex-wrap: wrap; }
-.ver-box { display: flex; flex-direction: column; }
-.ver-label { font-size: 10px; color: #94a3b8; }
-.ver-val { font-size: 13px; font-weight: 700; color: #1e293b; font-family: 'SF Mono', Menlo, monospace; }
-.ver-val.warn { color: #b45309; }
-.ver-val.review { color: #7c3aed; }
 
 .flag { font-size: 10px; font-weight: 600; padding: 2px 7px; border-radius: 5px; background: #f1f5f9; color: #475569; }
-.flag-warn { background: #fef3c7; color: #b45309; }
 .flag-off { background: #fee2e2; color: #b91c1c; }
 .pay-pill { font-size: 10px; font-weight: 600; padding: 2px 8px; border-radius: 6px; background: #eef2ff; color: #4338ca; }
 .pay-pill.missing { background: #fef3c7; color: #b45309; }
diff --git a/apps/admin/app/pages/chipvendor.vue b/apps/admin/app/pages/chipvendor.vue
new file mode 100644
index 00000000..521d7c2e
--- /dev/null
+++ b/apps/admin/app/pages/chipvendor.vue
@@ -0,0 +1,297 @@
+<template>
+  <div>
+    <!-- 列表视图 -->
+    <div v-show="view === 'list'">
+      <div class="flex items-center justify-between mb-5">
+        <h2 class="text-lg font-semibold text-slate-800">芯片厂商列表</h2>
+        <button class="btn btn-primary btn-sm text-white" @click="showForm()">+ 新增芯片厂商</button>
+      </div>
+
+      <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-4 mb-4">
+        <div class="flex flex-wrap items-end gap-3">
+          <div class="form-control">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">状态</span></label>
+            <select v-model.number="filterEnabled" class="select select-bordered select-sm w-32">
+              <option :value="-1">全部</option>
+              <option :value="1">启用中</option>
+              <option :value="0">已停用</option>
+            </select>
+          </div>
+          <div class="form-control flex-1 min-w-[220px]">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">关键字</span></label>
+            <input v-model="keyword" type="text" class="input input-bordered input-sm w-full" placeholder="厂商名称 / CID" />
+          </div>
+          <button class="btn btn-ghost btn-sm" @click="resetFilter">重置</button>
+          <span class="text-xs text-slate-400 ml-auto">共 {{ viewRows.length }} / {{ rows.length }} 条</span>
+        </div>
+      </div>
+
+      <div class="bg-white rounded-xl shadow-sm border border-slate-100">
+        <div class="overflow-x-auto">
+          <table class="table table-zebra">
+            <thead>
+              <tr>
+                <th class="cursor-pointer select-none" @click="toggleSort('id')">CID{{ sortMark('id') }}</th>
+                <th class="cursor-pointer select-none" @click="toggleSort('name')">厂商名称{{ sortMark('name') }}</th>
+                <th class="cursor-pointer select-none" @click="toggleSort('sort')">排序{{ sortMark('sort') }}</th>
+                <th>方案商数</th>
+                <th>状态</th>
+                <th>操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-if="loading">
+                <td colspan="6" class="text-center py-8"><span class="loading loading-spinner loading-sm"></span></td>
+              </tr>
+              <tr v-else-if="!viewRows.length">
+                <td colspan="6" class="text-center text-slate-400 py-8">暂无数据</td>
+              </tr>
+              <tr v-for="v in viewRows" :key="v.id">
+                <td class="font-mono text-sm">
+                  <span class="badge badge-primary badge-outline badge-sm">0x{{ hexCid(v.id) }}</span>
+                </td>
+                <td class="font-medium">{{ v.name }}</td>
+                <td class="text-sm text-slate-500">{{ v.sort || 0 }}</td>
+                <td class="text-sm">
+                  <span class="badge badge-sm" :class="providerCount(v.id) ? 'badge-primary badge-outline' : 'badge-ghost'">
+                    {{ providerCount(v.id) }}
+                  </span>
+                </td>
+                <td>
+                  <span class="badge badge-sm" :class="v.enabled === false ? 'badge-ghost' : 'badge-success badge-outline'">
+                    {{ v.enabled === false ? '已停用' : '启用中' }}
+                  </span>
+                </td>
+                <td>
+                  <div class="flex gap-1">
+                    <button class="btn btn-ghost btn-xs" @click="showForm(v)">编辑</button>
+                    <button class="btn btn-ghost btn-xs text-red-500" @click="delVendor(v)">删除</button>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+
+      <p class="text-xs text-slate-400 mt-3">
+        芯片厂商用于给「方案商」归组：同一家芯片厂商下往往有多套方案，每套方案在
+        <NuxtLink to="/provider" class="link link-primary">方案商管理</NuxtLink> 里单独建一条记录。
+        名下还有方案商的厂商不能删除，需要下线时改成「停用」——停用后不再出现在新建方案商的下拉里，
+        但存量方案商仍能正常显示它的名字。
+      </p>
+    </div>
+
+    <!-- 表单视图 -->
+    <div v-show="view === 'form'">
+      <div class="flex items-center gap-3 mb-5">
+        <button class="btn btn-ghost btn-sm" @click="showList()">&larr; 返回列表</button>
+        <h2 class="text-lg font-semibold text-slate-800">{{ isEditing ? '编辑芯片厂商' : '新增芯片厂商' }}</h2>
+      </div>
+      <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-6 max-w-2xl">
+        <form @submit.prevent="saveVendor">
+          <!-- CID 就是这条记录的主键，手工指定的十六进制编码，可改（改号会级联更新方案商引用） -->
+          <div class="form-control mb-4">
+            <label class="label"><span class="label-text font-medium">CID（十六进制）*</span></label>
+            <div class="flex items-stretch">
+              <span class="bg-slate-100 text-slate-400 font-mono px-3 flex items-center rounded-l-lg border border-r-0 border-slate-200">0x</span>
+              <input
+                v-model="form.cidHex"
+                type="text"
+                class="input input-bordered w-full font-mono uppercase rounded-l-none"
+                placeholder="ABF4"
+                maxlength="8"
+                required
+              />
+            </div>
+            <span class="label-text-alt text-slate-400 mt-1">
+              CID 就是芯片厂商的唯一标识，全后台不可重复。<b>可以随时改</b>——改号时挂在它下面的方案商会一起跟过去。
+            </span>
+          </div>
+
+          <div class="form-control mb-4">
+            <label class="label"><span class="label-text font-medium">厂商名称 *</span></label>
+            <input v-model="form.name" type="text" class="input input-bordered w-full" placeholder="如：杰里 / 恒玄 / 博通" required />
+          </div>
+
+          <div class="grid grid-cols-2 gap-4 mb-4">
+            <div class="form-control">
+              <label class="label"><span class="label-text font-medium">排序</span></label>
+              <input v-model.number="form.sort" type="number" class="input input-bordered w-full" />
+              <span class="label-text-alt text-slate-400 mt-1">小的排前面，相同则按 ID</span>
+            </div>
+            <div class="form-control">
+              <label class="label"><span class="label-text font-medium">状态</span></label>
+              <label class="label cursor-pointer justify-start gap-3">
+                <input v-model="form.enabled" type="checkbox" class="toggle toggle-primary" />
+                <span class="label-text">{{ form.enabled ? '启用中' : '已停用' }}</span>
+              </label>
+              <span class="label-text-alt text-slate-400 mt-1">停用后不再出现在新建方案商的下拉里</span>
+            </div>
+          </div>
+
+          <div class="flex gap-2 pt-2">
+            <button type="submit" class="btn btn-primary text-white" :disabled="submitting">
+              <span v-if="submitting" class="loading loading-spinner loading-xs"></span>
+              {{ isEditing ? '保存' : '创建' }}
+            </button>
+            <button type="button" class="btn btn-ghost" @click="showList()">取消</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted } from 'vue'
+import { useApi } from '~/composables/useApi'
+import { useToast } from '~/composables/useToast'
+import { useTableSort } from '~/composables/useTableSort'
+import { invalidateChipVendors, type ChipVendor } from '~/utils/chipvendors'
+
+definePageMeta({ title: '芯片管理' })
+
+interface Provider {
+  id: number
+  vendor: number
+}
+
+const { webApi } = useApi()
+const { success, error, warn } = useToast()
+
+const view = ref<'list' | 'form'>('list')
+const rows = ref<ChipVendor[]>([])
+// 方案商列表只用来在「方案商数」列上做引用计数，让运营删之前一眼看出有没有人挂着
+const providers = ref<Provider[]>([])
+const loading = ref(false)
+const submitting = ref(false)
+const isEditing = ref(false)
+const filterEnabled = ref(-1) // -1 全部；1 启用中；0 已停用
+const keyword = ref('')
+
+const form = reactive({ id: 0, name: '', cidHex: '', sort: 0, enabled: true })
+
+// CID 统一按十六进制大写展示；0 视为未设置，由模板另行处理，这里不会被调到
+function hexCid(v?: number) {
+  return Number(v || 0).toString(16).toUpperCase()
+}
+function providerCount(vendorId: number) {
+  return providers.value.filter((p) => Number(p.vendor || 0) === vendorId).length
+}
+
+const { toggleSort, sortMark, applySort } = useTableSort<ChipVendor>({
+  id: (a, b) => Number(a.id) - Number(b.id),
+  name: (a, b) => String(a.name || '').localeCompare(String(b.name || ''), 'zh') || Number(a.id) - Number(b.id),
+  sort: (a, b) => Number(a.sort || 0) - Number(b.sort || 0) || Number(a.id) - Number(b.id),
+}, 'sort')
+
+const viewRows = computed(() => {
+  const kw = keyword.value.trim().toLowerCase()
+  const list = rows.value.filter((v) => {
+    if (filterEnabled.value >= 0 && (v.enabled === false ? 0 : 1) !== filterEnabled.value) return false
+    if (!kw) return true
+    return (v.name || '').toLowerCase().includes(kw) || hexCid(v.id).toLowerCase().includes(kw)
+  })
+  return applySort(list)
+})
+function resetFilter() {
+  filterEnabled.value = -1
+  keyword.value = ''
+}
+
+async function loadData() {
+  loading.value = true
+  try {
+    const d = await webApi<{ vendors: ChipVendor[] }>('getchipvendors', {})
+    rows.value = d?.vendors ?? []
+  } catch (e: any) {
+    error(e?.message ?? '获取芯片厂商列表失败')
+    rows.value = []
+  } finally {
+    loading.value = false
+  }
+  // 引用计数用，拉不到不影响主流程（列显示 0）
+  try {
+    const d = await webApi<{ providers: Provider[] }>('getsolutionproviders', {})
+    providers.value = d?.providers ?? []
+  } catch {
+    providers.value = []
+  }
+}
+
+function showList() {
+  view.value = 'list'
+}
+
+function showForm(v?: ChipVendor) {
+  if (v) {
+    isEditing.value = true
+    form.id = Number(v.id)
+    form.name = v.name || ''
+    form.cidHex = hexCid(v.id)
+    form.sort = Number(v.sort || 0)
+    form.enabled = v.enabled !== false
+  } else {
+    isEditing.value = false
+    form.id = 0
+    form.name = ''
+    form.cidHex = ''
+    form.sort = 0
+    form.enabled = true
+  }
+  view.value = 'form'
+}
+
+async function saveVendor() {
+  if (!form.name.trim()) { warn('请填写厂商名称'); return }
+  // CID 即主键，必填且必须是合法十六进制
+  const hex = form.cidHex.trim().replace(/^0x/i, '')
+  if (!/^[0-9a-fA-F]{1,8}$/.test(hex)) { warn('CID 需填十六进制，如 ABF4'); return }
+  const cid = Number.parseInt(hex, 16)
+  if (!cid) { warn('CID 不能为 0'); return }
+  // 占用校验排除自己，否则编辑时不改号也会被自己挡住
+  if (rows.value.some((v) => Number(v.id) === cid && Number(v.id) !== form.id)) { warn(`CID ${hex.toUpperCase()} 已被占用`); return }
+  submitting.value = true
+  try {
+    const payload: { vendor: Record<string, unknown>; oldid?: number } = {
+      vendor: {
+        id: cid,
+        name: form.name.trim(),
+        sort: Number(form.sort || 0),
+        enabled: form.enabled,
+      },
+    }
+    // 编辑时带原 CID：服务端拿它定位记录，再决定要不要改主键
+    if (isEditing.value) payload.oldid = form.id
+    await webApi(isEditing.value ? 'updatechipvendor' : 'addchipvendor', payload)
+    success(isEditing.value ? '已保存' : '已创建')
+    invalidateChipVendors() // 让方案商页下次进入时拿到最新的厂商列表
+    showList()
+    await loadData()
+  } catch (e: any) {
+    error(e?.message ?? '保存失败')
+  } finally {
+    submitting.value = false
+  }
+}
+
+function delVendor(v: ChipVendor) {
+  const n = providerCount(v.id)
+  if (n > 0) {
+    // 前端先挡一道，省一次必然失败的请求；后端 delChipVendor 也有同样的拦截，两边都不能少
+    warn(`「${v.name}」下还有 ${n} 个方案商，请先把它们改到别的厂商下，或把本厂商改成「停用」`)
+    return
+  }
+  if (!window.confirm(`确认删除芯片厂商「${v.name}」？`)) return
+  webApi('delchipvendor', { id: v.id })
+    .then(async () => {
+      success('已删除')
+      invalidateChipVendors()
+      await loadData()
+    })
+    .catch((e: any) => error(e?.message ?? '删除失败'))
+}
+
+onMounted(loadData)
+</script>
diff --git a/apps/admin/app/pages/dealers.vue b/apps/admin/app/pages/dealers.vue
index f3cf81e3..4c274b2f 100644
--- a/apps/admin/app/pages/dealers.vue
+++ b/apps/admin/app/pages/dealers.vue
@@ -10,13 +10,6 @@
       <!-- 筛选 -->
       <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-4 mb-4">
         <div class="flex flex-wrap items-end gap-3">
-          <div v-if="!auth.isBrandAccount && !auth.isDealer" class="form-control">
-            <label class="label py-1"><span class="label-text text-xs text-slate-500">品牌商</span></label>
-            <select v-model.number="filters.brandid" class="select select-bordered select-sm w-48" @change="loadData">
-              <option :value="0">全部品牌商</option>
-              <option v-for="b in brands" :key="b.id" :value="b.id">{{ b.brand }}</option>
-            </select>
-          </div>
           <div class="form-control">
             <label class="label py-1"><span class="label-text text-xs text-slate-500">状态</span></label>
             <select v-model.number="filters.status" class="select select-bordered select-sm w-36" @change="loadData">
@@ -43,16 +36,16 @@
           <table class="table table-zebra">
             <thead>
               <tr>
-                <th>渠道商ID</th><th>名称</th><th>所属品牌商</th><th>分成比例</th>
+                <th>渠道商ID</th><th>名称</th><th>生产批次</th>
                 <th>联系方式</th><th>状态</th><th>创建时间</th><th>操作</th>
               </tr>
             </thead>
             <tbody>
               <tr v-if="loading">
-                <td colspan="8" class="text-center py-8"><span class="loading loading-spinner loading-sm"></span></td>
+                <td colspan="7" class="text-center py-8"><span class="loading loading-spinner loading-sm"></span></td>
               </tr>
               <tr v-else-if="!rows.length">
-                <td colspan="8" class="text-center text-slate-400 py-8">暂无数据</td>
+                <td colspan="7" class="text-center text-slate-400 py-8">暂无数据</td>
               </tr>
               <tr v-for="ch in rows" :key="ch.id">
                 <td class="font-mono text-sm font-semibold">{{ ch.id }}</td>
@@ -60,8 +53,16 @@
                   {{ ch.name }}
                   <span v-if="ch.official" class="badge badge-sm badge-primary badge-outline ml-1">官方</span>
                 </td>
-                <td><span class="badge badge-ghost badge-sm">{{ brandName(ch.brandid) }}</span></td>
-                <td class="text-sm">{{ ratePct(ch.sharerate) }}</td>
+                <!-- 生产批次：从生产批次台账按 channelid 汇总，只读。批次归属在「MAC生成管理」里生产时定 -->
+                <td class="text-sm">
+                  <button
+                    v-if="batchStat(ch.id).batches"
+                    class="btn btn-ghost btn-xs text-indigo-600 font-normal"
+                    @click="showBatches(ch)">
+                    {{ batchStat(ch.id).batches }} 批 / {{ batchStat(ch.id).macs }} 个
+                  </button>
+                  <span v-else class="text-slate-300">-</span>
+                </td>
                 <td class="text-sm text-slate-500">
                   <div v-if="ch.contact">{{ ch.contact }}</div>
                   <div v-if="ch.contactmails" class="text-xs text-slate-400">{{ ch.contactmails }}</div>
@@ -92,13 +93,11 @@
         </div>
       </div>
       <p class="text-xs text-slate-400 mt-3">
-        <template v-if="auth.isBrandAccount">
-          这里只显示贵品牌商名下的渠道商。新增后为「待审核」，需平台审核通过（状态=启用）才能用于生产授权码；分成比例由平台设置。
-        </template>
-        <template v-else>
-          渠道商新增后需超管/管理员审核通过（状态=启用）才能用于生产授权码；已有生产批次的渠道商不能删除，只能停用。
-          标「官方」的是品牌自营渠道，随品牌商自动创建、直接启用、不可删除。
-        </template>
+        渠道商新增后需超管/管理员审核通过（状态=启用）才能用于生成 MAC；已有生产批次的渠道商不能删除，只能停用。
+        标「官方」的是品牌自营渠道，随品牌商自动创建、直接启用、不可删除。
+        <br />
+        渠道商是<b>全局</b>实体，不归属某个品牌商；<b>产品归属与分成比例都在【MAC生成管理 → 生成MAC】里按批次定</b>——
+        同一家渠道商不同批次的比例可以不同。「生产批次」列是从生产台账按渠道商汇总出来的<b>只读</b>数据。
       </p>
     </div>
 
@@ -119,23 +118,6 @@
             <label class="label"><span class="label-text font-medium">渠道商名称 *</span></label>
             <input v-model="form.name" type="text" class="input input-bordered w-full" required />
           </div>
-          <div v-if="!auth.isBrandAccount" class="form-control mb-4">
-            <label class="label"><span class="label-text font-medium">所属品牌商 *</span></label>
-            <select v-model.number="form.brandid" class="select select-bordered w-full" :disabled="isEditing" required>
-              <option :value="0">请选择品牌商</option>
-              <option v-for="b in brands" :key="b.id" :value="b.id">{{ b.brand }}</option>
-            </select>
-            <span v-if="isEditing" class="label-text-alt text-slate-400 mt-1">归属品牌商创建后不可修改</span>
-          </div>
-          <div class="form-control mb-4">
-            <label class="label"><span class="label-text font-medium">分成比例（%）</span></label>
-            <input
-              v-model.number="form.sharepct" type="number" step="0.01" min="0" max="100"
-              class="input input-bordered w-full" :disabled="!canAudit" />
-            <span class="label-text-alt text-slate-400 mt-1">
-              从所属品牌商的分成里再切；仅超管/管理员可设置。
-            </span>
-          </div>
           <div class="form-control mb-4">
             <label class="label"><span class="label-text font-medium">联系人 / 电话</span></label>
             <input v-model="form.contact" type="text" class="input input-bordered w-full" />
@@ -193,6 +175,39 @@
       </div>
     </div>
 
+    <!-- 关联的 MAC 生产批次（只读）：归属在生产时定下，这里只做汇总与追溯 -->
+    <dialog ref="batchDlg" class="modal">
+      <div class="modal-box max-w-3xl">
+        <h3 class="font-bold text-lg mb-1">{{ batchCtx?.name }} 的生产批次</h3>
+        <p class="text-xs text-slate-400 mb-4">
+          批次归属在【MAC生成管理 → 生成MAC】里生产时定下，此处只读。共
+          {{ batchCtx ? batchStat(batchCtx.id).batches : 0 }} 批 /
+          {{ batchCtx ? batchStat(batchCtx.id).macs : 0 }} 个 MAC。
+        </p>
+        <div class="overflow-x-auto max-h-96">
+          <table class="table table-sm table-zebra">
+            <thead><tr><th>批次号</th><th>产品</th><th>数量</th><th>MAC区间</th><th>生产时间</th></tr></thead>
+            <tbody>
+              <tr v-for="b in ctxBatches" :key="b.batchno">
+                <td class="font-mono">{{ b.batchno }}</td>
+                <td>{{ productName(b.productid) }}</td>
+                <td>{{ b.devicenum }}</td>
+                <td class="font-mono text-xs text-slate-500">
+                  <span v-if="b.startmac">{{ b.startmac }} ~ {{ b.endmac }}</span>
+                  <span v-else class="text-slate-300">-</span>
+                </td>
+                <td class="text-slate-500">{{ fmtTime(b.ts) }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="modal-action">
+          <button class="btn btn-sm" @click="batchDlg?.close()">关闭</button>
+        </div>
+      </div>
+      <form method="dialog" class="modal-backdrop"><button>close</button></form>
+    </dialog>
+
     <!-- 新开渠道账号的凭据回执 -->
     <AccountCredentialDialog :info="cred" @close="cred = null" />
   </div>
@@ -209,12 +224,15 @@ definePageMeta({ title: '渠道商管理' })
 
 interface Channel {
   id: string
+  // 后端仍下发这两个字段，但后台已不维护它们，界面上也不显示：
+  //   brandid   0=全局渠道商；非 0 只出现在随品牌商自动创建的「官方渠道」上
+  //   sharerate [遗留]渠道商级分成比例；比例已改为按生产批次设置
   brandid: number
+  sharerate: number
   name: string
   contact: string
   contactmails: string
   remark: string
-  sharerate: number // 万分比
   status: number // 0待审核 1启用 2停用 3驳回
   applyaccount: string
   auditaccount: string
@@ -224,7 +242,17 @@ interface Channel {
   updatetime: number
   official: boolean // 品牌官方渠道：随品牌商自动创建，不可删除
 }
-interface Brand { id: number; brand: string }
+interface Product { id: number; devicename: string }
+// 生产批次：渠道商的「关联批次」由它按 channelid 汇总而来，不在渠道商表里另存一份
+interface Batch {
+  batchno: string
+  channelid: string
+  productid: number
+  devicenum: number
+  startmac: string
+  endmac: string
+  ts: number
+}
 // addchannel 的返回：渠道商本体 + （可选）渠道账号凭据
 interface AddChannelResp {
   account?: string
@@ -237,7 +265,7 @@ const { webApi } = useApi()
 const { success, error } = useToast()
 const auth = useAuthStore()
 
-// 审批（含分成比例设置、顺手开渠道账号）仅超管/管理员。
+// 审批（顺手开渠道账号）仅超管/管理员。
 const canAudit = computed(() => auth.isAdmin)
 
 // 新开账号的凭据回执（密码只有这一次能看到）
@@ -245,16 +273,20 @@ const cred = ref<AccountCredential | null>(null)
 
 const view = ref<'list' | 'form'>('list')
 const rows = ref<Channel[]>([])
-const brands = ref<Brand[]>([])
+const products = ref<Product[]>([])
+const batches = ref<Batch[]>([])
+const batchDlg = ref<HTMLDialogElement | null>(null)
+const batchCtx = ref<Channel | null>(null)
 const loading = ref(false)
 const submitting = ref(false)
 const isEditing = ref(false)
 
 // status 用 -1 表示「全部」：0 是合法取值（待审核），不能拿零值当全部。
-const filters = reactive({ brandid: 0, status: -1, keyword: '' })
+const filters = reactive({ status: -1, keyword: '' })
 // 表单里的比例用百分比（更直观），提交时换算成后端的万分比整数。
 const form = reactive({
-  id: '', name: '', brandid: 0, sharepct: 0, contact: '', contactmails: '', remark: '',
+  id: '', name: '', contact: '', contactmails: '', remark: '',
+
   // 仅新增时用：顺手开一个绑定本渠道商的渠道账号
   createAccount: false,
   accountUsername: '',
@@ -268,11 +300,33 @@ const STATUS_CLASS: Record<number, string> = {
 }
 function statusLabel(s: number) { return STATUS_LABELS[s] ?? String(s) }
 function statusClass(s: number) { return STATUS_CLASS[s] ?? 'badge-ghost' }
-function ratePct(rate?: number) { return ((Number(rate) || 0) / 100).toFixed(2) + '%' }
-function brandName(id?: number) {
-  const b = brands.value.find((x) => x.id === id)
-  return b ? b.brand : (id ? '品牌商#' + Number(id).toString(16).toUpperCase() : '-')
+function productName(id?: number) {
+  const p = products.value.find((x) => x.id === Number(id))
+  return p?.devicename || (id ? '产品#' + hex4(Number(id)) : '-')
+}
+// 产品 id 与后台其它页面一致，按十六进制大写展示（PID）
+function hex4(v?: number | null) {
+  return v ? Number(v).toString(16).padStart(4, '0').toUpperCase() : ''
+}
+// 某渠道商的批次汇总：批次数 + MAC 总数。数据源是生产批次台账，渠道商表里不另存。
+function batchStat(channelid: string) {
+  let b = 0
+  let m = 0
+  for (const x of batches.value) {
+    if (x.channelid !== channelid) continue
+    b += 1
+    m += Number(x.devicenum) || 0
+  }
+  return { batches: b, macs: m }
 }
+const ctxBatches = computed(() =>
+  batchCtx.value ? batches.value.filter((b) => b.channelid === batchCtx.value!.id) : [],
+)
+function showBatches(ch: Channel) {
+  batchCtx.value = ch
+  batchDlg.value?.showModal()
+}
+
 function fmtTime(ts?: number) {
   if (!ts) return '-'
   const d = new Date(ts * 1000)
@@ -280,21 +334,33 @@ function fmtTime(ts?: number) {
   return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`
 }
 
-async function loadBrands() {
+// 产品不按品牌商过滤：产品建档阶段已不再要求填品牌商（brandid 可为 0），
+// 按品牌过滤会让新建的产品在这里一个都选不到。
+async function loadProducts() {
+  try {
+    const d = await webApi<{ products: Product[] }>('getproducts', {})
+    products.value = d?.products ?? []
+  } catch {
+    products.value = []
+  }
+}
+
+// 一次拉全部批次再在前端按 channelid 分组，省掉「每个渠道商一次请求」。
+// 拉不到只影响「生产批次」列显示为 -，不挡主流程。
+async function loadBatches() {
   try {
-    const d = await webApi<{ brands: Brand[] }>('getbrands', {})
-    brands.value = d?.brands ?? []
+    const d = await webApi<{ notes: Batch[] }>('getproductionbatches', { limit: 2000 })
+    batches.value = d?.notes ?? []
   } catch {
-    brands.value = []
+    batches.value = []
   }
 }
 
 async function loadData() {
   loading.value = true
   try {
-    if (!brands.value.length) await loadBrands()
+    if (!products.value.length) await loadProducts()
     const d = await webApi<{ channels: Channel[] }>('getchannels', {
-      brandid: Number(filters.brandid) || 0,
       status: Number(filters.status),
       keyword: filters.keyword.trim(),
     })
@@ -305,10 +371,10 @@ async function loadData() {
   } finally {
     loading.value = false
   }
+  await loadBatches()
 }
 
 function resetFilters() {
-  filters.brandid = 0
   filters.status = -1
   filters.keyword = ''
   loadData()
@@ -324,8 +390,6 @@ function showForm(ch?: Channel) {
     isEditing.value = true
     form.id = ch.id
     form.name = ch.name || ''
-    form.brandid = ch.brandid || 0
-    form.sharepct = (Number(ch.sharerate) || 0) / 100
     form.contact = ch.contact || ''
     form.contactmails = ch.contactmails || ''
     form.remark = ch.remark || ''
@@ -333,8 +397,6 @@ function showForm(ch?: Channel) {
     isEditing.value = false
     form.id = ''
     form.name = ''
-    form.brandid = Number(filters.brandid) || 0
-    form.sharepct = 0
     form.contact = ''
     form.contactmails = ''
     form.remark = ''
@@ -347,15 +409,13 @@ function showForm(ch?: Channel) {
 }
 
 async function saveChannel() {
-  // 品牌商账号不选品牌商：后端按账号绑定自动补成自己名下。
-  if (!form.brandid && !auth.isBrandAccount) { error('请选择所属品牌商'); return }
+  if (!form.name.trim()) { error('请填写渠道商名称'); return }
   submitting.value = true
   try {
     const channel: Record<string, unknown> = {
+      // 品牌商归属与分成比例都不再由渠道商表单提交：
+      // 前者已取消（渠道商是全局实体），后者按生产批次设置（见 MAC生成管理 → 生成MAC）。
       name: form.name.trim(),
-      brandid: Number(form.brandid) || 0,
-      // 百分比 → 万分比整数，避免浮点比例入库。
-      sharerate: Math.round((Number(form.sharepct) || 0) * 100),
       contact: form.contact,
       contactmails: form.contactmails,
       remark: form.remark,
diff --git a/apps/admin/app/pages/device.vue b/apps/admin/app/pages/device.vue
index 04bb9512..af864031 100644
--- a/apps/admin/app/pages/device.vue
+++ b/apps/admin/app/pages/device.vue
@@ -3,16 +3,14 @@
     <!-- ========== 页面 Tab ========== -->
     <div class="flex items-center justify-between flex-wrap gap-3">
       <div class="tabs tabs-boxed bg-slate-100 inline-flex">
-        <a class="tab" :class="{ 'tab-active': tab === 'codes' }" @click="switchPageTab('codes')">授权码查询</a>
+        <a class="tab" :class="{ 'tab-active': tab === 'codes' }" @click="switchPageTab('codes')">MAC查询</a>
         <a class="tab" :class="{ 'tab-active': tab === 'batches' }" @click="switchPageTab('batches')">生产记录</a>
-        <a v-if="canCreate" class="tab" :class="{ 'tab-active': tab === 'produce' }" @click="switchPageTab('produce')">生产授权码</a>
+        <a v-if="canCreate" class="tab" :class="{ 'tab-active': tab === 'produce' }" @click="switchPageTab('produce')">生成MAC</a>
       </div>
-      <!-- 共享品牌/产品筛选（授权码查询与生产记录共用） -->
+      <!-- 共享渠道商/产品筛选（MAC查询与生产记录共用）。
+           品牌商筛选已去掉：生产链路不再涉及品牌商，新批次 brandid 一律为 0，
+           这个下拉筛出来永远是空的。 -->
       <div v-if="tab !== 'produce'" class="flex items-end gap-2 flex-wrap">
-        <select v-model.number="filterBrand" class="select select-bordered select-sm" style="min-width:150px;" @change="onBrandChange">
-          <option :value="0">全部品牌商</option>
-          <option v-for="b in brands" :key="b.id" :value="b.id">{{ b.brand || '' }}</option>
-        </select>
         <select v-model="filterChannel" class="select select-bordered select-sm" style="min-width:160px;" @change="onChannelChange">
           <option value="">全部渠道商</option>
           <option v-for="ch in filterChannelOptions" :key="ch.id" :value="ch.id">{{ ch.name }} ({{ ch.id }})</option>
@@ -24,10 +22,10 @@
       </div>
     </div>
 
-    <!-- ========== Tab 1: 授权码查询 ========== -->
+    <!-- ========== Tab 1: MAC查询 ========== -->
     <div v-show="tab === 'codes'" class="bg-white rounded-xl shadow-sm border border-slate-100">
       <div class="flex items-center justify-between px-5 py-3 border-b border-slate-100 flex-wrap gap-2">
-        <h3 class="text-sm font-semibold text-slate-700">授权码记录<span class="text-xs text-slate-400 font-normal ml-2">默认按生产时间倒序</span></h3>
+        <h3 class="text-sm font-semibold text-slate-700">MAC记录<span class="text-xs text-slate-400 font-normal ml-2">默认按生产时间倒序</span></h3>
         <div class="flex items-end gap-2 flex-wrap">
           <div class="form-control">
             <label class="label py-0"><span class="label-text text-xs">状态</span></label>
@@ -50,11 +48,7 @@
             <input v-model="codeBatch" type="text" class="input input-bordered input-xs font-mono" placeholder="批次号" style="width:90px;" />
           </div>
           <div class="form-control">
-            <label class="label py-0"><span class="label-text text-xs">授权码</span></label>
-            <input v-model="codeCode" type="text" class="input input-bordered input-xs" placeholder="授权码" />
-          </div>
-          <div class="form-control">
-            <label class="label py-0"><span class="label-text text-xs">MAC</span></label>
+            <label class="label py-0"><span class="label-text text-xs">MAC地址</span></label>
             <input v-model="codeMac" type="text" class="input input-bordered input-xs" placeholder="MAC" />
           </div>
           <div class="form-control">
@@ -88,24 +82,23 @@
           <thead>
             <tr>
               <th class="w-8"><input v-model="selectAll" type="checkbox" class="checkbox checkbox-xs" @change="toggleSelectAll" /></th>
-              <th>授权码</th><th>批次</th><th>MAC地址</th><th>用户UID</th><th>激活时间</th><th>状态</th><th>操作</th>
+              <th>MAC地址</th><th>批次</th><th>用户UID</th><th>激活时间</th><th>状态</th><th>操作</th>
             </tr>
           </thead>
           <tbody>
             <tr v-if="!filterProduct">
-              <td colspan="8" class="text-center text-slate-400 py-8">请先选择产品</td>
+              <td colspan="7" class="text-center text-slate-400 py-8">请先选择产品</td>
             </tr>
             <tr v-else-if="devicesError">
-              <td colspan="8" class="text-center text-red-400 py-8">查询失败: {{ devicesError }}</td>
+              <td colspan="7" class="text-center text-red-400 py-8">查询失败: {{ devicesError }}</td>
             </tr>
             <tr v-else-if="!devices.length">
-              <td colspan="8" class="text-center text-slate-400 py-8">暂无数据</td>
+              <td colspan="7" class="text-center text-slate-400 py-8">暂无数据</td>
             </tr>
             <tr v-for="(d, i) in devices" v-else :key="i">
               <td><input v-model="selectedCodes" type="checkbox" class="checkbox checkbox-xs" :value="d.code || ''" /></td>
-              <td class="font-mono text-xs">{{ d.code || '' }}</td>
+              <td class="font-mono text-xs font-medium">{{ d.devicemac || '-' }}</td>
               <td class="font-mono text-xs">{{ d.batchno || '' }}</td>
-              <td class="font-mono text-xs">{{ d.devicemac || '-' }}</td>
               <td class="text-xs">{{ d.uid || '-' }}</td>
               <td class="text-xs text-slate-500">{{ d.usedtime ? fmtTime(d.usedtime) : '-' }}</td>
               <td>
@@ -142,7 +135,7 @@
           <div class="text-2xl font-bold text-slate-800">{{ statBatch }}</div>
         </div>
         <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-5">
-          <div class="text-xs text-slate-400 mb-1">生产授权码总数</div>
+          <div class="text-xs text-slate-400 mb-1">生成MAC总数</div>
           <div class="text-2xl font-bold text-indigo-600">{{ statDevices }}</div>
         </div>
         <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-5">
@@ -152,7 +145,7 @@
       </div>
       <div class="bg-white rounded-xl shadow-sm border border-slate-100">
         <div class="flex items-center justify-between px-5 py-3 border-b border-slate-100 flex-wrap gap-2">
-          <h3 class="text-sm font-semibold text-slate-700">生产记录（按批次）<span class="text-xs text-slate-400 font-normal ml-2">点击记录查看该批次授权码</span></h3>
+          <h3 class="text-sm font-semibold text-slate-700">生产记录（按批次）<span class="text-xs text-slate-400 font-normal ml-2">点击记录查看该批次MAC</span></h3>
           <div class="flex items-end gap-2 flex-wrap">
             <div class="form-control">
               <label class="label py-0"><span class="label-text text-xs">起始时间</span></label>
@@ -171,11 +164,12 @@
           <table class="table table-pin-rows text-sm">
             <thead>
               <tr>
+                <th>批次号</th>
                 <th class="w-40">生产时间</th>
-                <th>品牌商</th>
                 <th>渠道商</th>
                 <th>产品</th>
-                <th>批次号</th>
+                <th>代工厂</th>
+                <th class="text-right">分成比例</th>
                 <th>序号区间</th>
                 <th>起始MAC</th>
                 <th>结束MAC</th>
@@ -185,27 +179,29 @@
             </thead>
             <tbody>
               <tr v-if="notesLoading">
-                <td colspan="10" class="text-center text-slate-400 py-8">加载中…</td>
+                <td colspan="11" class="text-center text-slate-400 py-8">加载中…</td>
               </tr>
               <tr v-else-if="notesError">
-                <td colspan="10" class="text-center text-red-400 py-8">查询失败: {{ notesError }}</td>
+                <td colspan="11" class="text-center text-red-400 py-8">查询失败: {{ notesError }}</td>
               </tr>
               <tr v-else-if="!notes.length">
-                <td colspan="10" class="text-center text-slate-400 py-8">暂无数据</td>
+                <td colspan="11" class="text-center text-slate-400 py-8">暂无数据</td>
               </tr>
               <tr v-for="(n, i) in notes" v-else :key="i" class="hover cursor-pointer" @click="viewBatchCodes(n.productid, String(n.batchno || ''))">
+                <td class="font-mono text-xs font-medium text-indigo-600">{{ n.batchno || '' }}</td>
                 <td class="text-xs text-slate-500 whitespace-nowrap">{{ fmtTime(n.ts) }}</td>
-                <td class="text-xs">{{ nameOfBrand(n.brandid) }}</td>
                 <td class="text-xs">{{ nameOfChannel(n.channelid) }}</td>
                 <td class="text-xs">{{ nameOfProduct(n.productid) }}</td>
-                <td class="font-mono text-xs font-medium text-indigo-600">{{ n.batchno || '' }}</td>
+                <td class="text-xs">{{ nameOfFactory(n.factoryid) }}</td>
+                <td class="text-xs text-right">{{ ratePct(n.sharerate) }}</td>
                 <td class="font-mono text-xs">{{ serialRange(n) }}</td>
-                <td class="font-mono text-xs">{{ n.startmac || '' }}</td>
-                <td class="font-mono text-xs">{{ n.endmac || '' }}</td>
+                <!-- 导入的批次没有 MAC 区间（外部 MAC 不连续），显示「-」；明细点「查看MAC」 -->
+                <td class="font-mono text-xs">{{ n.startmac || '-' }}</td>
+                <td class="font-mono text-xs">{{ n.endmac || '-' }}</td>
                 <td class="text-right font-medium">{{ n.devicenum || 0 }}</td>
                 <td>
                   <div class="flex gap-1">
-                    <button class="btn btn-ghost btn-xs text-indigo-500" @click.stop="viewBatchCodes(n.productid, String(n.batchno || ''))">查看授权码</button>
+                    <button class="btn btn-ghost btn-xs text-indigo-500" @click.stop="viewBatchCodes(n.productid, String(n.batchno || ''))">查看MAC</button>
                     <button v-if="isSuperAdmin" class="btn btn-ghost btn-xs text-red-500" @click.stop="openRevokeDialog(n.brandid, n.productid, String(n.batchno || ''), n.devicenum || 0)">撤销</button>
                   </div>
                 </td>
@@ -216,17 +212,19 @@
       </div>
     </div>
 
-    <!-- ========== Tab 3: 生产授权码 ========== -->
+    <!-- ========== Tab 3: 生成MAC ========== -->
     <div v-show="tab === 'produce'" class="bg-white rounded-xl shadow-sm border border-slate-100 p-8 max-w-3xl">
-      <h3 class="text-base font-semibold text-slate-800 mb-2">生产授权码</h3>
+      <h3 class="text-base font-semibold text-slate-800 mb-2">生成MAC</h3>
       <p class="text-sm text-slate-500 leading-relaxed mb-1">
-        生产流程：填写生产表单 → 系统按产品类型计算最终授权码数量并预分配批次号 →
-        <b>二次确认生产方案</b>（品牌商 / 产品ID / 批次号 / 数量 / MAC区间）→ 提交服务端生产 → 发送生产通知邮件。
+        生产流程：填写生产表单 → 系统按产品类型计算最终数量并预分配批次号 →
+        <b>核对生产方案</b>（产品ID / 批次号 / 数量 / MAC区间 / 赠送）→ 提交服务端生产 → 发送生产通知邮件。
       </p>
       <ul class="text-xs text-slate-400 list-disc list-inside mb-6 space-y-0.5">
-        <li>经典蓝牙耳机产品生成<b>设备码</b>（每个码绑定 MAC 地址）；其余产品生成<b>授权码</b>。</li>
+        <li>生成的就是 <b>MAC 地址</b>，<b>不再有单独的授权码</b>——设备的凭据就是它自己的 MAC，
+          MAC 前 2 字节即 PID，产品 / 批次 / 渠道都能从它查回来。</li>
         <li>产品配置了「每副份数」时，最终生成数量 = 生产数量 × 每副份数。</li>
-        <li>导入模式按上传的 MAC 地址列表逐条生成设备码。</li>
+        <li><b>导入MAC</b>：按上传的 MAC 地址列表逐条建档，用于外部已烧录好 MAC 的批次。</li>
+        <li><b>分成比例按批次填</b>——同一家渠道商不同批次可以谈不同比例，生产时冻结进批次台账。</li>
       </ul>
       <button class="btn btn-primary text-white" @click="showCreateForm">＋ 开始生产</button>
     </div>
@@ -234,65 +232,104 @@
     <!-- 生产表单弹窗 -->
     <dialog ref="createModal" class="modal">
       <div class="modal-box max-w-2xl">
-        <h3 class="font-bold text-lg mb-4">生产授权码</h3>
+        <h3 class="font-bold text-lg mb-4">生成MAC</h3>
         <form @submit.prevent="submitPreview">
           <div class="grid grid-cols-2 gap-4 mb-4">
-            <div class="form-control">
-              <label class="label"><span class="label-text font-medium">品牌商 *</span></label>
-              <select v-model.number="cBrand" class="select select-bordered select-sm w-full" required @change="onCreateBrandChange">
-                <option :value="0">请选择品牌商</option>
-                <option v-for="b in brands" :key="b.id" :value="b.id">{{ (b.brand || '') + ' (' + hexId(b.id) + ')' }}</option>
-              </select>
-            </div>
+            <!-- 渠道商放第一位：生产表单已不选品牌商，品牌归属由渠道商推导（选中品牌官方渠道时继承其品牌商） -->
             <div class="form-control">
               <label class="label"><span class="label-text font-medium">渠道商 *</span></label>
               <select v-model="cChannel" class="select select-bordered select-sm w-full" required :disabled="!createChannelOptions.length">
-                <option value="">{{ cBrand ? (createChannelOptions.length ? '请选择渠道商' : '该品牌商暂无已启用渠道商') : '请先选择品牌商' }}</option>
+                <option value="">{{ createChannelOptions.length ? '请选择渠道商' : '暂无已启用渠道商，请先到【渠道商管理】新增并审核通过' }}</option>
                 <option v-for="ch in createChannelOptions" :key="ch.id" :value="ch.id">{{ ch.name + ' (' + ch.id + ')' }}</option>
               </select>
             </div>
             <div class="form-control">
               <label class="label"><span class="label-text font-medium">产品 *</span></label>
               <select v-model.number="cProduct" class="select select-bordered select-sm w-full" required :disabled="!createProductOptions.length">
-                <option :value="0">{{ cBrand ? '请选择产品' : '请先选择品牌商' }}</option>
+                <option :value="0">{{ createProductOptions.length ? '请选择产品' : '暂无产品，请先到【产品管理】创建' }}</option>
                 <option v-for="p in createProductOptions" :key="p.id" :value="p.id">{{ (p.devicename || '') + ' (' + hexId(p.id) + ')' }}</option>
               </select>
             </div>
+            <!-- 分成比例按批次定：同一渠道商不同批次可以谈不同比例，挂在渠道商上只能存一个值 -->
+            <div class="form-control">
+              <label class="label"><span class="label-text font-medium">渠道分成比例（%）</span></label>
+              <input v-model.number="cSharepct" type="number" step="0.01" min="0" max="100" class="input input-bordered input-sm w-full" placeholder="0" />
+              <span class="label-text-alt text-slate-400 mt-1">给上面这家渠道商的分成，<b>生产时冻结进批次</b>，事后改不影响已生成的批次</span>
+            </div>
+          </div>
+
+          <!-- 产品档案带出来的三项，只读：改它们要回【产品管理】改产品，改在这里等于同一事实两处维护 -->
+          <div class="rounded-lg border border-slate-200 bg-slate-50 px-4 py-3 mb-4">
+            <div class="text-xs text-slate-400 mb-2">以下三项随所选产品自动带出，不可在此修改（要改请到【产品管理】改产品档案）</div>
+            <div class="grid grid-cols-3 gap-4 text-sm">
+              <div>
+                <div class="text-xs text-slate-500 mb-0.5">代工厂</div>
+                <div class="font-medium" :class="cProduct ? 'text-slate-700' : 'text-slate-300'">{{ cProduct ? nameOfFactory(cFactory) : '—' }}</div>
+              </div>
+              <div>
+                <div class="text-xs text-slate-500 mb-0.5">方案公司 (BID)</div>
+                <div class="font-medium" :class="cProduct ? 'text-slate-700' : 'text-slate-300'">{{ cProduct ? providerLabel : '—' }}</div>
+              </div>
+              <div>
+                <div class="text-xs text-slate-500 mb-0.5">芯片 (CID)</div>
+                <div class="font-medium" :class="cProduct ? 'text-slate-700' : 'text-slate-300'">{{ cProduct ? vendorLabel : '—' }}</div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 绑定赠送按批次配：同款产品不同批次（不同渠道/不同活动）送的东西经常不一样 -->
+          <div class="rounded-lg border border-slate-200 px-4 py-3 mb-4">
+            <div class="text-xs text-slate-500 mb-2">
+              绑定赠送（这一批设备被用户绑定时发放，<b>生产时冻结</b>；三项都填 0 则回退到产品档案上的旧配置）
+            </div>
+            <div class="grid grid-cols-3 gap-4">
+              <div class="form-control">
+                <label class="label py-1"><span class="label-text text-xs">赠送VIP（天）</span></label>
+                <input v-model.number="cRewardVip" type="number" min="0" max="3650" class="input input-bordered input-sm w-full" placeholder="0" />
+              </div>
+              <div class="form-control">
+                <label class="label py-1"><span class="label-text text-xs">赠送翻译时长（分钟）</span></label>
+                <input v-model.number="cRewardTranslate" type="number" min="0" max="525600" class="input input-bordered input-sm w-full" placeholder="0" />
+              </div>
+              <div class="form-control">
+                <label class="label py-1"><span class="label-text text-xs">赠送会议时长（分钟）</span></label>
+                <input v-model.number="cRewardMeeting" type="number" min="0" max="525600" class="input input-bordered input-sm w-full" placeholder="0" />
+              </div>
+            </div>
           </div>
           <div class="tabs tabs-boxed mb-4 bg-slate-100 inline-flex">
-            <a class="tab tab-sm" :class="{ 'tab-active': createMode === 'production' }" @click="createMode = 'production'">生产</a>
-            <a class="tab tab-sm" :class="{ 'tab-active': createMode === 'import' }" @click="createMode = 'import'">导入</a>
+            <a class="tab tab-sm" :class="{ 'tab-active': createMode === 'production' }" @click="createMode = 'production'">生成MAC</a>
+            <a class="tab tab-sm" :class="{ 'tab-active': createMode === 'import' }" @click="createMode = 'import'">导入MAC</a>
           </div>
+          <!-- 只剩生产数量。原来右边那个「绑定MAC地址」开关已删：MAC 本身就是设备凭据，
+               经典蓝牙耳机一律生成 MAC，没有「绑不绑」的选择；而且服务端从来没读过这个字段。 -->
           <div v-show="createMode === 'production'" class="grid grid-cols-2 gap-4 mb-1">
             <div class="form-control">
               <label class="label"><span class="label-text font-medium">生产数量 *</span></label>
               <input v-model.number="cNumber" type="number" class="input input-bordered input-sm w-full" min="1" max="10000" placeholder="生产数量（副）" :required="createMode === 'production'" />
             </div>
-            <div class="form-control">
-              <label class="label"><span class="label-text font-medium">绑定MAC地址</span></label>
-              <input v-model="cBindmac" type="checkbox" class="toggle toggle-primary" />
-            </div>
           </div>
           <div v-show="createMode === 'import'">
             <div class="form-control mb-2">
               <label class="label"><span class="label-text font-medium">上传 CSV 文件</span></label>
               <input type="file" class="file-input file-input-bordered file-input-sm w-full" accept=".csv" @change="readCSV" />
-              <p class="text-xs text-slate-400 mt-1">上传 CSV 文件，系统将读取第一列作为 MAC 地址</p>
+              <p class="text-xs text-slate-400 mt-1">只读第一列，每行一个 MAC 地址</p>
             </div>
             <div class="form-control mb-1">
               <label class="label"><span class="label-text font-medium">MAC 地址列表 *</span></label>
-              <textarea v-model="cMacaddresses" class="textarea textarea-bordered w-full" rows="4" placeholder="MAC 地址以逗号分隔，可手动输入或通过CSV导入"></textarea>
+              <textarea v-model="cMacaddresses" class="textarea textarea-bordered w-full" rows="4" placeholder="MAC 地址以逗号分隔，可手动输入或通过 CSV 导入"></textarea>
+              <span class="label-text-alt text-slate-400 mt-1">用于外部已烧录好 MAC 的批次：不按序号推算，直接按这里的地址逐条建档</span>
             </div>
           </div>
           <!-- 按产品类型说明最终产量 -->
           <div v-if="cProduct" class="rounded-lg bg-indigo-50 border border-indigo-100 px-4 py-3 text-sm text-slate-700 mt-3 mb-3">
             <div class="flex flex-wrap gap-x-6 gap-y-1">
-              <span>产品类型：<b>{{ createProductInfo.isClassicBT ? '经典蓝牙耳机（设备码，绑定MAC）' : '通用产品（授权码）' }}</b></span>
+              <span>产品类型：<b>{{ createProductInfo.isClassicBT ? '经典蓝牙耳机' : '通用产品' }}</b></span>
               <span>每副份数：<b>{{ createProductInfo.codeCount }}</b></span>
-              <span v-if="createMode === 'production'">最终生成：<b class="text-indigo-600">{{ createFinalTotal }}</b> 个{{ createProductInfo.isClassicBT ? '设备码' : '授权码' }}
+              <span v-if="createMode === 'production'">最终生成：<b class="text-indigo-600">{{ createFinalTotal }}</b> 个{{ createProductInfo.isClassicBT ? 'MAC' : '码' }}
                 <template v-if="createProductInfo.codeCount > 1">（{{ cNumber || 0 }} 副 × {{ createProductInfo.codeCount }} 份）</template>
               </span>
-              <span v-else>最终生成：<b class="text-indigo-600">{{ importMacCount }}</b> 个设备码（按 MAC 条数）</span>
+              <span v-else>最终生成：<b class="text-indigo-600">{{ importMacCount }}</b> 条（按导入的 MAC 条数）</span>
             </div>
           </div>
           <div class="form-control mb-4">
@@ -302,7 +339,7 @@
           <div class="modal-action">
             <button type="button" class="btn btn-ghost btn-sm" @click="closeCreateModal">取消</button>
             <button type="submit" class="btn btn-primary btn-sm text-white" :disabled="previewLoading">
-              <span v-if="previewLoading" class="loading loading-spinner loading-xs"></span>下一步：确认生产方案
+              <span v-if="previewLoading" class="loading loading-spinner loading-xs"></span>下一步：核对生产方案
             </button>
           </div>
         </form>
@@ -310,25 +347,36 @@
       <form method="dialog" class="modal-backdrop"><button>close</button></form>
     </dialog>
 
-    <!-- 生产方案二次确认弹窗（按邮件规格展示） -->
+    <!-- 生产方案核对弹窗（按邮件规格展示） -->
     <dialog ref="confirmModal" class="modal">
       <div class="modal-box max-w-lg">
-        <h3 class="font-bold text-lg mb-3">确认生产方案</h3>
+        <h3 class="font-bold text-lg mb-3">核对生产方案</h3>
         <div class="bg-amber-50 border border-amber-200 rounded-lg p-3 text-xs text-amber-700 mb-4">
           请核对以下生产方案。确认后立即提交服务端生产，批次一经生成只能整批撤销、不可修改。
         </div>
         <div v-if="preview" class="rounded-lg border border-slate-200 bg-slate-50 px-4 py-3 font-mono text-sm leading-7 mb-4">
           <div>生产批次(BatchNo)：<b class="text-indigo-600">{{ preview.batchno || '生产时分配' }}</b></div>
-          <div>品牌商：{{ preview.brandname }}</div>
+          <div>品牌商：{{ preview.brandname || '-' }}<span v-if="!preview.brandid" class="text-xs text-slate-400 ml-2">（无品牌归属，由所选渠道商推出）</span></div>
           <div>渠道商：{{ preview.channelname }}（{{ preview.channelid }}）</div>
-          <div>服务ID(CID)：0x{{ previewCid }}</div>
-          <div>品牌ID(BID)：0x{{ hexId(preview.brandid).padStart(4, '0') }}</div>
+          <div>渠道分成比例：<b class="text-indigo-600">{{ (Number(cSharepct) || 0).toFixed(2) }}%</b></div>
+          <div>代工厂：{{ nameOfFactory(cFactory) }}</div>
+          <div>芯片ID(CID)：0x{{ previewCid }}</div>
+          <div>方案ID(BID)：0x{{ previewBid }}</div>
           <div>产品ID(PID)：0x{{ hexId(preview.productid).padStart(4, '0') }}</div>
           <div>产品名称：{{ preview.productname }}</div>
-          <div>授权码类型：{{ preview.codetype }}</div>
+          <div>生成类型：{{ preview.codetype }}</div>
           <div>生产数量：<b class="text-indigo-600">{{ preview.total }}</b> 个<template v-if="preview.codecount > 1">（每副 {{ preview.codecount }} 份）</template></div>
           <div>序号区间：{{ preview.serialstart }} - {{ preview.serialend }}</div>
+          <!-- 生产模式：MAC 由 (PID,序号) 算出，首尾就是真实边界，显示区间 -->
           <div v-if="preview.startmac">MAC地址区间：{{ preview.startmac }} - {{ preview.endmac }}</div>
+          <!-- 导入模式：MAC 来自外部 CSV、彼此不连续，没有「区间」这回事，只报条数与前几条样例 -->
+          <template v-else-if="createMode === 'import'">
+            <div>MAC来源：<b>外部导入</b>（无区间，共 {{ preview.total }} 条）</div>
+            <div v-if="preview.importsample && preview.importsample.length" class="text-xs text-slate-500 pl-4">
+              前 {{ preview.importsample.length }} 条：{{ preview.importsample.join('、') }}{{ preview.total > preview.importsample.length ? ' …' : '' }}
+            </div>
+          </template>
+          <div>绑定赠送：{{ rewardSummary }}</div>
         </div>
         <div class="modal-action">
           <button type="button" class="btn btn-ghost btn-sm" @click="closeConfirmModal">返回修改</button>
@@ -389,14 +437,13 @@
           撤销生产批次
         </h3>
         <div class="bg-red-50 border border-red-200 rounded-lg p-3 text-sm text-red-700 mb-4">
-          此操作将<strong>删除该批次的全部授权码</strong>以及对应的生产出货记录，<strong>不可恢复</strong>。<br />
-          若该批次中已有任意授权码被激活/绑定，撤销会被拒绝。
+          此操作将<strong>删除该批次的全部 MAC</strong>以及对应的生产出货记录，<strong>不可恢复</strong>。<br />
+          若该批次中已有任意一条被激活/绑定，撤销会被拒绝。
         </div>
         <div class="text-sm space-y-1 mb-4">
-          <div><span class="text-slate-500">品牌商：</span><span class="font-medium">{{ revokeCtx ? nameOfBrand(revokeCtx.brandid) : '' }}</span></div>
           <div><span class="text-slate-500">产品：</span><span class="font-medium">{{ revokeCtx ? nameOfProduct(revokeCtx.productid) : '' }}</span></div>
           <div><span class="text-slate-500">批次号：</span><span class="font-mono font-medium text-red-600">{{ revokeConfirmTarget }}</span></div>
-          <div><span class="text-slate-500">授权码数量：</span><span class="font-medium">{{ revokeCtx ? revokeCtx.devicenum : '' }}</span></div>
+          <div><span class="text-slate-500">MAC数量：</span><span class="font-medium">{{ revokeCtx ? revokeCtx.devicenum : '' }}</span></div>
         </div>
         <div class="form-control mb-2">
           <label class="label"><span class="label-text text-xs">请输入批次号 <span class="font-mono text-red-600">{{ revokeConfirmTarget }}</span> 以确认撤销</span></label>
@@ -420,8 +467,9 @@ import { ref, reactive, computed, onMounted } from 'vue'
 import { useApi } from '~/composables/useApi'
 import { useToast } from '~/composables/useToast'
 import { useAuthStore } from '~/stores/auth'
+import { loadChipVendors, chipVendorName } from '~/utils/chipvendors'
 
-definePageMeta({ title: '生产管理' })
+definePageMeta({ title: 'MAC生成管理' })
 
 interface Brand {
   id: number
@@ -432,14 +480,16 @@ interface Product {
   id: number
   devicename: string
   brandid: number
-  providerid?: number // 归属方案商 = 服务ID(CID)
+  providerid?: number // 归属方案公司 = BID；CID 再由该方案商的 vendor 推出
+  oemfactoryid?: number // 默认代工厂（oem_factory.id），生产表单只读带出、批次归属按它落库
   devicetype?: number
   devicecodecount?: number
 }
 interface Channel {
   id: string
-  brandid: number
+  brandid: number // 0=全局渠道商；非 0 只出现在随品牌商自动创建的「官方渠道」上，生产时批次继承它
   name: string
+  contactmails?: string // 生产通知邮件的收件人回退来源（无品牌归属时用它）
   status: number // 0待审核 1启用 2停用 3驳回
 }
 interface Note {
@@ -455,6 +505,20 @@ interface Note {
   devicenum?: number
   batchno?: number | string
   remark?: string
+  factoryid?: number // 代工厂 id（oem_factory.id），0/缺失 = 未指定（本功能上线前的存量批次）
+  sharerate?: number // 本批次渠道分成比例(万分比)，0/缺失 = 不分成
+}
+interface OemFactory {
+  id: number
+  name: string
+  enabled?: boolean
+}
+// 方案公司：BID 直接取它的 id，CID 取它的 vendor（芯片公司 id）
+interface Provider {
+  id: number
+  name: string
+  vendor?: number
+  contactmails?: string // 生产通知邮件的收件人：货是方案公司在打，通知发给它
 }
 interface DeviceRow {
   code: string
@@ -497,6 +561,7 @@ interface PreviewResult {
   serialend?: number | string
   startmac?: string
   endmac?: string
+  importsample?: string[] // 导入模式的前几条 MAC 样例；生产模式为空
 }
 interface RevokeCtx {
   brandid: number
@@ -510,7 +575,7 @@ const { success, error, warn } = useToast()
 const auth = useAuthStore()
 
 const isSuperAdmin = computed(() => auth.identity === 1)
-// 管理员及以上（identity 1=超管, 2=管理员）才可生产授权码
+// 管理员及以上（identity 1=超管, 2=管理员）才可生成 MAC
 const canCreate = computed(() => auth.identity > 0 && auth.identity <= 2)
 
 // ========== 页面 Tab ==========
@@ -522,6 +587,10 @@ function switchPageTab(t: 'codes' | 'batches' | 'produce') {
 // ========== 全局状态 ==========
 const brands = ref<Brand[]>([])
 const channels = ref<Channel[]>([]) // 全量渠道商（含未启用），前端按品牌商过滤
+// 全量代工厂（含已停用）：列表列名要能显示历史批次里已停用的工厂，生产下拉再单独筛 enabled
+const factories = ref<OemFactory[]>([])
+// 方案公司全量：生产二次确认与通知邮件里的 CID/BID 都从这里推
+const providers = ref<Provider[]>([])
 const products = ref<Product[]>([]) // 当前账号可访问的产品（已按 productids 过滤）
 const allProducts = ref<Product[]>([]) // 全量产品（用于名称查询）
 const notes = ref<Note[]>([])
@@ -531,7 +600,6 @@ const devPage = ref(0)
 const devPageSize = ref(200)
 
 // ── 共享筛选 ──
-const filterBrand = ref(0)
 const filterChannel = ref('')
 const filterProduct = ref(0)
 const filterStart = ref('')
@@ -545,11 +613,18 @@ const notesCountText = ref('')
 const notesLoading = ref(false)
 const notesError = ref('')
 
-// ── 授权码筛选（默认最近生产：全部状态 + 按生产时间倒序） ──
+// ── MAC 筛选（默认最近生产：全部状态 + 按生产时间倒序） ──
 const codeStatus = ref('0')
 const codeSort = ref('createtime')
 const codeBatch = ref('') // 批次号（batchno 短码）
-const codeCode = ref('')
+// 本批次给渠道商的分成比例，表单用百分比（更直观），提交时换算成后端的万分比整数。
+// 放在批次而不是渠道商上：同一渠道商不同批次可以谈不同比例。
+const cSharepct = ref(0)
+// 绑定赠送三项，按批次配：同款产品不同批次（不同渠道/不同活动）送的东西经常不一样。
+// 三项都是 0 时服务端会回退到产品档案上的旧配置，所以「全 0」= 不覆盖，而不是「不送」。
+const cRewardVip = ref(0)
+const cRewardTranslate = ref(0)
+const cRewardMeeting = ref(0)
 const codeMac = ref('')
 const codeUid = ref('')
 const codePageSizeSel = ref('200')
@@ -567,10 +642,8 @@ const devicesTable = ref<HTMLElement | null>(null)
 const createModal = ref<HTMLDialogElement | null>(null)
 const confirmModal = ref<HTMLDialogElement | null>(null)
 const createMode = ref<'production' | 'import'>('production')
-const cBrand = ref(0)
 const cChannel = ref('')
 const cProduct = ref(0)
-const cBindmac = ref(false)
 const cNumber = ref<number | null>(null)
 const cMacaddresses = ref('')
 const cRemark = ref('')
@@ -597,30 +670,48 @@ const revokeConfirmOk = computed(() => !!revokeCtx.value && revokeConfirmInput.v
 const totalPages = computed(() => Math.max(1, Math.ceil(devTotal.value / devPageSize.value)))
 const pgInfoText = computed(() => filterProduct.value ? '第 ' + (devPage.value + 1) + ' / ' + totalPages.value + ' 页' : '-')
 
-// 顶部产品下拉：按所选品牌商过滤
-const filterProductOptions = computed(() => {
-  return filterBrand.value
-    ? products.value.filter((p) => p.brandid === filterBrand.value)
-    : products.value
+// 顶部产品/渠道商下拉：都列全部。原来按所选品牌商收窄，品牌商筛选去掉后这层过滤没了意义——
+// 而且产品与渠道商现在的 brandid 基本都是 0，按它筛只会筛出空列表。
+const filterProductOptions = computed(() => products.value)
+const filterChannelOptions = computed(() => channels.value)
+// 生产表单的代工厂/方案公司/芯片都由所选产品带出，只读——同一事实在两处能改就一定会不一致。
+// 代工厂取产品档案上的 oemfactoryid，服务端也是这么取的（不收前端传值）。
+const cFactory = computed(() => {
+  const p = allProducts.value.find((x) => x.id === cProduct.value)
+  return Number(p?.oemfactoryid || 0)
 })
-// 顶部渠道商下拉：按所选品牌商过滤（不限品牌商时列全部）
-const filterChannelOptions = computed(() => {
-  return filterBrand.value
-    ? channels.value.filter((ch) => ch.brandid === filterBrand.value)
-    : channels.value
+// 「名称 (0xBID)」；产品没绑方案商时显示成「未绑定方案」而不是空白，
+// 否则运营看不出是没选产品还是产品缺配置。
+const providerLabel = computed(() => {
+  const p = allProducts.value.find((x) => x.id === cProduct.value)
+  if (!p?.providerid) return '未绑定方案'
+  const pv = providers.value.find((x) => x.id === p.providerid)
+  return `${pv?.name || '方案商#' + p.providerid} (0x${hex4(p.providerid)})`
 })
-// 生产表单渠道商下拉：按所选品牌商过滤，且只列已启用的（待审核/停用/驳回不能用于生产）
-const createChannelOptions = computed(() => {
-  return cBrand.value
-    ? channels.value.filter((ch) => ch.brandid === cBrand.value && ch.status === 1)
-    : []
+const vendorLabel = computed(() => {
+  const p = allProducts.value.find((x) => x.id === cProduct.value)
+  if (!p?.providerid) return '未绑定方案'
+  const pv = providers.value.find((x) => x.id === p.providerid)
+  if (!pv?.vendor) return '方案未选芯片'
+  return `${chipVendorName(pv.vendor)} (0x${hex4(pv.vendor)})`
 })
-// 生产表单产品下拉：按所选品牌商过滤
-const createProductOptions = computed(() => {
-  return cBrand.value
-    ? products.value.filter((p) => p.brandid === cBrand.value)
-    : []
+// 核对页的一行摘要：三项都为 0 时说清楚会回退到产品配置，别让人以为是「不送」
+const rewardSummary = computed(() => {
+  const parts: string[] = []
+  if (Number(cRewardVip.value) > 0) parts.push(`VIP ${cRewardVip.value} 天`)
+  if (Number(cRewardTranslate.value) > 0) parts.push(`翻译 ${cRewardTranslate.value} 分钟`)
+  if (Number(cRewardMeeting.value) > 0) parts.push(`会议 ${cRewardMeeting.value} 分钟`)
+  return parts.length ? parts.join(' + ') : '未配置（按产品档案上的旧配置发放）'
 })
+
+// 生产表单渠道商下拉：只列已启用的（待审核/停用/驳回不能用于生产）。
+// ⚠️ 不按品牌商过滤：表单已经没有品牌商这一项了，品牌归属反过来由所选渠道商推出
+// （品牌官方渠道 → 继承它的品牌商；全局渠道商 → 无品牌归属）。
+const createChannelOptions = computed(() => channels.value.filter((ch) => ch.status === 1))
+// 生产表单产品下拉：列全部产品，不按品牌商/渠道商过滤。
+// 产品已经不带品牌商了（品牌归属改成生产时按批次定，见产品管理表单），
+// 再按 brandid 筛会因为产品的 brandid=0 而永远筛出空列表、一个产品都选不到。
+const createProductOptions = computed(() => products.value)
 // 生产表单所选产品的类型说明（经典蓝牙=1 → 设备码；每副份数 devicecodecount）
 const createProductInfo = computed(() => {
   const p = allProducts.value.find((x) => x.id === cProduct.value)
@@ -629,15 +720,28 @@ const createProductInfo = computed(() => {
 })
 const createFinalTotal = computed(() => (Number(cNumber.value) || 0) * createProductInfo.value.codeCount)
 const importMacCount = computed(() => cMacaddresses.value.split(',').map((s) => s.trim()).filter(Boolean).length)
-// 服务ID(CID) = 产品绑定的方案商 id（挂在产品上，不是品牌商上）
-const previewCid = computed(() => {
-  if (!preview.value) return 'N/A'
-  return cidOfProduct(preview.value.productid)
-})
+// 三个要烧进固件的标识，口径固定为：
+//   CID = 芯片公司（产品 → 方案商 → solution_provider.vendor，即 chip_vendor.id）
+//   BID = 方案公司（产品 → providerid，即 solution_provider.id）
+//   PID = 产品（product.id）
+// 两者都从产品的方案商推出来，所以产品必须绑方案商，否则 CID/BID 都定不了。
+function hex4(v?: number | null) {
+  return v ? Number(v).toString(16).padStart(4, '0').toUpperCase() : 'N/A'
+}
+// BID：产品绑定的方案公司 id
+function bidOfProduct(productId: number) {
+  const p = allProducts.value.find((x) => x.id === productId)
+  return hex4(p?.providerid)
+}
+// CID：该方案公司用的芯片公司 id（方案商的 vendor 列）
 function cidOfProduct(productId: number) {
   const p = allProducts.value.find((x) => x.id === productId)
-  return p && p.providerid ? Number(p.providerid).toString(16).padStart(4, '0').toUpperCase() : 'N/A'
+  if (!p?.providerid) return 'N/A'
+  const pv = providers.value.find((x) => x.id === p.providerid)
+  return hex4(pv?.vendor)
 }
+const previewCid = computed(() => (preview.value ? cidOfProduct(preview.value.productid) : 'N/A'))
+const previewBid = computed(() => (preview.value ? bidOfProduct(preview.value.productid) : 'N/A'))
 
 // ========== 工具函数 ==========
 function fmtTime(ts?: number) {
@@ -646,15 +750,17 @@ function fmtTime(ts?: number) {
   return d.getFullYear() + '-' + String(d.getMonth() + 1).padStart(2, '0') + '-' + String(d.getDate()).padStart(2, '0') +
     ' ' + String(d.getHours()).padStart(2, '0') + ':' + String(d.getMinutes()).padStart(2, '0')
 }
+
+// 万分比 → 百分比展示。0 显示成 -，免得整列都是意义不大的 0.00%
+function ratePct(rate?: number) {
+  const n = Number(rate) || 0
+  return n ? (n / 100).toFixed(2) + '%' : '-'
+}
 function dateToUnix(s: string, endOfDay: boolean) {
   if (!s) return 0
   const d = new Date(s + (endOfDay ? 'T23:59:59' : 'T00:00:00'))
   return Math.floor(d.getTime() / 1000)
 }
-function nameOfBrand(id: number): string {
-  const b = brands.value.find((x) => x.id === id)
-  return b ? b.brand : String(id || '')
-}
 function nameOfChannel(id?: string): string {
   if (!id) return '未分配'
   const ch = channels.value.find((x) => x.id === id)
@@ -664,6 +770,20 @@ function nameOfProduct(id: number): string {
   const p = allProducts.value.find((x) => x.id === id)
   return p ? p.devicename : String(id || '')
 }
+// 代工厂名。0/缺失 = 本功能上线前的存量批次，显示「未指定」而不是空白，
+// 免得看着像加载失败；查不到名字（工厂被删）时退化成 工厂#N，至少能看出是数据问题。
+// 产品归属的方案公司名。没绑方案时返回「未绑定方案」——生产前置校验已经会拦住这种产品，
+// 这里只是让邮件里不出现空白行。
+function providerNameOfProduct(productId: number): string {
+  const p = allProducts.value.find((x) => x.id === productId)
+  if (!p?.providerid) return '未绑定方案'
+  return providers.value.find((v) => v.id === p.providerid)?.name || ('方案商#' + p.providerid)
+}
+function nameOfFactory(id?: number): string {
+  const n = Number(id || 0)
+  if (!n) return '未指定'
+  return factories.value.find((f) => f.id === n)?.name ?? ('工厂#' + n)
+}
 function hexId(id: number) {
   return id ? Number(id).toString(16).toUpperCase() : ''
 }
@@ -673,7 +793,7 @@ function serialRange(n: Note): string {
   if (!a && !b) return '-'
   return a + ' - ' + b
 }
-// 授权码状态展示（封禁优先；圆点 + 文字的轻量样式）
+// 记录状态展示（封禁优先；圆点 + 文字的轻量样式）
 function codeState(d: DeviceRow): { label: string; dot: string; text: string } {
   if (d.disabled !== 0) return { label: '已禁用', dot: 'bg-red-500', text: 'text-red-600' }
   if (d.status === 1) return { label: '已激活', dot: 'bg-emerald-500', text: 'text-emerald-600' }
@@ -684,20 +804,28 @@ function codeState(d: DeviceRow): { label: string; dot: string; text: string } {
 // ========== 初始化 ==========
 async function init() {
   try {
-    const [fRes, pRes, cRes] = await Promise.all([
+    const [fRes, pRes, cRes, facRes, pvRes] = await Promise.all([
       webApi<{ brands: Brand[] }>('getbrands', {}),
       webApi<{ products: Product[] }>('getproducts', {}),
       // status=-1 取全部状态：列表列名要能显示历史批次里已停用的渠道商，生产下拉再单独筛 status=1
       webApi<{ channels: Channel[] }>('getchannels', { status: -1 }),
+      webApi<{ factories: OemFactory[] }>('getoemfactories', {}),
+      webApi<{ providers: Provider[] }>('getsolutionproviders', {}),
+      // 芯片厂商：生产表单要按「方案商.vendor → 芯片名」展示 CID，拿不到只影响那一栏的显示
+      loadChipVendors(webApi),
     ])
     brands.value = fRes?.brands ?? []
     allProducts.value = pRes?.products ?? []
     channels.value = cRes?.channels ?? []
+    factories.value = facRes?.factories ?? []
+    providers.value = pvRes?.providers ?? []
   } catch (e: any) {
     error(e?.message ?? '加载基础数据失败')
     brands.value = []
     allProducts.value = []
     channels.value = []
+    factories.value = []
+    providers.value = []
   }
 
   // 按账号绑定的 productids 过滤（identity 1 超管不限）
@@ -716,16 +844,6 @@ async function init() {
 }
 
 // ========== 筛选联动 ==========
-function onBrandChange() {
-  // 切换品牌商后，若当前所选产品/渠道商不在过滤后的列表，则清空
-  if (filterProduct.value && !filterProductOptions.value.find((p) => p.id === filterProduct.value)) {
-    filterProduct.value = 0
-  }
-  if (filterChannel.value && !filterChannelOptions.value.find((ch) => ch.id === filterChannel.value)) {
-    filterChannel.value = ''
-  }
-  reloadAll()
-}
 function onChannelChange() {
   devPage.value = 0
   reloadAll()
@@ -759,7 +877,6 @@ async function loadNotes() {
   notesError.value = ''
   const hasTimeFilter = !!(filterStart.value || filterEnd.value)
   const params: Record<string, unknown> = { limit: hasTimeFilter ? 500 : 10 }
-  if (filterBrand.value) params.brandid = filterBrand.value
   if (filterChannel.value) params.channelid = filterChannel.value
   if (filterProduct.value) params.productid = filterProduct.value
   const s = dateToUnix(filterStart.value, false)
@@ -807,7 +924,7 @@ async function submitRevoke() {
       batchno: revokeCtx.value.batchno,
     })
     closeRevokeDialog()
-    success('已撤销批次，删除 ' + (data?.deleted ?? 0) + ' 个授权码')
+    success('已撤销批次，删除 ' + (data?.deleted ?? 0) + ' 条记录')
     reloadAll()
   } catch (e: any) {
     revokeError.value = e?.message ?? '撤销失败'
@@ -816,7 +933,7 @@ async function submitRevoke() {
   }
 }
 
-// 点击生产记录跳转到授权码查询（按批次号过滤）
+// 点击生产记录跳转到 MAC 查询（按批次号过滤）
 function viewBatchCodes(pid: number, batchno: string) {
   filterProduct.value = pid
   codeBatch.value = batchno
@@ -829,7 +946,7 @@ function viewBatchCodes(pid: number, batchno: string) {
   }, 100)
 }
 
-// ========== 授权码记录加载 ==========
+// ========== MAC 记录加载 ==========
 function buildDeviceFilterParams(): Record<string, unknown> {
   const params: Record<string, unknown> = {
     productid: filterProduct.value,
@@ -838,11 +955,9 @@ function buildDeviceFilterParams(): Record<string, unknown> {
   }
   const st = parseInt(codeStatus.value)
   if (!isNaN(st)) params.status = st
-  if (filterBrand.value) params.brandid = filterBrand.value
   if (filterChannel.value) params.channelid = filterChannel.value
   const batch = codeBatch.value.trim()
   if (batch) params.batchno = batch
-  const code = codeCode.value.trim(); if (code) params.code = code
   const mac = codeMac.value.trim(); if (mac) params.devicemac = mac
   const uid = codeUid.value.trim(); if (uid) params.uid = uid
   return params
@@ -882,7 +997,9 @@ function changePage(delta: number) {
 async function resetDevice(license: string) {
   if (!window.confirm('确定重置该设备授权状态？')) return
   try {
-    await webApi('resetlicensestatus', { licenses: license })
+    // 必须带 productid：设备分表(license_<pid>)按产品切，而 code 就是 MAC，
+    // 导入进来的 MAC 前两字节是外部厂商的 OUI，服务端反解出来会是别人的产品。
+    await webApi('resetlicensestatus', { licenses: license, productid: Number(filterProduct.value) || 0 })
     success('重置成功')
     loadDevices(false)
     loadNotes()
@@ -904,9 +1021,9 @@ function toggleSelectAll() {
 async function batchSetDisabled(disabled: number, codes?: string[]) {
   if (!filterProduct.value) { warn('请先选择产品'); return }
   const list = codes ?? selectedCodes.value.slice()
-  if (!list.length) { warn('请先勾选授权码'); return }
+  if (!list.length) { warn('请先勾选记录'); return }
   const action = disabled === -1 ? '禁用' : '恢复'
-  if (!window.confirm('确定' + action + ' ' + list.length + ' 个授权码？' + (disabled === -1 ? '\n禁用后该授权码将无法绑定。' : ''))) return
+  if (!window.confirm('确定' + action + ' ' + list.length + ' 条记录？' + (disabled === -1 ? '\n禁用后对应设备将无法绑定。' : ''))) return
   try {
     const data = await webApi<{ affected?: number }>('disableauthcodes', { productid: filterProduct.value, codes: list, disabled })
     success(action + '成功（' + (data?.affected ?? 0) + ' 条）')
@@ -918,10 +1035,12 @@ async function batchSetDisabled(disabled: number, codes?: string[]) {
 
 // ========== 生产表单 → 预览 → 二次确认 → 生产 ==========
 function showCreateForm() {
-  cBrand.value = 0
   cChannel.value = ''
   cProduct.value = 0
-  cBindmac.value = false
+  cSharepct.value = 0 // 比例是一批一谈的，沿用上一批的值风险太大
+  cRewardVip.value = 0 // 赠送同理，且宁可漏配（回退产品配置）也不要多发
+  cRewardTranslate.value = 0
+  cRewardMeeting.value = 0
   cNumber.value = null
   cMacaddresses.value = ''
   cRemark.value = ''
@@ -936,11 +1055,6 @@ function closeConfirmModal() {
   confirmModal.value?.close()
 }
 
-function onCreateBrandChange() {
-  cProduct.value = 0
-  cChannel.value = ''
-}
-
 function readCSV(ev: Event) {
   const input = ev.target as HTMLInputElement
   const file = input.files?.[0]
@@ -961,21 +1075,33 @@ function readCSV(ev: Event) {
 
 // 组装生产请求参数（预览与正式生产共用）
 function buildCreateParams(): Record<string, unknown> | null {
-  const brandId = Number(cBrand.value)
   const productId = Number(cProduct.value)
   const channelId = cChannel.value.trim()
-  if (!brandId || !productId) { warn('请选择品牌商和产品'); return null }
   if (!channelId) { warn('请选择渠道商'); return null }
-  // 服务ID(CID) 取自产品绑定的方案商，没绑就生产不出可用的设备码
+  if (!productId) { warn('请选择产品'); return null }
+  // CID/BID 都从产品的方案商推导（BID=方案公司、CID=该方案用的芯片公司），没绑就发不出可用设备码
+  if (bidOfProduct(productId) === 'N/A') {
+    warn('该产品未绑定方案，无法确定方案ID(BID)，请先到【产品管理】补上归属方案')
+    return null
+  }
   if (cidOfProduct(productId) === 'N/A') {
-    warn('该产品未绑定方案商，无法确定服务ID(CID)，请先到【产品管理】补上归属方案商')
+    warn('该产品的方案未选芯片，无法确定芯片ID(CID)，请先到【方案商管理】给它选芯片')
     return null
   }
-  const params: Record<string, unknown> = { brandid: brandId, channelid: channelId, productid: productId, remark: cRemark.value.trim() }
+  // 不传 brandid：品牌归属由服务端按所选渠道商推出（见 resolveProductionBrandId），
+  // 前端再传一份只会多出一个对不上的口径。
+  const params: Record<string, unknown> = { channelid: channelId, productid: productId, remark: cRemark.value.trim() }
+  // 代工厂不传：服务端直接取产品档案上的 oemfactoryid（表单里那一栏只是只读展示）
+  // 分成比例：百分比 → 万分比整数，避免浮点比例入库
+  const pct = Number(cSharepct.value) || 0
+  if (pct < 0 || pct > 100) { warn('分成比例需在 0~100% 之间'); return null }
+  params.sharerate = Math.round(pct * 100)
+  params.rewardvip = Math.max(0, Number(cRewardVip.value) || 0)
+  params.rewardtranslate = Math.max(0, Number(cRewardTranslate.value) || 0)
+  params.rewardmeeting = Math.max(0, Number(cRewardMeeting.value) || 0)
   if (createMode.value === 'production') {
     params.createtype = 1
     params.number = Number(cNumber.value)
-    params.isbindmac = cBindmac.value
     if (!params.number || (params.number as number) < 1) { warn('请输入有效数量'); return null }
   } else {
     params.createtype = 2
@@ -1007,25 +1133,25 @@ async function submitPreview() {
 async function submitCreate() {
   const params = buildCreateParams()
   if (!params) return
-  const brandId = params.brandid as number
   const productId = params.productid as number
   if (preview.value?.batchno) params.batchno = preview.value.batchno // 回传预分配批次号
   submitting.value = true
   try {
     const data = await webApi<CreateResult>('createauthcodes', params)
-    // 结果中的 devices 可能是授权码字符串数组或对象数组，统一规整为对象
+    // 结果中的 devices 可能是码字符串数组或对象数组，统一规整为对象
     const rawDevices = data?.devices ?? []
     const devs: DeviceRow[] = rawDevices.map((x: any) => (
       typeof x === 'string'
-        ? ({ code: x, brandid: data?.brandid ?? brandId, productid: data?.productid ?? productId } as DeviceRow)
-        : ({ ...x, brandid: x.brandid ?? data?.brandid ?? brandId, productid: x.productid ?? data?.productid ?? productId } as DeviceRow)
+        ? ({ code: x, brandid: data?.brandid ?? 0, productid: data?.productid ?? productId } as DeviceRow)
+        : ({ ...x, brandid: x.brandid ?? data?.brandid ?? 0, productid: x.productid ?? data?.productid ?? productId } as DeviceRow)
     ))
     closeConfirmModal()
     closeCreateModal()
     if (devs.length > 0) {
-      success('成功生成 ' + devs.length + ' 个授权码，批次 ' + (data?.batchno || ''))
+      success('成功生成 ' + devs.length + ' 条，批次 ' + (data?.batchno || ''))
       buildCSV(devs)
-      openEmailDialog(data ?? {}, brandId, productId)
+      // 品牌商由服务端推出，收件人取不到品牌邮箱时回退渠道商邮箱
+      openEmailDialog(data ?? {}, data?.brandid ?? 0, productId)
     } else {
       success('创建成功')
       tab.value = 'batches'
@@ -1039,17 +1165,18 @@ async function submitCreate() {
 }
 
 // ========== CSV ==========
+// 这份 CSV 是发给方案公司/工厂烧录用的，只有 MAC 一列。
+// 2026-09-02 起授权码字符串已整体移除，code 就是 MAC，没有第二个可导的标识。
 function buildCSV(devs: DeviceRow[]) {
-  const hasMac = devs.some((d) => d.devicemac)
-  const headers = hasMac ? ['License', 'Mac地址'] : ['License']
-  const rows = devs.map((d) => hasMac ? [d.code || '', d.devicemac || ''] : [d.code || ''])
+  const headers = ['Mac地址']
+  const rows = devs.map((d) => [d.devicemac || d.code || ''])
   const content = [headers.join(',')].concat(rows.map((r) => r.join(','))).join('\n')
   csvBlob.value = new Blob([content], { type: 'text/csv;charset=utf-8;' })
   const first = devs[0]
   csvFileName.value = '设备生产_' + (first.brandid || 'unknown') + '_' + (first.productid || 'unknown') + '_' + new Date().toISOString().split('T')[0] + '.csv'
 }
 
-// 导出当前筛选条件下的「全部」授权码（分页拉取，而非仅当前页）
+// 导出当前筛选条件下的「全部」记录（分页拉取，而非仅当前页）
 async function exportDevicesCSV() {
   if (!filterProduct.value) { warn('请先选择产品'); return }
   try {
@@ -1078,10 +1205,11 @@ async function exportDevicesCSV() {
 
 function exportNotesCSV() {
   if (!notes.value.length) { warn('没有数据可导出'); return }
-  const headers = ['生产时间', '品牌商', '渠道商', '产品', '批次号', '序号区间', '起始MAC', '结束MAC', '数量']
+  // 与页面列顺序保持一致：批次号在前，不再有品牌商（生产链路已不涉及品牌商）
+  const headers = ['批次号', '生产时间', '渠道商', '产品', '代工厂', '分成比例', '序号区间', '起始MAC', '结束MAC', '数量']
   const rows = notes.value.map((n) => [
-    fmtTime(n.ts), nameOfBrand(n.brandid), nameOfChannel(n.channelid), nameOfProduct(n.productid),
-    n.batchno || '', serialRange(n), n.startmac || '', n.endmac || '', n.devicenum || 0,
+    n.batchno || '', fmtTime(n.ts), nameOfChannel(n.channelid), nameOfProduct(n.productid),
+    nameOfFactory(n.factoryid), ratePct(n.sharerate), serialRange(n), n.startmac || '-', n.endmac || '-', n.devicenum || 0,
   ])
   const content = [headers.join(',')].concat(rows.map((r) => r.join(','))).join('\n')
   const blob = new Blob([content], { type: 'text/csv;charset=utf-8;' })
@@ -1101,15 +1229,25 @@ function downloadBlob(blob: Blob, name: string) {
 }
 
 // ========== 邮件 ==========
+
+// 生产通知的收件人：**方案公司**（产品归属的方案商）的联系邮箱优先——货是方案公司在打，
+// MAC 清单也是给它烧录用的。方案公司没填邮箱时才依次退到品牌商、本次所选渠道商，
+// 三个都没有就留空让人手填；没有回退的话表单会经常是空的，运营每次都得自己查邮箱。
+function productionMailTo(productId: number, brandMails?: string): string[] {
+  const p = allProducts.value.find((x) => x.id === productId)
+  const provider = p?.providerid ? providers.value.find((v) => v.id === p.providerid) : undefined
+  const channel = channels.value.find((ch) => ch.id === cChannel.value)
+  const raw = [provider?.contactmails, brandMails, channel?.contactmails]
+    .map((x) => (x || '').trim())
+    .find((x) => x !== '')
+  return (raw || '').split(',').map((e) => e.trim()).filter(Boolean)
+}
 function openEmailDialog(createResult: CreateResult, brandId: number, productId: number) {
   const brand = brands.value.find((f) => f.id === brandId)
   const product = allProducts.value.find((p) => p.id === productId)
   const productName = product ? product.devicename : '未知产品(ID:' + productId + ')'
 
-  let emails: string[] = []
-  if (brand && brand.contactmails) {
-    emails = brand.contactmails.split(',').map((e) => e.trim()).filter(Boolean)
-  }
+  const emails = productionMailTo(productId, brand?.contactmails)
   email.to = emails[0] || ''
   email.cc = emails.length > 1 ? emails.slice(1).join(',') : ''
 
@@ -1118,11 +1256,14 @@ function openEmailDialog(createResult: CreateResult, brandId: number, productId:
   email.content =
     '尊敬的合作伙伴：\n\n' +
     '我公司向贵司发送产品生产通知函。\n\n' +
-    '设备地址区间为:' + (createResult.startmac || '') + '-' + (createResult.endmac || '') + '\n' +
+    (createResult.startmac
+      ? '设备地址区间为:' + createResult.startmac + '-' + createResult.endmac + '\n'
+      : '设备地址：见附件 CSV（本批为导入的 MAC，不连续、无区间）\n') +
     '序号区间：' + (createResult.serialstart ?? '') + ' - ' + (createResult.serialend ?? '') + '\n' +
     '生产批次(BatchNo)：' + (createResult.batchno || '') + '\n' +
-    '服务ID(CID): 0x' + cidOfProduct(productId) + '\n' +
-    '品牌ID(BID): 0x' + (brandId != null ? Number(brandId).toString(16).padStart(4, '0').toUpperCase() : 'N/A') + '\n' +
+    '芯片ID(CID): 0x' + cidOfProduct(productId) + '\n' +
+    '方案ID(BID): 0x' + bidOfProduct(productId) + '\n' +
+    '方案公司: ' + providerNameOfProduct(productId) + '\n' +
     '产品ID(PID): 0x' + (productId != null ? Number(productId).toString(16).padStart(4, '0').toUpperCase() : 'N/A') + '\n' +
     '产品名称: ' + productName + '\n' +
     '生产数量：' + (createResult.number || 0) + '\n\n' +
@@ -1139,18 +1280,15 @@ function openEmailForList() {
   const product = allProducts.value.find((p) => p.id === first.productid)
   const productName = product ? product.devicename : ''
 
-  let emails: string[] = []
-  if (brand && brand.contactmails) {
-    emails = brand.contactmails.split(',').map((e) => e.trim()).filter(Boolean)
-  }
+  const emails = productionMailTo(first.productid, brand?.contactmails)
   email.to = emails[0] || ''
   email.cc = emails.length > 1 ? emails.slice(1).join(',') : ''
 
   const today = new Date().toLocaleDateString()
-  email.subject = '【授权码清单】' + (productName || '设备') + ' - ' + today
+  email.subject = '【MAC清单】' + (productName || '设备') + ' - ' + today
   email.content =
     '尊敬的合作伙伴：\n\n' +
-    '附件为当前查询的授权码清单，共 ' + devices.value.length + ' 条记录。\n' +
+    '附件为当前查询的 MAC 清单，共 ' + devices.value.length + ' 条记录。\n' +
     (productName ? '产品：' + productName + '\n' : '') +
     '\n请查收。\n\n此致\n敬礼！'
   emailModal.value?.showModal()
diff --git a/apps/admin/app/pages/guestaccess.vue b/apps/admin/app/pages/guestaccess.vue
new file mode 100644
index 00000000..5102f7c3
--- /dev/null
+++ b/apps/admin/app/pages/guestaccess.vue
@@ -0,0 +1,244 @@
+<template>
+  <div>
+    <!-- 顶部 -->
+    <div class="flex items-center justify-between mb-5 flex-wrap gap-3">
+      <div>
+        <h2 class="text-lg font-semibold text-slate-800">游客显隐控制</h2>
+        <p class="text-xs text-slate-400 mt-1">
+          控制登录页的「游客登录」入口对哪一版客户端可见。<b>整个应用一套，不分渠道。</b>
+        </p>
+      </div>
+      <div class="flex items-center gap-3">
+        <span class="text-sm text-slate-500">应用</span>
+        <select v-model="scopeApp" class="select select-bordered select-sm" @change="load">
+          <option value="">全局默认（所有应用兜底）</option>
+          <option v-for="a in scopeApps" :key="a" :value="a">{{ a }}</option>
+        </select>
+      </div>
+    </div>
+
+    <div v-if="!scopeApp" class="scope-tip">
+      当前是<b>全局默认</b>作用域：这里配的对所有应用生效；某个应用单独配了，则以应用的为准。
+    </div>
+
+    <div class="guest-wrap">
+      <div class="card">
+        <section class="ed-section">
+          <div class="ed-section-title">游客登录入口</div>
+          <label class="flex items-center gap-2 text-sm cursor-pointer">
+            <input v-model="form.tourists" type="checkbox" class="checkbox checkbox-sm checkbox-primary" />
+            <span>允许游客登录</span>
+          </label>
+          <div v-if="form.tourists" class="pl-7 mt-3">
+            <span class="ed-label">生效版本（必填）</span>
+            <input v-model="form.touristsversion" class="input input-bordered input-sm w-full" placeholder="如 1.0.1" />
+            <p class="ed-hint">
+              填客户端上报的净版本号，<b>不含构建号</b>（<code>1.0.1</code> 而不是 <code>1.0.1+5</code>）。
+            </p>
+          </div>
+          <p v-if="warn" class="ed-warn">⚠ {{ warn }}</p>
+        </section>
+
+        <section class="ed-section">
+          <div class="ed-section-title">当前效果</div>
+          <div class="effect" :class="effect.tone">
+            <span class="effect-icon">{{ effect.icon }}</span>
+            <div>
+              <div class="effect-title">{{ effect.title }}</div>
+              <div class="effect-desc">{{ effect.desc }}</div>
+            </div>
+          </div>
+        </section>
+
+        <div class="ed-footer">
+          <button class="btn btn-ghost btn-sm" :disabled="submitting" @click="load">重置</button>
+          <button class="btn btn-primary btn-sm text-white" :disabled="submitting" @click="save">保存</button>
+        </div>
+      </div>
+
+      <!-- 语义说明单独立一块：这是白名单不是黑名单，配反了直接影响过审 -->
+      <div class="card note">
+        <div class="ed-section-title">这个开关怎么判定</div>
+        <p class="note-p">
+          <b>白名单语义：只有填在「生效版本」里的那一版能看到入口，其余版本一律隐藏。</b>
+        </p>
+        <table class="note-table">
+          <thead>
+            <tr><th>开关</th><th>生效版本</th><th>效果</th></tr>
+          </thead>
+          <tbody>
+            <tr><td>关</td><td>任意</td><td>全部版本隐藏</td></tr>
+            <tr><td>开</td><td>空</td><td>全部版本隐藏（保存时会被拦下）</td></tr>
+            <tr><td>开</td><td><code>1.0.1</code></td><td><b>只有 1.0.1 可见</b>，其余隐藏</td></tr>
+          </tbody>
+        </table>
+        <p class="note-p">
+          典型用法是送审：只给正在过审的那一版开游客登录，线上其它版本不受影响。
+        </p>
+        <p class="note-p muted">
+          判定在服务端做（客户端只拿结论，不拿规则）。留空按「全隐藏」而非「全放行」处理是刻意选的失败方向——
+          判宽会让不该露入口的版本露出去（过审风险、白嫖开户礼），判严只是入口少显示。
+          <b>要全部隐藏请直接取消勾选</b>，不要靠留空版本号表达。
+        </p>
+        <p class="note-p muted">
+          客户端拿不到配置（无网/接口失败）时同样按隐藏处理，所以断网启动后短时间内入口不出现是预期行为。
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted } from 'vue'
+import { useApi } from '~/composables/useApi'
+import { useToast } from '~/composables/useToast'
+
+definePageMeta({ title: '游客显隐控制' })
+
+interface GuestForm {
+  tourists: boolean
+  touristsversion: string
+}
+
+const { webApi, consoleApi } = useApi()
+const { success, error } = useToast()
+
+const scopeApp = ref('')
+const scopeApps = ref<string[]>([])
+const submitting = ref(false)
+// 线上版本号只读，用来提示「生效版本填得比线上还高 = 目前没人看得到」
+const onlineVersion = ref('')
+
+function emptyForm(): GuestForm {
+  return { tourists: false, touristsversion: '' }
+}
+const form = reactive<GuestForm>(emptyForm())
+
+// 与后端 comm.CompareVersion 同语义：切掉构建号、逐段按整数比、短的补 0
+function cmpVer(a: string, b: string): number {
+  const as = a.split('+')[0]!.trim().split('.')
+  const bs = b.split('+')[0]!.trim().split('.')
+  const n = Math.max(as.length, bs.length)
+  for (let i = 0; i < n; i++) {
+    const x = parseInt(as[i] ?? '0') || 0
+    const y = parseInt(bs[i] ?? '0') || 0
+    if (x !== y) return x < y ? -1 : 1
+  }
+  return 0
+}
+
+// 这里只提示，真正的拦截在后端 saveAppTourists（前端提示挡不住直接调接口）
+const warn = computed(() => {
+  if (!form.tourists) return ''
+  const v = form.touristsversion.trim()
+  if (!v) return '开启游客登录必须填生效版本，留空等于所有版本都看不到入口'
+  if (onlineVersion.value.trim() && cmpVer(v, onlineVersion.value) > 0) {
+    return `生效版本高于「当前线上版本 ${onlineVersion.value}」，目前线上没有任何一版客户端能看到入口`
+  }
+  return ''
+})
+
+const effect = computed(() => {
+  if (!form.tourists) {
+    return { tone: 'off', icon: '🚫', title: '全部版本隐藏', desc: '所有客户端的登录页都不显示游客登录入口。' }
+  }
+  const v = form.touristsversion.trim()
+  if (!v) {
+    return { tone: 'warn', icon: '⚠️', title: '等于没开', desc: '勾了开关却没点名版本，所有版本仍然看不到入口。保存时会被拦下。' }
+  }
+  return { tone: 'on', icon: '✅', title: `只有 ${v} 可见`, desc: `上报版本号等于 ${v} 的客户端会显示游客登录入口，其余版本一律隐藏。` }
+})
+
+// 应用名来源：应用中心的应用表 + 部署注册表（兜底老数据）；无权读这两张表时改走 api_getmyapps。
+async function loadScopeApps() {
+  const names = new Set<string>()
+  const [products, deploys] = await Promise.all([
+    consoleApi<Array<{ name: string }>>('products/list', {}).catch(() => [] as Array<{ name: string }>),
+    consoleApi<Array<{ app_name?: string; name: string }>>('apps/list', {}).catch(() => [] as Array<{ app_name?: string; name: string }>),
+  ])
+  ;(products ?? []).forEach((p) => p.name && names.add(p.name))
+  ;(deploys ?? []).forEach((d) => (d.app_name || d.name) && names.add(d.app_name || d.name))
+  if (!names.size) {
+    try {
+      const d = await webApi<{ apps: Array<{ name: string; app_name?: string }> }>('getmyapps', {})
+      ;(d?.apps ?? []).forEach((a) => {
+        const n = a.app_name || a.name
+        if (n) names.add(n)
+      })
+    } catch {
+      // 拿不到就只剩「全局默认」，不阻断页面
+    }
+  }
+  scopeApps.value = [...names].sort()
+}
+
+async function load() {
+  try {
+    const d = await webApi<{ item: GuestForm & { version?: string } }>('getapprelease', { app_name: scopeApp.value })
+    Object.assign(form, emptyForm(), {
+      tourists: d?.item?.tourists ?? false,
+      touristsversion: d?.item?.touristsversion ?? '',
+    })
+    onlineVersion.value = d?.item?.version ?? ''
+  } catch (e: any) {
+    error(e?.message ?? '加载失败')
+    Object.assign(form, emptyForm())
+    onlineVersion.value = ''
+  }
+}
+
+async function save() {
+  // 关掉开关时顺手清空生效版本：输入框此时是隐藏的，留着旧值会被后端的
+  // 「填了版本必须勾选开关」校验挡下，用户看不到是哪一项有问题。
+  if (!form.tourists) form.touristsversion = ''
+  if (warn.value) { error(warn.value); return }
+  submitting.value = true
+  try {
+    // 只提交游客这一组字段：版本控制和它同一行，整行提交会把对方清空。
+    await webApi('saveapptourists', {
+      app_name: scopeApp.value,
+      tourists: form.tourists,
+      touristsversion: form.touristsversion,
+    })
+    success('保存成功')
+    await load()
+  } catch (e: any) {
+    error(e?.message ?? '保存失败')
+  } finally {
+    submitting.value = false
+  }
+}
+
+onMounted(async () => {
+  await loadScopeApps()
+  await load()
+})
+</script>
+
+<style scoped>
+.scope-tip { background: #f8fafc; border: 1px solid #e2e8f0; color: #475569; font-size: 12px; padding: 8px 12px; border-radius: 10px; margin-bottom: 16px; }
+.guest-wrap { display: grid; gap: 16px; grid-template-columns: minmax(0, 1fr) minmax(300px, 1fr); align-items: start; }
+@media (max-width: 900px) { .guest-wrap { grid-template-columns: 1fr; } }
+.card { background: #fff; border: 1px solid #eef2f7; border-radius: 14px; padding: 18px 20px; }
+.ed-section { padding-bottom: 16px; margin-bottom: 16px; border-bottom: 1px solid #f1f5f9; }
+.ed-section:last-of-type { border-bottom: 0; margin-bottom: 0; }
+.ed-section-title { font-size: 13px; font-weight: 700; color: #334155; margin-bottom: 10px; }
+.ed-label { display: block; font-size: 12px; color: #64748b; margin-bottom: 4px; }
+.ed-hint { font-size: 11px; color: #94a3b8; margin-top: 4px; line-height: 1.6; }
+.ed-warn { font-size: 12px; color: #b45309; background: #fffbeb; border: 1px solid #fde68a; border-radius: 8px; padding: 6px 10px; margin-top: 10px; }
+.ed-footer { display: flex; justify-content: flex-end; gap: 8px; padding-top: 14px; border-top: 1px solid #f1f5f9; }
+.effect { display: flex; gap: 10px; align-items: flex-start; border-radius: 10px; padding: 10px 12px; }
+.effect.on { background: #dcfce7; }
+.effect.off { background: #f1f5f9; }
+.effect.warn { background: #fffbeb; }
+.effect-icon { font-size: 16px; line-height: 1.3; }
+.effect-title { font-size: 13px; font-weight: 700; color: #334155; }
+.effect-desc { font-size: 11px; color: #64748b; margin-top: 2px; line-height: 1.6; }
+.note { background: #fcfcfd; }
+.note-p { font-size: 12px; color: #475569; line-height: 1.8; margin-bottom: 10px; }
+.note-p.muted { color: #94a3b8; font-size: 11px; }
+.note-table { width: 100%; font-size: 11px; border-collapse: collapse; margin-bottom: 12px; }
+.note-table th, .note-table td { border: 1px solid #e2e8f0; padding: 5px 8px; text-align: left; color: #475569; }
+.note-table th { background: #f8fafc; color: #64748b; font-weight: 600; }
+code { background: #f1f5f9; padding: 0 4px; border-radius: 4px; }
+</style>
diff --git a/apps/admin/app/pages/oemfactory.vue b/apps/admin/app/pages/oemfactory.vue
new file mode 100644
index 00000000..d149ce1b
--- /dev/null
+++ b/apps/admin/app/pages/oemfactory.vue
@@ -0,0 +1,322 @@
+<template>
+  <div>
+    <!-- 列表视图 -->
+    <div v-show="view === 'list'">
+      <div class="flex items-center justify-between mb-5">
+        <h2 class="text-lg font-semibold text-slate-800">工厂列表</h2>
+        <button class="btn btn-primary btn-sm text-white" @click="showForm()">+ 新增工厂</button>
+      </div>
+
+      <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-4 mb-4">
+        <div class="flex flex-wrap items-end gap-3">
+          <div class="form-control">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">状态</span></label>
+            <select v-model.number="filterEnabled" class="select select-bordered select-sm w-32">
+              <option :value="-1">全部</option>
+              <option :value="1">合作中</option>
+              <option :value="0">已停用</option>
+            </select>
+          </div>
+          <div class="form-control flex-1 min-w-[220px]">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">关键字</span></label>
+            <input v-model="keyword" type="text" class="input input-bordered input-sm w-full" placeholder="工厂名称 / 联系人 / 地址 / 说明" />
+          </div>
+          <button class="btn btn-ghost btn-sm" @click="resetFilter">重置</button>
+          <span class="text-xs text-slate-400 ml-auto">共 {{ viewRows.length }} / {{ rows.length }} 条</span>
+        </div>
+      </div>
+
+      <div class="bg-white rounded-xl shadow-sm border border-slate-100">
+        <div class="overflow-x-auto">
+          <table class="table table-zebra">
+            <thead>
+              <tr>
+                <th class="cursor-pointer select-none" @click="toggleSort('id')">ID{{ sortMark('id') }}</th>
+                <th class="cursor-pointer select-none" @click="toggleSort('name')">工厂名称{{ sortMark('name') }}</th>
+                <th>联系人</th>
+                <th>联系电话</th>
+                <th>地址</th>
+                <th>说明</th>
+                <th class="cursor-pointer select-none" @click="toggleSort('sort')">排序{{ sortMark('sort') }}</th>
+                <th>状态</th>
+                <th>操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-if="loading">
+                <td colspan="9" class="text-center py-8"><span class="loading loading-spinner loading-sm"></span></td>
+              </tr>
+              <tr v-else-if="!viewRows.length">
+                <td colspan="9" class="text-center text-slate-400 py-8">暂无数据</td>
+              </tr>
+              <tr v-for="f in viewRows" :key="f.id">
+                <td class="font-mono text-sm">{{ f.id }}</td>
+                <td class="font-medium">{{ f.name }}</td>
+                <td class="text-sm">{{ f.contact || '-' }}</td>
+                <td class="text-sm">{{ f.phone || '-' }}</td>
+                <td class="text-sm text-slate-500 max-w-[180px] truncate" :title="f.address">{{ f.address || '-' }}</td>
+                <td class="text-sm text-slate-500 max-w-xs truncate" :title="f.description">{{ f.description || '' }}</td>
+                <td class="text-sm text-slate-500">{{ f.sort || 0 }}</td>
+                <td>
+                  <span class="badge badge-sm" :class="f.enabled === false ? 'badge-ghost' : 'badge-success badge-outline'">
+                    {{ f.enabled === false ? '已停用' : '合作中' }}
+                  </span>
+                </td>
+                <td>
+                  <div class="flex gap-1">
+                    <button class="btn btn-ghost btn-xs" @click="showForm(f)">编辑</button>
+                    <button class="btn btn-ghost btn-xs text-red-500" @click="delFactory(f)">删除</button>
+                  </div>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+
+      <p class="text-xs text-slate-400 mt-3">
+        工厂是「这批货由哪家厂生产组装」，与
+        品牌商（这货挂谁的牌子卖）是两回事：
+        同一品牌可以换厂、同一家厂也可以给多个品牌代工，所以分开维护。
+      </p>
+    </div>
+
+    <!-- 表单视图 -->
+    <div v-show="view === 'form'">
+      <div class="flex items-center gap-3 mb-5">
+        <button class="btn btn-ghost btn-sm" @click="showList()">&larr; 返回列表</button>
+        <h2 class="text-lg font-semibold text-slate-800">{{ isEditing ? '编辑工厂' : '新增工厂' }}</h2>
+      </div>
+      <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-6 max-w-2xl">
+        <form @submit.prevent="saveFactory">
+          <div v-if="isEditing" class="form-control mb-4">
+            <label class="label"><span class="label-text font-medium">ID</span></label>
+            <input :value="form.id" type="text" class="input input-bordered w-full bg-slate-50" disabled />
+          </div>
+
+          <div class="form-control mb-4">
+            <label class="label"><span class="label-text font-medium">工厂名称 *</span></label>
+            <input v-model="form.name" type="text" class="input input-bordered w-full" placeholder="如：东莞市XX电子有限公司" required />
+          </div>
+
+          <div class="grid grid-cols-2 gap-4 mb-4">
+            <div class="form-control">
+              <label class="label"><span class="label-text font-medium">联系人</span></label>
+              <input v-model="form.contact" type="text" class="input input-bordered w-full" placeholder="如：张工" />
+            </div>
+            <div class="form-control">
+              <label class="label"><span class="label-text font-medium">联系电话</span></label>
+              <input v-model="form.phone" type="text" class="input input-bordered w-full" placeholder="如：13800000000" />
+            </div>
+          </div>
+
+          <div class="form-control mb-4">
+            <label class="label"><span class="label-text font-medium">工厂地址</span></label>
+            <input v-model="form.address" type="text" class="input input-bordered w-full" placeholder="如：广东省东莞市XX镇XX路X号" />
+          </div>
+
+          <div class="form-control mb-4">
+            <label class="label"><span class="label-text font-medium">说明</span></label>
+            <textarea v-model="form.description" class="textarea textarea-bordered w-full" rows="3" placeholder="产能、擅长品类、合作情况等"></textarea>
+          </div>
+
+          <div class="form-control mb-4">
+            <label class="label"><span class="label-text font-medium">联系邮箱</span></label>
+            <div class="flex gap-2 mb-2">
+              <input v-model="newEmail" type="email" class="input input-bordered input-sm flex-1" placeholder="输入邮箱后点添加" @keydown.enter.prevent="addEmail" />
+              <button type="button" class="btn btn-sm" @click="addEmail">添加</button>
+            </div>
+            <div v-if="emails.length" class="flex flex-wrap gap-2">
+              <span v-for="(e, i) in emails" :key="i" class="badge badge-ghost gap-1">
+                {{ e }}
+                <button type="button" class="text-red-500" @click="emails.splice(i, 1)">&times;</button>
+              </span>
+            </div>
+          </div>
+
+          <div class="grid grid-cols-2 gap-4 mb-4">
+            <div class="form-control">
+              <label class="label"><span class="label-text font-medium">排序</span></label>
+              <input v-model.number="form.sort" type="number" class="input input-bordered w-full" />
+              <span class="label-text-alt text-slate-400 mt-1">小的排前面，相同则按 ID</span>
+            </div>
+            <div class="form-control">
+              <label class="label"><span class="label-text font-medium">状态</span></label>
+              <label class="label cursor-pointer justify-start gap-3">
+                <input v-model="form.enabled" type="checkbox" class="toggle toggle-primary" />
+                <span class="label-text">{{ form.enabled ? '合作中' : '已停用' }}</span>
+              </label>
+            </div>
+          </div>
+
+          <div class="flex gap-2 pt-2">
+            <button type="submit" class="btn btn-primary text-white" :disabled="submitting">
+              <span v-if="submitting" class="loading loading-spinner loading-xs"></span>
+              {{ isEditing ? '保存' : '创建' }}
+            </button>
+            <button type="button" class="btn btn-ghost" @click="showList()">取消</button>
+          </div>
+        </form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted } from 'vue'
+import { useApi } from '~/composables/useApi'
+import { useToast } from '~/composables/useToast'
+import { useTableSort } from '~/composables/useTableSort'
+
+definePageMeta({ title: '工厂管理' })
+
+interface OemFactory {
+  id: number
+  name: string
+  contact?: string
+  phone?: string
+  contactmails?: string
+  address?: string
+  description?: string
+  enabled?: boolean
+  sort?: number
+  createtime?: number
+  updatetime?: number
+}
+
+const { webApi } = useApi()
+const { success, error, warn } = useToast()
+
+const view = ref<'list' | 'form'>('list')
+const rows = ref<OemFactory[]>([])
+const loading = ref(false)
+const submitting = ref(false)
+const isEditing = ref(false)
+const emails = ref<string[]>([])
+const newEmail = ref('')
+
+const filterEnabled = ref(-1) // -1 全部；1 合作中；0 已停用
+const keyword = ref('')
+
+const form = reactive({ id: 0, name: '', contact: '', phone: '', address: '', description: '', sort: 0, enabled: true })
+
+function mailList(s?: string) {
+  return (s || '').split(',').map((e) => e.trim()).filter(Boolean)
+}
+
+const { toggleSort, sortMark, applySort } = useTableSort<OemFactory>({
+  id: (a, b) => Number(a.id) - Number(b.id),
+  name: (a, b) => String(a.name || '').localeCompare(String(b.name || ''), 'zh') || Number(a.id) - Number(b.id),
+  sort: (a, b) => Number(a.sort || 0) - Number(b.sort || 0) || Number(a.id) - Number(b.id),
+}, 'sort')
+
+const viewRows = computed(() => {
+  const kw = keyword.value.trim().toLowerCase()
+  const list = rows.value.filter((f) => {
+    if (filterEnabled.value >= 0 && (f.enabled === false ? 0 : 1) !== filterEnabled.value) return false
+    if (!kw) return true
+    return (f.name || '').toLowerCase().includes(kw) ||
+      (f.contact || '').toLowerCase().includes(kw) ||
+      (f.address || '').toLowerCase().includes(kw) ||
+      (f.description || '').toLowerCase().includes(kw)
+  })
+  return applySort(list)
+})
+function resetFilter() {
+  filterEnabled.value = -1
+  keyword.value = ''
+}
+
+async function loadData() {
+  loading.value = true
+  try {
+    const d = await webApi<{ factories: OemFactory[] }>('getoemfactories', {})
+    rows.value = d?.factories ?? []
+  } catch (e: any) {
+    error(e?.message ?? '获取工厂列表失败')
+    rows.value = []
+  } finally {
+    loading.value = false
+  }
+}
+
+function showList() {
+  view.value = 'list'
+}
+
+function showForm(f?: OemFactory) {
+  if (f) {
+    isEditing.value = true
+    form.id = Number(f.id)
+    form.name = f.name || ''
+    form.contact = f.contact || ''
+    form.phone = f.phone || ''
+    form.address = f.address || ''
+    form.description = f.description || ''
+    form.sort = Number(f.sort || 0)
+    form.enabled = f.enabled !== false
+    emails.value = mailList(f.contactmails)
+  } else {
+    isEditing.value = false
+    form.id = 0
+    form.name = ''
+    form.contact = ''
+    form.phone = ''
+    form.address = ''
+    form.description = ''
+    form.sort = 0
+    form.enabled = true
+    emails.value = []
+  }
+  newEmail.value = ''
+  view.value = 'form'
+}
+
+function addEmail() {
+  const e = newEmail.value.trim()
+  if (!e) return
+  if (emails.value.includes(e)) { warn('该邮箱已添加'); return }
+  emails.value.push(e)
+  newEmail.value = ''
+}
+
+async function saveFactory() {
+  if (!form.name.trim()) { warn('请填写工厂名称'); return }
+  submitting.value = true
+  try {
+    const payload = {
+      factory: {
+        id: form.id,
+        name: form.name.trim(),
+        contact: form.contact,
+        phone: form.phone,
+        contactmails: emails.value.join(','),
+        address: form.address,
+        description: form.description,
+        sort: Number(form.sort || 0),
+        enabled: form.enabled,
+      },
+    }
+    await webApi(isEditing.value ? 'updateoemfactory' : 'addoemfactory', payload)
+    success(isEditing.value ? '已保存' : '已创建')
+    showList()
+    await loadData()
+  } catch (e: any) {
+    error(e?.message ?? '保存失败')
+  } finally {
+    submitting.value = false
+  }
+}
+
+function delFactory(f: OemFactory) {
+  if (!window.confirm(`确认删除工厂「${f.name}」？`)) return
+  webApi('deloemfactory', { id: f.id })
+    .then(async () => {
+      success('已删除')
+      await loadData()
+    })
+    .catch((e: any) => error(e?.message ?? '删除失败'))
+}
+
+onMounted(loadData)
+</script>
diff --git a/apps/admin/app/pages/product.vue b/apps/admin/app/pages/product.vue
index 6709a592..2abc2d4f 100644
--- a/apps/admin/app/pages/product.vue
+++ b/apps/admin/app/pages/product.vue
@@ -29,7 +29,7 @@
           </div>
           <div class="form-control flex-1" style="min-width:200px;">
             <label class="label py-1"><span class="label-text text-xs text-slate-500">关键字</span></label>
-            <input v-model="keyword" type="text" class="input input-bordered input-sm w-full" placeholder="产品名称 / 产品ID（十六进制）" />
+            <input v-model="keyword" type="text" class="input input-bordered input-sm w-full" placeholder="产品名称 / PID（十六进制）" />
           </div>
           <button class="btn btn-ghost btn-sm" @click="resetFilter">重置</button>
           <span class="text-xs text-slate-400 ml-auto">共 {{ viewRows.length }} / {{ rows.length }} 条</span>
@@ -41,7 +41,7 @@
           <table class="table table-zebra text-sm">
             <thead>
               <tr>
-                <th class="cursor-pointer select-none" @click="toggleSort('id')">ID{{ sortMark('id') }}</th>
+                <th class="cursor-pointer select-none" @click="toggleSort('id')">PID{{ sortMark('id') }}</th>
                 <th>图片</th>
                 <th class="cursor-pointer select-none" @click="toggleSort('devicename')">名称{{ sortMark('devicename') }}</th>
                 <th class="cursor-pointer select-none" @click="toggleSort('brand')">品牌商{{ sortMark('brand') }}</th>
@@ -57,7 +57,7 @@
               <tr v-if="loading"><td colspan="11" class="text-center py-8"><span class="loading loading-spinner loading-sm"></span></td></tr>
               <tr v-else-if="!viewRows.length"><td colspan="11" class="text-center text-slate-400 py-8">暂无数据</td></tr>
               <tr v-for="p in viewRows" :key="p.id">
-                <td class="font-mono text-sm">{{ hexId(p.id) }}</td>
+                <td class="font-mono text-sm"><span class="badge badge-primary badge-outline badge-sm">0x{{ hex4(p.id) }}</span></td>
                 <td>
                   <img v-if="p.productimage" :src="p.productimage" class="w-10 h-10 rounded object-cover" />
                   <div v-else class="w-10 h-10 rounded bg-slate-100 flex items-center justify-center text-slate-300">
@@ -108,49 +108,93 @@
       <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-6 max-w-3xl">
         <form @submit.prevent="saveProduct">
           <h3 class="text-sm font-semibold text-slate-500 mb-3">基本信息</h3>
+          <!-- PID：产品主键，手工指定的十六进制编码。建档填错能改，但一旦投产（有批次/已发 MAC）就锁死 -->
           <div class="form-control mb-4">
-            <label class="label"><span class="label-text font-medium">产品名称 *</span></label>
-            <input v-model="form.devicename" type="text" class="input input-bordered w-full" required />
+            <label class="label"><span class="label-text font-medium">PID（十六进制）*</span></label>
+            <div class="flex items-stretch">
+              <span class="bg-slate-100 text-slate-400 font-mono px-3 flex items-center rounded-l-lg border border-r-0 border-slate-200">0x</span>
+              <input
+                v-model="form.idHex"
+                type="text"
+                class="input input-bordered w-full font-mono uppercase rounded-l-none"
+                placeholder="B001"
+                maxlength="8"
+                required
+              />
+            </div>
+            <span class="label-text-alt text-slate-400 mt-1">
+              PID 是产品的唯一标识，全后台不可重复，且<b>就是设备 MAC 的前 2 字节</b>。
+              <b>未投产时可以改</b>；已生产过 MAC / 有生产批次的产品不能改——设备分表
+              <span class="font-mono">license_&lt;PID&gt;</span> 与已发出去的 MAC 都按它组织，服务端会拒绝。
+            </span>
+            <span v-if="!isEditing" class="label-text-alt text-slate-400 mt-1">现有 PID 段从 B001 起，建议接着往后排。</span>
           </div>
+
+          <!-- 芯片 → 方案商 联动：先定芯片，方案商下拉只列该芯片下的方案。
+               芯片本身不存在产品上——它由方案商推导（solution_provider.vendor），
+               存一份会在方案商换芯片时变成对不上的旧值，而 CID(芯片公司) 是要烧进固件的。 -->
           <div class="grid grid-cols-2 gap-4 mb-4">
             <div class="form-control">
-              <label class="label"><span class="label-text font-medium">所属品牌商</span></label>
-              <select v-model.number="form.brandid" class="select select-bordered w-full">
-                <option :value="0">请选择</option>
-                <option v-for="b in brandOptions" :key="b.id" :value="b.id">{{ b.brand }}</option>
+              <label class="label">
+                <span class="label-text font-medium">芯片</span>
+                <span class="label-text-alt text-slate-400">用来筛下面的方案</span>
+              </label>
+              <select v-model.number="form.chipid" class="select select-bordered w-full" @change="onChipChange">
+                <option :value="0">全部芯片</option>
+                <option v-for="v in chipVendors" :key="v.id" :value="v.id">{{ v.name }} (0x{{ v.id.toString(16).toUpperCase() }})</option>
               </select>
+              <span v-if="!chipVendors.length" class="label-text-alt text-amber-500 mt-1">还没有芯片厂商，请先到【芯片管理】创建</span>
             </div>
             <div class="form-control">
-              <label class="label"><span class="label-text font-medium">设备类型</span></label>
-              <select v-model.number="form.devicetype" class="select select-bordered w-full">
-                <option v-for="(label, val) in deviceTypeOptions" :key="val" :value="Number(val)">{{ label }}</option>
+              <label class="label">
+                <span class="label-text font-medium">生产工厂</span>
+                <span class="label-text-alt text-slate-400">默认由哪家厂生产</span>
+              </label>
+              <select v-model.number="form.oemfactoryid" class="select select-bordered w-full">
+                <option :value="0">{{ factoryOptions.length ? '不指定' : '暂无可用工厂' }}</option>
+                <option v-for="f in factoryOptions" :key="f.id" :value="f.id">{{ f.name }}</option>
               </select>
+              <span v-if="!factoryOptions.length" class="label-text-alt text-slate-400 mt-1">可先留空，之后到【工厂管理】添加再回来补</span>
             </div>
           </div>
-          <div class="form-control mb-4">
-            <label class="label">
-              <span class="label-text font-medium">产品说明</span>
-              <span class="label-text-alt text-slate-400">这款产品是什么、有什么特性（与版本更新说明无关）</span>
-            </label>
-            <textarea v-model="form.description" class="textarea textarea-bordered w-full" rows="3" placeholder="如：双麦降噪同传耳机，支持 40 种语言实时翻译、会议转写"></textarea>
-          </div>
 
-          <!-- 归属方案商：生产设备码时的服务ID(CID)取这里；不再由品牌商推导 -->
+          <!-- 归属方案：BID 取它的 id，CID 再由它的芯片推出 -->
           <div class="form-control mb-4">
             <label class="label">
-              <span class="label-text font-medium">归属方案商 *</span>
-              <span class="label-text-alt text-slate-400">生产设备码的服务ID(CID)取自这里</span>
+              <span class="label-text font-medium">归属方案 *</span>
+              <span class="label-text-alt text-slate-400">方案ID(BID)取自这里，芯片ID(CID)由它的芯片推出</span>
             </label>
             <select v-model.number="form.providerid" class="select select-bordered w-full" required>
-              <option :value="0" disabled>请选择方案商</option>
-              <!-- 按芯片厂商分组：同一家方案商公司可能有多套方案，选项带 ID 才分得清是哪一套 -->
+              <option :value="0" disabled>请选择方案</option>
+              <!-- 按芯片分组：同一家方案公司可能有多套方案，选项带 BID 才分得清是哪一套 -->
               <optgroup v-for="g in providerGroups" :key="g.vendor" :label="g.label">
                 <option v-for="pv in g.items" :key="pv.id" :value="pv.id">{{ pv.name }}（{{ hexId(pv.id) }}）</option>
               </optgroup>
             </select>
             <span v-if="!providers.length" class="label-text-alt text-amber-500 mt-1">还没有方案商，请先到【方案商管理】创建</span>
+            <span v-else-if="form.chipid && !providerGroups.length" class="label-text-alt text-amber-500 mt-1">该芯片下还没有方案，换个芯片或先去【方案商管理】添加</span>
           </div>
 
+          <div class="form-control mb-4">
+            <label class="label"><span class="label-text font-medium">产品名称 *</span></label>
+            <input v-model="form.devicename" type="text" class="input input-bordered w-full" required />
+          </div>
+          <!-- 品牌商已从产品上移除：生产阶段不关心产品属于哪个品牌，品牌归属在 MAC生成 时按批次选。 -->
+          <div class="form-control mb-4">
+            <label class="label"><span class="label-text font-medium">设备类型</span></label>
+            <select v-model.number="form.devicetype" class="select select-bordered w-full">
+              <option v-for="(label, val) in deviceTypeOptions" :key="val" :value="Number(val)">{{ label }}</option>
+            </select>
+          </div>
+          <div class="form-control mb-4">
+            <label class="label">
+              <span class="label-text font-medium">产品说明</span>
+              <span class="label-text-alt text-slate-400">这款产品是什么、有什么特性（与版本更新说明无关）</span>
+            </label>
+            <textarea v-model="form.description" class="textarea textarea-bordered w-full" rows="3" placeholder="如：双麦降噪同传耳机，支持 40 种语言实时翻译、会议转写"></textarea>
+          </div>
+
+
           <!-- 绑定应用：决定该产品的数据算在哪个应用下，也决定品牌商/渠道商账号能选到哪些应用 -->
           <div class="form-control mb-4">
             <label class="label">
@@ -182,27 +226,6 @@
             </div>
           </div>
 
-          <!-- 渠道 -->
-          <div class="grid grid-cols-2 gap-4 mb-4">
-            <div class="form-control">
-              <label class="label"><span class="label-text font-medium">渠道方</span></label>
-              <select v-model="form.channel" class="select select-bordered w-full">
-                <option value="official">官方</option>
-                <option value="mobile">移动</option>
-              </select>
-            </div>
-          </div>
-          <div v-show="form.channel === 'mobile'" class="mb-4">
-            <div class="grid grid-cols-3 gap-4">
-              <div class="form-control"><label class="label"><span class="label-text font-medium">移动平台ID</span></label>
-                <input v-model="mobileExtra.platform_id" type="text" class="input input-bordered w-full" placeholder="移动平台分配的 ID" /></div>
-              <div class="form-control"><label class="label"><span class="label-text font-medium">移动平台KEY</span></label>
-                <input v-model="mobileExtra.platform_key" type="text" class="input input-bordered w-full" placeholder="移动平台分配的 KEY" /></div>
-              <div class="form-control"><label class="label"><span class="label-text font-medium">TUI(8位)</span></label>
-                <input v-model="mobileExtra.tui" type="text" maxlength="8" class="input input-bordered w-full" placeholder="CMEI 前缀，如 11113396" /></div>
-            </div>
-          </div>
-
           <!-- 产品图片 -->
           <div class="form-control mb-4">
             <label class="label"><span class="label-text font-medium">产品图片</span></label>
@@ -222,25 +245,6 @@
             </div>
           </div>
 
-          <!-- 绑定奖励 -->
-          <div class="divider text-sm text-slate-400">绑定奖励设置</div>
-          <div class="grid grid-cols-3 gap-4 mb-4">
-            <div class="form-control"><label class="label"><span class="label-text font-medium">VIP时长(天)</span></label>
-              <input v-model.number="form.bindrewardvpitime" type="number" min="0" class="input input-bordered w-full" /></div>
-            <div class="form-control"><label class="label"><span class="label-text font-medium">翻译时长(分钟)</span></label>
-              <input v-model.number="form.bindrewardtranslate" type="number" min="0" class="input input-bordered w-full" /></div>
-            <div class="form-control"><label class="label"><span class="label-text font-medium">会议时长(分钟)</span></label>
-              <input v-model.number="form.bindrewardmeeting" type="number" min="0" class="input input-bordered w-full" /></div>
-          </div>
-
-          <!-- 功能开关 -->
-          <div class="divider text-sm text-slate-400">功能开关</div>
-          <div class="grid grid-cols-3 gap-3 mb-6">
-            <label v-for="t in toggleFields" :key="t.key" class="flex items-center gap-2 cursor-pointer">
-              <input v-model="form.toggles[t.key]" type="checkbox" class="toggle toggle-primary toggle-sm" />
-              <span class="text-sm">{{ t.label }}</span>
-            </label>
-          </div>
 
           <div class="flex gap-3">
             <button type="button" class="btn btn-ghost" @click="showList()">取消</button>
@@ -259,14 +263,17 @@
         <div class="bg-slate-50 rounded-lg p-4 text-sm space-y-2 mb-4">
           <div class="flex"><span class="text-slate-500 w-28">产品名称</span><span class="font-medium">{{ form.devicename || '-' }}</span></div>
           <div v-if="form.description" class="flex"><span class="text-slate-500 w-28 shrink-0">产品说明</span><span class="whitespace-pre-wrap">{{ form.description }}</span></div>
-          <div class="flex"><span class="text-slate-500 w-28">品牌商(BID)</span>
-            <span class="font-medium">{{ brandName(form.brandid) }}<span class="font-mono text-slate-400 ml-2">0x{{ hex4(form.brandid) }}</span></span></div>
-          <div class="flex"><span class="text-slate-500 w-28">方案商(CID)</span>
+          <div class="flex"><span class="text-slate-500 w-28">产品(PID)</span>
+            <span class="font-medium font-mono">0x{{ (parsePid() ?? 0).toString(16).toUpperCase().padStart(4, '0') }}</span></div>
+          <div class="flex"><span class="text-slate-500 w-28">芯片(CID)</span>
+            <span class="font-medium">{{ chipVendorName(chipOfForm) }}<span class="font-mono text-slate-400 ml-2">0x{{ hex4(chipOfForm) }}</span></span></div>
+          <div class="flex"><span class="text-slate-500 w-28">方案(BID)</span>
             <span class="font-medium">{{ providerLabel(form.providerid) }}<span class="font-mono text-slate-400 ml-2">0x{{ hex4(form.providerid) }}</span></span></div>
+          <div class="flex"><span class="text-slate-500 w-28">生产工厂</span><span>{{ factoryName(form.oemfactoryid) }}</span></div>
           <div class="flex"><span class="text-slate-500 w-28">设备类型</span><span>{{ deviceTypeOptions[form.devicetype] || form.devicetype }}</span></div>
           <div class="flex"><span class="text-slate-500 w-28">设备码数量</span><span>{{ form.devicecodecount === 2 ? '双份 (2个/副)' : '单份 (1个/副)' }}</span></div>
           <div class="flex"><span class="text-slate-500 w-28">绑定应用</span><span>{{ form.appnames.length ? form.appnames.join('、') : '未绑定' }}</span></div>
-          <p class="text-xs text-slate-400 pt-1">产品ID(PID) 由系统在创建后分配，会一并写进通知邮件。</p>
+          <p class="text-xs text-slate-400 pt-1">PID 为上面手工指定的值，会一并写进通知邮件。</p>
         </div>
 
         <label class="flex items-center gap-2 cursor-pointer mb-3">
@@ -343,11 +350,30 @@
       <!-- 当前版本信息 -->
       <div v-if="currentProduct" class="bg-white rounded-xl shadow-sm border border-slate-100 p-4 mb-5">
         <div class="flex items-center gap-6 text-sm flex-wrap">
-          <span class="text-slate-400">产品ID:</span><span class="font-mono">{{ hexId(currentProduct.id) }}</span>
+          <span class="text-slate-400">PID:</span><span class="font-mono">0x{{ hex4(currentProduct.id) }}</span>
           <span class="text-slate-400">当前版本:</span><span class="badge badge-primary badge-sm">{{ currentProduct.version || '无' }}</span>
           <span class="text-slate-400">版本ID:</span><span class="text-xs">{{ currentProduct.versionid || '无' }}</span>
           <span class="text-slate-400">更新包:</span><span class="text-xs max-w-md truncate">{{ currentProduct.updatepackageaddress || '无' }}</span>
         </div>
+        <div class="divider my-2"></div>
+        <label class="flex items-start gap-2 cursor-pointer">
+          <input
+            type="checkbox"
+            class="checkbox checkbox-warning checkbox-sm mt-0.5"
+            :checked="!!currentProduct.updateonmismatch"
+            :disabled="mismatchSaving"
+            @change="toggleUpdateOnMismatch(($event.target as HTMLInputElement).checked)"
+          />
+          <span class="text-sm">
+            版本不一致即可升级
+            <span class="loading loading-spinner loading-xs ml-1" v-if="mismatchSaving"></span>
+            <span class="block text-xs text-slate-400 mt-0.5">
+              开发/测试用：勾上后设备版本只要和服务器版本<b>不同</b>就能点升级（可刷回旧固件反复验证）。
+              不勾则只有服务器版本<b>更高</b>时才允许升级。
+              <b class="text-warning">正式产品请勿开启</b>——挂错一个旧版固件会把全量用户降级。
+            </span>
+          </span>
+        </label>
       </div>
       <!-- 添加新版本 -->
       <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-5 mb-5">
@@ -375,7 +401,7 @@
       <div class="bg-white rounded-xl shadow-sm border border-slate-100">
         <div class="overflow-x-auto">
           <table class="table table-zebra text-sm">
-            <thead><tr><th>ID</th><th>版本号</th><th>描述</th><th>更新包地址</th><th>操作</th></tr></thead>
+            <thead><tr><th>版本ID</th><th>版本号</th><th>描述</th><th>更新包地址</th><th>操作</th></tr></thead>
             <tbody>
               <tr v-if="!versions.length"><td colspan="5" class="text-center text-slate-400 py-8">暂无版本</td></tr>
               <tr v-for="v in versions" :key="v.id">
@@ -409,7 +435,7 @@ import { ref, reactive, computed, onMounted } from 'vue'
 import { useApi } from '~/composables/useApi'
 import { useToast } from '~/composables/useToast'
 import { useAuthStore } from '~/stores/auth'
-import { CHIP_VENDORS, chipVendorName } from '~/utils/chipvendors'
+import { chipVendors, loadChipVendors, chipVendorName } from '~/utils/chipvendors'
 import { useTableSort } from '~/composables/useTableSort'
 
 definePageMeta({ title: '产品管理' })
@@ -418,11 +444,13 @@ interface Product {
   id: number; devicename: string; brandid: number; providerid?: number; devicetype: number
   description?: string // 产品说明（特性描述）
   createtime?: number
+  oemfactoryid?: number // 代工厂 id（oem_factory.id），0/缺失 = 未指定
   scanuuid: string; devicecodecount: number; productimage: string
   channel: string; channelextra: string
   appnames?: string // 绑定应用名 CSV（空=未绑定）
   bindrewardvpitime: number; bindrewardtranslate: number; bindrewardmeeting: number
   version?: string; versionid?: number; updatepackageaddress?: string
+  updateonmismatch?: boolean // 版本不一致即可升级（开发用，默认关）
   [key: string]: unknown
 }
 interface Version { id: number; version: string; description: string; updatepackageaddress: string; productid: number }
@@ -436,23 +464,6 @@ const auth = useAuthStore()
 const deviceTypes: Record<number, string> = { 0: '未知', 1: '经典蓝牙', 2: 'BLE双端', 3: 'BLE单端', 4: '录音笔', 5: '智能眼镜', 6: '激活码卡片' }
 const deviceTypeOptions: Record<number, string> = { 0: '未知', 1: '经典蓝牙耳机', 2: 'BLE双端', 3: 'BLE单端', 4: '智能录音笔', 5: '智能眼镜', 6: '激活码卡片' }
 
-const toggleFields = [
-  { key: 'iscanbindagain', label: '可重复绑定奖励' },
-  { key: 'iscontinuouschat', label: '连续对话' },
-  { key: 'eqenable', label: 'EQ 均衡器' },
-  { key: 'keyenable', label: '按键控制' },
-  { key: 'workmodeenable', label: '工作模式' },
-  { key: 'callmodeenable', label: '通话模式' },
-  { key: 'ledenable', label: 'LED 灯' },
-  { key: 'finddeviceenable', label: '查找设备' },
-  { key: 'noisereductionenable', label: '降噪' },
-  { key: 'shutdownenable', label: '定时关机' },
-  { key: 'showcasebattery', label: '充电盒电量' },
-  { key: 'wakeupenable', label: '唤醒控制' },
-  { key: 'broadcastpeertranslate', label: '播报对方翻译' },
-  { key: 'hideaiassistant', label: '隐藏AI助手' },
-]
-
 const view = ref<'list' | 'form' | 'version'>('list')
 const rows = ref<Product[]>([])
 const brands = ref<Record<number, string>>({})
@@ -469,19 +480,33 @@ const loading = ref(false)
 const submitting = ref(false)
 const isEditing = ref(false)
 
-function emptyToggles(): Record<string, boolean> {
-  const o: Record<string, boolean> = {}
-  toggleFields.forEach((t) => { o[t.key] = false })
-  return o
-}
-
 const form = reactive({
-  id: 0, devicename: '', description: '', brandid: 0, providerid: 0, devicetype: 0, scanuuid: '', devicecodecount: 1,
+  // id 是当前 PID，idHex 是编辑框里的十六进制值；改 PID 时两者不同，靠 id 做定位、idHex 做新值
+  id: 0, idHex: '', devicename: '', description: '', brandid: 0, providerid: 0, devicetype: 0, scanuuid: '', devicecodecount: 1,
+  // chipid 只用于筛下面的方案下拉，不落库——芯片由方案商推导，见模板注释
+  chipid: 0, oemfactoryid: 0,
   productimage: '', channel: 'official', appnames: [] as string[],
-  bindrewardvpitime: 0, bindrewardtranslate: 0, bindrewardmeeting: 0,
-  toggles: emptyToggles() as Record<string, boolean>,
 })
-const mobileExtra = reactive({ platform_id: '', platform_key: '', tui: '' })
+
+// 代工厂（含停用的：存量产品可能挂在停用工厂上，列表要显示得出名字；下拉另筛）
+interface OemFactory { id: number; name: string; enabled?: boolean }
+const factories = ref<OemFactory[]>([])
+const factoryOptions = computed(() => factories.value.filter((f) => f.enabled !== false))
+function factoryName(id?: number) {
+  const n = Number(id || 0)
+  if (!n) return '未指定'
+  return factories.value.find((f) => f.id === n)?.name ?? ('工厂#' + n)
+}
+// 当前所选方案对应的芯片公司 id —— 即 CID。始终由方案商推出，不单独存，
+// 这样方案商改了芯片，产品这边显示的 CID 立刻跟着变，不会留下对不上的旧值。
+const chipOfForm = computed(() => Number(providers.value.find((x) => x.id === form.providerid)?.vendor || 0))
+
+// 换芯片后，若当前所选方案不属于该芯片则清空，避免留下一个跟芯片对不上的方案
+function onChipChange() {
+  if (!form.chipid) return
+  const pv = providers.value.find((x) => x.id === form.providerid)
+  if (!pv || Number(pv.vendor || 0) !== form.chipid) form.providerid = 0
+}
 
 function hexId(id: number) { return id ? Number(id).toString(16).toUpperCase() : '' }
 function hex4(id: number) { return id ? Number(id).toString(16).padStart(4, '0').toUpperCase() : 'N/A' }
@@ -501,9 +526,12 @@ function providerLabel(id?: number) {
 }
 // 方案商下拉/筛选按芯片厂商分组（未分组的归到最后一组）
 const providerGroups = computed(() => {
-  const groups = CHIP_VENDORS.map((v) => ({ vendor: v.value, label: v.label, items: [] as Provider[] }))
+  // 含已停用的厂商：存量方案商可能挂在停用厂商下，漏了它们会被归进「未分组」那一组
+  const groups = chipVendors.value.map((v) => ({ vendor: v.id, label: v.name, items: [] as Provider[] }))
   groups.push({ vendor: 0, label: chipVendorName(0), items: [] as Provider[] })
-  for (const pv of providers.value) {
+  // 选了芯片就只看该芯片下的方案；选「全部芯片」时不筛
+  const pool = form.chipid ? providers.value.filter((pv) => Number(pv.vendor || 0) === form.chipid) : providers.value
+  for (const pv of pool) {
     const g = groups.find((x) => x.vendor === Number(pv.vendor || 0)) ?? groups[groups.length - 1]!
     g.items.push(pv)
   }
@@ -546,7 +574,14 @@ function resetFilter() {
 function appNamesOf(p: Product): string[] {
   return String(p.appnames || '').split(',').map((s) => s.trim()).filter(Boolean)
 }
-function featureCount(p: Product) { return toggleFields.filter((t) => !!p[t.key]).length }
+// 功能开关已从产品表单移除（改由别处配置），但字段仍在库里、仍下发给客户端，
+// 列表保留一个「已开启 N/14」的只读计数，方便一眼看出这个产品开了哪些能力。
+const TOGGLE_KEYS = [
+  'iscanbindagain', 'iscontinuouschat', 'eqenable', 'keyenable', 'workmodeenable',
+  'callmodeenable', 'ledenable', 'finddeviceenable', 'noisereductionenable',
+  'shutdownenable', 'showcasebattery', 'wakeupenable', 'broadcastpeertranslate', 'hideaiassistant',
+]
+function featureCount(p: Product) { return TOGGLE_KEYS.filter((k) => !!p[k]).length }
 
 // ── 列表 ──
 async function loadData() {
@@ -573,7 +608,7 @@ async function loadBrands() {
   } catch { brandOptions.value = [] }
 }
 
-// 方案商：产品必须绑一个，生产设备码的服务ID(CID) 取自它
+// 方案公司：产品必须绑一个。BID 取它的 id，CID 取它的 vendor（芯片公司）
 async function loadProviders() {
   try {
     const d = await webApi<{ providers: Provider[] }>('getsolutionproviders', {})
@@ -581,6 +616,14 @@ async function loadProviders() {
   } catch { providers.value = [] }
 }
 
+// 代工厂：产品可选绑一个，作为「默认由哪家厂生产」；具体批次在 MAC 生成页还能再选一次
+async function loadFactories() {
+  try {
+    const d = await webApi<{ factories: OemFactory[] }>('getoemfactories', {})
+    factories.value = d?.factories ?? []
+  } catch { factories.value = [] }
+}
+
 // 应用候选取自应用中心（console/api/products/list，即 app_product 表），与部署无关，只按应用名绑。
 async function loadAppOptions() {
   try {
@@ -595,83 +638,84 @@ function showForm(p?: Product) {
   loadBrands()
   loadProviders()
   loadAppOptions()
+  loadFactories()
   if (p) {
     isEditing.value = true
     form.id = p.id
+    form.idHex = hexId(p.id)
     form.devicename = p.devicename || ''
     form.description = p.description || ''
-    form.brandid = p.brandid || 0
     form.providerid = p.providerid || 0
+    // 芯片不落库，由所选方案商反推，保证展示的芯片永远等于方案商当前归属
+    form.chipid = Number(providers.value.find((x) => x.id === p.providerid)?.vendor || 0)
+    form.oemfactoryid = p.oemfactoryid || 0
     form.devicetype = p.devicetype || 0
     form.scanuuid = p.scanuuid || ''
     form.devicecodecount = p.devicecodecount === 2 ? 2 : 1
     form.productimage = p.productimage || ''
-    form.channel = p.channel || 'official'
     form.appnames = appNamesOf(p)
-    form.bindrewardvpitime = p.bindrewardvpitime || 0
-    form.bindrewardtranslate = p.bindrewardtranslate || 0
-    form.bindrewardmeeting = p.bindrewardmeeting || 0
-    let extra: any = {}
-    try { extra = p.channelextra ? JSON.parse(p.channelextra) : {} } catch { extra = {} }
-    mobileExtra.platform_id = extra.platform_id || ''
-    mobileExtra.platform_key = extra.platform_key || ''
-    mobileExtra.tui = extra.tui || ''
-    toggleFields.forEach((t) => { form.toggles[t.key] = !!p[t.key] })
   } else {
     isEditing.value = false
     form.id = 0
+    form.idHex = ''
+    form.chipid = 0
+    form.oemfactoryid = 0
     form.devicename = ''
     form.description = ''
-    form.brandid = 0
     form.providerid = 0
     form.devicetype = 0
     form.scanuuid = ''
     form.devicecodecount = 1
     form.productimage = ''
-    form.channel = 'official'
     form.appnames = []
-    form.bindrewardvpitime = 0
-    form.bindrewardtranslate = 0
-    form.bindrewardmeeting = 0
-    mobileExtra.platform_id = ''
-    mobileExtra.platform_key = ''
-    mobileExtra.tui = ''
-    toggleFields.forEach((t) => { form.toggles[t.key] = false })
   }
   view.value = 'form'
 }
 
 function buildProductPayload(): Record<string, unknown> {
-  let channelextra = ''
-  if (form.channel === 'mobile') {
-    channelextra = JSON.stringify({ platform_id: mobileExtra.platform_id || '', platform_key: mobileExtra.platform_key || '', tui: mobileExtra.tui || '' })
-  }
+  // 只下发本表单实际编辑的字段。
+  // 品牌商 / 渠道方(channel,channelextra) / 绑定奖励 / 功能开关 已从表单移除，故不再下发——
+  // 服务端 updateProduct 会把这几项从旧记录原样保留，编辑产品不会把它们清空。
   const product: Record<string, unknown> = {
     devicename: form.devicename,
     description: form.description,
-    brandid: Number(form.brandid) || 0,
     providerid: Number(form.providerid) || 0,
     devicetype: Number(form.devicetype) || 0,
     scanuuid: form.scanuuid,
     devicecodecount: Number(form.devicecodecount) || 1,
     productimage: form.productimage,
-    channel: form.channel,
-    channelextra,
     appnames: form.appnames.join(','),
-    bindrewardvpitime: Number(form.bindrewardvpitime) || 0,
-    bindrewardtranslate: Number(form.bindrewardtranslate) || 0,
-    bindrewardmeeting: Number(form.bindrewardmeeting) || 0,
+    oemfactoryid: Number(form.oemfactoryid) || 0,
   }
-  toggleFields.forEach((t) => { product[t.key] = form.toggles[t.key] })
-  if (isEditing.value) product.id = Number(form.id)
+  // PID 新增时也手填：一律从输入框解析（编辑改号时由调用方另传 oldid 定位旧记录）
+  product.id = parsePid() ?? 0
   return product
 }
 
+// 解析 PID 输入框；不合法返回 null（调用方负责提示）。新增/编辑共用一套口径。
+function parsePid(): number | null {
+  const hex = form.idHex.trim().replace(/^0x/i, '')
+  if (!/^[0-9a-fA-F]{1,8}$/.test(hex)) return null
+  const n = Number.parseInt(hex, 16)
+  return n > 0 ? n : null
+}
+
+// PID 合法性 + 全后台唯一（排除自己）。返回 true 表示可以提交。
+function checkPid(): boolean {
+  const pid = parsePid()
+  if (pid === null) { warn('PID 需填十六进制且不为 0，如 B001'); return false }
+  if (rows.value.some((p) => Number(p.id) === pid && Number(p.id) !== form.id)) {
+    warn(`PID ${pid.toString(16).toUpperCase()} 已被占用`)
+    return false
+  }
+  return true
+}
+
 // 编辑直接保存；新增走二次确认（确认框里同时定好通知邮件的收件人/抄送）
 async function saveProduct() {
   if (!form.devicename.trim()) { warn('请输入产品名称'); return }
-  if (!form.brandid) { warn('请选择所属品牌商'); return }
-  if (!form.providerid) { warn('请选择归属方案商（生产设备码的 CID 取自它）'); return }
+  if (!checkPid()) return
+  if (!form.providerid) { warn('请选择归属方案（方案ID(BID) 取自它）'); return }
   if (!isEditing.value) {
     prepareNotify()
     confirmModal.value?.showModal()
@@ -679,7 +723,9 @@ async function saveProduct() {
   }
   submitting.value = true
   try {
-    await webApi('updateproduct', { product: buildProductPayload() })
+    const product = buildProductPayload()
+    // 带原 PID：服务端拿它定位记录，再决定要不要改主键
+    await webApi('updateproduct', { product, oldid: Number(form.id) })
     success('保存成功')
     showList()
   } catch (e: any) {
@@ -727,6 +773,7 @@ function closeConfirm() { confirmModal.value?.close() }
 
 async function doCreate() {
   if (notify.enabled && !notify.to.trim()) { warn('请填写通知邮件的收件人（品牌方邮箱）'); return }
+  if (!checkPid()) { closeConfirm(); return }
   submitting.value = true
   try {
     const d = await webApi<{ product: Product }>('addproduct', { product: buildProductPayload() })
@@ -746,7 +793,8 @@ async function doCreate() {
   }
 }
 
-// 邮件正文给客户录入用：方案商ID(CID) / 品牌商ID(BID) / 产品ID(PID) 三个十六进制标识
+// 邮件正文给客户录入用：芯片ID(CID) / 方案ID(BID) / 产品ID(PID) 三个十六进制标识
+// 口径固定：CID=芯片公司、BID=方案公司、PID=产品。CID 由所选方案商的 vendor 推出，不单独存。
 function buildNotifyMail(pid: number) {
   const b = brandOptions.value.find((x) => x.id === form.brandid)
   const pv = providers.value.find((x) => x.id === form.providerid)
@@ -755,8 +803,8 @@ function buildNotifyMail(pid: number) {
   notify.content =
     '尊敬的合作伙伴：\n\n' +
     '贵司产品「' + form.devicename + '」已在平台创建完成，相关标识如下，请按此录入生产与开发环境：\n\n' +
-    '方案商(CID): 0x' + hex4(form.providerid) + '  ' + (pv ? pv.name + '（' + chipVendorName(pv.vendor) + '）' : '') + '\n' +
-    '品牌商(BID): 0x' + hex4(form.brandid) + '  ' + (b ? b.brand : '') + '\n' +
+    '芯片ID(CID): 0x' + hex4(chipOfForm.value) + '  ' + chipVendorName(chipOfForm.value) + '\n' +
+    '方案ID(BID): 0x' + hex4(form.providerid) + '  ' + (pv ? pv.name : '') + '\n' +
     '产品ID(PID): 0x' + hex4(pid) + '  ' + form.devicename + '\n' +
     '设备类型: ' + (deviceTypeOptions[form.devicetype] || form.devicetype) + '\n' +
     (form.description ? '产品说明: ' + form.description + '\n' : '') +
@@ -877,6 +925,30 @@ async function switchCurrentVersion(v: Version): Promise<boolean> {
   }
 }
 
+const mismatchSaving = ref(false)
+
+// 「版本不一致即可升级」开关。后端 updateproduct 是整条 Save，所以照
+// switchCurrentVersion 的做法把整个 product 回传，只改这一个字段。
+// ⚠️ 不要只 POST 一个 {id, updateonmismatch}——那会把产品其它字段全抹成零值。
+async function toggleUpdateOnMismatch(checked: boolean) {
+  if (!currentProduct.value) { error('产品信息未加载'); return }
+  mismatchSaving.value = true
+  const product = { ...currentProduct.value, updateonmismatch: checked }
+  try {
+    await webApi('updateproduct', { product })
+    const d = await webApi<{ product: Product }>('getproduct', { id: product.id })
+    currentProduct.value = d?.product ?? product
+    // 列表里那一行也要跟着变，否则重开抽屉又是旧值
+    const row = rows.value.find((r) => r.id === product.id)
+    if (row) row.updateonmismatch = checked
+    success(checked ? '已开启：版本不一致即可升级' : '已关闭：仅允许升级到更高版本')
+  } catch (e: any) {
+    error(e?.message ?? '保存失败')
+  } finally {
+    mismatchSaving.value = false
+  }
+}
+
 function useVersion(v: Version) {
   if (!window.confirm(`确定将版本 "${v.version}" 设为当前使用版本？`)) return
   switchCurrentVersion(v).then((ok) => {
@@ -891,7 +963,7 @@ async function addVersion() {
   if (!otaFile.value) { warn('请选择固件文件'); return }
   versionSubmitting.value = true
   try {
-    // 固件包：目录传 product/<产品id>/，后端强制置于 yunyan/ 根下 → yunyan/product/<id>/<文件名>
+    // 固件包：目录传 product/<产品id>/，后端强制置于 EAIMAR/ 根下 → EAIMAR/product/<id>/<文件名>
     const url = await uploadFile(otaFile.value, `product/${pid}/`)
     const d = await webApi<{ version: Version }>('addproductversion', {
       version: { productid: pid, version: ver.version.trim(), description: ver.desc, updatepackageaddress: url },
@@ -916,5 +988,9 @@ function delVersion(v: Version) {
     .catch((e: any) => error(e?.message ?? '删除失败'))
 }
 
-onMounted(loadData)
+onMounted(async () => {
+  // 芯片厂商已改为后台可维护的表（chip_vendor），方案商分组要按最新的厂商列表来
+  await loadChipVendors(webApi)
+  await loadData()
+})
 </script>
diff --git a/apps/admin/app/pages/provider.vue b/apps/admin/app/pages/provider.vue
index 68360513..4848320c 100644
--- a/apps/admin/app/pages/provider.vue
+++ b/apps/admin/app/pages/provider.vue
@@ -14,7 +14,7 @@
             <label class="label py-1"><span class="label-text text-xs text-slate-500">芯片分组</span></label>
             <select v-model.number="filterVendor" class="select select-bordered select-sm w-40">
               <option :value="-1">全部芯片</option>
-              <option v-for="v in CHIP_VENDORS" :key="v.value" :value="v.value">{{ v.label }}</option>
+              <option v-for="v in chipVendors" :key="v.id" :value="v.id">{{ v.name }} (0x{{ v.id.toString(16).toUpperCase() }}){{ v.enabled === false ? ' 已停用' : '' }}</option>
               <option :value="0">未分组</option>
             </select>
           </div>
@@ -32,7 +32,7 @@
           <table class="table table-zebra">
             <thead>
               <tr>
-                <th class="cursor-pointer select-none" @click="toggleSort('id')">ID{{ sortMark('id') }}</th>
+                <th class="cursor-pointer select-none" @click="toggleSort('id')">BID{{ sortMark('id') }}</th>
                 <th class="cursor-pointer select-none" @click="toggleSort('vendor')">芯片分组{{ sortMark('vendor') }}</th>
                 <th class="cursor-pointer select-none" @click="toggleSort('name')">方案商公司{{ sortMark('name') }}</th>
                 <th>方案说明</th>
@@ -83,36 +83,35 @@
       </div>
       <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-6 max-w-2xl">
         <form @submit.prevent="saveProvider">
-          <!-- 方案商 ID：手工指定的有含义编码，落库后不可改（已烧录进设备） -->
+          <!-- BID：手工指定的有含义编码，就是方案商主键。建档填错能改，但名下有产品后就锁死 -->
           <div class="form-control mb-4">
-            <label class="label"><span class="label-text font-medium">方案商 ID（十六进制）*</span></label>
+            <label class="label"><span class="label-text font-medium">BID（十六进制）*</span></label>
             <div class="flex items-stretch">
               <span class="bg-slate-100 text-slate-400 font-mono px-3 flex items-center rounded-l-lg border border-r-0 border-slate-200">0x</span>
               <input
                 v-model="form.idHex"
                 type="text"
                 class="input input-bordered w-full font-mono uppercase rounded-l-none"
-                :disabled="isEditing"
                 placeholder="C101"
                 maxlength="8"
                 required
               />
             </div>
             <span class="label-text-alt text-slate-400 mt-1">
-              方案商 ID 不自增，由人工指定成有含义的编码（如 C101 = 杰里 01 方案）。新增一律用 C 开头段（C1xx…）；
-              历史 ID（ABEF / ABF0~ABF4 / AB21）已烧录进设备，<b>创建后不可修改</b>。
+              BID 不自增，由人工指定成有含义的编码（如 C101 = 杰里 01 方案）。新增建议用 C 开头段（C1xx…）。
+              <b>名下还没有产品时可以改</b>；一旦有产品挂上来，改号会让那些产品指向不存在的方案商，服务端会拒绝。
             </span>
             <span v-if="!isEditing && usedIdHint" class="label-text-alt text-slate-400 mt-1">{{ usedIdHint }}</span>
           </div>
 
           <!-- 芯片分组：一个芯片厂商可以有多套方案，每套方案单独一条记录 -->
           <div class="form-control mb-4">
-            <label class="label"><span class="label-text font-medium">芯片分组 *</span></label>
+            <label class="label"><span class="label-text font-medium">芯片 *</span></label>
             <select v-model.number="form.vendor" class="select select-bordered w-full" required>
               <option :value="0" disabled>请选择芯片厂商</option>
-              <option v-for="v in CHIP_VENDORS" :key="v.value" :value="v.value">{{ v.label }}</option>
+              <option v-for="v in enabledVendors" :key="v.id" :value="v.id">{{ v.name }} (0x{{ v.id.toString(16).toUpperCase() }})</option>
             </select>
-            <span class="label-text-alt text-slate-400 mt-1">同一个芯片厂商可以有多套方案，每套方案单独建一条方案商记录，靠这里归组。</span>
+            <span class="label-text-alt text-slate-400 mt-1">这家方案公司用的是哪家芯片。厂商清单在「芯片管理」里维护，CID 也在那里填。</span>
           </div>
 
           <div class="form-control mb-4">
@@ -160,7 +159,7 @@
 import { ref, reactive, computed, onMounted } from 'vue'
 import { useApi } from '~/composables/useApi'
 import { useToast } from '~/composables/useToast'
-import { CHIP_VENDORS, chipVendorName } from '~/utils/chipvendors'
+import { chipVendors, enabledChipVendors, loadChipVendors, chipVendorName } from '~/utils/chipvendors'
 import { useTableSort } from '~/composables/useTableSort'
 
 definePageMeta({ title: '方案商管理' })
@@ -191,6 +190,10 @@ const keyword = ref('')
 
 const form = reactive({ id: 0, idHex: '', name: '', description: '', vendor: 0 })
 
+// 新建/编辑时只能选启用中的厂商；列表筛选那边用全量 chipVendors（含停用），
+// 否则挂在停用厂商下的存量方案商会筛不出来。
+const enabledVendors = computed(() => enabledChipVendors())
+
 function hexId(id: number) {
   return id ? Number(id).toString(16).toUpperCase() : ''
 }
@@ -288,18 +291,17 @@ function removeEmail(idx: number) {
 }
 
 async function saveProvider() {
-  if (!form.vendor) { warn('请选择芯片分组'); return }
-  let id = form.id
-  if (!isEditing.value) {
-    const hex = form.idHex.trim().replace(/^0x/i, '')
-    if (!/^[0-9a-fA-F]{1,8}$/.test(hex)) { warn('方案商 ID 需填十六进制，如 C101'); return }
-    id = Number.parseInt(hex, 16)
-    if (!id) { warn('方案商 ID 不能为 0'); return }
-    if (rows.value.some((p) => Number(p.id) === id)) { warn(`ID ${hex.toUpperCase()} 已被占用`); return }
-  }
+  if (!form.vendor) { warn('请选择芯片'); return }
+  // BID 现在编辑时也能改，所以新增/编辑一律从输入框重新解析，不再沿用 form.id
+  const hex = form.idHex.trim().replace(/^0x/i, '')
+  if (!/^[0-9a-fA-F]{1,8}$/.test(hex)) { warn('BID 需填十六进制，如 C101'); return }
+  const id = Number.parseInt(hex, 16)
+  if (!id) { warn('BID 不能为 0'); return }
+  // 占用校验要排除自己，否则编辑时不改号也会被自己挡住
+  if (rows.value.some((p) => Number(p.id) === id && Number(p.id) !== form.id)) { warn(`BID ${hex.toUpperCase()} 已被占用`); return }
   submitting.value = true
   try {
-    const payload: { provider: Record<string, unknown> } = {
+    const payload: { provider: Record<string, unknown>; oldid?: number } = {
       provider: {
         id,
         name: form.name,
@@ -308,6 +310,8 @@ async function saveProvider() {
         vendor: form.vendor,
       },
     }
+    // 编辑时必须带原 BID：服务端拿它定位记录，再决定要不要改主键
+    if (isEditing.value) payload.oldid = form.id
     await webApi(isEditing.value ? 'updatesolutionprovider' : 'addsolutionprovider', payload)
     success('保存成功')
     showList()
@@ -325,5 +329,9 @@ function delProvider(p: Provider) {
     .catch((e: any) => error(e?.message ?? '删除失败'))
 }
 
-onMounted(loadData)
+onMounted(async () => {
+  // 芯片厂商已改为后台可维护的表（chip_vendor），不再是写死的四条，进页面先拉一次。
+  await loadChipVendors(webApi)
+  await loadData()
+})
 </script>
diff --git a/apps/admin/app/pages/settlements.vue b/apps/admin/app/pages/settlements.vue
index 0cc4b2e6..bf2e7f51 100644
--- a/apps/admin/app/pages/settlements.vue
+++ b/apps/admin/app/pages/settlements.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="flex items-center justify-between mb-5 flex-wrap gap-3">
       <h2 class="text-lg font-semibold text-slate-800">
-        月结算<span class="text-xs text-slate-400 font-normal ml-2">按订单实付金额分成，渠道商从品牌商那份里再切</span>
+        月结算<span class="text-xs text-slate-400 font-normal ml-2">按【渠道商 × 生产批次】出行，比例取自该批次</span>
       </h2>
       <div v-if="canManage" class="flex gap-2">
         <button class="btn btn-primary btn-sm text-white" :disabled="generating" @click="genSettlement">
@@ -19,13 +19,6 @@
           <label class="label py-1"><span class="label-text text-xs text-slate-500">结算月</span></label>
           <input v-model="filters.month" type="month" class="input input-bordered input-sm w-44" @change="loadData" />
         </div>
-        <div v-if="!auth.isBrandAccount && !auth.isDealer" class="form-control">
-          <label class="label py-1"><span class="label-text text-xs text-slate-500">品牌商</span></label>
-          <select v-model.number="filters.brandid" class="select select-bordered select-sm w-48" @change="loadData">
-            <option :value="0">全部品牌商</option>
-            <option v-for="b in brands" :key="b.id" :value="b.id">{{ b.brand }}</option>
-          </select>
-        </div>
         <div v-if="!auth.isDealer" class="form-control">
           <label class="label py-1"><span class="label-text text-xs text-slate-500">渠道商</span></label>
           <select v-model="filters.channelid" class="select select-bordered select-sm w-52" @change="loadData">
@@ -60,27 +53,30 @@
         <table class="table table-zebra text-sm">
           <thead>
             <tr>
-              <th>结算月</th><th>品牌商</th><th>渠道商</th><th class="text-right">订单数</th>
-              <th class="text-right">结算基数</th><th class="text-right">品牌比例</th><th class="text-right">品牌实得</th>
+              <th>结算月</th><th>渠道商</th><th>批次号</th><th>产品</th><th class="text-right">订单数</th>
+              <th class="text-right">结算基数</th>
               <th class="text-right">渠道比例</th><th class="text-right">渠道分成</th><th class="text-right">平台留存</th>
               <th>状态</th><th v-if="canManage">操作</th>
             </tr>
           </thead>
           <tbody>
             <tr v-if="loading">
-              <td :colspan="canManage ? 12 : 11" class="text-center py-8"><span class="loading loading-spinner loading-sm"></span></td>
+              <td :colspan="canManage ? 11 : 10" class="text-center py-8"><span class="loading loading-spinner loading-sm"></span></td>
             </tr>
             <tr v-else-if="!rows.length">
-              <td :colspan="canManage ? 12 : 11" class="text-center text-slate-400 py-8">该月暂无结算数据</td>
+              <td :colspan="canManage ? 11 : 10" class="text-center text-slate-400 py-8">该月暂无结算数据</td>
             </tr>
             <tr v-for="(r, i) in rows" v-else :key="i">
               <td class="font-mono">{{ fmtPeriod(r.period) }}</td>
-              <td>{{ brandName(r.brandid) }}</td>
               <td>{{ channelName(r.channelid) }}</td>
+              <!-- 批次为空 = 这些订单归不到任何批次（用户没绑过设备 / 批次已撤销），比例 0、全归平台 -->
+              <td class="font-mono text-xs">
+                <span v-if="r.batchno" class="text-indigo-600 font-medium">{{ r.batchno }}</span>
+                <span v-else class="badge badge-ghost badge-sm">无批次归属</span>
+              </td>
+              <td class="text-xs">{{ productName(r.productid) }}</td>
               <td class="text-right">{{ r.order_count }}</td>
               <td class="text-right font-medium">{{ fmtMoney(r.base_amount) }}</td>
-              <td class="text-right text-slate-500">{{ ratePct(r.brand_rate) }}</td>
-              <td class="text-right text-emerald-600 font-medium">{{ fmtMoney(r.brand_net) }}</td>
               <td class="text-right text-slate-500">{{ ratePct(r.channel_rate) }}</td>
               <td class="text-right text-indigo-600 font-medium">{{ fmtMoney(r.channel_amount) }}</td>
               <td class="text-right text-slate-500">{{ fmtMoney(r.platform_amount) }}</td>
@@ -102,8 +98,10 @@
     </div>
 
     <p class="text-xs text-slate-400 mt-3 leading-relaxed">
-      结算基数 = 该月<b>已支付</b>订单实付金额合计，订单按下单时冻结的「来源设备」归属到品牌商与渠道商。<br />
-      品牌商总提成 = 基数 × 品牌比例；渠道分成 = 品牌总提成 × 渠道比例；品牌实得 = 品牌总提成 − 渠道分成；平台留存 = 基数 − 品牌总提成。<br />
+      结算基数 = 该月<b>已支付</b>订单实付金额合计。订单按下单时冻结的「来源设备」先归到渠道商，
+      再由设备反查出它属于哪个<b>生产批次</b>——分成比例是一批一谈的，取自该批次。<br />
+      渠道分成 = 基数 × 渠道比例；平台留存 = 基数 − 渠道分成。
+      标「无批次归属」的行是查不到来源设备的订单（用户从未绑过设备、或批次已被撤销），比例按 0 处理、全额归平台。<br />
       比例在生成结算单时快照冻结，之后调整比例不影响已生成的月份；<b>已确认</b>的行重算时会跳过，需先退回草稿才能重算。
     </p>
   </div>
@@ -119,15 +117,13 @@ definePageMeta({ title: '月结算' })
 
 interface Settlement {
   period: number
-  brandid: number
   channelid: string
+  batchno: string // 生产批次号；空 = 这些订单归不到批次
+  productid: number
   order_count: number
   base_amount: number
-  brand_rate: number
-  brand_gross: number
   channel_rate: number
   channel_amount: number
-  brand_net: number
   platform_amount: number
   status: number
   gen_time: number
@@ -135,7 +131,6 @@ interface Settlement {
   confirm_time: number
   remark: string
 }
-interface Brand { id: number; brand: string }
 interface Channel { id: string; brandid: number; name: string }
 
 const { webApi } = useApi()
@@ -146,22 +141,20 @@ const auth = useAuthStore()
 const canManage = computed(() => auth.isAdmin)
 
 const rows = ref<Settlement[]>([])
-const brands = ref<Brand[]>([])
 const channels = ref<Channel[]>([])
+const products = ref<Record<number, string>>({})
 const loading = ref(false)
 const generating = ref(false)
-const totals = reactive({ base: 0, brandNet: 0, channel: 0, platform: 0 })
+const totals = reactive({ base: 0, channel: 0, platform: 0 })
 
 // 默认结算上一个自然月（月初看上月账最常见）
-const filters = reactive({ month: prevMonthStr(), brandid: 0, channelid: '', status: -1 })
+const filters = reactive({ month: prevMonthStr(), channelid: '', status: -1 })
 
-const channelOptions = computed(() =>
-  filters.brandid ? channels.value.filter((ch) => ch.brandid === filters.brandid) : channels.value,
-)
+// 渠道商已是全局实体（brandid 恒为 0），不再按品牌商收窄
+const channelOptions = computed(() => channels.value)
 
 const summaryCards = computed(() => [
   { label: '结算基数（订单实付）', value: totals.base, cls: 'text-slate-800' },
-  { label: '品牌商实得', value: totals.brandNet, cls: 'text-emerald-600' },
   { label: '渠道商分成', value: totals.channel, cls: 'text-indigo-600' },
   { label: '平台留存', value: totals.platform, cls: 'text-slate-600' },
 ])
@@ -189,10 +182,11 @@ function fmtMoney(cents?: number) {
 function ratePct(rate?: number) {
   return ((Number(rate) || 0) / 100).toFixed(2) + '%'
 }
-function brandName(id?: number) {
-  if (!id) return '未归属品牌商'
-  const b = brands.value.find((x) => x.id === id)
-  return b ? b.brand : '品牌商#' + Number(id).toString(16).toUpperCase()
+// 产品名。结算行上存的是批次所属产品，仅用于展示。
+function productName(id?: number) {
+  const n = Number(id || 0)
+  if (!n) return '-'
+  return products.value[n] || ('产品#' + n.toString(16).toUpperCase())
 }
 function channelName(id?: string) {
   if (!id) return '未分配渠道'
@@ -207,33 +201,33 @@ function statusClass(s: number) { return STATUS_CLASS[s] ?? 'badge-ghost' }
 
 async function loadRefs() {
   try {
-    const [bd, cd] = await Promise.all([
-      webApi<{ brands: Brand[] }>('getbrands', {}),
+    const [cd, pd] = await Promise.all([
       webApi<{ channels: Channel[] }>('getchannels', { status: -1 }),
+      webApi<{ products: { id: number; devicename: string }[] }>('getproducts', {}),
     ])
-    brands.value = bd?.brands ?? []
     channels.value = cd?.channels ?? []
+    const m: Record<number, string> = {}
+    for (const p of pd?.products ?? []) m[p.id] = p.devicename
+    products.value = m
   } catch {
-    brands.value = []
     channels.value = []
+    products.value = {}
   }
 }
 
 async function loadData() {
   loading.value = true
   try {
-    if (!brands.value.length) await loadRefs()
+    if (!channels.value.length) await loadRefs()
     const d = await webApi<{
-      items: Settlement[]; total_base: number; total_brand_net: number; total_channel: number; total_platform: number
+      items: Settlement[]; total_base: number; total_channel: number; total_platform: number
     }>('getsettlements', {
       period: monthToPeriod(filters.month),
-      brandid: Number(filters.brandid) || 0,
       channelid: filters.channelid,
       status: Number(filters.status),
     })
     rows.value = d?.items ?? []
     totals.base = d?.total_base ?? 0
-    totals.brandNet = d?.total_brand_net ?? 0
     totals.channel = d?.total_channel ?? 0
     totals.platform = d?.total_platform ?? 0
   } catch (e: any) {
@@ -265,7 +259,8 @@ async function confirm(r: Settlement, status: number) {
   if (!window.confirm(`确定${actions[status]}这一行结算吗？`)) return
   try {
     await webApi('confirmsettlement', {
-      period: r.period, brandid: r.brandid, channelid: r.channelid, status, remark: r.remark || '',
+      // batchno 是结算行主键的一部分，不带的话服务端会定位到「无批次归属」那一行
+      period: r.period, channelid: r.channelid, batchno: r.batchno || '', status, remark: r.remark || '',
     })
     success(actions[status] + '成功')
     loadData()
@@ -275,11 +270,11 @@ async function confirm(r: Settlement, status: number) {
 }
 
 function exportCSV() {
-  const headers = ['结算月', '品牌商', '渠道商', '订单数', '结算基数(元)', '品牌比例', '品牌总提成(元)', '渠道比例', '渠道分成(元)', '品牌实得(元)', '平台留存(元)', '状态']
+  const headers = ['结算月', '渠道商', '批次号', '产品', '订单数', '结算基数(元)', '渠道比例', '渠道分成(元)', '平台留存(元)', '状态']
   const lines = rows.value.map((r) => [
-    fmtPeriod(r.period), brandName(r.brandid), channelName(r.channelid), r.order_count,
-    (r.base_amount / 100).toFixed(2), ratePct(r.brand_rate), (r.brand_gross / 100).toFixed(2),
-    ratePct(r.channel_rate), (r.channel_amount / 100).toFixed(2), (r.brand_net / 100).toFixed(2),
+    fmtPeriod(r.period), channelName(r.channelid), r.batchno || '无批次归属', productName(r.productid), r.order_count,
+    (r.base_amount / 100).toFixed(2),
+    ratePct(r.channel_rate), (r.channel_amount / 100).toFixed(2),
     (r.platform_amount / 100).toFixed(2), statusLabel(r.status),
   ])
   const content = [headers.join(',')].concat(lines.map((l) => l.join(','))).join('\n')
diff --git a/apps/admin/app/pages/users.vue b/apps/admin/app/pages/users.vue
index a7e9108b..10ea5790 100644
--- a/apps/admin/app/pages/users.vue
+++ b/apps/admin/app/pages/users.vue
@@ -1,59 +1,230 @@
 <template>
-  <div class="space-y-6">
-    <!-- ========== 查询条件：应用 → 区域 → UID ========== -->
-    <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-4">
-      <div class="flex items-end gap-3 flex-wrap">
-        <div class="form-control">
-          <label class="label py-1"><span class="label-text text-xs">应用</span></label>
-          <select v-model="qApp" class="select select-bordered select-sm" style="min-width:180px;" @change="onAppChange">
-            <option v-if="!appNames.length" value="">无可用应用</option>
-            <option v-for="n in appNames" :key="n" :value="n">{{ n }}</option>
-          </select>
+  <div class="space-y-5">
+    <!-- ========== 列表视图 ========== -->
+    <div v-show="view === 'list'" class="space-y-5">
+      <!-- 查询条件：应用 → 区域 是硬前提（用户住在所选应用的业务库里），其余是过滤 -->
+      <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-4">
+        <div class="flex items-end gap-3 flex-wrap">
+          <div class="form-control">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">应用 *</span></label>
+            <select v-model="qApp" class="select select-bordered select-sm" style="min-width:180px;" @change="onAppChange">
+              <option v-if="!appNames.length" value="">无可用应用</option>
+              <option v-for="n in appNames" :key="n" :value="n">{{ n }}</option>
+            </select>
+          </div>
+          <div class="form-control">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">区域 *</span></label>
+            <select v-model="qRegion" class="select select-bordered select-sm" style="min-width:130px;" @change="reload">
+              <option v-if="!regionItems.length" value="">无可用区域</option>
+              <option v-for="a in regionItems" :key="a.id" :value="a.id">{{ regionLabel(a.region) }}</option>
+            </select>
+          </div>
+          <div class="form-control flex-1" style="min-width:220px;">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">关键字</span></label>
+            <input
+              v-model="q.keyword" type="text" class="input input-bordered input-sm w-full"
+              placeholder="UID(精确) / 手机号 / 邮箱 / 用户名 / 登录账号 / 设备ID" @keydown.enter.prevent="reload" />
+          </div>
+          <div class="form-control">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">状态</span></label>
+            <select v-model.number="q.state" class="select select-bordered select-sm w-28" @change="reload">
+              <option :value="-1">全部</option>
+              <option :value="0">正常</option>
+              <option :value="1">已禁用</option>
+              <option :value="2">已注销</option>
+            </select>
+          </div>
+          <div class="form-control">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">会员</span></label>
+            <select v-model.number="q.vip" class="select select-bordered select-sm w-28" @change="reload">
+              <option :value="-1">全部</option>
+              <option :value="1">会员中</option>
+              <option :value="0">非会员</option>
+            </select>
+          </div>
+          <div class="form-control">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">实名</span></label>
+            <select v-model.number="q.idverified" class="select select-bordered select-sm w-28" @change="reload">
+              <option :value="-1">全部</option>
+              <option :value="1">已实名</option>
+              <option :value="0">未实名</option>
+            </select>
+          </div>
+          <div class="form-control">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">注册起</span></label>
+            <input v-model="q.startDate" type="date" class="input input-bordered input-sm" @change="reload" />
+          </div>
+          <div class="form-control">
+            <label class="label py-1"><span class="label-text text-xs text-slate-500">注册止</span></label>
+            <input v-model="q.endDate" type="date" class="input input-bordered input-sm" @change="reload" />
+          </div>
+          <button class="btn btn-primary btn-sm text-white" @click="reload">查询</button>
+          <button class="btn btn-ghost btn-sm" @click="resetFilters">重置</button>
+        </div>
+      </div>
+
+      <!-- 结果 -->
+      <div class="bg-white rounded-xl shadow-sm border border-slate-100">
+        <div class="flex items-center justify-between px-5 py-3 border-b border-slate-100">
+          <h3 class="text-sm font-semibold text-slate-700">
+            用户列表<span class="text-xs text-slate-400 font-normal ml-2">按注册时间倒序，点行查看详情</span>
+          </h3>
+          <div class="flex items-center gap-2">
+            <span class="text-xs text-slate-500">共 {{ total }} 人</span>
+            <select v-model.number="q.pageSize" class="select select-bordered select-xs" @change="reload">
+              <option :value="20">20/页</option>
+              <option :value="50">50/页</option>
+              <option :value="100">100/页</option>
+              <option :value="200">200/页</option>
+            </select>
+          </div>
         </div>
-        <div class="form-control">
-          <label class="label py-1"><span class="label-text text-xs">区域</span></label>
-          <select v-model="qRegion" class="select select-bordered select-sm" style="min-width:140px;">
-            <option v-if="!regionItems.length" value="">无可用区域</option>
-            <option v-for="a in regionItems" :key="a.id" :value="a.id">{{ regionLabel(a.region) }}</option>
-          </select>
+        <div class="overflow-x-auto">
+          <table class="table table-zebra text-sm">
+            <thead>
+              <tr>
+                <th>用户</th><th>联系方式</th><th>状态</th><th>会员</th>
+                <th class="text-right">翻译</th><th class="text-right">会议</th><th class="text-right">AI</th>
+                <th>实名</th><th>注册时间</th><th>最后登录</th><th>操作</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-if="loading"><td colspan="11" class="text-center py-10"><span class="loading loading-spinner loading-sm"></span></td></tr>
+              <tr v-else-if="!qRegion"><td colspan="11" class="text-center text-slate-400 py-10">请先选择应用与区域</td></tr>
+              <tr v-else-if="listError"><td colspan="11" class="text-center text-red-400 py-10">{{ listError }}</td></tr>
+              <tr v-else-if="!rows.length"><td colspan="11" class="text-center text-slate-400 py-10">没有符合条件的用户</td></tr>
+              <tr v-for="u in rows" v-else :key="u.uid" class="hover cursor-pointer" @click="openDetail(u)">
+                <td>
+                  <div class="flex items-center gap-2">
+                    <img v-if="u.avatar" :src="u.avatar" class="w-8 h-8 rounded-full object-cover border border-slate-100" />
+                    <div v-else class="w-8 h-8 rounded-full bg-indigo-100 text-indigo-600 flex items-center justify-center text-xs font-bold shrink-0">
+                      {{ initialOf(u) }}
+                    </div>
+                    <div class="min-w-0">
+                      <div class="font-medium truncate max-w-[140px]">{{ u.name || '(未设置)' }}</div>
+                      <div class="text-[11px] text-slate-400 font-mono truncate max-w-[140px]" :title="u.uid">{{ u.uid }}</div>
+                    </div>
+                  </div>
+                </td>
+                <td class="text-xs text-slate-500">
+                  <div v-if="u.phone">{{ u.phone }}</div>
+                  <div v-if="u.mail" class="truncate max-w-[160px]" :title="u.mail">{{ u.mail }}</div>
+                  <div v-if="u.account" class="text-slate-400">{{ u.account }}</div>
+                  <span v-if="!u.phone && !u.mail && !u.account" class="text-slate-300">-</span>
+                </td>
+                <td><span class="badge badge-sm" :class="stateClass(u.State)">{{ stateLabel(u.State) }}</span></td>
+                <td class="text-xs">
+                  <span v-if="isVip(u)" class="badge badge-sm badge-primary badge-outline">VIP {{ u.viplv || 0 }}</span>
+                  <span v-else class="text-slate-300">-</span>
+                  <div v-if="u.vipexptime" class="text-[11px] text-slate-400 mt-0.5">{{ fmtDate(u.vipexptime) }}</div>
+                </td>
+                <td class="text-right text-xs">{{ fmtMin(u.tradeintegral) }}</td>
+                <td class="text-right text-xs">{{ fmtMin(u.meetintegral) }}</td>
+                <td class="text-right text-xs">{{ u.aichatintegral || 0 }}</td>
+                <td><span class="badge badge-sm" :class="u.idverified ? 'badge-success badge-outline' : 'badge-ghost'">{{ u.idverified ? '已实名' : '未实名' }}</span></td>
+                <td class="text-xs text-slate-500 whitespace-nowrap">{{ fmtTs(u.createtime) }}</td>
+                <td class="text-xs text-slate-500 whitespace-nowrap">{{ fmtTs(u.lastsgintime) }}</td>
+                <td><button class="btn btn-ghost btn-xs text-indigo-600" @click.stop="openDetail(u)">详情</button></td>
+              </tr>
+            </tbody>
+          </table>
         </div>
-        <div class="form-control">
-          <label class="label py-1"><span class="label-text text-xs">用户UID</span></label>
-          <input v-model="qUid" type="text" class="input input-bordered input-sm" style="min-width:240px;" placeholder="输入用户 UID" @keydown.enter.prevent="searchUser" />
+        <div class="flex items-center justify-between px-5 py-3 border-t border-slate-100">
+          <span class="text-xs text-slate-500">{{ pageInfo }}</span>
+          <div class="flex items-center gap-2">
+            <button class="btn btn-ghost btn-xs" :disabled="q.page <= 0 || loading" @click="changePage(-1)">上一页</button>
+            <span class="text-xs text-slate-500">第 {{ q.page + 1 }} / {{ totalPages }} 页</span>
+            <button class="btn btn-ghost btn-xs" :disabled="q.page + 1 >= totalPages || loading" @click="changePage(1)">下一页</button>
+          </div>
         </div>
-        <button class="btn btn-primary btn-sm text-white" @click="searchUser">搜索</button>
       </div>
-      <p class="text-xs text-slate-400 mt-2">选择应用与区域后输入 UID，直接查询该部署业务库中的用户信息。</p>
     </div>
 
-    <!-- ========== 结果 ========== -->
-    <div v-if="!user" class="bg-white rounded-xl shadow-sm border border-slate-100 p-12 text-center text-slate-400">
-      {{ emptyHint }}
-    </div>
-    <div v-else class="space-y-5">
-      <!-- 头部 -->
-      <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-5 flex items-center gap-4">
-        <img v-if="user.avatar" :src="user.avatar" class="w-14 h-14 rounded-full object-cover border border-slate-100" />
-        <div v-else class="w-14 h-14 rounded-full bg-indigo-100 text-indigo-600 flex items-center justify-center text-xl font-bold">
-          {{ avatarInitial }}
-        </div>
-        <div>
-          <div class="text-lg font-semibold text-slate-800">{{ dispVal(user.name) }}</div>
-          <div class="text-xs text-slate-400 font-mono mt-0.5">{{ dispVal(user.uid) }}</div>
+    <!-- ========== 详情视图 ========== -->
+    <div v-show="view === 'detail'" class="space-y-5">
+      <div class="flex items-center gap-3">
+        <button class="btn btn-ghost btn-sm" @click="view = 'list'">&larr; 返回列表</button>
+        <h2 class="text-lg font-semibold text-slate-800">用户详情</h2>
+      </div>
+
+      <div v-if="user" class="space-y-5">
+        <!-- 头部 -->
+        <div class="bg-white rounded-xl shadow-sm border border-slate-100 p-5 flex items-center gap-4 flex-wrap">
+          <img v-if="user.avatar" :src="user.avatar" class="w-14 h-14 rounded-full object-cover border border-slate-100" />
+          <div v-else class="w-14 h-14 rounded-full bg-indigo-100 text-indigo-600 flex items-center justify-center text-xl font-bold">
+            {{ initialOf(user) }}
+          </div>
+          <div>
+            <div class="text-lg font-semibold text-slate-800">{{ dispVal(user.name) }}</div>
+            <div class="text-xs text-slate-400 font-mono mt-0.5">{{ dispVal(user.uid) }}</div>
+          </div>
+          <div class="ml-auto flex items-center gap-2 flex-wrap">
+            <span class="badge badge-sm" :class="stateClass(user.State)">{{ stateLabel(user.State) }}</span>
+            <span class="badge badge-primary badge-outline">VIP {{ user.viplv || 0 }}</span>
+            <button v-if="giftAllowed" class="btn btn-success btn-sm text-white" @click="openGift">赠送资源点</button>
+          </div>
         </div>
-        <div class="ml-auto flex items-center gap-3">
-          <span class="badge badge-primary badge-outline">VIP {{ user.viplv || 0 }}</span>
-          <button v-if="giftAllowed" class="btn btn-success btn-sm text-white" @click="openGift">赠送资源点</button>
+
+        <!-- 设置参数：仅超管/管理员。代理要发资源走「赠送资源点」，那条路会扣自己的余额 -->
+        <div v-if="canEdit" class="bg-white rounded-xl shadow-sm border border-slate-100 overflow-hidden">
+          <div class="px-5 py-3 border-b border-slate-50 flex items-center justify-between">
+            <span class="text-sm font-semibold text-slate-700">设置参数</span>
+            <span class="text-xs text-slate-400">只提交你改过的项；积分填的是<b>余额绝对值</b>，不是增量</span>
+          </div>
+          <div class="px-5 py-4">
+            <div class="grid grid-cols-2 md:grid-cols-3 gap-4">
+              <div class="form-control">
+                <label class="label py-1"><span class="label-text text-xs">用户名</span></label>
+                <input v-model="edit.name" type="text" class="input input-bordered input-sm" />
+              </div>
+              <div class="form-control">
+                <label class="label py-1"><span class="label-text text-xs">账号状态</span></label>
+                <select v-model.number="edit.state" class="select select-bordered select-sm">
+                  <option :value="0">正常</option>
+                  <option :value="1">禁用</option>
+                  <option :value="2">已注销</option>
+                </select>
+              </div>
+              <div class="form-control">
+                <label class="label py-1"><span class="label-text text-xs">VIP 等级</span></label>
+                <input v-model.number="edit.viplv" type="number" min="0" class="input input-bordered input-sm" />
+              </div>
+              <div class="form-control">
+                <label class="label py-1"><span class="label-text text-xs">VIP 到期</span></label>
+                <input v-model="edit.vipexpDate" type="datetime-local" class="input input-bordered input-sm" />
+                <span class="label-text-alt text-slate-400 mt-1">清空 = 不设到期（等于没有会员）</span>
+              </div>
+              <div class="form-control">
+                <label class="label py-1"><span class="label-text text-xs">翻译余额（分钟）</span></label>
+                <input v-model.number="edit.trademin" type="number" min="0" class="input input-bordered input-sm" />
+              </div>
+              <div class="form-control">
+                <label class="label py-1"><span class="label-text text-xs">会议余额（分钟）</span></label>
+                <input v-model.number="edit.meetmin" type="number" min="0" class="input input-bordered input-sm" />
+              </div>
+              <div class="form-control">
+                <label class="label py-1"><span class="label-text text-xs">AI 余额（次）</span></label>
+                <input v-model.number="edit.aichat" type="number" min="0" class="input input-bordered input-sm" />
+              </div>
+            </div>
+            <div class="flex items-center gap-2 mt-4">
+              <button class="btn btn-primary btn-sm text-white" :disabled="saving || !dirtyCount" @click="saveEdit">
+                <span v-if="saving" class="loading loading-spinner loading-xs"></span>
+                保存{{ dirtyCount ? `（${dirtyCount} 项改动）` : '' }}
+              </button>
+              <button class="btn btn-ghost btn-sm" :disabled="!dirtyCount" @click="resetEdit">撤销改动</button>
+            </div>
+          </div>
         </div>
-      </div>
 
-      <!-- 分组卡片 -->
-      <div v-for="s in sections" :key="s.title" class="bg-white rounded-xl shadow-sm border border-slate-100 overflow-hidden">
-        <div class="px-5 py-3 border-b border-slate-50 text-sm font-semibold text-slate-700">{{ s.title }}</div>
-        <div class="px-5 py-3 grid grid-cols-1 md:grid-cols-2 gap-x-8">
-          <div v-for="r in s.rows" :key="r[0]" class="flex justify-between gap-3 py-1.5 border-b border-slate-50">
-            <span class="text-xs text-slate-400 shrink-0">{{ r[1] }}</span>
-            <span class="text-sm text-slate-700 break-all text-right">{{ cellValue(user, r) }}</span>
+        <!-- 只读分组卡片 -->
+        <div v-for="s in sections" :key="s.title" class="bg-white rounded-xl shadow-sm border border-slate-100 overflow-hidden">
+          <div class="px-5 py-3 border-b border-slate-50 text-sm font-semibold text-slate-700">{{ s.title }}</div>
+          <div class="px-5 py-3 grid grid-cols-1 md:grid-cols-2 gap-x-8">
+            <div v-for="r in s.rows" :key="r[0]" class="flex justify-between gap-3 py-1.5 border-b border-slate-50">
+              <span class="text-xs text-slate-400 shrink-0">{{ r[1] }}</span>
+              <span class="text-sm text-slate-700 break-all text-right">{{ cellValue(user, r) }}</span>
+            </div>
           </div>
         </div>
       </div>
@@ -63,7 +234,10 @@
     <dialog ref="giftModal" class="modal">
       <div class="modal-box max-w-md">
         <h3 class="font-bold text-lg mb-1 text-slate-800">赠送资源点</h3>
-        <p class="text-xs text-slate-400 mb-4">目标用户 UID：<span class="font-mono text-slate-600">{{ lastUid }}</span>。代理账号将从自己的资源点余额中扣减，超管/管理员无消耗。</p>
+        <p class="text-xs text-slate-400 mb-4">
+          目标用户 UID：<span class="font-mono text-slate-600">{{ lastUid }}</span>。
+          这里是<b>增量赠送</b>（在现有余额上累加）；代理账号从自己的资源点余额中扣减，超管/管理员无消耗。
+        </p>
         <div class="grid grid-cols-3 gap-3">
           <div class="form-control">
             <label class="label py-1"><span class="label-text text-sm">VIP天数</span></label>
@@ -104,6 +278,8 @@ interface AppItem {
   region: string
   enabled?: boolean
 }
+// 列表行与详情是同一个 pb.DBUser，详情多几个 idverify_* 附加字段，故统一用宽松 map
+type UserRow = Record<string, any>
 
 type SectionRow = [string, string, ('ts' | 'bool' | 'gender')?]
 interface Section {
@@ -115,23 +291,43 @@ const { webApi, consoleApi } = useApi()
 const { success, error, warn } = useToast()
 const auth = useAuthStore()
 
+const view = ref<'list' | 'detail'>('list')
 
-// 启用的注册项 [{id,name,region,...}]
+// ---- 应用/区域（硬前提：用户住在所选应用的业务库里）----
 const apps = ref<AppItem[]>([])
 const qApp = ref('')
 const qRegion = ref<number | ''>('')
-const qUid = ref('')
 
-const user = ref<Record<string, any> | null>(null)
-const emptyHint = ref('请输入查询条件后点击「搜索」')
+// ---- 列表 ----
+const rows = ref<UserRow[]>([])
+const total = ref(0)
+const loading = ref(false)
+const listError = ref('')
+// state / vip / idverified 的「不限」必须是 -1：0 是合法取值（正常 / 非会员 / 未实名），
+// 拿零值当不限会让默认查询悄悄只返回一部分人。
+const q = reactive({ keyword: '', state: -1, vip: -1, idverified: -1, startDate: '', endDate: '', page: 0, pageSize: 20 })
 
-// 最近一次成功查询的应用/用户，赠送时复用
+const totalPages = computed(() => Math.max(1, Math.ceil(total.value / q.pageSize)))
+const pageInfo = computed(() => {
+  if (!total.value) return '-'
+  const from = q.page * q.pageSize + 1
+  return `第 ${from} - ${Math.min(from + rows.value.length - 1, total.value)} 条 / 共 ${total.value} 条`
+})
+
+// ---- 详情 ----
+const user = ref<UserRow | null>(null)
 const lastAppId = ref<number | ''>('')
 const lastUid = ref('')
 
+// 修改用户参数仅超管/管理员（后端同样把关）；代理只能走「赠送资源点」那条扣自己余额的路。
+const canEdit = computed(() => auth.isAdmin)
 // 超管/管理员/代理可赠送（运营不可）
 const giftAllowed = computed(() => [1, 2, 3].includes(auth.identity))
 
+const saving = ref(false)
+const edit = reactive({ name: '', state: 0, viplv: 0, vipexpDate: '', trademin: 0, meetmin: 0, aichat: 0 })
+const editBase = reactive({ name: '', state: 0, viplv: 0, vipexpDate: '', trademin: 0, meetmin: 0, aichat: 0 })
+
 const giftModal = ref<HTMLDialogElement | null>(null)
 const gift = reactive({ vipday: 0, trademin: 0, meetmin: 0 })
 
@@ -144,13 +340,13 @@ const appNames = computed(() => {
   })
   return names
 })
-
 // 二级：当前应用下的部署（按国内/海外展示）
 const regionItems = computed(() => apps.value.filter((a) => (a.app_name || a.name) === qApp.value))
 
 function onAppChange() {
   const items = regionItems.value
   qRegion.value = items.length ? items[0].id : ''
+  reload()
 }
 
 // ---- 展示工具 ----
@@ -158,31 +354,69 @@ function fmtTs(ts: any) {
   if (!ts) return '-'
   return new Date(ts * 1000).toLocaleString()
 }
-function fmtBool(v: any) {
-  return v ? '是' : '否'
+function fmtDate(ts: any) {
+  if (!ts) return '-'
+  const d = new Date(ts * 1000)
+  const p = (n: number) => ('0' + n).slice(-2)
+  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}`
+}
+function fmtBool(v: any) { return v ? '是' : '否' }
+function fmtGender(g: any) { return g === 1 ? '男' : (g === 2 ? '女' : '未知') }
+function dispVal(v: any) { return (v === undefined || v === null || v === '') ? '-' : v }
+// 翻译/会议积分按【秒】存储，展示成分钟；AI 积分是次数，不参与换算
+function fmtMin(sec: any) {
+  const n = Number(sec) || 0
+  return n ? Math.floor(n / 60) + ' 分' : '0'
+}
+function initialOf(u: UserRow) {
+  return String(u?.name || u?.uid || '?').charAt(0).toUpperCase()
 }
-function fmtGender(g: any) {
-  return g === 1 ? '男' : (g === 2 ? '女' : '未知')
+const STATE_LABELS: Record<number, string> = { 0: '正常', 1: '已禁用', 2: '已注销' }
+const STATE_CLASS: Record<number, string> = { 0: 'badge-success badge-outline', 1: 'badge-error', 2: 'badge-ghost' }
+function stateLabel(s: any) { return STATE_LABELS[Number(s) || 0] ?? String(s) }
+function stateClass(s: any) { return STATE_CLASS[Number(s) || 0] ?? 'badge-ghost' }
+// 会员按到期时间判，不按 viplv：等级过期后并不会被清零，拿它判会把过期用户也算成会员
+function isVip(u: UserRow) { return Number(u.vipexptime || 0) * 1000 > Date.now() }
+
+// 日期输入 → unix 秒。结束日按「当天 24:00」算，否则选同一天会查不到当天注册的人
+function dateToUnix(s: string, endOfDay: boolean): number {
+  if (!s) return 0
+  const d = new Date(s + 'T00:00:00')
+  if (isNaN(d.getTime())) return 0
+  return Math.floor(d.getTime() / 1000) + (endOfDay ? 86400 : 0)
 }
-function dispVal(v: any) {
-  return (v === undefined || v === null || v === '') ? '-' : v
+// <input type="datetime-local"> ↔ unix 秒
+function unixToLocalInput(ts: any): string {
+  const n = Number(ts) || 0
+  if (!n) return ''
+  const d = new Date(n * 1000)
+  const p = (x: number) => ('0' + x).slice(-2)
+  return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())}T${p(d.getHours())}:${p(d.getMinutes())}`
+}
+function localInputToUnix(s: string): number {
+  if (!s) return 0
+  const d = new Date(s)
+  return isNaN(d.getTime()) ? 0 : Math.floor(d.getTime() / 1000)
 }
 
 const sections: Section[] = [
   { title: '基本信息', rows: [
     ['uid', 'UID'], ['name', '用户名'], ['account', '登录账号'], ['mail', '邮箱'], ['phone', '手机号'],
-    ['gender', '性别', 'gender'], ['language', '语言'], ['version', '版本'], ['channel', '渠道'], ['State', '状态'],
+    ['gender', '性别', 'gender'], ['language', '语言'], ['version', '版本'], ['channel', '渠道'],
     ['country_code', '国家码'], ['continent_code', '大洲码'], ['servicetag', '服务区'], ['phonemodel', '手机型号'], ['phonemac', '设备ID'],
   ] },
   { title: '第三方登录', rows: [
     ['wxopenid', '微信 openid'], ['googleopenid', 'Google openid'], ['facebookopenid', 'Facebook openid'], ['appleopenid', 'Apple openid'],
   ] },
+  { title: '设备与归属', rows: [
+    ['lastbindproductid', '最后绑定产品ID'], ['lastbindchannelid', '最后绑定渠道商'],
+    ['isactivatecode', '已领公码', 'bool'], ['isgiveaway', '已领过赠送', 'bool'],
+  ] },
   { title: '会员与积分', rows: [
     ['viplv', 'VIP等级'], ['vipexptime', 'VIP到期', 'ts'],
-    ['aichatintegral', 'AI积分'], ['aichattotalintegral', 'AI累计积分'],
-    ['tradeintegral', '翻译积分'], ['tradetotalintegral', '翻译累计积分'],
-    ['meetintegral', '会议积分'], ['meettotalintegral', '会议累计积分'],
-    ['lastbindproductid', '最后绑定产品ID'], ['isactivatecode', '已领激活码', 'bool'], ['isgiveaway', '首次绑定赠送', 'bool'],
+    ['aichatintegral', 'AI积分(次)'], ['aichattotalintegral', 'AI累计'],
+    ['tradeintegral', '翻译积分(秒)'], ['tradetotalintegral', '翻译累计(秒)'],
+    ['meetintegral', '会议积分(秒)'], ['meettotalintegral', '会议累计(秒)'],
   ] },
   { title: '实名认证', rows: [
     ['idverified', '已实名', 'bool'], ['idverifiedtime', '实名时间', 'ts'],
@@ -194,7 +428,7 @@ const sections: Section[] = [
   ] },
 ]
 
-function cellValue(u: Record<string, any>, row: SectionRow) {
+function cellValue(u: UserRow, row: SectionRow) {
   const t = row[2]
   const v = u[row[0]]
   if (t === 'ts') return fmtTs(v)
@@ -203,47 +437,149 @@ function cellValue(u: Record<string, any>, row: SectionRow) {
   return dispVal(v)
 }
 
-const avatarInitial = computed(() => {
-  const u = user.value
-  if (!u) return '?'
-  return String(u.name || u.uid || '?').charAt(0).toUpperCase()
-})
-
+// ---- 列表加载 ----
 // 选定本页应用 → 同步到全局 currentAppId，使 webApi 自动带上对应 X-App-Id
-async function searchUser() {
-  if (!qApp.value) { warn('请选择应用'); return }
-  if (!qRegion.value) { warn('请选择区域'); return }
-  const uid = qUid.value.trim()
-  if (!uid) { warn('请输入用户UID'); return }
-
+async function loadUsers() {
+  if (!qApp.value || !qRegion.value) {
+    rows.value = []
+    total.value = 0
+    return
+  }
   const appId = Number(qRegion.value)
   lastAppId.value = appId
-  lastUid.value = uid
-  // 带本页选中的 X-App-Id（webApi 取 auth.currentAppId）
   auth.setCurrentApp(appId)
+  loading.value = true
+  listError.value = ''
+  try {
+    const d = await webApi<{ users: UserRow[]; total: number }>('getusers', {
+      keyword: q.keyword.trim(),
+      state: Number(q.state),
+      vip: Number(q.vip),
+      idverified: Number(q.idverified),
+      start: dateToUnix(q.startDate, false),
+      end: dateToUnix(q.endDate, true),
+      page: q.page,
+      page_size: q.pageSize,
+    })
+    rows.value = d?.users ?? []
+    total.value = d?.total ?? 0
+  } catch (e: any) {
+    listError.value = e?.message || '查询失败'
+    rows.value = []
+    total.value = 0
+  } finally {
+    loading.value = false
+  }
+}
+// 改了任何筛选项都要回到第一页——留在第 5 页上换条件，多半会看到一片空白
+function reload() {
+  q.page = 0
+  loadUsers()
+}
+function changePage(d: number) {
+  const next = q.page + d
+  if (next < 0 || next >= totalPages.value) return
+  q.page = next
+  loadUsers()
+}
+function resetFilters() {
+  q.keyword = ''
+  q.state = -1
+  q.vip = -1
+  q.idverified = -1
+  q.startDate = ''
+  q.endDate = ''
+  reload()
+}
+
+// ---- 详情 ----
+// 列表行已经是整行 user，但详情要多出 idverify_* 那几项（getuserinfo 才附带），所以再查一次。
+async function openDetail(row: UserRow) {
+  lastUid.value = String(row.uid || '')
+  user.value = row
+  fillEdit(row)
+  view.value = 'detail'
+  if (!lastUid.value) return
+  try {
+    auth.setCurrentApp(Number(lastAppId.value))
+    const d = await webApi<UserRow>('getuserinfo', { uid: lastUid.value })
+    if (d) {
+      user.value = d
+      fillEdit(d)
+    }
+  } catch (e: any) {
+    // 详情拉不到不清空：列表那一行的数据仍然是对的，够看大部分字段
+    warn(e?.message || '获取实名等附加信息失败，已显示列表数据')
+  }
+}
+
+function fillEdit(u: UserRow) {
+  const snap = {
+    name: String(u.name || ''),
+    state: Number(u.State || 0),
+    viplv: Number(u.viplv || 0),
+    vipexpDate: unixToLocalInput(u.vipexptime),
+    trademin: Math.floor((Number(u.tradeintegral) || 0) / 60),
+    meetmin: Math.floor((Number(u.meetintegral) || 0) / 60),
+    aichat: Number(u.aichatintegral || 0),
+  }
+  Object.assign(edit, snap)
+  Object.assign(editBase, snap)
+}
+function resetEdit() {
+  Object.assign(edit, editBase)
+}
+// 只提交改过的项：整包提交会把并发中变化的余额一起覆盖成后台读到的旧值
+const dirtyCount = computed(() =>
+  (Object.keys(editBase) as (keyof typeof editBase)[]).filter((k) => edit[k] !== editBase[k]).length,
+)
 
+async function saveEdit() {
+  if (!lastUid.value || !dirtyCount.value) return
+  const payload: Record<string, unknown> = { uid: lastUid.value }
+  if (edit.name !== editBase.name) payload.name = edit.name.trim()
+  if (edit.state !== editBase.state) payload.state = Number(edit.state)
+  if (edit.viplv !== editBase.viplv) payload.viplv = Number(edit.viplv)
+  if (edit.vipexpDate !== editBase.vipexpDate) payload.vipexptime = localInputToUnix(edit.vipexpDate)
+  // 分钟 → 秒：库里存的是秒，表单填的是分钟
+  if (edit.trademin !== editBase.trademin) payload.tradeintegral = Math.max(0, Number(edit.trademin) || 0) * 60
+  if (edit.meetmin !== editBase.meetmin) payload.meetintegral = Math.max(0, Number(edit.meetmin) || 0) * 60
+  if (edit.aichat !== editBase.aichat) payload.aichatintegral = Math.max(0, Number(edit.aichat) || 0)
+  saving.value = true
   try {
-    const data = await webApi<Record<string, any>>('getuserinfo', { uid })
-    user.value = data || {}
+    auth.setCurrentApp(Number(lastAppId.value))
+    await webApi('updateuser', payload)
+    success('已保存')
+    await refreshCurrent()
   } catch (e: any) {
-    error(e?.message || '查询失败')
-    user.value = null
-    emptyHint.value = e?.message || '未找到该用户'
+    error(e?.message || '保存失败')
+  } finally {
+    saving.value = false
   }
 }
 
+// 保存/赠送之后重新拉详情与列表，避免界面上还是改之前的数
+async function refreshCurrent() {
+  try {
+    auth.setCurrentApp(Number(lastAppId.value))
+    const d = await webApi<UserRow>('getuserinfo', { uid: lastUid.value })
+    if (d) {
+      user.value = d
+      fillEdit(d)
+    }
+  } catch { /* 详情刷新失败不影响已保存的结果 */ }
+  loadUsers()
+}
+
 // ---- 赠送资源点 ----
 function openGift() {
-  if (!lastUid.value) { warn('请先查询用户'); return }
+  if (!lastUid.value) { warn('请先选择用户'); return }
   gift.vipday = 0
   gift.trademin = 0
   gift.meetmin = 0
   giftModal.value?.showModal()
 }
-
-function closeGift() {
-  giftModal.value?.close()
-}
+function closeGift() { giftModal.value?.close() }
 
 async function submitGift() {
   const vipday = Number(gift.vipday) || 0
@@ -251,14 +587,13 @@ async function submitGift() {
   const meetmin = Number(gift.meetmin) || 0
   if (vipday < 0 || trademin < 0 || meetmin < 0) { warn('数量不能为负'); return }
   if (!vipday && !trademin && !meetmin) { warn('请至少填写一项'); return }
-  if (!lastAppId.value || !lastUid.value) { warn('请先查询用户'); return }
-
+  if (!lastAppId.value || !lastUid.value) { warn('请先选择用户'); return }
   auth.setCurrentApp(Number(lastAppId.value))
   try {
     await webApi('giftuserresource', { uid: lastUid.value, vipday, trademin, meetmin })
     success('赠送成功')
     giftModal.value?.close()
-    searchUser() // 刷新用户资源显示
+    await refreshCurrent()
   } catch (e: any) {
     error(e?.message || '赠送失败')
   }
@@ -273,7 +608,8 @@ function buildAppSelect() {
     return
   }
   qApp.value = names[0]
-  onAppChange()
+  const items = regionItems.value
+  qRegion.value = items.length ? items[0].id : ''
 }
 
 // ---- 初始化：加载启用的注册应用 ----
@@ -291,6 +627,7 @@ async function loadApps() {
       }))
     }
     buildAppSelect()
+    loadUsers()
     return
   }
   try {
@@ -300,6 +637,7 @@ async function loadApps() {
     apps.value = []
   }
   buildAppSelect()
+  loadUsers()
 }
 
 onMounted(loadApps)
diff --git a/apps/admin/app/utils/chipvendors.ts b/apps/admin/app/utils/chipvendors.ts
index 90c16599..2159739c 100644
--- a/apps/admin/app/utils/chipvendors.ts
+++ b/apps/admin/app/utils/chipvendors.ts
@@ -1,23 +1,79 @@
-// 芯片方案厂商分组，对应后端 DBSolutionProvider.vendor（proto 的 SolutionVendor 枚举）。
-// 一个芯片厂商下可能有多套方案，每套方案是一条方案商记录，靠这个分组归拢。
-// 新增芯片厂商要三处同步补同一个数值：
-//   apps/proto/db.proto 的 SolutionVendor
-//   apps/services/modules/console/api_device.go 的 chipVendorNames
-//   本文件的 CHIP_VENDORS
+// 芯片厂商，对应后端 chip_vendor 表（原 proto 的 SolutionVendor 枚举，2026-09-01 转表）。
+// 一个芯片厂商下可能有多套方案，每套方案是一条方案商记录，靠 DBSolutionProvider.vendor 归拢。
+//
+// 以前这里是写死的四条，加一家厂商要同步改三处代码（db.proto 枚举 + 后端 chipVendorNames +
+// 本文件）再发版；现在改成拉「芯片管理」页维护的表，代码不用动。
+//
+// 缓存是模块级单例：方案商页、芯片管理页共用同一份，避免每个页面各拉一次。
+// 增删改后调用 invalidateChipVendors() 让下次 load 重新拉。
+import { ref } from 'vue'
+
 export interface ChipVendor {
-  value: number
-  label: string
+  id: number // 即 CID：手工指定的十六进制编码（如 0xABF4=恒玄），也是 solution_provider.vendor 指向的值
+  name: string
+  enabled?: boolean
+  sort?: number
+  createtime?: number
+  updatetime?: number
+}
+
+/** 全部芯片厂商（含已停用的）。停用项仍要留在这里，否则存量方案商的分组会显示成「厂商#N」。 */
+export const chipVendors = ref<ChipVendor[]>([])
+
+let loaded = false
+let inflight: Promise<void> | null = null
+
+/**
+ * 拉取芯片厂商列表（模块级缓存，重复调用只发一次请求）。
+ * webApi 由调用方传入——util 不是组件上下文，直接 useApi() 在某些场景下取不到 Nuxt 实例。
+ */
+export async function loadChipVendors(
+  webApi: <T>(method: string, data?: unknown) => Promise<T>,
+  force = false,
+): Promise<void> {
+  if (loaded && !force) return
+  // 并发去重：同一帧里多个组件同时 onMounted 拉取，只发一个请求。
+  if (inflight && !force) return inflight
+  inflight = (async () => {
+    try {
+      const d = await webApi<{ vendors: ChipVendor[] }>('getchipvendors', {})
+      chipVendors.value = d?.vendors ?? []
+      loaded = true
+    } catch {
+      // 拉不到就保持空列表：下拉为空比显示一份可能过期的硬编码值更诚实，
+      // 也避免运营在后台删了某厂商后前端还能选到它。
+      chipVendors.value = []
+    } finally {
+      inflight = null
+    }
+  })()
+  return inflight
+}
+
+/** 增删改之后调用，让下次 loadChipVendors 重新拉。 */
+export function invalidateChipVendors() {
+  loaded = false
 }
 
-export const CHIP_VENDORS: ChipVendor[] = [
-  { value: 1, label: '杰里' },
-  { value: 2, label: '蓝汛' },
-  { value: 3, label: '恒玄' },
-  { value: 4, label: '博通' },
-]
+/** 可选项：只列启用中的，用于「新建/编辑方案商」的下拉。 */
+export function enabledChipVendors(): ChipVendor[] {
+  return chipVendors.value.filter((v) => v.enabled !== false)
+}
 
+/**
+ * id → 厂商名。查不到时回退成「厂商#N」而不是空白——存量方案商指着一个已删除的厂商时，
+ * 显示成 `厂商#2` 至少能看出是数据问题，空白会让人以为没填。
+ */
 export function chipVendorName(v?: number | null): string {
   const n = Number(v || 0)
   if (!n) return '未分组'
-  return CHIP_VENDORS.find((x) => x.value === n)?.label ?? ('厂商#' + n)
+  return chipVendors.value.find((x) => x.id === n)?.name ?? ('厂商#' + n)
+}
+
+/** 「名称 (0xCID)」，下拉里用——同名难辨时靠 CID 区分，也让人一眼看到要烧进固件的那个值。 */
+export function chipVendorLabel(v?: number | null): string {
+  const n = Number(v || 0)
+  if (!n) return '未分组'
+  const hit = chipVendors.value.find((x) => x.id === n)
+  return hit ? `${hit.name} (0x${n.toString(16).toUpperCase()})` : ('厂商#' + n)
 }
diff --git a/apps/admin/app/utils/menus.ts b/apps/admin/app/utils/menus.ts
index a6541e1c..a9135c00 100644
--- a/apps/admin/app/utils/menus.ts
+++ b/apps/admin/app/utils/menus.ts
@@ -27,12 +27,25 @@ export const MENU_GROUPS: MenuGroup[] = [
   {
     label: '生产管理',
     items: [
+      // 顺序 = 生产链路的上下游：芯片厂商 → 方案商 → 代工厂 → 产品 → 发 MAC → 铺渠道。
+      //
+      // ⚠️【2026-09-02 暂时下架】品牌商管理(/factory) 与 公码管理(/code) 已从菜单移除。
+      // 只是注释掉、页面与接口都还在：
+      //   - 直接敲 URL 仍能进（menuItemByPath 查不到就不拦，见 middleware/access.global.ts）；
+      //   - 存量账号 access CSV 里的 'factory'/'code' 不受影响，恢复时把下面两行放开即可；
+      //   - 但「后台账号 → 菜单权限」里这两项的勾选框会跟着消失，新账号勾不到。
+      // 背景：品牌商已不参与生产链路（生成MAC 表单里已去掉品牌商，归属改由渠道商推导）。
+      { id: 'chipvendor', label: '芯片管理', to: '/chipvendor', icon: 'M9 3v2m6-2v2M9 19v2m6-2v2M5 9H3m2 6H3m18-6h-2m2 6h-2M7 19h10a2 2 0 002-2V7a2 2 0 00-2-2H7a2 2 0 00-2 2v10a2 2 0 002 2zM9 9h6v6H9V9z' },
       { id: 'provider', label: '方案商管理', to: '/provider', icon: 'M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z' },
-      { id: 'factory', label: '品牌商管理', to: '/factory', icon: 'M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4' },
-      { id: 'channel', label: '渠道商管理', to: '/dealers', icon: 'M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z' },
+      { id: 'oemfactory', label: '工厂管理', to: '/oemfactory', icon: 'M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10' },
       { id: 'product', label: '产品管理', to: '/product', icon: 'M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4' },
-      { id: 'code', label: '公码管理', to: '/code', icon: 'M4 4h6v6H4V4zm10 0h6v6h-6V4zM4 14h6v6H4v-6zm10 2h2m-2 4h6m-4-4v4m4-8h2m-2 0v4' },
-      { id: 'device', label: '生产管理', to: '/device', icon: 'M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z' },
+      // 原「生产管理」，2026-09-01 改名：这个页面实际干的就是按产品发 MAC 段/授权码并记生产批次
+      // （production_batch 的字段就是 startmac/endmac），叫生产管理太泛。
+      // ⚠️ 权限键仍是 device，不能跟着改名——它已存进各账号的 access CSV，改了等于把所有人的权限清零。
+      { id: 'device', label: 'MAC生成管理', to: '/device', icon: 'M15 7a2 2 0 012 2m4 0a6 6 0 01-7.743 5.743L11 17H9v2H7v2H4a1 1 0 01-1-1v-2.586a1 1 0 01.293-.707l5.964-5.964A6 6 0 1121 9z' },
+      { id: 'channel', label: '渠道商管理', to: '/dealers', icon: 'M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z' },
+      // { id: 'factory', label: '品牌商管理', to: '/factory', icon: 'M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4' },
+      // { id: 'code', label: '公码管理', to: '/code', icon: 'M4 4h6v6H4V4zm10 0h6v6h-6V4zM4 14h6v6H4v-6zm10 2h2m-2 4h6m-4-4v4m4-8h2m-2 0v4' },
     ],
   },
   {
@@ -54,6 +67,11 @@ export const MENU_GROUPS: MenuGroup[] = [
       { id: 'appconfig', label: '应用环境配置', to: '/appconfig', icon: 'M4 7v10c0 2.21 3.582 4 8 4s8-1.79 8-4V7M4 7c0 2.21 3.582 4 8 4s8-1.79 8-4M4 7c0-2.21 3.582-4 8-4s8 1.79 8 4m0 5c0 2.21-3.582 4-8 4s-8-1.79-8-4' },
       { id: 'appgoods', label: '应用商品配置', to: '/appgoods', icon: 'M16 11V7a4 4 0 00-8 0v4M5 9h14l1 12H4L5 9z' },
       { id: 'meettemplate', label: '会议模板', to: '/meettemplates', icon: 'M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z' },
+      // 版本控制 / 游客显隐控制：按应用配、不分渠道（存 app_release 表）。
+      // 这两组开关原先埋在「SaaS 管理 → 渠道分发」里按渠道各存一份，同一个开关有 8 处能改，
+      // 客户端只读一处，出过「后台开了游客登录但 App 里没有」的事故，故拆到这里单独管。
+      { id: 'appversion', label: '版本控制', to: '/appversion', icon: 'M12 3v12m0 0l-4-4m4 4l4-4M4 17v2a2 2 0 002 2h12a2 2 0 002-2v-2' },
+      { id: 'guestaccess', label: '游客显隐控制', to: '/guestaccess', icon: 'M15 12a3 3 0 11-6 0 3 3 0 016 0z M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z' },
       { id: 'svcconfig', label: '第三方服务配置', to: '/serviceconfig', icon: 'M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z M15 12a3 3 0 11-6 0 3 3 0 016 0z' },
       { id: 'agents', label: 'Agent 配置', to: '/agents', icon: 'M12 3a2 2 0 012 2v1h3a2 2 0 012 2v3a2 2 0 01-2 2h-1v3a2 2 0 01-2 2H8a2 2 0 01-2-2v-3H5a2 2 0 01-2-2V8a2 2 0 012-2h3V5a2 2 0 012-2zM9 13h.01M15 13h.01' },
       { id: 'meetingsvc', label: '会议记录服务', to: '/meetingsvc', icon: 'M19 11H5m14 0a2 2 0 012 2v6a2 2 0 01-2 2H5a2 2 0 01-2-2v-6a2 2 0 012-2m14 0V9a2 2 0 00-2-2M5 11V9a2 2 0 012-2m0 0V5a2 2 0 012-2h6a2 2 0 012 2v2M7 7h10' },
diff --git a/apps/client/BES_CONNECT_FIX_PLAN.md b/apps/client/BES_CONNECT_FIX_PLAN.md
new file mode 100644
index 00000000..3d2f09f4
--- /dev/null
+++ b/apps/client/BES_CONNECT_FIX_PLAN.md
@@ -0,0 +1,395 @@
+# 恒玄耳机连接链路：两份改动方案
+
+背景与问题定位见本文「附：为什么分两份」。两份**互相独立**，可以分别上、分别验证。
+
+- **方案一**：修「换个耳机就连不上」。纯 bug，无策略取舍，改动小。
+- **方案二**：自动回连提速 + 确权失败的处置口径。**含策略决定，需要先定口径再动手。**
+
+---
+
+# 方案一：修「换个耳机就连不上」
+
+## 根因
+
+[bes_scan_view.dart:169-181](lib/modules/devices/views/bes_scan_view.dart#L169-L181) 把**用户点的那一台排在候选列表最后**：
+
+```dart
+candidates.add(liveId);   // ① 原生当前连着的      ← 旧耳机 A
+candidates.add(last);     // ② lastDeviceAddress   ← 旧耳机 A
+candidates.add(id);       // ③ 用户点的那一台      ← 新耳机 B
+```
+
+这个顺序是为 Android **TWS 双地址**写的（同一只耳机：配对列表地址 ≠ 跑 SPP 的地址），
+但它分不清「同一台耳机的另一个地址」和「另一台耳机」。
+
+叠加 Android 原生的静默丢弃 [BluetoothManager.kt:628-640](local_plugins/bluetooth_manager/android/src/main/kotlin/com/example/bluetooth_manager/BluetoothManager.kt#L628-L640)：
+
+```kotlin
+fun connect(deviceId: String, ...) {
+    cancelReconnect()                                      // ← 会 closeSocketQuietly()
+    if (!isConnecting.compareAndSet(false, true)) return   // ← 静默 return，不报错不改状态
+```
+
+`cancelReconnect()` **不复位 `isConnecting`**（只 interrupt 线程 + 关 socket），它只在连接线程的
+`finally`（第 638 行）里清。而 CAS 紧接着同步执行，上一次的线程还没被调度到 `finally`——
+**这个竞态新调用几乎必输**。
+
+### 失败时间线（A 已配对但不在身边）
+
+| 时刻 | 发生什么 |
+|---|---|
+| t=0 | 连 A → `isConnecting=true` → `sock.connect()` 阻塞（配对但不在场的经典蓝牙设备要等系统页超时） |
+| t=8s | Dart `_waitConnected` 超时 → 循环到 B → `connect(B)`：`cancelReconnect()` **关掉 A 的 socket**，随后 CAS 失败 → **静默丢弃** |
+| t=8s+ε | A 的线程抛 IOException → `publishBluetoothStatus(0)` → `isConnecting=false`。**此时没有任何设备在连** |
+| t=16s | Dart 再次超时 → 弹「连接失败：请确认 Echo-one 已开机、在手机附近」 |
+
+重试无效：`lastDeviceAddress` 仍是 A（`_finish` 没跑过）。**永久卡死。**
+
+**触发条件**：第一个候选在 8 秒内既没连上也没失败。配对但不在范围内的经典蓝牙设备正是这个行为。
+（若 A 快速失败——比如已关机且系统立即返回——则 B 能连上，所以现场表现会有偶发性。）
+
+### A 在身边时的另一种失败
+
+候选①立刻成功 → [第 64 行](lib/modules/devices/views/bes_scan_view.dart#L64) 的 `_statusWorker`
+抢在候选循环中途开火 → `_finish()` → `savePairedDevice({address: A, name: B的名字})` →
+弹「连接成功」跳主页。**用户以为换成 B 了，其实还在 A，且配对列表被写脏。**
+
+## 改动清单
+
+### 1.1 候选 = 点击的那台 + 同名设备遍历，删掉两个 fallback（`bes_scan_view.dart`）
+
+#### 先说为什么现有的 fallback 必须删，而不是重排
+
+Android 插件里**没有任何扫描/发现路径**（`startDiscovery` / `ACTION_FOUND` 全项目零命中），
+地址的唯一来源是 `adapter.bondedDevices`（[getBondedDevicesList:774](local_plugins/bluetooth_manager/android/src/main/kotlin/com/example/bluetooth_manager/BluetoothManager.kt#L774)）。
+而两个 fallback 的来源是闭环的：
+
+```
+adapter.bondedDevices ──► 扫描页列表 ──► 用户点击 ──► connectToDevice(addr)
+                                                        └─► 原生 lastDeviceId = addr
+                                                              ├─► currentConnectedDevice() ─┐
+                                                              └─► savePairedDevice          │
+                                                                    └─► lastDeviceAddress ──┤
+                                        只能吐回 App 自己拨过的地址 ◄─────────────────────────┘
+```
+
+**`currentConnectedDevice()` 与 `lastDeviceAddress` 永远产生不了一个「新地址」。**
+所以注释里说的 TWS 双地址（「配对列表是 …C1:C4，SPP 实际走 …BE:F8」）这条链根本够不着——
+…BE:F8 没有任何入口能进入系统。原作者瞄准的问题是对的，但接错了源：
+这两个 fallback 唯一的实际效果就是**把上一台耳机塞进候选列表**。
+
+反过来，那个 SPP 地址若真的存在于系统配对列表里，它就是**同名的另一行**——
+正好落在「同名设备遍历」的范围内。两种情况下遍历同名行都不比现状差。
+
+#### 改法
+
+```dart
+// 身份由连上之后的 MAC 校验来定，不由拨哪个地址来定（见 1.4 + BesDeviceAuth）。
+// 所以连接阶段只要「拨通一条链路」即可，不需要在地址层面追求精确。
+final tapped = (d['address'] as String? ?? '');
+final tappedName = (d['name'] as String? ?? '').trim().toUpperCase();
+
+final candidates = <String>[tapped];
+// 同名的其余行：可能是同一只耳机的另一个 BR/EDR 地址（TWS），
+// 也可能是另一台同款耳机——两种都值得试，连上哪台由 MAC 校验兜底认领。
+for (final row in _devices) {
+  final a = (row['address'] as String? ?? '');
+  final n = (row['name'] as String? ?? '').trim().toUpperCase();
+  if (a.isEmpty || n != tappedName) continue;
+  if (candidates.any((c) => c.toUpperCase() == a.toUpperCase())) continue;
+  candidates.add(a);
+}
+// ⚠️ 不要再把 currentConnectedDevice() / lastDeviceAddress 加进来（理由见上）
+```
+
+**这一条单独就能消掉绝大部分现象**，且不需要动原生。
+
+#### 配套：`_waitConnected` 监听 1→0 提前失败
+
+`connectBlocking` 失败时会 `publishBluetoothStatus(0)`
+（[第 684 行](local_plugins/bluetooth_manager/android/src/main/kotlin/com/example/bluetooth_manager/BluetoothManager.kt#L684)），
+所以不必每个候选都干等满 8 秒：
+
+```dart
+Future<bool> _waitConnected({Duration timeout = const Duration(seconds: 8)}) async {
+  final end = DateTime.now().add(timeout);
+  bool sawConnecting = false;
+  while (DateTime.now().isBefore(end)) {
+    final s = _service.deviceStatus.value;
+    if (s == 2) return true;
+    if (s == 1) sawConnecting = true;
+    // 已经进过「连接中」又掉回 0 = 原生明确失败了，不用等满超时
+    if (sawConnecting && s == 0) return false;
+    await Future.delayed(const Duration(milliseconds: 300));
+  }
+  return _service.deviceStatus.value == 2;
+}
+```
+
+遍历 N 个同名设备的总耗时从「N × 8s」降到接近真实失败时间。
+⚠️ 这一条**依赖 1.3**：原生现在静默丢弃时不发任何状态，`sawConnecting && s == 0`
+在丢弃场景下不会触发（状态停在 Dart 自己写的 1），仍要靠超时兜底。
+
+⚠️ 副作用（可接受）：用户点 B、B 不在范围内时，会回落到同名的 A 并连上它。
+配合 1.4，落盘与提示显示的是**真实连上的那台**，数据不会脏；
+代价是用户可能拿到不是自己点的那只。若要杜绝，可在回落成功后提示
+「已连接 <真实名称/地址>」而不是沿用点击行的名字。
+
+### 1.2 候选循环期间不让 `_statusWorker` 抢跑（`bes_scan_view.dart:64`）
+
+```dart
+_statusWorker = ever<int>(_service.deviceStatus, (v) {
+  if (v == 2 && mounted && !_finished && !_connecting) _finish();
+});
+```
+
+`_connecting` 期间由 `_connect` 自己在循环结束后决定收尾，避免第一个候选一连上就跳走。
+
+### 1.3 Android 原生：`connect()` 不再静默丢弃（`BluetoothManager.kt:628`）
+
+```kotlin
+fun connect(deviceId: String, serviceUuid: String = "aeaf5241-...") {
+    cancelReconnect()   // 已关掉在飞的 socket，阻塞的 sock.connect() 会立刻抛异常
+    Thread {
+        // 等上一次的 finally 复位 isConnecting。不等就 CAS 几乎必然失败，
+        // 这次 connect 会被静默丢弃——「换个耳机连不上」的直接原因。
+        val deadline = System.currentTimeMillis() + 2000
+        while (isConnecting.get() && System.currentTimeMillis() < deadline) Thread.sleep(20)
+        if (!isConnecting.compareAndSet(false, true)) {
+            publishBluetoothStatus(0)   // 至少让 Dart 知道这次没成，别干等 8 秒
+            return@Thread
+        }
+        lastDeviceId = deviceId
+        lastServiceUuid = serviceUuid
+        isUserInitiatedDisconnect = false
+        try { connectBlocking(deviceId, serviceUuid) } finally { isConnecting.set(false) }
+    }.start()
+}
+```
+
+要点：
+- 等待放在**工作线程**里，不能在平台线程 `Thread.sleep`（`connect` 由 MethodChannel 在主线程调用）。
+- `lastDeviceId` 的赋值跟着挪进线程。已核对：唯一的读者 `getConnectedDeviceInfo()`
+  ([第 762 行](local_plugins/bluetooth_manager/android/src/main/kotlin/com/example/bluetooth_manager/BluetoothManager.kt#L762))
+  先判 `isConnected`，不依赖它被同步写入。
+- **iOS 不需要改**：`BluetoothManager.swift:138` 的 `connect()` 没有 `isConnecting` 门禁，
+  每次都走 `attachAndConnect` → `resetConnectionState()`，本来就不会丢弃。
+
+### 1.4 连接后回填真实设备身份（`bes_bluetooth_service.dart:654`）
+
+`connectToDevice` 在调原生**之前**就乐观写了 `connectedDeviceId = 目标地址`：
+
+```dart
+deviceStatus.value = 1;
+connectedDeviceId.value = deviceId;   // ← 原生若丢弃/连到别的，这个值就是错的
+```
+
+而 `_listen` 的 `event == 2` 分支只在 `connectedDeviceId.value.isEmpty` 时才去问原生真实设备。
+于是「状态里是 B、链路上是 A」会一路带到确权：拿 B 的 MAC 去 `binddevice`（绑一台没连着的耳机），
+被拒时 `_reject` 又按 `connectedDeviceId == B` 判 `isCurrent=true`，把实际连着的 A 断掉。
+
+改法：`event == 2` 时**无条件**用原生 `getConnectedDevice()` 回填，不再以「本地值为空」为条件。
+
+### 1.5 `deviceMac` 按 device id 建缓存，而不是断开就清
+
+问题：`event == 0` 分支清了 7 个字段，唯独没清 `deviceMac`。注释的理由是「它是这台硬件的属性」——
+但**换耳机之后它就是上一台的属性了**。而 iOS 的 `resolveDeviceMac()` 第一行就是：
+
+```dart
+if (deviceMac.value.isNotEmpty) return deviceMac.value;   // ← 直接返回旧耳机的 MAC
+```
+
+后果：iOS 换耳机后确权用旧 MAC → 命中旧白名单 → B 冒用 A 的确权通过。
+
+#### ⚠️ 不能简单地「断开就清」——那会拖慢 iOS 自动回连
+
+`resolveDeviceMac()` 在 iOS 上拿不到缓存时要 `queryBattery()` 再轮询**最多 3 秒**。
+而它排在 `verifyConnected()` → 握手链路的最前面。于是「断开就清」会让
+**每一次 iOS 自动回连都多等最多 3 秒**；在固件 0.0.3 上（`AA 09` 已不回 `BB 0A`）
+更是每次都必然等满 3 秒才返回 null。这与「回连要快」的目标直接冲突。
+
+#### 改法：把 MAC 缓存成 `deviceId → mac` 的映射并持久化
+
+```dart
+static const String _macCacheKey = 'bes_device_mac_cache';   // {deviceId: MAC}
+
+// event == 2、用 1.4 回填出真实 connectedDeviceId 之后：
+final cached = (_storage.read<Map>(_macCacheKey) ?? {})[connectedDeviceId.value];
+deviceMac.value = (cached as String?) ?? '';   // 换了设备就是空，不会串用上一台的
+
+// _handleRawFrame 解析出 BB 0A 属性 7 时，除了写 deviceMac，
+// 再按当前 connectedDeviceId 落一条映射
+```
+
+- iOS 上 `connectedDeviceId` 是 peripheral UUID，对「同一台手机 + 同一只耳机」是稳定的，
+  所以这个映射可长期复用 → **回连仍然是同步命中，零等待**。
+- 换耳机时 id 不同 → 查不到 → `deviceMac` 为空 → 老老实实重新查，**不会串用旧 MAC**。
+- Android 不受影响：`resolveDeviceMac()` 在 Android 上直接返回 `connectedDeviceId`，不走这条。
+
+⚠️ 这一条**依赖 1.4**：必须先拿到真实的 `connectedDeviceId` 再查映射，
+否则用 Dart 乐观写入的那个错值做键，等于换了个方式串号。
+
+## 对自动回连的影响：不影响，且修正了「回连锁错设备」
+
+三条自动回连路径与本方案的关系：
+
+| 路径 | 触发条件 | 方案一的影响 |
+|---|---|---|
+| **Android ACL 广播**（耳机开机自动回连的主路径） | `ACTION_ACL_CONNECTED` 且 `btDevice.address == lastDeviceId` 且 `!isUserInitiatedDisconnect` 且 `deviceStatus == 0` → `reconnectWithRetry` | 不改这条；**1.1/1.3 修正了 `lastDeviceId` 锁错设备**（见下） |
+| **iOS `.peerConnected`** | 外设在 `authorizedDeviceIds` 里 → `attachAndConnect` | 不改；1.5 改后回连仍是同步命中 |
+| **冷启动 `tryAutoConnect()`** | `deviceStatus == 0` + `BackgroundLaunchConsent.granted` + `getPairedDevices().first` | 不改（它直接调 `connectToDevice`，不经过扫描页的 `_connect`） |
+
+**耳机关机再开机属于链路掉线，不是用户主动断开**——`isUserInitiatedDisconnect` 保持 false、
+`lastDeviceId` 保留，所以 ACL 回连正常。这条不变。
+
+**1.1/1.3 反而修好了一个回连 bug**：现状下用户点 B 却连上 A 时，原生
+`lastDeviceId = A`，于是此后**耳机开机自动回连的永远是 A**。1.1 让拨号顺序正确、
+1.3 让被丢弃的 connect 不再污染 `lastDeviceId`（赋值挪到抢到 `isConnecting` 之后），
+回连目标才会跟着用户的选择走。
+
+### 1.2 会不会挡掉「停在扫描页时的 ACL 回连」
+
+不会。`_statusWorker` 存在的目的正是这个场景，加 `!_connecting` 后：
+- 回连发生在候选循环**期间** → `_waitConnected` 会看到 `deviceStatus == 2` 并 `break`，
+  由 `_connect` 自己走 `_finish()`；
+- 回连发生在循环**结束后** → `finally` 已把 `_connecting` 置回 false，worker 照常开火。
+
+两条路都有人收尾，不存在空档。
+
+### 与本方案无关、但会关掉自动回连的既有条件（供排查参考）
+
+`disconnect()` 会同时 `lastDeviceId = null` 且 `isUserInitiatedDisconnect = true`，
+**自动回连从此关闭，直到下一次显式 `connect()`**。Dart 侧会走到这里的有 5 处：
+设置页手动断开、`bes_test` 调试页、OTA 让路给插件（升级后会重连）、
+`BesDeviceAuth._reject`（确权拒绝）、`removePairedDevice` 命中当前设备（解绑）。
+其中确权拒绝那条正是方案二 2.3 要处理的。
+
+## 验证方式
+
+必须真机，且需要**两台**恒玄耳机（或一台 + 一台改过名的其它经典蓝牙设备凑数）。
+
+| # | 步骤 | 期望 |
+|---|---|---|
+| 1 | 绑定 A → 关闭 A 电源 → 进扫描页点 B | B 在数秒内连上；**不再**出现「连接失败」 |
+| 2 | A 开机在旁 → 进扫描页点 B | 连上的是 B（不是 A），配对列表首项是 B |
+| 2b | A 开机在旁 → 点 B，但 B 拒连/不在范围 | 回落连上 A，且提示与落盘显示的是 **A** 的身份（验 1.4） |
+| 3 | 只有一台耳机时进扫描页 | 自动连接行为不变（回归） |
+| 4 | 杀进程重启 | `tryAutoConnect` 回连的是最近一次连的那台 |
+| 5 | Android 看 logcat | `connect(B)` 之后有 `Bluetooth Connection` 日志，不再静默无输出 |
+| 6 | **连上 B → 关机 B → 再开机 B** | ACL 自动回连的是 **B**（现状会回连 A，因为 `lastDeviceId` 被写成了 A） |
+| 7 | **iOS：已确权耳机断开后重连，掐表** | 握手开始时间与改动前一致，**不引入额外 3 秒**（验 1.5 的映射缓存生效） |
+| 8 | iOS：换成另一台耳机 | 确权用的是**新耳机**的 MAC，不再命中旧白名单 |
+
+⚠️ 1.3 改原生，需重新出包；1.1/1.2/1.4/1.5 纯 Dart，可先单独上一版验证前四条。
+
+---
+
+# 方案二：自动回连提速 + 确权失败的处置口径
+
+> **这份含策略取舍，动手前需要先拍板下面「待定口径」两条。**
+
+## 前提澄清（这两件事已经是现状，不需要改）
+
+1. **确权本来就是「先连上再校验」**：`verifyConnected()` 由 `event == 2`（链路已通）触发，
+   不是连接的前置条件。
+2. **MAC 缓存在本地就不打接口**：[bes_device_auth.dart:149](lib/data/services/bes_device_auth.dart#L149)
+   的白名单短路在任何网络调用之前，同步返回。
+
+所以确权**不是**「换耳机连不上」的原因——那条失败路径上 `deviceStatus` 从来没到过 2，
+`verifyConnected` 一次都没被调用。方案二解决的是另外三件事。
+
+## 2.1 只有 `authorized` 才写缓存，`unknown` 每次回连都重来
+
+`_remember()` 只在 [180](lib/data/services/bes_device_auth.dart#L180) 与
+[229](lib/data/services/bes_device_auth.dart#L229) 两个 authorized 分支调用。
+判不出结论时什么都不缓存，于是**每次自动回连都重跑一遍**：
+
+- 断网 → `Api.binddevice` 被 `.timeout(10s)` 卡满 → 每次回连白等 10 秒才开始查固件版本/电量
+- iOS 固件 0.0.3（`AA 09` 已不回 `BB 0A`，`_listen` 里有 TODO）→ `resolveDeviceMac` 每次空等 3 秒
+
+**改法**：让确权脱离握手链路——白名单命中仍同步放行；没命中则**后台跑**，握手立即继续。
+这正是「校验通过就无感，不通过再提醒」。
+
+```dart
+final auth = BesDeviceAuth.tryFastPath();       // 白名单命中 → 同步 authorized
+if (auth == null) {
+  unawaited(BesDeviceAuth.verifyInBackground()); // 慢路径：拿到 denied 再断开+提示
+}
+// 握手不再等待，立即继续
+```
+
+**待定口径 ①**：确权改后台后，未授权设备会拿到**数秒的完整功能**才被切断。
+当前注释写的是「必须排在握手和 AI 编排之前——未确权的设备不该被当成一台可用耳机对待」。
+这道闸门的定位是**防非授权硬件蹭服务**，不是防滥用，我倾向于可以接受；
+但如果口径是「一秒都不能用」，那 2.1 只能改成「缩短超时」而不是「移出链路」。
+
+## 2.2 `_reported` 是死字段
+
+[第 80/87/115/123/181/230 行](lib/data/services/bes_device_auth.dart#L80) 全是
+`add`/`remove`/`clear`，**没有任何一处读它**。它本来的职责（进程内去重，别每次回连都打接口）
+完全没生效——真正在去重的是持久化白名单 `isAuthorizedLocally`。
+
+**改法**：让它接管 `unknown` 的进程内去重。断网时一个进程周期内只白等一次 10 秒，
+而不是每次回连都等。这是给自动回连提速最便宜的一刀，且无策略风险。
+
+## 2.3 一次 denied 会把自动回连永久关掉
+
+`_reject()` 一次做了三件事：移出 `pairedDevices`、清 `_lastDeviceKey`、
+`disconnectDevice()`（原生 `disconnect()` 里 `lastDeviceId = null`；
+iOS 侧 `_syncAuthorizedDevices` 也会把它移出 `authorizedDeviceIds`）。
+**Dart 的 `tryAutoConnect` 和原生 ACL/`.peerConnected` 两条回连路径同时被切断**，
+只能靠用户再进一次扫描页手动点。
+
+而且有一条**误杀正品**的路径：`_resolveProductId` 匹配不上产品名时
+`return headsets.first.id` 无条件兜底 → 后台若有多个经典蓝牙耳机产品，
+就会拿**错的 pid** 去 `getFactoryDeviceformac` → 查不到 → `AuthorizeNoCanUse` → denied。
+而设备名来源 `connectedDeviceName` 正是方案一 1.4 会写错的那个值；
+再叠加 Android `getBondedDevices` 返回系统缓存的旧配对名（代码自己注释了
+`DEEPVOICE` → `Echo-one` 改名问题），匹配不上的概率不低。
+
+**改法（三条）**：
+
+- **`_resolveProductId` 去掉 `headsets.first` 兜底**：匹配不到就返回 null → `unknown` → 放行。
+  拿错 pid 去查 license 表，结论必然是「查不到」，等于把「不知道」伪装成「不合法」。
+- **denied 不再清 `pairedDevices` / `lastDeviceId`**，改为本地黑名单 + 冷却期
+  （`bes_denied_macs: {mac: deniedAtMs}`，24h 内不自动回连、也不重打接口；
+  用户在扫描页**手动点**视为明确意图，清掉冷却强制重查）。
+  这样既不永久失联，也不会掉进「连上→弹窗→断开→连上」的死循环——
+  那个循环正是当初移出 `pairedDevices` 要防的。
+- **提示文案可自救**：`deviceConnectionRestricted` 现在是「设备连接受限，该设备未获授权」，
+  用户不知道该做什么。应说明这是设备未在后台登记，需联系客服/经销商。
+
+**待定口径 ②**：denied 时**要不要还断链**？
+
+| | 判严（现在：断链 + 关闭自动回连） | 中间（断链，但保留自动回连 + 冷却） | 判宽（不断链，仅降级需授权的功能） |
+|---|---|---|---|
+| 误判代价 | 用户永久失去自动回连，且无法自救 | 24h 后自动重试一次 | 几乎无 |
+| 闸门强度 | 最强 | 与判严等价（联网后仍会拦） | 弱，靠功能降级兜底 |
+
+我建议**中间档**：与现有 `unknown` 一律放行的口径一致（类注释：「判严的代价是合法用户一断网
+就用不了自己的耳机」），denied 分支目前没跟上这个口径。
+
+## 验证方式
+
+| # | 场景 | 期望 |
+|---|---|---|
+| 1 | 已确权耳机 + 断网，重启 App 回连 | 握手不再被 10s 超时拖住（白名单命中，本来就不该打接口——回归验证） |
+| 2 | **未**确权耳机 + 断网，反复回连 | 只在第一次白等 10 秒，之后走 `_reported` 去重 |
+| 3 | 后台把某 MAC 从 license 表移除后连接 | 提示可自救；**设备仍留在配对列表**，24h 内不再打接口 |
+| 4 | 后台配置两个经典蓝牙耳机产品，连一台名字对不上的 | 判为 `unknown` 放行，**不再**误判 denied |
+| 5 | 正常首连一台已登记的新耳机 | 无感，握手不被确权拖慢 |
+
+---
+
+# 附：为什么分两份
+
+两组问题在时间轴上根本不重叠：
+
+```
+用户点 B ──► 候选循环(A→B) ──► 原生连接 ──► event==2 ──► 确权 ──► 握手
+            └──────── 方案一 ────────┘              └──── 方案二 ────┘
+                「连不上」死在这里                    这里从来没被执行到
+```
+
+**确权层怎么调都救不了「用户点 B、代码去连 A」。** 方案一是纯 bug 修复、无口径争议，
+建议先上；方案二牵涉「闸门该多严」的产品决定，定了口径再动。
diff --git a/apps/client/CLIENT_AUDIT.md b/apps/client/CLIENT_AUDIT.md
new file mode 100644
index 00000000..5b8a713f
--- /dev/null
+++ b/apps/client/CLIENT_AUDIT.md
@@ -0,0 +1,286 @@
+# apps/client 全量体检（2026-09-03）
+
+扫描范围：428 个 dart 文件 / 187,759 行 / 41 个语种。
+工具：`dart analyze` 全量 + 括号配平的自定义扫描脚本 + 逐条 grep 反查。
+**未做**：真机运行、动态链路验证、`local_plugins/` 下 25 个原生插件的内部审查。
+
+统计：analyzer 1,222 项（1,049 info + 173 warning）。
+
+---
+
+## 必须先修
+
+### 01. ~~32~~ 27 个翻译 key 在全部 41 个语言文件里都不存在 —— 用户可见 ✅ 已修（2026-09-03）
+
+> **修复记录**：26 个 key 已补入全部 41 个语言文件（1,066 条）；第 27 个 `tips` 改为复用
+> 项目里已有的 `tip`（30 处在用），不新增同义重复键。
+> 复查结果：代码里生效的 1,151 个 `.tr` key **全部有译文**，各语言文件无重复键，
+> `dart analyze` 全量 1,222 → 1,222 项、0 error（无新增问题）。
+>
+> **修正初版报告**：初版列的 32 个里有 5 个只出现在**被注释掉的代码**里，界面上并不会显示，
+> 已从清单剔除：`codeSend`、`clearInput`、`ttsInterruptToggle`、`unsupportedMode`、
+> `checkUpdateTooFrequent`。真正生效的是 27 个。
+> （`pleaseEnterVerificationCode` 在 `:477` 是生效的，未受此修正影响。）
+
+<details>
+<summary>原始问题描述</summary>
+
+GetX 的 `.tr` 找不到 key 时**原样返回 key 本身**，不报错、不回退中文。这 32 处在
+**包括简体中文在内的每一种语言**下，界面上直接显示英文标识符。
+
+命中主流程：
+
+| key | 位置 | 表现 |
+|---|---|---|
+| `pleaseEnterVerificationCode` | `login_controller.dart:477` | 登录页显示 `pleaseEnterVerificationCode` |
+| `codeSend` | `login_controller.dart:331` | 发送验证码按钮 |
+| `userDataParseFailed` | `login_controller.dart:718` | 登录失败提示 |
+| `notCharging` | `home_controller.dart:513` | 首页设备卡片充电状态 |
+| `finishRecording` / `pauseRecording` / `markFavorite` / `unmarkFavorite` / `enterFileName` | `meeting_record_view.dart` | 会议录音页控制按钮 |
+| `monthlyTranscriptionDuration` / `industrySpecificSummaryTemplate` / `distinguishDifferentSpeakers` / `importAudioFromAppWeb` / `findMore` / `bindImmediately` / `autopilotTemplateSummary` | `member_bottom_sheet.dart` | 会员权益弹窗 6 条文案 |
+| `clearInput` | `text_translation_view.dart:84` | 文本翻译清空按钮 |
+| `ttsInterruptToggle` / `tips` | `agent_view.dart:319`, `agent_controller.dart:1773` | 智能体页 |
+| `notBound` | `goodsvip_view.dart:363` | VIP 商品页 |
+| `unsupportedMode` | `translation_controller.dart:343` | 通话翻译 |
+| `storageBytes` / `storageUploads` | `meeting_stats_view.dart:226,232` | 用量统计 |
+| `checkUpdateTooFrequent` | `settings_controller.dart:319` | 设置页 |
+| `scanIdle` / `scanning` / `startScan` / `stopScan` / `discoveredDevices` / `noDevicesFound` / `unnamedDevice` / `disconnect` | `devices_view.dart` | 杰理扫描页（本项目不走，优先级低） |
+
+**修法**：先补 `zh_cn` / `en_us`，再批量灌其余 39 语。
+⚠️ 语言文件里单双引号两种写法都存在，补之前两种都要查，否则 const map 会在 build 阶段撞重复键。
+
+</details>
+
+**遗留**：防回归的 CI 检查还没加（见第 04 条），现在仍然可能再漏进新的缺失 key。
+
+### 02. 微信 appSecret 硬编码 + 无条件打印进设备日志
+
+```
+weixinLogin.dart:148   print("_getTokenUrl 数据获取${_appId},${_appSecret}");
+weixinLogin.dart:160   print("_getRefreshTokenUrl 数据获取${_appId},${_appSecret}");
+login_service.dart:9   appSecret: 'c792a0387c339f7b5c85d439466c67b7'
+pay_service.dart:41    appSecret: '9ceb39df312b3ba95a229b2aa0d15496'
+```
+
+裸 `print()` **不受 `kReleaseMode` 约束**，正式包照打。（同项目 `appleLogin.dart` 的 print
+都套了 `kDebugMode`，这两行漏了。）拿到 appSecret 就能以应用身份换 access_token。
+
+**修法**：先删这两行 print（零成本止血）。appSecret 本身应挪到服务端（客户端只发 code）；
+一时改不动至少改成后端 `AppConfig.env()` 下发。**已进过 git 的 secret 必须视为已泄漏，去微信开放平台重置。**
+
+### 03. 支付宝已签名订单串被打进日志
+
+`pay_service.dart` 有 **68 处裸 `print()`，全文件零 `kDebugMode` 门禁**。
+
+```
+pay_service.dart:732   print('支付宝支付订单: $orderInfo');   ← 含服务端签好的 sign
+pay_service.dart:610   print('创建支付订单: $response');
+pay_service.dart:836   print('创建支付宝订单: $response');
+```
+
+**修法**：整文件 print 换成项目已有的 `Logger`（自带 `kReleaseMode ? warning : debug` 分级）；
+涉及订单串/响应体的直接删，不要降级。
+
+---
+
+## 高
+
+### 04. 30 个语种各缺 160+ 个正在使用的 key
+
+全项目 key 并集 1,599 个：
+
+| 语种 | key 数 | 覆盖率 |
+|---|---:|---:|
+| `zh_cn` `en_us`（2 个） | 1,555 | 97% |
+| `de` `es` `fr` `ja` `ko` `pt` `ru` `zh_hk` `zh_tw`（9 个） | 1,541 | 96% |
+| `ar` `bg` `cs` `da` `el` … （28 个） | 1,322 | 83% |
+| `tr_tr` | 1,320 | 83% |
+| `nl_nl` | 1,213 | 76% |
+
+荷兰语/土耳其语等用户会在自动回连授权弹窗、蓝牙扫描页、设备绑定页看到
+`autoConnectConsentTitle` 这样的标识符。
+
+**修法**：把「以 en_us 为基准做 key 差集」做成 CI 检查，仓库已有的 `tools/i18n_audit.py` 加一条覆盖率断言。
+
+### 05. `AppConfig.getproduct()` 的地雷仍有 6 处调用 ✅ 已修（2026-09-03）
+
+> **修复记录**：`appconfig.dart` 的 `getproduct()` 与 `agentsystemPrompt()` 都改成了
+> 显式循环 + 返回 null（不引入 `collection` 依赖——项目 pubspec 里没有它）。
+> 同时补了两道原本不成立的前置条件：
+> - **未初始化时返回 null**：`config` 是 `static late`，`user_getappconfig` 还没回来时
+>   原实现会抛 `LateInitializationError`，null 契约照样不成立。
+> - **空设备名返回 null**：`devicename.contains('')` 恒为 true，原实现会把**产品表里的
+>   第一个产品**当成匹配结果返回。调用点本来就都紧接着判 `deviceName != ''`，无一依赖此行为。
+>
+> 6 个调用点的代码**没动**——它们写的 `if (product != null)` 现在才真正开始工作。
+> 另外把三处「不要用 getproduct，它会抛」的注释改写成了真实理由（那三个本地
+> `_findProduct` 有更宽的双向包含匹配规则，所以保留，见第 10 条）。
+> `dart analyze` 对改动文件 0 新增告警。
+
+内部 `firstWhere` **没有 orElse**，查不到抛 `StateError` 而不是返回 null。
+代码里已有三处注释写着「不要用这个函数」，但调用点一个没换。
+
+调用方全写成 `DBProduct? p = getproduct(...); if (p != null) {...}`——那个 null 分支
+**永远等不到**，异常被外层 try 吞掉后直接走兜底，全程不报错：
+
+```
+home_controller.dart:526        getCurrentDeviceType() → 设备类型退化成 unknown
+home_controller.dart:609
+translation_controller.dart:1490  broadcastPeer 恒为 false
+translation_controller.dart:1584
+agent_controller.dart:368       TTS 打断偏好读不到
+ble_manager.dart:1055
+```
+
+同类：`appconfig.dart:35` 的 `agentsystemPrompt()` 也是无 orElse 的 firstWhere。
+
+**修法**：改成 `firstWhereOrNull`（collection 包已在依赖里）。改完那 6 个 `if (p != null)` 才真正开始工作。
+
+### 06. 耳机配对页整页硬编码中文
+
+`bes_scan_view.dart` 是恒玄耳机唯一配对入口、新用户必经流程，**一句都没走 `.tr`**：
+
+```
+:223  Text('添加 AI 耳机（$_targetName）')
+:274  Text('没有找到 $_targetName 耳机')
+:282  '请先在系统「设置 → 蓝牙」里连接 …'
+:86   Get.snackbar('连接成功', …)
+:190  Get.snackbar('连接失败', …)
+```
+
+### 07. 会议转写编辑框每次重建都被重置
+
+`speech_tab.dart:142` 在 `Obx` 回调里 `new TextEditingController(text: item['content'])`。
+`Obx` 每次重建都造一个新的：**用户正在改的发言人文字会被打回原文**，旧 controller 一个都没 dispose。
+
+同类（仅泄漏、不影响功能）：`profile_view.dart:148`、`profile_meeting_view.dart:12`、
+`translation_list_view.dart:347`。
+
+**修法**：`speech_tab` 改 StatefulWidget，controller 按 `item['id']` 缓存在 State 里、dispose 时统一释放。
+
+### 08. 两端都全局放开了明文 HTTP
+
+```
+ios/Runner/Info.plist                    NSAllowsArbitraryLoads = true
+android/…/AndroidManifest.xml:73         usesCleartextTraffic="true"
+android/…/network_security_config.xml    base-config 全放开 + certificates src="user"
+```
+
+**全站可被降级到明文**（业务后端、支付回调、会议音频上传都在口子里），而实际需要明文的
+只有讯飞声音复刻一家：`timbre_controller.dart:107,128,155,200,241`
+（`opentrain.xfyousheng.com` / `avatar-hci.xfyousheng.com`）。
+Apple 对全局 `NSAllowsArbitraryLoads` 会要求提交理由说明。
+
+**修法**：iOS 用 `NSExceptionDomains` 只放 `xfyousheng.com`；Android `base-config` 改
+`cleartextTrafficPermitted="false"` 再加 `domain-config`。顺带去掉 `certificates src="user"`
+（当前配置默认接受用户证书 = 默认接受抓包代理）。
+
+---
+
+## 中
+
+### 09. 付费页在卖一个已经关掉的功能
+
+```
+goodsai_view.dart:324                'helpCallAndSMS'.tr   ← AI 商品购买页卖点
+assistant_directive_service.dart:48  'SEND_message': '本版已移除短信与联系人能力'
+```
+
+用户付费后说「给爸爸发短信」，什么都不会发生。
+**修法**：摘掉这张 feature card，或去百炼后台把这两个 tool 也摘掉并恢复端侧实现。两边同时留着是最差组合。
+
+### 10. 「按设备名找产品」有 5 套各写各的实现
+
+```
+appconfig.dart:53                    getproduct()          ← 会抛异常那个
+home_controller.dart:89              _findProductByName()
+bes_ota_upgrade_controller.dart:208  _findProduct()
+ota_core_contropller.dart:429        findProduct()
+bes_device_auth.dart:269             内联实现
+```
+
+匹配规则互不相同，改一次规则要改 5 处。
+**修法**：收敛成 `AppConfig.findProduct(name)`，规则用 OTA 那版最完整的
+（名字互相包含 → 唯一 `devicetype==1` → null）。和第 05 条一起做。
+
+### 11. eq_settings 是 1,911 行完全不可达的死代码
+
+`app_routes.dart:22` 声明了 `/eq_settings` 常量，但 `app_pages.dart` **没有对应 GetPage**，
+全项目**没有任何一处导航过去**。模块内部 UI 标签也全是硬编码中文（音效／均衡器／默认／流行／摇滚…）。
+
+### 12. 4 个调试页面挂在正式路由上，无任何门禁
+
+`bes_test`、`opus_test`、`speech_test`、`log_export` 都在 `app_pages.dart` 注册为正常 GetPage，
+正式包可达。`bes_test` 尤其敏感——能对耳机下发任意私有协议命令，而 `0x5x/0x6x` 段会切换耳机工作模式。
+
+### 13. 60 处空 catch 把失败原因全吞了
+
+分布在 34 个文件，top：`volcano_tts_api_service.dart`(6)、`translation_controller.dart`(3)、
+`translation_detail_controller.dart`(3)、`agent_controller.dart`(3)、`ble_manager.dart`(3)。
+
+**修法**：不必全改，先给**网络与蓝牙**相关的补一行 `Logger.w`——这两类线上最常出问题、最难复现。
+
+### 14. 核心流程里还有一批中文硬编码
+
+```
+call_recording_controller.dart:470,763     「已标记」「录音已存入语音记录助手」
+picture_translation_controller.dart:214,221
+agent_controller.dart:1773,2446,2728        导航失败 / 播放提示
+settings_controller.dart:278,279,301-306    清除配对设备确认框
+calendar_controller.dart:345,528+           ${month}月${day}日 + 中国节假日表
+```
+
+### 15. 微信登录里残留着教程示例代码
+
+`weixinLogin.dart:193` 的 `postData()` 往 `jsonplaceholder.typicode.com`（公开 API 教程站）发 POST。
+全项目无调用。同文件 `fetchData()` 也只剩注释里的调用。删掉即可，顺带解决 `:177/:208` 打印接口响应体的 print。
+
+### 16. 网络图片零缓存
+
+8 处 `Image.network`，未引 `cached_network_image`。产品图/头像每次重建、滚动都重新走网络。
+
+---
+
+## 清理项
+
+### 17. 1,222 项 analyzer 告警
+
+```
+358  deprecated_member_use      ← 升 SDK 时变硬错误，值得先看
+198  prefer_const_constructors  ← 直接影响重建开销
+191  avoid_print                ← 即第 02/03 条
+ 53  unused_import
+ 34  unused_element / 23 unused_field / 17 unused_local_variable
+ 14  dead_null_aware_expression（goods_base_controller 占 10 处）
+  2  must_call_super
+```
+
+`dart fix --apply` 能自动清掉约 400 项。deprecated_member_use 建议升 Flutter 前单独排一次。
+
+### 18. 两处 `onClose` 没调 `super.onClose()`
+
+`record_timer_controller.dart:88`、`translation_history_controller.dart:373`。
+GetX 的 `ListNotifierMixin.onClose` 标了 `@mustCallSuper`，不调则该 controller 的 worker 不回收。
+
+### 19. 本地闹钟记录读回时不校验时间格式
+
+`fromDirective` 走 `_normalizeTime`、格式不对返回 null，这条路径是稳的。
+但 `assistant_directive.dart:376` 的 `fromJson` 直接 `j['time'] ?? '00:00'` 不校验，
+而 `:354/:355` 的 `hour`/`minute` 是裸 `int.parse(time.split(':')[…])`——
+本地存储里有一条格式不对的旧记录，代办页整页渲染就抛。
+
+### 20. CLAUDE.md 与代码已经对不上的几处
+
+| 位置 | 文档说 | 代码实际 |
+|---|---|---|
+| 微信 Universal Link | `https://ymaikj.com/app/` | `https://yimai.games/app/`。代码与 `Runner.entitlements` 的 `applinks:yimai.games` **一致**，不是 bug；但第三条腿（微信开放平台登记 + `yimai.games/.well-known/apple-app-site-association`）需确认已同步，否则微信登录与支付静默失败 |
+| `version_update_service` | 失败会把游客入口锁死 10 分钟 | 已修：`:156` 成功后才写 `_lastCheckTime`，失败分支显式不写 |
+| `bes_bluetooth_service.dart:296` | — | 注释写「`AA 20` 耳机状态」，而实现和下方长注释都明确是 `AA 09`。`AA 20` 恰是实测过、完全无回包的那个错误命令 |
+| Google Play 权限 | — | 已核对：`SEND_SMS` 与 `MANAGE_EXTERNAL_STORAGE` 确实是 XML 注释状态，`GOOGLE_PLAY_RELEASE_CHECKLIST.md` 判断正确。仍生效的受限权限是 `QUERY_ALL_PACKAGES` 和已废弃的 `GET_TASKS`，checklist §3 已覆盖 |
+
+---
+
+## 扫描过程中修正过的判断
+
+- 一度把 `SEND_SMS` / `MANAGE_EXTERNAL_STORAGE` 记成生效权限，逐行核对后确认是 XML 注释，已从清单移除。
+- `appleLogin.dart` 的 31 处 print 确认套了 `kDebugMode`，未列入第 02 条。
diff --git a/apps/client/assets/images/app_icon.png b/apps/client/assets/images/app_icon.png
new file mode 100644
index 00000000..9d6a506a
Binary files /dev/null and b/apps/client/assets/images/app_icon.png differ
diff --git a/apps/client/assets/images/devices/earphone_icon.png b/apps/client/assets/images/devices/earphone_icon.png
new file mode 100644
index 00000000..d7b8b1fa
Binary files /dev/null and b/apps/client/assets/images/devices/earphone_icon.png differ
diff --git a/apps/client/ios/Podfile.lock b/apps/client/ios/Podfile.lock
index dbaa8761..e10670e1 100644
--- a/apps/client/ios/Podfile.lock
+++ b/apps/client/ios/Podfile.lock
@@ -7,6 +7,8 @@ PODS:
     - AMapFoundation (>= 1.8.2)
   - audio_waveforms (0.0.1):
     - Flutter
+  - bes_ota_manager (0.0.1):
+    - Flutter
   - bluetooth_manager (0.0.1):
     - Flutter
   - device_plugin_interface (0.1.0):
@@ -54,6 +56,7 @@ PODS:
 DEPENDENCIES:
   - amap_service (from `.symlinks/plugins/amap_service/ios`)
   - audio_waveforms (from `.symlinks/plugins/audio_waveforms/ios`)
+  - bes_ota_manager (from `.symlinks/plugins/bes_ota_manager/ios`)
   - bluetooth_manager (from `.symlinks/plugins/bluetooth_manager/ios`)
   - device_plugin_interface (from `.symlinks/plugins/device_plugin_interface/ios`)
   - floating_ui_plugin (from `.symlinks/plugins/floating_ui_plugin/ios`)
@@ -82,6 +85,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/amap_service/ios"
   audio_waveforms:
     :path: ".symlinks/plugins/audio_waveforms/ios"
+  bes_ota_manager:
+    :path: ".symlinks/plugins/bes_ota_manager/ios"
   bluetooth_manager:
     :path: ".symlinks/plugins/bluetooth_manager/ios"
   device_plugin_interface:
@@ -114,6 +119,7 @@ SPEC CHECKSUMS:
   AMapFoundation: 5f01fcabd1e591967e52178d2d96dac843396285
   AMapNavi: fceb4715f9a3b5a25f330facebee2aa2bdba42dd
   audio_waveforms: cd736909ebc6b6a164eb74701d8c705ce3241e1c
+  bes_ota_manager: 4fcdbe6962548a1ac69421f0c3212837e76c0af4
   bluetooth_manager: f09915bb90e61cc30cbf93f1f5b127b86d957e43
   device_plugin_interface: ee316d62288f942bd08a05acdf417ec4671639a7
   floating_ui_plugin: d218b25dcd922d3a66a536dd2190ecd47451e5a8
diff --git a/apps/client/ios/Runner.xcodeproj/project.pbxproj b/apps/client/ios/Runner.xcodeproj/project.pbxproj
index 4e8fcd0f..38479903 100644
--- a/apps/client/ios/Runner.xcodeproj/project.pbxproj
+++ b/apps/client/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 60;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -259,7 +259,7 @@
 			);
 			mainGroup = 97C146E51CF9000F007C117D;
 			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
 			);
 			productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
 			projectDirPath = "";
@@ -302,14 +302,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -354,14 +350,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -810,7 +802,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};
@@ -819,7 +811,7 @@
 /* Begin XCSwiftPackageProductDependency section */
 		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */;
+			package = 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */;
 			productName = FlutterGeneratedPluginSwiftPackage;
 		};
 /* End XCSwiftPackageProductDependency section */
diff --git a/apps/client/lib/core/theme/theme_service.dart b/apps/client/lib/core/theme/theme_service.dart
index 023ee507..d8161250 100644
--- a/apps/client/lib/core/theme/theme_service.dart
+++ b/apps/client/lib/core/theme/theme_service.dart
@@ -35,12 +35,16 @@ class ThemeService {
         return isDarkMode ? ThemeMode.dark : ThemeMode.light;
       }
 
-      // 默认系统跟随
-      Logger.info('未发现主题偏好，默认系统跟随');
-      return ThemeMode.system;
+      // 默认浅色。**刻意不跟随系统**：设置页只有一个「暗黑模式」开关
+      // （读的是 isSavedDarkMode()，无偏好时为 false），跟随系统会让深色手机上
+      // 装完就是暗的、开关却显示「关」，两边对不上。要恢复跟随系统得先把
+      // 设置页改成三档（浅色/深色/跟随系统）。
+      Logger.info('未发现主题偏好，默认浅色');
+      return ThemeMode.light;
     } catch (e) {
+      // 读存储都失败了，同样落到浅色——与上面的默认保持一致。
       Logger.error('读取主题模式失败: ${e.toString()}');
-      return ThemeMode.system;
+      return ThemeMode.light;
     }
   }
 
diff --git a/apps/client/lib/core/translations/language/ar_sa.dart b/apps/client/lib/core/translations/language/ar_sa.dart
index c9983238..20e496e0 100644
--- a/apps/client/lib/core/translations/language/ar_sa.dart
+++ b/apps/client/lib/core/translations/language/ar_sa.dart
@@ -1751,4 +1751,60 @@ const Map<String, String> arSA = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'لديك أحدث إصدار',
+  'otaCurrentVersion': 'الإصدار الحالي',
+  'otaDone': 'تم',
+  'otaDownloading': 'جارٍ تنزيل البرنامج الثابت...',
+  'otaError': 'خطأ',
+  'otaExitConfirm': 'هناك ترقية قيد التنفيذ. هل تريد الخروج فعلاً؟',
+  'otaExitTitle': 'إنهاء الترقية',
+  'otaFailed': 'فشلت الترقية',
+  'otaFailedWithCode': 'فشلت الترقية (الرمز @code)',
+  'otaKeepConnectedWarning': 'أبقِ الجهاز قريبًا ولا تُغلق التطبيق أثناء الترقية.',
+  'otaLatestVersion': 'أحدث إصدار',
+  'otaNeedConnect': 'يرجى توصيل جهاز أولاً',
+  'otaNotConnectedTip': 'لم يتم العثور على جهاز متصل. يرجى توصيل سماعتك قبل الترقية.',
+  'otaPreparing': 'جارٍ التحضير...',
+  'otaStartUpgrade': 'بدء الترقية',
+  'otaSuccessReboot': 'تمت الترقية بنجاح. يرجى إعادة تشغيل الجهاز.',
+  'otaTimeout': 'انتهت مهلة الترقية. يرجى المحاولة مرة أخرى.',
+  'otaUnknownDevice': 'جهاز غير معروف',
+  'otaUpdateAvailable': 'يتوفر تحديث',
+  'otaUpgrading': 'جارٍ الترقية... @percent%',
+  'otaUpgradingShort': 'جارٍ الترقية...',
+  'otaDownloadPreparing': 'جارٍ التحضير لتنزيل البرنامج الثابت...',
+  'otaFirmwareCached': 'البرنامج الثابت جاهز، جارٍ التحضير للترقية...',
+  'otaDownloadStarted': 'بدأ تنزيل البرنامج الثابت...',
+  'otaDownloadingPercent': 'جارٍ تنزيل البرنامج الثابت... @percent%',
+  'otaDownloadDone': 'اكتمل التنزيل، جارٍ التحضير للترقية...',
+  'addDevice': 'إضافة جهاز',
+  'deviceConnectionRestricted': 'اتصال الجهاز مقيّد، هذا الجهاز غير مصرّح به',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'ملخصات تلقائية بقوالب Autopilot',
+  'bindImmediately': 'الربط الآن',
+  'disconnect': 'قطع الاتصال',
+  'discoveredDevices': 'الأجهزة المكتشفة',
+  'distinguishDifferentSpeakers': 'التمييز بين المتحدثين',
+  'enterFileName': 'أدخل اسم الملف',
+  'findMore': 'اكتشف المزيد',
+  'finishRecording': 'إنهاء التسجيل',
+  'importAudioFromAppWeb': 'استورد الصوت من التطبيق أو الويب لتفريغه وتلخيصه',
+  'industrySpecificSummaryTemplate': 'قوالب ملخصات احترافية مصمّمة لمجالك',
+  'markFavorite': 'إضافة إلى المفضلة',
+  'monthlyTranscriptionDuration': '300 دقيقة تفريغ نصي شهريًا',
+  'noDevicesFound': 'لم يتم العثور على أجهزة',
+  'notBound': 'غير مرتبط',
+  'notCharging': 'لا يتم الشحن',
+  'pauseRecording': 'إيقاف التسجيل مؤقتًا',
+  'pleaseEnterVerificationCode': 'الرجاء إدخال رمز التحقق',
+  'scanIdle': 'لا يوجد بحث',
+  'scanning': 'جارٍ البحث...',
+  'startScan': 'بدء البحث',
+  'stopScan': 'إيقاف البحث',
+  'storageBytes': 'إجمالي التخزين',
+  'storageUploads': 'عمليات الرفع',
+  'unmarkFavorite': 'إزالة من المفضلة',
+  'unnamedDevice': 'جهاز بلا اسم',
+  'userDataParseFailed': 'تعذّر تحليل بيانات المستخدم',
 };
diff --git a/apps/client/lib/core/translations/language/bg_bg.dart b/apps/client/lib/core/translations/language/bg_bg.dart
index 5234ca7f..f94cf673 100644
--- a/apps/client/lib/core/translations/language/bg_bg.dart
+++ b/apps/client/lib/core/translations/language/bg_bg.dart
@@ -1814,4 +1814,60 @@ const Map<String, String> bgBG = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Вече е актуален',
+  'otaCurrentVersion': 'Текуща версия',
+  'otaDone': 'Готово',
+  'otaDownloading': 'Изтегляне на фърмуера...',
+  'otaError': 'Грешка',
+  'otaExitConfirm': 'В момента тече актуализация. Сигурни ли сте, че искате да излезете?',
+  'otaExitTitle': 'Изход от актуализацията',
+  'otaFailed': 'Актуализацията е неуспешна',
+  'otaFailedWithCode': 'Актуализацията е неуспешна (код @code)',
+  'otaKeepConnectedWarning': 'По време на актуализацията дръжте устройството наблизо и не затваряйте приложението.',
+  'otaLatestVersion': 'Най-нова версия',
+  'otaNeedConnect': 'Първо свържете устройство',
+  'otaNotConnectedTip': 'Не е открито свързано устройство. Свържете слушалките, преди да актуализирате.',
+  'otaPreparing': 'Подготовка...',
+  'otaStartUpgrade': 'Стартиране на актуализацията',
+  'otaSuccessReboot': 'Актуализацията е успешна. Рестартирайте устройството.',
+  'otaTimeout': 'Времето за актуализация изтече. Опитайте отново.',
+  'otaUnknownDevice': 'Неизвестно устройство',
+  'otaUpdateAvailable': 'Налична е актуализация',
+  'otaUpgrading': 'Актуализиране... @percent%',
+  'otaUpgradingShort': 'Актуализиране...',
+  'otaDownloadPreparing': 'Подготовка за изтегляне на фърмуера...',
+  'otaFirmwareCached': 'Фърмуерът е готов, подготовка за актуализация...',
+  'otaDownloadStarted': 'Изтеглянето на фърмуера започна...',
+  'otaDownloadingPercent': 'Изтегляне на фърмуера... @percent%',
+  'otaDownloadDone': 'Изтеглянето завърши, подготовка за актуализация...',
+  'addDevice': 'Добавяне на устройство',
+  'deviceConnectionRestricted': 'Връзката с устройството е ограничена: устройството не е оторизирано',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Автоматични обобщения с шаблони Autopilot',
+  'bindImmediately': 'Свържи сега',
+  'disconnect': 'Прекъсване',
+  'discoveredDevices': 'Открити устройства',
+  'distinguishDifferentSpeakers': 'Различаване на говорещите',
+  'enterFileName': 'Въведете име на файл',
+  'findMore': 'Открий още',
+  'finishRecording': 'Край на записа',
+  'importAudioFromAppWeb': 'Импортирайте аудио от приложението или уеб, за да го транскрибирате и обобщите',
+  'industrySpecificSummaryTemplate': 'Професионални шаблони за обобщение за вашия бранш',
+  'markFavorite': 'Добави в любими',
+  'monthlyTranscriptionDuration': '300 минути транскрипция месечно',
+  'noDevicesFound': 'Не са открити устройства',
+  'notBound': 'Не е свързано',
+  'notCharging': 'Не се зарежда',
+  'pauseRecording': 'Пауза на записа',
+  'pleaseEnterVerificationCode': 'Въведете кода за потвърждение',
+  'scanIdle': 'Не се сканира',
+  'scanning': 'Сканиране...',
+  'startScan': 'Започни сканиране',
+  'stopScan': 'Спри сканирането',
+  'storageBytes': 'Общо хранилище',
+  'storageUploads': 'Качвания',
+  'unmarkFavorite': 'Премахни от любими',
+  'unnamedDevice': 'Устройство без име',
+  'userDataParseFailed': 'Данните на потребителя не бяха разчетени',
 };
diff --git a/apps/client/lib/core/translations/language/cs_cz.dart b/apps/client/lib/core/translations/language/cs_cz.dart
index 32ae85b4..4b0fbc25 100644
--- a/apps/client/lib/core/translations/language/cs_cz.dart
+++ b/apps/client/lib/core/translations/language/cs_cz.dart
@@ -1782,4 +1782,60 @@ const Map<String, String> csCZ = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Již aktuální',
+  'otaCurrentVersion': 'Aktuální verze',
+  'otaDone': 'Hotovo',
+  'otaDownloading': 'Stahování firmwaru...',
+  'otaError': 'Chyba',
+  'otaExitConfirm': 'Probíhá aktualizace. Opravdu chcete odejít?',
+  'otaExitTitle': 'Ukončit aktualizaci',
+  'otaFailed': 'Aktualizace se nezdařila',
+  'otaFailedWithCode': 'Aktualizace se nezdařila (kód @code)',
+  'otaKeepConnectedWarning': 'Během aktualizace mějte zařízení nablízku a nezavírejte aplikaci.',
+  'otaLatestVersion': 'Nejnovější verze',
+  'otaNeedConnect': 'Nejprve připojte zařízení',
+  'otaNotConnectedTip': 'Nebylo nalezeno připojené zařízení. Před aktualizací připojte sluchátka.',
+  'otaPreparing': 'Příprava...',
+  'otaStartUpgrade': 'Spustit aktualizaci',
+  'otaSuccessReboot': 'Aktualizace proběhla úspěšně. Restartujte zařízení.',
+  'otaTimeout': 'Vypršel časový limit aktualizace. Zkuste to znovu.',
+  'otaUnknownDevice': 'Neznámé zařízení',
+  'otaUpdateAvailable': 'Je k dispozici aktualizace',
+  'otaUpgrading': 'Aktualizace... @percent%',
+  'otaUpgradingShort': 'Aktualizace...',
+  'otaDownloadPreparing': 'Příprava stahování firmwaru...',
+  'otaFirmwareCached': 'Firmware připraven, příprava aktualizace...',
+  'otaDownloadStarted': 'Stahování firmwaru zahájeno...',
+  'otaDownloadingPercent': 'Stahování firmwaru... @percent%',
+  'otaDownloadDone': 'Stahování dokončeno, příprava aktualizace...',
+  'addDevice': 'Přidat zařízení',
+  'deviceConnectionRestricted': 'Připojení zařízení je omezeno: toto zařízení není autorizováno',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatická shrnutí ze šablon Autopilot',
+  'bindImmediately': 'Spárovat nyní',
+  'disconnect': 'Odpojit',
+  'discoveredDevices': 'Nalezená zařízení',
+  'distinguishDifferentSpeakers': 'Rozlišení mluvčích',
+  'enterFileName': 'Zadejte název souboru',
+  'findMore': 'Objevit více',
+  'finishRecording': 'Ukončit nahrávání',
+  'importAudioFromAppWeb': 'Importujte zvuk z aplikace nebo webu, přepište jej a shrňte',
+  'industrySpecificSummaryTemplate': 'Profesionální šablony shrnutí pro váš obor',
+  'markFavorite': 'Přidat k oblíbeným',
+  'monthlyTranscriptionDuration': '300 minut přepisu měsíčně',
+  'noDevicesFound': 'Nebyla nalezena žádná zařízení',
+  'notBound': 'Nespárováno',
+  'notCharging': 'Nenabíjí se',
+  'pauseRecording': 'Pozastavit nahrávání',
+  'pleaseEnterVerificationCode': 'Zadejte ověřovací kód',
+  'scanIdle': 'Nevyhledává se',
+  'scanning': 'Vyhledávání...',
+  'startScan': 'Spustit vyhledávání',
+  'stopScan': 'Zastavit vyhledávání',
+  'storageBytes': 'Celkové úložiště',
+  'storageUploads': 'Nahrání',
+  'unmarkFavorite': 'Odebrat z oblíbených',
+  'unnamedDevice': 'Nepojmenované zařízení',
+  'userDataParseFailed': 'Data uživatele se nepodařilo načíst',
 };
diff --git a/apps/client/lib/core/translations/language/da_dk.dart b/apps/client/lib/core/translations/language/da_dk.dart
index 90758fe6..823beb12 100644
--- a/apps/client/lib/core/translations/language/da_dk.dart
+++ b/apps/client/lib/core/translations/language/da_dk.dart
@@ -1784,4 +1784,60 @@ const Map<String, String> daDK = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Allerede opdateret',
+  'otaCurrentVersion': 'Nuværende version',
+  'otaDone': 'Færdig',
+  'otaDownloading': 'Downloader firmware...',
+  'otaError': 'Fejl',
+  'otaExitConfirm': 'En opdatering er i gang. Er du sikker på, at du vil afslutte?',
+  'otaExitTitle': 'Afslut opdatering',
+  'otaFailed': 'Opdateringen mislykkedes',
+  'otaFailedWithCode': 'Opdateringen mislykkedes (kode @code)',
+  'otaKeepConnectedWarning': 'Hold enheden tæt på, og luk ikke appen under opdateringen.',
+  'otaLatestVersion': 'Nyeste version',
+  'otaNeedConnect': 'Tilslut først en enhed',
+  'otaNotConnectedTip': 'Ingen tilsluttet enhed fundet. Tilslut dine øretelefoner før opdatering.',
+  'otaPreparing': 'Forbereder...',
+  'otaStartUpgrade': 'Start opdatering',
+  'otaSuccessReboot': 'Opdateringen lykkedes. Genstart enheden.',
+  'otaTimeout': 'Opdateringen fik timeout. Prøv igen.',
+  'otaUnknownDevice': 'Ukendt enhed',
+  'otaUpdateAvailable': 'Opdatering tilgængelig',
+  'otaUpgrading': 'Opdaterer... @percent%',
+  'otaUpgradingShort': 'Opdaterer...',
+  'otaDownloadPreparing': 'Forbereder download af firmware...',
+  'otaFirmwareCached': 'Firmware klar, forbereder opdatering...',
+  'otaDownloadStarted': 'Download af firmware startet...',
+  'otaDownloadingPercent': 'Downloader firmware... @percent%',
+  'otaDownloadDone': 'Download fuldført, forbereder opdatering...',
+  'addDevice': 'Tilføj enhed',
+  'deviceConnectionRestricted': 'Enhedsforbindelse begrænset: enheden er ikke autoriseret',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatiske opsummeringer med Autopilot-skabeloner',
+  'bindImmediately': 'Tilknyt nu',
+  'disconnect': 'Afbryd forbindelsen',
+  'discoveredDevices': 'Fundne enheder',
+  'distinguishDifferentSpeakers': 'Skeln mellem talere',
+  'enterFileName': 'Indtast et filnavn',
+  'findMore': 'Opdag mere',
+  'finishRecording': 'Afslut optagelse',
+  'importAudioFromAppWeb': 'Importér lyd fra appen eller nettet for at transskribere og opsummere',
+  'industrySpecificSummaryTemplate': 'Professionelle opsummeringsskabeloner til din branche',
+  'markFavorite': 'Føj til favoritter',
+  'monthlyTranscriptionDuration': '300 minutters transskription om måneden',
+  'noDevicesFound': 'Der blev ikke fundet nogen enheder',
+  'notBound': 'Ikke tilknyttet',
+  'notCharging': 'Oplader ikke',
+  'pauseRecording': 'Sæt optagelsen på pause',
+  'pleaseEnterVerificationCode': 'Indtast bekræftelseskoden',
+  'scanIdle': 'Søger ikke',
+  'scanning': 'Søger...',
+  'startScan': 'Start søgning',
+  'stopScan': 'Stop søgning',
+  'storageBytes': 'Samlet lagerplads',
+  'storageUploads': 'Uploads',
+  'unmarkFavorite': 'Fjern fra favoritter',
+  'unnamedDevice': 'Enhed uden navn',
+  'userDataParseFailed': 'Brugerdata kunne ikke læses',
 };
diff --git a/apps/client/lib/core/translations/language/de_de.dart b/apps/client/lib/core/translations/language/de_de.dart
index bbda7d21..ab0c617d 100644
--- a/apps/client/lib/core/translations/language/de_de.dart
+++ b/apps/client/lib/core/translations/language/de_de.dart
@@ -1797,7 +1797,7 @@ const Map<String, String> deDE = {
   'currentConnection': 'Aktuelle Verbindung',
   'binding': 'Wird verbunden…',
   'tabDevice': 'Geräte',
-  'tabTodo': 'To-do',
+  'tabTodo': 'Remin',
   'tabPlaza': 'Plaza',
   'sloganHome': 'Technik für ein smarteres Leben',
   'sloganAi': 'Grenzenlose Intelligenz',
@@ -2071,4 +2071,59 @@ const Map<String, String> deDE = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Bereits aktuell',
+  'otaCurrentVersion': 'Aktuelle Version',
+  'otaDone': 'Fertig',
+  'otaDownloading': 'Firmware wird heruntergeladen...',
+  'otaError': 'Fehler',
+  'otaExitConfirm': 'Ein Update läuft. Möchten Sie wirklich beenden?',
+  'otaExitTitle': 'Update beenden',
+  'otaFailed': 'Update fehlgeschlagen',
+  'otaFailedWithCode': 'Update fehlgeschlagen (Code @code)',
+  'otaKeepConnectedWarning': 'Halten Sie das Gerät während des Updates in der Nähe und schließen Sie die App nicht.',
+  'otaLatestVersion': 'Neueste Version',
+  'otaNeedConnect': 'Bitte zuerst ein Gerät verbinden',
+  'otaNotConnectedTip': 'Kein verbundenes Gerät gefunden. Bitte verbinden Sie Ihre Kopfhörer vor dem Update.',
+  'otaPreparing': 'Wird vorbereitet...',
+  'otaStartUpgrade': 'Update starten',
+  'otaSuccessReboot': 'Update erfolgreich. Bitte starten Sie das Gerät neu.',
+  'otaTimeout': 'Zeitüberschreitung beim Update. Bitte erneut versuchen.',
+  'otaUnknownDevice': 'Unbekanntes Gerät',
+  'otaUpdateAvailable': 'Update verfügbar',
+  'otaUpgrading': 'Update läuft... @percent%',
+  'otaUpgradingShort': 'Update läuft...',
+  'otaDownloadPreparing': 'Download der Firmware wird vorbereitet...',
+  'otaFirmwareCached': 'Firmware bereit, Update wird vorbereitet...',
+  'otaDownloadStarted': 'Firmware-Download gestartet...',
+  'otaDownloadingPercent': 'Firmware wird heruntergeladen... @percent%',
+  'otaDownloadDone': 'Download abgeschlossen, Update wird vorbereitet...',
+  'deviceConnectionRestricted': 'Geräteverbindung eingeschränkt: Dieses Gerät ist nicht autorisiert',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatische Zusammenfassungen mit Autopilot-Vorlagen',
+  'bindImmediately': 'Jetzt koppeln',
+  'disconnect': 'Trennen',
+  'discoveredDevices': 'Gefundene Geräte',
+  'distinguishDifferentSpeakers': 'Sprecher unterscheiden',
+  'enterFileName': 'Dateinamen eingeben',
+  'findMore': 'Mehr entdecken',
+  'finishRecording': 'Aufnahme beenden',
+  'importAudioFromAppWeb': 'Audio aus App oder Web importieren, transkribieren und zusammenfassen',
+  'industrySpecificSummaryTemplate': 'Professionelle Zusammenfassungsvorlagen für Ihre Branche',
+  'markFavorite': 'Zu Favoriten hinzufügen',
+  'monthlyTranscriptionDuration': '300 Minuten Transkription pro Monat',
+  'noDevicesFound': 'Keine Geräte gefunden',
+  'notBound': 'Nicht gekoppelt',
+  'notCharging': 'Lädt nicht',
+  'pauseRecording': 'Aufnahme pausieren',
+  'pleaseEnterVerificationCode': 'Bitte Bestätigungscode eingeben',
+  'scanIdle': 'Sucht nicht',
+  'scanning': 'Suche läuft ...',
+  'startScan': 'Suche starten',
+  'stopScan': 'Suche stoppen',
+  'storageBytes': 'Gesamter Speicher',
+  'storageUploads': 'Uploads',
+  'unmarkFavorite': 'Aus Favoriten entfernen',
+  'unnamedDevice': 'Unbenanntes Gerät',
+  'userDataParseFailed': 'Benutzerdaten konnten nicht gelesen werden',
 };
diff --git a/apps/client/lib/core/translations/language/el_gr.dart b/apps/client/lib/core/translations/language/el_gr.dart
index 3894bde2..aee4af11 100644
--- a/apps/client/lib/core/translations/language/el_gr.dart
+++ b/apps/client/lib/core/translations/language/el_gr.dart
@@ -1818,4 +1818,60 @@ const Map<String, String> elGR = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Ήδη ενημερωμένο',
+  'otaCurrentVersion': 'Τρέχουσα έκδοση',
+  'otaDone': 'Τέλος',
+  'otaDownloading': 'Λήψη υλικολογισμικού...',
+  'otaError': 'Σφάλμα',
+  'otaExitConfirm': 'Μια αναβάθμιση βρίσκεται σε εξέλιξη. Θέλετε σίγουρα να βγείτε;',
+  'otaExitTitle': 'Έξοδος από την αναβάθμιση',
+  'otaFailed': 'Η αναβάθμιση απέτυχε',
+  'otaFailedWithCode': 'Η αναβάθμιση απέτυχε (κωδικός @code)',
+  'otaKeepConnectedWarning': 'Κρατήστε τη συσκευή κοντά και μην κλείσετε την εφαρμογή κατά την αναβάθμιση.',
+  'otaLatestVersion': 'Τελευταία έκδοση',
+  'otaNeedConnect': 'Συνδέστε πρώτα μια συσκευή',
+  'otaNotConnectedTip': 'Δεν εντοπίστηκε συνδεδεμένη συσκευή. Συνδέστε τα ακουστικά σας πριν την αναβάθμιση.',
+  'otaPreparing': 'Προετοιμασία...',
+  'otaStartUpgrade': 'Έναρξη αναβάθμισης',
+  'otaSuccessReboot': 'Η αναβάθμιση ολοκληρώθηκε. Επανεκκινήστε τη συσκευή.',
+  'otaTimeout': 'Λήξη χρόνου αναβάθμισης. Δοκιμάστε ξανά.',
+  'otaUnknownDevice': 'Άγνωστη συσκευή',
+  'otaUpdateAvailable': 'Διαθέσιμη ενημέρωση',
+  'otaUpgrading': 'Αναβάθμιση... @percent%',
+  'otaUpgradingShort': 'Αναβάθμιση...',
+  'otaDownloadPreparing': 'Προετοιμασία λήψης υλικολογισμικού...',
+  'otaFirmwareCached': 'Το υλικολογισμικό είναι έτοιμο, προετοιμασία αναβάθμισης...',
+  'otaDownloadStarted': 'Η λήψη υλικολογισμικού ξεκίνησε...',
+  'otaDownloadingPercent': 'Λήψη υλικολογισμικού... @percent%',
+  'otaDownloadDone': 'Η λήψη ολοκληρώθηκε, προετοιμασία αναβάθμισης...',
+  'addDevice': 'Προσθήκη συσκευής',
+  'deviceConnectionRestricted': 'Περιορισμένη σύνδεση συσκευής: η συσκευή δεν είναι εξουσιοδοτημένη',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Αυτόματες συνόψεις με πρότυπα Autopilot',
+  'bindImmediately': 'Σύνδεση τώρα',
+  'disconnect': 'Αποσύνδεση',
+  'discoveredDevices': 'Συσκευές που βρέθηκαν',
+  'distinguishDifferentSpeakers': 'Διάκριση ομιλητών',
+  'enterFileName': 'Εισαγάγετε όνομα αρχείου',
+  'findMore': 'Ανακαλύψτε περισσότερα',
+  'finishRecording': 'Ολοκλήρωση εγγραφής',
+  'importAudioFromAppWeb': 'Εισαγάγετε ήχο από την εφαρμογή ή το web για απομαγνητοφώνηση και σύνοψη',
+  'industrySpecificSummaryTemplate': 'Επαγγελματικά πρότυπα σύνοψης για τον κλάδο σας',
+  'markFavorite': 'Προσθήκη στα αγαπημένα',
+  'monthlyTranscriptionDuration': '300 λεπτά απομαγνητοφώνησης τον μήνα',
+  'noDevicesFound': 'Δεν βρέθηκαν συσκευές',
+  'notBound': 'Μη συνδεδεμένο',
+  'notCharging': 'Δεν φορτίζει',
+  'pauseRecording': 'Παύση εγγραφής',
+  'pleaseEnterVerificationCode': 'Εισαγάγετε τον κωδικό επαλήθευσης',
+  'scanIdle': 'Δεν γίνεται σάρωση',
+  'scanning': 'Σάρωση...',
+  'startScan': 'Έναρξη σάρωσης',
+  'stopScan': 'Διακοπή σάρωσης',
+  'storageBytes': 'Συνολικός αποθηκευτικός χώρος',
+  'storageUploads': 'Μεταφορτώσεις',
+  'unmarkFavorite': 'Αφαίρεση από τα αγαπημένα',
+  'unnamedDevice': 'Συσκευή χωρίς όνομα',
+  'userDataParseFailed': 'Αποτυχία ανάγνωσης δεδομένων χρήστη',
 };
diff --git a/apps/client/lib/core/translations/language/en_us.dart b/apps/client/lib/core/translations/language/en_us.dart
index 0d3810e2..fd5115d5 100644
--- a/apps/client/lib/core/translations/language/en_us.dart
+++ b/apps/client/lib/core/translations/language/en_us.dart
@@ -1554,6 +1554,8 @@ const Map<String, String> enUS = {
   'otaUpgradeSuccessComplete': 'Upgrade completed successfully',
   'otaUpgradeFailedWithCode': 'Upgrade failed, error code: @code',
   'otaUpgradeFailedTitle': 'Upgrade Failed',
+  'otaBesNotSupported':
+      'This headset does not yet support in-app firmware upgrade. Please contact support.',
   'otaUpgradeFailedDesc':
       'Please check device connection or update package, error code: @code',
   'otaDeviceDisconnected': 'Device disconnected',
@@ -1765,7 +1767,7 @@ const Map<String, String> enUS = {
 
   // ==== 界面文案补齐（自启动授权 / 设备页 / AI页 / 广场 等）====
   'tabDevice': 'Devices',
-  'tabTodo': 'To-Do',
+  'tabTodo': 'Remin',
   'tabPlaza': 'Plaza',
   'sloganHome': 'Technology for a smarter life',
   'sloganAi': 'Limitless intelligence',
@@ -2036,4 +2038,62 @@ const Map<String, String> enUS = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Already up to date',
+  'otaCurrentVersion': 'Current version',
+  'otaDone': 'Done',
+  'otaDownloading': 'Downloading firmware...',
+  'otaError': 'Error',
+  'otaExitConfirm': 'An upgrade is in progress. Are you sure you want to exit?',
+  'otaExitTitle': 'Exit Upgrade',
+  'otaFailed': 'Upgrade failed',
+  'otaFailedWithCode': 'Upgrade failed (code @code)',
+  'otaKeepConnectedWarning':
+      'Keep the device close and do not close the app during the upgrade.',
+  'otaLatestVersion': 'Latest version',
+  'otaNeedConnect': 'Please connect a device first',
+  'otaNotConnectedTip':
+      'No connected device detected. Please connect your earbuds before upgrading.',
+  'otaPreparing': 'Preparing...',
+  'otaStartUpgrade': 'Start Upgrade',
+  'otaSuccessReboot': 'Upgrade succeeded. Please restart the device.',
+  'otaTimeout': 'Upgrade timed out. Please try again.',
+  'otaUnknownDevice': 'Unknown device',
+  'otaUpdateAvailable': 'Update available',
+  'otaUpgrading': 'Upgrading... @percent%',
+  'otaUpgradingShort': 'Upgrading...',
+  'otaDownloadPreparing': 'Preparing to download firmware...',
+  'otaFirmwareCached': 'Firmware ready, preparing to upgrade...',
+  'otaDownloadStarted': 'Downloading firmware...',
+  'otaDownloadingPercent': 'Downloading firmware... @percent%',
+  'otaDownloadDone': 'Download complete, preparing to upgrade...',
+  'deviceConnectionRestricted': 'Device connection restricted: this device is not authorized',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Autopilot template summaries',
+  'bindImmediately': 'Bind Now',
+  'disconnect': 'Disconnect',
+  'discoveredDevices': 'Discovered Devices',
+  'distinguishDifferentSpeakers': 'Distinguish different speakers',
+  'enterFileName': 'Enter a file name',
+  'findMore': 'Discover More',
+  'finishRecording': 'Finish Recording',
+  'importAudioFromAppWeb': 'Import audio from the app or web to transcribe and summarize',
+  'industrySpecificSummaryTemplate': 'Professional summary templates for your industry',
+  'markFavorite': 'Add to Favorites',
+  'monthlyTranscriptionDuration': '300 minutes of transcription per month',
+  'noDevicesFound': 'No devices found',
+  'notBound': 'Not bound',
+  'notCharging': 'Not charging',
+  'pauseRecording': 'Pause Recording',
+  'pleaseEnterVerificationCode': 'Please enter the verification code',
+  'scanIdle': 'Not scanning',
+  'scanning': 'Scanning...',
+  'startScan': 'Start Scan',
+  'stopScan': 'Stop Scan',
+  'storageBytes': 'Total Storage',
+  'storageUploads': 'Uploads',
+  'unmarkFavorite': 'Remove from Favorites',
+  'unnamedDevice': 'Unnamed Device',
+  'userDataParseFailed': 'Failed to parse user data',
 };
diff --git a/apps/client/lib/core/translations/language/es_es.dart b/apps/client/lib/core/translations/language/es_es.dart
index caae21c2..0772d1f6 100644
--- a/apps/client/lib/core/translations/language/es_es.dart
+++ b/apps/client/lib/core/translations/language/es_es.dart
@@ -1768,7 +1768,7 @@ const Map<String, String> esES = {
 
   // ==== 界面文案补齐（自启动授权 / 设备页 / AI页 / 广场 等）====
   'tabDevice': 'Dispositivos',
-  'tabTodo': 'Tareas',
+  'tabTodo': 'Remin',
   'tabPlaza': 'Plaza',
   'sloganHome': 'Tecnología para una vida inteligente',
   'sloganAi': 'Inteligencia sin límites',
@@ -2065,4 +2065,59 @@ const Map<String, String> esES = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Ya está actualizado',
+  'otaCurrentVersion': 'Versión actual',
+  'otaDone': 'Listo',
+  'otaDownloading': 'Descargando firmware...',
+  'otaError': 'Error',
+  'otaExitConfirm': 'Hay una actualización en curso. ¿Seguro que quieres salir?',
+  'otaExitTitle': 'Salir de la actualización',
+  'otaFailed': 'Error en la actualización',
+  'otaFailedWithCode': 'Error en la actualización (código @code)',
+  'otaKeepConnectedWarning': 'Mantén el dispositivo cerca y no cierres la aplicación durante la actualización.',
+  'otaLatestVersion': 'Última versión',
+  'otaNeedConnect': 'Conecta un dispositivo primero',
+  'otaNotConnectedTip': 'No se detectó ningún dispositivo conectado. Conecta tus auriculares antes de actualizar.',
+  'otaPreparing': 'Preparando...',
+  'otaStartUpgrade': 'Iniciar actualización',
+  'otaSuccessReboot': 'Actualización correcta. Reinicia el dispositivo.',
+  'otaTimeout': 'Se agotó el tiempo de la actualización. Inténtalo de nuevo.',
+  'otaUnknownDevice': 'Dispositivo desconocido',
+  'otaUpdateAvailable': 'Actualización disponible',
+  'otaUpgrading': 'Actualizando... @percent%',
+  'otaUpgradingShort': 'Actualizando...',
+  'otaDownloadPreparing': 'Preparando la descarga del firmware...',
+  'otaFirmwareCached': 'Firmware listo, preparando la actualización...',
+  'otaDownloadStarted': 'Descarga del firmware iniciada...',
+  'otaDownloadingPercent': 'Descargando firmware... @percent%',
+  'otaDownloadDone': 'Descarga completa, preparando la actualización...',
+  'deviceConnectionRestricted': 'Conexión del dispositivo restringida: este dispositivo no está autorizado',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Resúmenes automáticos con plantillas Autopilot',
+  'bindImmediately': 'Vincular ahora',
+  'disconnect': 'Desconectar',
+  'discoveredDevices': 'Dispositivos encontrados',
+  'distinguishDifferentSpeakers': 'Distinguir a los hablantes',
+  'enterFileName': 'Introduce un nombre de archivo',
+  'findMore': 'Descubrir más',
+  'finishRecording': 'Finalizar grabación',
+  'importAudioFromAppWeb': 'Importa audio desde la app o la web para transcribirlo y resumirlo',
+  'industrySpecificSummaryTemplate': 'Plantillas de resumen profesionales para tu sector',
+  'markFavorite': 'Añadir a favoritos',
+  'monthlyTranscriptionDuration': '300 minutos de transcripción al mes',
+  'noDevicesFound': 'No se encontraron dispositivos',
+  'notBound': 'Sin vincular',
+  'notCharging': 'No está cargando',
+  'pauseRecording': 'Pausar grabación',
+  'pleaseEnterVerificationCode': 'Introduce el código de verificación',
+  'scanIdle': 'Sin buscar',
+  'scanning': 'Buscando...',
+  'startScan': 'Iniciar búsqueda',
+  'stopScan': 'Detener búsqueda',
+  'storageBytes': 'Almacenamiento total',
+  'storageUploads': 'Subidas',
+  'unmarkFavorite': 'Quitar de favoritos',
+  'unnamedDevice': 'Dispositivo sin nombre',
+  'userDataParseFailed': 'Error al procesar los datos del usuario',
 };
diff --git a/apps/client/lib/core/translations/language/et_ee.dart b/apps/client/lib/core/translations/language/et_ee.dart
index 1fca854f..0f42e167 100644
--- a/apps/client/lib/core/translations/language/et_ee.dart
+++ b/apps/client/lib/core/translations/language/et_ee.dart
@@ -1778,4 +1778,60 @@ const Map<String, String> etEE = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Juba ajakohane',
+  'otaCurrentVersion': 'Praegune versioon',
+  'otaDone': 'Valmis',
+  'otaDownloading': 'Püsivara allalaadimine...',
+  'otaError': 'Viga',
+  'otaExitConfirm': 'Uuendus on pooleli. Kas soovite kindlasti väljuda?',
+  'otaExitTitle': 'Välju uuendusest',
+  'otaFailed': 'Uuendamine ebaõnnestus',
+  'otaFailedWithCode': 'Uuendamine ebaõnnestus (kood @code)',
+  'otaKeepConnectedWarning': 'Hoidke seadet uuendamise ajal lähedal ja ärge sulgege rakendust.',
+  'otaLatestVersion': 'Uusim versioon',
+  'otaNeedConnect': 'Ühendage esmalt seade',
+  'otaNotConnectedTip': 'Ühendatud seadet ei leitud. Ühendage enne uuendamist kõrvaklapid.',
+  'otaPreparing': 'Ettevalmistamine...',
+  'otaStartUpgrade': 'Alusta uuendamist',
+  'otaSuccessReboot': 'Uuendamine õnnestus. Taaskäivitage seade.',
+  'otaTimeout': 'Uuendamise ajalõpp. Proovige uuesti.',
+  'otaUnknownDevice': 'Tundmatu seade',
+  'otaUpdateAvailable': 'Saadaval on uuendus',
+  'otaUpgrading': 'Uuendamine... @percent%',
+  'otaUpgradingShort': 'Uuendamine...',
+  'otaDownloadPreparing': 'Püsivara allalaadimise ettevalmistamine...',
+  'otaFirmwareCached': 'Püsivara on valmis, uuendamise ettevalmistamine...',
+  'otaDownloadStarted': 'Püsivara allalaadimine algas...',
+  'otaDownloadingPercent': 'Püsivara allalaadimine... @percent%',
+  'otaDownloadDone': 'Allalaadimine lõpetatud, uuendamise ettevalmistamine...',
+  'addDevice': 'Lisa seade',
+  'deviceConnectionRestricted': 'Seadme ühendus on piiratud: see seade pole autoriseeritud',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automaatsed kokkuvõtted Autopiloti mallidega',
+  'bindImmediately': 'Seo kohe',
+  'disconnect': 'Katkesta ühendus',
+  'discoveredDevices': 'Leitud seadmed',
+  'distinguishDifferentSpeakers': 'Kõnelejate eristamine',
+  'enterFileName': 'Sisestage faili nimi',
+  'findMore': 'Avasta rohkem',
+  'finishRecording': 'Lõpeta salvestus',
+  'importAudioFromAppWeb': 'Impordi heli rakendusest või veebist, et see transkribeerida ja kokku võtta',
+  'industrySpecificSummaryTemplate': 'Professionaalsed kokkuvõttemallid teie valdkonna jaoks',
+  'markFavorite': 'Lisa lemmikutesse',
+  'monthlyTranscriptionDuration': '300 minutit transkribeerimist kuus',
+  'noDevicesFound': 'Seadmeid ei leitud',
+  'notBound': 'Sidumata',
+  'notCharging': 'Ei lae',
+  'pauseRecording': 'Peata salvestus',
+  'pleaseEnterVerificationCode': 'Sisestage kinnituskood',
+  'scanIdle': 'Otsingut ei toimu',
+  'scanning': 'Otsin...',
+  'startScan': 'Alusta otsingut',
+  'stopScan': 'Peata otsing',
+  'storageBytes': 'Salvestusruum kokku',
+  'storageUploads': 'Üleslaadimised',
+  'unmarkFavorite': 'Eemalda lemmikutest',
+  'unnamedDevice': 'Nimeta seade',
+  'userDataParseFailed': 'Kasutajaandmete lugemine ebaõnnestus',
 };
diff --git a/apps/client/lib/core/translations/language/fa_ir.dart b/apps/client/lib/core/translations/language/fa_ir.dart
index 57a554cc..fa0e6b24 100644
--- a/apps/client/lib/core/translations/language/fa_ir.dart
+++ b/apps/client/lib/core/translations/language/fa_ir.dart
@@ -1769,4 +1769,60 @@ const Map<String, String> faIR = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'هم‌اکنون به‌روز است',
+  'otaCurrentVersion': 'نسخهٔ فعلی',
+  'otaDone': 'انجام شد',
+  'otaDownloading': 'در حال دانلود میان‌افزار...',
+  'otaError': 'خطا',
+  'otaExitConfirm': 'ارتقا در حال انجام است. مطمئنید می‌خواهید خارج شوید؟',
+  'otaExitTitle': 'خروج از ارتقا',
+  'otaFailed': 'ارتقا ناموفق بود',
+  'otaFailedWithCode': 'ارتقا ناموفق بود (کد @code)',
+  'otaKeepConnectedWarning': 'در حین ارتقا دستگاه را نزدیک نگه دارید و برنامه را نبندید.',
+  'otaLatestVersion': 'آخرین نسخه',
+  'otaNeedConnect': 'لطفاً ابتدا یک دستگاه وصل کنید',
+  'otaNotConnectedTip': 'دستگاه متصلی یافت نشد. پیش از ارتقا هدفون خود را وصل کنید.',
+  'otaPreparing': 'در حال آماده‌سازی...',
+  'otaStartUpgrade': 'شروع ارتقا',
+  'otaSuccessReboot': 'ارتقا با موفقیت انجام شد. لطفاً دستگاه را دوباره راه‌اندازی کنید.',
+  'otaTimeout': 'زمان ارتقا به پایان رسید. لطفاً دوباره تلاش کنید.',
+  'otaUnknownDevice': 'دستگاه ناشناخته',
+  'otaUpdateAvailable': 'به‌روزرسانی موجود است',
+  'otaUpgrading': 'در حال ارتقا... @percent%',
+  'otaUpgradingShort': 'در حال ارتقا...',
+  'otaDownloadPreparing': 'در حال آماده‌سازی دانلود میان‌افزار...',
+  'otaFirmwareCached': 'میان‌افزار آماده است، در حال آماده‌سازی ارتقا...',
+  'otaDownloadStarted': 'دانلود میان‌افزار آغاز شد...',
+  'otaDownloadingPercent': 'در حال دانلود میان‌افزار... @percent%',
+  'otaDownloadDone': 'دانلود کامل شد، در حال آماده‌سازی ارتقا...',
+  'addDevice': 'افزودن دستگاه',
+  'deviceConnectionRestricted': 'اتصال دستگاه محدود است: این دستگاه مجاز نیست',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'خلاصه‌سازی خودکار با قالب‌های Autopilot',
+  'bindImmediately': 'اتصال فوری',
+  'disconnect': 'قطع اتصال',
+  'discoveredDevices': 'دستگاه‌های یافت‌شده',
+  'distinguishDifferentSpeakers': 'تشخیص گویندگان مختلف',
+  'enterFileName': 'نام فایل را وارد کنید',
+  'findMore': 'بیشتر ببینید',
+  'finishRecording': 'پایان ضبط',
+  'importAudioFromAppWeb': 'صدا را از برنامه یا وب وارد کنید تا پیاده‌سازی و خلاصه شود',
+  'industrySpecificSummaryTemplate': 'قالب‌های خلاصه حرفه‌ای متناسب با صنعت شما',
+  'markFavorite': 'افزودن به علاقه‌مندی‌ها',
+  'monthlyTranscriptionDuration': 'ماهانه ۳۰۰ دقیقه پیاده‌سازی متن',
+  'noDevicesFound': 'دستگاهی یافت نشد',
+  'notBound': 'متصل نشده',
+  'notCharging': 'در حال شارژ نیست',
+  'pauseRecording': 'توقف موقت ضبط',
+  'pleaseEnterVerificationCode': 'لطفاً کد تأیید را وارد کنید',
+  'scanIdle': 'در حال جست‌وجو نیست',
+  'scanning': 'در حال جست‌وجو...',
+  'startScan': 'شروع جست‌وجو',
+  'stopScan': 'توقف جست‌وجو',
+  'storageBytes': 'کل فضای ذخیره‌سازی',
+  'storageUploads': 'بارگذاری‌ها',
+  'unmarkFavorite': 'حذف از علاقه‌مندی‌ها',
+  'unnamedDevice': 'دستگاه بدون نام',
+  'userDataParseFailed': 'تحلیل داده‌های کاربر ناموفق بود',
 };
diff --git a/apps/client/lib/core/translations/language/fi_fi.dart b/apps/client/lib/core/translations/language/fi_fi.dart
index 8a1852ad..4fd4b4b9 100644
--- a/apps/client/lib/core/translations/language/fi_fi.dart
+++ b/apps/client/lib/core/translations/language/fi_fi.dart
@@ -1788,4 +1788,60 @@ const Map<String, String> fiFI = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Jo ajan tasalla',
+  'otaCurrentVersion': 'Nykyinen versio',
+  'otaDone': 'Valmis',
+  'otaDownloading': 'Ladataan laiteohjelmistoa...',
+  'otaError': 'Virhe',
+  'otaExitConfirm': 'Päivitys on käynnissä. Haluatko varmasti poistua?',
+  'otaExitTitle': 'Poistu päivityksestä',
+  'otaFailed': 'Päivitys epäonnistui',
+  'otaFailedWithCode': 'Päivitys epäonnistui (koodi @code)',
+  'otaKeepConnectedWarning': 'Pidä laite lähellä äläkä sulje sovellusta päivityksen aikana.',
+  'otaLatestVersion': 'Uusin versio',
+  'otaNeedConnect': 'Yhdistä ensin laite',
+  'otaNotConnectedTip': 'Yhdistettyä laitetta ei löytynyt. Yhdistä kuulokkeet ennen päivitystä.',
+  'otaPreparing': 'Valmistellaan...',
+  'otaStartUpgrade': 'Aloita päivitys',
+  'otaSuccessReboot': 'Päivitys onnistui. Käynnistä laite uudelleen.',
+  'otaTimeout': 'Päivityksen aikakatkaisu. Yritä uudelleen.',
+  'otaUnknownDevice': 'Tuntematon laite',
+  'otaUpdateAvailable': 'Päivitys saatavilla',
+  'otaUpgrading': 'Päivitetään... @percent%',
+  'otaUpgradingShort': 'Päivitetään...',
+  'otaDownloadPreparing': 'Valmistellaan laiteohjelmiston latausta...',
+  'otaFirmwareCached': 'Laiteohjelmisto valmis, valmistellaan päivitystä...',
+  'otaDownloadStarted': 'Laiteohjelmiston lataus alkoi...',
+  'otaDownloadingPercent': 'Ladataan laiteohjelmistoa... @percent%',
+  'otaDownloadDone': 'Lataus valmis, valmistellaan päivitystä...',
+  'addDevice': 'Lisää laite',
+  'deviceConnectionRestricted': 'Laitteen yhteys on rajoitettu: laitetta ei ole valtuutettu',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automaattiset koosteet Autopilot-malleilla',
+  'bindImmediately': 'Yhdistä nyt',
+  'disconnect': 'Katkaise yhteys',
+  'discoveredDevices': 'Löydetyt laitteet',
+  'distinguishDifferentSpeakers': 'Puhujien erottelu',
+  'enterFileName': 'Anna tiedostonimi',
+  'findMore': 'Tutustu lisää',
+  'finishRecording': 'Lopeta tallennus',
+  'importAudioFromAppWeb': 'Tuo ääntä sovelluksesta tai verkosta litteroitavaksi ja tiivistettäväksi',
+  'industrySpecificSummaryTemplate': 'Ammattimaiset koostemallit toimialallesi',
+  'markFavorite': 'Lisää suosikkeihin',
+  'monthlyTranscriptionDuration': '300 minuuttia litterointia kuukaudessa',
+  'noDevicesFound': 'Laitteita ei löytynyt',
+  'notBound': 'Ei yhdistetty',
+  'notCharging': 'Ei lataudu',
+  'pauseRecording': 'Keskeytä tallennus',
+  'pleaseEnterVerificationCode': 'Anna vahvistuskoodi',
+  'scanIdle': 'Ei haeta',
+  'scanning': 'Haetaan...',
+  'startScan': 'Aloita haku',
+  'stopScan': 'Lopeta haku',
+  'storageBytes': 'Tallennustila yhteensä',
+  'storageUploads': 'Lataukset',
+  'unmarkFavorite': 'Poista suosikeista',
+  'unnamedDevice': 'Nimetön laite',
+  'userDataParseFailed': 'Käyttäjätietojen luku epäonnistui',
 };
diff --git a/apps/client/lib/core/translations/language/fr_fr.dart b/apps/client/lib/core/translations/language/fr_fr.dart
index 81d107ef..a7e479a2 100644
--- a/apps/client/lib/core/translations/language/fr_fr.dart
+++ b/apps/client/lib/core/translations/language/fr_fr.dart
@@ -1807,7 +1807,7 @@ const Map<String, String> frFR = {
   'currentConnection': 'Connexion actuelle',
   'binding': 'Association…',
   'tabDevice': 'Appareils',
-  'tabTodo': 'À faire',
+  'tabTodo': 'Remin',
   'tabPlaza': 'Plaza',
   'sloganHome': 'La technologie au service du quotidien',
   'sloganAi': 'Une intelligence sans limites',
@@ -2084,4 +2084,59 @@ const Map<String, String> frFR = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Déjà à jour',
+  'otaCurrentVersion': 'Version actuelle',
+  'otaDone': 'Terminé',
+  'otaDownloading': 'Téléchargement du firmware...',
+  'otaError': 'Erreur',
+  'otaExitConfirm': 'Une mise à jour est en cours. Voulez-vous vraiment quitter ?',
+  'otaExitTitle': 'Quitter la mise à jour',
+  'otaFailed': 'Échec de la mise à jour',
+  'otaFailedWithCode': 'Échec de la mise à jour (code @code)',
+  'otaKeepConnectedWarning': 'Gardez l’appareil à proximité et ne fermez pas l’application pendant la mise à jour.',
+  'otaLatestVersion': 'Dernière version',
+  'otaNeedConnect': 'Veuillez d’abord connecter un appareil',
+  'otaNotConnectedTip': 'Aucun appareil connecté détecté. Connectez vos écouteurs avant la mise à jour.',
+  'otaPreparing': 'Préparation...',
+  'otaStartUpgrade': 'Démarrer la mise à jour',
+  'otaSuccessReboot': 'Mise à jour réussie. Veuillez redémarrer l’appareil.',
+  'otaTimeout': 'Délai de mise à jour dépassé. Veuillez réessayer.',
+  'otaUnknownDevice': 'Appareil inconnu',
+  'otaUpdateAvailable': 'Mise à jour disponible',
+  'otaUpgrading': 'Mise à jour... @percent%',
+  'otaUpgradingShort': 'Mise à jour en cours...',
+  'otaDownloadPreparing': 'Préparation du téléchargement du firmware...',
+  'otaFirmwareCached': 'Firmware prêt, préparation de la mise à jour...',
+  'otaDownloadStarted': 'Téléchargement du firmware démarré...',
+  'otaDownloadingPercent': 'Téléchargement du firmware... @percent%',
+  'otaDownloadDone': 'Téléchargement terminé, préparation de la mise à jour...',
+  "deviceConnectionRestricted": "Connexion de l'appareil restreinte : cet appareil n'est pas autorisé",
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Résumés automatiques avec les modèles Autopilot',
+  'bindImmediately': 'Associer maintenant',
+  'disconnect': 'Déconnecter',
+  'discoveredDevices': 'Appareils détectés',
+  'distinguishDifferentSpeakers': 'Distinguer les intervenants',
+  'enterFileName': 'Saisissez un nom de fichier',
+  'findMore': 'En découvrir plus',
+  'finishRecording': "Terminer l'enregistrement",
+  'importAudioFromAppWeb': "Importez de l'audio depuis l'app ou le web pour le transcrire et le résumer",
+  'industrySpecificSummaryTemplate': 'Modèles de résumé professionnels conçus pour votre secteur',
+  'markFavorite': 'Ajouter aux favoris',
+  'monthlyTranscriptionDuration': '300 minutes de transcription par mois',
+  'noDevicesFound': 'Aucun appareil trouvé',
+  'notBound': 'Non associé',
+  'notCharging': 'Pas en charge',
+  'pauseRecording': "Suspendre l'enregistrement",
+  'pleaseEnterVerificationCode': 'Veuillez saisir le code de vérification',
+  'scanIdle': 'Aucune recherche',
+  'scanning': 'Recherche en cours...',
+  'startScan': 'Lancer la recherche',
+  'stopScan': 'Arrêter la recherche',
+  'storageBytes': 'Stockage total',
+  'storageUploads': 'Envois',
+  'unmarkFavorite': 'Retirer des favoris',
+  'unnamedDevice': 'Appareil sans nom',
+  'userDataParseFailed': "Échec de l'analyse des données utilisateur",
 };
diff --git a/apps/client/lib/core/translations/language/hi_in.dart b/apps/client/lib/core/translations/language/hi_in.dart
index 5ba7f3dc..86235074 100644
--- a/apps/client/lib/core/translations/language/hi_in.dart
+++ b/apps/client/lib/core/translations/language/hi_in.dart
@@ -1787,4 +1787,60 @@ const Map<String, String> hiIN = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'पहले से नवीनतम है',
+  'otaCurrentVersion': 'वर्तमान संस्करण',
+  'otaDone': 'पूर्ण',
+  'otaDownloading': 'फ़र्मवेयर डाउनलोड हो रहा है...',
+  'otaError': 'त्रुटि',
+  'otaExitConfirm': 'अपग्रेड चल रहा है। क्या आप वाकई बाहर निकलना चाहते हैं?',
+  'otaExitTitle': 'अपग्रेड से बाहर निकलें',
+  'otaFailed': 'अपग्रेड विफल',
+  'otaFailedWithCode': 'अपग्रेड विफल (कोड @code)',
+  'otaKeepConnectedWarning': 'अपग्रेड के दौरान डिवाइस को पास रखें और ऐप बंद न करें।',
+  'otaLatestVersion': 'नवीनतम संस्करण',
+  'otaNeedConnect': 'कृपया पहले कोई डिवाइस कनेक्ट करें',
+  'otaNotConnectedTip': 'कोई कनेक्टेड डिवाइस नहीं मिला। अपग्रेड से पहले अपने ईयरफ़ोन कनेक्ट करें।',
+  'otaPreparing': 'तैयार किया जा रहा है...',
+  'otaStartUpgrade': 'अपग्रेड शुरू करें',
+  'otaSuccessReboot': 'अपग्रेड सफल। कृपया डिवाइस को पुनः चालू करें।',
+  'otaTimeout': 'अपग्रेड का समय समाप्त। कृपया पुनः प्रयास करें।',
+  'otaUnknownDevice': 'अज्ञात डिवाइस',
+  'otaUpdateAvailable': 'अपडेट उपलब्ध है',
+  'otaUpgrading': 'अपग्रेड हो रहा है... @percent%',
+  'otaUpgradingShort': 'अपग्रेड हो रहा है...',
+  'otaDownloadPreparing': 'फ़र्मवेयर डाउनलोड की तैयारी...',
+  'otaFirmwareCached': 'फ़र्मवेयर तैयार है, अपग्रेड की तैयारी...',
+  'otaDownloadStarted': 'फ़र्मवेयर डाउनलोड शुरू...',
+  'otaDownloadingPercent': 'फ़र्मवेयर डाउनलोड हो रहा है... @percent%',
+  'otaDownloadDone': 'डाउनलोड पूर्ण, अपग्रेड की तैयारी...',
+  'addDevice': 'डिवाइस जोड़ें',
+  'deviceConnectionRestricted': 'डिवाइस कनेक्शन प्रतिबंधित: यह डिवाइस अधिकृत नहीं है',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Autopilot टेम्पलेट से स्वतः सारांश',
+  'bindImmediately': 'अभी जोड़ें',
+  'disconnect': 'डिस्कनेक्ट करें',
+  'discoveredDevices': 'मिले हुए डिवाइस',
+  'distinguishDifferentSpeakers': 'अलग-अलग वक्ताओं की पहचान',
+  'enterFileName': 'फ़ाइल का नाम दर्ज करें',
+  'findMore': 'और जानें',
+  'finishRecording': 'रिकॉर्डिंग समाप्त करें',
+  'importAudioFromAppWeb': 'ऐप या वेब से ऑडियो आयात कर उसका ट्रांसक्रिप्शन और सारांश बनाएँ',
+  'industrySpecificSummaryTemplate': 'आपके उद्योग के लिए बने पेशेवर सारांश टेम्पलेट',
+  'markFavorite': 'पसंदीदा में जोड़ें',
+  'monthlyTranscriptionDuration': 'हर महीने 300 मिनट ट्रांसक्रिप्शन',
+  'noDevicesFound': 'कोई डिवाइस नहीं मिला',
+  'notBound': 'जुड़ा नहीं है',
+  'notCharging': 'चार्ज नहीं हो रहा',
+  'pauseRecording': 'रिकॉर्डिंग रोकें',
+  'pleaseEnterVerificationCode': 'कृपया सत्यापन कोड दर्ज करें',
+  'scanIdle': 'स्कैन नहीं हो रहा',
+  'scanning': 'स्कैन हो रहा है...',
+  'startScan': 'स्कैन शुरू करें',
+  'stopScan': 'स्कैन रोकें',
+  'storageBytes': 'कुल संग्रहण',
+  'storageUploads': 'अपलोड',
+  'unmarkFavorite': 'पसंदीदा से हटाएँ',
+  'unnamedDevice': 'बिना नाम का डिवाइस',
+  'userDataParseFailed': 'उपयोगकर्ता डेटा पढ़ने में विफल',
 };
diff --git a/apps/client/lib/core/translations/language/hr_hr.dart b/apps/client/lib/core/translations/language/hr_hr.dart
index b7084402..8aaa0f43 100644
--- a/apps/client/lib/core/translations/language/hr_hr.dart
+++ b/apps/client/lib/core/translations/language/hr_hr.dart
@@ -1803,4 +1803,60 @@ const Map<String, String> hrHR = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Već je ažurno',
+  'otaCurrentVersion': 'Trenutačna verzija',
+  'otaDone': 'Gotovo',
+  'otaDownloading': 'Preuzimanje firmvera...',
+  'otaError': 'Pogreška',
+  'otaExitConfirm': 'Nadogradnja je u tijeku. Želite li stvarno izaći?',
+  'otaExitTitle': 'Izlaz iz nadogradnje',
+  'otaFailed': 'Nadogradnja nije uspjela',
+  'otaFailedWithCode': 'Nadogradnja nije uspjela (kod @code)',
+  'otaKeepConnectedWarning': 'Tijekom nadogradnje držite uređaj blizu i ne zatvarajte aplikaciju.',
+  'otaLatestVersion': 'Najnovija verzija',
+  'otaNeedConnect': 'Najprije povežite uređaj',
+  'otaNotConnectedTip': 'Nije pronađen povezani uređaj. Povežite slušalice prije nadogradnje.',
+  'otaPreparing': 'Priprema...',
+  'otaStartUpgrade': 'Pokreni nadogradnju',
+  'otaSuccessReboot': 'Nadogradnja je uspjela. Ponovno pokrenite uređaj.',
+  'otaTimeout': 'Isteklo je vrijeme nadogradnje. Pokušajte ponovno.',
+  'otaUnknownDevice': 'Nepoznat uređaj',
+  'otaUpdateAvailable': 'Dostupna je nadogradnja',
+  'otaUpgrading': 'Nadogradnja... @percent%',
+  'otaUpgradingShort': 'Nadogradnja...',
+  'otaDownloadPreparing': 'Priprema preuzimanja firmvera...',
+  'otaFirmwareCached': 'Firmver je spreman, priprema nadogradnje...',
+  'otaDownloadStarted': 'Preuzimanje firmvera je započelo...',
+  'otaDownloadingPercent': 'Preuzimanje firmvera... @percent%',
+  'otaDownloadDone': 'Preuzimanje je dovršeno, priprema nadogradnje...',
+  'addDevice': 'Dodaj uređaj',
+  'deviceConnectionRestricted': 'Povezivanje uređaja ograničeno: uređaj nije autoriziran',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatski sažeci pomoću Autopilot predložaka',
+  'bindImmediately': 'Poveži odmah',
+  'disconnect': 'Prekini vezu',
+  'discoveredDevices': 'Pronađeni uređaji',
+  'distinguishDifferentSpeakers': 'Razlikovanje govornika',
+  'enterFileName': 'Unesite naziv datoteke',
+  'findMore': 'Otkrijte više',
+  'finishRecording': 'Završi snimanje',
+  'importAudioFromAppWeb': 'Uvezite zvuk iz aplikacije ili s weba radi transkripcije i sažetka',
+  'industrySpecificSummaryTemplate': 'Profesionalni predlošci sažetaka za vašu djelatnost',
+  'markFavorite': 'Dodaj u favorite',
+  'monthlyTranscriptionDuration': '300 minuta transkripcije mjesečno',
+  'noDevicesFound': 'Nije pronađen nijedan uređaj',
+  'notBound': 'Nije povezano',
+  'notCharging': 'Ne puni se',
+  'pauseRecording': 'Pauziraj snimanje',
+  'pleaseEnterVerificationCode': 'Unesite verifikacijski kod',
+  'scanIdle': 'Ne pretražuje se',
+  'scanning': 'Pretraživanje...',
+  'startScan': 'Pokreni pretragu',
+  'stopScan': 'Zaustavi pretragu',
+  'storageBytes': 'Ukupna pohrana',
+  'storageUploads': 'Prijenosi',
+  'unmarkFavorite': 'Ukloni iz favorita',
+  'unnamedDevice': 'Uređaj bez naziva',
+  'userDataParseFailed': 'Podatke korisnika nije moguće učitati',
 };
diff --git a/apps/client/lib/core/translations/language/hu_hu.dart b/apps/client/lib/core/translations/language/hu_hu.dart
index 954e47ea..cc6c873e 100644
--- a/apps/client/lib/core/translations/language/hu_hu.dart
+++ b/apps/client/lib/core/translations/language/hu_hu.dart
@@ -1806,4 +1806,60 @@ const Map<String, String> huHU = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Már naprakész',
+  'otaCurrentVersion': 'Jelenlegi verzió',
+  'otaDone': 'Kész',
+  'otaDownloading': 'Firmware letöltése...',
+  'otaError': 'Hiba',
+  'otaExitConfirm': 'Frissítés van folyamatban. Biztosan kilép?',
+  'otaExitTitle': 'Kilépés a frissítésből',
+  'otaFailed': 'A frissítés sikertelen',
+  'otaFailedWithCode': 'A frissítés sikertelen (kód: @code)',
+  'otaKeepConnectedWarning': 'A frissítés alatt tartsa közel az eszközt, és ne zárja be az alkalmazást.',
+  'otaLatestVersion': 'Legújabb verzió',
+  'otaNeedConnect': 'Először csatlakoztasson egy eszközt',
+  'otaNotConnectedTip': 'Nem található csatlakoztatott eszköz. Frissítés előtt csatlakoztassa a fülhallgatót.',
+  'otaPreparing': 'Előkészítés...',
+  'otaStartUpgrade': 'Frissítés indítása',
+  'otaSuccessReboot': 'A frissítés sikerült. Indítsa újra az eszközt.',
+  'otaTimeout': 'A frissítés időtúllépés miatt megszakadt. Próbálja újra.',
+  'otaUnknownDevice': 'Ismeretlen eszköz',
+  'otaUpdateAvailable': 'Elérhető frissítés',
+  'otaUpgrading': 'Frissítés... @percent%',
+  'otaUpgradingShort': 'Frissítés...',
+  'otaDownloadPreparing': 'Firmware letöltésének előkészítése...',
+  'otaFirmwareCached': 'A firmware kész, frissítés előkészítése...',
+  'otaDownloadStarted': 'Firmware letöltése elindult...',
+  'otaDownloadingPercent': 'Firmware letöltése... @percent%',
+  'otaDownloadDone': 'Letöltés kész, frissítés előkészítése...',
+  'addDevice': 'Eszköz hozzáadása',
+  'deviceConnectionRestricted': 'Az eszköz csatlakozása korlátozott: az eszköz nincs engedélyezve',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatikus összefoglalók Autopilot sablonokkal',
+  'bindImmediately': 'Párosítás most',
+  'disconnect': 'Bontás',
+  'discoveredDevices': 'Megtalált eszközök',
+  'distinguishDifferentSpeakers': 'Beszélők megkülönböztetése',
+  'enterFileName': 'Adjon meg egy fájlnevet',
+  'findMore': 'Fedezzen fel többet',
+  'finishRecording': 'Felvétel befejezése',
+  'importAudioFromAppWeb': 'Importáljon hangot az appból vagy a webről leiratozáshoz és összefoglaláshoz',
+  'industrySpecificSummaryTemplate': 'Az Ön ágazatára szabott profi összefoglaló sablonok',
+  'markFavorite': 'Hozzáadás a kedvencekhez',
+  'monthlyTranscriptionDuration': 'Havi 300 perc leiratozás',
+  'noDevicesFound': 'Nem található eszköz',
+  'notBound': 'Nincs párosítva',
+  'notCharging': 'Nem tölt',
+  'pauseRecording': 'Felvétel szüneteltetése',
+  'pleaseEnterVerificationCode': 'Adja meg az ellenőrző kódot',
+  'scanIdle': 'Nincs keresés',
+  'scanning': 'Keresés...',
+  'startScan': 'Keresés indítása',
+  'stopScan': 'Keresés leállítása',
+  'storageBytes': 'Teljes tárhely',
+  'storageUploads': 'Feltöltések',
+  'unmarkFavorite': 'Eltávolítás a kedvencekből',
+  'unnamedDevice': 'Névtelen eszköz',
+  'userDataParseFailed': 'A felhasználói adatok feldolgozása sikertelen',
 };
diff --git a/apps/client/lib/core/translations/language/id_id.dart b/apps/client/lib/core/translations/language/id_id.dart
index 4fc3278a..61c1028d 100644
--- a/apps/client/lib/core/translations/language/id_id.dart
+++ b/apps/client/lib/core/translations/language/id_id.dart
@@ -1787,4 +1787,60 @@ const Map<String, String> idID = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Sudah versi terbaru',
+  'otaCurrentVersion': 'Versi saat ini',
+  'otaDone': 'Selesai',
+  'otaDownloading': 'Mengunduh firmware...',
+  'otaError': 'Kesalahan',
+  'otaExitConfirm': 'Peningkatan sedang berlangsung. Yakin ingin keluar?',
+  'otaExitTitle': 'Keluar dari peningkatan',
+  'otaFailed': 'Peningkatan gagal',
+  'otaFailedWithCode': 'Peningkatan gagal (kode @code)',
+  'otaKeepConnectedWarning': 'Selama peningkatan, dekatkan perangkat dan jangan tutup aplikasi.',
+  'otaLatestVersion': 'Versi terbaru',
+  'otaNeedConnect': 'Hubungkan perangkat terlebih dahulu',
+  'otaNotConnectedTip': 'Tidak ada perangkat terhubung. Hubungkan earphone sebelum melakukan peningkatan.',
+  'otaPreparing': 'Menyiapkan...',
+  'otaStartUpgrade': 'Mulai peningkatan',
+  'otaSuccessReboot': 'Peningkatan berhasil. Silakan mulai ulang perangkat.',
+  'otaTimeout': 'Waktu peningkatan habis. Silakan coba lagi.',
+  'otaUnknownDevice': 'Perangkat tidak dikenal',
+  'otaUpdateAvailable': 'Pembaruan tersedia',
+  'otaUpgrading': 'Meningkatkan... @percent%',
+  'otaUpgradingShort': 'Meningkatkan...',
+  'otaDownloadPreparing': 'Menyiapkan unduhan firmware...',
+  'otaFirmwareCached': 'Firmware siap, menyiapkan peningkatan...',
+  'otaDownloadStarted': 'Unduhan firmware dimulai...',
+  'otaDownloadingPercent': 'Mengunduh firmware... @percent%',
+  'otaDownloadDone': 'Unduhan selesai, menyiapkan peningkatan...',
+  'addDevice': 'Tambah perangkat',
+  'deviceConnectionRestricted': 'Koneksi perangkat dibatasi: perangkat ini tidak diotorisasi',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Ringkasan otomatis dengan templat Autopilot',
+  'bindImmediately': 'Tautkan Sekarang',
+  'disconnect': 'Putuskan sambungan',
+  'discoveredDevices': 'Perangkat ditemukan',
+  'distinguishDifferentSpeakers': 'Bedakan tiap pembicara',
+  'enterFileName': 'Masukkan nama berkas',
+  'findMore': 'Jelajahi Lainnya',
+  'finishRecording': 'Selesaikan Rekaman',
+  'importAudioFromAppWeb': 'Impor audio dari aplikasi atau web untuk ditranskripsikan dan diringkas',
+  'industrySpecificSummaryTemplate': 'Templat ringkasan profesional untuk industri Anda',
+  'markFavorite': 'Tambahkan ke favorit',
+  'monthlyTranscriptionDuration': '300 menit transkripsi per bulan',
+  'noDevicesFound': 'Perangkat tidak ditemukan',
+  'notBound': 'Belum ditautkan',
+  'notCharging': 'Tidak mengisi daya',
+  'pauseRecording': 'Jeda Rekaman',
+  'pleaseEnterVerificationCode': 'Masukkan kode verifikasi',
+  'scanIdle': 'Tidak memindai',
+  'scanning': 'Memindai...',
+  'startScan': 'Mulai Pindai',
+  'stopScan': 'Hentikan Pindai',
+  'storageBytes': 'Total Penyimpanan',
+  'storageUploads': 'Unggahan',
+  'unmarkFavorite': 'Hapus dari favorit',
+  'unnamedDevice': 'Perangkat tanpa nama',
+  'userDataParseFailed': 'Gagal membaca data pengguna',
 };
diff --git a/apps/client/lib/core/translations/language/is_is.dart b/apps/client/lib/core/translations/language/is_is.dart
index 407fb339..3ca11fc9 100644
--- a/apps/client/lib/core/translations/language/is_is.dart
+++ b/apps/client/lib/core/translations/language/is_is.dart
@@ -1784,4 +1784,60 @@ const Map<String, String> isIS = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Þegar uppfært',
+  'otaCurrentVersion': 'Núverandi útgáfa',
+  'otaDone': 'Lokið',
+  'otaDownloading': 'Sæki fastbúnað...',
+  'otaError': 'Villa',
+  'otaExitConfirm': 'Uppfærsla er í gangi. Ertu viss um að þú viljir hætta?',
+  'otaExitTitle': 'Hætta við uppfærslu',
+  'otaFailed': 'Uppfærsla mistókst',
+  'otaFailedWithCode': 'Uppfærsla mistókst (kóði @code)',
+  'otaKeepConnectedWarning': 'Hafðu tækið nálægt og lokaðu ekki forritinu meðan á uppfærslu stendur.',
+  'otaLatestVersion': 'Nýjasta útgáfa',
+  'otaNeedConnect': 'Tengdu fyrst tæki',
+  'otaNotConnectedTip': 'Ekkert tengt tæki fannst. Tengdu heyrnartólin áður en þú uppfærir.',
+  'otaPreparing': 'Undirbý...',
+  'otaStartUpgrade': 'Hefja uppfærslu',
+  'otaSuccessReboot': 'Uppfærsla tókst. Endurræstu tækið.',
+  'otaTimeout': 'Uppfærslan rann út á tíma. Reyndu aftur.',
+  'otaUnknownDevice': 'Óþekkt tæki',
+  'otaUpdateAvailable': 'Uppfærsla í boði',
+  'otaUpgrading': 'Uppfæri... @percent%',
+  'otaUpgradingShort': 'Uppfæri...',
+  'otaDownloadPreparing': 'Undirbý niðurhal fastbúnaðar...',
+  'otaFirmwareCached': 'Fastbúnaður tilbúinn, undirbý uppfærslu...',
+  'otaDownloadStarted': 'Niðurhal fastbúnaðar hafið...',
+  'otaDownloadingPercent': 'Sæki fastbúnað... @percent%',
+  'otaDownloadDone': 'Niðurhali lokið, undirbý uppfærslu...',
+  'addDevice': 'Bæta við tæki',
+  'deviceConnectionRestricted': 'Tenging tækis takmörkuð: þetta tæki er ekki heimilað',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Sjálfvirkar samantektir með Autopilot-sniðmátum',
+  'bindImmediately': 'Tengja núna',
+  'disconnect': 'Aftengja',
+  'discoveredDevices': 'Fundin tæki',
+  'distinguishDifferentSpeakers': 'Greina á milli ræðumanna',
+  'enterFileName': 'Sláðu inn skráarnafn',
+  'findMore': 'Uppgötvaðu meira',
+  'finishRecording': 'Ljúka upptöku',
+  'importAudioFromAppWeb': 'Fluttu inn hljóð úr appinu eða af vefnum til umritunar og samantektar',
+  'industrySpecificSummaryTemplate': 'Fagleg samantektarsniðmát fyrir þína atvinnugrein',
+  'markFavorite': 'Bæta við eftirlæti',
+  'monthlyTranscriptionDuration': '300 mínútur af umritun á mánuði',
+  'noDevicesFound': 'Engin tæki fundust',
+  'notBound': 'Ekki tengt',
+  'notCharging': 'Hleður ekki',
+  'pauseRecording': 'Gera hlé á upptöku',
+  'pleaseEnterVerificationCode': 'Sláðu inn staðfestingarkóðann',
+  'scanIdle': 'Ekki að leita',
+  'scanning': 'Leita...',
+  'startScan': 'Hefja leit',
+  'stopScan': 'Stöðva leit',
+  'storageBytes': 'Heildargeymslurými',
+  'storageUploads': 'Upphleðslur',
+  'unmarkFavorite': 'Fjarlægja úr eftirlæti',
+  'unnamedDevice': 'Ónefnt tæki',
+  'userDataParseFailed': 'Ekki tókst að lesa notandagögn',
 };
diff --git a/apps/client/lib/core/translations/language/it_it.dart b/apps/client/lib/core/translations/language/it_it.dart
index 8971d841..c4ed1c16 100644
--- a/apps/client/lib/core/translations/language/it_it.dart
+++ b/apps/client/lib/core/translations/language/it_it.dart
@@ -1825,4 +1825,60 @@ const Map<String, String> itIT = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Già aggiornato',
+  'otaCurrentVersion': 'Versione attuale',
+  'otaDone': 'Fatto',
+  'otaDownloading': 'Download del firmware...',
+  'otaError': 'Errore',
+  'otaExitConfirm': 'È in corso un aggiornamento. Vuoi davvero uscire?',
+  'otaExitTitle': 'Esci dall’aggiornamento',
+  'otaFailed': 'Aggiornamento non riuscito',
+  'otaFailedWithCode': 'Aggiornamento non riuscito (codice @code)',
+  'otaKeepConnectedWarning': 'Tieni il dispositivo vicino e non chiudere l’app durante l’aggiornamento.',
+  'otaLatestVersion': 'Ultima versione',
+  'otaNeedConnect': 'Collega prima un dispositivo',
+  'otaNotConnectedTip': 'Nessun dispositivo collegato rilevato. Collega gli auricolari prima di aggiornare.',
+  'otaPreparing': 'Preparazione...',
+  'otaStartUpgrade': 'Avvia aggiornamento',
+  'otaSuccessReboot': 'Aggiornamento riuscito. Riavvia il dispositivo.',
+  'otaTimeout': 'Timeout dell’aggiornamento. Riprova.',
+  'otaUnknownDevice': 'Dispositivo sconosciuto',
+  'otaUpdateAvailable': 'Aggiornamento disponibile',
+  'otaUpgrading': 'Aggiornamento... @percent%',
+  'otaUpgradingShort': 'Aggiornamento in corso...',
+  'otaDownloadPreparing': 'Preparazione del download del firmware...',
+  'otaFirmwareCached': 'Firmware pronto, preparazione dell’aggiornamento...',
+  'otaDownloadStarted': 'Download del firmware avviato...',
+  'otaDownloadingPercent': 'Download del firmware... @percent%',
+  'otaDownloadDone': 'Download completato, preparazione dell’aggiornamento...',
+  'addDevice': 'Aggiungi dispositivo',
+  'deviceConnectionRestricted': 'Connessione del dispositivo limitata: questo dispositivo non è autorizzato',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Riepiloghi automatici con i modelli Autopilot',
+  'bindImmediately': 'Associa ora',
+  'disconnect': 'Disconnetti',
+  'discoveredDevices': 'Dispositivi rilevati',
+  'distinguishDifferentSpeakers': 'Distingui i diversi interlocutori',
+  'enterFileName': 'Inserisci un nome file',
+  'findMore': 'Scopri di più',
+  'finishRecording': 'Termina registrazione',
+  'importAudioFromAppWeb': "Importa l'audio dall'app o dal web per trascriverlo e riassumerlo",
+  'industrySpecificSummaryTemplate': 'Modelli di riepilogo professionali per il tuo settore',
+  'markFavorite': 'Aggiungi ai preferiti',
+  'monthlyTranscriptionDuration': '300 minuti di trascrizione al mese',
+  'noDevicesFound': 'Nessun dispositivo trovato',
+  'notBound': 'Non associato',
+  'notCharging': 'Non in carica',
+  'pauseRecording': 'Metti in pausa la registrazione',
+  'pleaseEnterVerificationCode': 'Inserisci il codice di verifica',
+  'scanIdle': 'Nessuna ricerca',
+  'scanning': 'Ricerca in corso...',
+  'startScan': 'Avvia ricerca',
+  'stopScan': 'Interrompi ricerca',
+  'storageBytes': 'Spazio totale',
+  'storageUploads': 'Caricamenti',
+  'unmarkFavorite': 'Rimuovi dai preferiti',
+  'unnamedDevice': 'Dispositivo senza nome',
+  'userDataParseFailed': "Impossibile leggere i dati dell'utente",
 };
diff --git a/apps/client/lib/core/translations/language/ja_jp.dart b/apps/client/lib/core/translations/language/ja_jp.dart
index 13289fcf..a2eb95b8 100644
--- a/apps/client/lib/core/translations/language/ja_jp.dart
+++ b/apps/client/lib/core/translations/language/ja_jp.dart
@@ -1593,7 +1593,7 @@ const Map<String, String> jaJP = {
   'meetingRecordScreenCapturePermissionDenied':
       'システム音声を録音するには「画面収録」の許可が必要です。許可してから再試行してください',
   'tabDevice': 'デバイス',
-  'tabTodo': 'ToDo',
+  'tabTodo': 'Remin',
   'tabPlaza': 'プラザ',
   'sloganHome': 'テクノロジーでスマートな毎日を',
   'sloganAi': '無限の知性、無限の可能性',
@@ -1866,4 +1866,59 @@ const Map<String, String> jaJP = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': '最新の状態です',
+  'otaCurrentVersion': '現在のバージョン',
+  'otaDone': '完了',
+  'otaDownloading': 'ファームウェアをダウンロード中...',
+  'otaError': 'エラー',
+  'otaExitConfirm': 'アップグレード中です。終了してもよろしいですか？',
+  'otaExitTitle': 'アップグレードを終了',
+  'otaFailed': 'アップグレードに失敗しました',
+  'otaFailedWithCode': 'アップグレードに失敗しました（コード @code）',
+  'otaKeepConnectedWarning': 'アップグレード中はデバイスを近くに置き、アプリを終了しないでください',
+  'otaLatestVersion': '最新バージョン',
+  'otaNeedConnect': '先にデバイスを接続してください',
+  'otaNotConnectedTip': '接続されたデバイスが見つかりません。イヤホンを接続してから更新してください',
+  'otaPreparing': '準備中...',
+  'otaStartUpgrade': 'アップグレードを開始',
+  'otaSuccessReboot': 'アップグレードに成功しました。デバイスを再起動してください',
+  'otaTimeout': 'アップグレードがタイムアウトしました。再試行してください',
+  'otaUnknownDevice': '不明なデバイス',
+  'otaUpdateAvailable': '更新があります',
+  'otaUpgrading': 'アップグレード中... @percent%',
+  'otaUpgradingShort': 'アップグレード中...',
+  'otaDownloadPreparing': 'ファームウェアのダウンロードを準備中...',
+  'otaFirmwareCached': 'ファームウェアの準備が完了しました',
+  'otaDownloadStarted': 'ファームウェアのダウンロードを開始...',
+  'otaDownloadingPercent': 'ファームウェアをダウンロード中... @percent%',
+  'otaDownloadDone': 'ダウンロード完了、アップグレードを準備中...',
+  'deviceConnectionRestricted': 'デバイスの接続が制限されています。この製品は認証されていません',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Autopilot テンプレートによる自動要約',
+  'bindImmediately': '今すぐ連携',
+  'disconnect': '接続を解除',
+  'discoveredDevices': '検出されたデバイス',
+  'distinguishDifferentSpeakers': '話者を区別',
+  'enterFileName': 'ファイル名を入力してください',
+  'findMore': 'もっと見る',
+  'finishRecording': '録音を終了',
+  'importAudioFromAppWeb': 'アプリや Web から音声を取り込んで文字起こしと要約',
+  'industrySpecificSummaryTemplate': '業種別に設計されたプロ向け要約テンプレート',
+  'markFavorite': 'お気に入りに追加',
+  'monthlyTranscriptionDuration': '毎月 300 分の文字起こし',
+  'noDevicesFound': 'デバイスが見つかりません',
+  'notBound': '未連携',
+  'notCharging': '充電していません',
+  'pauseRecording': '録音を一時停止',
+  'pleaseEnterVerificationCode': '認証コードを入力してください',
+  'scanIdle': 'スキャンしていません',
+  'scanning': 'スキャン中...',
+  'startScan': 'スキャン開始',
+  'stopScan': 'スキャン停止',
+  'storageBytes': 'ストレージ使用量',
+  'storageUploads': 'アップロード回数',
+  'unmarkFavorite': 'お気に入りから削除',
+  'unnamedDevice': '名称未設定のデバイス',
+  'userDataParseFailed': 'ユーザーデータの解析に失敗しました',
 };
diff --git a/apps/client/lib/core/translations/language/ko_kr.dart b/apps/client/lib/core/translations/language/ko_kr.dart
index e6902236..87bbd9ae 100644
--- a/apps/client/lib/core/translations/language/ko_kr.dart
+++ b/apps/client/lib/core/translations/language/ko_kr.dart
@@ -1598,7 +1598,7 @@ const Map<String, String> koKR = {
   'currentConnection': '현재 연결',
   'binding': '등록 중…',
   'tabDevice': '기기',
-  'tabTodo': '할 일',
+  'tabTodo': 'Remin',
   'tabPlaza': '플라자',
   'sloganHome': '기술로 더 스마트한 일상을',
   'sloganAi': '무한한 지능, 무한한 가능성',
@@ -1859,4 +1859,59 @@ const Map<String, String> koKR = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': '이미 최신 버전입니다',
+  'otaCurrentVersion': '현재 버전',
+  'otaDone': '완료',
+  'otaDownloading': '펌웨어 다운로드 중...',
+  'otaError': '오류',
+  'otaExitConfirm': '업그레이드가 진행 중입니다. 종료하시겠습니까?',
+  'otaExitTitle': '업그레이드 종료',
+  'otaFailed': '업그레이드 실패',
+  'otaFailedWithCode': '업그레이드 실패 (코드 @code)',
+  'otaKeepConnectedWarning': '업그레이드 중에는 기기를 가까이 두고 앱을 종료하지 마세요',
+  'otaLatestVersion': '최신 버전',
+  'otaNeedConnect': '먼저 기기를 연결하세요',
+  'otaNotConnectedTip': '연결된 기기가 없습니다. 이어폰을 연결한 후 업그레이드하세요',
+  'otaPreparing': '준비 중...',
+  'otaStartUpgrade': '업그레이드 시작',
+  'otaSuccessReboot': '업그레이드 성공. 기기를 다시 시작하세요',
+  'otaTimeout': '업그레이드 시간이 초과되었습니다. 다시 시도하세요',
+  'otaUnknownDevice': '알 수 없는 기기',
+  'otaUpdateAvailable': '업데이트 가능',
+  'otaUpgrading': '업그레이드 중... @percent%',
+  'otaUpgradingShort': '업그레이드 중...',
+  'otaDownloadPreparing': '펌웨어 다운로드 준비 중...',
+  'otaFirmwareCached': '펌웨어 준비 완료',
+  'otaDownloadStarted': '펌웨어 다운로드 시작...',
+  'otaDownloadingPercent': '펌웨어 다운로드 중... @percent%',
+  'otaDownloadDone': '다운로드 완료, 업그레이드 준비 중...',
+  'deviceConnectionRestricted': '기기 연결이 제한되었습니다. 인증되지 않은 기기입니다',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Autopilot 템플릿 자동 요약',
+  'bindImmediately': '지금 연결',
+  'disconnect': '연결 해제',
+  'discoveredDevices': '검색된 기기',
+  'distinguishDifferentSpeakers': '화자 구분',
+  'enterFileName': '파일 이름을 입력하세요',
+  'findMore': '더 알아보기',
+  'finishRecording': '녹음 종료',
+  'importAudioFromAppWeb': '앱과 웹에서 오디오를 가져와 전사 및 요약',
+  'industrySpecificSummaryTemplate': '업종별로 설계된 전문 요약 템플릿',
+  'markFavorite': '즐겨찾기 추가',
+  'monthlyTranscriptionDuration': '매월 300분 전사 시간',
+  'noDevicesFound': '기기를 찾을 수 없습니다',
+  'notBound': '미연결',
+  'notCharging': '충전 중 아님',
+  'pauseRecording': '녹음 일시정지',
+  'pleaseEnterVerificationCode': '인증번호를 입력하세요',
+  'scanIdle': '검색 대기 중',
+  'scanning': '검색 중...',
+  'startScan': '검색 시작',
+  'stopScan': '검색 중지',
+  'storageBytes': '총 저장 용량',
+  'storageUploads': '업로드 횟수',
+  'unmarkFavorite': '즐겨찾기 해제',
+  'unnamedDevice': '이름 없는 기기',
+  'userDataParseFailed': '사용자 데이터 분석 실패',
 };
diff --git a/apps/client/lib/core/translations/language/lt_lt.dart b/apps/client/lib/core/translations/language/lt_lt.dart
index a323b0e7..f5c719e4 100644
--- a/apps/client/lib/core/translations/language/lt_lt.dart
+++ b/apps/client/lib/core/translations/language/lt_lt.dart
@@ -1802,4 +1802,60 @@ const Map<String, String> ltLT = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Jau naujausia versija',
+  'otaCurrentVersion': 'Dabartinė versija',
+  'otaDone': 'Atlikta',
+  'otaDownloading': 'Atsisiunčiama programinė aparatinė įranga...',
+  'otaError': 'Klaida',
+  'otaExitConfirm': 'Vyksta naujinimas. Ar tikrai norite išeiti?',
+  'otaExitTitle': 'Išeiti iš naujinimo',
+  'otaFailed': 'Naujinimas nepavyko',
+  'otaFailedWithCode': 'Naujinimas nepavyko (kodas @code)',
+  'otaKeepConnectedWarning': 'Naujinimo metu laikykite įrenginį šalia ir neuždarykite programos.',
+  'otaLatestVersion': 'Naujausia versija',
+  'otaNeedConnect': 'Pirmiausia prijunkite įrenginį',
+  'otaNotConnectedTip': 'Prijungto įrenginio nerasta. Prieš naujindami prijunkite ausines.',
+  'otaPreparing': 'Ruošiama...',
+  'otaStartUpgrade': 'Pradėti naujinimą',
+  'otaSuccessReboot': 'Naujinimas pavyko. Paleiskite įrenginį iš naujo.',
+  'otaTimeout': 'Baigėsi naujinimo laikas. Bandykite dar kartą.',
+  'otaUnknownDevice': 'Nežinomas įrenginys',
+  'otaUpdateAvailable': 'Yra naujinys',
+  'otaUpgrading': 'Naujinama... @percent%',
+  'otaUpgradingShort': 'Naujinama...',
+  'otaDownloadPreparing': 'Ruošiamas programinės aparatinės įrangos atsisiuntimas...',
+  'otaFirmwareCached': 'Programinė aparatinė įranga paruošta, ruošiamas naujinimas...',
+  'otaDownloadStarted': 'Pradėtas programinės aparatinės įrangos atsisiuntimas...',
+  'otaDownloadingPercent': 'Atsisiunčiama programinė aparatinė įranga... @percent%',
+  'otaDownloadDone': 'Atsisiuntimas baigtas, ruošiamas naujinimas...',
+  'addDevice': 'Pridėti įrenginį',
+  'deviceConnectionRestricted': 'Įrenginio ryšys apribotas: šis įrenginys neautorizuotas',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatinės santraukos pagal „Autopilot“ šablonus',
+  'bindImmediately': 'Susieti dabar',
+  'disconnect': 'Atjungti',
+  'discoveredDevices': 'Rasti įrenginiai',
+  'distinguishDifferentSpeakers': 'Kalbėtojų atskyrimas',
+  'enterFileName': 'Įveskite failo pavadinimą',
+  'findMore': 'Sužinoti daugiau',
+  'finishRecording': 'Baigti įrašymą',
+  'importAudioFromAppWeb': 'Importuokite garsą iš programėlės ar žiniatinklio, kad jį transkribuotumėte ir apibendrintumėte',
+  'industrySpecificSummaryTemplate': 'Profesionalūs santraukų šablonai jūsų sričiai',
+  'markFavorite': 'Įtraukti į mėgstamus',
+  'monthlyTranscriptionDuration': '300 transkripcijos minučių per mėnesį',
+  'noDevicesFound': 'Įrenginių nerasta',
+  'notBound': 'Nesusieta',
+  'notCharging': 'Nekraunama',
+  'pauseRecording': 'Pristabdyti įrašymą',
+  'pleaseEnterVerificationCode': 'Įveskite patvirtinimo kodą',
+  'scanIdle': 'Neieškoma',
+  'scanning': 'Ieškoma...',
+  'startScan': 'Pradėti paiešką',
+  'stopScan': 'Stabdyti paiešką',
+  'storageBytes': 'Bendra saugykla',
+  'storageUploads': 'Įkėlimai',
+  'unmarkFavorite': 'Pašalinti iš mėgstamų',
+  'unnamedDevice': 'Įrenginys be pavadinimo',
+  'userDataParseFailed': 'Nepavyko nuskaityti naudotojo duomenų',
 };
diff --git a/apps/client/lib/core/translations/language/lv_lv.dart b/apps/client/lib/core/translations/language/lv_lv.dart
index 5e425412..01f173fc 100644
--- a/apps/client/lib/core/translations/language/lv_lv.dart
+++ b/apps/client/lib/core/translations/language/lv_lv.dart
@@ -1807,4 +1807,60 @@ const Map<String, String> lvLV = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Jau ir jaunākā versija',
+  'otaCurrentVersion': 'Pašreizējā versija',
+  'otaDone': 'Gatavs',
+  'otaDownloading': 'Notiek programmaparatūras lejupielāde...',
+  'otaError': 'Kļūda',
+  'otaExitConfirm': 'Notiek jaunināšana. Vai tiešām vēlaties iziet?',
+  'otaExitTitle': 'Iziet no jaunināšanas',
+  'otaFailed': 'Jaunināšana neizdevās',
+  'otaFailedWithCode': 'Jaunināšana neizdevās (kods @code)',
+  'otaKeepConnectedWarning': 'Jaunināšanas laikā turiet ierīci tuvumā un neaizveriet lietotni.',
+  'otaLatestVersion': 'Jaunākā versija',
+  'otaNeedConnect': 'Vispirms pievienojiet ierīci',
+  'otaNotConnectedTip': 'Pievienota ierīce netika atrasta. Pirms jaunināšanas pievienojiet austiņas.',
+  'otaPreparing': 'Notiek sagatavošana...',
+  'otaStartUpgrade': 'Sākt jaunināšanu',
+  'otaSuccessReboot': 'Jaunināšana izdevās. Lūdzu, restartējiet ierīci.',
+  'otaTimeout': 'Jaunināšanas noildze. Lūdzu, mēģiniet vēlreiz.',
+  'otaUnknownDevice': 'Nezināma ierīce',
+  'otaUpdateAvailable': 'Pieejams atjauninājums',
+  'otaUpgrading': 'Notiek jaunināšana... @percent%',
+  'otaUpgradingShort': 'Notiek jaunināšana...',
+  'otaDownloadPreparing': 'Tiek sagatavota programmaparatūras lejupielāde...',
+  'otaFirmwareCached': 'Programmaparatūra ir gatava, tiek sagatavota jaunināšana...',
+  'otaDownloadStarted': 'Sākta programmaparatūras lejupielāde...',
+  'otaDownloadingPercent': 'Notiek programmaparatūras lejupielāde... @percent%',
+  'otaDownloadDone': 'Lejupielāde pabeigta, tiek sagatavota jaunināšana...',
+  'addDevice': 'Pievienot ierīci',
+  'deviceConnectionRestricted': 'Ierīces savienojums ierobežots: šī ierīce nav autorizēta',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automātiski kopsavilkumi ar Autopilot veidnēm',
+  'bindImmediately': 'Saistīt tūlīt',
+  'disconnect': 'Atvienot',
+  'discoveredDevices': 'Atrastās ierīces',
+  'distinguishDifferentSpeakers': 'Runātāju atšķiršana',
+  'enterFileName': 'Ievadiet faila nosaukumu',
+  'findMore': 'Uzzināt vairāk',
+  'finishRecording': 'Beigt ierakstu',
+  'importAudioFromAppWeb': 'Importējiet audio no lietotnes vai tīmekļa, lai to atšifrētu un apkopotu',
+  'industrySpecificSummaryTemplate': 'Profesionālas kopsavilkumu veidnes jūsu nozarei',
+  'markFavorite': 'Pievienot izlasei',
+  'monthlyTranscriptionDuration': '300 atšifrēšanas minūtes mēnesī',
+  'noDevicesFound': 'Ierīces netika atrastas',
+  'notBound': 'Nav saistīts',
+  'notCharging': 'Neuzlādējas',
+  'pauseRecording': 'Pauzēt ierakstu',
+  'pleaseEnterVerificationCode': 'Ievadiet verifikācijas kodu',
+  'scanIdle': 'Netiek meklēts',
+  'scanning': 'Notiek meklēšana...',
+  'startScan': 'Sākt meklēšanu',
+  'stopScan': 'Apturēt meklēšanu',
+  'storageBytes': 'Kopējā krātuve',
+  'storageUploads': 'Augšupielādes',
+  'unmarkFavorite': 'Noņemt no izlases',
+  'unnamedDevice': 'Ierīce bez nosaukuma',
+  'userDataParseFailed': 'Neizdevās nolasīt lietotāja datus',
 };
diff --git a/apps/client/lib/core/translations/language/ms_my.dart b/apps/client/lib/core/translations/language/ms_my.dart
index 5542556f..ccd946ec 100644
--- a/apps/client/lib/core/translations/language/ms_my.dart
+++ b/apps/client/lib/core/translations/language/ms_my.dart
@@ -1791,4 +1791,60 @@ const Map<String, String> msMY = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Sudah versi terkini',
+  'otaCurrentVersion': 'Versi semasa',
+  'otaDone': 'Selesai',
+  'otaDownloading': 'Memuat turun perisian tegar...',
+  'otaError': 'Ralat',
+  'otaExitConfirm': 'Naik taraf sedang berjalan. Anda pasti mahu keluar?',
+  'otaExitTitle': 'Keluar daripada naik taraf',
+  'otaFailed': 'Naik taraf gagal',
+  'otaFailedWithCode': 'Naik taraf gagal (kod @code)',
+  'otaKeepConnectedWarning': 'Semasa naik taraf, dekatkan peranti dan jangan tutup aplikasi.',
+  'otaLatestVersion': 'Versi terkini',
+  'otaNeedConnect': 'Sila sambungkan peranti dahulu',
+  'otaNotConnectedTip': 'Tiada peranti bersambung dikesan. Sambungkan fon telinga sebelum menaik taraf.',
+  'otaPreparing': 'Menyediakan...',
+  'otaStartUpgrade': 'Mula naik taraf',
+  'otaSuccessReboot': 'Naik taraf berjaya. Sila mulakan semula peranti.',
+  'otaTimeout': 'Naik taraf tamat masa. Sila cuba lagi.',
+  'otaUnknownDevice': 'Peranti tidak diketahui',
+  'otaUpdateAvailable': 'Kemas kini tersedia',
+  'otaUpgrading': 'Menaik taraf... @percent%',
+  'otaUpgradingShort': 'Menaik taraf...',
+  'otaDownloadPreparing': 'Menyediakan muat turun perisian tegar...',
+  'otaFirmwareCached': 'Perisian tegar sedia, menyediakan naik taraf...',
+  'otaDownloadStarted': 'Muat turun perisian tegar bermula...',
+  'otaDownloadingPercent': 'Memuat turun perisian tegar... @percent%',
+  'otaDownloadDone': 'Muat turun selesai, menyediakan naik taraf...',
+  'addDevice': 'Tambah peranti',
+  'deviceConnectionRestricted': 'Sambungan peranti dihadkan: peranti ini tidak dibenarkan',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Ringkasan automatik dengan templat Autopilot',
+  'bindImmediately': 'Pautkan Sekarang',
+  'disconnect': 'Putuskan sambungan',
+  'discoveredDevices': 'Peranti ditemui',
+  'distinguishDifferentSpeakers': 'Bezakan setiap penutur',
+  'enterFileName': 'Masukkan nama fail',
+  'findMore': 'Terokai Lagi',
+  'finishRecording': 'Tamatkan Rakaman',
+  'importAudioFromAppWeb': 'Import audio dari apl atau web untuk ditranskripsi dan diringkaskan',
+  'industrySpecificSummaryTemplate': 'Templat ringkasan profesional untuk industri anda',
+  'markFavorite': 'Tambah ke kegemaran',
+  'monthlyTranscriptionDuration': '300 minit transkripsi sebulan',
+  'noDevicesFound': 'Tiada peranti ditemui',
+  'notBound': 'Belum dipautkan',
+  'notCharging': 'Tidak mengecas',
+  'pauseRecording': 'Jeda Rakaman',
+  'pleaseEnterVerificationCode': 'Sila masukkan kod pengesahan',
+  'scanIdle': 'Tidak mengimbas',
+  'scanning': 'Mengimbas...',
+  'startScan': 'Mula Imbas',
+  'stopScan': 'Henti Imbas',
+  'storageBytes': 'Jumlah Storan',
+  'storageUploads': 'Muat naik',
+  'unmarkFavorite': 'Buang dari kegemaran',
+  'unnamedDevice': 'Peranti tanpa nama',
+  'userDataParseFailed': 'Gagal membaca data pengguna',
 };
diff --git a/apps/client/lib/core/translations/language/nb_no.dart b/apps/client/lib/core/translations/language/nb_no.dart
index 40ca997c..c2c10653 100644
--- a/apps/client/lib/core/translations/language/nb_no.dart
+++ b/apps/client/lib/core/translations/language/nb_no.dart
@@ -1785,4 +1785,60 @@ const Map<String, String> nbNO = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Allerede oppdatert',
+  'otaCurrentVersion': 'Gjeldende versjon',
+  'otaDone': 'Ferdig',
+  'otaDownloading': 'Laster ned fastvare...',
+  'otaError': 'Feil',
+  'otaExitConfirm': 'En oppdatering pågår. Er du sikker på at du vil avslutte?',
+  'otaExitTitle': 'Avslutt oppdatering',
+  'otaFailed': 'Oppdateringen mislyktes',
+  'otaFailedWithCode': 'Oppdateringen mislyktes (kode @code)',
+  'otaKeepConnectedWarning': 'Hold enheten i nærheten og ikke lukk appen under oppdateringen.',
+  'otaLatestVersion': 'Nyeste versjon',
+  'otaNeedConnect': 'Koble til en enhet først',
+  'otaNotConnectedTip': 'Fant ingen tilkoblet enhet. Koble til øretelefonene før du oppdaterer.',
+  'otaPreparing': 'Forbereder...',
+  'otaStartUpgrade': 'Start oppdatering',
+  'otaSuccessReboot': 'Oppdateringen er fullført. Start enheten på nytt.',
+  'otaTimeout': 'Tidsavbrudd for oppdateringen. Prøv igjen.',
+  'otaUnknownDevice': 'Ukjent enhet',
+  'otaUpdateAvailable': 'Oppdatering tilgjengelig',
+  'otaUpgrading': 'Oppdaterer... @percent%',
+  'otaUpgradingShort': 'Oppdaterer...',
+  'otaDownloadPreparing': 'Forbereder nedlasting av fastvare...',
+  'otaFirmwareCached': 'Fastvaren er klar, forbereder oppdatering...',
+  'otaDownloadStarted': 'Nedlasting av fastvare startet...',
+  'otaDownloadingPercent': 'Laster ned fastvare... @percent%',
+  'otaDownloadDone': 'Nedlasting fullført, forbereder oppdatering...',
+  'addDevice': 'Legg til enhet',
+  'deviceConnectionRestricted': 'Enhetstilkobling begrenset: denne enheten er ikke autorisert',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatiske sammendrag med Autopilot-maler',
+  'bindImmediately': 'Koble til nå',
+  'disconnect': 'Koble fra',
+  'discoveredDevices': 'Enheter som ble funnet',
+  'distinguishDifferentSpeakers': 'Skill mellom talere',
+  'enterFileName': 'Skriv inn et filnavn',
+  'findMore': 'Oppdag mer',
+  'finishRecording': 'Avslutt opptak',
+  'importAudioFromAppWeb': 'Importer lyd fra appen eller nettet for transkribering og sammendrag',
+  'industrySpecificSummaryTemplate': 'Profesjonelle sammendragsmaler for din bransje',
+  'markFavorite': 'Legg til i favoritter',
+  'monthlyTranscriptionDuration': '300 minutter transkribering per måned',
+  'noDevicesFound': 'Fant ingen enheter',
+  'notBound': 'Ikke koblet',
+  'notCharging': 'Lader ikke',
+  'pauseRecording': 'Sett opptak på pause',
+  'pleaseEnterVerificationCode': 'Skriv inn bekreftelseskoden',
+  'scanIdle': 'Søker ikke',
+  'scanning': 'Søker...',
+  'startScan': 'Start søk',
+  'stopScan': 'Stopp søk',
+  'storageBytes': 'Total lagring',
+  'storageUploads': 'Opplastinger',
+  'unmarkFavorite': 'Fjern fra favoritter',
+  'unnamedDevice': 'Enhet uten navn',
+  'userDataParseFailed': 'Kunne ikke lese brukerdata',
 };
diff --git a/apps/client/lib/core/translations/language/nl_nl.dart b/apps/client/lib/core/translations/language/nl_nl.dart
index c436481e..e2317bbe 100644
--- a/apps/client/lib/core/translations/language/nl_nl.dart
+++ b/apps/client/lib/core/translations/language/nl_nl.dart
@@ -1684,4 +1684,60 @@ const Map<String, String> nlNL = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Al up-to-date',
+  'otaCurrentVersion': 'Huidige versie',
+  'otaDone': 'Klaar',
+  'otaDownloading': 'Firmware downloaden...',
+  'otaError': 'Fout',
+  'otaExitConfirm': 'Er loopt een update. Weet je zeker dat je wilt afsluiten?',
+  'otaExitTitle': 'Update afsluiten',
+  'otaFailed': 'Update mislukt',
+  'otaFailedWithCode': 'Update mislukt (code @code)',
+  'otaKeepConnectedWarning': 'Houd het apparaat dichtbij en sluit de app niet tijdens de update.',
+  'otaLatestVersion': 'Nieuwste versie',
+  'otaNeedConnect': 'Verbind eerst een apparaat',
+  'otaNotConnectedTip': 'Geen verbonden apparaat gevonden. Verbind je oordopjes voordat je bijwerkt.',
+  'otaPreparing': 'Voorbereiden...',
+  'otaStartUpgrade': 'Update starten',
+  'otaSuccessReboot': 'Update geslaagd. Start het apparaat opnieuw op.',
+  'otaTimeout': 'Time-out bij de update. Probeer het opnieuw.',
+  'otaUnknownDevice': 'Onbekend apparaat',
+  'otaUpdateAvailable': 'Update beschikbaar',
+  'otaUpgrading': 'Bijwerken... @percent%',
+  'otaUpgradingShort': 'Bijwerken...',
+  'otaDownloadPreparing': 'Firmware-download voorbereiden...',
+  'otaFirmwareCached': 'Firmware gereed, update voorbereiden...',
+  'otaDownloadStarted': 'Firmware-download gestart...',
+  'otaDownloadingPercent': 'Firmware downloaden... @percent%',
+  'otaDownloadDone': 'Download voltooid, update voorbereiden...',
+  'addDevice': 'Apparaat toevoegen',
+  'deviceConnectionRestricted': 'Apparaatverbinding beperkt: dit apparaat is niet geautoriseerd',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatische samenvattingen met Autopilot-sjablonen',
+  'bindImmediately': 'Nu koppelen',
+  'disconnect': 'Verbinding verbreken',
+  'discoveredDevices': 'Gevonden apparaten',
+  'distinguishDifferentSpeakers': 'Sprekers onderscheiden',
+  'enterFileName': 'Voer een bestandsnaam in',
+  'findMore': 'Meer ontdekken',
+  'finishRecording': 'Opname beëindigen',
+  'importAudioFromAppWeb': 'Importeer audio uit de app of het web om te transcriberen en samen te vatten',
+  'industrySpecificSummaryTemplate': 'Professionele samenvattingssjablonen voor jouw branche',
+  'markFavorite': 'Aan favorieten toevoegen',
+  'monthlyTranscriptionDuration': '300 minuten transcriptie per maand',
+  'noDevicesFound': 'Geen apparaten gevonden',
+  'notBound': 'Niet gekoppeld',
+  'notCharging': 'Laadt niet op',
+  'pauseRecording': 'Opname pauzeren',
+  'pleaseEnterVerificationCode': 'Voer de verificatiecode in',
+  'scanIdle': 'Niet aan het scannen',
+  'scanning': 'Scannen...',
+  'startScan': 'Scannen starten',
+  'stopScan': 'Scannen stoppen',
+  'storageBytes': 'Totale opslag',
+  'storageUploads': 'Uploads',
+  'unmarkFavorite': 'Uit favorieten verwijderen',
+  'unnamedDevice': 'Naamloos apparaat',
+  'userDataParseFailed': 'Kan gebruikersgegevens niet verwerken',
 };
diff --git a/apps/client/lib/core/translations/language/pl_pl.dart b/apps/client/lib/core/translations/language/pl_pl.dart
index b716a99e..6a8db691 100644
--- a/apps/client/lib/core/translations/language/pl_pl.dart
+++ b/apps/client/lib/core/translations/language/pl_pl.dart
@@ -1813,4 +1813,60 @@ const Map<String, String> plPL = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Masz najnowszą wersję',
+  'otaCurrentVersion': 'Bieżąca wersja',
+  'otaDone': 'Gotowe',
+  'otaDownloading': 'Pobieranie oprogramowania...',
+  'otaError': 'Błąd',
+  'otaExitConfirm': 'Trwa aktualizacja. Czy na pewno chcesz wyjść?',
+  'otaExitTitle': 'Zakończ aktualizację',
+  'otaFailed': 'Aktualizacja nie powiodła się',
+  'otaFailedWithCode': 'Aktualizacja nie powiodła się (kod @code)',
+  'otaKeepConnectedWarning': 'Podczas aktualizacji trzymaj urządzenie blisko i nie zamykaj aplikacji.',
+  'otaLatestVersion': 'Najnowsza wersja',
+  'otaNeedConnect': 'Najpierw połącz urządzenie',
+  'otaNotConnectedTip': 'Nie wykryto połączonego urządzenia. Połącz słuchawki przed aktualizacją.',
+  'otaPreparing': 'Przygotowywanie...',
+  'otaStartUpgrade': 'Rozpocznij aktualizację',
+  'otaSuccessReboot': 'Aktualizacja zakończona pomyślnie. Uruchom ponownie urządzenie.',
+  'otaTimeout': 'Przekroczono limit czasu aktualizacji. Spróbuj ponownie.',
+  'otaUnknownDevice': 'Nieznane urządzenie',
+  'otaUpdateAvailable': 'Dostępna aktualizacja',
+  'otaUpgrading': 'Aktualizowanie... @percent%',
+  'otaUpgradingShort': 'Aktualizowanie...',
+  'otaDownloadPreparing': 'Przygotowywanie pobierania oprogramowania...',
+  'otaFirmwareCached': 'Oprogramowanie gotowe, przygotowywanie aktualizacji...',
+  'otaDownloadStarted': 'Rozpoczęto pobieranie oprogramowania...',
+  'otaDownloadingPercent': 'Pobieranie oprogramowania... @percent%',
+  'otaDownloadDone': 'Pobieranie zakończone, przygotowywanie aktualizacji...',
+  'addDevice': 'Dodaj urządzenie',
+  'deviceConnectionRestricted': 'Połączenie urządzenia ograniczone: to urządzenie nie jest autoryzowane',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatyczne podsumowania na szablonach Autopilot',
+  'bindImmediately': 'Powiąż teraz',
+  'disconnect': 'Rozłącz',
+  'discoveredDevices': 'Znalezione urządzenia',
+  'distinguishDifferentSpeakers': 'Rozróżnianie mówców',
+  'enterFileName': 'Wpisz nazwę pliku',
+  'findMore': 'Odkryj więcej',
+  'finishRecording': 'Zakończ nagrywanie',
+  'importAudioFromAppWeb': 'Zaimportuj dźwięk z aplikacji lub sieci, aby go przepisać i podsumować',
+  'industrySpecificSummaryTemplate': 'Profesjonalne szablony podsumowań dla Twojej branży',
+  'markFavorite': 'Dodaj do ulubionych',
+  'monthlyTranscriptionDuration': '300 minut transkrypcji miesięcznie',
+  'noDevicesFound': 'Nie znaleziono urządzeń',
+  'notBound': 'Niepowiązane',
+  'notCharging': 'Nie ładuje się',
+  'pauseRecording': 'Wstrzymaj nagrywanie',
+  'pleaseEnterVerificationCode': 'Wpisz kod weryfikacyjny',
+  'scanIdle': 'Brak skanowania',
+  'scanning': 'Skanowanie...',
+  'startScan': 'Rozpocznij skanowanie',
+  'stopScan': 'Zatrzymaj skanowanie',
+  'storageBytes': 'Łączna pamięć',
+  'storageUploads': 'Przesłane pliki',
+  'unmarkFavorite': 'Usuń z ulubionych',
+  'unnamedDevice': 'Urządzenie bez nazwy',
+  'userDataParseFailed': 'Nie udało się odczytać danych użytkownika',
 };
diff --git a/apps/client/lib/core/translations/language/pt_pt.dart b/apps/client/lib/core/translations/language/pt_pt.dart
index 2c619357..e0b269d5 100644
--- a/apps/client/lib/core/translations/language/pt_pt.dart
+++ b/apps/client/lib/core/translations/language/pt_pt.dart
@@ -1794,7 +1794,7 @@ const Map<String, String> ptPT = {
   'currentConnection': 'Ligação atual',
   'binding': 'A associar…',
   'tabDevice': 'Dispositivos',
-  'tabTodo': 'Tarefas',
+  'tabTodo': 'Remin',
   'tabPlaza': 'Plaza',
   'sloganHome': 'Tecnologia para um dia a dia inteligente',
   'sloganAi': 'Inteligência sem limites',
@@ -2071,4 +2071,59 @@ const Map<String, String> ptPT = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Já está atualizado',
+  'otaCurrentVersion': 'Versão atual',
+  'otaDone': 'Concluído',
+  'otaDownloading': 'A transferir firmware...',
+  'otaError': 'Erro',
+  'otaExitConfirm': 'Há uma atualização em curso. Tem a certeza de que quer sair?',
+  'otaExitTitle': 'Sair da atualização',
+  'otaFailed': 'Falha na atualização',
+  'otaFailedWithCode': 'Falha na atualização (código @code)',
+  'otaKeepConnectedWarning': 'Mantenha o dispositivo por perto e não feche a aplicação durante a atualização.',
+  'otaLatestVersion': 'Versão mais recente',
+  'otaNeedConnect': 'Ligue primeiro um dispositivo',
+  'otaNotConnectedTip': 'Nenhum dispositivo ligado detetado. Ligue os auriculares antes de atualizar.',
+  'otaPreparing': 'A preparar...',
+  'otaStartUpgrade': 'Iniciar atualização',
+  'otaSuccessReboot': 'Atualização concluída. Reinicie o dispositivo.',
+  'otaTimeout': 'Tempo limite da atualização excedido. Tente novamente.',
+  'otaUnknownDevice': 'Dispositivo desconhecido',
+  'otaUpdateAvailable': 'Atualização disponível',
+  'otaUpgrading': 'A atualizar... @percent%',
+  'otaUpgradingShort': 'A atualizar...',
+  'otaDownloadPreparing': 'A preparar a transferência do firmware...',
+  'otaFirmwareCached': 'Firmware pronto, a preparar a atualização...',
+  'otaDownloadStarted': 'Transferência do firmware iniciada...',
+  'otaDownloadingPercent': 'A transferir firmware... @percent%',
+  'otaDownloadDone': 'Transferência concluída, a preparar a atualização...',
+  'deviceConnectionRestricted': 'Ligação do dispositivo restrita: este dispositivo não está autorizado',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Resumos automáticos com modelos Autopilot',
+  'bindImmediately': 'Associar agora',
+  'disconnect': 'Desligar',
+  'discoveredDevices': 'Dispositivos encontrados',
+  'distinguishDifferentSpeakers': 'Distinguir os oradores',
+  'enterFileName': 'Introduza um nome de ficheiro',
+  'findMore': 'Descobrir mais',
+  'finishRecording': 'Terminar gravação',
+  'importAudioFromAppWeb': 'Importe áudio da app ou da web para transcrever e resumir',
+  'industrySpecificSummaryTemplate': 'Modelos de resumo profissionais para o seu setor',
+  'markFavorite': 'Adicionar aos favoritos',
+  'monthlyTranscriptionDuration': '300 minutos de transcrição por mês',
+  'noDevicesFound': 'Nenhum dispositivo encontrado',
+  'notBound': 'Não associado',
+  'notCharging': 'Não está a carregar',
+  'pauseRecording': 'Pausar gravação',
+  'pleaseEnterVerificationCode': 'Introduza o código de verificação',
+  'scanIdle': 'Sem procurar',
+  'scanning': 'A procurar...',
+  'startScan': 'Iniciar procura',
+  'stopScan': 'Parar procura',
+  'storageBytes': 'Armazenamento total',
+  'storageUploads': 'Carregamentos',
+  'unmarkFavorite': 'Remover dos favoritos',
+  'unnamedDevice': 'Dispositivo sem nome',
+  'userDataParseFailed': 'Falha ao processar os dados do utilizador',
 };
diff --git a/apps/client/lib/core/translations/language/ro_ro.dart b/apps/client/lib/core/translations/language/ro_ro.dart
index 9cb55915..3b9d18af 100644
--- a/apps/client/lib/core/translations/language/ro_ro.dart
+++ b/apps/client/lib/core/translations/language/ro_ro.dart
@@ -1815,4 +1815,60 @@ const Map<String, String> roRO = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Deja la zi',
+  'otaCurrentVersion': 'Versiunea curentă',
+  'otaDone': 'Gata',
+  'otaDownloading': 'Se descarcă firmware-ul...',
+  'otaError': 'Eroare',
+  'otaExitConfirm': 'O actualizare este în curs. Sigur vrei să ieși?',
+  'otaExitTitle': 'Ieși din actualizare',
+  'otaFailed': 'Actualizarea a eșuat',
+  'otaFailedWithCode': 'Actualizarea a eșuat (cod @code)',
+  'otaKeepConnectedWarning': 'Ține dispozitivul aproape și nu închide aplicația în timpul actualizării.',
+  'otaLatestVersion': 'Cea mai recentă versiune',
+  'otaNeedConnect': 'Conectează mai întâi un dispozitiv',
+  'otaNotConnectedTip': 'Nu a fost detectat niciun dispozitiv conectat. Conectează căștile înainte de actualizare.',
+  'otaPreparing': 'Se pregătește...',
+  'otaStartUpgrade': 'Începe actualizarea',
+  'otaSuccessReboot': 'Actualizare reușită. Repornește dispozitivul.',
+  'otaTimeout': 'Actualizarea a expirat. Încearcă din nou.',
+  'otaUnknownDevice': 'Dispozitiv necunoscut',
+  'otaUpdateAvailable': 'Actualizare disponibilă',
+  'otaUpgrading': 'Se actualizează... @percent%',
+  'otaUpgradingShort': 'Se actualizează...',
+  'otaDownloadPreparing': 'Se pregătește descărcarea firmware-ului...',
+  'otaFirmwareCached': 'Firmware pregătit, se pregătește actualizarea...',
+  'otaDownloadStarted': 'Descărcarea firmware-ului a început...',
+  'otaDownloadingPercent': 'Se descarcă firmware-ul... @percent%',
+  'otaDownloadDone': 'Descărcare finalizată, se pregătește actualizarea...',
+  'addDevice': 'Adaugă dispozitiv',
+  'deviceConnectionRestricted': 'Conexiunea dispozitivului este restricționată: dispozitivul nu este autorizat',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Rezumate automate cu șabloane Autopilot',
+  'bindImmediately': 'Asociază acum',
+  'disconnect': 'Deconectează',
+  'discoveredDevices': 'Dispozitive găsite',
+  'distinguishDifferentSpeakers': 'Diferențierea vorbitorilor',
+  'enterFileName': 'Introdu un nume de fișier',
+  'findMore': 'Descoperă mai mult',
+  'finishRecording': 'Încheie înregistrarea',
+  'importAudioFromAppWeb': 'Importă audio din aplicație sau din web pentru transcriere și rezumat',
+  'industrySpecificSummaryTemplate': 'Șabloane de rezumat profesionale pentru domeniul tău',
+  'markFavorite': 'Adaugă la favorite',
+  'monthlyTranscriptionDuration': '300 de minute de transcriere pe lună',
+  'noDevicesFound': 'Nu s-au găsit dispozitive',
+  'notBound': 'Neasociat',
+  'notCharging': 'Nu se încarcă',
+  'pauseRecording': 'Întrerupe înregistrarea',
+  'pleaseEnterVerificationCode': 'Introdu codul de verificare',
+  'scanIdle': 'Nu se scanează',
+  'scanning': 'Se scanează...',
+  'startScan': 'Pornește scanarea',
+  'stopScan': 'Oprește scanarea',
+  'storageBytes': 'Spațiu total',
+  'storageUploads': 'Încărcări',
+  'unmarkFavorite': 'Elimină de la favorite',
+  'unnamedDevice': 'Dispozitiv fără nume',
+  'userDataParseFailed': 'Datele utilizatorului nu au putut fi citite',
 };
diff --git a/apps/client/lib/core/translations/language/ru_ru.dart b/apps/client/lib/core/translations/language/ru_ru.dart
index f951592e..674c9950 100644
--- a/apps/client/lib/core/translations/language/ru_ru.dart
+++ b/apps/client/lib/core/translations/language/ru_ru.dart
@@ -1772,7 +1772,7 @@ const Map<String, String> ruRU = {
   'binding': 'Привязка…',
   'microphonePermission': 'Микрофон',
   'tabDevice': 'Устройства',
-  'tabTodo': 'Задачи',
+  'tabTodo': 'Remin',
   'tabPlaza': 'Плаза',
   'sloganHome': 'Технологии для умной жизни',
   'sloganAi': 'Безграничный интеллект',
@@ -2046,4 +2046,59 @@ const Map<String, String> ruRU = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Установлена последняя версия',
+  'otaCurrentVersion': 'Текущая версия',
+  'otaDone': 'Готово',
+  'otaDownloading': 'Загрузка прошивки...',
+  'otaError': 'Ошибка',
+  'otaExitConfirm': 'Идёт обновление. Вы действительно хотите выйти?',
+  'otaExitTitle': 'Выйти из обновления',
+  'otaFailed': 'Ошибка обновления',
+  'otaFailedWithCode': 'Ошибка обновления (код @code)',
+  'otaKeepConnectedWarning': 'Держите устройство рядом и не закрывайте приложение во время обновления.',
+  'otaLatestVersion': 'Последняя версия',
+  'otaNeedConnect': 'Сначала подключите устройство',
+  'otaNotConnectedTip': 'Подключённое устройство не найдено. Подключите наушники перед обновлением.',
+  'otaPreparing': 'Подготовка...',
+  'otaStartUpgrade': 'Начать обновление',
+  'otaSuccessReboot': 'Обновление выполнено. Перезапустите устройство.',
+  'otaTimeout': 'Время обновления истекло. Попробуйте ещё раз.',
+  'otaUnknownDevice': 'Неизвестное устройство',
+  'otaUpdateAvailable': 'Доступно обновление',
+  'otaUpgrading': 'Обновление... @percent%',
+  'otaUpgradingShort': 'Обновление...',
+  'otaDownloadPreparing': 'Подготовка к загрузке прошивки...',
+  'otaFirmwareCached': 'Прошивка готова, подготовка к обновлению...',
+  'otaDownloadStarted': 'Загрузка прошивки начата...',
+  'otaDownloadingPercent': 'Загрузка прошивки... @percent%',
+  'otaDownloadDone': 'Загрузка завершена, подготовка к обновлению...',
+  'deviceConnectionRestricted': 'Подключение устройства ограничено: устройство не авторизовано',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Автоматические сводки по шаблонам Autopilot',
+  'bindImmediately': 'Привязать',
+  'disconnect': 'Отключить',
+  'discoveredDevices': 'Найденные устройства',
+  'distinguishDifferentSpeakers': 'Различать говорящих',
+  'enterFileName': 'Введите имя файла',
+  'findMore': 'Узнать больше',
+  'finishRecording': 'Завершить запись',
+  'importAudioFromAppWeb': 'Импортируйте аудио из приложения или веб-версии для расшифровки и сводки',
+  'industrySpecificSummaryTemplate': 'Профессиональные шаблоны сводок для вашей отрасли',
+  'markFavorite': 'В избранное',
+  'monthlyTranscriptionDuration': '300 минут расшифровки в месяц',
+  'noDevicesFound': 'Устройства не найдены',
+  'notBound': 'Не привязано',
+  'notCharging': 'Не заряжается',
+  'pauseRecording': 'Приостановить запись',
+  'pleaseEnterVerificationCode': 'Введите код подтверждения',
+  'scanIdle': 'Поиск не идёт',
+  'scanning': 'Поиск...',
+  'startScan': 'Начать поиск',
+  'stopScan': 'Остановить поиск',
+  'storageBytes': 'Всего в хранилище',
+  'storageUploads': 'Загрузки',
+  'unmarkFavorite': 'Убрать из избранного',
+  'unnamedDevice': 'Устройство без имени',
+  'userDataParseFailed': 'Не удалось обработать данные пользователя',
 };
diff --git a/apps/client/lib/core/translations/language/sk_sk.dart b/apps/client/lib/core/translations/language/sk_sk.dart
index 8da39d2b..5897bf70 100644
--- a/apps/client/lib/core/translations/language/sk_sk.dart
+++ b/apps/client/lib/core/translations/language/sk_sk.dart
@@ -1796,4 +1796,60 @@ const Map<String, String> skSK = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Už je aktuálny',
+  'otaCurrentVersion': 'Aktuálna verzia',
+  'otaDone': 'Hotovo',
+  'otaDownloading': 'Sťahovanie firmvéru...',
+  'otaError': 'Chyba',
+  'otaExitConfirm': 'Prebieha aktualizácia. Naozaj chcete odísť?',
+  'otaExitTitle': 'Ukončiť aktualizáciu',
+  'otaFailed': 'Aktualizácia zlyhala',
+  'otaFailedWithCode': 'Aktualizácia zlyhala (kód @code)',
+  'otaKeepConnectedWarning': 'Počas aktualizácie majte zariadenie nablízku a nezatvárajte aplikáciu.',
+  'otaLatestVersion': 'Najnovšia verzia',
+  'otaNeedConnect': 'Najprv pripojte zariadenie',
+  'otaNotConnectedTip': 'Nenašlo sa pripojené zariadenie. Pred aktualizáciou pripojte slúchadlá.',
+  'otaPreparing': 'Príprava...',
+  'otaStartUpgrade': 'Spustiť aktualizáciu',
+  'otaSuccessReboot': 'Aktualizácia úspešná. Reštartujte zariadenie.',
+  'otaTimeout': 'Vypršal časový limit aktualizácie. Skúste to znova.',
+  'otaUnknownDevice': 'Neznáme zariadenie',
+  'otaUpdateAvailable': 'Dostupná aktualizácia',
+  'otaUpgrading': 'Aktualizácia... @percent%',
+  'otaUpgradingShort': 'Aktualizácia...',
+  'otaDownloadPreparing': 'Príprava sťahovania firmvéru...',
+  'otaFirmwareCached': 'Firmvér pripravený, príprava aktualizácie...',
+  'otaDownloadStarted': 'Sťahovanie firmvéru sa začalo...',
+  'otaDownloadingPercent': 'Sťahovanie firmvéru... @percent%',
+  'otaDownloadDone': 'Sťahovanie dokončené, príprava aktualizácie...',
+  'addDevice': 'Pridať zariadenie',
+  'deviceConnectionRestricted': 'Pripojenie zariadenia je obmedzené: toto zariadenie nie je autorizované',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatické zhrnutia zo šablón Autopilot',
+  'bindImmediately': 'Spárovať teraz',
+  'disconnect': 'Odpojiť',
+  'discoveredDevices': 'Nájdené zariadenia',
+  'distinguishDifferentSpeakers': 'Rozlíšenie hovoriacich',
+  'enterFileName': 'Zadajte názov súboru',
+  'findMore': 'Objaviť viac',
+  'finishRecording': 'Ukončiť nahrávanie',
+  'importAudioFromAppWeb': 'Importujte zvuk z aplikácie alebo webu, prepíšte ho a zhrňte',
+  'industrySpecificSummaryTemplate': 'Profesionálne šablóny zhrnutí pre váš odbor',
+  'markFavorite': 'Pridať k obľúbeným',
+  'monthlyTranscriptionDuration': '300 minút prepisu mesačne',
+  'noDevicesFound': 'Nenašli sa žiadne zariadenia',
+  'notBound': 'Nespárované',
+  'notCharging': 'Nenabíja sa',
+  'pauseRecording': 'Pozastaviť nahrávanie',
+  'pleaseEnterVerificationCode': 'Zadajte overovací kód',
+  'scanIdle': 'Nevyhľadáva sa',
+  'scanning': 'Vyhľadávanie...',
+  'startScan': 'Spustiť vyhľadávanie',
+  'stopScan': 'Zastaviť vyhľadávanie',
+  'storageBytes': 'Celkové úložisko',
+  'storageUploads': 'Nahratia',
+  'unmarkFavorite': 'Odstrániť z obľúbených',
+  'unnamedDevice': 'Nepomenované zariadenie',
+  'userDataParseFailed': 'Údaje používateľa sa nepodarilo načítať',
 };
diff --git a/apps/client/lib/core/translations/language/sl_si.dart b/apps/client/lib/core/translations/language/sl_si.dart
index 52232e64..44c2c03b 100644
--- a/apps/client/lib/core/translations/language/sl_si.dart
+++ b/apps/client/lib/core/translations/language/sl_si.dart
@@ -1799,4 +1799,60 @@ const Map<String, String> slSI = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Že posodobljeno',
+  'otaCurrentVersion': 'Trenutna različica',
+  'otaDone': 'Končano',
+  'otaDownloading': 'Prenašanje vdelane programske opreme...',
+  'otaError': 'Napaka',
+  'otaExitConfirm': 'Nadgradnja poteka. Ali res želite zapustiti?',
+  'otaExitTitle': 'Izhod iz nadgradnje',
+  'otaFailed': 'Nadgradnja ni uspela',
+  'otaFailedWithCode': 'Nadgradnja ni uspela (koda @code)',
+  'otaKeepConnectedWarning': 'Med nadgradnjo imejte napravo blizu in ne zapirajte aplikacije.',
+  'otaLatestVersion': 'Najnovejša različica',
+  'otaNeedConnect': 'Najprej povežite napravo',
+  'otaNotConnectedTip': 'Povezane naprave ni bilo mogoče najti. Pred nadgradnjo povežite slušalke.',
+  'otaPreparing': 'Pripravljanje...',
+  'otaStartUpgrade': 'Začni nadgradnjo',
+  'otaSuccessReboot': 'Nadgradnja je uspela. Znova zaženite napravo.',
+  'otaTimeout': 'Časovna omejitev nadgradnje je potekla. Poskusite znova.',
+  'otaUnknownDevice': 'Neznana naprava',
+  'otaUpdateAvailable': 'Na voljo je posodobitev',
+  'otaUpgrading': 'Nadgrajevanje... @percent%',
+  'otaUpgradingShort': 'Nadgrajevanje...',
+  'otaDownloadPreparing': 'Pripravljanje prenosa vdelane programske opreme...',
+  'otaFirmwareCached': 'Vdelana programska oprema je pripravljena, pripravljanje nadgradnje...',
+  'otaDownloadStarted': 'Prenos vdelane programske opreme se je začel...',
+  'otaDownloadingPercent': 'Prenašanje vdelane programske opreme... @percent%',
+  'otaDownloadDone': 'Prenos je končan, pripravljanje nadgradnje...',
+  'addDevice': 'Dodaj napravo',
+  'deviceConnectionRestricted': 'Povezava naprave je omejena: ta naprava ni pooblaščena',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Samodejni povzetki s predlogami Autopilot',
+  'bindImmediately': 'Poveži zdaj',
+  'disconnect': 'Prekini povezavo',
+  'discoveredDevices': 'Najdene naprave',
+  'distinguishDifferentSpeakers': 'Razlikovanje govorcev',
+  'enterFileName': 'Vnesite ime datoteke',
+  'findMore': 'Odkrijte več',
+  'finishRecording': 'Končaj snemanje',
+  'importAudioFromAppWeb': 'Uvozite zvok iz aplikacije ali spleta za prepis in povzetek',
+  'industrySpecificSummaryTemplate': 'Profesionalne predloge povzetkov za vašo panogo',
+  'markFavorite': 'Dodaj med priljubljene',
+  'monthlyTranscriptionDuration': '300 minut prepisa na mesec',
+  'noDevicesFound': 'Ni najdenih naprav',
+  'notBound': 'Ni povezano',
+  'notCharging': 'Se ne polni',
+  'pauseRecording': 'Začasno ustavi snemanje',
+  'pleaseEnterVerificationCode': 'Vnesite potrditveno kodo',
+  'scanIdle': 'Iskanje ne poteka',
+  'scanning': 'Iskanje...',
+  'startScan': 'Začni iskanje',
+  'stopScan': 'Ustavi iskanje',
+  'storageBytes': 'Skupna shramba',
+  'storageUploads': 'Nalaganja',
+  'unmarkFavorite': 'Odstrani iz priljubljenih',
+  'unnamedDevice': 'Neimenovana naprava',
+  'userDataParseFailed': 'Uporabniških podatkov ni bilo mogoče prebrati',
 };
diff --git a/apps/client/lib/core/translations/language/sr_rs.dart b/apps/client/lib/core/translations/language/sr_rs.dart
index f7531790..5dacca4c 100644
--- a/apps/client/lib/core/translations/language/sr_rs.dart
+++ b/apps/client/lib/core/translations/language/sr_rs.dart
@@ -1795,4 +1795,60 @@ const Map<String, String> srRS = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Već je ažurno',
+  'otaCurrentVersion': 'Trenutna verzija',
+  'otaDone': 'Gotovo',
+  'otaDownloading': 'Preuzimanje firmvera...',
+  'otaError': 'Greška',
+  'otaExitConfirm': 'Ažuriranje je u toku. Da li stvarno želite da izađete?',
+  'otaExitTitle': 'Izlaz iz ažuriranja',
+  'otaFailed': 'Ažuriranje nije uspelo',
+  'otaFailedWithCode': 'Ažuriranje nije uspelo (kod @code)',
+  'otaKeepConnectedWarning': 'Tokom ažuriranja držite uređaj blizu i ne zatvarajte aplikaciju.',
+  'otaLatestVersion': 'Najnovija verzija',
+  'otaNeedConnect': 'Prvo povežite uređaj',
+  'otaNotConnectedTip': 'Nije pronađen povezani uređaj. Povežite slušalice pre ažuriranja.',
+  'otaPreparing': 'Priprema...',
+  'otaStartUpgrade': 'Pokreni ažuriranje',
+  'otaSuccessReboot': 'Ažuriranje je uspelo. Ponovo pokrenite uređaj.',
+  'otaTimeout': 'Isteklo je vreme ažuriranja. Pokušajte ponovo.',
+  'otaUnknownDevice': 'Nepoznat uređaj',
+  'otaUpdateAvailable': 'Dostupno je ažuriranje',
+  'otaUpgrading': 'Ažuriranje... @percent%',
+  'otaUpgradingShort': 'Ažuriranje...',
+  'otaDownloadPreparing': 'Priprema preuzimanja firmvera...',
+  'otaFirmwareCached': 'Firmver je spreman, priprema ažuriranja...',
+  'otaDownloadStarted': 'Preuzimanje firmvera je počelo...',
+  'otaDownloadingPercent': 'Preuzimanje firmvera... @percent%',
+  'otaDownloadDone': 'Preuzimanje je završeno, priprema ažuriranja...',
+  'addDevice': 'Dodaj uređaj',
+  'deviceConnectionRestricted': 'Povezivanje uređaja je ograničeno: uređaj nije autorizovan',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Аутоматски резимеи помоћу Autopilot шаблона',
+  'bindImmediately': 'Повежи одмах',
+  'disconnect': 'Прекини везу',
+  'discoveredDevices': 'Пронађени уређаји',
+  'distinguishDifferentSpeakers': 'Разликовање говорника',
+  'enterFileName': 'Унесите назив датотеке',
+  'findMore': 'Откријте више',
+  'finishRecording': 'Заврши снимање',
+  'importAudioFromAppWeb': 'Увезите звук из апликације или са веба ради транскрипције и резимеа',
+  'industrySpecificSummaryTemplate': 'Професионални шаблони резимеа за вашу делатност',
+  'markFavorite': 'Додај у омиљено',
+  'monthlyTranscriptionDuration': '300 минута транскрипције месечно',
+  'noDevicesFound': 'Није пронађен ниједан уређај',
+  'notBound': 'Није повезано',
+  'notCharging': 'Не пуни се',
+  'pauseRecording': 'Паузирај снимање',
+  'pleaseEnterVerificationCode': 'Унесите верификациони код',
+  'scanIdle': 'Не претражује се',
+  'scanning': 'Претраживање...',
+  'startScan': 'Покрени претрагу',
+  'stopScan': 'Заустави претрагу',
+  'storageBytes': 'Укупно складиште',
+  'storageUploads': 'Отпремања',
+  'unmarkFavorite': 'Уклони из омиљених',
+  'unnamedDevice': 'Уређај без назива',
+  'userDataParseFailed': 'Подаци корисника нису могли да се учитају',
 };
diff --git a/apps/client/lib/core/translations/language/sv_se.dart b/apps/client/lib/core/translations/language/sv_se.dart
index ea076436..886b3906 100644
--- a/apps/client/lib/core/translations/language/sv_se.dart
+++ b/apps/client/lib/core/translations/language/sv_se.dart
@@ -1791,4 +1791,60 @@ const Map<String, String> svSE = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Redan uppdaterad',
+  'otaCurrentVersion': 'Nuvarande version',
+  'otaDone': 'Klar',
+  'otaDownloading': 'Laddar ner fast programvara...',
+  'otaError': 'Fel',
+  'otaExitConfirm': 'En uppdatering pågår. Vill du verkligen avsluta?',
+  'otaExitTitle': 'Avsluta uppdatering',
+  'otaFailed': 'Uppdateringen misslyckades',
+  'otaFailedWithCode': 'Uppdateringen misslyckades (kod @code)',
+  'otaKeepConnectedWarning': 'Håll enheten nära och stäng inte appen under uppdateringen.',
+  'otaLatestVersion': 'Senaste versionen',
+  'otaNeedConnect': 'Anslut en enhet först',
+  'otaNotConnectedTip': 'Ingen ansluten enhet hittades. Anslut dina hörlurar innan du uppdaterar.',
+  'otaPreparing': 'Förbereder...',
+  'otaStartUpgrade': 'Starta uppdatering',
+  'otaSuccessReboot': 'Uppdateringen lyckades. Starta om enheten.',
+  'otaTimeout': 'Tidsgränsen för uppdateringen överskreds. Försök igen.',
+  'otaUnknownDevice': 'Okänd enhet',
+  'otaUpdateAvailable': 'Uppdatering tillgänglig',
+  'otaUpgrading': 'Uppdaterar... @percent%',
+  'otaUpgradingShort': 'Uppdaterar...',
+  'otaDownloadPreparing': 'Förbereder nedladdning av fast programvara...',
+  'otaFirmwareCached': 'Fast programvara klar, förbereder uppdatering...',
+  'otaDownloadStarted': 'Nedladdning av fast programvara startad...',
+  'otaDownloadingPercent': 'Laddar ner fast programvara... @percent%',
+  'otaDownloadDone': 'Nedladdning klar, förbereder uppdatering...',
+  'addDevice': 'Lägg till enhet',
+  'deviceConnectionRestricted': 'Enhetsanslutning begränsad: enheten är inte auktoriserad',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Automatiska sammanfattningar med Autopilot-mallar',
+  'bindImmediately': 'Koppla nu',
+  'disconnect': 'Koppla från',
+  'discoveredDevices': 'Hittade enheter',
+  'distinguishDifferentSpeakers': 'Skilj på olika talare',
+  'enterFileName': 'Ange ett filnamn',
+  'findMore': 'Upptäck mer',
+  'finishRecording': 'Avsluta inspelning',
+  'importAudioFromAppWeb': 'Importera ljud från appen eller webben för transkribering och sammanfattning',
+  'industrySpecificSummaryTemplate': 'Professionella sammanfattningsmallar för din bransch',
+  'markFavorite': 'Lägg till i favoriter',
+  'monthlyTranscriptionDuration': '300 minuters transkribering per månad',
+  'noDevicesFound': 'Inga enheter hittades',
+  'notBound': 'Inte kopplad',
+  'notCharging': 'Laddar inte',
+  'pauseRecording': 'Pausa inspelning',
+  'pleaseEnterVerificationCode': 'Ange verifieringskoden',
+  'scanIdle': 'Söker inte',
+  'scanning': 'Söker...',
+  'startScan': 'Starta sökning',
+  'stopScan': 'Stoppa sökning',
+  'storageBytes': 'Total lagring',
+  'storageUploads': 'Uppladdningar',
+  'unmarkFavorite': 'Ta bort från favoriter',
+  'unnamedDevice': 'Namnlös enhet',
+  'userDataParseFailed': 'Det gick inte att läsa användardata',
 };
diff --git a/apps/client/lib/core/translations/language/th_th.dart b/apps/client/lib/core/translations/language/th_th.dart
index cd607871..1020a9c1 100644
--- a/apps/client/lib/core/translations/language/th_th.dart
+++ b/apps/client/lib/core/translations/language/th_th.dart
@@ -1744,4 +1744,60 @@ const Map<String, String> thTH = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'เป็นเวอร์ชันล่าสุดแล้ว',
+  'otaCurrentVersion': 'เวอร์ชันปัจจุบัน',
+  'otaDone': 'เสร็จสิ้น',
+  'otaDownloading': 'กำลังดาวน์โหลดเฟิร์มแวร์...',
+  'otaError': 'ข้อผิดพลาด',
+  'otaExitConfirm': 'กำลังอัปเกรดอยู่ ต้องการออกหรือไม่?',
+  'otaExitTitle': 'ออกจากการอัปเกรด',
+  'otaFailed': 'อัปเกรดไม่สำเร็จ',
+  'otaFailedWithCode': 'อัปเกรดไม่สำเร็จ (รหัส @code)',
+  'otaKeepConnectedWarning': 'ระหว่างอัปเกรด กรุณาวางอุปกรณ์ไว้ใกล้ ๆ และอย่าปิดแอป',
+  'otaLatestVersion': 'เวอร์ชันล่าสุด',
+  'otaNeedConnect': 'กรุณาเชื่อมต่ออุปกรณ์ก่อน',
+  'otaNotConnectedTip': 'ไม่พบอุปกรณ์ที่เชื่อมต่อ กรุณาเชื่อมต่อหูฟังก่อนอัปเกรด',
+  'otaPreparing': 'กำลังเตรียม...',
+  'otaStartUpgrade': 'เริ่มอัปเกรด',
+  'otaSuccessReboot': 'อัปเกรดสำเร็จ กรุณารีสตาร์ทอุปกรณ์',
+  'otaTimeout': 'หมดเวลาการอัปเกรด กรุณาลองใหม่',
+  'otaUnknownDevice': 'อุปกรณ์ที่ไม่รู้จัก',
+  'otaUpdateAvailable': 'มีการอัปเดต',
+  'otaUpgrading': 'กำลังอัปเกรด... @percent%',
+  'otaUpgradingShort': 'กำลังอัปเกรด...',
+  'otaDownloadPreparing': 'กำลังเตรียมดาวน์โหลดเฟิร์มแวร์...',
+  'otaFirmwareCached': 'เฟิร์มแวร์พร้อมแล้ว กำลังเตรียมอัปเกรด...',
+  'otaDownloadStarted': 'เริ่มดาวน์โหลดเฟิร์มแวร์...',
+  'otaDownloadingPercent': 'กำลังดาวน์โหลดเฟิร์มแวร์... @percent%',
+  'otaDownloadDone': 'ดาวน์โหลดเสร็จ กำลังเตรียมอัปเกรด...',
+  'addDevice': 'เพิ่มอุปกรณ์',
+  'deviceConnectionRestricted': 'การเชื่อมต่ออุปกรณ์ถูกจำกัด: อุปกรณ์นี้ไม่ได้รับอนุญาต',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'สรุปอัตโนมัติด้วยเทมเพลต Autopilot',
+  'bindImmediately': 'ผูกอุปกรณ์ทันที',
+  'disconnect': 'ตัดการเชื่อมต่อ',
+  'discoveredDevices': 'อุปกรณ์ที่พบ',
+  'distinguishDifferentSpeakers': 'แยกแยะผู้พูดแต่ละคน',
+  'enterFileName': 'กรอกชื่อไฟล์',
+  'findMore': 'ดูเพิ่มเติม',
+  'finishRecording': 'สิ้นสุดการบันทึก',
+  'importAudioFromAppWeb': 'นำเข้าเสียงจากแอปหรือเว็บเพื่อถอดความและสรุป',
+  'industrySpecificSummaryTemplate': 'เทมเพลตสรุปมืออาชีพที่ออกแบบมาเพื่ออุตสาหกรรมของคุณ',
+  'markFavorite': 'เพิ่มในรายการโปรด',
+  'monthlyTranscriptionDuration': 'ถอดความ 300 นาทีต่อเดือน',
+  'noDevicesFound': 'ไม่พบอุปกรณ์',
+  'notBound': 'ยังไม่ได้ผูก',
+  'notCharging': 'ไม่ได้ชาร์จ',
+  'pauseRecording': 'หยุดบันทึกชั่วคราว',
+  'pleaseEnterVerificationCode': 'กรุณากรอกรหัสยืนยัน',
+  'scanIdle': 'ไม่ได้กำลังค้นหา',
+  'scanning': 'กำลังค้นหา...',
+  'startScan': 'เริ่มค้นหา',
+  'stopScan': 'หยุดค้นหา',
+  'storageBytes': 'พื้นที่จัดเก็บทั้งหมด',
+  'storageUploads': 'จำนวนการอัปโหลด',
+  'unmarkFavorite': 'นำออกจากรายการโปรด',
+  'unnamedDevice': 'อุปกรณ์ที่ไม่มีชื่อ',
+  'userDataParseFailed': 'อ่านข้อมูลผู้ใช้ไม่สำเร็จ',
 };
diff --git a/apps/client/lib/core/translations/language/tl_ph.dart b/apps/client/lib/core/translations/language/tl_ph.dart
index 7d57ce12..fb3b3fe2 100644
--- a/apps/client/lib/core/translations/language/tl_ph.dart
+++ b/apps/client/lib/core/translations/language/tl_ph.dart
@@ -1829,4 +1829,60 @@ const Map<String, String> tlPH = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Pinakabago na',
+  'otaCurrentVersion': 'Kasalukuyang bersyon',
+  'otaDone': 'Tapos na',
+  'otaDownloading': 'Dina-download ang firmware...',
+  'otaError': 'Error',
+  'otaExitConfirm': 'May kasalukuyang pag-upgrade. Sigurado kang gusto mong lumabas?',
+  'otaExitTitle': 'Lumabas sa pag-upgrade',
+  'otaFailed': 'Nabigo ang pag-upgrade',
+  'otaFailedWithCode': 'Nabigo ang pag-upgrade (code @code)',
+  'otaKeepConnectedWarning': 'Ilapit ang device at huwag isara ang app habang nag-a-upgrade.',
+  'otaLatestVersion': 'Pinakabagong bersyon',
+  'otaNeedConnect': 'Kumonekta muna sa isang device',
+  'otaNotConnectedTip': 'Walang nakitang nakakonektang device. Ikonekta ang iyong earphone bago mag-upgrade.',
+  'otaPreparing': 'Naghahanda...',
+  'otaStartUpgrade': 'Simulan ang pag-upgrade',
+  'otaSuccessReboot': 'Matagumpay ang pag-upgrade. Pakirestart ang device.',
+  'otaTimeout': 'Nag-timeout ang pag-upgrade. Subukan ulit.',
+  'otaUnknownDevice': 'Hindi kilalang device',
+  'otaUpdateAvailable': 'May available na update',
+  'otaUpgrading': 'Nag-a-upgrade... @percent%',
+  'otaUpgradingShort': 'Nag-a-upgrade...',
+  'otaDownloadPreparing': 'Naghahanda sa pag-download ng firmware...',
+  'otaFirmwareCached': 'Handa na ang firmware, naghahanda sa pag-upgrade...',
+  'otaDownloadStarted': 'Nagsimula ang pag-download ng firmware...',
+  'otaDownloadingPercent': 'Dina-download ang firmware... @percent%',
+  'otaDownloadDone': 'Tapos na ang download, naghahanda sa pag-upgrade...',
+  'addDevice': 'Magdagdag ng device',
+  'deviceConnectionRestricted': 'Pinaghihigpitan ang koneksyon ng device: hindi awtorisado ang device na ito',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Awtomatikong buod gamit ang mga template ng Autopilot',
+  'bindImmediately': 'I-bind Ngayon',
+  'disconnect': 'Idiskonekta',
+  'discoveredDevices': 'Mga natagpuang device',
+  'distinguishDifferentSpeakers': 'Kilalanin ang magkakaibang nagsasalita',
+  'enterFileName': 'Maglagay ng pangalan ng file',
+  'findMore': 'Tumuklas Pa',
+  'finishRecording': 'Tapusin ang Pagre-record',
+  'importAudioFromAppWeb': 'Mag-import ng audio mula sa app o web para i-transcribe at buurin',
+  'industrySpecificSummaryTemplate': 'Mga propesyonal na template ng buod para sa iyong industriya',
+  'markFavorite': 'Idagdag sa mga paborito',
+  'monthlyTranscriptionDuration': '300 minutong transcription bawat buwan',
+  'noDevicesFound': 'Walang natagpuang device',
+  'notBound': 'Hindi naka-bind',
+  'notCharging': 'Hindi nagcha-charge',
+  'pauseRecording': 'I-pause ang Pagre-record',
+  'pleaseEnterVerificationCode': 'Pakilagay ang verification code',
+  'scanIdle': 'Hindi nagsa-scan',
+  'scanning': 'Nagsa-scan...',
+  'startScan': 'Simulan ang Scan',
+  'stopScan': 'Itigil ang Scan',
+  'storageBytes': 'Kabuuang Storage',
+  'storageUploads': 'Mga upload',
+  'unmarkFavorite': 'Alisin sa mga paborito',
+  'unnamedDevice': 'Device na walang pangalan',
+  'userDataParseFailed': 'Nabigong basahin ang data ng user',
 };
diff --git a/apps/client/lib/core/translations/language/tr_tr.dart b/apps/client/lib/core/translations/language/tr_tr.dart
index a8e80831..6c22252d 100644
--- a/apps/client/lib/core/translations/language/tr_tr.dart
+++ b/apps/client/lib/core/translations/language/tr_tr.dart
@@ -1783,4 +1783,60 @@ const Map<String, String> trTR = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Zaten güncel',
+  'otaCurrentVersion': 'Geçerli sürüm',
+  'otaDone': 'Tamam',
+  'otaDownloading': 'Ürün yazılımı indiriliyor...',
+  'otaError': 'Hata',
+  'otaExitConfirm': 'Bir güncelleme sürüyor. Çıkmak istediğinizden emin misiniz?',
+  'otaExitTitle': 'Güncellemeden çık',
+  'otaFailed': 'Güncelleme başarısız',
+  'otaFailedWithCode': 'Güncelleme başarısız (kod @code)',
+  'otaKeepConnectedWarning': 'Güncelleme sırasında cihazı yakın tutun ve uygulamayı kapatmayın.',
+  'otaLatestVersion': 'En son sürüm',
+  'otaNeedConnect': 'Lütfen önce bir cihaz bağlayın',
+  'otaNotConnectedTip': 'Bağlı cihaz bulunamadı. Güncellemeden önce kulaklığınızı bağlayın.',
+  'otaPreparing': 'Hazırlanıyor...',
+  'otaStartUpgrade': 'Güncellemeyi başlat',
+  'otaSuccessReboot': 'Güncelleme başarılı. Lütfen cihazı yeniden başlatın.',
+  'otaTimeout': 'Güncelleme zaman aşımına uğradı. Lütfen tekrar deneyin.',
+  'otaUnknownDevice': 'Bilinmeyen cihaz',
+  'otaUpdateAvailable': 'Güncelleme mevcut',
+  'otaUpgrading': 'Güncelleniyor... @percent%',
+  'otaUpgradingShort': 'Güncelleniyor...',
+  'otaDownloadPreparing': 'Ürün yazılımı indirmesi hazırlanıyor...',
+  'otaFirmwareCached': 'Ürün yazılımı hazır, güncelleme hazırlanıyor...',
+  'otaDownloadStarted': 'Ürün yazılımı indirmesi başladı...',
+  'otaDownloadingPercent': 'Ürün yazılımı indiriliyor... @percent%',
+  'otaDownloadDone': 'İndirme tamamlandı, güncelleme hazırlanıyor...',
+  'addDevice': 'Cihaz ekle',
+  'deviceConnectionRestricted': 'Cihaz bağlantısı kısıtlandı: bu cihaz yetkilendirilmemiş',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Autopilot şablonlarıyla otomatik özet',
+  'bindImmediately': 'Şimdi eşle',
+  'disconnect': 'Bağlantıyı kes',
+  'discoveredDevices': 'Bulunan cihazlar',
+  'distinguishDifferentSpeakers': 'Konuşmacıları ayırt et',
+  'enterFileName': 'Bir dosya adı girin',
+  'findMore': 'Daha fazlasını keşfet',
+  'finishRecording': 'Kaydı bitir',
+  'importAudioFromAppWeb': 'Uygulamadan veya web’den ses içe aktarıp yazıya dökün ve özetleyin',
+  'industrySpecificSummaryTemplate': 'Sektörünüz için tasarlanmış profesyonel özet şablonları',
+  'markFavorite': 'Favorilere ekle',
+  'monthlyTranscriptionDuration': 'Ayda 300 dakika deşifre süresi',
+  'noDevicesFound': 'Cihaz bulunamadı',
+  'notBound': 'Eşlenmedi',
+  'notCharging': 'Şarj olmuyor',
+  'pauseRecording': 'Kaydı duraklat',
+  'pleaseEnterVerificationCode': 'Lütfen doğrulama kodunu girin',
+  'scanIdle': 'Taranmıyor',
+  'scanning': 'Taranıyor...',
+  'startScan': 'Taramayı başlat',
+  'stopScan': 'Taramayı durdur',
+  'storageBytes': 'Toplam depolama',
+  'storageUploads': 'Yüklemeler',
+  'unmarkFavorite': 'Favorilerden çıkar',
+  'unnamedDevice': 'Adsız cihaz',
+  'userDataParseFailed': 'Kullanıcı verileri işlenemedi',
 };
diff --git a/apps/client/lib/core/translations/language/uk_ua.dart b/apps/client/lib/core/translations/language/uk_ua.dart
index 2f5c6555..72549837 100644
--- a/apps/client/lib/core/translations/language/uk_ua.dart
+++ b/apps/client/lib/core/translations/language/uk_ua.dart
@@ -1803,4 +1803,60 @@ const Map<String, String> ukUA = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Установлено найновішу версію',
+  'otaCurrentVersion': 'Поточна версія',
+  'otaDone': 'Готово',
+  'otaDownloading': 'Завантаження прошивки...',
+  'otaError': 'Помилка',
+  'otaExitConfirm': 'Триває оновлення. Ви справді хочете вийти?',
+  'otaExitTitle': 'Вийти з оновлення',
+  'otaFailed': 'Помилка оновлення',
+  'otaFailedWithCode': 'Помилка оновлення (код @code)',
+  'otaKeepConnectedWarning': 'Тримайте пристрій поруч і не закривайте застосунок під час оновлення.',
+  'otaLatestVersion': 'Найновіша версія',
+  'otaNeedConnect': 'Спершу підключіть пристрій',
+  'otaNotConnectedTip': 'Підключений пристрій не знайдено. Підключіть навушники перед оновленням.',
+  'otaPreparing': 'Підготовка...',
+  'otaStartUpgrade': 'Почати оновлення',
+  'otaSuccessReboot': 'Оновлення виконано. Перезапустіть пристрій.',
+  'otaTimeout': 'Час оновлення вичерпано. Спробуйте ще раз.',
+  'otaUnknownDevice': 'Невідомий пристрій',
+  'otaUpdateAvailable': 'Доступне оновлення',
+  'otaUpgrading': 'Оновлення... @percent%',
+  'otaUpgradingShort': 'Оновлення...',
+  'otaDownloadPreparing': 'Підготовка до завантаження прошивки...',
+  'otaFirmwareCached': 'Прошивка готова, підготовка до оновлення...',
+  'otaDownloadStarted': 'Завантаження прошивки почалося...',
+  'otaDownloadingPercent': 'Завантаження прошивки... @percent%',
+  'otaDownloadDone': 'Завантаження завершено, підготовка до оновлення...',
+  'addDevice': 'Додати пристрій',
+  'deviceConnectionRestricted': 'Підключення пристрою обмежено: пристрій не авторизовано',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Автоматичні підсумки за шаблонами Autopilot',
+  'bindImmediately': "Зв'язати зараз",
+  'disconnect': 'Відключити',
+  'discoveredDevices': 'Знайдені пристрої',
+  'distinguishDifferentSpeakers': 'Розрізнення мовців',
+  'enterFileName': "Введіть ім'я файлу",
+  'findMore': 'Дізнатися більше',
+  'finishRecording': 'Завершити запис',
+  'importAudioFromAppWeb': 'Імпортуйте аудіо з застосунку або вебу для розшифрування та підсумку',
+  'industrySpecificSummaryTemplate': 'Професійні шаблони підсумків для вашої галузі',
+  'markFavorite': 'Додати до обраного',
+  'monthlyTranscriptionDuration': '300 хвилин розшифрування щомісяця',
+  'noDevicesFound': 'Пристроїв не знайдено',
+  'notBound': "Не зв'язано",
+  'notCharging': 'Не заряджається',
+  'pauseRecording': 'Призупинити запис',
+  'pleaseEnterVerificationCode': 'Введіть код підтвердження',
+  'scanIdle': 'Пошук не виконується',
+  'scanning': 'Пошук...',
+  'startScan': 'Почати пошук',
+  'stopScan': 'Зупинити пошук',
+  'storageBytes': 'Загальний обсяг сховища',
+  'storageUploads': 'Завантаження',
+  'unmarkFavorite': 'Прибрати з обраного',
+  'unnamedDevice': 'Пристрій без назви',
+  'userDataParseFailed': 'Не вдалося обробити дані користувача',
 };
diff --git a/apps/client/lib/core/translations/language/vi_vn.dart b/apps/client/lib/core/translations/language/vi_vn.dart
index ca90b56b..73a93911 100644
--- a/apps/client/lib/core/translations/language/vi_vn.dart
+++ b/apps/client/lib/core/translations/language/vi_vn.dart
@@ -1763,4 +1763,60 @@ const Map<String, String> viVN = {
   'idVerifyTooFrequent': 'Too many attempts. Please try again later.',
   'idVerifyFailed': 'Verification failed. Please try again later.',
   'genderLockedByIdVerify': 'Gender is set from your verified ID and cannot be changed',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': 'Đã là phiên bản mới nhất',
+  'otaCurrentVersion': 'Phiên bản hiện tại',
+  'otaDone': 'Xong',
+  'otaDownloading': 'Đang tải phần mềm...',
+  'otaError': 'Lỗi',
+  'otaExitConfirm': 'Đang nâng cấp. Bạn có chắc muốn thoát không?',
+  'otaExitTitle': 'Thoát nâng cấp',
+  'otaFailed': 'Nâng cấp thất bại',
+  'otaFailedWithCode': 'Nâng cấp thất bại (mã @code)',
+  'otaKeepConnectedWarning': 'Giữ thiết bị ở gần và không đóng ứng dụng trong khi nâng cấp.',
+  'otaLatestVersion': 'Phiên bản mới nhất',
+  'otaNeedConnect': 'Vui lòng kết nối thiết bị trước',
+  'otaNotConnectedTip': 'Không phát hiện thiết bị đã kết nối. Hãy kết nối tai nghe trước khi nâng cấp.',
+  'otaPreparing': 'Đang chuẩn bị...',
+  'otaStartUpgrade': 'Bắt đầu nâng cấp',
+  'otaSuccessReboot': 'Nâng cấp thành công. Vui lòng khởi động lại thiết bị.',
+  'otaTimeout': 'Nâng cấp quá thời gian. Vui lòng thử lại.',
+  'otaUnknownDevice': 'Thiết bị không xác định',
+  'otaUpdateAvailable': 'Có bản cập nhật',
+  'otaUpgrading': 'Đang nâng cấp... @percent%',
+  'otaUpgradingShort': 'Đang nâng cấp...',
+  'otaDownloadPreparing': 'Đang chuẩn bị tải phần mềm...',
+  'otaFirmwareCached': 'Phần mềm đã sẵn sàng, đang chuẩn bị nâng cấp...',
+  'otaDownloadStarted': 'Bắt đầu tải phần mềm...',
+  'otaDownloadingPercent': 'Đang tải phần mềm... @percent%',
+  'otaDownloadDone': 'Tải xong, đang chuẩn bị nâng cấp...',
+  'addDevice': 'Thêm thiết bị',
+  'deviceConnectionRestricted': 'Kết nối thiết bị bị hạn chế: thiết bị này chưa được ủy quyền',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Tự động tóm tắt bằng mẫu Autopilot',
+  'bindImmediately': 'Liên kết ngay',
+  'disconnect': 'Ngắt kết nối',
+  'discoveredDevices': 'Thiết bị đã tìm thấy',
+  'distinguishDifferentSpeakers': 'Phân biệt người nói',
+  'enterFileName': 'Nhập tên tệp',
+  'findMore': 'Khám phá thêm',
+  'finishRecording': 'Kết thúc ghi âm',
+  'importAudioFromAppWeb': 'Nhập âm thanh từ ứng dụng hoặc web để chuyển thành văn bản và tóm tắt',
+  'industrySpecificSummaryTemplate': 'Mẫu tóm tắt chuyên nghiệp cho ngành của bạn',
+  'markFavorite': 'Thêm vào yêu thích',
+  'monthlyTranscriptionDuration': '300 phút chuyển lời nói thành văn bản mỗi tháng',
+  'noDevicesFound': 'Không tìm thấy thiết bị',
+  'notBound': 'Chưa liên kết',
+  'notCharging': 'Không sạc',
+  'pauseRecording': 'Tạm dừng ghi âm',
+  'pleaseEnterVerificationCode': 'Vui lòng nhập mã xác minh',
+  'scanIdle': 'Chưa quét',
+  'scanning': 'Đang quét...',
+  'startScan': 'Bắt đầu quét',
+  'stopScan': 'Dừng quét',
+  'storageBytes': 'Tổng dung lượng',
+  'storageUploads': 'Lượt tải lên',
+  'unmarkFavorite': 'Bỏ khỏi yêu thích',
+  'unnamedDevice': 'Thiết bị chưa đặt tên',
+  'userDataParseFailed': 'Không đọc được dữ liệu người dùng',
 };
diff --git a/apps/client/lib/core/translations/language/zh_cn.dart b/apps/client/lib/core/translations/language/zh_cn.dart
index e89312eb..dff0e641 100644
--- a/apps/client/lib/core/translations/language/zh_cn.dart
+++ b/apps/client/lib/core/translations/language/zh_cn.dart
@@ -1386,6 +1386,7 @@ const Map<String, String> zhCN = {
   'otaUpgradeSuccessComplete': '升级成功完成',
   'otaUpgradeFailedWithCode': '升级失败，错误码：@code',
   'otaUpgradeFailedTitle': '升级失败',
+  'otaBesNotSupported': '该耳机暂不支持在 App 内升级固件，请联系客服获取升级方式',
   'otaUpgradeFailedDesc': '请检查设备连接或升级包，错误码：@code',
   'otaDeviceDisconnected': '设备连接断开',
   'otaDeviceConnected': '设备连接成功',
@@ -1594,7 +1595,7 @@ const Map<String, String> zhCN = {
 
   // ==== 界面文案补齐（自启动授权 / 设备页 / AI页 / 广场 等）====
   'tabDevice': '设备',
-  'tabTodo': '代办',
+  'tabTodo': '拾忆',
   'tabPlaza': '广场',
   'sloganHome': '科技引领 智能人生',
   'sloganAi': '智能无限 无所不能',
@@ -1851,4 +1852,60 @@ const Map<String, String> zhCN = {
   'idVerifyTooFrequent': '尝试过于频繁，请稍后再试',
   'idVerifyFailed': '实名认证失败，请稍后再试',
   'genderLockedByIdVerify': '性别已根据实名认证信息确定，不可修改',
+
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': '已是最新版本',
+  'otaCurrentVersion': '当前版本',
+  'otaDone': '完成',
+  'otaDownloading': '正在下载固件...',
+  'otaError': '错误',
+  'otaExitConfirm': '升级正在进行中，确定要退出吗？',
+  'otaExitTitle': '退出升级',
+  'otaFailed': '升级失败',
+  'otaFailedWithCode': '升级失败（错误码 @code）',
+  'otaKeepConnectedWarning': '升级过程中请保持设备靠近并勿关闭应用',
+  'otaLatestVersion': '最新版本',
+  'otaNeedConnect': '请先连接设备',
+  'otaNotConnectedTip': '未检测到已连接的设备，请先连接耳机后再升级固件',
+  'otaPreparing': '准备中...',
+  'otaStartUpgrade': '开始升级',
+  'otaSuccessReboot': '升级成功，请重启设备',
+  'otaTimeout': '升级超时，请重试',
+  'otaUnknownDevice': '未知设备',
+  'otaUpdateAvailable': '有可用更新',
+  'otaUpgrading': '升级中... @percent%',
+  'otaUpgradingShort': '正在升级...',
+  'otaDownloadPreparing': '准备下载固件包...',
+  'otaFirmwareCached': '固件已就绪，准备升级...',
+  'otaDownloadStarted': '开始下载固件包...',
+  'otaDownloadingPercent': '正在下载固件包... @percent%',
+  'otaDownloadDone': '下载完成，准备升级...',
+  'deviceConnectionRestricted': '设备连接受限，该设备未获授权',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Autopilot 模版自动总结',
+  'bindImmediately': '立即绑定',
+  'disconnect': '断开连接',
+  'discoveredDevices': '发现的设备',
+  'distinguishDifferentSpeakers': '区分不同说话人',
+  'enterFileName': '请输入文件名',
+  'findMore': '发现更多',
+  'finishRecording': '结束录音',
+  'importAudioFromAppWeb': '从 APP、WEB 导入音频进行转写和总结',
+  'industrySpecificSummaryTemplate': '为行业细分场景设计的专业总结模版',
+  'markFavorite': '标记收藏',
+  'monthlyTranscriptionDuration': '每月 300 分钟转写时长',
+  'noDevicesFound': '未找到设备',
+  'notBound': '未绑定',
+  'notCharging': '未充电',
+  'pauseRecording': '暂停录音',
+  'pleaseEnterVerificationCode': '请输入验证码',
+  'scanIdle': '未在扫描',
+  'scanning': '正在扫描...',
+  'startScan': '开始扫描',
+  'stopScan': '停止扫描',
+  'storageBytes': '存储总大小',
+  'storageUploads': '上传次数',
+  'unmarkFavorite': '取消收藏',
+  'unnamedDevice': '未命名设备',
+  'userDataParseFailed': '用户数据解析失败',
 };
diff --git a/apps/client/lib/core/translations/language/zh_hk.dart b/apps/client/lib/core/translations/language/zh_hk.dart
index 793aab5f..7bdd4b32 100644
--- a/apps/client/lib/core/translations/language/zh_hk.dart
+++ b/apps/client/lib/core/translations/language/zh_hk.dart
@@ -1570,7 +1570,7 @@ const Map<String, String> zhHK = {
 
   // ==== 界面文案补齐（自启动授权 / 设备页 / AI页 / 广场 等）====
   'tabDevice': '裝置',
-  'tabTodo': '待辦',
+  'tabTodo': '拾憶',
   'tabPlaza': '廣場',
   'sloganHome': '科技引領 智能生活',
   'sloganAi': '智能無限 無所不能',
@@ -1836,4 +1836,59 @@ const Map<String, String> zhHK = {
   'idVerifyTooFrequent': '尝试过于频繁，请稍后再试',
   'idVerifyFailed': '实名认证失败，请稍后再试',
   'genderLockedByIdVerify': '性别已根据实名认证信息确定，不可修改',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': '已是最新版本',
+  'otaCurrentVersion': '目前版本',
+  'otaDone': '完成',
+  'otaDownloading': '正在下載韌體...',
+  'otaError': '錯誤',
+  'otaExitConfirm': '升級正在進行中，確定要離開嗎？',
+  'otaExitTitle': '離開升級',
+  'otaFailed': '升級失敗',
+  'otaFailedWithCode': '升級失敗（錯誤碼 @code）',
+  'otaKeepConnectedWarning': '升級過程中請保持裝置靠近並勿關閉應用程式',
+  'otaLatestVersion': '最新版本',
+  'otaNeedConnect': '請先連接裝置',
+  'otaNotConnectedTip': '未偵測到已連接的裝置，請先連接耳機後再升級韌體',
+  'otaPreparing': '準備中...',
+  'otaStartUpgrade': '開始升級',
+  'otaSuccessReboot': '升級成功，請重新啟動裝置',
+  'otaTimeout': '升級逾時，請重試',
+  'otaUnknownDevice': '未知裝置',
+  'otaUpdateAvailable': '有可用更新',
+  'otaUpgrading': '升級中... @percent%',
+  'otaUpgradingShort': '正在升級...',
+  'otaDownloadPreparing': '準備下載韌體檔...',
+  'otaFirmwareCached': '韌體已就緒，準備升級...',
+  'otaDownloadStarted': '開始下載韌體檔...',
+  'otaDownloadingPercent': '正在下載韌體檔... @percent%',
+  'otaDownloadDone': '下載完成，準備升級...',
+  'deviceConnectionRestricted': '裝置連接受限，此裝置未獲授權',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Autopilot 範本自動總結',
+  'bindImmediately': '立即綁定',
+  'disconnect': '中斷連線',
+  'discoveredDevices': '發現的裝置',
+  'distinguishDifferentSpeakers': '區分不同說話人',
+  'enterFileName': '請輸入檔案名稱',
+  'findMore': '發現更多',
+  'finishRecording': '結束錄音',
+  'importAudioFromAppWeb': '從 APP、WEB 匯入音訊進行轉寫和總結',
+  'industrySpecificSummaryTemplate': '為產業細分場景設計的專業總結範本',
+  'markFavorite': '標記收藏',
+  'monthlyTranscriptionDuration': '每月 300 分鐘轉寫時長',
+  'noDevicesFound': '未找到裝置',
+  'notBound': '未綁定',
+  'notCharging': '未充電',
+  'pauseRecording': '暫停錄音',
+  'pleaseEnterVerificationCode': '請輸入驗證碼',
+  'scanIdle': '未在掃描',
+  'scanning': '正在掃描...',
+  'startScan': '開始掃描',
+  'stopScan': '停止掃描',
+  'storageBytes': '儲存總大小',
+  'storageUploads': '上傳次數',
+  'unmarkFavorite': '取消收藏',
+  'unnamedDevice': '未命名裝置',
+  'userDataParseFailed': '使用者資料解析失敗',
 };
diff --git a/apps/client/lib/core/translations/language/zh_tw.dart b/apps/client/lib/core/translations/language/zh_tw.dart
index 76baf983..3cfc825b 100644
--- a/apps/client/lib/core/translations/language/zh_tw.dart
+++ b/apps/client/lib/core/translations/language/zh_tw.dart
@@ -1570,7 +1570,7 @@ const Map<String, String> zhTW = {
 
   // ==== 界面文案补齐（自启动授权 / 设备页 / AI页 / 广场 等）====
   'tabDevice': '裝置',
-  'tabTodo': '待辦',
+  'tabTodo': '拾憶',
   'tabPlaza': '廣場',
   'sloganHome': '科技引領 智慧生活',
   'sloganAi': '智慧無限 無所不能',
@@ -1836,4 +1836,59 @@ const Map<String, String> zhTW = {
   'idVerifyTooFrequent': '尝试过于频繁，请稍后再试',
   'idVerifyFailed': '实名认证失败，请稍后再试',
   'genderLockedByIdVerify': '性别已根据实名认证信息确定，不可修改',
+  // ---- 恒玄(BES)固件 OTA 升级页 ----
+  'otaAlreadyLatest': '已是最新版本',
+  'otaCurrentVersion': '目前版本',
+  'otaDone': '完成',
+  'otaDownloading': '正在下載韌體...',
+  'otaError': '錯誤',
+  'otaExitConfirm': '升級正在進行中，確定要離開嗎？',
+  'otaExitTitle': '離開升級',
+  'otaFailed': '升級失敗',
+  'otaFailedWithCode': '升級失敗（錯誤碼 @code）',
+  'otaKeepConnectedWarning': '升級過程中請保持裝置靠近並勿關閉應用程式',
+  'otaLatestVersion': '最新版本',
+  'otaNeedConnect': '請先連接裝置',
+  'otaNotConnectedTip': '未偵測到已連接的裝置，請先連接耳機後再升級韌體',
+  'otaPreparing': '準備中...',
+  'otaStartUpgrade': '開始升級',
+  'otaSuccessReboot': '升級成功，請重新啟動裝置',
+  'otaTimeout': '升級逾時，請重試',
+  'otaUnknownDevice': '未知裝置',
+  'otaUpdateAvailable': '有可用更新',
+  'otaUpgrading': '升級中... @percent%',
+  'otaUpgradingShort': '正在升級...',
+  'otaDownloadPreparing': '準備下載韌體檔...',
+  'otaFirmwareCached': '韌體已就緒，準備升級...',
+  'otaDownloadStarted': '開始下載韌體檔...',
+  'otaDownloadingPercent': '正在下載韌體檔... @percent%',
+  'otaDownloadDone': '下載完成，準備升級...',
+  'deviceConnectionRestricted': '裝置連線受限，此裝置未獲授權',
+  // --- 2026-09-03 补齐：这些 key 代码里在用，但 41 个语言文件里都没有 ---
+  'autopilotTemplateSummary': 'Autopilot 範本自動總結',
+  'bindImmediately': '立即綁定',
+  'disconnect': '中斷連線',
+  'discoveredDevices': '發現的裝置',
+  'distinguishDifferentSpeakers': '區分不同說話人',
+  'enterFileName': '請輸入檔案名稱',
+  'findMore': '發現更多',
+  'finishRecording': '結束錄音',
+  'importAudioFromAppWeb': '從 APP、WEB 匯入音訊進行轉寫和總結',
+  'industrySpecificSummaryTemplate': '為產業細分場景設計的專業總結範本',
+  'markFavorite': '標記收藏',
+  'monthlyTranscriptionDuration': '每月 300 分鐘轉寫時長',
+  'noDevicesFound': '未找到裝置',
+  'notBound': '未綁定',
+  'notCharging': '未充電',
+  'pauseRecording': '暫停錄音',
+  'pleaseEnterVerificationCode': '請輸入驗證碼',
+  'scanIdle': '未在掃描',
+  'scanning': '正在掃描...',
+  'startScan': '開始掃描',
+  'stopScan': '停止掃描',
+  'storageBytes': '儲存總大小',
+  'storageUploads': '上傳次數',
+  'unmarkFavorite': '取消收藏',
+  'unnamedDevice': '未命名裝置',
+  'userDataParseFailed': '使用者資料解析失敗',
 };
diff --git a/apps/client/lib/core/utils/id_verify_guard.dart b/apps/client/lib/core/utils/id_verify_guard.dart
index 9108faa6..ede82496 100644
--- a/apps/client/lib/core/utils/id_verify_guard.dart
+++ b/apps/client/lib/core/utils/id_verify_guard.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 
 import '../../data/models/user_Info.dart';
@@ -25,6 +26,23 @@ class IdVerifyGuard {
     return !svc.verified.value;
   }
 
+  /// [required] 的**响应式**版本，给「未认证」角标这类要跟着状态走的 UI 用。
+  ///
+  /// 直接在 build 里读 [required] 是不会重建的 —— 它读的确实是 Rx，但没被 Obx
+  /// 收集，于是认证通过后角标要等下次进页面才消失。这里统一封装成 builder：
+  /// - 无条件先把两个 Rx 读出来再判断，早退会漏收集依赖；
+  /// - IdVerifyService 尚未注册时**不建** Obx —— Obx 里一个 Rx 都没读到会抛
+  ///   「improper use of a GetX」。正常情况下它在 InitialBinding 里是 permanent 的。
+  static Widget builder(Widget Function(bool needVerify) build) {
+    if (!Get.isRegistered<IdVerifyService>()) return build(false);
+    return Obx(() {
+      final svc = IdVerifyService.to;
+      final loaded = svc.loaded.value;
+      final verified = svc.verified.value;
+      return build(User.isLoggedIn() && loaded && !verified);
+    });
+  }
+
   /// 拦截入口：需要实名时弹认证窗并返回 true（调用方直接 return）。
   ///
   /// 弹窗里认证通过后不会自动重跑原动作 —— 调用方 return 之后，
diff --git a/apps/client/lib/data/models/appconfig.dart b/apps/client/lib/data/models/appconfig.dart
index 547cd8fa..660862b0 100644
--- a/apps/client/lib/data/models/appconfig.dart
+++ b/apps/client/lib/data/models/appconfig.dart
@@ -31,9 +31,16 @@ class AppConfig {
   }
 
   //智能体配置
+  ///
+  /// 找不到该 agentId 时返回 null。**不要改回 `firstWhere`**——它没有 orElse，
+  /// 查不到时抛 StateError 而不是返回 null，调用方（ble_manager 的
+  /// startAgentService）那句 try 会把整个智能体服务的启动一起吞掉。
   static String? agentsystemPrompt(String agentId) {
-    final foundAgent = config.agents.firstWhere((agent) => agent.id == agentId);
-    return foundAgent.systemPrompt;
+    if (!_isInitialized) return null;
+    for (final agent in config.agents) {
+      if (agent.id == agentId) return agent.systemPrompt;
+    }
+    return null;
   }
 
   static List<String> allproductNames() {
@@ -47,10 +54,24 @@ class AppConfig {
     return uuids;
   }
 
-//根据产品名称获取产品配置
+  /// 根据产品名称获取产品配置，查不到返回 null。
+  ///
+  /// ⚠️ **不要改回 `firstWhere`**：它没有 orElse，查不到时抛 StateError 而不是
+  /// 返回 null。所有调用点写的都是 `if (product != null)`，那个 null 分支于是
+  /// 永远等不到，异常被外层 try 吞掉后直接走兜底——设备类型退化成 unknown、
+  /// 通话翻译的 broadcastpeertranslate 恒为 false，且全程不报任何错。
+  ///
+  /// 未初始化（`user_getappconfig` 还没回来）时同样返回 null，而不是让
+  /// `late config` 抛 LateInitializationError——否则 null 契约仍然不成立。
+  ///
+  /// 空设备名也返回 null：`devicename.contains('')` 恒为 true，原实现会把
+  /// **产品表里的第一个产品**当成匹配结果返回。调用点本来就都在紧接着判
+  /// `deviceName != ''`，没有一处依赖这个行为。
   static DBProduct? getproduct(String name) {
-    final foundProduct = config.products
-        .firstWhere((product) => product.devicename.contains(name));
-    return foundProduct;
+    if (!_isInitialized || name.isEmpty) return null;
+    for (final product in config.products) {
+      if (product.devicename.contains(name)) return product;
+    }
+    return null;
   }
 }
diff --git a/apps/client/lib/data/models/appconfig_model.dart b/apps/client/lib/data/models/appconfig_model.dart
index 88c0a966..788289e6 100644
--- a/apps/client/lib/data/models/appconfig_model.dart
+++ b/apps/client/lib/data/models/appconfig_model.dart
@@ -82,6 +82,15 @@ class DBProduct {
   final String scanuuid;
   final String? version;
   bool? isforceupdate;
+
+  /// 版本不一致即可升级（后台「产品 → 版本管理」里的开关，默认关）。
+  ///
+  /// 开发/测试环境用：测试机固件常常比后台挂的还新，按「只允许升到更高版本」
+  /// 会永远点不动升级按钮，也没法刷回旧固件反复验证 OTA。
+  /// ⚠️ 可空且默认按 false 处理——老服务端不下发这个字段时必须退回严格判定，
+  /// 绝不能反过来（那会让线上用户被降级）。
+  final bool? updateonmismatch;
+
   final bool? iscontinuouschat;
   final bool? wakeupenable; //该产品是否拥有唤醒开关控制
   final bool? broadcastpeertranslate; //通话翻译是否本地播报对方翻译内容
@@ -97,6 +106,7 @@ class DBProduct {
     required this.scanuuid,
     required this.version,
     required this.isforceupdate, //该产品固件版本是否强制更新
+    this.updateonmismatch, //可选：老服务端不下发这个字段，缺省即 null→按 false
     required this.iscontinuouschat,
     required this.wakeupenable,
     required this.broadcastpeertranslate,
diff --git a/apps/client/lib/data/models/appconfig_model.g.dart b/apps/client/lib/data/models/appconfig_model.g.dart
index 4227611e..e776602a 100644
--- a/apps/client/lib/data/models/appconfig_model.g.dart
+++ b/apps/client/lib/data/models/appconfig_model.g.dart
@@ -82,6 +82,7 @@ DBProduct _$DBProductFromJson(Map<String, dynamic> json) => DBProduct(
       scanuuid: json['scanuuid'] as String,
       version: json['version'] as String?,
       isforceupdate: json['isforceupdate'] as bool?,
+      updateonmismatch: json['updateonmismatch'] as bool?,
       iscontinuouschat: json['iscontinuouschat'] as bool?,
       wakeupenable: json['wakeupenable'] as bool?,
       broadcastpeertranslate: json['broadcastpeertranslate'] as bool?,
@@ -98,6 +99,7 @@ Map<String, dynamic> _$DBProductToJson(DBProduct instance) => <String, dynamic>{
       'scanuuid': instance.scanuuid,
       'version': instance.version,
       'isforceupdate': instance.isforceupdate,
+      'updateonmismatch': instance.updateonmismatch,
       'iscontinuouschat': instance.iscontinuouschat,
       'wakeupenable': instance.wakeupenable,
       'broadcastpeertranslate': instance.broadcastpeertranslate,
diff --git a/apps/client/lib/data/models/channel_app_model.dart b/apps/client/lib/data/models/channel_app_model.dart
index 7226eb27..cc043e97 100644
--- a/apps/client/lib/data/models/channel_app_model.dart
+++ b/apps/client/lib/data/models/channel_app_model.dart
@@ -81,10 +81,25 @@ class AppInfo {
   @JsonKey(name: 'allowskipdevicebinding')
   final bool allowskipdevicebinding;
 
-  /// 支付渠道列表
-  @JsonKey(name: 'Paychannels')
+  /// 支付渠道列表。
+  ///
+  /// 服务端的 json tag 是全小写的 `paychannels`（见 db.proto 的 DBChannelApp），
+  /// 这里两种写法都认一下：早先只认大写 `Paychannels`，实际永远解析不到。
+  @JsonKey(name: 'paychannels', readValue: _readPaychannels)
   final String? paychannels;
 
+  /// 最低支持版本，低于它必须更新。空 = 后台没配，不参与判定。
+  @JsonKey(name: 'minversion')
+  final String? minversion;
+
+  /// 强制更新开关，配合 [minversion] 使用。
+  ///
+  /// **强更判定的唯一依据就是这两个字段**（后台「渠道分发」里配）。
+  /// 别再拿「主版本号第一位不同」之类的土规则去猜 —— 那和后台配置完全脱节，
+  /// 运营勾了强更也拦不住人。
+  @JsonKey(name: 'forceupdate')
+  final bool forceupdate;
+
   const AppInfo({
     this.address,
     required this.channel,
@@ -94,6 +109,8 @@ class AppInfo {
     this.touristsversion,
     this.allowskipdevicebinding = false,
     required this.paychannels,
+    this.minversion,
+    this.forceupdate = false,
   });
 
   factory AppInfo.fromJson(Map<String, dynamic> json) =>
@@ -105,6 +122,10 @@ class AppInfo {
 // 辅助函数：将 UserChannel 转换为 JSON
 int _channelToJson(UserChannel channel) => channel.value;
 
+// 兼容历史大写键名的读取器：先按服务端真实的小写键取，取不到再退回大写。
+Object? _readPaychannels(Map json, String key) =>
+    json[key] ?? json['Paychannels'];
+
 /// 版本更新信息模型
 class VersionUpdateInfo {
   /// 是否有新版本
diff --git a/apps/client/lib/data/models/channel_app_model.g.dart b/apps/client/lib/data/models/channel_app_model.g.dart
index 6c9501f6..8a9c33ba 100644
--- a/apps/client/lib/data/models/channel_app_model.g.dart
+++ b/apps/client/lib/data/models/channel_app_model.g.dart
@@ -40,7 +40,9 @@ AppInfo _$AppInfoFromJson(Map<String, dynamic> json) => AppInfo(
       tourists: json['tourists'] as bool? ?? false,
       touristsversion: json['touristsversion'] as String?,
       allowskipdevicebinding: json['allowskipdevicebinding'] as bool? ?? false,
-      paychannels: json['Paychannels'] as String?,
+      paychannels: _readPaychannels(json, 'paychannels') as String?,
+      minversion: json['minversion'] as String?,
+      forceupdate: json['forceupdate'] as bool? ?? false,
     );
 
 Map<String, dynamic> _$AppInfoToJson(AppInfo instance) => <String, dynamic>{
@@ -51,5 +53,7 @@ Map<String, dynamic> _$AppInfoToJson(AppInfo instance) => <String, dynamic>{
       'tourists': instance.tourists,
       'touristsversion': instance.touristsversion,
       'allowskipdevicebinding': instance.allowskipdevicebinding,
-      'Paychannels': instance.paychannels,
+      'paychannels': instance.paychannels,
+      'minversion': instance.minversion,
+      'forceupdate': instance.forceupdate,
     };
diff --git a/apps/client/lib/data/models/device_category.dart b/apps/client/lib/data/models/device_category.dart
index 788f93b2..b3e29be7 100644
--- a/apps/client/lib/data/models/device_category.dart
+++ b/apps/client/lib/data/models/device_category.dart
@@ -64,6 +64,12 @@ class DeviceCategories {
   /// AI 耳机（恒玄方案）的实拍图
   static const String earphoneImage = 'assets/images/devices/earphone.png';
 
+  /// 同一张耳机实拍图的小尺寸版（111×144，25KB），用于列表/卡片里的小图标。
+  /// [earphoneImage] 是 892×1152 / 1.1MB 的主图，塞进 44px 的位置纯属浪费解码。
+  /// 换图时两张一起换：`sips -Z 144 earphone.png --out earphone_icon.png`
+  static const String earphoneIconImage =
+      'assets/images/devices/earphone_icon.png';
+
   /// AI 手机支架（蓝讯 Echomeet）的实拍图
   static const String phoneHolderImage =
       'assets/images/devices/phone_holder.png';
@@ -76,7 +82,9 @@ class DeviceCategories {
     if (name == null || name.isEmpty) return null;
     final n = name.toLowerCase();
     if (n.contains('echomeet')) return phoneHolderImage;
-    if (n.contains('deepvoice') || n.contains('deepsound') ||
+    // 'echo-one' 要写全，不能只写 'echo'——上面 echomeet（手机支架）也含 echo
+    if (n.contains('echo-one') ||
+        n.contains('deepvoice') || n.contains('deepsound') ||
         n.contains('voitrans') ||
         n.contains('buds') || n.contains('ai80') || n.contains('a80')) {
       return earphoneImage;
diff --git a/apps/client/lib/data/services/account_service.dart b/apps/client/lib/data/services/account_service.dart
index 8a0e5cb7..08b63c66 100644
--- a/apps/client/lib/data/services/account_service.dart
+++ b/apps/client/lib/data/services/account_service.dart
@@ -7,6 +7,7 @@ import '../services/network/api.dart';
 import 'db/database_helper.dart';
 import '../../data/models/user_Info.dart';
 import 'meeting/meeting_upload_service.dart';
+import 'bes_device_auth.dart';
 
 /// 账号管理服务
 ///
@@ -34,6 +35,9 @@ class AccountService extends GetxService {
       await _storage.write("user_info", null);
       await _storage.write("local_avatar", null);
       User.clearUserSession();
+      // 换账号后同一台耳机要重新登记到新账号名下，
+      // 不清这个 set 的话「本进程已登记过」会把新账号的绑定吞掉。
+      BesDeviceAuth.reset();
       logger.d('用户数据清理成功');
       return true;
     } catch (e) {
@@ -47,6 +51,7 @@ class AccountService extends GetxService {
     try {
       await _storage.erase();
       User.clearUserSession();
+      BesDeviceAuth.reset();
       logger.d('所有用户数据清理成功');
       return true;
     } catch (e) {
diff --git a/apps/client/lib/data/services/bes_bluetooth_service.dart b/apps/client/lib/data/services/bes_bluetooth_service.dart
index 45b8193d..588394c8 100644
--- a/apps/client/lib/data/services/bes_bluetooth_service.dart
+++ b/apps/client/lib/data/services/bes_bluetooth_service.dart
@@ -4,12 +4,14 @@ import 'dart:typed_data';
 
 
 import 'package:bluetooth_manager/bluetooth_manager.dart' as bes;
+import 'package:flutter/foundation.dart' show kDebugMode;
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
 
 import '../../core/utils/logger.dart';
 import 'agent_module_defaults.dart';
 import 'background_launch_consent.dart';
+import 'bes_device_auth.dart';
 
 /// 恒玄(BES/Bestechnic)芯片经典蓝牙连接服务。
 ///
@@ -48,9 +50,43 @@ class BesBluetoothService extends GetxService {
   final RxInt batteryRight = (-1).obs;
   final RxInt batteryCase = (-1).obs;
 
+  /// 耳机自报的蓝牙地址（`BB 0A` 的属性 7），格式 `11:11:22:33:33:A4`。
+  ///
+  /// 与 [connectedDeviceId] 的区别：后者在 Android 上是蓝牙 MAC，在 iOS 上是
+  /// CoreBluetooth 的 peripheral UUID（每台 iPhone 看同一只耳机都不一样）。
+  /// 这个值来自耳机自己的上报，两端一致，是 iOS 上唯一能拿到真 MAC 的途径。
+  ///
+  /// 每次连上时由 [_restoreDeviceMac] 按 [connectedDeviceId] 从 [_macCacheKey]
+  /// 恢复，查不到就是空。**它属于「当前这台」，不是全局值**——早先的写法是断开
+  /// 不清、一直留着，换耳机之后就变成上一台的 MAC，新耳机会拿它命中旧耳机的
+  /// 确权白名单蒙混过关。
+  final RxString deviceMac = ''.obs;
+
+  /// 充电中标记：电量字节的**最高位**就是充电指示位（协议 3.1.10），
+  /// 所以电量必须 `& 0x7F` 取值，直接用原字节会得到 128~228 的假电量。
+  final RxBool chargingLeft = false.obs;
+  final RxBool chargingRight = false.obs;
+  final RxBool chargingCase = false.obs;
+
   static const String _pairedDevicesKey = 'bes_paired_devices';
   static const String _lastDeviceKey = 'bes_last_device';
 
+  /// `{本地设备标识: 耳机自报的 MAC}`，持久化。
+  ///
+  /// 为什么不是「断开就清 [deviceMac]」：iOS 上 [resolveDeviceMac] 拿不到缓存时
+  /// 要发 `AA 09` 再轮询**最多 3 秒**，而它排在确权和握手的最前面——断开就清会让
+  /// **每次自动回连都多等最多 3 秒**；固件 0.0.3 上 `AA 09` 已经不回 `BB 0A`，
+  /// 那就是每次必然等满 3 秒才拿到 null。
+  ///
+  /// 但也不能像原先那样「断开不清、全局留着」：换一台耳机之后那个值就是**上一台**
+  /// 的 MAC 了，iOS 的 [resolveDeviceMac] 第一行直接返回它，于是新耳机会命中旧耳机
+  /// 的确权白名单蒙混过关。
+  ///
+  /// 按本地标识建映射同时满足两边：同一台回连是同步命中（零等待），
+  /// 换设备时标识不同、查不到，老老实实重查。iOS 的 peripheral UUID 对
+  /// 「同一台手机 + 同一只耳机」是稳定的，可长期复用。
+  static const String _macCacheKey = 'bes_device_mac_cache';
+
   /// 设备端按键事件（type: startMicRecording / stopMicRecording / startAI …）。
   /// 只做转发，具体业务由订阅方决定；与支架的 [HolderRecordingService] 完全分开。
   final RxString lastCmdType = ''.obs;
@@ -59,6 +95,12 @@ class BesBluetoothService extends GetxService {
   String get lastDeviceName =>
       (_storage.read<Map>(_lastDeviceKey)?['name'] as String?) ?? '';
 
+  /// ⚠️ **别拿它（或 [currentConnectedDevice]）去当连接候选地址。**
+  /// 这两个值都只是把 App 自己拨过的地址回吐——插件里没有扫描/发现路径，
+  /// 地址的唯一来源是系统配对列表；`lastDeviceId` 只在原生 `connect()` 里赋值，
+  /// 这个 key 又来自 `savePairedDevice` 存的 `connectedDeviceId`。
+  /// 它们永远产生不了「新地址」，塞进候选只会把**上一台耳机**排到用户的选择前面。
+  /// 换耳机连不上就是这么来的，详见 bes_scan_view 的 `_connect`。
   String get lastDeviceAddress =>
       (_storage.read<Map>(_lastDeviceKey)?['address'] as String?) ?? '';
 
@@ -134,19 +176,55 @@ class BesBluetoothService extends GetxService {
       deviceStatus.value = event;
       Logger.i(_tag, '恒玄设备状态变化: $event');
       if (event == 2) {
-        // 首次连上耳机 → AI 页铺开耳机的默认功能编排
-        AgentDefaults.onEarphoneConnected();
         try {
-          if (connectedDeviceId.value.isEmpty) {
-            // 被动连接场景（原生 ACL 广播触发的自动回连）没人调过 connectToDevice，
-            // 向原生查询当前已连接外设补齐 id/name。
-            final info = await _manager.getConnectedDevice();
-            // await 期间可能已经掉线，避免把陈旧信息写回
-            if (info != null && deviceStatus.value == 2) {
-              connectedDeviceId.value = info['address'] ?? '';
-              connectedDeviceName.value = info['name'] ?? '';
+          // **无条件**向原生要当前真正连着的设备，不再以「本地值为空」为条件。
+          //
+          // connectToDevice 是在调原生**之前**就乐观写了 connectedDeviceId 的，
+          // 那个值只代表「我们想连谁」。原生若把这次 connect 丢弃、或连上的是
+          // 候选列表里的另一个地址，本地值就是错的；只在为空时才查询，会把这个
+          // 错值一路带到确权——拿 B 的 MAC 去 binddevice（绑一台没连着的耳机），
+          // 被拒时 _reject 又按它判 isCurrent，把实际连着的那台断掉。
+          //
+          // 被动连接场景（ACL 广播 / .peerConnected）本来就靠这一步补齐 id/name，
+          // 改成无条件只是多一次 IPC，对那条路径没有影响。
+          final info = await _manager.getConnectedDevice();
+          // await 期间可能已经掉线，避免把陈旧信息写回
+          if (info != null && deviceStatus.value == 2) {
+            final realId = info['address'] ?? '';
+            if (realId.isNotEmpty) {
+              if (realId.toUpperCase() != connectedDeviceId.value.toUpperCase()) {
+                Logger.w(_tag,
+                    '实际连上的设备与请求的不一致: 请求=${connectedDeviceId.value} 实际=$realId');
+              }
+              connectedDeviceId.value = realId;
             }
+            final realName = info['name'] ?? '';
+            if (realName.isNotEmpty) connectedDeviceName.value = realName;
+          }
+          // 身份确定之后再恢复这台设备的 MAC 缓存（见 _restoreDeviceMac）
+          _restoreDeviceMac();
+
+          // 设备确权闸门。必须排在握手和 AI 编排之前——未确权的设备不该被
+          // 当成一台可用耳机对待。
+          //
+          // 第一次连这台耳机才走服务端（按 MAC 校验），之后读本地白名单，
+          // 命中就是同步返回、不产生任何延迟。所以「首连慢几百毫秒」是
+          // 唯一的代价，回连和离线都不受影响。
+          //
+          // 只有 denied 会中止：unknown（断网/未登录/产品表没下发）一律放行，
+          // 理由见 BesDeviceAuth 的类注释。
+          final auth = await BesDeviceAuth.verifyConnected();
+          if (auth == BesAuthResult.denied) {
+            // 断开与提示已由 BesDeviceAuth 就地做完（此时 connectedDeviceId
+            // 已被清空，别再拿它打日志），这里只是不再往下走
+            Logger.w(_tag, '设备未通过确权，已断开连接');
+            return;
           }
+          if (deviceStatus.value != 2) return; // 确权期间掉线了
+
+          // 首次连上耳机 → AI 页铺开耳机的默认功能编排
+          AgentDefaults.onEarphoneConnected();
+
           // 数据通道就绪后再发 0x06 获取固件版本
           await Future.delayed(const Duration(milliseconds: 500));
           if (deviceStatus.value == 2) {
@@ -157,6 +235,15 @@ class BesBluetoothService extends GetxService {
             await queryCallState();
             // 命令探测改成手动触发（BesBluetoothService.to.probeCommands()），
             // 不再每次连上都扫——扫一轮要几十秒，日志也吵
+            //
+            // TODO(临时): 固件 0.0.3 上 `AA 09` 不再回 `BB 0A`（电量帧），
+            // 之前那张命令表是在 0.0.2 上扫出来的，升级后失效了。
+            // 重扫 0x01~0x20 这一段——当初就是在这段里扫出 AA 09 的。
+            // 0x21~0x7F 已确认整段无回包（2026-09-01 扫过 69 个命令），不用再扫。
+            // **重新定位到电量命令后必须删掉这段**。
+            if (kDebugMode) {
+              unawaited(probeCommands(from: 0x01, to: 0x20));
+            }
           }
         } catch (e) {
           Logger.e(_tag, '连接后握手失败（不致命）: $e');
@@ -170,6 +257,9 @@ class BesBluetoothService extends GetxService {
         batteryLeft.value = -1;
         batteryRight.value = -1;
         batteryCase.value = -1;
+        chargingLeft.value = false;
+        chargingRight.value = false;
+        chargingCase.value = false;
       }
     });
 
@@ -201,13 +291,16 @@ class BesBluetoothService extends GetxService {
   /// 恒玄这套私有协议的电量命令没有文档，deepvoice 也没实现过，只能实测。
   /// 跳过已知会切换工作模式的命令（0x5x/0x6x 那批：进通话/录音/AI 模式），
   /// 只扫低位查询类命令。仅在 debug 包里调用。
-  Future<void> probeCommands() async {
-    const skip = {0x06, 0x0E, 0x51, 0x52, 0x56, 0x57, 0x58, 0x59, 0x5A,
+  Future<void> probeCommands({int from = 0x21, int to = 0x7F}) async {
+    // 0x5x/0x6x 那批会切工作模式（进通话/录音/AI），一律不碰。
+    // 0x06(固件版本)/0x0E(通话状态) **故意不跳过**：重扫是为了确认新固件上
+    // 哪些命令还活着，跳过它们就失去了对照组。
+    const skip = {0x51, 0x52, 0x56, 0x57, 0x58, 0x59, 0x5A,
                   0x5E, 0x5F, 0x64, 0x65, 0x66, 0x67, 0x69, 0x6A};
-    // 第一轮 0x01~0x20 已扫过（拿到按键配置 0x8C、EQ 0x90 等），
-    // 这轮扫 0x21~0x50 和 0x6B~0x7F，跳过会切工作模式的 0x5x/0x6x
-    for (var cmd = 0x21; cmd <= 0x7F; cmd++) {
-      if (cmd >= 0x51 && cmd <= 0x6A) continue;
+    Logger.i(_tag,
+        '[探测] 开始 0x${from.toRadixString(16)}~0x${to.toRadixString(16)}');
+    for (var cmd = from; cmd <= to; cmd++) {
+      if (cmd >= 0x51 && cmd <= 0x6A) continue; // 会切工作模式，别碰
       if (skip.contains(cmd)) continue;
       if (deviceStatus.value != 2) return;
       Logger.i(_tag, '[探测] 发送 AA ${cmd.toRadixString(16).padLeft(2, '0')}');
@@ -219,6 +312,21 @@ class BesBluetoothService extends GetxService {
     Logger.i(_tag, '[探测] 结束');
   }
 
+  /// 实测出来的命令号（2026-09-01，Echo-one 固件 0.0.2，`probeCommands` 扫 0x01~0x20 得到）：
+  ///
+  /// | 请求 | 回包 | 含义 |
+  /// |---|---|---|
+  /// | `AA 09` | `BB 0A` + `BB 89`(ack) | **耳机状态：左右耳电量 / 位置 / 连接状态 / MAC** |
+  /// | `AA 06` | `BB 86` | 固件版本 |
+  /// | `AA 0E` | `BB 8E` | 通话状态 |
+  /// | `AA 0B` | `BB 8B 04 00` | 未知，只回一个 0 |
+  /// | `AA 0D` | `BB 8D 07 00 02 01 02` | 未知 |
+  /// | `AA 0F` | `BB 8F 04 00` | 未知 |
+  /// | `AA 19` | `BB 99 04 01` | 未知，回 1 |
+  ///
+  /// `BB 18` 是耳机周期主动上报的另一种状态帧（`02 01 01 02 02 00`，值 0/1），
+  /// **不是电量**，`AA 18` 也查不出东西。
+
   /// 刷新耳机当前状态。
   ///
   /// deepvoice 的做法：每次进入一个功能都重新拉一遍设备状态，而不是只在连接
@@ -227,6 +335,7 @@ class BesBluetoothService extends GetxService {
   /// - `AA 06` 固件版本（回 0x86）
   /// - `AA 0C` 按键配置（回 0x8C）
   /// - `AA 10` EQ 配置（回 0x90）
+  /// - `AA 20` 耳机状态/电量（回 0x0A）
   /// 回包各自在 [_handleRawFrame] 里解析并刷新对应的 Rx。
   Future<void> refreshDeviceState() async {
     if (!isConnected) return;
@@ -237,6 +346,9 @@ class BesBluetoothService extends GetxService {
       await Future.delayed(const Duration(milliseconds: 120));
       await sendData([0xAA, 0x10]);
       await Future.delayed(const Duration(milliseconds: 120));
+      // 电量会随时间掉，进功能页时重查一次，别只依赖连接那一刻的值
+      await queryBattery();
+      await Future.delayed(const Duration(milliseconds: 120));
       await queryCallState();
       Logger.i(_tag, '已刷新耳机状态');
     } catch (e) {
@@ -244,14 +356,75 @@ class BesBluetoothService extends GetxService {
     }
   }
 
-  /// 查询电量。
+  /// 查询耳机状态（电量 / 是否在盒内 / 连接状态 / 蓝牙地址）。
   ///
-  /// deepvoice 那边没实现过电量查询，恒玄这套私有协议里电量用哪个 CMD
-  /// 目前没有文档。这里按同族固件常见的 0x0A 试查一次；固件不认的话会静默
-  /// 忽略，不影响其它功能。真实 CMD 一旦确认，改这一处即可。
+  /// 协议 3.1.10 的状态帧：**APP 发 `AA 09`，耳机回 `BB 0A`**
+  /// （状态变化时耳机也会主动推同一帧）。
+  ///
+  /// 请求码 `0x09` 是**真机实测**出来的（Echo-one 固件 0.0.2），不是文档给的：
+  /// 文档正文只写了「响应命令 20」且不带 `0x` 前缀，那个 20 既不是 `0x20`
+  /// 也不是十进制的 `0x14`——两个都发过，**完全无回包**。别再照文档改这里。
+  ///
+  /// ⚠️ 请求码和响应码差 1（`09` → `0A`），不是本机其它命令那种
+  /// 「响应 = 请求 | 0x80」的规律（`AA 06`→`BB 86`、`AA 0E`→`BB 8E`）。
+  /// 按 `|0x80` 推出来的 `AA 0A` 是错的，早期版本就栽在这上面。
+  /// `AA 09` 另外还会附带一个 `BB 89 04 00` 的 ack，忽略即可。
+  /// 取这台耳机的真实蓝牙 MAC，拿不到返回 null。
+  ///
+  /// Android 直接用 [connectedDeviceId]（系统给的就是 MAC）；iOS 上那是
+  /// peripheral UUID，只能靠耳机自报的 [deviceMac]，而它要等一帧 `BB 0A`
+  /// 回来才有值——所以这里会主动发一次查询并等它到达。
+  ///
+  /// [timeout] 内没等到就返回 null，调用方按「拿不到 MAC」处理，别死等。
+  Future<String?> resolveDeviceMac(
+      {Duration timeout = const Duration(seconds: 3)}) async {
+    if (Platform.isAndroid) {
+      final id = connectedDeviceId.value;
+      return id.isEmpty ? null : id.toUpperCase();
+    }
+    if (deviceMac.value.isNotEmpty) return deviceMac.value;
+    if (!isConnected) return null;
+    await queryBattery();
+    final deadline = DateTime.now().add(timeout);
+    while (DateTime.now().isBefore(deadline)) {
+      if (deviceMac.value.isNotEmpty) return deviceMac.value;
+      await Future.delayed(const Duration(milliseconds: 100));
+      if (!isConnected) return null;
+    }
+    return null;
+  }
+
+  /// 连上之后按本地设备标识恢复这台耳机的 MAC（见 [_macCacheKey]）。
+  ///
+  /// 必须在 [connectedDeviceId] 已经用原生真实值回填之后调用——用连接前写入的
+  /// 乐观值做键，等于换个方式串号。
+  void _restoreDeviceMac() {
+    final id = connectedDeviceId.value;
+    if (id.isEmpty) {
+      deviceMac.value = '';
+      return;
+    }
+    final cache = _storage.read<Map>(_macCacheKey);
+    final cached = cache?[id.toUpperCase()] as String?;
+    // 查不到就清空：这次连的是另一台设备，绝不能沿用上一台的 MAC
+    deviceMac.value = cached ?? '';
+  }
+
+  void _rememberDeviceMac(String mac) {
+    final id = connectedDeviceId.value;
+    if (id.isEmpty || mac.isEmpty) return;
+    final cache = <String, dynamic>{
+      ...?_storage.read<Map>(_macCacheKey)?.cast<String, dynamic>(),
+    };
+    final key = id.toUpperCase();
+    if (cache[key] == mac) return;
+    cache[key] = mac;
+    _storage.write(_macCacheKey, cache);
+  }
+
   Future<void> queryBattery() async {
     try {
-      await sendData([0xAA, 0x0A]);
+      await sendData([0xAA, 0x09]);
     } catch (e) {
       Logger.e(_tag, '查询电量失败: $e');
     }
@@ -282,17 +455,24 @@ class BesBluetoothService extends GetxService {
         _parseFirmwareVersion(data);
         break;
       case 0x0A:
-        // 实测这帧是连接后周期性上报的遥测：
-        //   BB 0A 28 | 02 01 63 | 02 02 60 | 02 03 46 | 02 04 89 | 02 05 6E
-        //           | 0D 06 .. <本机MAC> .. <对端MAC>
-        // 值每秒都在变（99→97、70→73），还有 >100 的（137/110），
-        // 不像电量，更像链路质量/信号强度。先只记日志，不当电量显示，
-        // 免得界面上跳一个会乱跳的假电量。固件确认后再决定怎么用。
-        Logger.d(_tag, '设备遥测(0x0A) 原始=$data');
-        break;
-      case 0x8A: // 响应 0xAA 0x0A 查询电量（当前固件不响应）
+        // TODO(临时/抓帧): 找 iOS 能用的真 MAC。iOS 拿不到蓝牙 MAC（CoreBluetooth
+        // 只给 peripheral UUID），设备页显示的「MAC」和设备确权都因此失效；
+        // 这帧的属性 6「预留」里嵌着 MAC，布局没实测过，先原样打出来分析。
+        // **布局确认后必须删掉这段**。
+        _dumpStatusFrame(data);
+        // 耳机状态帧（协议 3.1.10）：既是 `AA 20` 的响应，也会在状态变化时主动上报。
+        //   BB 0A 28 | 02 01 2B | 02 02 18 | 02 03 64 | 02 04 85 | 02 05 6E
+        //           | 0D 06 .. | 07 07 <6字节MAC>
+        // 属性 1=左耳电量 2=右耳电量 3=盒电量 4=耳机位置 5=连接状态 6=预留 7=蓝牙地址。
+        // ⚠️ 早先把这帧判成「链路质量」只记日志，是因为解析偏移和属性映射都错了
+        //（见 _parseBattery 的注释），解出来的是错位垃圾值，才显得「每秒乱跳、还超过 100」。
+        // 真机实测（Echo-one 0.0.2）这帧解出 L=69% R=86%，末尾 MAC 与设备地址逐字节吻合。
         _parseBattery(data);
         break;
+      case 0x89:
+        // `AA 09` 的 ack（实测 `BB 89 04 00`，00=成功）。真正的数据在 BB 0A 里，
+        // 这里只吞掉不处理，免得落到 default 分支刷「未识别回包」日志。
+        break;
       case 0x18:
         // 连接后周期性上报，结构是 [len,attr,value] × 2（attr 0x01左 / 0x02右）。
         // 实测值恒为 1，不像百分比；可能是等级或入耳状态。
@@ -300,46 +480,130 @@ class BesBluetoothService extends GetxService {
         Logger.d(_tag, '设备状态上报(0x18) 原始=$data');
         break;
       default:
-        // 没识别的回包打出来，方便按真实固件补协议（电量 CMD 就靠这个定位）
-        Logger.d(_tag, '未识别回包 CMD=0x${data[1].toRadixString(16)} 原始=$data');
+        // 没识别的回包打出来，方便按真实固件补协议（电量 CMD 就靠这个定位）。
+        // 用 INFO 级 + 十六进制：DEBUG 在某些构建里被过滤掉，而十进制的
+        // `[187, 134, 34, ...]` 对着协议文档看要一个个换算，很容易看错。
+        Logger.i(
+            _tag,
+            '[探测] 未识别回包 CMD=0x${data[1].toRadixString(16).padLeft(2, '0')} '
+            '原始=${data.map((e) => e.toRadixString(16).padLeft(2, '0').toUpperCase()).join(' ')}');
     }
   }
 
-  /// 电量回包：与固件版本同构 —— BB CMD len + 若干块 [len, 属性, 数据…]，
-  /// 属性 0x01左 / 0x02右 / 0x04盒，数据首字节为百分比。
-  /// 收到超出 0~100 的值一律丢弃，宁可不显示也不显示错的。
+  /// 耳机状态帧（`BB 0A`，协议 3.1.10）里的电量解析。
+  ///
+  /// 帧structure：`BB | 0A | CMD Length(1) | 块… | checksum`，
+  /// 块是 `[len, 属性, 数据…]`，**len 计的是「属性+数据」的字节数**
+  /// （`07 07 20 FF 36 6B A4 F3` = len 7 → 属性 1 + 6 字节 MAC）。
+  ///
+  /// 属性：1=左耳电量 2=右耳电量 3=充电盒电量 4=耳机位置 5=连接状态 6=预留 7=蓝牙地址。
+  ///
+  /// ⚠️ 这里踩过三个坑，都会让电量永远显示不出来，且**不报任何错**：
+  /// 1. **起点是 3 不是 4**。`_parseFirmwareVersion` 那帧的长度字段占 2 字节，
+  ///    照抄它的 `p = 4` 用在本帧上会整体错位一格——把属性号当成块长度，
+  ///    真实样例里第一个块长度读成 0x01 < 2 直接 break，一个值都解不出来。
+  /// 2. **充电盒是属性 0x03 不是 0x04**。0x04 是「耳机位置」，值经常 >100
+  ///    （样例里 0x85），当电量读会被 0~100 的范围判丢掉。
+  /// 3. **电量字节最高位是充电指示位**，必须 `& 0x7F` 取百分比。
+  ///    直接用原字节，充电时会得到 128~228 的假电量。
   void _parseBattery(List<int> data) {
-    var p = 4;
+    var p = 3; // 跳过 SOF + CMD + 1 字节长度
     var hit = false;
-    while (p + 1 < data.length) {
+    while (p + 2 < data.length) {
       final blockLen = data[p];
       if (blockLen < 2 || p + blockLen >= data.length) break;
       final attr = data[p + 1];
-      final value = data[p + 2];
-      if (value >= 0 && value <= 100) {
-        hit = true;
+      final raw = data[p + 2];
+      final level = raw & 0x7F; // 低 7 位是百分比
+      final charging = (raw & 0x80) != 0; // 最高位是充电指示
+      if (level <= 100) {
         switch (attr) {
           case 0x01:
-            batteryLeft.value = value;
+            batteryLeft.value = level;
+            chargingLeft.value = charging;
+            hit = true;
             break;
           case 0x02:
-            batteryRight.value = value;
+            batteryRight.value = level;
+            chargingRight.value = charging;
+            hit = true;
             break;
-          case 0x04:
-            batteryCase.value = value;
+          case 0x03:
+            batteryCase.value = level;
+            chargingCase.value = charging;
+            hit = true;
             break;
         }
       }
+      // 属性 7 = 耳机蓝牙地址（6 字节）。这是**耳机自己报上来的**真 MAC，
+      // 不经过系统蓝牙 API，所以 iOS 上也拿得到——iOS 的 connectedDeviceId
+      // 是 CoreBluetooth 的 peripheral UUID（每台手机看同一只耳机都不一样），
+      // 设备页显示 MAC 和设备确权都指望这个值。
+      // 实测（Echo-one 0.0.3）解出 11:11:22:33:33:A4，与 Android 上
+      // connectedDeviceId 逐字节一致，也正是后台 license 表登记的那个。
+      // ⚠️ 别改用属性 6：那 12 字节里虽然也嵌着一个 MAC
+      //（布局 `00 01 01 | <6字节> | 00 00 00`，实测 70:B3:B1:4D:33:DC），
+      //   但它既不是耳机主地址也不是手机地址，含义至今未知，拿去确权必然对不上。
+      if (attr == 0x07 && blockLen >= 7 && p + 7 < data.length) {
+        final mac = data
+            .sublist(p + 2, p + 8)
+            .map((e) => e.toRadixString(16).padLeft(2, '0').toUpperCase())
+            .join(':');
+        if (mac != deviceMac.value) {
+          deviceMac.value = mac;
+          Logger.i(_tag, '耳机上报蓝牙地址: $mac');
+        }
+        // 按本地设备标识记下来，下次连同一台时同步命中，不用再等一帧 BB 0A
+        _rememberDeviceMac(mac);
+      }
       p += blockLen + 1;
     }
     if (!hit) return;
-    final levels = [batteryLeft.value, batteryRight.value]
-        .where((v) => v >= 0)
-        .toList();
+    final levels =
+        [batteryLeft.value, batteryRight.value].where((v) => v >= 0).toList();
     if (levels.isNotEmpty) {
+      // 左右耳取较低的一侧——用户关心的是「还能用多久」
       batteryLevel.value = levels.reduce((a, b) => a < b ? a : b);
-      Logger.i(_tag, '恒玄耳机电量: ${batteryLevel.value}%'
-          ' (L=${batteryLeft.value} R=${batteryRight.value} 仓=${batteryCase.value})');
+    } else if (batteryCase.value >= 0) {
+      // 只有盒子上报时（两只耳机都在盒内）退而显示盒电量
+      batteryLevel.value = batteryCase.value;
+    }
+    Logger.i(
+        _tag,
+        '恒玄耳机电量: ${batteryLevel.value}%'
+        ' (L=${batteryLeft.value}${chargingLeft.value ? "⚡" : ""}'
+        ' R=${batteryRight.value}${chargingRight.value ? "⚡" : ""}'
+        ' 仓=${batteryCase.value}${chargingCase.value ? "⚡" : ""})');
+  }
+
+  /// 【调试用/临时】把 `BB 0A` 状态帧逐块打出来，重点是属性 6 那 12 字节。
+  ///
+  /// 目的：确认属性 6 里嵌的 MAC 到底是谁的（副耳？手机？），能不能拿来当
+  /// iOS 上的设备 MAC 用。布局定了就删掉这个方法和它的调用点。
+  void _dumpStatusFrame(List<int> data) {
+    String hex(Iterable<int> b) =>
+        b.map((e) => e.toRadixString(16).padLeft(2, '0').toUpperCase()).join(' ');
+    String mac(Iterable<int> b) =>
+        b.map((e) => e.toRadixString(16).padLeft(2, '0').toUpperCase()).join(':');
+
+    Logger.i(_tag, '[抓帧] BB0A 原始 = ${hex(data)}');
+    var p = 3; // 与 _parseBattery 同一起点：SOF + CMD + 1 字节长度
+    while (p + 1 < data.length) {
+      final blockLen = data[p];
+      if (blockLen < 2 || p + blockLen >= data.length) break;
+      final attr = data[p + 1];
+      final body = data.sublist(p + 2, p + 1 + blockLen);
+      final note = attr == 6
+          ? '  ← 预留(找MAC)  可能的MAC切片: '
+              '[0..5]=${body.length >= 6 ? mac(body.sublist(0, 6)) : "-"} '
+              '[3..8]=${body.length >= 9 ? mac(body.sublist(3, 9)) : "-"} '
+              '[6..11]=${body.length >= 12 ? mac(body.sublist(6, 12)) : "-"}'
+          : (attr == 7 ? '  ← 蓝牙地址 = ${mac(body)}' : '');
+      Logger.i(
+          _tag,
+          '[抓帧]   attr=$attr len=$blockLen body(${body.length}B)='
+          '${hex(body)}$note');
+      p += blockLen + 1;
     }
   }
 
@@ -495,16 +759,65 @@ class BesBluetoothService extends GetxService {
     await _syncAuthorizedDevices(devices);
   }
 
+  /// 把一台设备移出「已配对」列表（自动回连列表），正连着就顺带断开。
+  ///
+  /// [address] 可以是本地设备标识（[connectedDeviceId]，即 pairedDevices 里存的
+  /// 那个串）或服务端记录的真 MAC（`UserDevice.devicemac`）——**两者在 iOS 上是
+  /// 完全不同的值**（前者是 CoreBluetooth peripheral UUID），所以这里两种都认。
+  ///
+  /// ⚠️ 只按 [connectedDeviceId] 比较会让 iOS 上的解绑**静默失效**：
+  /// 传进来的是真 MAC，跟 UUID 永远不相等 → 既不断开连接、也删不掉
+  /// pairedDevices，表现为「服务端解绑成功了，App 却还连着、还会自动回连」。
+  /// 耳机自报的 [deviceMac] 是唯一能把「服务端的 MAC」和「本地的 UUID」
+  /// 对应起来的桥。
+  ///
+  /// 地址比较一律大小写不敏感——存进去的大小写取决于当时是谁写的。
   Future<void> removePairedDevice(String address) async {
+    final target = address.toUpperCase();
+
+    // 要删的是不是「当前连着的这一台」：本地标识对上、或自报 MAC 对上都算
+    final bool isCurrent = (connectedDeviceId.value.isNotEmpty &&
+            connectedDeviceId.value.toUpperCase() == target) ||
+        (deviceMac.value.isNotEmpty && deviceMac.value.toUpperCase() == target);
+
+    // 待清理的本地标识：传进来的那个，外加（若是当前设备）它的本地 id——
+    // iOS 上 pairedDevices 存的是后者，只按前者删会漏。
+    final ids = <String>{target};
+    if (isCurrent && connectedDeviceId.value.isNotEmpty) {
+      ids.add(connectedDeviceId.value.toUpperCase());
+    }
+
     final devices = getPairedDevices();
-    devices.removeWhere((d) => d['address'] == address);
+    devices.removeWhere(
+        (d) => ids.contains((d['address'] as String? ?? '').toUpperCase()));
     await _storage.write(_pairedDevicesKey, devices);
+    // lastDevice 是 tryAutoConnect 的另一个入口，只清 pairedDevices 不够
+    if (ids.contains(
+        (_storage.read<Map>(_lastDeviceKey)?['address'] as String? ?? '')
+            .toUpperCase())) {
+      await _storage.remove(_lastDeviceKey);
+    }
     await _syncAuthorizedDevices(devices);
-    if (connectedDeviceId.value == address) {
+
+    // 解绑 = 「不要它了」，把这些本地标识对应的 MAC 缓存一并删掉，
+    // 下次再连上时重新查一遍（与 BesDeviceAuth.forget 清白名单是同一个用意：
+    // 不清的话会命中缓存跳过重新确权）。
+    _forgetDeviceMac(ids);
+
+    if (isCurrent) {
+      deviceMac.value = '';
       await disconnectDevice();
     }
   }
 
+  void _forgetDeviceMac(Set<String> upperIds) {
+    final cache = _storage.read<Map>(_macCacheKey);
+    if (cache == null || cache.isEmpty) return;
+    final next = <String, dynamic>{...cache.cast<String, dynamic>()}
+      ..removeWhere((k, _) => upperIds.contains(k.toUpperCase()));
+    if (next.length != cache.length) _storage.write(_macCacheKey, next);
+  }
+
   Future<void> _syncAuthorizedDevices([List<Map<String, dynamic>>? devices]) async {
     final ids = (devices ?? getPairedDevices())
         .map((d) => d['address'] as String? ?? '')
diff --git a/apps/client/lib/data/services/id_verify_service.dart b/apps/client/lib/data/services/id_verify_service.dart
index cd26dc15..93314def 100644
--- a/apps/client/lib/data/services/id_verify_service.dart
+++ b/apps/client/lib/data/services/id_verify_service.dart
@@ -1,4 +1,5 @@
 import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
 
 import '../models/user_Info.dart';
 import '../../core/utils/logger.dart';
@@ -102,13 +103,7 @@ class IdVerifyService extends GetxService {
       // 免得「我的」页还显示着用户当初随手选的那个。
       final g = _asInt(data is Map ? data['gender'] : null);
       verifiedGender.value = g;
-      if (g > 0) {
-        try {
-          User.instance.gender = g;
-        } catch (_) {
-          // User 尚未初始化（理论上到不了这里，实名要求已登录），忽略即可
-        }
-      }
+      _applyGender(g);
       return verified.value ? null : 'idVerifyFailed'.tr;
     } catch (e) {
       Logger.w(_tag, '实名核验失败: $e');
@@ -116,6 +111,27 @@ class IdVerifyService extends GetxService {
     }
   }
 
+  /// 把核验回来的真实性别写进全局用户对象，并让在场的 UI 立刻跟着变。
+  ///
+  /// 三件事缺一不可，早先只做了第一件，所以「我的」页要退出去再进来才更新：
+  /// 1. 改 [User.instance]（ProfileController 的 `userInfo` 包的就是这个对象）；
+  /// 2. 回写本地 `user_info`，否则重启后又变回用户自选的那个值
+  ///    （服务端 markUserVerified 已经存了，但本地缓存会盖回来）;
+  /// 3. `refreshTick++` 驱动重建 —— 直接改字段不会触发任何 Rx。
+  void _applyGender(int gender) {
+    if (gender <= 0) return;
+    if (!User.isLoggedIn()) return; // 实名要求已登录，理论上到不了这里
+    final u = User.instance;
+    if (u.gender == gender) return;
+    u.gender = gender;
+    try {
+      GetStorage().write('user_info', u.toJson());
+    } catch (e) {
+      Logger.w(_tag, '性别写入本地缓存失败: $e');
+    }
+    User.refreshTick.value++;
+  }
+
   void _apply(dynamic data) {
     if (data is! Map) return;
     verified.value = data['verified'] == true;
diff --git a/apps/client/lib/data/services/language_configs/alibaba35_language_config.dart b/apps/client/lib/data/services/language_configs/alibaba35_language_config.dart
new file mode 100644
index 00000000..411b7e40
--- /dev/null
+++ b/apps/client/lib/data/services/language_configs/alibaba35_language_config.dart
@@ -0,0 +1,73 @@
+/// 阿里通义 **qwen3.5-livetranslate-flash-realtime**（新版，带实时声音复刻）
+/// 的通话翻译语言表。
+///
+/// 与旧版 [getAlibabaTranslationLanguageSpecs] 的关系见
+/// LanguageManager.findBestMatchingProvider 的路由说明：
+/// 3.5 优先 → 旧版兜底（只剩 yue/el）→ 微软 → 讯飞。
+///
+/// ⚠️ **这里只列 3.5 的「音频+文本输出」29 语**，不是它宣传的 60 语。
+/// 另外 31 语（yue、el、uk、ro、hu…）是**仅文本输出**——通话翻译要把 TTS
+/// PCM 回灌进耳机，没有音频等于功能不成立，所以那 31 语不能走 3.5，
+/// 必须落到下一档。这条是本表存在的全部意义，加语言前先确认它在音频档里。
+/// 语种档位来源：阿里云百炼「通过 WebSocket 实现实时音视频翻译」文档。
+///
+/// 音色：3.5 这一档开了 `enable_voice_clone`，握手时 `voice` 被原生强制写成
+/// `"default"`（阿里要求 frequency=once/always 时 voice 必须是 default），
+/// 所以下面的 `ttsVoiceName` 实际不生效，只是为了让 map 形状统一、
+/// 避免 ttsCode 为空时退到 Azure 音色名（对阿里是非法值）。
+library;
+
+/// 3.5 支持「音频 + 文本」输出的 29 个语种（= 声音复刻可用的范围）
+const Set<String> kAlibaba35AudioShortCodes = {
+  'zh', 'en', 'ar', 'de', 'fr', 'es', 'pt', 'id', 'it', 'ko',
+  'ru', 'th', 'vi', 'ja', 'tr', 'hi', 'ms', 'nl', 'ur', 'nb',
+  'sv', 'da', 'he', 'fi', 'pl', 'is', 'cs', 'fil', 'fa',
+};
+
+/// 语种展示名，只用于日志与界面回显
+const Map<String, List<String>> _names = {
+  'zh': ['中文', 'Chinese'],
+  'en': ['英语', 'English'],
+  'ar': ['阿拉伯语', 'Arabic'],
+  'de': ['德语', 'German'],
+  'fr': ['法语', 'French'],
+  'es': ['西班牙语', 'Spanish'],
+  'pt': ['葡萄牙语', 'Portuguese'],
+  'id': ['印尼语', 'Indonesian'],
+  'it': ['意大利语', 'Italian'],
+  'ko': ['韩语', 'Korean'],
+  'ru': ['俄语', 'Russian'],
+  'th': ['泰语', 'Thai'],
+  'vi': ['越南语', 'Vietnamese'],
+  'ja': ['日语', 'Japanese'],
+  'tr': ['土耳其语', 'Turkish'],
+  'hi': ['印地语', 'Hindi'],
+  'ms': ['马来语', 'Malay'],
+  'nl': ['荷兰语', 'Dutch'],
+  'ur': ['乌尔都语', 'Urdu'],
+  'nb': ['挪威语', 'Norwegian'],
+  'sv': ['瑞典语', 'Swedish'],
+  'da': ['丹麦语', 'Danish'],
+  'he': ['希伯来语', 'Hebrew'],
+  'fi': ['芬兰语', 'Finnish'],
+  'pl': ['波兰语', 'Polish'],
+  'is': ['冰岛语', 'Icelandic'],
+  'cs': ['捷克语', 'Czech'],
+  'fil': ['菲律宾语', 'Filipino'],
+  'fa': ['波斯语', 'Persian'],
+};
+
+/// 返回 3.5 的翻译语言配置表。`translationCode` 就是短码本身。
+List<Map<String, String>> getAlibaba35TranslationLanguageSpecs() {
+  return kAlibaba35AudioShortCodes.map((code) {
+    final n = _names[code] ?? [code, code];
+    return <String, String>{
+      'shortCode': code,
+      'chineseName': n[0],
+      'englishName': n[1],
+      'translationCode': code,
+      // 见文件头注释：开了声音复刻后这个值不生效，占位而已
+      'ttsVoiceName': 'default',
+    };
+  }).toList();
+}
diff --git a/apps/client/lib/data/services/language_configs/alibaba_language_config.dart b/apps/client/lib/data/services/language_configs/alibaba_language_config.dart
index 4e1aa6a5..a774b0e9 100644
--- a/apps/client/lib/data/services/language_configs/alibaba_language_config.dart
+++ b/apps/client/lib/data/services/language_configs/alibaba_language_config.dart
@@ -1,9 +1,55 @@
 import '../../models/user_Info.dart';
 
-/// 返回阿里云通义千问的翻译语言配置表（Translation）
+/// 阿里通义**旧版** `qwen3-livetranslate-flash-realtime` 的通话翻译语言表与音色。
 ///
-/// 数据来源：阿里云通义千问翻译支持语种
-/// 参考： https://bailian.console.aliyun.com/cn-beijing/?spm=5176.12818093_47.overview_recent.2.3be916d0Dc1NWf&tab=doc#/doc/?type=model&url=2983281
+/// 路由上它是**第二档**：3.5（带声音复刻）不覆盖的语种才落到这里，
+/// 见 LanguageManager.findBestMatchingProvider。旧版支持 18 语，
+/// 其中 16 语已被 3.5 的「音频输出 29 语」覆盖，所以实际只有
+/// **yue（粤语）和 el（希腊语）**会真的走到这一档——这两个在 3.5 里
+/// 是「仅文本输出」，出不了 TTS 音频，通话翻译用不了。
+/// 表里仍按阿里文档把 18 语列全，别按「反正走不到」删掉。
+///
+/// 音色（旧版没有声音复刻，只能挑固定音色）：
+///
+/// ⚠️ **模型不会"听出说话人是男是女"再挑音色**。`voice` 是 session 级参数，
+/// 在握手的第一条 `session.update` 里定死，之后再发 `voice` 会被服务端忽略
+/// （阿里文档明写）。所以对方的性别我们无从得知，也没法中途换音色。
+/// （新版 qwen3.5-livetranslate-flash-realtime 支持实时**声音复刻**
+///  `enable_voice_clone`，能让译文听起来像本人说外语——那才是根治方案，
+///  但要换模型，不在当前实现范围。）
+///
+/// 口径与项目既有的 [LanguageManager._getVoiceByGender] 对齐：
+/// **只有明确设置为男（gender==1）才用男声，未设置(0) 与 女(2) 一律女声**。
+/// 默认女声是刻意选的失败方向——认不出来时给女声比给男声更不出戏。
+/// 原实现写的是 `gender == 2 ? Cherry : Nofish`，等于把「未设置」也判成男声，
+/// 与全项目口径相反，已修正。
+const String kAlibabaVoiceFemale = 'Cherry'; // 芊悦，女声
+const String kAlibabaVoiceMale = 'Nofish'; // 不吃鱼，男声
+
+/// 粤语专用女声。目前粤语没在下面的表里（被注释掉了），留着备用：
+/// 真要放开 yue，得确认 Cherry 能不能播粤语，不能就换这个。
+const String kAlibabaVoiceCantonese = 'Kiki'; // 粤语-阿清，女声
+
+/// 代表「用户本人」的那一路音色：己方说话 → 译成对方语言 → 对方听见的"我"。
+/// 用户设了性别就跟着走，没设按女声。
+///
+/// [targetShortCode] 是**这一路要播出来的语言**（不是源语言）：
+/// 粤语只有 Kiki 这一个音色，Cherry/Nofish 播不了，所以粤语忽略性别。
+String getAlibabaVoiceForUser(String targetShortCode) {
+  if (targetShortCode == 'yue') return kAlibabaVoiceCantonese;
+  try {
+    return User.instance.gender == 1 ? kAlibabaVoiceMale : kAlibabaVoiceFemale;
+  } catch (_) {
+    // 用户信息还没初始化（未登录/游客首启）——也别退化成男声
+    return kAlibabaVoiceFemale;
+  }
+}
+
+/// 代表「对方」的那一路音色：对方说话 → 译成己方语言 → 我听见的"对方"。
+/// 对方性别无从得知，固定女声。
+String getAlibabaVoiceForPeer(String targetShortCode) =>
+    targetShortCode == 'yue' ? kAlibabaVoiceCantonese : kAlibabaVoiceFemale;
+
 List<Map<String, String>> getAlibabaTranslationLanguageSpecs() {
   return [
     // 中文系列
@@ -12,7 +58,7 @@ List<Map<String, String>> getAlibabaTranslationLanguageSpecs() {
       'chineseName': '中文',
       'englishName': 'Chinese',
       'translationCode': 'zh',
-      'ttsVoiceName': User.instance.gender == 2 ? 'Cherry' : 'Nofish',
+      'ttsVoiceName': kAlibabaVoiceFemale,
     },
 
     // 常见通用语种
@@ -21,63 +67,125 @@ List<Map<String, String>> getAlibabaTranslationLanguageSpecs() {
       'chineseName': '英语',
       'englishName': 'English',
       'translationCode': 'en',
-      'ttsVoiceName': User.instance.gender == 2 ? 'Cherry' : 'Nofish',
+      'ttsVoiceName': kAlibabaVoiceFemale,
     },
     {
       'shortCode': 'ja',
       'chineseName': '日语',
       'englishName': 'Japanese',
       'translationCode': 'ja',
-      'ttsVoiceName': User.instance.gender == 2 ? 'Cherry' : 'Nofish',
+      'ttsVoiceName': kAlibabaVoiceFemale,
     },
     {
       'shortCode': 'ko',
       'chineseName': '韩语',
       'englishName': 'Korean',
       'translationCode': 'ko',
-      'ttsVoiceName': User.instance.gender == 2 ? 'Cherry' : 'Nofish',
+      'ttsVoiceName': kAlibabaVoiceFemale,
     },
     {
       'shortCode': 'fr',
       'chineseName': '法语',
       'englishName': 'French',
       'translationCode': 'fr',
-      'ttsVoiceName': User.instance.gender == 2 ? 'Cherry' : 'Nofish',
+      'ttsVoiceName': kAlibabaVoiceFemale,
     },
     {
       'shortCode': 'de',
       'chineseName': '德语',
       'englishName': 'German',
       'translationCode': 'de',
-      'ttsVoiceName': User.instance.gender == 2 ? 'Cherry' : 'Nofish',
+      'ttsVoiceName': kAlibabaVoiceFemale,
     },
     {
       'shortCode': 'es',
       'chineseName': '西班牙语',
       'englishName': 'Spanish',
       'translationCode': 'es',
-      'ttsVoiceName': User.instance.gender == 2 ? 'Cherry' : 'Nofish',
+      'ttsVoiceName': kAlibabaVoiceFemale,
     },
     {
       'shortCode': 'it',
       'chineseName': '意大利语',
       'englishName': 'Italian',
       'translationCode': 'it',
-      'ttsVoiceName': User.instance.gender == 2 ? 'Cherry' : 'Nofish',
+      'ttsVoiceName': kAlibabaVoiceFemale,
     },
     {
       'shortCode': 'pt',
       'chineseName': '葡萄牙语',
       'englishName': 'Portuguese',
       'translationCode': 'pt',
-      'ttsVoiceName': User.instance.gender == 2 ? 'Cherry' : 'Nofish',
+      'ttsVoiceName': kAlibabaVoiceFemale,
     },
     {
       'shortCode': 'ru',
       'chineseName': '俄语',
       'englishName': 'Russian',
       'translationCode': 'ru',
-      'ttsVoiceName': User.instance.gender == 2 ? 'Cherry' : 'Nofish',
+      'ttsVoiceName': kAlibabaVoiceFemale,
+    },
+
+    // 以下 8 语是旧版模型支持、但 3.5 的**音频档**里没有或用不上的补充。
+    // 真正只会走到这一档的是 yue 和 el（3.5 里它们只有文本输出）。
+    {
+      'shortCode': 'id',
+      'chineseName': '印尼语',
+      'englishName': 'Indonesian',
+      'translationCode': 'id',
+      'ttsVoiceName': kAlibabaVoiceFemale,
+    },
+    {
+      'shortCode': 'vi',
+      'chineseName': '越南语',
+      'englishName': 'Vietnamese',
+      'translationCode': 'vi',
+      'ttsVoiceName': kAlibabaVoiceFemale,
+    },
+    {
+      'shortCode': 'th',
+      'chineseName': '泰语',
+      'englishName': 'Thai',
+      'translationCode': 'th',
+      'ttsVoiceName': kAlibabaVoiceFemale,
+    },
+    {
+      'shortCode': 'ar',
+      'chineseName': '阿拉伯语',
+      'englishName': 'Arabic',
+      'translationCode': 'ar',
+      'ttsVoiceName': kAlibabaVoiceFemale,
+    },
+    {
+      'shortCode': 'hi',
+      'chineseName': '印地语',
+      'englishName': 'Hindi',
+      'translationCode': 'hi',
+      'ttsVoiceName': kAlibabaVoiceFemale,
+    },
+    {
+      'shortCode': 'tr',
+      'chineseName': '土耳其语',
+      'englishName': 'Turkish',
+      'translationCode': 'tr',
+      'ttsVoiceName': kAlibabaVoiceFemale,
+    },
+    // ⚠️ 粤语音色只有 Kiki，见 getAlibabaVoiceForUser 里的 yue 分支
+    {
+      'shortCode': 'yue',
+      'chineseName': '粤语',
+      'englishName': 'Cantonese',
+      'translationCode': 'yue',
+      'ttsVoiceName': kAlibabaVoiceCantonese,
+    },
+    // ⚠️ 希腊语：旧版文档列了这个语种，但 Cherry/Nofish 能不能播希腊语
+    // **没有实测过**。真机验证优先测这一对。
+    {
+      'shortCode': 'el',
+      'chineseName': '希腊语',
+      'englishName': 'Greek',
+      'translationCode': 'el',
+      'ttsVoiceName': kAlibabaVoiceFemale,
     },
 
     // {
diff --git a/apps/client/lib/data/services/language_manager.dart b/apps/client/lib/data/services/language_manager.dart
index d6e1c1a2..eca25c7e 100644
--- a/apps/client/lib/data/services/language_manager.dart
+++ b/apps/client/lib/data/services/language_manager.dart
@@ -7,6 +7,7 @@ import 'language_configs/google_language_config.dart';
 import 'language_configs/iflytek_language_config.dart';
 import 'language_configs/volcano_language_config.dart';
 import 'language_configs/alibaba_language_config.dart';
+import 'language_configs/alibaba35_language_config.dart';
 import 'language_configs/ast_config.dart';
 
 /// 语言信息类，包含语言的各种表示形式
@@ -612,28 +613,42 @@ class LanguageManager extends GetxService {
         .toList();
   }
 
-  /// 豆包端到端 STS 实际优化良好的语言白名单
-  /// 只有源和目标都在白名单内，且至少一个是 zh/en 时，才走豆包；
-  /// 其余情况退到阿里或微软，避免法/德/西/葡/俄等语种走豆包端到端时
-  /// 出现词被拆碎、ASR 误识别、WebSocket 频繁断开等问题
-  static const Set<String> _volcanoE2EWhitelist = {'zh', 'en', 'ja', 'ko'};
-
   /// 查找同时支持源语言和目标语言的最佳提供商（通过 shortCode 匹配）
-  /// 路由策略：
-  ///   1. 豆包：源/目标都在白名单(zh/en/ja/ko)且至少一个是 zh/en
-  ///   2. 阿里：源/目标都在阿里翻译表内（zh/en/ja/ko/fr/de/es/it/pt/ru）
-  ///   3. 微软：其他所有组合（阿里不覆盖的稀有语种，或两端有任一不在阿里白名单）
-  ///   4. 讯飞：兜底
+  ///
+  /// ⚠️ **通话翻译不再走豆包（火山）端到端**（2026-08-31 改）：
+  /// 原来 zh/en/ja/ko 这几对语言优先命中豆包，现统一改走阿里
+  /// （通义 qwen3-livetranslate 端到端）。豆包覆盖的 {zh,en,ja,ko} 是阿里
+  /// 翻译表（zh/en/ja/ko/fr/de/es/it/pt/ru）的真子集，所以摘掉豆包不会
+  /// 留下任何没人接的语言对。**别把 `SpeechServiceType.volcano` 加回
+  /// providers 列表**——加回去它排在前面就会又把中英通话翻译抢走。
+  /// （原生侧 DoubaoE2ETranslateHelper 仍在，只是不再被这里选中；
+  ///  本函数是通话翻译选 provider 的唯一入口，见
+  ///  TranslationController._initializeCallModeTranslationService。）
+  ///
+  /// 路由策略（2026-09-01 起，四档降级）：
+  ///   1. **阿里 3.5**（qwen3.5-livetranslate-flash-realtime，带实时声音复刻）：
+  ///      源/目标都在它的「音频+文本输出」29 语内。这一档译文用**说话人本人
+  ///      的声音**，男女音色天然对得上，不需要猜性别。
+  ///   2. **阿里旧版**（qwen3-livetranslate-flash-realtime）：3.5 出不了音频的
+  ///      语种落这里。旧版 18 语里有 16 语被 3.5 覆盖，所以实际只有
+  ///      **yue（粤语）/ el（希腊语）** 会走到——它俩在 3.5 里是「仅文本输出」。
+  ///   3. **微软**：上面两档都不覆盖的语种（app 一共开放 80 个语种，
+  ///      阿里两档合起来 31 个，剩下约 50 个都靠微软）。
+  ///   4. **讯飞**：兜底。
+  ///
+  /// ⚠️ 「3.5 支持 60 语」这个宣传数字**不能直接拿来当路由依据**：其中 31 语
+  /// 是仅文本输出。通话翻译必须拿到 TTS PCM 回灌耳机，没音频等于功能不成立，
+  /// 所以第 1 档卡的是 29 语的音频档，不是 60。
   BestProviderResult? findBestMatchingProvider(
       String sourceShortCode, String targetShortCode) {
     final providers = [
-      SpeechServiceType.volcano,
+      SpeechServiceType.alibaba35,
       SpeechServiceType.alibaba,
       SpeechServiceType.azure,
       SpeechServiceType.iflytek,
     ];
     Logger.info(
-        '[TRANS-INIT] 开始匹配提供商: $sourceShortCode -> $targetShortCode, 策略=豆包(zh/en/ja/ko白名单且含zh|en)>阿里(含zh)>微软>讯飞');
+        '[TRANS-INIT] 开始匹配提供商: $sourceShortCode -> $targetShortCode, 策略=阿里3.5(声音复刻)>阿里旧版>微软>讯飞（豆包已停用）');
 
     for (final provider in providers) {
       final providerName = _providerStringFromType(provider);
@@ -659,36 +674,12 @@ class LanguageManager extends GetxService {
         continue;
       }
 
-      // 豆包端到端限制：
-      //   (a) 源和目标都必须在白名单 {zh, en, ja, ko}
-      //   (b) 且至少一个是 zh/en（豆包 STS 以中英为 pivot）
-      if (provider == SpeechServiceType.volcano) {
-        final bothInWhitelist =
-            _volcanoE2EWhitelist.contains(sourceShortCode) &&
-                _volcanoE2EWhitelist.contains(targetShortCode);
-        final hasZhOrEn = sourceShortCode == 'zh' ||
-            sourceShortCode == 'en' ||
-            targetShortCode == 'zh' ||
-            targetShortCode == 'en';
-        if (!bothInWhitelist) {
-          Logger.info(
-              '[TRANS-INIT] 跳过 ${providerDisplayName('volcano')}: 端到端仅对 {zh,en,ja,ko} 稳定，当前 $sourceShortCode/$targetShortCode 不全在白名单');
-          continue;
-        }
-        if (!hasZhOrEn) {
-          Logger.info(
-              '[TRANS-INIT] 跳过 ${providerDisplayName('volcano')}: 需源或目标至少一个为 zh/en（当前 $sourceShortCode/$targetShortCode）');
-          continue;
-        }
-      }
-
       // 阿里端到端 (qwen3-livetranslate): 覆盖主流 10 语（zh/en/ja/ko/fr/de/es/it/pt/ru），
       // 两端都在阿里翻译表内即走阿里；稀有语种交给微软兜底。
       // 这里不加额外白名单——上面 transSpecs 的匹配检查已经做了筛选。
 
       // 对于非端到端服务（Azure, Iflytek），还需要检查 ASR 和 TTS 支持
-      if (provider != SpeechServiceType.volcano &&
-          provider != SpeechServiceType.alibaba) {
+      if (!_isAlibaba(provider)) {
         final asrSpecs = _getAsrSpecs(provider);
         final ttsSpecs = _getTtsSpecs(provider);
 
@@ -711,21 +702,60 @@ class LanguageManager extends GetxService {
                 _getGenderAwareTtsCode(spec['shortCode']!) ?? spec["ttsVoiceName"]!;
           }
         }
-      } else if (provider == SpeechServiceType.alibaba) {
+      } else if (_isAlibaba(provider)) {
+        // 阿里端到端的音色是**按路**定的，两路含义完全不同，别给成同一个值：
+        //
+        //   A 路 = 己方麦克风 → 译成对方语言 → **对方听见的"我"**
+        //          原生读 supportedLanguages[5]，即这里的 targetSpec['ttsCode']
+        //   B 路 = 对端通话音 → 译成己方语言 → **我听见的"对方"**
+        //          原生读 supportedLanguages[4]，即这里的 sourceSpec['ttsCode']
+        //
+        // 映射见 AzureSpeechPlugin（两端一致）：
+        //   bailianConfigA.voice = ttsLang1 / bailianConfigB.voice = ttsLang0。
+        // 改这两行前先回去核一眼，写反了就变成「对方说话用我的性别、
+        // 我说话用默认女声」，且不会报任何错。
+        //
+        // 对方是男是女**无从得知**：qwen3-livetranslate 的 voice 是 session 级
+        // 参数，握手时定死且中途改不了，模型也不做说话人性别识别。
+        // 所以 B 路一律女声；A 路代表用户本人，跟随用户设置的性别
+        // （未设置同样落女声，见 getAlibabaVoiceForUser）。
+        // 每一路的音色跟的是**这一路要播出来的语言**：
+        // A 路播 targetShortCode，B 路播 sourceShortCode。
+        final String userVoice = getAlibabaVoiceForUser(targetShortCode);
+        final String peerVoice = getAlibabaVoiceForPeer(sourceShortCode);
         final ttsSpecs = _getTtsSpecs(provider);
         for (final spec in ttsSpecs) {
+          // 仍然按 shortCode 命中才填：填不上会退到 translation_controller 里
+          // getTtsVoiceNameByAsrCode 的 Azure 音色名（zh-CN-XiaoxiaoNeural），
+          // 那对阿里是非法值。上面的 transSpecs 校验保证了这里一定命中。
           if (spec['shortCode'] == sourceShortCode) {
-            sourceTransSpec["ttsCode"] = spec["ttsVoiceName"]!;
+            sourceTransSpec["ttsCode"] = peerVoice;
           }
           if (spec['shortCode'] == targetShortCode) {
-            targetTransSpec["ttsCode"] = spec["ttsVoiceName"]!;
+            targetTransSpec["ttsCode"] = userVoice;
           }
         }
+        // ⚠️ 日志里别直接读 User.instance：未初始化时它是 throw 而不是返回 null，
+        // 异常会被上层 _initializeCallModeTranslationService 的 catch 吞成
+        // 「通话翻译初始化失败」，一句日志把整个功能带塌。
+        int? genderForLog;
+        try {
+          genderForLog = User.instance.gender;
+        } catch (_) {
+          genderForLog = null;
+        }
+        if (provider == SpeechServiceType.alibaba35) {
+          Logger.info(
+              '[TRANS-INIT] 阿里3.5 开启声音复刻：两路音色由原生强制写成 default，'
+              '译文用说话人本人的声音，不按性别选音色（gender=${genderForLog ?? "未初始化"} 仅记录）');
+        } else {
+          Logger.info(
+              '[TRANS-INIT] 阿里旧版音色: A路(我说话/对方听)=$userVoice, B路(对方说话/我听)=$peerVoice, gender=${genderForLog ?? "未初始化"}');
+        }
       }
 
       final providerString = _providerStringFromType(provider);
-      final isEndToEnd = provider == SpeechServiceType.volcano ||
-          provider == SpeechServiceType.alibaba;
+      final isEndToEnd = _isAlibaba(provider);
       Logger.info(
           '[TRANS-INIT] 命中 ${providerDisplayName(providerString)}[$providerString] for $sourceShortCode -> $targetShortCode (端到端=$isEndToEnd), transSrc=${sourceTransSpec["translationCode"]}, transTgt=${targetTransSpec["translationCode"]}, asrSrc=${sourceTransSpec["asrCode"]}, asrTgt=${targetTransSpec["asrCode"]}, ttsSrc=${sourceTransSpec["ttsCode"]}, ttsTgt=${targetTransSpec["ttsCode"]}');
       return BestProviderResult(
@@ -737,6 +767,13 @@ class LanguageManager extends GetxService {
     return null;
   }
 
+  /// 两档阿里共用同一套端到端流水线（同一个原生 helper、同一套 WS 协议），
+  /// 差别只在 model 名与是否开声音复刻，所以凡是「是不是端到端阿里」的判断
+  /// 都走这里，别再逐个写 `== SpeechServiceType.alibaba`——漏掉 3.5 会让它
+  /// 掉进 Azure 那条「还要查 ASR/TTS 表」的分支里，直接匹配失败。
+  static bool _isAlibaba(SpeechServiceType t) =>
+      t == SpeechServiceType.alibaba || t == SpeechServiceType.alibaba35;
+
   String _providerStringFromType(SpeechServiceType type) {
     switch (type) {
       case SpeechServiceType.iflytek:
@@ -747,6 +784,8 @@ class LanguageManager extends GetxService {
         return 'google';
       case SpeechServiceType.alibaba:
         return 'alibaba';
+      case SpeechServiceType.alibaba35:
+        return 'alibaba35';
       case SpeechServiceType.volcano:
         return 'volcano';
       case SpeechServiceType.flutter:
@@ -760,7 +799,9 @@ class LanguageManager extends GetxService {
       case 'volcano':
         return '豆包(火山)';
       case 'alibaba':
-        return '阿里(通义)';
+        return '阿里(通义·旧版)';
+      case 'alibaba35':
+        return '阿里(通义3.5·声音复刻)';
       case 'azure':
         return '微软(Azure)';
       case 'iflytek':
@@ -801,6 +842,8 @@ class LanguageManager extends GetxService {
         return getVolcanoTranslationLanguageSpecs();
       case SpeechServiceType.alibaba:
         return getAlibabaTranslationLanguageSpecs();
+      case SpeechServiceType.alibaba35:
+        return getAlibaba35TranslationLanguageSpecs();
       default:
         return getAzureTranslationLanguageSpecs();
     }
@@ -816,6 +859,8 @@ class LanguageManager extends GetxService {
         return getIflytekTTSLanguageSpecs();
       case SpeechServiceType.alibaba:
         return getAlibabaTranslationLanguageSpecs();
+      case SpeechServiceType.alibaba35:
+        return getAlibaba35TranslationLanguageSpecs();
       default:
         return getAzureTTSLanguageSpecs();
     }
diff --git a/apps/client/lib/data/services/speech_factory.dart b/apps/client/lib/data/services/speech_factory.dart
index 7127431a..57725a82 100644
--- a/apps/client/lib/data/services/speech_factory.dart
+++ b/apps/client/lib/data/services/speech_factory.dart
@@ -17,9 +17,17 @@ enum SpeechServiceType {
   /// Google 语音服务
   google,
 
-  /// 阿里巴巴语音服务
+  /// 阿里巴巴语音服务（旧版 qwen3-livetranslate-flash-realtime，无声音复刻）
   alibaba,
 
+  /// 阿里巴巴语音服务 3.5（qwen3.5-livetranslate-flash-realtime，带实时声音复刻）
+  ///
+  /// 与 [alibaba] 是**同一套 WebSocket 协议、同一个原生 helper**，只差
+  /// `model` 参数和 `enable_voice_clone` 两个开关，所以下发给原生的
+  /// provider 字符串仍然是 `alibaba`（见 AzureAstService.initialize），
+  /// 原生不需要为它多一个分支。
+  alibaba35,
+
   /// 火山引擎（豆包）语音服务
   volcano,
 
diff --git a/apps/client/lib/data/services/speech_impl/azure_ast_service.dart b/apps/client/lib/data/services/speech_impl/azure_ast_service.dart
index 86a8b703..1c0ad32e 100644
--- a/apps/client/lib/data/services/speech_impl/azure_ast_service.dart
+++ b/apps/client/lib/data/services/speech_impl/azure_ast_service.dart
@@ -5,6 +5,21 @@ import '../../../core/utils/logger.dart';
 import 'package:get/get.dart';
 import '../ast_service.dart';
 
+/// 阿里通义实时翻译的两个模型名。
+///
+/// ⚠️ 3.5 的模型名里是**点号** `qwen3.5-...`，不是文档 URL 里的 `qwen3-5-...`；
+/// 写错了 WebSocket 握手会被服务端拒掉。
+const String kAlibabaModelLegacy = 'qwen3-livetranslate-flash-realtime';
+const String kAlibabaModel35 = 'qwen3.5-livetranslate-flash-realtime';
+
+/// 声音复刻的复刻时机：`never` / `once` / `always`。
+///
+/// 取 `once`：通话里每一路的说话人是固定的（A 路永远是机主、B 路永远是对端），
+/// 开头复刻一次就够；`always` 会持续重复刻，费用和延迟都更高。
+/// ⚠️ frequency 为 once/always 时，阿里要求 `voice` 必须是 `"default"`，
+/// 这一步由原生 helper 强制写入，Dart 侧算出来的音色在 3.5 档不生效。
+const String kAlibabaVoiceCloneFrequency = 'once';
+
 /// Azure 语音识别服务
 ///
 /// 该服务提供了通过平台通道与原生 Microsoft Speech SDK 交互的接口
@@ -251,7 +266,7 @@ class AzureAstService extends GetxService implements AstService {
     _alibabaAppKey = AppConfig.env('ALIBABA_OPENSPEECH_APP_KEY') ?? '';
     final aliModel = AppConfig.env('ALIBABA_OPENSPEECH_APP_ID') ?? '';
     _alibabaAppId = aliModel.trim().isEmpty
-        ? 'qwen3-livetranslate-flash-realtime'
+        ? kAlibabaModelLegacy
         : aliModel;
     final aliUrl = AppConfig.env('ALIBABA_OPENSPEECH_APP_URL') ?? '';
     _alibabaAppURL = aliUrl.trim().isEmpty
@@ -411,7 +426,21 @@ class AzureAstService extends GetxService implements AstService {
     try {
       final List<String> languages =
           supportedLanguages ?? _defaultSupportedLanguages;
-      Logger.info('[STS] initialize: provider=$provider, isInitialized=$_isInitialized');
+      // 两档阿里在原生侧是**同一个 helper、同一套 WS 协议**，只差 model 名和
+      // 是否开声音复刻，所以下发给原生的 provider 统一成 'alibaba'，
+      // 原生不需要为 3.5 多一个分支（少 6 处 == 比较，少 6 处漏改的机会）。
+      final String nativeProvider =
+          provider == 'alibaba35' ? 'alibaba' : provider;
+      // 3.5 才有实时声音复刻；旧版模型没这个能力，传了会被拒。
+      final bool enableVoiceClone = provider == 'alibaba35';
+      // ⚠️ 模型名必须跟着档位走。`.env` 的 ALIBABA_OPENSPEECH_APP_ID 只覆盖
+      // 旧版那一档；3.5 这一档写死常量，否则运维改了 env 会把 3.5 打回旧版，
+      // 而现象只是「声音复刻悄悄没了」，不报任何错。
+      final String alibabaModel =
+          provider == 'alibaba35' ? kAlibabaModel35 : _alibabaAppId;
+      Logger.info(
+          '[STS] initialize: provider=$provider (native=$nativeProvider), '
+          'alibabaModel=$alibabaModel, voiceClone=$enableVoiceClone, isInitialized=$_isInitialized');
       // 底层会初始化前释放
       if (_isInitialized) {
         await dispose();
@@ -422,7 +451,7 @@ class AzureAstService extends GetxService implements AstService {
       Logger.info('[STS] initialize: eventChannel已建立, streamController=${_eventStreamController?.hashCode}');
 
       final bool result = await _channel.invokeMethod('initialize', {
-        'provider': provider,
+        'provider': nativeProvider,
         'subscriptionKey': _subscriptionKey,
         'region': _serviceRegion,
         'supportedLanguages': languages,
@@ -440,8 +469,12 @@ class AzureAstService extends GetxService implements AstService {
         'resourceId': _doubaoResourceId,
 
         'alibabaAppKey': _alibabaAppKey,
-        'alibabaAppId': _alibabaAppId,
+        'alibabaAppId': alibabaModel,
         'alibabaAppURL': _alibabaAppURL,
+        // 原生新增入参（旧原生收不到也不影响：它读不到就按老行为走）
+        'alibabaModel': alibabaModel,
+        'alibabaEnableVoiceClone': enableVoiceClone,
+        'alibabaVoiceCloneFrequency': kAlibabaVoiceCloneFrequency,
       });
 
       _isInitialized = result;
diff --git a/apps/client/lib/data/services/version_update_service.dart b/apps/client/lib/data/services/version_update_service.dart
index 6198b780..26779750 100644
--- a/apps/client/lib/data/services/version_update_service.dart
+++ b/apps/client/lib/data/services/version_update_service.dart
@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:math' as math;
 
 import 'package:get/get.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -23,6 +22,7 @@ class VersionUpdateService extends GetxService {
   static String? _latestVersion = ""; //最新版本号+构建号
   static bool? _hasUpdate = false; //是否有更新
   static bool? _isForceUpdate = false; //是否强制更新
+  static bool? _isReviewing = false; //本机版本是否正处于渠道审核期（服务端判定）
   static String? _updateUrl = ""; //更新链接
   static AppInfo? _appInfo; //应用信息
   static bool? _isShowTourists = false; //是否显示游客登录
@@ -68,6 +68,10 @@ class VersionUpdateService extends GetxService {
   /// 获取缓存的更新地址
   String get cachedUpdateUrl => _updateUrl ?? '';
 
+  /// 本机版本是否正处于渠道审核期（后台「版本控制」填的送审版本号等于本机版本）。
+  /// 服务端算好的结论，供「审核期隐藏未过审功能」用；目前还没有 UI 消费它。
+  bool get cachedIsReviewing => _isReviewing ?? false;
+
   /// 获取缓存的应用信息
   AppInfo? get cachedAppInfo => _appInfo;
 
@@ -98,7 +102,19 @@ class VersionUpdateService extends GetxService {
   //   super.onInit();
   // }
 
-  /// 检查版本更新
+  /// 检查版本更新。
+  ///
+  /// 走**单数**接口 `user_getchannelapp`：只要本渠道这一条，且服务端把
+  /// `needupdate/forceupdate/reviewing` 三个结论直接算好下发（见 api_getchannelapp.go），
+  /// 客户端不再自己比版本号。
+  ///
+  /// 为什么不是复数的 `user_getchannelapps`：
+  /// - 它取回全部渠道，而客户端只用得上自己这一条 —— 早先那套「环境渠道 + 品牌渠道」
+  ///   双取的逻辑早已失效（`_channel` 在 getCurrentPlatformInfo 里就被改写成品牌渠道，
+  ///   两个变量取到的是同一条），留着只是多传一堆用不到的数据。
+  /// - 更要命的是它**不在网关白名单里**，未登录时返回 `code:18 NoLogin`。而游客登录入口
+  ///   恰恰只在未登录时才需要显示，于是入口在任何未登录设备上都不可能出现，且不报错。
+  ///   单数接口本来就在白名单里。
   Future<VersionUpdateInfo> checkForUpdate() async {
     if (_lastCheckTime != null &&
         DateTime.now().difference(_lastCheckTime!).inMinutes <
@@ -110,118 +126,118 @@ class VersionUpdateService extends GetxService {
         currentVersion: _appVersion ?? '1.0.0',
         latestVersion: (_latestVersion ?? '1.0.0').split('+')[0],
         appInfo: _appInfo,
-        updateType: _hasUpdate!
-            ? (_isForceUpdate! ? UpdateType.force : UpdateType.optional)
+        updateType: (_hasUpdate ?? false)
+            ? ((_isForceUpdate ?? false) ? UpdateType.force : UpdateType.optional)
             : UpdateType.none,
       );
     }
 
+    final currentVersion = await getCurrentVersion();
     try {
-      final currentVersion = await getCurrentVersion();
       final platformInfo = await getCurrentPlatformInfo();
-
       _platform = platformInfo.platform;
-      //_channel = platformInfo.channel;
-      _lastCheckTime = DateTime.now();
 
-      // 获取所有渠道包信息。必须带上本机版本号：游客登录入口是否显示由服务端按版本判定，
+      // 必须带上本机版本号：游客登录入口是否显示、是否需要强更，都由服务端按这个版本判定，
       // 不传服务端认不出是哪一版，后台限定了生效版本时会一律隐藏。
       // 传净版本号（去掉 "+构建号"）：后台填的是 1.0.2 这种商店版本号，两边口径必须一致。
       // 直接传 "1.0.1+3" 虽然也能被服务端的 leadingInt 吃掉后缀而碰巧判对，但那是巧合不是约定。
-      final response =
-          await Api.getChannelApps({'version': currentVersion.split('+')[0]});
+      final response = await Api.getChannelApp({
+        'channel': platformInfo.channel.value,
+        'version': currentVersion.split('+')[0],
+      });
+
+      _logger.d('lxm--获取渠道包信息(channel=${platformInfo.channel.name})：$response');
 
-      _logger.d('lxm--获取所有渠道包信息：$response');
+      final AppInfo? app = _parseApp(response);
 
-      final List<AppInfo> apps = _parseAppsList(response);
+      // ⚠️ 缓存时间戳只在**请求成功之后**才写。早先是在发请求之前写的，于是一次网络抖动
+      // 就把结果锁死 10 分钟：失败分支把 _isShowTourists 置 false，而缓存命中分支
+      // 根本不重算它 —— 表现为 splash 那次失败之后，登录页怎么重进游客入口都不出现。
+      _lastCheckTime = DateTime.now();
 
-      if (apps.isEmpty) {
-        _logger.w('lxm--获取所有渠道包信息失败或为空');
+      if (app == null) {
+        // 后台还没给这个渠道配任何东西。按「无更新 + 不显示游客入口」处理：
+        // 游客入口判宽会在送审期把不该露的入口露给审核员，判严只是入口少显示。
+        _logger.w('lxm--该渠道未配置，按无更新处理');
+        _appInfo = null;
+        _isShowTourists = false;
+        _allowSkipDeviceBinding = false;
+        _hasUpdate = false;
+        _isForceUpdate = false;
+        _isReviewing = false;
         return VersionUpdateInfo(
           hasUpdate: false,
-          currentVersion: currentVersion,
-          latestVersion: currentVersion,
+          currentVersion: currentVersion.split('+')[0],
+          latestVersion: currentVersion.split('+')[0],
           updateType: UpdateType.none,
         );
       }
 
-      final Map<UserChannel, AppInfo> appIndex = _buildChannelIndex(apps);
+      _appInfo = app;
+      _latestVersion = app.version;
+      _updateUrl = app.address;
 
-      // 依据设备品牌渠道用于版本更新链接
-      final brandChannel = platformInfo.channel;
-
-      // 环境变量渠道用于游客登录配置
-      // final envChannelName = dotenv.env['Channel'] ?? 'OFFICIAL';
-      final envChannel = _channel;
-      final AppInfo? envAppInfo = appIndex[envChannel];
+      // 这里的 tourists 已是服务端按本机版本算好的结论，直接用，不要再做版本比较。
+      _isShowTourists = app.tourists;
+      _allowSkipDeviceBinding = app.allowskipdevicebinding;
+      _logger.d('lxm--从服务器获取游客登录配置(最终): $_isShowTourists');
 
-      // 若不存在品牌渠道信息，降级为环境渠道；仍不存在则返回无更新
-      final AppInfo? brandAppInfo = appIndex[brandChannel] ?? envAppInfo;
+      // 升级判定同样取服务端结论：版本号逐段比较各端各写一遍必然出现实现不一致，
+      // 而强更判错的代价是全员无法使用。服务端没回这几个字段时按 false 处理。
+      _hasUpdate = _asBool(response, 'needupdate');
+      _isForceUpdate = _asBool(response, 'forceupdate');
+      _isReviewing = _asBool(response, 'reviewing');
 
-      if (brandAppInfo == null) {
-        _logger.w('lxm--未找到品牌或环境渠道的应用信息，返回无更新');
-        return VersionUpdateInfo(
-          hasUpdate: false,
-          currentVersion: currentVersion,
-          latestVersion: currentVersion,
-          updateType: UpdateType.none,
-        );
-      }
+      final UpdateType updateType = _hasUpdate!
+          ? (_isForceUpdate! ? UpdateType.force : UpdateType.optional)
+          : UpdateType.none;
 
-      _appInfo = brandAppInfo;
-      _latestVersion = brandAppInfo.version;
-      _updateUrl = brandAppInfo.address;
-
-      // 设置游客登录显示状态（先用当前渠道结果作为回退，再用.env渠道覆盖以保持一致）。
-      // 这里的 tourists 已是服务端按本机版本算好的结论，直接用，不要再做版本比较。
-      _isShowTourists = (envAppInfo ?? brandAppInfo).tourists;
-      _allowSkipDeviceBinding =
-          (envAppInfo ?? brandAppInfo).allowskipdevicebinding;
-
-      _logger.d('lxm--从服务器获取游客登录配置(最终): ${_isShowTourists}');
-
-      // if (channelAppResponse.code != 0 || channelAppResponse.data == null) {
-      //   _logger.w('获取版本信息失败: ${channelAppResponse.msg}');
-      //   return VersionUpdateInfo(
-      //     hasUpdate: false,
-      //     currentVersion: currentVersion,
-      //     latestVersion: currentVersion,
-      //     updateType: UpdateType.none,
-      //   );
-      // }
-
-      // final appInfo = channelAppResponse.data!.app;
-      _hasUpdate = _compareVersions(currentVersion, brandAppInfo.version);
-
-      // 判断更新类型：如果主版本号不同则强制更新
-      UpdateType updateType = UpdateType.none;
-      if (_hasUpdate!) {
-        _isForceUpdate =
-            _shouldForceUpdate(currentVersion, brandAppInfo.version);
-        updateType = _isForceUpdate! ? UpdateType.force : UpdateType.optional;
-      }
-      //[3]返回版本更新信息
       return VersionUpdateInfo(
         hasUpdate: _hasUpdate!,
         currentVersion: currentVersion.split('+')[0],
-        latestVersion: brandAppInfo.version.split('+')[0],
-        appInfo: brandAppInfo,
+        latestVersion: app.version.split('+')[0],
+        appInfo: app,
         updateType: updateType,
       );
     } catch (e) {
       _logger.e('检查版本更新失败: $e');
-      // 发生错误时，保持默认值 false
+      // 失败方向偏向「不显示游客入口 / 不提示更新」。注意**不写** _lastCheckTime：
+      // 失败不该占用 10 分钟缓存窗口，下一次调用要能真的重试。
       _isShowTourists = false;
-      final currentVersion = await getCurrentVersion();
+      _allowSkipDeviceBinding = false;
+      _hasUpdate = false;
+      _isForceUpdate = false;
+      _isReviewing = false;
       return VersionUpdateInfo(
         hasUpdate: false,
-        currentVersion: currentVersion,
-        latestVersion: currentVersion,
+        currentVersion: currentVersion.split('+')[0],
+        latestVersion: currentVersion.split('+')[0],
         updateType: UpdateType.none,
       );
     }
   }
 
+  /// 从 `user_getchannelapp` 的响应里取 app 段；该渠道没配置时服务端回的是空对象。
+  AppInfo? _parseApp(dynamic response) {
+    try {
+      final appJson = (response is Map) ? response['app'] : null;
+      if (appJson is Map<String, dynamic>) return AppInfo.fromJson(appJson);
+    } catch (e) {
+      _logger.e('解析渠道包信息失败: $e');
+    }
+    return null;
+  }
+
+  /// 取响应里的布尔字段；缺字段或类型不对一律 false（服务端 omitempty 会吃掉 false）。
+  static bool _asBool(dynamic response, String key) {
+    if (response is! Map) return false;
+    final v = response[key];
+    if (v is bool) return v;
+    if (v is num) return v != 0;
+    if (v is String) return v == 'true' || v == '1';
+    return false;
+  }
+
   /// 获取当前应用版本信息
   Future<String> getCurrentVersion() async {
     try {
@@ -373,103 +389,12 @@ class VersionUpdateService extends GetxService {
     }
   }
 
-  /// 判断是否需要强制更新
-  /// 当主版本号（第一位数字）不同时返回true
-  bool _shouldForceUpdate(String current, String latest) {
-    try {
-      // 拆分版本号与构建号
-      final currentParts = current.split('+');
-      final latestParts = latest.split('+');
-
-      // 解析版本号 (major.minor.patch)
-      final currentVersions =
-          currentParts[0].split('.').map(int.parse).toList();
-      final latestVersions = latestParts[0].split('.').map(int.parse).toList();
-
-      // 比较主版本号（第一位）
-      if (currentVersions.isNotEmpty && latestVersions.isNotEmpty) {
-        if (currentVersions[0] != latestVersions[0]) {
-          return true;
-        }
-      }
-
-      // 检查是否有两个或更多的 + 号，如果有则强制更新
-      if (latest.split('+').length > 2) {
-        return true;
-      }
-
-      return false;
-    } catch (e) {
-      _logger.e('判断强制更新失败: $e');
-      return false;
-    }
-  }
-
-  /// 比较版本号
-  /// 返回true表示需要更新（远程版本更高）
-  bool _compareVersions(String current, String latest) {
-    // 拆分版本号与构建号
-    final currentParts = current.split('+')[0];
-    final latestParts = latest.split('+')[0];
-
-    // 解析版本号 (major.minor.patch)
-    final currentVersions = currentParts.split('.').map(int.parse).toList();
-    final latestVersions = latestParts.split('.').map(int.parse).toList();
-
-    // 使用较小的长度进行比较，避免索引越界
-    final minLength = math.min(currentVersions.length, latestVersions.length);
-
-    // 逐级比较版本号
-    for (var i = 0; i < minLength; i++) {
-      if (latestVersions[i] > currentVersions[i]) return true;
-      if (latestVersions[i] < currentVersions[i]) return false;
-    }
 
-    // 如果前面的版本号都相同，比较长度
-    // 更长的版本号被认为是更新的版本（如 1.0.1 > 1.0）
-    return latestVersions.length > currentVersions.length;
-  }
 
-  /// 解析响应数据为AppInfo列表
-  List<AppInfo> _parseAppsList(dynamic response) {
-    try {
-      final appsJson = (response is Map) ? response['apps'] : null;
-      if (appsJson is List) {
-        return appsJson
-            .whereType<Map<String, dynamic>>()
-            .map((e) => AppInfo.fromJson(e))
-            .toList();
-      }
-    } catch (e) {
-      _logger.e('解析渠道列表失败: $e');
-    }
-    return [];
-  }
 
-  /// 构建渠道索引
-  Map<UserChannel, AppInfo> _buildChannelIndex(List<AppInfo> apps) {
-    final index = <UserChannel, AppInfo>{};
-    for (final app in apps) {
-      index[app.channel] = app;
-    }
-    return index;
-  }
 
-  /// 解析版本号字符串为数字数组
-  List<int> _parseVersion(String version) {
-    final parts = version.split('.');
-    final result = <int>[];
 
-    for (int i = 0; i < 3; i++) {
-      if (i < parts.length) {
-        result.add(int.tryParse(parts[i]) ?? 0);
-      } else {
-        result.add(0);
-      }
-    }
 
-    return result;
-  }
 
   /// 执行更新操作
   Future<bool> performUpdate(VersionUpdateInfo updateInfo) async {
diff --git a/apps/client/lib/modules/agent/controllers/agent_controller.dart b/apps/client/lib/modules/agent/controllers/agent_controller.dart
index caa9dd7a..aedcc7e5 100644
--- a/apps/client/lib/modules/agent/controllers/agent_controller.dart
+++ b/apps/client/lib/modules/agent/controllers/agent_controller.dart
@@ -1770,7 +1770,9 @@ class AgentController extends GetxController with WidgetsBindingObserver {
     // 必须已连接杰理耳机；iOS / Android 都走 device_jieli 的 AI 助理通路
     final BleManager bleManager = Get.find<BleManager>();
     if (!bleManager.isConnected) {
-      Get.snackbar('tips'.tr, '请先连接耳机');
+      // 用已有的 'tip'（全项目 30 处在用），不要写 'tips'——那个 key 一个语言
+      // 文件里都没有，.tr 会原样显示 "tips"。
+      Get.snackbar('tip'.tr, '请先连接耳机');
       return;
     }
 
diff --git a/apps/client/lib/modules/call_recording/views/call_recording_view.dart b/apps/client/lib/modules/call_recording/views/call_recording_view.dart
index 12664293..68abfeb8 100644
--- a/apps/client/lib/modules/call_recording/views/call_recording_view.dart
+++ b/apps/client/lib/modules/call_recording/views/call_recording_view.dart
@@ -8,6 +8,7 @@ import '../controllers/call_recording_controller.dart';
 import 'widgets/recorder_waveform.dart';
 import '../../../core/theme/app_palette.dart';
 import '../../../core/utils/background_session_notifier.dart';
+import '../../../core/utils/logger.dart';
 
 /// 录音页退出操作
 enum _RecordingExitAction { continueInBackground, endAndSave, cancel }
@@ -20,17 +21,79 @@ enum _RecordingExitAction { continueInBackground, endAndSave, cancel }
 /// 没有用 GetView：通话录音 / 现场录音是两个 permanent 单例（按 folder 分开
 /// tag，见 [CallRecordingBinding]），GetView 默认的 Get.find() 不带 tag，会
 /// 拿错实例，所以这里自己按 tag 查。
-class CallRecordingView extends StatelessWidget {
+///
+/// 是 StatefulWidget 而不是 StatelessWidget，只为了**在 initState 里把 tag 和
+/// 路由参数定死**——理由见 [_CallRecordingViewState._tag] 的注释。
+class CallRecordingView extends StatefulWidget {
   const CallRecordingView({super.key});
 
-  String get _tag => CallRecordingController.tagFor(Get.arguments);
+  @override
+  State<CallRecordingView> createState() => _CallRecordingViewState();
+}
+
+class _CallRecordingViewState extends State<CallRecordingView> {
+  static const String _logTag = 'CallRecordingView';
+
+  /// 每个 tag 当前有几个页面实例活着。
+  ///
+  /// 退出时的延时删除（[_deleteControllerAfterPop]）必须给「刚又进来的页面」
+  /// 让路：用户退出后 400ms 内再点进来时，binding 看到 controller 还注册着
+  /// 就直接复用，紧接着旧页面那颗延时炸弹把它删掉——之后这个页面每次 build
+  /// 和每次按返回都 `Get.find` 失败，返回键彻底失效，人就卡在录音页里出不去。
+  static final Map<String, int> _liveViews = <String, int>{};
+
+  /// 本页对应的 controller tag，**进页面时取一次就不再变**。
+  ///
+  /// ⚠️ 不能在 build / 回调里现取 `Get.arguments`：它是「全局当前路由」的参数，
+  /// 任何 dialog / bottomSheet push 进来都会被 GetObserver.didPush 里的
+  /// `value.args = route.settings.arguments` 冲掉（GetX 4.7 的行为）。
+  /// 退出确认弹窗一弹，`Get.arguments` 就变成 null，tag 退化成默认的
+  /// 'call_recordings'——现场录音页当场 find 不到自己的 controller。
+  late final String _tag;
+
+  /// 同理缓存路由参数与路由名，供「后台继续」重新跳回本页用。
+  late final Map<String, dynamic>? _args;
+  late final String _route;
+
+  /// 返回键重入锁：确认弹窗还开着时再按返回，不要叠第二个弹窗。
+  bool _popHandling = false;
+
+  CallRecordingController? get _controllerOrNull =>
+      Get.isRegistered<CallRecordingController>(tag: _tag)
+          ? Get.find<CallRecordingController>(tag: _tag)
+          : null;
 
   CallRecordingController get controller =>
       Get.find<CallRecordingController>(tag: _tag);
 
-  void _deleteControllerAfterPop() {
-    final tag = _tag;
+  @override
+  void initState() {
+    super.initState();
+    _tag = CallRecordingController.tagFor(Get.arguments);
+    _args = Get.arguments as Map<String, dynamic>?;
+    _route = Get.currentRoute;
+    _liveViews.update(_tag, (v) => v + 1, ifAbsent: () => 1);
+    // 用户从后台通知或其它页面点回来了，之前挂着的"还在后台录音"提示可以撤了。
+    unawaited(BackgroundSessionNotifier.cancel(
+      CallRecordingController.notificationIdFor(_tag),
+    ));
+  }
+
+  @override
+  void dispose() {
+    final left = (_liveViews[_tag] ?? 1) - 1;
+    if (left <= 0) {
+      _liveViews.remove(_tag);
+    } else {
+      _liveViews[_tag] = left;
+    }
+    super.dispose();
+  }
+
+  static void _deleteControllerAfterPop(String tag) {
     Future.delayed(const Duration(milliseconds: 400), () {
+      // 这段时间里用户又进来了（或者压根没退成）：controller 还有人用，别删。
+      if ((_liveViews[tag] ?? 0) > 0) return;
       if (Get.isRegistered<CallRecordingController>(tag: tag)) {
         Get.delete<CallRecordingController>(tag: tag, force: true);
       }
@@ -39,7 +102,7 @@ class CallRecordingView extends StatelessWidget {
 
   /// 显示退出确认弹窗：录音中点返回（而不是点结束）时弹，
   /// 「后台继续」不停录音、也不删这个 permanent controller。
-  Future<_RecordingExitAction?> _showExitConfirmDialog(bool isDarkMode) {
+  Future<_RecordingExitAction?> _showExitConfirmDialog() {
     return Get.dialog<_RecordingExitAction>(
       AlertDialog(
         title: Text('meetingRecordExitTitle'.tr),
@@ -67,63 +130,81 @@ class CallRecordingView extends StatelessWidget {
     );
   }
 
-  Future<void> _handlePop(bool isDarkMode) async {
-    if (!controller.isRecording.value) {
-      Get.back();
-      _deleteControllerAfterPop();
-      return;
-    }
-
-    final action = await _showExitConfirmDialog(isDarkMode);
-    switch (action) {
-      case _RecordingExitAction.endAndSave:
-        // 弹窗等用户选择期间，录音可能已经被设备端（耳机挂断/按键）停掉了，
-        // 这里再查一次 isRecording，避免 toggle 把它当成"当前没在录"又启动一次。
-        if (controller.isRecording.value) {
-          await controller.toggleRecording();
-        }
+  Future<void> _handlePop() async {
+    if (_popHandling) return;
+    _popHandling = true;
+    final String tag = _tag;
+    try {
+      final c = _controllerOrNull;
+      if (c == null || !c.isRecording.value) {
         Get.back();
-        _deleteControllerAfterPop();
-        return;
-      case _RecordingExitAction.continueInBackground:
-        final route = Get.currentRoute;
-        final arguments = Get.arguments as Map<String, dynamic>?;
-        Get.back();
-        unawaited(BackgroundSessionNotifier.show(
-          id: CallRecordingController.notificationIdFor(_tag),
-          title: controller.pageTitle.tr,
-          body: 'backgroundRecordingIndicatorBody'.tr,
-          route: route,
-          arguments: arguments,
-        ));
-        return;
-      case _RecordingExitAction.cancel:
-      case null:
+        _deleteControllerAfterPop(tag);
         return;
+      }
+
+      final action = await _showExitConfirmDialog();
+      switch (action) {
+        case _RecordingExitAction.endAndSave:
+          // ⚠️ **先关页面，再收尾**，顺序不能反。
+          // 停止录音这一路是 `停设备指令 → 关文件 → 归档`，归档要发
+          // `echomeet_addrecord`（Dio 30s connect + 30s receive 超时）。
+          // 通话中数据网络本来就可能不通，原先 `await toggleRecording()`
+          // 之后才 Get.back()，这一分钟里页面纹丝不动、点什么都没反应——
+          // 表现就是"进了通话录音界面出不来"。
+          // 落盘与归档由全局服务（BesCallRecordingService / HolderRecordingService）
+          // 或 controller 自己持有的通路完成，跟页面在不在没有关系。
+          Get.back();
+          final Future<void> stopping = c.isRecording.value
+              ? c.toggleRecording()
+              : Future<void>.value();
+          unawaited(stopping.catchError((Object e) {
+            Logger.error('$_logTag 结束录音失败: $e');
+          }).whenComplete(() => _deleteControllerAfterPop(tag)));
+          return;
+        case _RecordingExitAction.continueInBackground:
+          Get.back();
+          unawaited(BackgroundSessionNotifier.show(
+            id: CallRecordingController.notificationIdFor(tag),
+            title: c.pageTitle.tr,
+            body: 'backgroundRecordingIndicatorBody'.tr,
+            route: _route,
+            arguments: _args,
+          ));
+          return;
+        case _RecordingExitAction.cancel:
+        case null:
+          return;
+      }
+    } catch (e, st) {
+      // PopScope(canPop: false) 之下，这个回调是本页唯一的出口：
+      // 一旦这里抛异常，返回键就变成永久空操作，用户真的出不去了。
+      // 所以兜底直接放行，宁可少弹一次确认框。
+      Logger.error('$_logTag 处理返回失败，直接退出: $e\n$st');
+      Get.back();
+      _deleteControllerAfterPop(tag);
+    } finally {
+      _popHandling = false;
     }
   }
 
   @override
   Widget build(BuildContext context) {
-    // 用户从后台通知或其它页面点回来了，之前挂着的"还在后台录音"提示可以撤了。
-    unawaited(
-      BackgroundSessionNotifier.cancel(
-        CallRecordingController.notificationIdFor(_tag),
-      ),
-    );
     final isDarkMode = Theme.of(context).brightness == Brightness.dark;
     final Color bg = isDarkMode ? Colors.black : AppPalette.brand50;
     return PopScope(
       canPop: false,
       onPopInvokedWithResult: (didPop, result) async {
         if (didPop) return;
-        await _handlePop(isDarkMode);
+        await _handlePop();
       },
       child: Scaffold(
         backgroundColor: bg,
         appBar: AppBar(
           backgroundColor: bg,
           elevation: 0,
+          // 显式走 maybePop，交给上面的 PopScope 统一判断，
+          // 不直接 Get.back()，否则录音中点返回箭头会绕过确认弹窗。
+          leading: BackButton(onPressed: () => Navigator.of(context).maybePop()),
           title: Text(controller.pageTitle.tr),
         ),
         body: Column(
diff --git a/apps/client/lib/modules/devices/views/bes_scan_view.dart b/apps/client/lib/modules/devices/views/bes_scan_view.dart
index 10466b39..821ce61e 100644
--- a/apps/client/lib/modules/devices/views/bes_scan_view.dart
+++ b/apps/client/lib/modules/devices/views/bes_scan_view.dart
@@ -32,9 +32,21 @@ class BesScanView extends StatefulWidget {
 }
 
 class _BesScanViewState extends State<BesScanView> {
-  /// 目前恒玄这条链路只对接 DEEPVOICE 耳机，其它已配对的经典蓝牙设备
+  /// 展示用的设备名（提示文案、连接成功 snackbar 的兜底）。当前固件的广播名。
+  ///
+  /// ⚠️ 大小写按设备端实际广播的写；**匹配**不要直接拿它比，走
+  /// [_acceptedNames]（[_findTargets] 里统一转大写）——上一版常量恰好是全大写的
+  /// `DEEPVOICE`，跟大写后的设备名比才碰巧成立，改成混合大小写就会全部匹配不到。
+  static const String _targetName = 'Echo-one';
+
+  /// 认哪些广播名。恒玄这条链路只对接自家耳机，其它已配对的经典蓝牙设备
   /// （车机、音箱、别家耳机）都不该出现在这个页面里，直接按名字写死过滤。
-  static const String _targetName = 'DEEPVOICE';
+  ///
+  /// 之所以是列表而不是单个值：设备端 2026-08-31 把广播名从 `DEEPVOICE` 改成
+  /// `Echo-one`，但 Android 的 `getBondedDevices` 给的是**系统缓存的配对名**，
+  /// 改名前配过对的手机在重新配对之前仍然报旧名，只认新名会让这些机器扫不到。
+  /// 旧名可在存量设备全部换代后删除。
+  static const List<String> _acceptedNames = ['Echo-one', 'DEEPVOICE'];
 
   late final BesBluetoothService _service;
   final RxList<Map<String, dynamic>> _devices = <Map<String, dynamic>>[].obs;
@@ -49,8 +61,15 @@ class _BesScanViewState extends State<BesScanView> {
         : Get.put(BesBluetoothService());
     // 主动连接失败后耳机才连上手机的场景：原生靠 ACL 广播自动补 RFCOMM，
     // 状态一旦变成「已连接」，这页也要把绑定存下来并跳回设备页。
+    //
+    // ⚠️ `_connecting` 期间不能开火：_connect 正在按候选列表逐个试，
+    // 第一个候选一连上就 _finish() 会把用户点的那台挤掉（存盘存成先连上的
+    // 那一台并直接跳走）。候选循环自己会收尾——
+    //   · 回连发生在循环期间 → _waitConnected 看到 2 就 break，由 _connect 走 _finish；
+    //   · 回连发生在循环之后 → finally 已把 _connecting 置回 false，这里照常开火。
+    // 两条路都有人收尾，不存在空档。
     _statusWorker = ever<int>(_service.deviceStatus, (v) {
-      if (v == 2 && mounted && !_finished) _finish();
+      if (v == 2 && mounted && !_finished && !_connecting) _finish();
     });
     WidgetsBinding.instance.addPostFrameCallback((_) => _load());
   }
@@ -86,12 +105,9 @@ class _BesScanViewState extends State<BesScanView> {
     _loading.value = true;
     try {
       await _service.initialize();
-      // 进页面时就已经连上了（冷启动自动回连 / 上个页面连过），
-      // 不用再让用户点一次，直接按连接成功处理
-      if (_service.deviceStatus.value == 2) {
-        if (!_finished) await _finish();
-        return;
-      }
+      // ⚠️ 进页面时已经连上（冷启动自动回连 / 上个页面连过）**不再直接跳回主页**。
+      // 这页要展示已配对的耳机并把「当前连着的那台」高亮出来，直接跳走的话
+      // 用户根本看不到这个区分。想回主页点那一行即可（走 _finish）。
       final target = await _findTargets();
       _devices.assignAll(target);
       // 只有一台目标耳机时不用再让用户点一次，直接连。
@@ -122,7 +138,7 @@ class _BesScanViewState extends State<BesScanView> {
       final list = await _service.getBondedDevices();
       final target = list.where((d) {
         final n = (d['name'] as String? ?? '').toUpperCase();
-        return n.contains(_targetName);
+        return _acceptedNames.any((t) => n.contains(t.toUpperCase()));
       }).toList();
       if (target.isNotEmpty || i == attempts - 1) return target;
       await Future.delayed(const Duration(milliseconds: 300));
@@ -153,19 +169,30 @@ class _BesScanViewState extends State<BesScanView> {
     }
     setState(() => _connecting = true);
     try {
-      // Android 上耳机是 TWS 双地址：系统配对列表给的地址不一定是能跑 SPP 的那个
-      // （实测配对列表是 …C1:C4，SPP 实际走 …BE:F8）。iOS 上 address 是 CBPeripheral
-      // UUID，不存在双地址问题，但多试一个也不会有副作用。所以统一按
-      // 「原生当前已连接的 → 上次连成功过的 → 列表里的」依次试。
-      final candidates = <String>[];
-      try {
-        final live = await _service.currentConnectedDevice();
-        final liveId = live?['address'] ?? '';
-        if (liveId.isNotEmpty) candidates.add(liveId);
-      } catch (_) {}
-      final last = _service.lastDeviceAddress;
-      if (last.isNotEmpty && !candidates.contains(last)) candidates.add(last);
-      if (!candidates.contains(id)) candidates.add(id);
+      // 候选 = 用户点的那台（永远第一）+ 列表里的同名设备。
+      //
+      // 身份由连上之后的 MAC 校验来定（见 BesDeviceAuth 与 _listen 的回填），
+      // 不由拨哪个地址来定。所以连接阶段只要「拨通一条链路」即可，
+      // 不需要在地址层面追求精确——同名的另一行既可能是同一只耳机的另一个
+      // BR/EDR 地址（Android TWS 双地址：实测配对列表是 …C1:C4，SPP 走 …BE:F8），
+      // 也可能是另一台同款耳机，两种都值得试。
+      //
+      // ⚠️ **不要把 currentConnectedDevice() / lastDeviceAddress 加回来。**
+      // 插件里没有任何扫描/发现路径，地址的唯一来源是 adapter.bondedDevices；
+      // 而这两个值都只是把 App 自己拨过的地址回吐（lastDeviceId 只在 connect()
+      // 里赋值，lastDeviceAddress 来自 savePairedDevice 存的 connectedDeviceId）。
+      // 它们永远产生不了一个「新地址」，唯一的实际效果是把**上一台耳机**塞进
+      // 候选并排在用户的选择前面——换耳机时就会连上旧的那台，或者在旧耳机
+      // 不在身边时白等一轮超时。
+      final tappedName = name.trim().toUpperCase();
+      final candidates = <String>[id];
+      for (final row in _devices) {
+        final a = (row['address'] as String? ?? '');
+        final n = (row['name'] as String? ?? '').trim().toUpperCase();
+        if (a.isEmpty || n != tappedName) continue;
+        if (candidates.any((c) => c.toUpperCase() == a.toUpperCase())) continue;
+        candidates.add(a);
+      }
 
       bool ok = false;
       for (final addr in candidates) {
@@ -192,12 +219,23 @@ class _BesScanViewState extends State<BesScanView> {
     }
   }
 
-  /// 等状态流推到「已连接」，超时返回当前状态
+  /// 等状态流推到「已连接」，超时返回当前状态。
+  ///
+  /// 进过「连接中」又掉回 0 就提前判失败：原生 `connectBlocking` 失败时会
+  /// `publishBluetoothStatus(0)`，不必每个候选都干等满超时——遍历同名设备的
+  /// 总耗时会从「N × timeout」降到接近真实失败时间。
+  ///
+  /// ⚠️ 仍要保留超时兜底：原生若把这次 connect 丢弃了（见 BluetoothManager.kt
+  /// 的 isConnecting 门禁），状态会停在 connectToDevice 自己写的 1，等不到 0。
   Future<bool> _waitConnected(
       {Duration timeout = const Duration(seconds: 8)}) async {
     final end = DateTime.now().add(timeout);
+    bool sawConnecting = false;
     while (DateTime.now().isBefore(end)) {
-      if (_service.deviceStatus.value == 2) return true;
+      final s = _service.deviceStatus.value;
+      if (s == 2) return true;
+      if (s == 1) sawConnecting = true;
+      if (sawConnecting && s == 0) return false;
       await Future.delayed(const Duration(milliseconds: 300));
     }
     return _service.deviceStatus.value == 2;
@@ -232,11 +270,22 @@ class _BesScanViewState extends State<BesScanView> {
                 return const Center(child: CircularProgressIndicator());
               }
               if (_devices.isEmpty) return _empty(isDark);
+              // ⚠️ 连接态必须在**这里**读出来再传下去：ListView 的 itemBuilder 是
+              // 延迟调用的，在 _tile 里读 Rx 不会被这个 Obx 收集到，
+              // 耳机连上/断开时列表不会重绘。
+              final live = _service.deviceStatus.value == 2;
+              final connId = _service.connectedDeviceId.value;
+              final connName = _service.connectedDeviceName.value;
               return ListView.separated(
                 padding: EdgeInsets.fromLTRB(16.w, 16.h, 16.w, 24.h),
                 itemCount: _devices.length,
                 separatorBuilder: (_, __) => SizedBox(height: 12.h),
-                itemBuilder: (context, i) => _tile(_devices[i], isDark),
+                itemBuilder: (context, i) => _tile(
+                  _devices[i],
+                  isDark,
+                  connected:
+                      live && _isLiveDevice(_devices[i], connId, connName),
+                ),
               );
             }),
     );
@@ -271,22 +320,52 @@ class _BesScanViewState extends State<BesScanView> {
     );
   }
 
-  Widget _tile(Map<String, dynamic> d, bool isDark) {
+  /// 这一行是不是当前正连着的那台。
+  ///
+  /// ⚠️ 不能只比地址：Android 上耳机是 TWS 双地址，系统配对列表给的地址不一定
+  /// 是真正跑 SPP 的那个（实测配对列表是 …C1:C4，SPP 走 …BE:F8）。只比地址会让
+  /// 明明连着的那台显示成「未连接」。地址对不上时退回比设备名——本项目一次只
+  /// 连一台耳机，重名的风险可以忽略。
+  bool _isLiveDevice(
+      Map<String, dynamic> d, String connId, String connName) {
+    final addr = (d['address'] as String? ?? '').toUpperCase();
+    if (addr.isNotEmpty && addr == connId.toUpperCase()) return true;
+    final n = (d['name'] as String? ?? '').trim().toUpperCase();
+    final cn = connName.trim().toUpperCase();
+    return n.isNotEmpty && n == cn;
+  }
+
+  /// 一行设备。[connected] 决定这一行是高亮态还是置灰态。
+  ///
+  /// 置灰的是「配过对但此刻没连上」的存量设备——它们仍然可点（点了就去连），
+  /// 只是视觉权重压下去，让用户一眼看出哪台是活的。
+  Widget _tile(Map<String, dynamic> d, bool isDark, {bool connected = false}) {
     final name = (d['name'] ?? 'bleUnknownDevice'.tr) as String;
     final addr = (d['address'] ?? '') as String;
+
+    const Color accent = AppPalette.accent;
+    final Color idle = AppPalette.textHint(isDark);
+
     return GestureDetector(
       behavior: HitTestBehavior.opaque,
-      onTap: () => _connect(d),
+      // 已经连着的那台点了就是「用这台」——存盘并回主页，跟连接成功后同一条路径
+      onTap: () => connected ? _finish() : _connect(d),
       child: Container(
         padding: EdgeInsets.all(14.w),
         decoration: BoxDecoration(
-          color: AppPalette.surface(isDark),
+          color: connected
+              ? accent.withValues(alpha: isDark ? 0.16 : 0.08)
+              : AppPalette.surface(isDark),
           borderRadius: BorderRadius.circular(14.r),
-          border: Border.all(color: AppPalette.border(isDark)),
+          border: Border.all(
+            color: connected ? accent : AppPalette.border(isDark),
+            width: connected ? 1.5 : 1,
+          ),
         ),
         child: Row(
           children: [
-            Icon(Icons.headphones, size: 26.sp, color: AppPalette.accent),
+            Icon(Icons.headphones,
+                size: 26.sp, color: connected ? accent : idle),
             SizedBox(width: 12.w),
             Expanded(
               child: Column(
@@ -295,21 +374,26 @@ class _BesScanViewState extends State<BesScanView> {
                   Text(name,
                       style: TextStyle(
                           fontSize: 15.sp,
-                          fontWeight: FontWeight.w600,
-                          color: AppPalette.textPrimary(isDark))),
+                          fontWeight:
+                              connected ? FontWeight.w700 : FontWeight.w500,
+                          color: connected
+                              ? AppPalette.textPrimary(isDark)
+                              : AppPalette.textSecondary(isDark))),
                   SizedBox(height: 2.h),
                   Text(addr,
-                      style: TextStyle(
-                          fontSize: 11.sp,
-                          color: AppPalette.textHint(isDark))),
+                      style: TextStyle(fontSize: 11.sp, color: idle)),
                 ],
               ),
             ),
-            Text('连接',
+            if (connected) ...[
+              Icon(Icons.check_circle, size: 16.sp, color: accent),
+              SizedBox(width: 4.w),
+            ],
+            Text(connected ? 'connected'.tr : 'connect'.tr,
                 style: TextStyle(
                     fontSize: 13.sp,
                     fontWeight: FontWeight.w600,
-                    color: AppPalette.accent)),
+                    color: connected ? accent : idle)),
           ],
         ),
       ),
diff --git a/apps/client/lib/modules/home/controllers/home_controller.dart b/apps/client/lib/modules/home/controllers/home_controller.dart
index 88969480..f1228b33 100644
--- a/apps/client/lib/modules/home/controllers/home_controller.dart
+++ b/apps/client/lib/modules/home/controllers/home_controller.dart
@@ -85,6 +85,17 @@ class HomeController extends GetxController {
 
   final noviceGuideService = Get.find<NoviceGuideService>();
 
+  /// 按设备名安全地查产品（AppConfig.getproduct 会抛，见调用处注释）。
+  DBProduct? _findProductByName(String deviceName) {
+    if (!AppConfig.isInitialized()) return null;
+    final n = deviceName.trim();
+    if (n.isEmpty) return null;
+    for (final p in AppConfig.config.products) {
+      if (p.devicename.contains(n)) return p;
+    }
+    return null;
+  }
+
   @override
   void onInit() {
     super.onInit();
@@ -171,7 +182,11 @@ class HomeController extends GetxController {
     try {
       if (!_storage.hasData('agent_tts_interrupt')) {
         final deviceName = getDeviceName();
-        final DBProduct? product = AppConfig.getproduct(deviceName);
+        // 这里用本地的 _findProductByName 而不是 AppConfig.getproduct()：
+        // 后者只做「产品名包含设备名」单向匹配，本地这份是双向包含 + 兜底，
+        // 设备名与产品名不完全一致时才匹配得上。
+        // （getproduct 本身已经不会抛了，2026-09-03 起查不到返回 null。）
+        final DBProduct? product = _findProductByName(deviceName);
         if (deviceName.isNotEmpty && product != null) {
           isTtsInterruptEnabled.value = !(product.iscontinuouschat ?? true);
         } else {
diff --git a/apps/client/lib/modules/login/views/login_view.dart b/apps/client/lib/modules/login/views/login_view.dart
index 9b5d8bcc..fcb27e8e 100644
--- a/apps/client/lib/modules/login/views/login_view.dart
+++ b/apps/client/lib/modules/login/views/login_view.dart
@@ -68,15 +68,15 @@ class LoginView extends GetView<LoginController> {
   Widget _buildAppLogo(bool isDarkMode) {
     return Column(
       children: [
+        // 登录页 logo：用 App 自己的图标，替掉原来的「蓝紫渐变 + 耳机 glyph」。
+        // 与启动页、关于应用、固件页共用 assets/images/app_icon.png：
+        // 那是张不带圆角的正方形（iOS AppIcon 1024 缩到 512），
+        // 圆角靠 ClipRRect 切；渐变底去掉，因为图标自带深色不透明底，
+        // 叠上去只会在圆角处露出一圈脏边。
         Container(
           width: 80.w,
           height: 80.w,
           decoration: BoxDecoration(
-            gradient: const LinearGradient(
-              begin: Alignment.topLeft,
-              end: Alignment.bottomRight,
-              colors: [Color(0xFF0066CC), Color(0xFF5E5CE6)],
-            ),
             borderRadius: BorderRadius.circular(24.r),
             boxShadow: [
               BoxShadow(
@@ -86,10 +86,14 @@ class LoginView extends GetView<LoginController> {
               ),
             ],
           ),
-          child: Icon(
-            Icons.headset,
-            size: 40.sp,
-            color: Colors.white,
+          child: ClipRRect(
+            borderRadius: BorderRadius.circular(24.r),
+            child: Image.asset(
+              'assets/images/app_icon.png',
+              width: 80.w,
+              height: 80.w,
+              fit: BoxFit.cover,
+            ),
           ),
         ),
         SizedBox(height: 16.h),
diff --git a/apps/client/lib/modules/main_tab/views/tabs/device_tab.dart b/apps/client/lib/modules/main_tab/views/tabs/device_tab.dart
index 9c0bdf74..6cf76138 100644
--- a/apps/client/lib/modules/main_tab/views/tabs/device_tab.dart
+++ b/apps/client/lib/modules/main_tab/views/tabs/device_tab.dart
@@ -24,6 +24,13 @@ class DeviceTab extends StatelessWidget {
   /// 设备图片区高度：不论连没连上都占住，避免连接前后布局跳动
   static const double _imageAreaHeight = 300;
 
+  /// 底部信息（左下 MAC / 右下电量）的专属高度。
+  ///
+  /// 这两块原先都贴在 `bottom: 0`，与居中的耳机主图压在一起、挡住图片下沿。
+  /// 这里把它们下移到图片区之外：图片仍在上方 [_imageAreaHeight] 内居中
+  /// （位置和大小都不变），整块区域高度加上这一段。
+  static const double _bottomInfoInset = 28;
+
   @override
   Widget build(BuildContext context) {
     final bool isDarkMode = Theme.of(context).brightness == Brightness.dark;
@@ -125,13 +132,20 @@ class DeviceTab extends StatelessWidget {
     HomeController controller,
   ) {
     return SizedBox(
-      height: _imageAreaHeight.h,
+      height: (_imageAreaHeight + _bottomInfoInset).h,
       child: Stack(
         children: [
-          Positioned.fill(
-              child: Center(
-                  child: _buildImage(
-                      isDarkMode, connected, holderOn, besOn, controller))),
+          // 图片只占上方 _imageAreaHeight，底部那段留给 MAC / 电量，
+          // 免得信息压在耳机主图上
+          Positioned(
+            left: 0,
+            right: 0,
+            top: 0,
+            bottom: _bottomInfoInset.h,
+            child: Center(
+                child: _buildImage(
+                    isDarkMode, connected, holderOn, besOn, controller)),
+          ),
           // 右上：连接状态
           Positioned(
             right: 0,
@@ -260,9 +274,15 @@ class DeviceTab extends StatelessWidget {
       mainAxisSize: MainAxisSize.min,
       children: [
         _infoLine(Icons.memory, mac, textColor),
-        SizedBox(height: 3.h),
-        _infoLine(Icons.vpn_key_outlined,
-            license.isEmpty ? 'licenseUnknown'.tr : license, textColor),
+        // ⚠️ 没有授权码就整行不显示，**不要**退回显示「授权码未知」。
+        // 经典蓝牙耳机（恒玄）这条链路压根没有授权码：绑定时 code 传空，
+        // 服务端是按 MAC 去 license 表反查的（api_binddevice.go），
+        // 所以 DBUserDivice.License 恒为空串。显示「未知」会让人以为
+        // 「本该有、只是没读到」，跑去查一个根本不存在的东西。
+        if (license.isNotEmpty) ...[
+          SizedBox(height: 3.h),
+          _infoLine(Icons.vpn_key_outlined, license, textColor),
+        ],
       ],
     );
   }
@@ -303,44 +323,74 @@ class DeviceTab extends StatelessWidget {
       bool besOn, HomeController controller) {
     if (!connected) return const SizedBox.shrink();
     return Obx(() {
-      // 恒玄耳机：SPP 链路暂时没有电量上报，只展示 MAC
+      // 恒玄耳机：电量随 `BB 0A` 状态帧上报（左/右/仓分开，带充电位）
       if (besOn) {
         final Color c =
             isDarkMode ? Colors.white70 : const Color(0xFF444444);
-        final mac = BesBluetoothService.to.connectedDeviceId.value;
-        final ver = BesBluetoothService.to.deviceVersion.value;
-        final battery = BesBluetoothService.to.batteryLevel.value;
-        if (mac.isEmpty && ver.isEmpty && battery < 0) {
+        final bes = BesBluetoothService.to;
+        // ⚠️ 别直接用 connectedDeviceId：那在 iOS 上是 CoreBluetooth 的
+        // peripheral UUID（每台 iPhone 都不一样），显示出来根本不是 MAC。
+        // 耳机在 `BB 0A` 属性 7 里自报的地址两端一致，优先用它；
+        // 它要等一帧状态回包才有值，那之前先拿 connectedDeviceId 顶着
+        // （Android 上本来就等于最终值，iOS 上会在收到帧后自动刷成真 MAC）。
+        final reported = bes.deviceMac.value;
+        final mac = reported.isNotEmpty ? reported : bes.connectedDeviceId.value;
+        final battery = bes.batteryLevel.value;
+        final left = bes.batteryLeft.value;
+        final right = bes.batteryRight.value;
+        final box = bes.batteryCase.value;
+        if (mac.isEmpty && battery < 0) {
           return const SizedBox.shrink();
         }
-        // 耳机主图是实拍照片，直接把文字压在上面看不清，加一层半透明底
-        return Container(
-          padding: EdgeInsets.symmetric(horizontal: 8.w, vertical: 5.h),
-          decoration: BoxDecoration(
-            color: (isDarkMode ? Colors.black : Colors.white).withOpacity(0.72),
-            borderRadius: BorderRadius.circular(8.r),
-          ),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.end,
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              if (mac.isNotEmpty) _infoLine(Icons.memory, mac, c),
-              // 版本号旁边跟电量；电量没拿到就不占位
-              if (ver.isNotEmpty || battery >= 0) ...[
-                SizedBox(height: 4.h),
-                Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    if (ver.isNotEmpty)
-                      _infoLine(Icons.memory_outlined, 'v$ver', c),
-                    if (ver.isNotEmpty && battery >= 0) SizedBox(width: 8.w),
-                    if (battery >= 0)
-                      BatteryIndicator(level: battery, isDarkMode: isDarkMode),
-                  ],
-                ),
-              ],
+        // 固件版本不在这里显示——固件升级页（Routes.OTA_UPGRADE）已经有了。
+        // 也不套半透明底：直接压在耳机主图上。
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.end,
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            if (mac.isNotEmpty) _infoLine(Icons.memory, mac, c),
+            // 电量一行排开，顺序固定 C → L → R。
+            // 每个都可能缺：盒电量只在耳机入盒时上报（属性 3 是可选的），
+            // 左右耳只有单侧数据时退化成一个不带标的电池。
+            if (box >= 0 || left >= 0 || right >= 0 || battery >= 0) ...[
+              SizedBox(height: 4.h),
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                // 用 spacing 而不是手动插 SizedBox：只有 C 一个电池时，
+                // 尾随的间距会把它整体推离右边缘。
+                spacing: 8.w,
+                children: [
+                  if (box >= 0)
+                    BatteryIndicator(
+                      level: box,
+                      label: 'C',
+                      isDarkMode: isDarkMode,
+                      charging: bes.chargingCase.value,
+                    ),
+                  if (left >= 0 && right >= 0) ...[
+                    BatteryIndicator(
+                      level: left,
+                      label: 'L',
+                      isDarkMode: isDarkMode,
+                      charging: bes.chargingLeft.value,
+                    ),
+                    BatteryIndicator(
+                      level: right,
+                      label: 'R',
+                      isDarkMode: isDarkMode,
+                      charging: bes.chargingRight.value,
+                    ),
+                  ] else if (battery >= 0)
+                    BatteryIndicator(
+                      level: battery,
+                      isDarkMode: isDarkMode,
+                      charging:
+                          bes.chargingLeft.value || bes.chargingRight.value,
+                    ),
+                ],
+              ),
             ],
-          ),
+          ],
         );
       }
       // 蓝讯支架是单电池设备，直接用 SDK 上报的电量
diff --git a/apps/client/lib/modules/main_tab/views/widgets/module_card.dart b/apps/client/lib/modules/main_tab/views/widgets/module_card.dart
index 89cb01b4..522febfa 100644
--- a/apps/client/lib/modules/main_tab/views/widgets/module_card.dart
+++ b/apps/client/lib/modules/main_tab/views/widgets/module_card.dart
@@ -101,17 +101,24 @@ class ModuleCard extends StatelessWidget {
                             ),
                           ),
                         ),
-                        // 未实名时直接在卡片上说明，别让用户点了才知道
-                        if (IdVerifyGuard.required) ...[
-                          SizedBox(width: 6.w),
-                          _tag('idVerifyNotDone'.tr, AppPalette.brand400),
-                        ] else if (module.comingSoon) ...[
-                          SizedBox(width: 6.w),
-                          _tag('comingSoonTag'.tr, AppPalette.brand400),
-                        ] else if (module.requiresDevice) ...[
-                          SizedBox(width: 6.w),
-                          _tag('needDeviceTag'.tr, AppPalette.warning),
-                        ],
+                        // 未实名时直接在卡片上说明，别让用户点了才知道。
+                        // 走 IdVerifyGuard.builder（内部是 Obx）：认证通过的那一刻
+                        // 角标就得消失，写成 `if (IdVerifyGuard.required)` 不会重建。
+                        IdVerifyGuard.builder((needVerify) {
+                          if (needVerify) {
+                            return _gap(
+                                _tag('idVerifyNotDone'.tr, AppPalette.brand400));
+                          }
+                          if (module.comingSoon) {
+                            return _gap(
+                                _tag('comingSoonTag'.tr, AppPalette.brand400));
+                          }
+                          if (module.requiresDevice) {
+                            return _gap(
+                                _tag('needDeviceTag'.tr, AppPalette.warning));
+                          }
+                          return const SizedBox.shrink();
+                        }),
                       ],
                     ),
                     if (showSubtitle && module.subtitle != null) ...[
@@ -137,6 +144,11 @@ class ModuleCard extends StatelessWidget {
     );
   }
 
+  /// 角标左侧的间距。原先是 children 里的 SizedBox，改成 Obx 之后整块只能返回
+  /// 一个 widget，间距只好跟着一起包进来。
+  Widget _gap(Widget child) =>
+      Padding(padding: EdgeInsets.only(left: 6.w), child: child);
+
   Widget _tag(String text, Color color) {
     return Container(
       padding: EdgeInsets.symmetric(horizontal: 6.w, vertical: 2.h),
@@ -241,23 +253,27 @@ class ModuleSquareCard extends StatelessWidget {
                         style: TextStyle(fontSize: 11.sp, color: subColor),
                       ),
                     ],
-                    // 未实名：点之前就让用户知道要先认证
-                    if (IdVerifyGuard.required) ...[
-                      SizedBox(height: 6.h),
-                      Container(
-                        padding: EdgeInsets.symmetric(
-                            horizontal: 6.w, vertical: 2.h),
-                        decoration: BoxDecoration(
-                          color: AppPalette.brand400.withOpacity(0.12),
-                          borderRadius: BorderRadius.circular(4.r),
-                        ),
-                        child: Text(
-                          'idVerifyNotDone'.tr,
-                          style: TextStyle(
-                              fontSize: 9.sp, color: AppPalette.brand400),
+                    // 未实名：点之前就让用户知道要先认证。
+                    // 同上，必须走 builder(Obx) 才能在认证通过时立刻收起来。
+                    IdVerifyGuard.builder((needVerify) {
+                      if (!needVerify) return const SizedBox.shrink();
+                      return Padding(
+                        padding: EdgeInsets.only(top: 6.h),
+                        child: Container(
+                          padding: EdgeInsets.symmetric(
+                              horizontal: 6.w, vertical: 2.h),
+                          decoration: BoxDecoration(
+                            color: AppPalette.brand400.withOpacity(0.12),
+                            borderRadius: BorderRadius.circular(4.r),
+                          ),
+                          child: Text(
+                            'idVerifyNotDone'.tr,
+                            style: TextStyle(
+                                fontSize: 9.sp, color: AppPalette.brand400),
+                          ),
                         ),
-                      ),
-                    ],
+                      );
+                    }),
                   ],
                 )
               : Row(
diff --git a/apps/client/lib/modules/my_devices/controllers/my_devices_controller.dart b/apps/client/lib/modules/my_devices/controllers/my_devices_controller.dart
index 1be2baa4..3e323127 100644
--- a/apps/client/lib/modules/my_devices/controllers/my_devices_controller.dart
+++ b/apps/client/lib/modules/my_devices/controllers/my_devices_controller.dart
@@ -3,6 +3,8 @@ import 'package:get/get.dart';
 import '/core/utils/logger.dart';
 import '/data/models/user_Info.dart';
 import '/data/services/ble_manager.dart';
+import '/data/services/bes_bluetooth_service.dart';
+import '/data/services/bes_device_auth.dart';
 import '/data/services/network/api.dart';
 import '/routes/app_routes.dart';
 
@@ -35,6 +37,11 @@ class MyDevicesController extends GetxController {
     if (!User.isLoggedIn()) return;
     isLoading.value = true;
     try {
+      // 补校当前连着的恒玄耳机（顺带完成绑定登记）。
+      // 「先连耳机、后登录」是很常见的顺序，那时候连接事件里的登记会因为
+      // 未登录而跳过；不在这里补一次，这台设备就要等下次重连才会出现在列表里。
+      // 放在拉取之前，这样这次刷新就能看到它。
+      await BesDeviceAuth.verifyConnected();
       final response = await Api.getdevices();
       if (response != null) {
         final list = response['devices'] as List<dynamic>?;
@@ -63,12 +70,39 @@ class MyDevicesController extends GetxController {
       if (response == null) return;
 
       User.instance.removeUserDevice(device.id);
-      _refreshFromUser();
+      // 解绑要把这台在本地留下的痕迹一次清干净，两处缺一不可：
+      //  1. 确权白名单——不清的话下次连上会命中缓存、跳过 binddevice，
+      //     这台设备再也回不到列表里；
+      //  2. 已配对列表 + lastDevice——不清的话 tryAutoConnect 和原生 ACL 广播
+      //     还会把它自动连回来，用户「解绑了但它还连着」。
+      //     removePairedDevice 内部会顺带断开当前连接。
+      await BesDeviceAuth.forget(device.devicemac);
 
+      // 解绑的是不是当前连着的那台恒玄耳机。
+      // ⚠️ 判据不能只看 connectedDeviceId：iOS 上那是 CoreBluetooth 的
+      // peripheral UUID，跟服务端记录里的真 MAC 永远对不上。耳机自报的
+      // deviceMac 才是能把两边对应起来的值。必须在 removePairedDevice
+      // **之前**取，那之后连接已经被断开、这两个值都清空了。
+      bool besWasCurrent = false;
       if (device.devicemac.isNotEmpty &&
-          _bleManager.currentDeviceAddress == device.devicemac) {
-        Logger.i(_tag, '解绑的设备就是当前连接，断开并回到扫描页');
+          Get.isRegistered<BesBluetoothService>()) {
+        final bes = BesBluetoothService.to;
+        final String t = device.devicemac.toUpperCase();
+        besWasCurrent = bes.isConnected &&
+            (bes.connectedDeviceId.value.toUpperCase() == t ||
+                bes.deviceMac.value.toUpperCase() == t);
+        await bes.removePairedDevice(device.devicemac);
+      }
+      _refreshFromUser();
+
+      final bool jieliWasCurrent = device.devicemac.isNotEmpty &&
+          _bleManager.currentDeviceAddress == device.devicemac;
+      if (jieliWasCurrent) {
         await _bleManager.disconnect();
+      }
+      // 恒玄那条的断开已由 removePairedDevice 做完，这里只负责离开本页
+      if (jieliWasCurrent || besWasCurrent) {
+        Logger.i(_tag, '解绑的设备就是当前连接，已断开，回到主框架');
         await Future.delayed(const Duration(milliseconds: 300));
         // 本页已去掉「添加设备」入口，解绑当前设备后回主框架，
         // 让用户从设备页左上角重新走「选择设备 → 扫描」流程
@@ -93,10 +127,23 @@ class MyDevicesController extends GetxController {
     allDevices.assignAll(flat);
   }
 
+  /// 当前是不是正连着这一台。**只看本地蓝牙状态，不问服务端**——
+  /// 连接是此刻的链路状态，服务端存的是绑定关系，两回事。
+  ///
+  /// ⚠️ 原来只查了 [BleManager]（杰理链路），而本项目实际用的是恒玄耳机，
+  /// 于是这里对所有设备恒为 false，列表上永远显示"未连接"。
   bool isConnected(UserDevice device) {
     if (device.devicemac.isEmpty) return false;
+    final mac = device.devicemac.toUpperCase();
+    if (Get.isRegistered<BesBluetoothService>()) {
+      final bes = BesBluetoothService.to;
+      if (bes.isConnected &&
+          bes.connectedDeviceId.value.toUpperCase() == mac) {
+        return true;
+      }
+    }
     return _bleManager.isConnected &&
-        _bleManager.currentDeviceAddress == device.devicemac;
+        _bleManager.currentDeviceAddress?.toUpperCase() == mac;
   }
 
   void goToScan() {
diff --git a/apps/client/lib/modules/my_devices/views/my_devices_view.dart b/apps/client/lib/modules/my_devices/views/my_devices_view.dart
index 6b29c849..df49d192 100644
--- a/apps/client/lib/modules/my_devices/views/my_devices_view.dart
+++ b/apps/client/lib/modules/my_devices/views/my_devices_view.dart
@@ -3,6 +3,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
 import '/data/models/user_Info.dart';
+import '../../../routes/app_routes.dart';
 import '../controllers/my_devices_controller.dart';
 
 enum _MyDeviceCategory {
@@ -65,13 +66,48 @@ class MyDevicesView extends GetView<MyDevicesController> {
       body: Column(
         children: [
           _buildTopArea(context, isDark, bg),
-          // 只列已绑定设备（服务端拉取）+ 解绑；添加设备统一走设备页左上角入口
+          // 只列已绑定设备（服务端拉取）+ 解绑
           Expanded(child: _buildDevicesList(isDark, topBg)),
+          _buildAddDeviceButton(context, isDark),
         ],
       ),
     );
   }
 
+  /// 底部「添加设备」：与设备页左上角那个入口同一个去处（`Routes.deviceCategory`）。
+  /// 加在这里是因为列表为空时用户在本页无路可走，得退回上一级才能找到入口。
+  Widget _buildAddDeviceButton(BuildContext context, bool isDark) {
+    return Padding(
+      padding: EdgeInsets.fromLTRB(
+        20.w,
+        8.h,
+        20.w,
+        // 手势条/虚拟键区域会盖住按钮，底部安全区要单独加进来
+        MediaQuery.of(context).padding.bottom + 16.h,
+      ),
+      child: SizedBox(
+        width: double.infinity,
+        height: 50.h,
+        child: ElevatedButton.icon(
+          onPressed: () => Get.toNamed(Routes.deviceCategory),
+          icon: Icon(Icons.add, size: 20.sp),
+          label: Text(
+            'addDevice'.tr,
+            style: TextStyle(fontSize: 16.sp, fontWeight: FontWeight.w600),
+          ),
+          style: ElevatedButton.styleFrom(
+            backgroundColor: const Color(0xFF6366F1), // 与本页卡片选中态同色
+            foregroundColor: Colors.white,
+            elevation: 0,
+            shape: RoundedRectangleBorder(
+              borderRadius: BorderRadius.circular(14.r),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
   Widget _buildTopArea(BuildContext context, bool isDark, Color bg) {
     return Container(
       padding: EdgeInsets.only(
@@ -435,7 +471,7 @@ class MyDevicesView extends GetView<MyDevicesController> {
               ),
             ],
           ),
-          if (device.license.isNotEmpty || device.cmei.isNotEmpty) ...[
+          if (_hasRealLicense(device) || device.cmei.isNotEmpty) ...[
             SizedBox(height: 14.h),
             Container(
               padding: EdgeInsets.all(12.w),
@@ -447,12 +483,12 @@ class MyDevicesView extends GetView<MyDevicesController> {
               ),
               child: Column(
                 children: [
-                  if (device.license.isNotEmpty)
+                  if (_hasRealLicense(device))
                     _buildFieldRow(
                         label: 'licenseCode'.tr,
                         value: device.license,
                         isDark: isDark),
-                  if (device.license.isNotEmpty && device.cmei.isNotEmpty)
+                  if (_hasRealLicense(device) && device.cmei.isNotEmpty)
                     SizedBox(height: 8.h),
                   if (device.cmei.isNotEmpty)
                     _buildFieldRow(
@@ -466,6 +502,20 @@ class MyDevicesView extends GetView<MyDevicesController> {
     );
   }
 
+  /// 这台设备有没有「值得展示」的授权码。
+  ///
+  /// ⚠️ 光判非空不够：服务端绑定时写的是**从 license 表查到的** code
+  /// （api_binddevice.go 的 `License: model.Code`，不是客户端传的空串），
+  /// 而后台「导入 MAC」模式建的授权码，code 就是 MAC 串本身。
+  /// 于是界面上会出现 MAC 一行、授权码一行、两行值一模一样——看着像 bug。
+  /// 这种占位值不展示；真授权码（如 71E5E5C3A797C043B5A7）照常展示。
+  bool _hasRealLicense(UserDevice device) {
+    final lic = device.license.trim();
+    if (lic.isEmpty) return false;
+    String norm(String v) => v.replaceAll(':', '').replaceAll('-', '').toUpperCase();
+    return norm(lic) != norm(device.devicemac);
+  }
+
   Widget _buildFieldRow({
     required String label,
     required String value,
diff --git a/apps/client/lib/modules/ota_upgrade/bindings/ota_upgrade_binding.dart b/apps/client/lib/modules/ota_upgrade/bindings/ota_upgrade_binding.dart
index f9714601..eabd8a5f 100644
--- a/apps/client/lib/modules/ota_upgrade/bindings/ota_upgrade_binding.dart
+++ b/apps/client/lib/modules/ota_upgrade/bindings/ota_upgrade_binding.dart
@@ -1,9 +1,11 @@
 import 'package:get/get.dart';
-import '../controllers/ota_upgrade_controller.dart';
+import '../controllers/bes_ota_upgrade_controller.dart';
 
 class OtaUpgradeBinding extends Bindings {
   @override
   void dependencies() {
-    Get.lazyPut<OtaUpgradeController>(() => OtaUpgradeController());
+    // 本项目只有恒玄耳机，固件升级走 BES 链路。杰理那版 OtaUpgradeController
+    // 依赖 BleManager/Jielihome，已不再由路由装配。
+    Get.lazyPut<BesOtaUpgradeController>(() => BesOtaUpgradeController());
   }
 }
diff --git a/apps/client/lib/modules/ota_upgrade/controllers/bes_ota_download_service.dart b/apps/client/lib/modules/ota_upgrade/controllers/bes_ota_download_service.dart
new file mode 100644
index 00000000..48ff5ead
--- /dev/null
+++ b/apps/client/lib/modules/ota_upgrade/controllers/bes_ota_download_service.dart
@@ -0,0 +1,153 @@
+import 'dart:io';
+
+import 'package:dio/dio.dart';
+import 'package:dio/io.dart';
+import 'package:path/path.dart' as p;
+import 'package:get/get.dart';
+import 'package:path_provider/path_provider.dart';
+
+import '../../../core/utils/logger.dart';
+
+/// 恒玄(BES) OTA 固件下载服务
+///
+/// 用 Dio 把固件包下载到应用支持目录，提供进度/状态回调，并做"同名复用 + 清旧文件"。
+class BesOtaDownloadService {
+  static const _tag = 'BesOtaDownloadService';
+  static const _dirName = 'ota_upgrades';
+
+  /// 接收空闲超时：超过该时长未收到任何字节即判定断流并抛错（非总时长，
+  /// 持续下载不受影响）。兜底"服务器握手后不发数据"导致永久挂起。
+  static const Duration _receiveTimeout = Duration(seconds: 60);
+
+  /// 允许跳过 TLS 证书校验的主机：运行时设为"当前固件下载地址的主机"。
+  /// 固件地址由后端产品配置下发，换 CDN（如腾讯云→阿里云）只需后端改地址、
+  /// app 无需改代码发版；且仅对后端指定的这一个下载源放行，不放宽其它请求。
+  /// 为空时（默认）所有 https 都走系统正常证书校验。
+  String? _allowedInsecureHost;
+
+  late final Dio _dio;
+
+  BesOtaDownloadService() {
+    _dio = Dio(
+      BaseOptions(
+        connectTimeout: const Duration(seconds: 30),
+        receiveTimeout: _receiveTimeout,
+        sendTimeout: const Duration(seconds: 30),
+        headers: {'Accept-Encoding': 'gzip'},
+      ),
+    );
+
+    (_dio.httpClientAdapter as IOHttpClientAdapter).createHttpClient = () {
+      final client = HttpClient();
+      client.badCertificateCallback = (cert, host, port) {
+        final allowed =
+            _allowedInsecureHost != null && host == _allowedInsecureHost;
+        if (allowed) {
+          Logger.w(_tag, 'SSL 证书校验跳过(固件下载主机): $host:$port');
+        }
+        return allowed; // 仅当前固件下载主机放行，其它一律正常校验
+      };
+      return client;
+    };
+  }
+
+  /// 下载固件包。
+  ///
+  /// - [downloadUrl] 固件下载地址。
+  /// - [onProgress] 下载进度回调（0.0~1.0）。
+  /// - [onStatusUpdate] 文本状态回调。
+  ///
+  /// 返回下载文件的本地绝对路径；下载失败抛异常。
+  Future<String> downloadFirmware({
+    required String downloadUrl,
+    required void Function(double) onProgress,
+    required void Function(String) onStatusUpdate,
+    CancelToken? cancelToken,
+  }) async {
+    onStatusUpdate('otaDownloadPreparing'.tr);
+
+    // 仅对本次固件下载地址的主机放行证书校验（地址来自后端，换 CDN 自动适配）。
+    _allowedInsecureHost = Uri.tryParse(downloadUrl)?.host;
+
+    final fileName = _fileNameFromUrl(downloadUrl);
+    final supportDir = await getApplicationSupportDirectory();
+    final targetDir = Directory(p.join(supportDir.path, _dirName));
+    if (!await targetDir.exists()) {
+      await targetDir.create(recursive: true);
+    }
+
+    final savePath = p.join(targetDir.path, fileName);
+    final tmpPath = '$savePath.part';
+
+    // 正式文件存在 = 上次已完整下载并 rename（原子化保证），可安全复用。
+    if (await File(savePath).exists()) {
+      onStatusUpdate('otaFirmwareCached'.tr);
+      return savePath;
+    }
+
+    // 清理旧固件与可能残留的 .part（上次中断留下的半截文件），避免占用空间/误用。
+    await _cleanOldFiles(targetDir);
+
+    onStatusUpdate('otaDownloadStarted'.tr);
+
+    // 先下到临时 .part 文件，完整下载成功后再 rename 为正式名——
+    // 避免下载中断/被杀留下的半截文件被下次"同名复用"当成完整固件刷机。
+    final tmpFile = File(tmpPath);
+    if (await tmpFile.exists()) await tmpFile.delete();
+
+    await _dio.download(
+      downloadUrl,
+      tmpPath,
+      cancelToken: cancelToken,
+      options: Options(
+        receiveTimeout: _receiveTimeout,
+        followRedirects: true,
+        maxRedirects: 5,
+      ),
+      onReceiveProgress: (received, total) {
+        if (total > 0) {
+          final progress = received / total;
+          onProgress(progress);
+          onStatusUpdate(
+            'otaDownloadingPercent'.trParams({
+              'percent': (progress * 100).toStringAsFixed(1),
+            }),
+          );
+        }
+      },
+    );
+
+    if (!await tmpFile.exists()) {
+      throw FileSystemException('otaDownloadFailedCheckNetwork'.tr);
+    }
+    // 原子 rename：此后 savePath 存在即代表一个完整固件包。
+    await tmpFile.rename(savePath);
+
+    onStatusUpdate('otaDownloadDone'.tr);
+    return savePath;
+  }
+
+  /// 从 URL 末段取文件名；无扩展名时补 `.bin`。
+  String _fileNameFromUrl(String url) {
+    var name = url.substring(url.lastIndexOf('/') + 1);
+    // 去掉可能的查询参数。
+    final q = name.indexOf('?');
+    if (q != -1) name = name.substring(0, q);
+    if (name.isEmpty) name = 'firmware.bin';
+    if (!name.contains('.')) name = '$name.bin';
+    return name;
+  }
+
+  Future<void> _cleanOldFiles(Directory dir) async {
+    try {
+      final entries = await dir.list().toList();
+      for (final e in entries) {
+        if (await FileSystemEntity.isFile(e.path)) {
+          await e.delete();
+        }
+      }
+    } catch (e) {
+      Logger.w(_tag, '清理旧固件失败: $e');
+    }
+  }
+}
diff --git a/apps/client/lib/modules/ota_upgrade/controllers/bes_ota_upgrade_controller.dart b/apps/client/lib/modules/ota_upgrade/controllers/bes_ota_upgrade_controller.dart
new file mode 100644
index 00000000..c66f50bd
--- /dev/null
+++ b/apps/client/lib/modules/ota_upgrade/controllers/bes_ota_upgrade_controller.dart
@@ -0,0 +1,495 @@
+import 'dart:async';
+
+import 'package:bes_ota_manager/bes_ota_manager.dart';
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
+
+import '../../../core/utils/logger.dart';
+import '../../../data/models/appconfig.dart';
+import '../../../data/models/appconfig_model.dart';
+import '../../../data/services/bes_bluetooth_service.dart';
+import 'bes_ota_download_service.dart';
+
+/// OTA 升级阶段（驱动页面 UI）。
+class OtaPhase {
+  static const idle = 0; // 待升级
+  static const downloading = 1; // 下载固件中
+  static const upgrading = 2; // 蓝牙推送中
+  static const success = 3; // 升级成功
+  static const failed = 4; // 升级失败
+}
+
+/// 恒玄(BES)耳机固件 OTA 升级控制器。
+///
+/// 与杰理那条链路（[OtaCoreService] / `ota_upgrade_controller.dart`）完全独立：
+/// 不碰 BleManager / Jielihome，只依赖 [BesBluetoothService] 与 `bes_ota_manager` 插件。
+/// 本项目只有恒玄耳机，路由 `Routes.OTA_UPGRADE` 已指向这里。
+///
+/// 流程：读产品配置 → 断开 app 层 SPP → 下载固件 → 插件自管连接推送 → 设备重启。
+class BesOtaUpgradeController extends GetxController {
+  static const _tag = 'BesOtaUpgradeController';
+
+  /// 看门狗超时：升级阶段超过该时长无任何进度或状态推进，即判定卡死失败。
+  /// 兜底原生侧「既不推进也不上报 onError」导致 UI 永久停在升级中的情况。
+  static const Duration _watchdogTimeout = Duration(seconds: 90);
+
+  /// 固件下载地址：来自后端 `user_getappconfig` 下发的产品配置，按设备名匹配。
+  String _downloadUrl = '';
+
+  /// 页面已销毁标志：onClose 置位，用于让正在进行的下载/升级异步链提前退出，
+  /// 避免在已销毁的控制器上发起 startOta（僵尸会话）。
+  bool _disposed = false;
+
+  /// 当前下载的取消令牌：cancel()/onClose 时取消，立即中止下载、不再续跑。
+  CancelToken? _downloadCancelToken;
+
+  /// 升级看门狗定时器：每次收到进度/状态事件即重置；超时未重置则判失败。
+  Timer? _watchdog;
+
+  final BesBluetoothService _bes = BesBluetoothService.to;
+  final BesOtaManager _besOta = BesOtaManager();
+  final BesOtaDownloadService _downloadService = BesOtaDownloadService();
+
+  // ---- 响应式状态 ----
+  final RxString currentVersion = ''.obs;
+  final RxString latestVersion = ''.obs;
+  final RxString updateDescription = ''.obs;
+  final RxBool isUpdateAvailable = false.obs;
+  final RxBool isConnected = true.obs;
+
+  /// 设备名快照：开始升级时会主动断开 app 层连接，[BesBluetoothService] 的字段被
+  /// 清空，页面展示用控制器自己的快照，不跟着变空。
+  final RxString deviceName = ''.obs;
+
+  /// 设备地址快照，服务字段被清空后（如失败重试时）回退使用。
+  String _address = '';
+
+  /// 是否为本次 OTA 主动断开过 app 层连接。主动断开不会自动回连，
+  /// 退出页面时据此决定是否恢复连接（没点过「开始升级」则无需处理）。
+  bool _appConnectionReleased = false;
+
+  final RxInt phase = OtaPhase.idle.obs;
+  final RxDouble downloadProgress = 0.0.obs; // 0~1
+  final RxDouble otaProgress = 0.0.obs; // 0~1
+  final RxString detailedStatus = ''.obs;
+
+  StreamSubscription<BesOtaEvent>? _otaSub;
+  Worker? _versionWorker;
+  Worker? _statusWorker;
+  Worker? _deviceWorker;
+  Worker? _nameWorker;
+
+  bool get isBusy =>
+      phase.value == OtaPhase.downloading || phase.value == OtaPhase.upgrading;
+
+  @override
+  void onInit() {
+    super.onInit();
+
+    isConnected.value = _bes.isConnected;
+    currentVersion.value = _bes.deviceVersion.value;
+    deviceName.value = _bes.connectedDeviceName.value;
+    _address = _bes.connectedDeviceId.value;
+    _loadProductConfig();
+
+    // 设备版本回包（`AA 06` → `BB 86`）后同步刷新；开始升级时主动断开会把
+    // deviceVersion 清空，空值忽略，保留页面上已知的版本显示。
+    _versionWorker = ever(_bes.deviceVersion, (String v) {
+      if (v.isEmpty) return;
+      currentVersion.value = v;
+      _refreshUpdateAvailable();
+    });
+
+    // 跟踪 app 层连接状态（仅用于展示与按钮可用性）。
+    // 注意：OTA 连接由插件自管、掉线会经 onError 上报；开始升级时 app 层连接
+    // 是我们主动断开的，不能拿它的断开去中止 OTA。
+    _statusWorker = ever(_bes.deviceStatus, (int s) {
+      isConnected.value = s == 2;
+    });
+
+    // （重）连接后重新捕获设备地址，失败重试时要用。
+    _deviceWorker = ever(_bes.connectedDeviceId, (String id) {
+      if (id.isEmpty) return;
+      _address = id;
+    });
+
+    // 设备名就绪/变化时刷新快照并重载产品配置。注意：重连时服务里 id 先于
+    // name 赋值且 worker 同步触发，挂在 id 上拿不到新名字；页面初始化恰逢
+    // 重连中名字为空时，也靠这里在名字就绪后补加载，否则「最新版本」会一直为空。
+    _nameWorker = ever(_bes.connectedDeviceName, (String n) {
+      if (n.isEmpty) return;
+      deviceName.value = n;
+      _loadProductConfig();
+    });
+
+    _otaSub = _besOta.events.listen(
+      _handleOtaEvent,
+      // 事件通道本身异常（原生 sink 出错/通道断开）也要落到失败终态，避免无声卡死。
+      onError: (Object err) {
+        if (phase.value == OtaPhase.success) return;
+        _onUpgradeError(null, err.toString());
+      },
+    );
+  }
+
+  @override
+  void onClose() {
+    _disposed = true;
+    _downloadCancelToken?.cancel('page closed'); // 中止可能仍在跑的下载
+    _cancelWatchdog();
+    _setKeepScreenOn(false); // 退出页面兜底关闭常亮
+    _otaSub?.cancel();
+    _versionWorker?.dispose();
+    _statusWorker?.dispose();
+    _deviceWorker?.dispose();
+    _nameWorker?.dispose();
+
+    // 主动断开不会自动回连：若本次为 OTA 断开过 app 层连接，退出页面时恢复。
+    // 升级成功时设备正在重启，延时几秒再连。
+    final needReconnect = _appConnectionReleased && _address.isNotEmpty;
+    final addr = _address;
+    final name = deviceName.value;
+    // SDK 自己 OTA 成功后的内部重连等了 15s（MSG_OTA_OVER_RECONNECT），设备重启到
+    // 蓝牙就绪需要数秒；即使这次连不上，耳机开机也会主动回连手机兜底。
+    final delay = phase.value == OtaPhase.success
+        ? const Duration(seconds: 5) // 设备正在重启
+        : const Duration(seconds: 2); // 等耳机拆完 OTA 链路再回连（与开始升级方向一致）
+    // 先停掉 OTA 会话释放插件占用的 SPP 连接，再回连 app 层，避免两条连接打架。
+    _besOta.stopOta().whenComplete(() {
+      _besOta.dispose();
+      if (!needReconnect) return;
+      Future.delayed(delay, () {
+        // 期间可能已（自动/手动）连上，避免重复发起。
+        if (_bes.deviceStatus.value != 2) {
+          _bes.connectToDevice(addr, name);
+        }
+      });
+    });
+    super.onClose();
+  }
+
+  /// 从后端产品配置取最新固件版本与下载地址（按设备名匹配产品）。
+  void _loadProductConfig() {
+    final product = _findProduct(deviceName.value);
+    if (product == null) {
+      Logger.w(_tag, '未找到设备对应的产品配置: ${deviceName.value}');
+      latestVersion.value = '';
+      updateDescription.value = '';
+      _downloadUrl = '';
+    } else {
+      latestVersion.value = product.version?.split('+').first.trim() ?? '';
+      updateDescription.value = product.updatedescription ?? '';
+      _downloadUrl = product.updatepackageaddress ?? '';
+      // 「拉到的版本不对」这类问题以前只能靠猜：失败有日志、成功没有，
+      // 分不清是没匹配上产品、下发的值就是旧的、还是设备当前版本读错了。
+      Logger.i(
+          _tag,
+          '产品配置: name=${product.devicename} pid=${product.id} '
+          '服务端最新=${product.version} → 解析后=${latestVersion.value} '
+          '设备当前=${currentVersion.value} '
+          '产品表共${AppConfig.config.products.length}个');
+    }
+    _refreshUpdateAvailable();
+  }
+
+  /// 后台是否允许「版本不一致即可升级」。取不到产品配置时按 false（严格）。
+  bool get _allowDowngrade =>
+      _findProduct(deviceName.value)?.updateonmismatch ?? false;
+
+  /// 按设备名找产品。
+  ///
+  /// ⚠️ 不要用 [AppConfig.getproduct]——它内部 `firstWhere` 没有 orElse，
+  /// 查不到直接抛 StateError，而调用点写的都是 `if (product == null)`，
+  /// 那个 null 判断永远等不到，异常会穿出去、在固件页表现成「加载失败」。
+  ///
+  /// 顺序：设备名互相包含 → 唯一的经典蓝牙耳机产品 → null。
+  DBProduct? _findProduct(String name) {
+    if (!AppConfig.isInitialized()) return null;
+    final products = AppConfig.config.products;
+    if (products.isEmpty) return null;
+    final n = name.trim().toUpperCase();
+    if (n.isNotEmpty && n != 'UNKNOWNEQUIPMENT') {
+      for (final p in products) {
+        final pn = p.devicename.trim().toUpperCase();
+        if (pn.isEmpty) continue;
+        if (pn.contains(n) || n.contains(pn)) return p;
+      }
+    }
+    // 本项目只有恒玄（经典蓝牙耳机）一种设备，名字对不上时退化到它是安全的
+    final headsets = products.where((p) => p.devicetype == 1).toList();
+    if (headsets.length == 1) return headsets.first;
+    return null;
+  }
+
+  void _refreshUpdateAvailable() {
+    final cur = currentVersion.value.trim();
+    final latest = latestVersion.value.trim();
+    // 没有产品配置（无最新版本）不可升级
+    if (latest.isEmpty) {
+      isUpdateAvailable.value = false;
+      return;
+    }
+    // 读不到当前版本时允许升级（未知 → 允许）
+    if (cur.isEmpty) {
+      isUpdateAvailable.value = true;
+      return;
+    }
+    // 判定口径由**后台产品配置**决定，不看包类型：
+    //   updateonmismatch=true  → 版本不一致就允许升（开发/测试，可刷回旧固件）
+    //   updateonmismatch=false → 只有服务端版本更高才允许（正式，默认）
+    // ⚠️ 之前用 kDebugMode 分界是错的：测试同事拿到的往往是 release 包，
+    //    在开发环境照样点不动升级按钮。开关放后台才能按产品、按环境自由控制。
+    // ⚠️ 字段可空（老服务端不下发），null 一律按 false 走严格判定——
+    //    判宽的后果是线上用户被降级，判严只是开发时少一个便利。
+    isUpdateAvailable.value = _allowDowngrade
+        ? latest != cur
+        : _isNewer(latest, cur);
+  }
+
+  /// 入口：开始升级（下载 → 交接连接 → OTA 推送）。
+  Future<void> startUpdate() async {
+    if (isBusy) return;
+    if (!_bes.isConnected) {
+      _snack('otaError'.tr, 'otaNeedConnect'.tr);
+      return;
+    }
+
+    // 关键：在断开现有连接前先捕获设备标识（disconnect 会清空）；
+    // 服务字段已为空时（失败后重试）回退到控制器快照。
+    final serviceId = _bes.connectedDeviceId.value;
+    final address = serviceId.isNotEmpty ? serviceId : _address;
+    final serviceName = _bes.connectedDeviceName.value;
+    final name = serviceName.isNotEmpty ? serviceName : deviceName.value;
+    if (address.isEmpty) {
+      _snack('otaError'.tr, 'otaNeedConnect'.tr);
+      return;
+    }
+    _address = address;
+
+    // 产品配置缺失（AppConfig 晚于页面初始化等）时兜底重取一次。
+    if (_downloadUrl.isEmpty) {
+      _loadProductConfig();
+      if (_downloadUrl.isEmpty) {
+        _snack('otaError'.tr, 'otaVersionInfoFailed'.tr);
+        return;
+      }
+    }
+
+    final cancelToken = CancelToken();
+    _downloadCancelToken = cancelToken;
+
+    try {
+      // 升级期间保持屏幕常亮（成功/失败/退出页面时关闭）。
+      _setKeepScreenOn(true);
+      phase.value = OtaPhase.downloading;
+      downloadProgress.value = 0;
+      otaProgress.value = 0;
+      detailedStatus.value = 'otaPreparing'.tr;
+
+      // 1) 释放 app 现有 SPP 连接，让插件自管 OTA 连接。
+      await _bes.disconnectDevice();
+      _appConnectionReleased = true;
+      // disconnect 返回只代表本端 socket 已关，耳机侧链路拆除还要在空中传播；
+      // 固件已缓存时下载不耗时、衔接近乎瞬时，立刻连 OTA 可能被拒
+      //（多数固件同时只接受一条 SPP 链路），留 2s 缓冲等耳机拆完旧链路。
+      // 曾出现过快速衔接导致 OTA 连接失败的案例，SDK 内部还有 3 次快速重连兜底。
+      await Future.delayed(const Duration(seconds: 2));
+      if (_disposed) return; // 期间已退出页面，不再继续
+      // 2) 初始化原生 OTA 环境。
+      await _besOta.init();
+
+      // 3) 下载固件。
+      final filePath = await _downloadService.downloadFirmware(
+        downloadUrl: _downloadUrl,
+        cancelToken: cancelToken,
+        onProgress: (p) => downloadProgress.value = p,
+        onStatusUpdate: (s) => detailedStatus.value = s,
+      );
+
+      // 已退出/已取消则不再发起原生 OTA，避免在已销毁控制器上建立僵尸会话。
+      if (_disposed || cancelToken.isCancelled) return;
+
+      // 4) 启动 SPP OTA 2.0。
+      phase.value = OtaPhase.upgrading;
+      detailedStatus.value = 'otaConnectingDevice'.tr;
+      // 看门狗从这里起覆盖「连接+握手+推送」全程：原生握手会持续发 onStatus、
+      // 传输会持续发 onProgress，任一推进即重置；长时间静默（如原生卡住且不报错）兜底失败。
+      // 下载阶段的卡死另由 Dio 超时与 CancelToken 处理，不纳入看门狗。
+      _armWatchdog();
+      await _besOta.startOta(
+        address: address,
+        name: name,
+        filePath: filePath,
+        protocol: 'SPP',
+        userFlag: 1,
+        upgradeType: 1,
+        user: 1,
+      );
+    } catch (e, st) {
+      // 用户取消下载 / 页面已退出：静默收尾（控制器可能已销毁）。
+      if (_disposed || (e is DioException && CancelToken.isCancel(e))) {
+        return;
+      }
+      Logger.e(_tag, '升级流程异常', e, st);
+      _onUpgradeError(null, e.toString()); // 统一走失败终态（含去重/看门狗关闭）
+    }
+  }
+
+  /// 取消升级。
+  void cancel() {
+    _downloadCancelToken?.cancel('user cancelled'); // 中止下载，阻断后续 startOta
+    _cancelWatchdog();
+    _besOta.stopOta();
+    _setKeepScreenOn(false);
+    phase.value = OtaPhase.idle;
+    detailedStatus.value = '';
+    downloadProgress.value = 0;
+    otaProgress.value = 0;
+  }
+
+  // ---- 看门狗：覆盖升级（连接/握手/推送）阶段，超时未推进则判失败 ----
+  void _armWatchdog() {
+    if (_disposed) return;
+    _watchdog?.cancel();
+    _watchdog = Timer(_watchdogTimeout, _onWatchdogTimeout);
+  }
+
+  void _cancelWatchdog() {
+    _watchdog?.cancel();
+    _watchdog = null;
+  }
+
+  void _onWatchdogTimeout() {
+    if (_disposed) return;
+    if (phase.value == OtaPhase.upgrading) {
+      Logger.w(_tag, 'OTA 看门狗超时：${_watchdogTimeout.inSeconds}s 无进度推进');
+      _onUpgradeError(null, 'otaTimeout'.tr);
+    }
+  }
+
+  /// 屏幕常亮开关。失败不致命，吞掉异常。
+  void _setKeepScreenOn(bool on) {
+    try {
+      on ? WakelockPlus.enable() : WakelockPlus.disable();
+    } catch (e) {
+      Logger.w(_tag, '设置屏幕常亮失败: $e');
+    }
+  }
+
+  void _handleOtaEvent(BesOtaEvent e) {
+    // 进入终态（成功/失败）即锁定：stopOta 清理、设备重启断链、看门狗超时后迟到的
+    // 进度/Canceled/Error 一律忽略，避免成功被覆盖成失败、或失败被迟到进度翻回升级中。
+    // 新会话由 startUpdate 重置 phase。
+    if (phase.value == OtaPhase.success || phase.value == OtaPhase.failed) {
+      return;
+    }
+    // 任何进度/状态推进都重置看门狗（成功/失败在各自处理里关闭看门狗）。
+    if (e.event == 'onProgress' || e.event == 'onStatus') {
+      _armWatchdog();
+    }
+    switch (e.event) {
+      case 'onProgress':
+        phase.value = OtaPhase.upgrading;
+        _updateProgress(e.progress ?? 0);
+        break;
+      case 'onStatus':
+        // SDK 的 OTA_SEND_DATA_PROGRESS 状态消息带原始浮点百分比（如 99.94765…），
+        // 当作进度更新并入单一写入口；其余状态文本只记日志不上屏——
+        // 曾直接展示，但与进度文案高频交替会闪烁出看不清的内容。
+        final numeric = double.tryParse(e.message ?? '');
+        if (numeric != null && numeric > 0) {
+          phase.value = OtaPhase.upgrading;
+          _updateProgress((numeric / 100).clamp(0.0, 1.0));
+        }
+        break;
+      case 'onSuccess':
+        _onUpgradeSuccess();
+        break;
+      case 'onError':
+        _onUpgradeError(e.code, e.message);
+        break;
+    }
+  }
+
+  /// 进度的单一写入口：onProgress（Android 为整数百分比）与数字型 onStatus
+  /// 消息（浮点百分比）都汇到这里，只在单调递增时刷新，避免两个来源
+  /// 高频交替导致数字来回跳动。
+  void _updateProgress(double p) {
+    if (p <= otaProgress.value) return;
+    otaProgress.value = p;
+    detailedStatus.value = 'otaUpgrading'.trParams({
+      'percent': (p * 100).toStringAsFixed(2),
+    });
+  }
+
+  void _onUpgradeSuccess() {
+    _cancelWatchdog();
+    _setKeepScreenOn(false);
+    phase.value = OtaPhase.success;
+    otaProgress.value = 1.0;
+    detailedStatus.value = 'otaSuccessReboot'.tr;
+    currentVersion.value = latestVersion.value;
+    isUpdateAvailable.value = false;
+    _besOta.stopOta();
+  }
+
+  void _onUpgradeError(int? code, String? message) {
+    if (phase.value == OtaPhase.failed) return; // 已是失败终态，避免重复弹窗
+    _cancelWatchdog();
+    _setKeepScreenOn(false);
+    phase.value = OtaPhase.failed;
+    // 进入失败终态即释放原生 OTA 会话与 SPP 链路（与 _onUpgradeSuccess/cancel 对齐）。
+    // 否则看门狗超时/连接失败后 native 会话仍在跑，占用唯一 SPP，且因终态已锁，
+    // 迟到的 onSuccess 会被吞——会卡死在「失败」直到用户退页面才由 onClose 清理。
+    _besOta.stopOta();
+    detailedStatus.value = 'otaFailed'.tr;
+    _snack(
+      'otaFailed'.tr,
+      message?.isNotEmpty == true
+          ? message!
+          : 'otaFailedWithCode'.trParams({'code': '${code ?? -1}'}),
+    );
+  }
+
+  void _snack(String title, String msg) {
+    Get.snackbar(
+      title,
+      msg,
+      snackPosition: SnackPosition.TOP,
+      backgroundColor: Colors.red[400],
+      colorText: Colors.white,
+      margin: const EdgeInsets.all(12),
+      duration: const Duration(seconds: 3),
+    );
+  }
+
+  /// [a] 是否比 [b] 新。
+  ///
+  /// 逐段取前导数字比较，与服务端 `comm.CompareVersion` 同口径——
+  /// `1.0.0-beta` / `1.2.3+4` 这类版本串不会抛异常（用 int.parse 会抛，
+  /// 被外层 catch 吞掉后表现为「明明有新版本却说已是最新」）。
+  bool _isNewer(String a, String b) {
+    final pa = _splitVersion(a);
+    final pb = _splitVersion(b);
+    if (pa.isEmpty || pb.isEmpty) return a.trim() != b.trim();
+    final len = pa.length > pb.length ? pa.length : pb.length;
+    for (var i = 0; i < len; i++) {
+      final x = i < pa.length ? pa[i] : 0;
+      final y = i < pb.length ? pb[i] : 0;
+      if (x != y) return x > y;
+    }
+    return false;
+  }
+
+  /// 把版本串按 `.` 切开，每段只取前导数字（`3+4` → 3，`0-beta` → 0）。
+  List<int> _splitVersion(String v) {
+    final s = v.trim();
+    if (s.isEmpty) return const [];
+    return s.split('.').map((seg) {
+      final m = RegExp(r'^\d+').firstMatch(seg.trim());
+      return m == null ? 0 : int.parse(m.group(0)!);
+    }).toList();
+  }
+}
diff --git a/apps/client/lib/modules/ota_upgrade/controllers/ota_core_contropller.dart b/apps/client/lib/modules/ota_upgrade/controllers/ota_core_contropller.dart
index f7fae11f..8e202d32 100644
--- a/apps/client/lib/modules/ota_upgrade/controllers/ota_core_contropller.dart
+++ b/apps/client/lib/modules/ota_upgrade/controllers/ota_core_contropller.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:logger/web.dart';
 import '../../../data/services/ble_manager.dart';
+import '../../../data/services/bes_bluetooth_service.dart';
 import '../../../data/services/bluetooth_manager.dart'; // 添加蓝牙管理器导入
 import '../../../data/models/appconfig.dart';
 import '../../../data/models/appconfig_model.dart';
@@ -208,14 +209,11 @@ class OtaCoreService {
 
       // 获取设备类型以确定检查策略
       String deviceName = getDeviceName();
-      DBProduct? product = AppConfig.getproduct(deviceName);
+      final DBProduct? product = findProduct(deviceName);
       if (product == null) {
-        // 如果根据设备名称找不到产品，尝试使用默认产品名称
-        product = AppConfig.getproduct("DeapSound");
-        if (product == null) {
-          _showBatteryCheckFailedSnackbar('otaCannotGetProductInfoWithName'.trParams({'deviceName': deviceName}));
-          return false;
-        }
+        _showBatteryCheckFailedSnackbar('otaCannotGetProductInfoWithName'
+            .trParams({'deviceName': deviceName}));
+        return false;
       }
 
       final leftBattery = deviceInfo.leftEarBattery;
@@ -418,6 +416,33 @@ class OtaCoreService {
 
   // ==================== 版本管理功能 ====================
 
+
+  /// 按设备名安全地查产品配置。
+  ///
+  /// 匹配规则比 `AppConfig.getproduct()` 宽：后者只做「产品名包含设备名」这一个
+  /// 方向，恒玄耳机的广播名与产品表里的名字常常互为子串的另一头，单向匹配会漏。
+  /// （getproduct 本身已经不会抛了，2026-09-03 起查不到返回 null。）
+  ///
+  /// 顺序：设备名互相包含 → 唯一的经典蓝牙耳机产品 → null。
+  /// 老代码里的兜底名 "DeapSound" 是上一代品牌，早已不在产品表里，去掉了。
+  DBProduct? findProduct(String deviceName) {
+    if (!AppConfig.isInitialized()) return null;
+    final products = AppConfig.config.products;
+    if (products.isEmpty) return null;
+    final n = deviceName.trim().toUpperCase();
+    if (n.isNotEmpty && n != 'UNKNOWNEQUIPMENT') {
+      for (final p in products) {
+        final pn = p.devicename.trim().toUpperCase();
+        if (pn.isEmpty) continue;
+        if (pn.contains(n) || n.contains(pn)) return p;
+      }
+    }
+    // 本项目只有恒玄（经典蓝牙耳机）一种设备，名字对不上时退化到它是安全的
+    final headsets = products.where((p) => p.devicetype == 1).toList();
+    if (headsets.length == 1) return headsets.first;
+    return null;
+  }
+
   /// 动态获取当前连接的设备名称
   /// 参考home_controller中的getDeviceName方法实现
   String getDeviceName() {
@@ -434,6 +459,14 @@ class OtaCoreService {
         return deviceInfo.name;
       }
 
+      // 恒玄耳机不在杰理 RCSP 链路上，上面两个来源都拿不到它。
+      // 少了这一支，恒玄用户的设备名恒为 unknownEquipment，
+      // 后面按名字查产品必然落空 → 固件页取不到服务端版本。
+      if (Get.isRegistered<BesBluetoothService>()) {
+        final besName = BesBluetoothService.to.connectedDeviceName.value;
+        if (besName.isNotEmpty) return besName;
+      }
+
       // 最后从BLE管理器的最后连接设备名称获取
       // if (_bleManager.currentDeviceName.isNotEmpty) {
       //   return _bleManager.currentDeviceName;
@@ -480,17 +513,13 @@ class OtaCoreService {
     String deviceName = getDeviceName();
 
     // 获取产品信息以确定设备类型
-    DBProduct? product = AppConfig.getproduct(deviceName);
+    final DBProduct? product = findProduct(deviceName);
     if (product == null) {
-      // 如果根据设备名称找不到产品，尝试使用默认产品名称
-      product = AppConfig.getproduct("DeapSound");
-      if (product == null) {
-        throw OtaCoreException(
-          type: OtaCoreErrorType.productInfoUnavailable,
-          params: {'deviceName': deviceName},
-          debugMessage: 'productInfoUnavailable: $deviceName', //根据设备名称未找到产品信息
-        );
-      }
+      throw OtaCoreException(
+        type: OtaCoreErrorType.productInfoUnavailable,
+        params: {'deviceName': deviceName},
+        debugMessage: 'productInfoUnavailable: $deviceName', //根据设备名称未找到产品信息
+      );
     }
 
     // 根据设备类型进行不同的版本校验
@@ -559,17 +588,15 @@ class OtaCoreService {
     // 动态获取当前连接的设备名称
     String deviceName = getDeviceName();
 
-    DBProduct? product = AppConfig.getproduct(deviceName);
+    final DBProduct? product = findProduct(deviceName);
     if (product == null) {
-      // 如果根据设备名称找不到产品，尝试使用默认产品名称
-      product = AppConfig.getproduct("DeapSound");
-      if (product == null) {
-        throw "无法获取产品信息，设备名称: $deviceName";
-      }
+      throw "无法获取产品信息，设备名称: $deviceName";
     }
 
-    product.isforceupdate = product.version?.contains("+");
-
+    // ⚠️ 强更以**后台 product.isforceupdate 字段**为准。
+    // 原来写的是 `product.version?.contains("+")`——拿版本号里有没有 "+"
+    // 当强更开关，跟后台配置完全脱节（后台勾了拦不住、版本号带 + 的全被强更）。
+    // 这和 App 版本更新那边踩过的土规则是同一个毛病，别改回去。
     return {
       'latestVersion': product.version?.split('+').first ?? "",
       'updateDescription': product.updatedescription ?? "",
@@ -578,16 +605,29 @@ class OtaCoreService {
     };
   }
 
+  /// 把版本串按 `.` 切开，每段只取前导数字（`3+4` → 3，`0-beta` → 0）。
+  /// 与服务端 comm.CompareVersion 的口径一致。
+  static List<int> _splitVersion(String v) {
+    final s = v.trim();
+    if (s.isEmpty) return const [];
+    return s.split('.').map((seg) {
+      final m = RegExp(r'^\d+').firstMatch(seg.trim());
+      return m == null ? 0 : int.parse(m.group(0)!);
+    }).toList();
+  }
+
   /// 比较版本号，判断是否有新版本可用
   /// [currentVersion] 当前版本号
   /// [latestVersion] 最新版本号
   /// 返回true表示有新版本可用（只支持升级）
   bool isNewVersionAvailable(String currentVersion, String latestVersion) {
     try {
-      List<int> currentParts =
-          currentVersion.split('.').map((e) => int.parse(e.trim())).toList();
-      List<int> latestParts =
-          latestVersion.split('.').map((e) => int.parse(e.trim())).toList();
+      // ⚠️ 逐段取**前导数字**，不能用 int.parse：固件版本出现过
+      // `1.0.0-beta` / `1.2.3+4` 这类后缀，int.parse 直接抛，
+      // 异常被下面的 catch 吞掉后返回 false —— 表现是「明明有新版本却说已是最新」。
+      List<int> currentParts = _splitVersion(currentVersion);
+      List<int> latestParts = _splitVersion(latestVersion);
+      if (currentParts.isEmpty || latestParts.isEmpty) return false;
 
       // 确保两个版本号长度一致，短的用0补齐
       int maxLength = currentParts.length > latestParts.length
diff --git a/apps/client/lib/modules/ota_upgrade/controllers/ota_upgrade_controller.dart b/apps/client/lib/modules/ota_upgrade/controllers/ota_upgrade_controller.dart
index 94f966ec..c17c940c 100644
--- a/apps/client/lib/modules/ota_upgrade/controllers/ota_upgrade_controller.dart
+++ b/apps/client/lib/modules/ota_upgrade/controllers/ota_upgrade_controller.dart
@@ -100,16 +100,28 @@ class OtaUpgradeController extends GetxController {
 
   /// 初始化控制器
   /// 设置事件监听并加载版本信息
+  /// 恒玄耳机是否连着。恒玄不在杰理 RCSP 链路上，
+  /// [OtaCoreService.checkBleConnectionStatus] 查的是 BleManager（杰理），
+  /// 对恒玄恒为 false。
+  bool get _besConnected =>
+      Get.isRegistered<BesBluetoothService>() &&
+      BesBluetoothService.to.isConnected;
+
   Future<void> _initializeController() async {
-    // 首先检查BLE设备连接状态
-    if (!_coreService.checkBleConnectionStatus()) {
-      //isFetchingDeviceInfo.value = false;
-      //errorMessage.value = 'unconnected'.tr;
+    // ⚠️ 这里原来是「杰理没连上就直接 return」，而本项目用的是恒玄耳机——
+    // 于是 _loadVersionInfo() 永远不会被调到，固件页从头到尾**没有任何一次
+    // 服务端拉取**，看起来就是「接口没通」。实际上服务端版本是随
+    // user_getappconfig 的 products 下发的（product.version /
+    // updatepackageaddress / updatedescription / isforceupdate），
+    // 一直都在，只是没人去读。
+    final bool jieliReady = _coreService.checkBleConnectionStatus();
+    if (!jieliReady && !_besConnected) {
       isBleConnected.value = false;
-
       return;
     }
-    _listenToOtaEvents();
+    isBleConnected.value = true;
+    // 杰理的 OTA 事件流只有杰理链路才有意义
+    if (jieliReady) _listenToOtaEvents();
     await _loadVersionInfo();
   }
 
@@ -179,6 +191,18 @@ class OtaUpgradeController extends GetxController {
   /// 开始更新流程的公共方法
   /// 供视图调用的更新入口点
   Future<void> startUpdate() async {
+    // 恒玄耳机目前**没有固件推送通道**：bluetooth_manager 插件里没有任何
+    // OTA 实现，下面这条流程整条是杰理 RCSP 的（下载 → RCSP 分包 → 重启配对）。
+    // 让它跑下去只会在中途失败，用户看到的是一串莫名其妙的错误码。
+    // 所以这里明确拦一下：版本对比与更新提示照常给，升级动作说清楚做不了。
+    if (_besConnected && !_coreService.checkBleConnectionStatus()) {
+      _uiService.showErrorSnackbar(
+        'tip'.tr,
+        'otaBesNotSupported'.tr,
+        backgroundColor: Colors.orange[800],
+      );
+      return;
+    }
     //立即给用户状态反馈
     showDetailedStatus.value = true;
     detailedStatus.value = 'otaCheckingDeviceStatus'.tr;
diff --git a/apps/client/lib/modules/ota_upgrade/views/bes_ota_upgrade_view.dart b/apps/client/lib/modules/ota_upgrade/views/bes_ota_upgrade_view.dart
new file mode 100644
index 00000000..0efd749f
--- /dev/null
+++ b/apps/client/lib/modules/ota_upgrade/views/bes_ota_upgrade_view.dart
@@ -0,0 +1,443 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:get/get.dart';
+
+import '../../../data/models/device_category.dart';
+import '../controllers/bes_ota_upgrade_controller.dart';
+
+class BesOtaUpgradeView extends GetView<BesOtaUpgradeController> {
+  const BesOtaUpgradeView({super.key});
+
+  static const _accent = Color(0xFF009688);
+  static const _accentBg = Color(0xFFE0F2F1);
+
+  @override
+  Widget build(BuildContext context) {
+    return PopScope(
+      // 升级中禁止直接返回，先二次确认。
+      canPop: false,
+      onPopInvokedWithResult: (didPop, _) {
+        if (didPop) return;
+        _handleBack();
+      },
+      child: Scaffold(
+        backgroundColor: Colors.grey[50],
+        body: SafeArea(
+          child: Column(
+            children: [
+              _buildTopBar(),
+              Expanded(
+                child: Obx(() {
+                  // 仅"待升级"且未连接时显示"请先连接设备"占位页。
+                  // 升级期间会主动断开 app 层连接(isBleConnected=false)，成功/失败等
+                  // 终态也要展示对应结果卡片，故只在 idle 态才让占位页接管。
+                  if (!controller.isConnected.value &&
+                      controller.phase.value == OtaPhase.idle) {
+                    return _buildNotConnected();
+                  }
+                  return SingleChildScrollView(
+                    padding: EdgeInsets.symmetric(
+                      horizontal: 16.w,
+                      vertical: 12.h,
+                    ),
+                    child: Column(
+                      children: [
+                        _buildDeviceCard(),
+                        16.verticalSpace,
+                        _buildVersionCard(),
+                        16.verticalSpace,
+                        _buildProgressSection(),
+                      ],
+                    ),
+                  );
+                }),
+              ),
+              _buildBottomBar(),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTopBar() {
+    return Padding(
+      padding: EdgeInsets.only(right: 16.w),
+      child: Row(
+        children: [
+          // 使用 IconButton 提供 48dp 最小点击热区与点击反馈
+          IconButton(
+            onPressed: _handleBack,
+            icon: Icon(
+              Icons.arrow_back_ios,
+              size: 20.w,
+              color: Colors.grey[800],
+            ),
+          ),
+          Expanded(
+            child: Center(
+              child: Text(
+                'firmwareUpgrade'.tr,
+                style: TextStyle(
+                  fontSize: 18.sp,
+                  fontWeight: FontWeight.bold,
+                  color: Colors.grey[800],
+                ),
+              ),
+            ),
+          ),
+          SizedBox(width: 20.w),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildDeviceCard() {
+    return _card(
+      child: Row(
+        children: [
+          // 耳机实拍图（小尺寸版），比通用耳机图标更能对上用户手里那台设备。
+          // 用 earphoneIconImage 而不是主图 earphoneImage——后者 892×1152/1.1MB，
+          // 解到 44px 纯属浪费。
+          Container(
+            width: 44.w,
+            height: 44.w,
+            padding: EdgeInsets.all(4.w),
+            decoration: BoxDecoration(
+              color: _accentBg,
+              borderRadius: BorderRadius.circular(12.r),
+            ),
+            child: Image.asset(
+              DeviceCategories.earphoneIconImage,
+              fit: BoxFit.contain,
+              // 图缺失时退回通用图标，不让整张卡片塌成红色报错块
+              errorBuilder: (_, __, ___) =>
+                  Icon(Icons.headphones, color: _accent, size: 24.w),
+            ),
+          ),
+          12.horizontalSpace,
+          Expanded(
+            child: Obx(() {
+              final name = controller.deviceName.value;
+              return Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    name.isEmpty ? 'otaUnknownDevice'.tr : name,
+                    style: TextStyle(
+                      fontSize: 15.sp,
+                      fontWeight: FontWeight.w600,
+                      color: Colors.grey[850],
+                    ),
+                  ),
+                  4.verticalSpace,
+                  Text(
+                    '${'otaCurrentVersion'.tr}: '
+                    '${controller.currentVersion.value.isEmpty ? '--' : controller.currentVersion.value}',
+                    style: TextStyle(fontSize: 12.sp, color: Colors.grey[500]),
+                  ),
+                ],
+              );
+            }),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildVersionCard() {
+    return _card(
+      child: Column(
+        children: [
+          _versionRow(
+            'otaCurrentVersion'.tr,
+            () => controller.currentVersion.value.isEmpty
+                ? '--'
+                : controller.currentVersion.value,
+          ),
+          Divider(height: 20.h, color: Colors.grey[200]),
+          _versionRow(
+            'otaLatestVersion'.tr,
+            () => controller.latestVersion.value.isEmpty
+                ? '--'
+                : controller.latestVersion.value,
+          ),
+          12.verticalSpace,
+          Obx(() {
+            final available = controller.isUpdateAvailable.value;
+            return Container(
+              width: double.infinity,
+              padding: EdgeInsets.symmetric(vertical: 8.h, horizontal: 12.w),
+              decoration: BoxDecoration(
+                color: available ? _accentBg : Colors.grey[100],
+                borderRadius: BorderRadius.circular(10.r),
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Icon(
+                    available ? Icons.system_update : Icons.check_circle,
+                    size: 16.w,
+                    color: available ? _accent : Colors.grey[500],
+                  ),
+                  6.horizontalSpace,
+                  Text(
+                    available ? 'otaUpdateAvailable'.tr : 'otaAlreadyLatest'.tr,
+                    style: TextStyle(
+                      fontSize: 13.sp,
+                      color: available ? _accent : Colors.grey[600],
+                      fontWeight: FontWeight.w500,
+                    ),
+                  ),
+                ],
+              ),
+            );
+          }),
+        ],
+      ),
+    );
+  }
+
+  Widget _versionRow(String label, String Function() value) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: [
+        Text(label, style: TextStyle(fontSize: 14.sp, color: Colors.grey[600])),
+        Obx(
+          () => Text(
+            value(),
+            style: TextStyle(
+              fontSize: 14.sp,
+              fontWeight: FontWeight.w600,
+              color: Colors.grey[850],
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+
+  Widget _buildProgressSection() {
+    return Obx(() {
+      final phase = controller.phase.value;
+      if (phase == OtaPhase.idle) return const SizedBox.shrink();
+
+      if (phase == OtaPhase.success) {
+        return _resultCard(
+          icon: Icons.check_circle,
+          color: _accent,
+          text: 'otaSuccessReboot'.tr,
+        );
+      }
+      if (phase == OtaPhase.failed) {
+        return _resultCard(
+          icon: Icons.error,
+          color: Colors.red[400]!,
+          text: controller.detailedStatus.value.isEmpty
+              ? 'otaFailed'.tr
+              : controller.detailedStatus.value,
+        );
+      }
+      // downloading / upgrading
+      final isDownloading = phase == OtaPhase.downloading;
+      final value = isDownloading
+          ? controller.downloadProgress.value
+          : controller.otaProgress.value;
+      return _card(
+        child: Column(
+          children: [
+            SizedBox(
+              width: 96.w,
+              height: 96.w,
+              child: Stack(
+                alignment: Alignment.center,
+                children: [
+                  SizedBox(
+                    width: 96.w,
+                    height: 96.w,
+                    child: CircularProgressIndicator(
+                      value: value == 0 ? null : value,
+                      strokeWidth: 6.w,
+                      backgroundColor: Colors.grey[200],
+                      valueColor: const AlwaysStoppedAnimation(_accent),
+                    ),
+                  ),
+                  Text(
+                    '${(value * 100).toStringAsFixed(0)}%',
+                    style: TextStyle(
+                      fontSize: 20.sp,
+                      fontWeight: FontWeight.bold,
+                      color: _accent,
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            16.verticalSpace,
+            Text(
+              controller.detailedStatus.value.isEmpty
+                  ? (isDownloading ? 'otaDownloading'.tr : 'otaUpgradingShort'.tr)
+                  : controller.detailedStatus.value,
+              textAlign: TextAlign.center,
+              style: TextStyle(fontSize: 13.sp, color: Colors.grey[600]),
+            ),
+            12.verticalSpace,
+            Row(
+              children: [
+                Icon(Icons.info_outline, size: 14.w, color: Colors.orange[600]),
+                6.horizontalSpace,
+                Expanded(
+                  child: Text(
+                    'otaKeepConnectedWarning'.tr,
+                    style: TextStyle(fontSize: 11.sp, color: Colors.orange[700]),
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      );
+    });
+  }
+
+  Widget _buildBottomBar() {
+    return Obx(() {
+      final phase = controller.phase.value;
+      // 升级中只显示进度；失败/断开态不提供重试按钮（从顶栏返回退出页面，
+      // 退出时自动回连，重新进入即可再次升级）。
+      if (phase == OtaPhase.downloading ||
+          phase == OtaPhase.upgrading ||
+          phase == OtaPhase.failed) {
+        return const SizedBox.shrink();
+      }
+
+      final isSuccess = phase == OtaPhase.success;
+      final canUpgrade = controller.isUpdateAvailable.value &&
+          controller.isConnected.value;
+
+      String label;
+      VoidCallback? onTap;
+      if (isSuccess) {
+        label = 'otaDone'.tr;
+        onTap = () => Get.back();
+      } else {
+        label = 'otaStartUpgrade'.tr;
+        onTap = canUpgrade ? () => controller.startUpdate() : null;
+      }
+
+      return Padding(
+        padding: EdgeInsets.fromLTRB(16.w, 8.h, 16.w, 16.h),
+        child: SizedBox(
+          width: double.infinity,
+          height: 50.h,
+          child: ElevatedButton(
+            onPressed: onTap,
+            style: ElevatedButton.styleFrom(
+              backgroundColor: _accent,
+              disabledBackgroundColor: Colors.grey[300],
+              foregroundColor: Colors.white,
+              elevation: 0,
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(14.r),
+              ),
+            ),
+            child: Text(
+              label,
+              style: TextStyle(fontSize: 16.sp, fontWeight: FontWeight.w600),
+            ),
+          ),
+        ),
+      );
+    });
+  }
+
+  Widget _buildNotConnected() {
+    return Center(
+      child: Padding(
+        padding: EdgeInsets.all(32.w),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Icon(Icons.bluetooth_disabled, size: 56.w, color: Colors.grey[400]),
+            16.verticalSpace,
+            Text(
+              'otaNotConnectedTip'.tr,
+              textAlign: TextAlign.center,
+              style: TextStyle(fontSize: 14.sp, color: Colors.grey[600]),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _resultCard({
+    required IconData icon,
+    required Color color,
+    required String text,
+  }) {
+    return _card(
+      child: Column(
+        children: [
+          Icon(icon, size: 56.w, color: color),
+          12.verticalSpace,
+          Text(
+            text,
+            textAlign: TextAlign.center,
+            style: TextStyle(
+              fontSize: 15.sp,
+              fontWeight: FontWeight.w600,
+              color: Colors.grey[800],
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _card({required Widget child}) {
+    return Container(
+      width: double.infinity,
+      padding: EdgeInsets.all(16.w),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        borderRadius: BorderRadius.circular(18.r),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withValues(alpha: 0.04),
+            blurRadius: 10,
+            offset: const Offset(0, 2),
+          ),
+        ],
+      ),
+      child: child,
+    );
+  }
+
+  void _handleBack() {
+    if (controller.isBusy) {
+      Get.dialog(
+        AlertDialog(
+          title: Text('otaExitTitle'.tr),
+          content: Text('otaExitConfirm'.tr),
+          actions: [
+            TextButton(
+              onPressed: () => Get.back(),
+              child: Text('cancel'.tr),
+            ),
+            TextButton(
+              onPressed: () {
+                controller.cancel();
+                Get.back(); // 关弹窗
+                Get.back(); // 退页面
+              },
+              child: Text('confirm'.tr),
+            ),
+          ],
+        ),
+      );
+      return;
+    }
+    Get.back();
+  }
+}
diff --git a/apps/client/lib/modules/ota_upgrade/views/ota_upgrade_view.dart b/apps/client/lib/modules/ota_upgrade/views/ota_upgrade_view.dart
index ab985010..0597ef02 100644
--- a/apps/client/lib/modules/ota_upgrade/views/ota_upgrade_view.dart
+++ b/apps/client/lib/modules/ota_upgrade/views/ota_upgrade_view.dart
@@ -290,7 +290,6 @@ class OtaUpgradeView extends GetView<OtaUpgradeController> {
           children: [
             // 设备型号信息
             _buildDeviceInfoRow(
-              icon: Icons.headset,
               label: 'deviceModel'.tr, // 设备型号
               value: besName.isNotEmpty
                   ? besName
@@ -331,26 +330,24 @@ class OtaUpgradeView extends GetView<OtaUpgradeController> {
   }
 
   // 设备信息行组件
+  //
+  // 行首图标用 App 自己的图标（原来是蓝色 Icons.headset glyph 套一层浅蓝底）。
+  // app_icon.png 自带深色背景，再套浅蓝底会脏，所以底色一并去掉，
+  // 直接按原来的整体尺寸（6.w 内边距 + 16.sp 字形 ≈ 28.w）出图。
   Widget _buildDeviceInfoRow({
-    required IconData icon,
     required String label,
     required String value,
     required bool isDarkMode,
   }) {
     return Row(
       children: [
-        Container(
-          padding: EdgeInsets.all(6.w),
-          decoration: BoxDecoration(
-            color: isDarkMode
-                ? Colors.blue.withValues(alpha: 0.1)
-                : Colors.blue.withValues(alpha: 0.1),
-            borderRadius: BorderRadius.circular(6.r),
-          ),
-          child: Icon(
-            icon,
-            size: 16.sp,
-            color: isDarkMode ? Colors.blue[300] : Colors.blue[600],
+        ClipRRect(
+          borderRadius: BorderRadius.circular(6.r),
+          child: Image.asset(
+            'assets/images/app_icon.png',
+            width: 28.w,
+            height: 28.w,
+            fit: BoxFit.cover,
           ),
         ),
         SizedBox(width: 12.w),
diff --git a/apps/client/lib/modules/profile/controllers/profile_controller.dart b/apps/client/lib/modules/profile/controllers/profile_controller.dart
index 269f624a..af540433 100644
--- a/apps/client/lib/modules/profile/controllers/profile_controller.dart
+++ b/apps/client/lib/modules/profile/controllers/profile_controller.dart
@@ -83,6 +83,13 @@ class ProfileController extends GetxController {
     if (Get.isRegistered<IdVerifyService>()) {
       IdVerifyService.to.ensureLoaded();
     }
+    // [userInfo] 包的就是 User.instance 这个对象本身，别处直接改它的字段
+    // （实名核验回写真实性别就是这么改的）不会触发任何 Rx。挂上全局刷新信号，
+    // 让这类"绕过 controller 的改动"也能立刻反映到「我的」页上。
+    ever<int>(User.refreshTick, (_) {
+      userInfo.value = User.instance;
+      userInfo.refresh();
+    });
   }
 
   // 加载用户语言偏好设置
@@ -464,6 +471,10 @@ class ProfileController extends GetxController {
   ///
   /// 刻意不置 hasEdits —— 这不是用户在编辑，是核验结果回写，
   /// 置了会让用户退出页面时被问「要保存吗」，很奇怪。
+  ///
+  /// 注：写入 User.instance + 落本地缓存 + 发全局刷新信号现在统一在
+  /// [IdVerifyService] 里做（不论从哪个入口认证都生效），这里只兜住
+  /// 「服务端这次没回性别、但页面上还是旧值」的残余情况。
   void applyVerifiedGender(int gender) {
     if (gender <= 0 || gender == userInfo.value.gender) return;
     userInfo.update((user) {
diff --git a/apps/client/lib/modules/settings/views/settings_view.dart b/apps/client/lib/modules/settings/views/settings_view.dart
index 1e349ca9..47451c31 100644
--- a/apps/client/lib/modules/settings/views/settings_view.dart
+++ b/apps/client/lib/modules/settings/views/settings_view.dart
@@ -740,26 +740,16 @@ class SettingsView extends GetView<SettingsController> {
                 children: [
                   GestureDetector(
                     onTap: controller.handleSecretTap, // 点击事件
-                    child: Container(
-                      width: 40.w,
-                      height: 40.w,
-                      decoration: BoxDecoration(
-                        gradient: LinearGradient(
-                          colors: [
-                            const Color(0xFF2196F3)
-                                .withValues(alpha: isDarkMode ? 0.7 : 1.0),
-                            const Color(0xFF9C27B0)
-                                .withValues(alpha: isDarkMode ? 0.7 : 1.0)
-                          ],
-                          begin: Alignment.topLeft,
-                          end: Alignment.bottomRight,
-                        ),
-                        borderRadius: BorderRadius.circular(12.r),
-                      ),
-                      child: Icon(
-                        Icons.headphones,
-                        size: 24.w,
-                        color: Colors.white,
+                    // 关于应用的 logo：用 App 自己的图标，替掉原来的
+                    // 「蓝紫渐变 + 耳机 glyph」。asset 是无圆角正方形，
+                    // 圆角由 ClipRRect 切（与启动页同一张图、同一套做法）。
+                    child: ClipRRect(
+                      borderRadius: BorderRadius.circular(12.r),
+                      child: Image.asset(
+                        'assets/images/app_icon.png',
+                        width: 40.w,
+                        height: 40.w,
+                        fit: BoxFit.cover,
                       ),
                     ),
                   ),
@@ -844,7 +834,7 @@ class SettingsView extends GetView<SettingsController> {
           child: Column(
             children: [
               Text(
-                '© 2025 Eaimar Technologies',
+                '© 2026 Eaimar Technologies',
                 style: TextStyle(
                   fontSize: 12.sp,
                   color: isDarkMode ? Colors.grey[400] : Colors.grey[500],
diff --git a/apps/client/lib/modules/speech_test/views/speech_test_view.dart b/apps/client/lib/modules/speech_test/views/speech_test_view.dart
index afea231e..62a42e41 100644
--- a/apps/client/lib/modules/speech_test/views/speech_test_view.dart
+++ b/apps/client/lib/modules/speech_test/views/speech_test_view.dart
@@ -106,7 +106,9 @@ class SpeechTestView extends GetView<SpeechTestController> {
       case SpeechServiceType.google:
         return 'Google语音';
       case SpeechServiceType.alibaba:
-        return '阿里语音';
+        return '阿里语音(旧版)';
+      case SpeechServiceType.alibaba35:
+        return '阿里语音3.5(声音复刻)';
       case SpeechServiceType.volcano:
         return '豆包语音';
       case SpeechServiceType.flutter:
diff --git a/apps/client/lib/modules/splash/views/splash_view.dart b/apps/client/lib/modules/splash/views/splash_view.dart
index 7a7d232a..692ae2ad 100644
--- a/apps/client/lib/modules/splash/views/splash_view.dart
+++ b/apps/client/lib/modules/splash/views/splash_view.dart
@@ -75,15 +75,14 @@ class SplashView extends GetView<SplashController> {
           ),
         );
       },
+      // 启动页 logo：直接用 App 自己的图标，不再用「蓝紫渐变 + 耳机 glyph」。
+      // assets/images/app_icon.png 是 iOS AppIcon 1024 缩到 512 的副本；
+      // 它是**不带圆角的正方形**（RGB 无 alpha），圆角靠外面这层 ClipRRect 切，
+      // 所以半径改这里就行。换 App 图标时记得同步替换这个 asset。
       child: Container(
         width: 96.w,
         height: 96.w,
         decoration: BoxDecoration(
-          gradient: const LinearGradient(
-            begin: Alignment.topLeft,
-            end: Alignment.bottomRight,
-            colors: [Colors.blue, Colors.purple],
-          ),
           borderRadius: BorderRadius.circular(24.r),
           boxShadow: [
             BoxShadow(
@@ -94,10 +93,14 @@ class SplashView extends GetView<SplashController> {
             ),
           ],
         ),
-        child: Icon(
-          Icons.headset,
-          size: 48.sp,
-          color: Colors.white,
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(24.r),
+          child: Image.asset(
+            'assets/images/app_icon.png',
+            width: 96.w,
+            height: 96.w,
+            fit: BoxFit.cover,
+          ),
         ),
       ),
     );
diff --git a/apps/client/lib/routes/app_pages.dart b/apps/client/lib/routes/app_pages.dart
index 9e07959d..a8a92789 100644
--- a/apps/client/lib/routes/app_pages.dart
+++ b/apps/client/lib/routes/app_pages.dart
@@ -68,7 +68,7 @@ import '../modules/agent/views/agent_view.dart';
 import '../modules/emai/views/emai_view.dart';
 import '../modules/emai/bindings/emai_binding.dart';
 import '../modules/agent/bindings/agent_binding.dart';
-import '../modules/ota_upgrade/views/ota_upgrade_view.dart';
+import '../modules/ota_upgrade/views/bes_ota_upgrade_view.dart';
 import '../modules/ota_upgrade/bindings/ota_upgrade_binding.dart';
 import '../modules/realtime/bindings/realtime_binding.dart';
 import '../modules/realtime/views/realtime_view.dart';
@@ -151,7 +151,9 @@ abstract class AppPages {
     ),
     GetPage(
       name: Routes.OTA_UPGRADE,
-      page: () => const OtaUpgradeView(),
+      // 本项目只有恒玄耳机：固件页走 BES 链路（bes_ota_manager 插件自管 SPP）。
+      // 杰理那版 OtaUpgradeView/OtaUpgradeController 留着但不再挂路由。
+      page: () => const BesOtaUpgradeView(),
       binding: OtaUpgradeBinding(),
       transition: Transition.rightToLeft,
       transitionDuration: Duration(milliseconds: 250),
diff --git a/apps/client/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt b/apps/client/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt
index 0bee2b77..29b480db 100644
--- a/apps/client/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt
+++ b/apps/client/local_plugins/azure_speech/android/src/main/kotlin/com/yunqiinnovation/azure_speech/AzureSpeechPlugin.kt
@@ -1394,6 +1394,16 @@ class AzureSpeechPlugin : BleService.Callback, FlutterPlugin, ActivityAware,
                     val alibabaAppKey = call.argument<String>("alibabaAppKey") ?: ""
                     val alibabaAppId = call.argument<String>("alibabaAppId") ?: ""
                     val alibabaAppURL = call.argument<String>("alibabaAppURL") ?: ""
+                    // 阿里 3.5（声音复刻）相关入参。老版本 Dart 不传这几个，
+                    // 取不到就退回 alibabaAppId / 关闭复刻，行为与改动前一致。
+                    val alibabaModel =
+                        call.argument<String>("alibabaModel")?.takeIf { it.isNotBlank() }
+                            ?: alibabaAppId
+                    val alibabaEnableVoiceClone =
+                        call.argument<Boolean>("alibabaEnableVoiceClone") ?: false
+                    val alibabaVoiceCloneFrequency =
+                        call.argument<String>("alibabaVoiceCloneFrequency")
+                            ?.takeIf { it.isNotBlank() } ?: "once"
                     if (currentAstProvider == "iflytek" ) {
                         Log.d(tag, "initializeIntegrated: iflytek")
                         val azureConfig = IflytekIntegratedSpeechService.AzureConfiguration(
@@ -1573,21 +1583,26 @@ class AzureSpeechPlugin : BleService.Callback, FlutterPlugin, ActivityAware,
                     } else if (currentAstProvider == "alibaba" ) {
                         Log.d(tag, "initializeIntegrated: alibaba")
 
+                        Log.d(tag, "initializeIntegrated: alibaba model=$alibabaModel voiceClone=$alibabaEnableVoiceClone")
                         val bailianConfigA = AliyunBailianE2EHelper.Config(
                             apiKey = alibabaAppKey,
-                            appId = alibabaAppId,
+                            appId = alibabaModel,
                             wsUrl = alibabaAppURL,
                             sourceLanguage = translationLang0,
                             targetLanguage = translationLang1,
-                            voice = ttsLang1
+                            voice = ttsLang1,
+                            enableVoiceClone = alibabaEnableVoiceClone,
+                            voiceCloneFrequency = alibabaVoiceCloneFrequency
                         )
                         val bailianConfigB = AliyunBailianE2EHelper.Config(
                             apiKey = alibabaAppKey,
-                            appId = alibabaAppId,
+                            appId = alibabaModel,
                             wsUrl = alibabaAppURL,
                             sourceLanguage = translationLang1,
                             targetLanguage = translationLang0,
-                            voice = ttsLang0
+                            voice = ttsLang0,
+                            enableVoiceClone = alibabaEnableVoiceClone,
+                            voiceCloneFrequency = alibabaVoiceCloneFrequency
                         )
 
                         val callbackA = AliyunAstCallback(
diff --git a/apps/client/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift b/apps/client/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift
index e4649c5a..a4065fe8 100644
--- a/apps/client/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift
+++ b/apps/client/local_plugins/azure_speech/ios/azure_speech/Sources/azure_speech/AzureSpeechPlugin.swift
@@ -1058,6 +1058,14 @@ private func sendAudioDataEvent(_ event: [String: Any]) {
             let alibabaAppKey = (args["alibabaAppKey"] as? String) ?? ""
             let alibabaAppId = (args["alibabaAppId"] as? String) ?? ""
             let alibabaAppURL = (args["alibabaAppURL"] as? String) ?? ""
+            // 阿里 3.5（声音复刻）相关入参。老版本 Dart 不传这几个，
+            // 取不到就退回 alibabaAppId / 关闭复刻，行为与改动前一致。
+            let alibabaModelArg = (args["alibabaModel"] as? String) ?? ""
+            let alibabaModel = alibabaModelArg.isEmpty ? alibabaAppId : alibabaModelArg
+            let alibabaEnableVoiceClone = (args["alibabaEnableVoiceClone"] as? Bool) ?? false
+            let alibabaVoiceCloneFrequencyArg = (args["alibabaVoiceCloneFrequency"] as? String) ?? ""
+            let alibabaVoiceCloneFrequency =
+                alibabaVoiceCloneFrequencyArg.isEmpty ? "once" : alibabaVoiceCloneFrequencyArg
 
             os_log("[AST-INIT] provider=%{public}@ lang0=%{public}@ lang1=%{public}@ trans0=%{public}@ trans1=%{public}@ tts0=%{public}@ tts1=%{public}@",
                    log: ctLog, type: .info, provider, lang0, lang1, translationLang0, translationLang1, ttsLang0, ttsLang1)
@@ -1158,23 +1166,31 @@ private func sendAudioDataEvent(_ event: [String: Any]) {
                 // 初始化阿里百炼（双路）
                 os_log("[AST-INIT] Alibaba: configuring A(%{public}@->%{public}@) B(%{public}@->%{public}@)",
                        log: ctLog, type: .info, translationLang0, translationLang1, translationLang1, translationLang0)
+                // ⚠️ appId 原来在这里写死成旧模型名，等于 Dart 传的模型永远不生效。
+                // 现在跟着 alibabaModel 走（3.5 / 旧版由 Dart 侧按语言档位决定）。
+                os_log("[AST-INIT] Alibaba model=%{public}@ voiceClone=%d",
+                       log: ctLog, type: .info, alibabaModel, alibabaEnableVoiceClone ? 1 : 0)
                 var cfgA = AliyunBailianE2EHelper.Config()
                 cfgA.wsUrl = alibabaAppURL
                 cfgA.apiKey = alibabaAppKey
-                cfgA.appId = "qwen3-livetranslate-flash-realtime"
+                cfgA.appId = alibabaModel
                 cfgA.sampleRate = 16000
                 cfgA.sourceLanguage = translationLang0
                 cfgA.targetLanguage = translationLang1
                 cfgA.voice = ttsLang1
+                cfgA.enableVoiceClone = alibabaEnableVoiceClone
+                cfgA.voiceCloneFrequency = alibabaVoiceCloneFrequency
 
                 var cfgB = AliyunBailianE2EHelper.Config()
                 cfgB.wsUrl = alibabaAppURL
                 cfgB.apiKey = alibabaAppKey
-                cfgB.appId = "qwen3-livetranslate-flash-realtime"
+                cfgB.appId = alibabaModel
                 cfgB.sampleRate = 16000
                 cfgB.sourceLanguage = translationLang1
                 cfgB.targetLanguage = translationLang0
                 cfgB.voice = ttsLang0
+                cfgB.enableVoiceClone = alibabaEnableVoiceClone
+                cfgB.voiceCloneFrequency = alibabaVoiceCloneFrequency
 
                 let cbA = AliyunCallbackProxy(plugin: self, serviceId: "A", direction: "\(translationLang0)->\(translationLang1)", targetLanguage: translationLang1)
                 let cbB = AliyunCallbackProxy(plugin: self, serviceId: "B", direction: "\(translationLang1)->\(translationLang0)", targetLanguage: translationLang0)
diff --git a/apps/client/local_plugins/bes_ota_manager/LICENSE b/apps/client/local_plugins/bes_ota_manager/LICENSE
new file mode 100644
index 00000000..ba75c69f
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/LICENSE
@@ -0,0 +1 @@
+TODO: Add your license here.
diff --git a/apps/client/local_plugins/bes_ota_manager/android/build.gradle b/apps/client/local_plugins/bes_ota_manager/android/build.gradle
new file mode 100644
index 00000000..806e4b96
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/build.gradle
@@ -0,0 +1,78 @@
+group = "com.example.bes_ota_manager"
+version = "1.0-SNAPSHOT"
+
+buildscript {
+    ext.kotlin_version = "2.1.0"
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath("com.android.tools.build:gradle:8.9.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
+
+android {
+    namespace = "com.example.bes_ota_manager"
+
+    compileSdk = 36
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11
+    }
+
+    sourceSets {
+        // Kotlin bridge lives under src/main/kotlin; the bulk-copied BES OTA SDK
+        // (Java) lives under src/main/java with its original package layout.
+        main.java.srcDirs += "src/main/kotlin"
+        main.java.srcDirs += "src/main/java"
+        test.java.srcDirs += "src/test/kotlin"
+    }
+
+    defaultConfig {
+        minSdk = 24
+    }
+
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+
+            testLogging {
+               events "passed", "skipped", "failed", "standardOut", "standardError"
+               outputs.upToDateWhen {false}
+               showStandardStreams = true
+            }
+        }
+    }
+}
+
+dependencies {
+    // BES OTA SDK sources reference these annotations/support libs.
+    implementation("androidx.annotation:annotation:1.7.1")
+    implementation("androidx.core:core:1.13.1")
+    // Declared per BES SDK packaging convention. The OTA path copied here does not
+    // currently reference these symbols, but they are kept so the broader SDK
+    // remains drop-in compatible if more packages are added later.
+    implementation("com.google.code.gson:gson:2.8.6")
+    implementation("io.reactivex.rxjava2:rxjava:2.0.5")
+
+    testImplementation("org.jetbrains.kotlin:kotlin-test")
+    testImplementation("org.mockito:mockito-core:5.0.0")
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/settings.gradle b/apps/client/local_plugins/bes_ota_manager/android/settings.gradle
new file mode 100644
index 00000000..ee3b15b1
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'bes_ota_manager'
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/AndroidManifest.xml b/apps/client/local_plugins/bes_ota_manager/android/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..3e9eb2b8
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/AndroidManifest.xml
@@ -0,0 +1,9 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_SCAN"
+        android:usesPermissionFlags="neverForLocation" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+</manifest>
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/BesSdkConstants.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/BesSdkConstants.java
new file mode 100644
index 00000000..4266f6ea
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/BesSdkConstants.java
@@ -0,0 +1,73 @@
+package com.bes.bessdk;
+
+import java.util.UUID;
+
+public class BesSdkConstants {
+
+    public static final int DEFAULT_MTU = 512;
+
+
+    public static final String           BES_CONNECT_SERVICE = "CONNECT_SERVICE";
+    public static final String    BES_CONNECT_CHARACTERISTIC = "BES_CONNECT_CHARACTERISTIC";
+    public static final String        BES_CONNECT_DESCRIPTOR = "BES_CONNECT_DESCRIPTOR";
+
+    public static final UUID    BES_OTA_SERVICE_OTA_UUID_OLD = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
+    public static final UUID        BES_OTA_SERVICE_OTA_UUID = UUID.fromString("66666666-6666-6666-6666-666666666666");
+    public static final UUID BES_OTA_CHARACTERISTIC_OTA_UUID = UUID.fromString("77777777-7777-7777-7777-777777777777");
+    public static final UUID     BES_OTA_DESCRIPTOR_OTA_UUID = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
+
+    public static final UUID       BES_TOTA_SERVICE_OTA_UUID = UUID.fromString("86868686-8686-8686-8686-868686868686");
+    public static final UUID BES_TOTA_CHARACTERISTI_OTA_UUID = UUID.fromString("97979797-9797-9797-9797-979797979797");
+    public static final UUID    BES_TOTA_DESCRIPTOR_OTA_UUID = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
+ //WIFI UUID
+    public static final UUID                BES_SERVICE_UUID = UUID.fromString("05000500-0000-1000-8000-009478563412");
+    public static final UUID      BES_CHARACTERISTIC_TX_UUID = UUID.fromString("06000600-0000-1000-8000-009578563412");
+    public static final UUID      BES_CHARACTERISTIC_RX_UUID = UUID.fromString("07000700-0000-1000-8000-009678563412");
+
+    public static final UUID           BES_GATT_SERVICE_UUID = UUID.fromString("00001801-0000-1000-8000-00805f9b34fb");
+    public static final UUID    BES_GATT_DESCRIPTOR_OTA_UUID = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
+
+    public static final UUID                 BES_SPP_CONNECT = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
+
+    public static final UUID         THROUGHPUT_SERVICE_UUID = UUID.fromString("65786365-6c70-6f69-6e74-2e636f820000");
+    public static final UUID  THROUGHPUT_CHARACTERISTIC_TX_UUID = UUID.fromString("65786365-6c70-6f69-6e74-2e636f820002");
+    public static final UUID  THROUGHPUT_CHARACTERISTIC_RX_UUID = UUID.fromString("65786365-6c70-6f69-6e74-2e636f820001");
+    public static final UUID        BES_DATA_DESCRIPTOR_UUID = UUID.fromString("00002902-0000-1000-8000-00805f9b34fb");
+
+
+    public static final int              BES_CONNECT_SUCCESS = 0x0000029a;
+    public static final int                BES_CONNECT_ERROR = 0x000001bc;
+
+    public static final int               BES_NOTIFY_SUCCESS = 0x0000029b;
+    public static final int                 BES_NOTIFY_ERROR = 0x000001bd;
+
+    //tota
+    public static final int                   BES_TOTA_START = 0x00000300;
+    public static final int                 BES_TOTA_CONFIRM = 0x00000301;
+    public static final int                 BES_TOTA_SUCCESS = 0x00000302;
+    public static final int                   BES_TOTA_ERROR = 0x00000303;
+    public final static String       BES_TOTA_ENCRYPTION_KEY = "BES_TOTA_ENCRYPTION_KEY";
+    public final static String           BES_TOTA_USE_TOTAV2 = "BES_TOTA_USE_TOTAV2";
+    public final static boolean    BES_TOTA_ENCRYPTION_VALUE = true;
+    public final static boolean    BES_TOTA_USE_TOTAV2_VALUE = true;
+
+    //handle_msg
+    public static final int                     MSG_TIME_OUT = 0x00000404;
+    public static final int              MSG_PARAMETER_ERROR = 0x00000405;
+
+    //LOG
+    public static final String             BES_SAVE_LOG_OTA = "BESOTA.txt";
+    public final static String             BES_SAVE_LOG_KEY = "BES_SAVE_LOG";
+    public final static boolean          BES_SAVE_LOG_VALUE = true;
+    public final static String            BES_SAVE_LOG_NAME = "BES_SAVE_LOG_NAME";
+
+    public final static String        CUSTOMER_SERVICE_UUID           = "CUSTOMER_SERVICE_UUID";
+    public final static String        CUSTOMER_CHARACTERISTIC_TX_UUID = "CUSTOMER_CHARACTERISTIC_TX_UUID";
+    public final static String        CUSTOMER_CHARACTERISTIC_RX_UUID = "CUSTOMER_CHARACTERISTIC_RX_UUID";
+    public final static String        CUSTOMER_DESCRIPTOR_UUID        = "CUSTOMER_DESCRIPTOR_UUID";
+
+    public final static String          BES_default_INTERVAL = "BES_default_INTERVAL";
+    public final static boolean         BES_default_INTERVAL_VALUE = true;
+    public final static String          BES_BLE_INTERVAL = "BES_BLE_INTERVAL";
+    public final static String          BES_SPP_INTERVAL = "BES_SPP_INTERVAL";
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/connect/BTService.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/connect/BTService.java
new file mode 100644
index 00000000..4b0a9baf
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/connect/BTService.java
@@ -0,0 +1,39 @@
+package com.bes.bessdk.connect;
+
+import android.content.Context;
+
+import com.bes.sdk.utils.DeviceProtocol;
+
+public class BTService {
+
+    protected static Object mOtaLock = new Object();
+
+    public static boolean sendData(Context context, DeviceProtocol deviceProtocol, byte[] data) {
+        if (context == null) {
+            return false;
+        }
+        synchronized (mOtaLock) {
+            if (deviceProtocol == DeviceProtocol.PROTOCOL_BLE || deviceProtocol == DeviceProtocol.PROTOCOL_GATT_BR_EDR) {
+                return BleConnector.getsConnector(context, null).write(data);
+            } else if (deviceProtocol == DeviceProtocol.PROTOCOL_SPP) {
+                return SppConnector.getsConnector(context).write(data);
+            }
+        }
+        return false;
+    }
+
+    public static boolean sendDataWithoutResponse(Context context, DeviceProtocol deviceProtocol, byte[] data) {
+        if (context == null) {
+            return false;
+        }
+        synchronized (mOtaLock) {
+            if (deviceProtocol == DeviceProtocol.PROTOCOL_BLE|| deviceProtocol == DeviceProtocol.PROTOCOL_GATT_BR_EDR) {
+                return BleConnector.getsConnector(context, null).writeWithoutResponse(data);
+            } else if (deviceProtocol == DeviceProtocol.PROTOCOL_SPP) {
+                return SppConnector.getsConnector(context).write(data);
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/connect/BleConnector.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/connect/BleConnector.java
new file mode 100644
index 00000000..e592bf53
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/connect/BleConnector.java
@@ -0,0 +1,429 @@
+package com.bes.bessdk.connect;
+
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothGatt;
+import android.bluetooth.BluetoothGattCallback;
+import android.bluetooth.BluetoothGattCharacteristic;
+import android.bluetooth.BluetoothGattDescriptor;
+import android.bluetooth.BluetoothGattService;
+import android.content.Context;
+import android.os.Build;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bes.bessdk.BesSdkConstants;
+import com.bes.bessdk.scan.BtHeleper;
+import com.bes.bessdk.service.base.BesBaseConnectListener;
+import com.bes.bessdk.utils.ArrayUtil;
+import com.bes.bessdk.utils.SPHelper;
+import com.bes.sdk.connect.DeviceConnector;
+import com.bes.sdk.device.HmDevice;
+import com.bes.sdk.message.BaseMessage;
+import com.bes.sdk.utils.DeviceProtocol;
+import com.besall.allbase.common.utils.LogUtils;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.UUID;
+
+import static android.bluetooth.BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE;
+import static com.bes.bessdk.BesSdkConstants.BES_CONNECT_ERROR;
+import static com.bes.bessdk.BesSdkConstants.BES_CONNECT_SUCCESS;
+import static com.bes.bessdk.BesSdkConstants.BES_NOTIFY_ERROR;
+import static com.bes.bessdk.BesSdkConstants.BES_NOTIFY_SUCCESS;
+import static com.bes.bessdk.BesSdkConstants.BES_SAVE_LOG_OTA;
+import static com.bes.bessdk.BesSdkConstants.DEFAULT_MTU;
+import static com.bes.sdk.utils.DeviceProtocol.PROTOCOL_BLE;
+import static com.bes.sdk.utils.DeviceProtocol.PROTOCOL_GATT_BR_EDR;
+
+public class BleConnector implements DeviceConnector {
+    protected final String TAG = getClass().getSimpleName();
+
+    private static volatile BleConnector sConnector;
+    private BluetoothGatt mBluetoothGatt;
+    private BluetoothGattCharacteristic mCharacteristicTx;
+
+    private Object mStateLock = new Object();
+
+    private static Context mContext;
+    ConnectionListener mConnectionListener;
+    private static List<ConnectionListener> mConnectListeners;
+    private Object mListenerLock = new Object();
+
+    static BesBaseConnectListener mBesBaseConnectListener;
+    private HmDevice mHmDevice;
+    private BluetoothDevice mDevice;
+
+    private int mMtu;
+    private UUID mDescriptor;
+
+    public static BleConnector getsConnector(Context context, BesBaseConnectListener besBaseConnectListener) {
+        mContext = context;
+        if (besBaseConnectListener != null) {
+            mBesBaseConnectListener = besBaseConnectListener;
+        }
+        if (sConnector == null) {
+            synchronized (BleConnector.class) {
+                if (sConnector == null) {
+                    sConnector = new BleConnector();
+                    mConnectListeners = new ArrayList<>();
+                }
+            }
+        }
+        return sConnector;
+    }
+
+    @Override
+    public List<DeviceProtocol> getSupportedProtocols() {
+        List<DeviceProtocol> sL = new ArrayList<>();
+        sL.add(PROTOCOL_BLE);
+        return sL;
+    }
+
+    @Override
+    public boolean isProtocolSupported(DeviceProtocol deviceProtocol) {
+        if (deviceProtocol == PROTOCOL_BLE) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void connect(HmDevice device) {
+        if (device == null || mContext == null) {
+            return;
+        }
+        mHmDevice = device;
+        connectWithListener(null);
+    }
+
+    @Override
+    public void connect(HmDevice device, ConnectionListener connectionListener) {
+        if (device == null || connectionListener == null || mContext == null) {
+            return;
+        }
+        mHmDevice = device;
+        connectWithListener(connectionListener);
+    }
+
+    private void connectWithListener(ConnectionListener connectionListener) {
+        if (connectionListener != null) {
+            mConnectionListener = connectionListener;
+        }
+        String address = mHmDevice.getPreferredProtocol() == PROTOCOL_GATT_BR_EDR ? mHmDevice.getDeviceMAC() : mHmDevice.getBleAddress();
+        LOG(TAG, "connect: -----" + address);
+        mDevice = BtHeleper.getBluetoothAdapter(mContext).getRemoteDevice(address);
+        startConnect();
+    }
+
+    
+    private void startConnect() {
+        if (mBluetoothGatt != null) {
+            mBluetoothGatt = null;
+        }
+        if (mHmDevice.getPreferredProtocol() == PROTOCOL_GATT_BR_EDR) {
+            mBluetoothGatt = mDevice.connectGatt(mContext, false, mBluetoothGattCallback, BluetoothDevice.TRANSPORT_BREDR);
+        } else {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && BtHeleper.getBluetoothAdapter(mContext).isLe2MPhySupported()) {
+                LOG(TAG, "startConnect: -------PHY_LE_2M_MASK");
+                mBluetoothGatt = mDevice.connectGatt(mContext, false, mBluetoothGattCallback, BluetoothDevice.TRANSPORT_LE, BluetoothDevice.PHY_LE_2M_MASK, null);
+                mBluetoothGatt.setPreferredPhy(BluetoothDevice.PHY_LE_2M_MASK, BluetoothDevice.PHY_LE_2M_MASK, BluetoothDevice.PHY_OPTION_NO_PREFERRED);
+            } else {
+                LOG(TAG, "startConnect: -------PHY_LE_1M_MASK");
+                mBluetoothGatt = mDevice.connectGatt(mContext, false, mBluetoothGattCallback);
+            }
+        }
+    }
+
+    private BluetoothGattCallback mBluetoothGattCallback = new BluetoothGattCallback() {
+        @Override
+        public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState) {
+            super.onConnectionStateChange(gatt, status, newState);
+            mBluetoothGatt = gatt;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && BtHeleper.getBluetoothAdapter(mContext).isLe2MPhySupported()) {
+                mBluetoothGatt.setPreferredPhy(BluetoothDevice.PHY_LE_2M_MASK, BluetoothDevice.PHY_LE_2M_MASK, BluetoothDevice.PHY_OPTION_NO_PREFERRED);
+            }
+            LOG(TAG, "onConnectionStateChange: -----");
+            if (status == BluetoothGatt.GATT_SUCCESS && newState == BluetoothGatt.STATE_CONNECTED) {
+                notifyConnectionStateChanged(true);
+            } else {
+                close();
+            }
+        }
+
+        @Override
+        public void onServicesDiscovered(BluetoothGatt gatt, int status) {
+            super.onServicesDiscovered(gatt, status);
+            LOG(TAG, "onServicesDiscovered status: -----" + status);
+            mBluetoothGatt = gatt;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && BtHeleper.getBluetoothAdapter(mContext).isLe2MPhySupported()) {
+                mBluetoothGatt.setPreferredPhy(BluetoothDevice.PHY_LE_2M_MASK, BluetoothDevice.PHY_LE_2M_MASK, BluetoothDevice.PHY_OPTION_NO_PREFERRED);
+            }
+            if (status != BluetoothGatt.GATT_SUCCESS) {
+                notifyServicesDiscovered(BES_CONNECT_ERROR);
+                refresh();
+                close();
+            } else {
+                notifyServicesDiscovered(BES_CONNECT_SUCCESS);
+            }
+        }
+
+        @Override
+        public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
+            super.onCharacteristicWrite(gatt, characteristic, status);
+            if (status == BluetoothGatt.GATT_SUCCESS) {
+                mBesBaseConnectListener.notifyWrite(BES_NOTIFY_SUCCESS);
+            } else {
+                mBesBaseConnectListener.notifyWrite(BES_NOTIFY_ERROR);
+            }
+        }
+
+        @Override
+        public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
+            super.onCharacteristicChanged(gatt, characteristic);
+            LOG(TAG, "onCharacteristicChanged: -----");
+            if (characteristic == null) {
+            } else {
+                notifyReceive(characteristic.getValue());
+            }
+        }
+        
+        @Override
+        public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+            super.onDescriptorWrite(gatt, descriptor, status);
+            LOG(TAG, "onDescriptorWrite: -----");
+            if (descriptor.getUuid().equals(mDescriptor)) {
+                if (mConnectionListener != null) {
+                    mConnectionListener.onStatusChanged(mHmDevice, status == BluetoothGatt.GATT_SUCCESS ? BES_CONNECT_SUCCESS : BES_CONNECT_ERROR, PROTOCOL_BLE);
+                }
+                synchronized (mListenerLock) {
+                    for (ConnectionListener cl : mConnectListeners) {
+                        cl.onStatusChanged(mHmDevice, status == BluetoothGatt.GATT_SUCCESS ? BES_CONNECT_SUCCESS : BES_CONNECT_ERROR, PROTOCOL_BLE);
+                    }
+                }
+            }
+        }
+
+        @Override
+        public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
+            super.onMtuChanged(gatt, mtu, status);
+            LOG(TAG, "onMtuChanged: -----" + mtu);
+            if (status == BluetoothGatt.GATT_SUCCESS) {
+                mMtu = mtu;
+                enableCharacteristicNotification();
+            }
+        }
+    };
+
+    private boolean discoverServices() {
+        if (mBluetoothGatt != null) {
+            return mBluetoothGatt.discoverServices();
+        }
+        return false;
+    }
+
+    private void notifyServicesDiscovered(int status) {
+        LOG(TAG, "onServicesDiscovered: -----" + status);
+        if (setWriteCharacteristic(UUID.fromString((String) SPHelper.getPreference(mContext, BesSdkConstants.BES_CONNECT_SERVICE, BesSdkConstants.BES_OTA_SERVICE_OTA_UUID.toString())), UUID.fromString((String) SPHelper.getPreference(mContext, BesSdkConstants.BES_CONNECT_CHARACTERISTIC, BesSdkConstants.BES_OTA_CHARACTERISTIC_OTA_UUID.toString())))) {
+            if (!requestMtu(DEFAULT_MTU)) {
+                enableCharacteristicNotification();
+            } else if (mHmDevice.getPreferredProtocol() == DeviceProtocol.PROTOCOL_GATT_BR_EDR) {
+                enableCharacteristicNotification();
+            }
+        } else {
+
+        }
+    }
+
+    private void enableCharacteristicNotification() {
+
+        if (UUID.fromString((String) SPHelper.getPreference(mContext, BesSdkConstants.BES_CONNECT_SERVICE, BesSdkConstants.BES_SERVICE_UUID.toString())).equals(BesSdkConstants.BES_SERVICE_UUID)){
+            mConnectionListener.onStatusChanged(mHmDevice, BES_CONNECT_SUCCESS, PROTOCOL_BLE);
+            return;
+        }
+        if (!enableCharacteristicNotification(UUID.fromString((String) SPHelper.getPreference(mContext, BesSdkConstants.BES_CONNECT_SERVICE, BesSdkConstants.BES_OTA_SERVICE_OTA_UUID.toString())), UUID.fromString((String) SPHelper.getPreference(mContext, BesSdkConstants.BES_CONNECT_CHARACTERISTIC, BesSdkConstants.BES_OTA_CHARACTERISTIC_OTA_UUID.toString())), UUID.fromString((String) SPHelper.getPreference(mContext, BesSdkConstants.BES_CONNECT_DESCRIPTOR, BesSdkConstants.BES_OTA_DESCRIPTOR_OTA_UUID.toString())))) {
+            refresh();
+            close();
+        } else {
+            LOG(TAG, "enableCharacteristicNotification: -----true");
+        }
+    }
+
+    private boolean setWriteCharacteristic(UUID service, UUID characteristic) {
+        LOG(TAG, "setWriteCharacteristic service----- " + service.toString() + "; characteristic " + characteristic.toString());
+        if (mBluetoothGatt == null) {
+            return false;
+        }
+        BluetoothGattService gattService = mBluetoothGatt.getService(service);
+        if (gattService == null) {
+            return false;
+        }
+        mCharacteristicTx = gattService.getCharacteristic(characteristic);
+        if (mCharacteristicTx == null) {
+            return false;
+        }
+        return true;
+    }
+
+    private boolean requestMtu(int mtu) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return false;
+        }
+        if (mBluetoothGatt != null) {
+            return mBluetoothGatt.requestMtu(mtu);
+        }
+        return false;
+    }
+
+    private boolean enableCharacteristicNotification(UUID service, UUID rxCharacteristic, UUID descriptor) {
+        if (mBluetoothGatt != null) {
+            BluetoothGattService gattService = mBluetoothGatt.getService(service);
+            if (gattService == null) {
+                return false;
+            }
+            BluetoothGattCharacteristic gattCharacteristic = gattService.getCharacteristic(rxCharacteristic);
+            if (gattCharacteristic == null) {
+                return false;
+            }
+            BluetoothGattDescriptor gattDescriptor = gattCharacteristic.getDescriptor(descriptor);
+            if (gattDescriptor == null) {
+                return false;
+            }
+            if (!mBluetoothGatt.setCharacteristicNotification(gattCharacteristic, true)) {
+                return false;
+            }
+            if (!gattDescriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE)) {
+                return false;
+            }
+            mDescriptor = descriptor;
+            return mBluetoothGatt.writeDescriptor(gattDescriptor);
+        }
+        return false;
+    }
+
+    private void notifyConnectionStateChanged(boolean connected) {
+        synchronized (mStateLock) {
+            if (connected) {
+                if (discoverServices()) {
+                    LOG(TAG, "discoverServices: -----true");
+                } else {
+                    LOG(TAG, "discoverServices: -----false");
+                }
+            } else {
+                LOG(TAG, "notifyConnectionStateChanged: -----false");
+                if (mConnectionListener != null) {
+                    mConnectionListener.onStatusChanged(mHmDevice, BES_CONNECT_ERROR, PROTOCOL_BLE);
+                }
+                synchronized (mListenerLock) {
+                    for (ConnectionListener cl : mConnectListeners) {
+                        cl.onStatusChanged(mHmDevice, BES_CONNECT_ERROR, PROTOCOL_BLE);
+                    }
+                }
+            }
+        }
+    }
+
+    public boolean write(byte[] data) {
+        LOG(TAG, "write: ------" + ArrayUtil.toHex(data));
+        if (mBluetoothGatt != null) {
+            mCharacteristicTx.setValue(data);
+            boolean ret = mBluetoothGatt.writeCharacteristic(mCharacteristicTx);
+            return ret ;
+        }
+        return false;
+    }
+
+    public boolean writeWithoutResponse(byte[] data) {
+        if (mBluetoothGatt != null) {
+            mCharacteristicTx.setWriteType(WRITE_TYPE_NO_RESPONSE);
+            mCharacteristicTx.setValue(data);
+            boolean ret = mBluetoothGatt.writeCharacteristic(mCharacteristicTx);
+            return ret ;
+        }
+        return false;
+    }
+
+    private void notifyReceive(byte[] data) {
+        BaseMessage baseMessage = new BaseMessage();
+        baseMessage.setPush(true);
+        baseMessage.setMsgContent(data);
+        if (mConnectionListener != null) {
+            mConnectionListener.onDataReceived(baseMessage);
+        }
+        synchronized (mListenerLock) {
+            for (ConnectionListener cl : mConnectListeners) {
+                cl.onDataReceived(baseMessage);
+            }
+        }
+    }
+
+    public void close() {
+        if (mBluetoothGatt != null) {
+            mBluetoothGatt.disconnect();
+        }
+        if (mBluetoothGatt != null) {
+            mBluetoothGatt.close();
+        }
+        notifyConnectionStateChanged(false);
+        mBluetoothGatt = null;
+    }
+
+    private boolean refresh() {
+        try {
+            if (mBluetoothGatt != null) {
+                Method refresh = mBluetoothGatt.getClass().getMethod("refresh", new Class[0]);
+                return ((Boolean) refresh.invoke(mBluetoothGatt, new Object[0])).booleanValue();
+            }
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    @Override
+    public void disconnect(HmDevice device) {
+        close();
+    }
+
+    @Override
+    public void registerConnectionListener(ConnectionListener connectionListener) {
+        synchronized (mListenerLock) {
+            if (!mConnectListeners.contains(connectionListener)) {
+                mConnectListeners.add(connectionListener);
+            }
+        }
+    }
+
+    @Override
+    public void unregisterConnectionListener(ConnectionListener connectionListener) {
+        if (mConnectListeners.contains(connectionListener)) {
+            mConnectListeners.remove(connectionListener);
+        }
+    }
+
+    public void LOG(String TAG, String msg) {
+        if (mContext == null) {
+            return;
+        }
+        String saveLogName = (String) SPHelper.getPreference(mContext, BesSdkConstants.BES_SAVE_LOG_NAME, "");
+        boolean saveLog = (boolean) SPHelper.getPreference(mContext, BesSdkConstants.BES_SAVE_LOG_KEY, BesSdkConstants.BES_SAVE_LOG_VALUE);
+        if (saveLog) {
+            if (saveLogName.equals(BES_SAVE_LOG_OTA)) {
+                LogUtils.writeForOTA(TAG, msg, saveLogName);
+            } else if (saveLogName.length() > 0){
+                LogUtils.writeForLOG(TAG, msg, saveLogName);
+            }
+        }
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/connect/SppConnector.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/connect/SppConnector.java
new file mode 100644
index 00000000..ebebb8b2
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/connect/SppConnector.java
@@ -0,0 +1,261 @@
+package com.bes.bessdk.connect;
+
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothSocket;
+import android.content.Context;
+import android.util.Log;
+
+import com.bes.bessdk.BesSdkConstants;
+import com.bes.bessdk.scan.BtHeleper;
+import com.bes.bessdk.utils.ArrayUtil;
+import com.bes.bessdk.utils.SPHelper;
+import com.bes.sdk.connect.DeviceConnector;
+import com.bes.sdk.device.HmDevice;
+import com.bes.sdk.message.BaseMessage;
+import com.bes.sdk.utils.DeviceProtocol;
+import com.besall.allbase.common.utils.LogUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import static com.bes.bessdk.BesSdkConstants.BES_SAVE_LOG_OTA;
+import static com.bes.bessdk.BesSdkConstants.BES_SPP_CONNECT;
+import static com.bes.sdk.utils.DeviceProtocol.PROTOCOL_BLE;
+import static com.bes.sdk.utils.DeviceProtocol.PROTOCOL_SPP;
+
+public class SppConnector implements DeviceConnector {
+    private final String TAG = getClass().getSimpleName();
+
+    private static volatile SppConnector sConnector;
+
+    private BluetoothSocket mBluetoothSocket;
+    private Object mCallbackLock = new Object();
+
+    private static Context mContext;
+    ConnectionListener mConnectionListener;
+    private static List<ConnectionListener> mConnectListeners;
+    private Object mListenerLock = new Object();
+
+    private HmDevice mHmDevice;
+    private BluetoothDevice mDevice;
+
+
+    public static SppConnector getsConnector(Context context) {
+        mContext = context;
+        if (sConnector == null) {
+            synchronized (SppConnector.class) {
+                if (sConnector == null) {
+                    sConnector = new SppConnector();
+                    mConnectListeners = new ArrayList<>();
+                }
+            }
+        }
+        return sConnector;
+    }
+    
+    @Override
+    public List<DeviceProtocol> getSupportedProtocols() {
+        List<DeviceProtocol> sL = new ArrayList<>();
+        sL.add(PROTOCOL_SPP);
+        return sL;
+    }
+
+    @Override
+    public boolean isProtocolSupported(DeviceProtocol deviceProtocol) {
+        if (deviceProtocol == PROTOCOL_SPP) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void connect(HmDevice device) {
+        if (device == null || mContext == null) {
+            return;
+        }
+        mHmDevice = device;
+        connectWithListener(null);
+    }
+
+    @Override
+    public void connect(HmDevice device, ConnectionListener connectionListener) {
+        if (device == null || connectionListener == null || mContext == null) {
+            return;
+        }
+        mHmDevice = device;
+        connectWithListener(connectionListener);
+    }
+
+    private void connectWithListener(ConnectionListener connectionListener) {
+        if (connectionListener != null) {
+            mConnectionListener = connectionListener;
+        }
+        LOG(TAG, "connect: -----" + mHmDevice.getDeviceMAC().toString());
+        mDevice = BtHeleper.getBluetoothAdapter(mContext).getRemoteDevice(mHmDevice.getDeviceMAC());
+        startConnect();
+    }
+
+    private void startConnect() {
+        LOG(TAG, "startConnect: -----spp");
+        new Thread(new ConnectRunnable(mDevice)).start();
+    }
+
+    private void onConnectionStateChanged(boolean connected) {
+        LOG(TAG, "onConnectionStateChanged: -----" + connected);
+        synchronized (mCallbackLock) {
+            if (mConnectionListener != null) {
+                mConnectionListener.onStatusChanged(mHmDevice, connected ? BesSdkConstants.BES_CONNECT_SUCCESS :  BesSdkConstants.BES_CONNECT_ERROR, PROTOCOL_SPP);
+            }
+        }
+        synchronized (mListenerLock) {
+            for (ConnectionListener cl : mConnectListeners) {
+                cl.onStatusChanged(mHmDevice, connected ? BesSdkConstants.BES_CONNECT_SUCCESS :  BesSdkConstants.BES_CONNECT_ERROR, PROTOCOL_SPP);
+            }
+        }
+        if (!connected) {
+            disconnect();
+        }
+    }
+
+    public boolean write(byte[] data) {
+        if (mConnectedRunnable != null) {
+            return mConnectedRunnable.write(data);
+        }
+        return false;
+    }
+
+    private void onReceive(byte[] data) {
+        BaseMessage baseMessage = new BaseMessage();
+        baseMessage.setPush(true);
+        baseMessage.setMsgContent(data);
+        if (mConnectionListener != null) {
+            mConnectionListener.onDataReceived(baseMessage);
+        }
+        synchronized (mListenerLock) {
+            for (ConnectionListener cl : mConnectListeners) {
+                cl.onDataReceived(baseMessage);
+            }
+        }
+    }
+    
+    @Override
+    public void disconnect(HmDevice device) {
+        disconnect();
+    }
+
+    @Override
+    public void registerConnectionListener(ConnectionListener connectionListener) {
+        synchronized (mListenerLock) {
+            if (!mConnectListeners.contains(connectionListener)) {
+                mConnectListeners.add(connectionListener);
+            }
+        }
+    }
+
+    @Override
+    public void unregisterConnectionListener(ConnectionListener connectionListener) {
+        if (mConnectListeners.contains(connectionListener)) {
+            mConnectListeners.remove(connectionListener);
+        }
+    }
+
+    public void disconnect() {
+        try {
+            if (mBluetoothSocket != null)
+                mBluetoothSocket.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+    
+    private ConnectedRunnable mConnectedRunnable;
+
+    private class ConnectRunnable implements Runnable {
+
+        private BluetoothDevice mDevice;
+
+        public ConnectRunnable(BluetoothDevice device) {
+            mDevice = device;
+        }
+
+        @Override
+        public void run() {
+            try {
+
+                UUID sUUID = UUID.fromString((String) SPHelper.getPreference(mContext, BesSdkConstants.BES_CONNECT_SERVICE, BES_SPP_CONNECT.toString()));
+                LOG(TAG, "run: ------" + sUUID);
+                mBluetoothSocket = mDevice.createInsecureRfcommSocketToServiceRecord(sUUID);
+                mBluetoothSocket.connect();
+                mConnectedRunnable = new ConnectedRunnable(mBluetoothSocket.getInputStream(), mBluetoothSocket.getOutputStream());
+                onConnectionStateChanged(true);
+                new Thread(mConnectedRunnable).start();
+            } catch (IOException e) {
+                e.printStackTrace();
+                onConnectionStateChanged(false);
+            }
+        }
+    }
+
+    private class ConnectedRunnable implements Runnable {
+
+        private OutputStream mWrite;
+        private InputStream mRead;
+
+        public ConnectedRunnable(InputStream read, OutputStream write) {
+            mRead = read;
+            mWrite = write;
+        }
+
+        @Override
+        public void run() {
+            try {
+                byte[] data = new byte[1024 * 1024];
+                while (true) {
+                    int length = mRead.read(data);
+                    onReceive(ArrayUtil.extractBytes(data, 0, length));
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+                onConnectionStateChanged(false);
+            } finally {
+                try {
+                    if (mRead != null)
+                        mRead.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        public boolean write(byte[] data) {
+            try {
+                mWrite.write(data);
+                return true;
+            } catch (IOException e) {
+                e.printStackTrace();
+                onConnectionStateChanged(false);
+            }
+            return false;
+        }
+    }
+
+    public void LOG(String TAG, String msg) {
+        if (mContext == null) {
+            return;
+        }
+        String saveLogName = (String) SPHelper.getPreference(mContext, BesSdkConstants.BES_SAVE_LOG_NAME, "");
+        boolean saveLog = (boolean) SPHelper.getPreference(mContext, BesSdkConstants.BES_SAVE_LOG_KEY, BesSdkConstants.BES_SAVE_LOG_VALUE);
+        if (saveLog) {
+            if (saveLogName.equals(BES_SAVE_LOG_OTA)) {
+                LogUtils.writeForOTA(TAG, msg, saveLogName);
+            } else if (saveLogName.length() > 0){
+                LogUtils.writeForLOG(TAG, msg, saveLogName);
+            }
+        }
+    }
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/scan/BesScanManager.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/scan/BesScanManager.java
new file mode 100644
index 00000000..d97477b9
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/scan/BesScanManager.java
@@ -0,0 +1,260 @@
+package com.bes.bessdk.scan;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
+import android.bluetooth.le.BluetoothLeScanner;
+import android.bluetooth.le.ScanResult;
+import android.bluetooth.le.ScanSettings;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Build;
+import android.provider.Settings;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bes.sdk.device.HmDevice;
+import com.bes.sdk.scan.BleBroadCastParser;
+import com.bes.sdk.scan.ScanFilter;
+import com.bes.sdk.scan.ScanManager;
+import com.bes.sdk.utils.DeviceProtocol;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import static android.content.ContentValues.TAG;
+
+public class BesScanManager implements ScanManager {
+
+    private Context mContext;
+
+    private BluetoothAdapter mBluetoothAdapter;
+    private BluetoothAdapter bluetoothAdapter;
+    private BluetoothLeScanner mLeScanner;
+
+    private ScanManager.ScanListener mCallBack;
+
+    private Timer timer;
+    private TimerTask task;
+    private int searchDevices = 0;
+
+    public BesScanManager(Context context) {
+        mContext = context;
+        mBluetoothAdapter = BtHeleper.getBluetoothAdapter(mContext);
+        initReceiver();
+    }
+
+    private void initReceiver() {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_STARTED);
+        filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
+        filter.addAction(BluetoothDevice.ACTION_FOUND);
+        mContext.registerReceiver(mReceiver, filter);
+    }
+
+    private void getConnectBtDetails(int flag) {
+        bluetoothAdapter.getProfileProxy(mContext, new BluetoothProfile.ServiceListener() {
+            @Override
+            public void onServiceDisconnected(int profile)
+            {
+
+            }
+
+            @Override
+            public void onServiceConnected(int profile, BluetoothProfile proxy)
+            {
+                List<BluetoothDevice> mDevices = proxy.getConnectedDevices();
+                if (mDevices != null && mDevices.size() > 0) {
+                    for (BluetoothDevice device : mDevices) {
+                        HmDevice hmDevice = new HmDevice();
+                        hmDevice.setDeviceName(device.getName());
+                        hmDevice.setDeviceMAC(device.getAddress());
+                        if (mCallBack != null) {
+                            mCallBack.onScanResult(hmDevice);
+                        }
+                    }
+                }
+            }
+        }, flag);
+    }
+
+    private int getConnectBt() {
+        if (bluetoothAdapter == null) {
+            bluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+        }
+        int a2dp = bluetoothAdapter.getProfileConnectionState(BluetoothProfile.A2DP);
+        int headset = bluetoothAdapter.getProfileConnectionState(BluetoothProfile.HEADSET);
+        int health = bluetoothAdapter.getProfileConnectionState(BluetoothProfile.HEALTH);
+        int flag = -1;
+        if (a2dp == BluetoothProfile.STATE_CONNECTED) {
+            flag = a2dp;
+        }
+        else if (headset == BluetoothProfile.STATE_CONNECTED) {
+            flag = headset;
+        }
+        else if (health == BluetoothProfile.STATE_CONNECTED) {
+            flag = health;
+        }
+        return flag;
+    }
+
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            switch (intent.getAction()) {
+                case BluetoothAdapter.ACTION_DISCOVERY_STARTED:
+                    break;
+                case BluetoothAdapter.ACTION_DISCOVERY_FINISHED:
+                    break;
+                case BluetoothDevice.ACTION_FOUND:
+                    BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
+                    HmDevice hmDevice = new HmDevice();
+                    hmDevice.setDeviceName(device.getName());
+                    hmDevice.setDeviceMAC(device.getAddress());
+                    int rssi = intent.getShortExtra(BluetoothDevice.EXTRA_RSSI, (short) -100);
+                    hmDevice.setRssi(rssi);
+                    if (mCallBack != null) {
+                        mCallBack.onScanResult(hmDevice);
+                    }
+                    break;
+            }
+        }
+    };
+
+    private android.bluetooth.le.ScanCallback mLeScanCallBack = new android.bluetooth.le.ScanCallback() {
+
+        @Override
+        public void onScanFailed(int errorCode) {
+            super.onScanFailed(errorCode);
+            if (mCallBack != null) {
+                mCallBack.onScanFailed("" + errorCode);
+            }
+        }
+
+        @Override
+        public void onScanResult(int callbackType, ScanResult result) {
+            HmDevice hmDevice = new HmDevice();
+            if (result.getDevice().getName() == null) {
+                return;
+            }
+            searchDevices ++;
+            hmDevice.setDeviceName(result.getDevice().getName());
+            hmDevice.setBleAddress(result.getDevice().getAddress());
+            hmDevice.setRssi(result.getRssi());
+            if (mCallBack != null) {
+                mCallBack.onScanResult(hmDevice);
+            }
+        }
+    };
+
+    @Override
+    public boolean isScanInProgress(@NonNull DeviceProtocol deviceProtocol) {
+        return false;
+    }
+
+
+    @Override
+    public void startScan(@NonNull Collection<DeviceProtocol> deviceProtocols, @NonNull ScanListener scanListener, @Nullable ScanFilter scanFilter) {
+        if (scanListener == null) {
+            return;
+        }
+        mCallBack = scanListener;
+        if (mLeScanner != null) {
+//            mLeScanner.stopScan(mLeScanCallBack);
+            mLeScanner = null;
+        }
+        if (new BtPermission(mContext).checkConditions() && mCallBack != null) {
+            if (deviceProtocols.contains(DeviceProtocol.PROTOCOL_BLE)) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    startTimer();
+                    mLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
+                    if (mLeScanner != null) {
+                        mLeScanner.startScan(null, new ScanSettings.Builder().setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build(), mLeScanCallBack);
+                    } else {
+                        Intent intent =  new Intent(Settings.ACTION_BLUETOOTH_SETTINGS);
+                        mContext.startActivity(intent);
+                    }
+                } else {
+                    return;
+                }
+            } else if (deviceProtocols.contains(DeviceProtocol.PROTOCOL_SPP)) {
+                getConnectBtDetails(getConnectBt());
+                mBluetoothAdapter.startDiscovery();
+            }
+        }
+    }
+
+    private void startTimer() {
+        searchDevices = 0;
+
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+        timer = new Timer();
+        task = new TimerTask()
+        {
+            @Override
+            public void run()
+
+            {
+               if (searchDevices < 3) {
+                   mLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
+                   if (mLeScanner != null) {
+                       mLeScanner.startScan(null, new ScanSettings.Builder().setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build(), mLeScanCallBack);
+                   }
+               } else {
+                   timer.cancel();
+                   timer = null;
+               }
+            }
+        };
+
+        timer.schedule(task, 3 * 1000, 2 * 1000);
+    }
+
+    @Override
+    public void startScan(@NonNull Collection<DeviceProtocol> deviceProtocols, @NonNull ScanListener scanListener, @Nullable ScanFilter scanFilter, @Nullable BleBroadCastParser parser) {
+        if (deviceProtocols.contains(DeviceProtocol.PROTOCOL_BLE)) {
+
+
+        } else if (deviceProtocols.contains(DeviceProtocol.PROTOCOL_SPP)) {
+
+        }
+    }
+
+    @Override
+    public void stopScan(@NonNull Collection<DeviceProtocol> deviceProtocols) {
+        if (deviceProtocols.contains(DeviceProtocol.PROTOCOL_BLE) && mLeScanner != null) {
+            mLeScanner.stopScan(mLeScanCallBack);
+            mLeScanner = null;
+            mLeScanCallBack = null;
+        } else if (deviceProtocols.contains(DeviceProtocol.PROTOCOL_SPP) && mBluetoothAdapter != null) {
+            mBluetoothAdapter.cancelDiscovery();
+        }
+        mBluetoothAdapter = null;
+        mContext = null;
+        if (timer != null) {
+            timer.cancel();
+            timer = null;
+        }
+    }
+
+    @Override
+    public void stopAllScan() {
+
+
+    }
+
+    @Override
+    public Collection<HmDevice> getDeviceList() {
+        return null;
+    }
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/scan/BtHeleper.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/scan/BtHeleper.java
new file mode 100644
index 00000000..730169e2
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/scan/BtHeleper.java
@@ -0,0 +1,21 @@
+package com.bes.bessdk.scan;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothManager;
+import android.content.Context;
+import android.os.Build;
+
+public class BtHeleper {
+
+    public static BluetoothManager getBluetoothManager(Context context) {
+        return (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE);
+    }
+
+    public static BluetoothAdapter getBluetoothAdapter(Context context) {
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN_MR1)
+            return BluetoothAdapter.getDefaultAdapter();
+        else {
+            return getBluetoothManager(context).getAdapter();
+        }
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/scan/BtPermission.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/scan/BtPermission.java
new file mode 100644
index 00000000..4600ab27
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/scan/BtPermission.java
@@ -0,0 +1,74 @@
+package com.bes.bessdk.scan;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.location.LocationManager;
+import android.os.Build;
+import android.provider.Settings;
+
+import androidx.core.app.ActivityCompat;
+
+public class BtPermission extends Activity {
+    private static final int REQUEST_LOCATION_PERMISSION = 0x01;
+    public Context mContext;
+    public BtPermission(Context context) {
+        mContext = context;
+    }
+
+    public boolean checkConditions() {
+        if (!initPermission())
+            return false;
+        if (!initLocation())
+            return false;
+        return true;
+    }
+
+    private boolean initPermission() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
+            return true;
+        if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+            return true;
+        }
+        if (ActivityCompat.shouldShowRequestPermissionRationale((Activity) mContext, Manifest.permission.ACCESS_COARSE_LOCATION)) {
+            new AlertDialog.Builder(mContext)
+                    .setMessage("Location permission is needed after Android 6.0. Apply the location permission firstly?")
+                    .setNegativeButton("no", null)
+                    .setPositiveButton("yes", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialog.dismiss();
+                            ActivityCompat.requestPermissions((Activity) mContext, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION}, REQUEST_LOCATION_PERMISSION);
+                        }
+                    }).create().show();
+        } else {
+            ActivityCompat.requestPermissions((Activity) mContext, new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_BACKGROUND_LOCATION}, REQUEST_LOCATION_PERMISSION);
+        }
+        return false;
+    }
+
+    private boolean initLocation() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            return true;
+        }
+        LocationManager manager = (LocationManager) mContext.getSystemService(LOCATION_SERVICE);
+        if (manager.isProviderEnabled(LocationManager.GPS_PROVIDER)) {
+            return true;
+        }
+        new AlertDialog.Builder(mContext).setMessage("Location service is needed after Android 6.0. Turn to the setting view to enable this service?")
+                .setNegativeButton("no", null)
+                .setPositiveButton("yes", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                        mContext.startActivity(new Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS));
+                    }
+                }).create().show();
+        return false;
+    }
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/BesOTAConstants.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/BesOTAConstants.java
new file mode 100644
index 00000000..bf8ca7d9
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/BesOTAConstants.java
@@ -0,0 +1,83 @@
+package com.bes.bessdk.service;
+
+public class BesOTAConstants {
+
+    //cmd msg
+    public static final int                        OTA_CMD_RETURN = 0x00000900;
+    public static final int          OTA_CMD_GET_PROTOCOL_VERSION = 0x00000901;
+    public static final int               OTA_CMD_SET_OAT_USER_OK = 0x00000902;
+    public static final int                   OTA_CMD_GET_HW_INFO = 0x00000903;
+    public static final int       OTA_CMD_SET_UPGRADE_TYPE_NORMAL = 0x00000904;
+    public static final int         OTA_CMD_SET_UPGRADE_TYPE_FAST = 0x00000905;
+    public static final int       OTA_CMD_ROLESWITCH_GET_RANDOMID = 0x00000906;
+    public static final int                OTA_CMD_SELECT_SIDE_OK = 0x00000907;
+    public static final int           OTA_CMD_BREAKPOINT_CHECK_80 = 0x00000908;
+    public static final int              OTA_CMD_BREAKPOINT_CHECK = 0x00000909;
+    public static final int             OTA_CMD_SEND_CONFIGURE_OK = 0x00000910;
+    public static final int                    OTA_CMD_DISCONNECT = 0x00000911;
+    public static final int                 OTA_CMD_SEND_OTA_DATA = 0x00000912;
+    public static final int             OTA_CMD_CRC_CHECK_PACKAGE = 0x00000913;
+    public static final int          OTA_CMD_CRC_CHECK_PACKAGE_OK = 0x00000914;
+    public static final int               OTA_CMD_WHOLE_CRC_CHECK = 0x00000915;
+    public static final int            OTA_CMD_WHOLE_CRC_CHECK_OK = 0x00000916;
+    public static final int            OTA_CMD_IMAGE_OVER_CONFIRM = 0x00000917;
+    public static final int                OTA_SEND_DATA_PROGRESS = 0x00000918;
+    public static final int           OTA_CMD_ROLESWITCH_COMPLETE = 0x00000919;
+
+    //error
+    public static final int                   OTA_START_OTA_ERROR = 0x00000940;
+    public static final int             OTA_CMD_SELECT_SIDE_ERROR = 0x00000941;
+    public static final int          OTA_CMD_SEND_CONFIGURE_ERROR = 0x00000942;
+    public static final int       OTA_CMD_CRC_CHECK_PACKAGE_ERROR = 0x00000943;
+    public static final int         OTA_CMD_WHOLE_CRC_CHECK_ERROR = 0x00000944;
+    public static final int      OTA_CMD_IMAGE_OVER_CONFIRM_ERROR = 0x00000945;
+    public static final int            OTA_CMD_SET_OAT_USER_ERROR = 0x00000946;
+
+
+
+    //handle_msg
+    public static final int              MSG_GET_VERSION_TIME_OUT = 0x00000950;
+    public static final int             MSG_GET_RANDOMID_TIME_OUT = 0x00000951;
+    public static final int                MSG_OTA_OVER_RECONNECT = 0x00000952;
+    public static final int     MSG_GET_PROTOCOL_VERSION_TIME_OUT = 0x00000953;
+    public static final int         MSG_GET_UPGRATE_TYPE_TIME_OUT = 0x00000954;
+    public static final int          MSG_GET_SELECT_SIDE_TIME_OUT = 0x00000955;
+    public static final int    MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT = 0x00000956;
+    public static final int                 MSG_SET_USER_TIME_OUT = 0x00000957;
+
+
+    //devicetype
+    public static final int                    DEVICE_TYPE_STEREO = 0x00000930;
+    public static final int          DEVICE_TYPE_TWS_CONNECT_LEFT = 0x00000931;
+    public static final int         DEVICE_TYPE_TWS_CONNECT_RIGHT = 0x00000932;
+
+
+    public static final byte                    CONFIRM_BYTE_PASS = 0x01;
+    public static final byte                    CONFIRM_BYTE_FAIL = 0x00;
+
+
+    //SPHelper
+    public static final String                    BES_OTA_RANDOM_CODE_LEFT = "BES_OTA_RANDOM_CODE_LEFT";
+    public static final String                   BES_OTA_RANDOM_CODE_RIGHT = "BES_OTA_RANDOM_CODE_RIGHT";
+    public static final String                         BES_OTA_CURRENT_MTU = "BES_OTA_CURRENT_MTU";
+
+    public static final boolean                    DEFAULT_CLEAR_USER_DATA = false;
+    public static final boolean                  DEFAULT_UPDATE_BT_ADDRESS = false;
+    public static final boolean                     DEFAULT_UPDATE_BT_NAME = false;
+    public static final boolean                 DEFAULT_UPDATE_BLE_ADDRESS = false;
+    public static final boolean                    DEFAULT_UPDATE_BLE_NAME = false;
+
+    public static final String               KEY_OTA_CONFIG_CLEAR_USER_DATA = "ota_config_clear_user_data";
+    public static final String             KEY_OTA_CONFIG_UPDATE_BT_ADDRESS = "ota_config_update_bt_address";
+    public static final String       KEY_OTA_CONFIG_UPDATE_BT_ADDRESS_VALUE = "ota_config_update_bt_address_value";
+    public static final String                KEY_OTA_CONFIG_UPDATE_BT_NAME = "ota_config_update_bt_name";
+    public static final String          KEY_OTA_CONFIG_UPDATE_BT_NAME_VALUE = "ota_config_update_bt_name_value";
+    public static final String            KEY_OTA_CONFIG_UPDATE_BLE_ADDRESS = "ota_config_update_ble_address";
+    public static final String      KEY_OTA_CONFIG_UPDATE_BLE_ADDRESS_VALUE = "ota_config_update_ble_address_value";
+    public static final String               KEY_OTA_CONFIG_UPDATE_BLE_NAME = "ota_config_update_ble_name";
+    public static final String         KEY_OTA_CONFIG_UPDATE_BLE_NAME_VALUE = "ota_config_update_ble_name_value";
+
+    //TOTA
+    public static final short                                   OP_TOTA_OTA = (short)0x9000;
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/BesOtaCMD.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/BesOtaCMD.java
new file mode 100644
index 00000000..733fffd3
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/BesOtaCMD.java
@@ -0,0 +1,887 @@
+package com.bes.bessdk.service;
+
+import android.content.Context;
+import android.util.Log;
+
+import com.bes.bessdk.BesSdkConstants;
+import com.bes.bessdk.service.base.TOTAConnectCMD;
+import com.bes.bessdk.utils.ArrayUtil;
+import com.bes.bessdk.utils.ProfileUtils;
+import com.bes.bessdk.utils.SPHelper;
+import com.besall.allbase.common.utils.LogUtils;
+
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import static com.bes.bessdk.BesSdkConstants.BES_SAVE_LOG_OTA;
+import static com.bes.bessdk.service.BesOTAConstants.CONFIRM_BYTE_FAIL;
+import static com.bes.bessdk.service.BesOTAConstants.CONFIRM_BYTE_PASS;
+
+public class BesOtaCMD {
+
+    static Context mContext;
+
+    static byte B_8C = (byte) 0x8C;
+    static byte B_8D = (byte) 0x8D;
+    static byte B_80 = (byte) 0x80;
+    static byte B_81 = (byte) 0x81;
+    static byte B_85 = (byte) 0x85;
+    static byte B_86 = (byte) 0x86;
+    static byte B_87 = (byte) 0x87;
+    static byte B_82 = (byte) 0x82;
+    static byte B_83 = (byte) 0x83;
+    static byte B_88 = (byte) 0x88;
+    static byte B_84 = (byte) 0x84;
+    static byte B_8B = (byte) 0x8B;
+    static byte B_8E = (byte) 0x8E;
+    static byte B_8F = (byte) 0x8F;
+    static byte B_90 = (byte) 0x90;
+    static byte B_91 = (byte) 0x91;
+    static byte B_92 = (byte) 0x92;
+    static byte B_93 = (byte) 0x93;
+    static byte B_95 = (byte) 0x95;
+    static byte B_96 = (byte) 0x96;
+    static byte B_99 = (byte) 0x99;
+    static byte B_9A = (byte) 0x9A;
+    static byte B_97 = (byte) 0x97;
+    static byte B_98 = (byte) 0x98;
+    static byte B_9B = (byte) 0x9B;
+    static byte B_9C = (byte) 0x9C;
+    static byte B_9D = (byte) 0x9D;
+    static byte B_9E = (byte) 0x9E;
+
+
+    static int USER_FLAG = 0;
+    static boolean isWithoutResponse = false;
+    static boolean isTotaConnect = false;
+    static boolean useTotaV2 = false;
+    static int pl = 1; //packetType length
+    static int ll = 0; //USER length bytes' length: USER_FLAG == 0 ? 0 : 4
+    static byte[] magicCode = new byte[]{0x42, 0x45, 0x53, 0x54};
+    static byte[] emptyByte = new byte[]{};
+
+    static int deviceType = 0;
+    static byte[] deviceTypeBytes = new byte[1];
+    static byte[] imageSideSelection = new byte[1];
+    static String curVersionLeft = "";
+    static String curVersionRight = "";
+    static String versionMsg = "";
+
+    static int mMtu = BesSdkConstants.DEFAULT_MTU;
+    static String mSwVersion = "";
+    static String mHwVersion = "";
+
+    static byte[] mOtaImageData;
+    static int packetPayload = 0;
+    static int checkBytesLength = 16 * 1024;
+    static int totalPacketCount = 0;
+    static int onePercentBytes = 0;
+    static int curSendLength = 0;
+    static int curConfirmLength = 0;
+    static int beforeSendLength = 0;
+    static byte[] beforeRandomCode;
+    static int curSendPacketLength = 0;
+    static int crcConfirmTimes = 0;
+    static boolean crcConfirm = false;
+
+    static String roleSwitchRandomID = "";
+
+    static boolean isSppConnect = false;
+    static byte[] totaOP = new byte[]{0x00, (byte) 0x90};
+
+    public static void destoryVariable () {
+        mOtaImageData = null;
+        packetPayload = 0;
+        totalPacketCount = 0;
+        onePercentBytes = 0;
+        curSendLength = 0;
+        beforeSendLength = 0;
+        curSendPacketLength = 0;
+        crcConfirmTimes = 0;
+        crcConfirm = false;
+        roleSwitchRandomID = "";
+        curConfirmLength = 0;
+    }
+
+    public static void setOtaUser(int user, boolean isSpp, boolean withoutResponse, boolean isTota, boolean totaV2) {
+        USER_FLAG = user;
+        isSppConnect = isSpp;
+        isWithoutResponse = withoutResponse;
+        isTotaConnect = isTota;
+        useTotaV2 = totaV2;
+        curConfirmLength = 0;
+        if (isSppConnect) {
+            checkBytesLength = 32 * 1024;
+        }
+        if (USER_FLAG == 1) {
+            ll = 4;
+        } else {
+            ll = 0;
+        }
+    }
+    //0：stereo 1：left 2:right 3:both 4:both diff
+    public static void setImageSideSelection(int type) {
+        if (type == 0) {
+            imageSideSelection[0] = (byte) 0x00;
+        } else if (type == 1) {
+            imageSideSelection[0] = (byte) 0x01;
+        } else if (type == 2) {
+            imageSideSelection[0] = (byte) 0x10;
+        } else if (type == 3) {
+            imageSideSelection[0] = (byte) 0x11;
+        }
+    }
+
+    public static byte[] getCurrentVersionCMD() {
+        byte[] pt = new byte[]{(byte) B_8E};
+        byte[] lBytes = emptyByte;
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(magicCode.length);
+        }
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, magicCode, emptyByte);
+
+        if (isTotaConnect) {
+           return convertToTotaCMD(bytes);
+        }
+        return  bytes;
+    }
+
+    public static int getCurrentDeviceType() {
+        return deviceType;
+    }
+
+    public static String getCurrentVersion() {
+        String v = "";
+        if (deviceType == BesOTAConstants.DEVICE_TYPE_STEREO) {
+            v = "stereo:" + curVersionLeft + "\n" +  versionMsg;
+            versionMsg = "";
+        } else if (deviceType == BesOTAConstants.DEVICE_TYPE_TWS_CONNECT_LEFT) {
+            v = "TWS left:" + curVersionLeft;
+        } else if (deviceType == BesOTAConstants.DEVICE_TYPE_TWS_CONNECT_RIGHT) {
+            v = "TWS right:" + curVersionRight;
+        }
+        return v;
+    }
+
+    public static String getRoleSwitchRandomID() {
+        return roleSwitchRandomID;
+    }
+
+    public static byte[] getOtaProtocolVersionCMD(boolean currentOrLegacy) {
+        byte[] pt = new byte[]{(byte) B_99};
+        byte[] lBytes = emptyByte;
+        byte[] vBytes = new byte[4];
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(vBytes.length);
+        }
+        vBytes[3] = currentOrLegacy ? (byte) 0x01 : (byte) 0x00;
+
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, emptyByte, vBytes);
+
+        if (isTotaConnect) {
+            return convertToTotaCMD(bytes);
+        }
+        return bytes;
+    }
+
+    public static byte[] getSetOtaUserCMD(int user) {
+        byte[] pt = new byte[]{(byte) B_97};
+        byte[] lBytes = emptyByte;
+        byte[] vBytes = new byte[1];
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(vBytes.length);
+        }
+        byte userByte = 0x00;
+        if (user == 1) {
+            userByte = 0x01;
+        } else if (user == 2) {
+            userByte = 0x02;
+        } else if (user == 3) {
+            userByte = 0x03;
+        } else if (user == 4) {
+            userByte = 0x04;
+        } else if (user == 5) {
+            userByte = 0x05;
+        } else if (user == 6) {
+            userByte = 0x06;
+        }
+        vBytes[0] = userByte;
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, emptyByte, vBytes);
+
+        if (isTotaConnect) {
+            return convertToTotaCMD(bytes);
+        }
+        return bytes;
+    }
+
+    //0x01: apply NORMAL MODE
+    //0x02: apply FAST MODE
+    public static byte[] getSetUpgrateTypeCMD(int type) {
+        byte[] pt = new byte[]{(byte) B_9D};
+        byte[] lBytes = emptyByte;
+        byte[] tBytes = new byte[1];
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(tBytes.length);
+        }
+        byte tByte = 0x00;
+        if (type == 1) {
+            tByte = 0x01;
+        } else if (type == 2) {
+            tByte = 0x02;
+        }
+        tBytes[0] = tByte;
+
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, emptyByte, tBytes);
+
+        if (isTotaConnect) {
+            return convertToTotaCMD(bytes);
+        }
+        return bytes;
+    }
+
+    public static byte[] getROLESwitchRandomIDCMD() {
+        byte[] pt = new byte[]{(byte) B_9B};
+        byte[] lBytes = emptyByte;
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(0);
+        }
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, emptyByte, emptyByte);
+
+        if (isTotaConnect) {
+            return convertToTotaCMD(bytes);
+        }
+        return bytes;
+    }
+
+    public static byte[] getSelectSideCMD() {
+        byte[] pt = new byte[]{(byte) B_90};
+        byte[] lBytes = emptyByte;
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(1);
+        }
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, emptyByte, imageSideSelection);
+
+        if (isTotaConnect) {
+            return convertToTotaCMD(bytes);
+        }
+        return bytes;
+    }
+
+    public static byte[] getCheckBreakPointCMD(Context context) {
+        mContext = context;
+        byte[] pt = new byte[]{(byte) B_8C};
+        byte[] lBytes = emptyByte;
+        byte[] randomCode = new byte[32];
+        byte[] segmentBytes = new byte[]{0x01, 0x02, 0x03, 0x04};
+        byte[] crc32Bytes = new byte[4];
+        int dataL = randomCode.length + segmentBytes.length + crc32Bytes.length;
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(magicCode.length + dataL);
+        }
+        byte[] data = new byte[dataL];
+
+        String randomCodestr = null;
+        randomCodestr = (String) SPHelper.getPreference(mContext, BesOTAConstants.BES_OTA_RANDOM_CODE_LEFT, "");
+        if (randomCodestr != null && randomCodestr != "") {
+            randomCode = ArrayUtil.toBytes(randomCodestr);
+        }
+        beforeRandomCode = randomCode;
+
+        byte[] crc32_data = new byte[36];
+        System.arraycopy(randomCode, 0, crc32_data, 0, randomCode.length);
+        System.arraycopy(segmentBytes, 0, crc32_data, randomCode.length, segmentBytes.length);
+
+        long crc32 = ArrayUtil.crc32(crc32_data, 0, 36);
+        crc32Bytes[0] = (byte) crc32;
+        crc32Bytes[1] = (byte) (crc32 >> 8);
+        crc32Bytes[2] = (byte) (crc32 >> 16);
+        crc32Bytes[3] = (byte) (crc32 >> 24);
+
+        System.arraycopy(randomCode, 0, data, 0, randomCode.length);
+        System.arraycopy(segmentBytes, 0, data, randomCode.length, segmentBytes.length);
+        System.arraycopy(crc32Bytes, 0, data, randomCode.length + segmentBytes.length, crc32Bytes.length);
+
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, magicCode, data);
+
+        if (isTotaConnect) {
+            return convertToTotaCMD(bytes);
+        }
+        return bytes;
+    }
+
+    public static byte[] getStartOTAPacketCMD(String path) {
+        byte[] pt = new byte[]{(byte) B_80};
+        byte[] imageSize = new byte[4];
+        byte[] crc32OfImage = new byte[4];
+        byte[] lBytes = emptyByte;
+        int dataL = imageSize.length + crc32OfImage.length;
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(magicCode.length + dataL);
+        }
+        byte[] data = new byte[dataL];
+        FileInputStream inputStream = null;
+        try {
+            inputStream = new FileInputStream(path);
+            int totalSize = inputStream.available();
+            int dataSize = totalSize;
+            //d4b71a00
+//            int m = 0;
+//            if((dataSize % 256) > 0) {
+//                m = dataSize / 256;
+//                dataSize = (m + 1) * 256;
+//            }
+            byte[] iamgeBytes = new byte[dataSize];
+            inputStream.read(iamgeBytes, 0, dataSize);
+            long crc32 = ArrayUtil.crc32(iamgeBytes, 0, dataSize);
+            imageSize = ArrayUtil.intToBytesLittle(dataSize);
+
+            crc32OfImage[0] = (byte) crc32;
+            crc32OfImage[1] = (byte) (crc32 >> 8);
+            crc32OfImage[2] = (byte) (crc32 >> 16);
+            crc32OfImage[3] = (byte) (crc32 >> 24);
+
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        System.arraycopy(imageSize, 0, data, 0, imageSize.length);
+        System.arraycopy(crc32OfImage, 0, data, imageSize.length, crc32OfImage.length);
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, magicCode, data);
+
+        if (isTotaConnect) {
+            return convertToTotaCMD(bytes);
+        }
+        return bytes;
+    }
+
+    public static byte[] getOTAConfigureCMD(String path, Context context) {
+        //fix :role switch state
+        crcConfirm = false;
+        mContext = context;
+        byte[] pt = new byte[]{(byte) B_86};
+        byte[] followingDataLBytes = new byte[4];
+        byte[] startLocationToWriteImageBytes = new byte[4];
+        byte[] configBytes = new byte[4];
+        byte[] newBTName = new byte[32];
+        byte[] newBLEName = new byte[32];
+        byte[] newBTAddr = new byte[6];
+        byte[] newBLEAddr = new byte[6];
+        byte[] crcOfConfiguration = new byte[4];
+
+        byte[] lBytes = emptyByte;
+        int dataL = followingDataLBytes.length + startLocationToWriteImageBytes.length + configBytes.length + newBTName.length + newBLEName.length + newBTAddr.length + newBLEAddr.length + crcOfConfiguration.length;
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(dataL);
+        }
+        byte[] data = new byte[dataL];
+        followingDataLBytes = ArrayUtil.intToBytesLittle(dataL - followingDataLBytes.length);
+        FileInputStream inputStream = null;
+        try {
+            inputStream = new FileInputStream(path);
+            int totalSize = inputStream.available();
+            int dataSize = totalSize;
+            byte[] iamgeBytes = new byte[dataSize];
+            inputStream.read(iamgeBytes, 0, dataSize);
+
+            startLocationToWriteImageBytes[0] = iamgeBytes[dataSize - 4];
+            startLocationToWriteImageBytes[1] = iamgeBytes[dataSize - 3];
+            startLocationToWriteImageBytes[2] = iamgeBytes[dataSize - 2];
+
+            boolean clearUserData = (boolean) SPHelper.getPreference(mContext, BesOTAConstants.KEY_OTA_CONFIG_CLEAR_USER_DATA, BesOTAConstants.DEFAULT_CLEAR_USER_DATA);
+            boolean updateBtAddress = (boolean) SPHelper.getPreference(mContext, BesOTAConstants.KEY_OTA_CONFIG_UPDATE_BT_ADDRESS, BesOTAConstants.DEFAULT_UPDATE_BT_ADDRESS);
+            boolean updateBtName = (boolean) SPHelper.getPreference(mContext, BesOTAConstants.KEY_OTA_CONFIG_UPDATE_BT_NAME, BesOTAConstants.DEFAULT_UPDATE_BT_NAME);
+            boolean updateBleAddress = (boolean) SPHelper.getPreference(mContext, BesOTAConstants.KEY_OTA_CONFIG_UPDATE_BLE_ADDRESS, BesOTAConstants.DEFAULT_UPDATE_BLE_ADDRESS);
+            boolean updateBleName = (boolean) SPHelper.getPreference(mContext, BesOTAConstants.KEY_OTA_CONFIG_UPDATE_BLE_NAME, BesOTAConstants.DEFAULT_UPDATE_BLE_NAME);
+
+            byte enable = 0x00;
+            enable |= (clearUserData ? 0x01 : 0x00);
+            enable |= (updateBtName ? (0x01 << 1) : 0x00);
+            enable |= (updateBleName ? (0x01 << 2) : 0x00);
+            enable |= (updateBtAddress ? (0x01 << 3) : 0x00);
+            enable |= (updateBleAddress ? (0x01 << 4) : 0x00);
+            configBytes[0] = enable;
+
+            updateBtName = true;
+            if (updateBtName) {
+                String btName = (String) SPHelper.getPreference(mContext, BesOTAConstants.KEY_OTA_CONFIG_UPDATE_BT_NAME_VALUE, "");
+//                String name16 = ArrayUtil.str2HexStr(btName);
+                byte[] namebytes = btName.getBytes();
+                int btNameLength = namebytes.length;
+                if (btNameLength > 32) {
+                    btNameLength = 32;
+                }
+                for (int i = 0; i < namebytes.length; i++) {
+                    newBTName[i] = namebytes[i];
+                }
+            }
+            if (updateBleName) {
+                String bleName = (String) SPHelper.getPreference(mContext, BesOTAConstants.KEY_OTA_CONFIG_UPDATE_BLE_NAME_VALUE, "");
+//                String name16 = ArrayUtil.str2HexStr(bleName);
+                byte[] namebytes = bleName.getBytes();
+                int bleNameLength = namebytes.length;
+                if (bleNameLength > 32) {
+                    bleNameLength = 32;
+                }
+                for (int i = 0; i < namebytes.length; i++) {
+                    newBLEName[i] = namebytes[i];
+                }
+            }
+            if (updateBtAddress) {
+                String btAdress = (String) SPHelper.getPreference(mContext, BesOTAConstants.KEY_OTA_CONFIG_UPDATE_BT_ADDRESS_VALUE, "");
+//                String name16 = ArrayUtil.str2HexStr(btAdress);
+//                byte[] namebytes = ArrayUtil.to2Bytes(name16);
+//                Log.i("TAG", "getOTAConfigureCMD: " + name16);
+//                Log.i("TAG", "getOTAConfigureCMD: " + namebytes.length + "byte" + ArrayUtil.toHex(namebytes));
+                for (int i = 0; i < 6; i++) {
+                    newBTAddr[5 - i] = Integer.valueOf(btAdress.substring(i, i * 2 + 2), 16).byteValue();
+                }
+            }
+            if (updateBleAddress) {
+                String bleAdress = (String) SPHelper.getPreference(mContext, BesOTAConstants.KEY_OTA_CONFIG_UPDATE_BLE_ADDRESS_VALUE, "");
+//                String name16 = ArrayUtil.str2HexStr(bleAdress);
+//                byte[] namebytes = ArrayUtil.toBytes(name16);
+                for (int i = 0; i < 6; i++) {
+                    newBLEAddr[5 - i] = Integer.valueOf(bleAdress.substring(i, i * 2 + 2), 16).byteValue();
+                }
+            }
+
+            byte[] half0 =  ArrayUtil.bytesSplic(followingDataLBytes, startLocationToWriteImageBytes, configBytes, newBTName);
+            byte[] half1 =  ArrayUtil.bytesSplic(newBLEName, newBTAddr, newBLEAddr, crcOfConfiguration);
+
+            System.arraycopy(half0, 0, data, 0, half0.length);
+            System.arraycopy(half1, 0, data, half0.length, half1.length);
+
+            long crc32 = ArrayUtil.crc32(data, 0, dataL - 4);
+            crcOfConfiguration[0] = (byte) crc32;
+            crcOfConfiguration[1] = (byte) (crc32 >> 8);
+            crcOfConfiguration[2] = (byte) (crc32 >> 16);
+            crcOfConfiguration[3] = (byte) (crc32 >> 24);
+            System.arraycopy(crcOfConfiguration, 0, data, dataL - crcOfConfiguration.length, crcOfConfiguration.length);
+
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, emptyByte, data);
+
+        if (isTotaConnect) {
+            return convertToTotaCMD(bytes);
+        }
+        return bytes;
+    }
+
+    public static byte[] getDataPacketCMD(String path, boolean isBle) {
+        if (mOtaImageData == null) {
+            readlocalImageData(path, isBle);
+        }
+        byte[] lBytes = emptyByte;
+
+        if (crcConfirm) {
+            crcConfirm = false;
+            byte[] crcPt = new byte[]{(byte) B_82};
+            byte[] crc32OfSegment = getCrc32OfSegment();
+            int crcDataL = magicCode.length + crc32OfSegment.length;
+            if (USER_FLAG == 1) {
+                lBytes = ArrayUtil.intToBytesLittle(crcDataL);
+            }
+
+            byte[] bytes = ArrayUtil.bytesSplic(crcPt, lBytes, magicCode, crc32OfSegment);
+
+            if (isTotaConnect) {
+                return convertToTotaCMD(bytes);
+            }
+            return bytes;
+        }
+
+        if (beforeSendLength == mOtaImageData.length || curSendLength == mOtaImageData.length) {
+            byte[] wholeCrcPt = new byte[]{(byte) B_88};
+            if (USER_FLAG == 1) {
+                lBytes = ArrayUtil.intToBytesLittle(0);
+            }
+            byte[] bytes = ArrayUtil.bytesSplic(wholeCrcPt, lBytes, emptyByte, emptyByte);
+
+            if (isTotaConnect) {
+                return convertToTotaCMD(bytes);
+            }
+            return bytes;
+        }
+
+        byte[] pt = new byte[]{(byte) B_85};
+        byte[] packetData = getDataPacket();
+        int dataL = packetData.length;
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(dataL);
+        }
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, emptyByte, packetData);
+
+        if (isTotaConnect) {
+            return convertToTotaCMD(bytes);
+        }
+        return bytes;
+    }
+
+    public static void readlocalImageData(String path, boolean isBle) {
+        FileInputStream inputStream = null;
+        try {
+            inputStream = new FileInputStream(path);
+            int totalSize = inputStream.available();
+            int dataSize = totalSize;
+
+//            int m = 0;
+//            if((dataSize % 256) > 0) {
+//                m = dataSize / 256;
+//                dataSize = (m + 1) * 256;
+//            }
+            byte[] data = new byte[dataSize];
+            inputStream.read(data, 0, dataSize);
+            mOtaImageData = data;
+
+            int stereo_flg = deviceType == BesOTAConstants.DEVICE_TYPE_STEREO ? 1 : 0;
+
+            LOG("TAG", "readlocalImageData: -----" + mMtu);
+            LOG("TAG", "readlocalImageData: -----" + dataSize);
+            LOG("TAG", "readlocalImageData: -----" + isBle);
+
+            packetPayload = ProfileUtils.calculateBLESinglePacketLen(dataSize, mMtu, isBle, stereo_flg) - ll;
+            if (useTotaV2) {
+                packetPayload = (packetPayload - 20) / 16 * 15 + 16;
+            }
+
+            totalPacketCount = (dataSize + packetPayload - 1) / packetPayload;
+            onePercentBytes = ProfileUtils.calculateBLEOnePercentBytes(dataSize, isBle, stereo_flg);
+            curSendPacketLength = packetPayload;
+
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static byte[] getDataPacket() {
+        LOG("TAG", "getDataPacket 1------" + curSendPacketLength);
+        LOG("TAG", "getDataPacket 1curSendLength------" + curSendLength);
+        LOG("TAG", "getDataPacket 1packetPayload------" + packetPayload);
+        LOG("TAG", "getDataPacket 1checkBytesLength------" + checkBytesLength);
+
+        if (USER_FLAG == 1 && isWithoutResponse) {
+            //固定长度校验
+            if (beforeSendLength > 0 && crcConfirmTimes == 0) {
+                LOG("TAG", "getDataPacket 1checkBytesLength------0");
+                crcConfirmTimes = beforeSendLength / checkBytesLength;
+                curSendPacketLength = packetPayload;
+            }
+            else if (curSendLength + packetPayload >= mOtaImageData.length) {
+                LOG("TAG", "getDataPacket 1checkBytesLength------1");
+
+                curSendPacketLength = mOtaImageData.length - curSendLength;
+                crcConfirm = true;
+            }
+            else if (curSendLength + packetPayload >= checkBytesLength * (crcConfirmTimes + 1)) {
+                LOG("TAG", "getDataPacket 1checkBytesLength------2");
+
+                curSendPacketLength = checkBytesLength * (crcConfirmTimes + 1) - curSendLength;
+                crcConfirm = true;
+            }
+            else {
+                LOG("TAG", "getDataPacket 1checkBytesLength------3");
+
+                curSendPacketLength = packetPayload;
+            }
+            if (curSendLength + curSendPacketLength == (crcConfirmTimes + 1) * checkBytesLength) {
+                crcConfirm = true;
+            }
+        } else {
+            //1%校验
+            if (beforeSendLength > 0 && crcConfirmTimes == 0) {
+                crcConfirmTimes = beforeSendLength / onePercentBytes;
+                curSendPacketLength = packetPayload;
+            }
+            else if (curSendLength + packetPayload > onePercentBytes * (crcConfirmTimes + 1) || curSendLength + packetPayload == onePercentBytes * (crcConfirmTimes + 1)) {
+
+                curSendPacketLength = onePercentBytes * (crcConfirmTimes + 1) - curSendLength;
+                crcConfirm = true;
+            }
+            else if (curSendLength + packetPayload > mOtaImageData.length) {
+                curSendPacketLength = mOtaImageData.length - curSendLength;
+                crcConfirm = true;
+            }
+            else {
+                curSendPacketLength = packetPayload;
+            }
+        }
+        // 固件长度不是 1% 校验块（256 对齐上取整）的整数倍时，最后一个校验边界会越过文件末尾，
+        // 上面的边界分支会算出超长包（如边界 17920*99 > 文件长导致 arraycopy 越界崩溃），统一钳制到剩余字节。
+        if (curSendLength + curSendPacketLength > mOtaImageData.length) {
+            curSendPacketLength = mOtaImageData.length - curSendLength;
+            crcConfirm = true;
+        }
+        LOG("TAG", "getDataPacket 2------" + curSendPacketLength);
+        byte[] data = new byte[curSendPacketLength];
+
+        LOG("BesOtaCMD", "curSendLength--" + curSendLength);
+        LOG("BesOtaCMD", "curSendPacketLength--" + curSendPacketLength);
+        LOG("BesOtaCMD", "mOtaImageDataLength--" + mOtaImageData.length);
+        System.arraycopy(mOtaImageData, curSendLength, data, 0, curSendPacketLength);
+
+        return data;
+    }
+
+    public static byte[] getCrc32OfSegment() {
+        if (USER_FLAG == 1 && isWithoutResponse) {
+            LOG("TAG", "getCrc32OfSegment: -----" + curSendLength);
+            LOG("TAG", "getCrc32OfSegment: -----" + checkBytesLength * crcConfirmTimes);
+
+            byte[] crcSegmentData = new byte[curSendLength - checkBytesLength * crcConfirmTimes];
+            System.arraycopy(mOtaImageData, checkBytesLength * crcConfirmTimes, crcSegmentData, 0, curSendLength - checkBytesLength * crcConfirmTimes);
+            long crc32 = ArrayUtil.crc32(crcSegmentData, 0, crcSegmentData.length);
+            return new byte[]{(byte) crc32, (byte) (crc32 >> 8), (byte) (crc32 >> 16), (byte) (crc32 >> 24)};
+        } else {
+            byte[] crcSegmentData = new byte[curSendLength - onePercentBytes * crcConfirmTimes];
+            System.arraycopy(mOtaImageData, onePercentBytes * crcConfirmTimes, crcSegmentData, 0, curSendLength - onePercentBytes * crcConfirmTimes);
+            long crc32 = ArrayUtil.crc32(crcSegmentData, 0, crcSegmentData.length);
+            return new byte[]{(byte) crc32, (byte) (crc32 >> 8), (byte) (crc32 >> 16), (byte) (crc32 >> 24)};
+        }
+    }
+
+    public static byte[] getImageOverwritingConfirmationPacketCMD() {
+        byte[] pt = new byte[]{(byte) B_92};
+        byte[] lBytes = emptyByte;
+        if (USER_FLAG == 1) {
+            lBytes = ArrayUtil.intToBytesLittle(magicCode.length);
+        }
+        byte[] bytes = ArrayUtil.bytesSplic(pt, lBytes, magicCode, emptyByte);
+
+        if (isTotaConnect) {
+            return convertToTotaCMD(bytes);
+        }
+        return bytes;
+    }
+
+    public static void notifySuccess() {
+        curSendLength += curSendPacketLength;
+        LOG("TAG", "notifySuccess: ---------" + curSendLength);
+        LOG("TAG", "notifySuccess: ---------" + curConfirmLength);
+    }
+
+    //onReceive
+    public static int receiveData(byte[] data, Context context, int curOtaResult, boolean sendPackageWithAck) {
+        mContext = context;
+        if (data[0] == B_8F) {
+            int typeL = pl + ll + magicCode.length;
+            deviceTypeBytes = new byte[]{data[typeL]};
+            if (data[typeL] == 0x00) {
+                deviceType = BesOTAConstants.DEVICE_TYPE_STEREO;
+                if (USER_FLAG == 1) {
+                    byte[] lb = new byte[4];
+                    System.arraycopy(data, pl, lb, 0, ll);
+                    int msgL = ArrayUtil.bytesToIntLittle(lb);
+                    if (msgL > 15) {
+                        byte[] msgBytes = new byte[data.length - (typeL + 8 + 1)];
+                        System.arraycopy(data, (typeL + 8 + 1), msgBytes, 0, data.length - (typeL + 8 + 1));
+                        versionMsg = ArrayUtil.toASCII(msgBytes).replace("-", " ");
+                    }
+                }
+            } else if (data[typeL] == 0x01) {
+                deviceType = BesOTAConstants.DEVICE_TYPE_TWS_CONNECT_LEFT;
+            } else if (data[typeL] == 0x02) {
+                deviceType = BesOTAConstants.DEVICE_TYPE_TWS_CONNECT_RIGHT;
+            }
+
+            int vl = 4;
+            byte[] versionL = new byte[vl];
+            System.arraycopy(data, typeL + 1, versionL, 0, vl);
+            String versionLStr = ArrayUtil.toHex(versionL);
+            curVersionLeft = versionLStr.replace(",", ".");
+            byte[] versionR = new byte[vl];
+            System.arraycopy(data, typeL + 1 + vl, versionR, 0, vl);
+            String versionRStr = ArrayUtil.toHex(versionR);
+            curVersionRight = versionRStr.replace(",", ".");
+            return getReturnResult(BesOTAConstants.OTA_CMD_GET_HW_INFO, curOtaResult);
+        }
+        else if (data[0] == B_91) {
+            destoryVariable();
+            int confirmL = pl + ll;
+            if (data[confirmL] == CONFIRM_BYTE_PASS) {
+                return getReturnResult(BesOTAConstants.OTA_CMD_SELECT_SIDE_OK, curOtaResult);
+            }
+            return getReturnResult(BesOTAConstants.OTA_CMD_SELECT_SIDE_ERROR, curOtaResult);
+        }
+        else if (data[0] == B_8D) {
+            int breakpointL = pl + ll;
+            byte[] bpLengthBytes = new byte[4];
+            System.arraycopy(data, breakpointL, bpLengthBytes, 0, bpLengthBytes.length);
+            curSendLength = ArrayUtil.bytesToIntLittle(bpLengthBytes);
+            if (curSendLength > 0) {
+                beforeSendLength = curSendLength;
+                curConfirmLength = curSendLength;
+                mMtu = (int) SPHelper.getPreference(mContext, BesOTAConstants.BES_OTA_CURRENT_MTU, mMtu);
+                return getReturnResult(BesOTAConstants.OTA_CMD_BREAKPOINT_CHECK, curOtaResult);
+            } else {
+                byte[] bpRandomBytes = new byte[32];
+                System.arraycopy(data, breakpointL + bpLengthBytes.length, bpRandomBytes, 0, bpRandomBytes.length);
+                SPHelper.putPreference(mContext, BesOTAConstants.BES_OTA_RANDOM_CODE_LEFT, ArrayUtil.toHex(bpRandomBytes));
+                return getReturnResult(BesOTAConstants.OTA_CMD_BREAKPOINT_CHECK_80, curOtaResult);
+            }
+        }
+        else if (data[0] == B_81) {
+            int vl = pl + ll + magicCode.length;
+            byte[] swVersionBytes = new byte[2];
+            System.arraycopy(data, vl, swVersionBytes, 0, 2);
+            String swVersionBytesStr = ArrayUtil.toHex(swVersionBytes);
+            mSwVersion = swVersionBytesStr.replace(",", ".");
+
+            byte[] hwVersionBytes = new byte[2];
+            System.arraycopy(data, vl + swVersionBytes.length, hwVersionBytes, 0, 2);
+            String hwVersionBytesStr = ArrayUtil.toHex(hwVersionBytes);
+            mHwVersion = hwVersionBytesStr.replace(",", ".");
+            LOG("TAG", "receiveData: --" + mSwVersion + "--"  + mHwVersion);
+
+            byte[] mtuBytes = new byte[4];
+            System.arraycopy(data, vl + swVersionBytes.length + hwVersionBytes.length, mtuBytes, 0, 2);
+            mMtu = ArrayUtil.bytesToIntLittle(mtuBytes);
+            LOG("TAG", "receiveData mMtu: --" + mMtu);
+            SPHelper.putPreference(mContext, BesOTAConstants.BES_OTA_CURRENT_MTU, mMtu);
+            return getReturnResult(BesOTAConstants.OTA_CMD_BREAKPOINT_CHECK, curOtaResult);
+        }
+        else if (data[0] == B_87) {
+            int confirmL = pl + ll;
+            if (data[confirmL] == CONFIRM_BYTE_PASS) {
+                return BesOTAConstants.OTA_CMD_SEND_CONFIGURE_OK;
+            }
+            return getReturnResult(BesOTAConstants.OTA_CMD_SEND_CONFIGURE_ERROR, curOtaResult);
+        }
+        else if (data[0] == B_83) {
+            int confirmL = pl + ll;
+            if (data[confirmL] == CONFIRM_BYTE_PASS) {
+                crcConfirmTimes ++;
+                curConfirmLength = curSendLength;
+                crcConfirm = false;
+                if (curSendLength == mOtaImageData.length) {
+                    return BesOTAConstants.OTA_CMD_WHOLE_CRC_CHECK;
+                }
+                return BesOTAConstants.OTA_CMD_CRC_CHECK_PACKAGE_OK;
+            }
+            return BesOTAConstants.OTA_CMD_CRC_CHECK_PACKAGE_ERROR;
+        }
+        else if (data[0] == B_84) {
+            int confirmL = pl + ll;
+            if (data[confirmL] == CONFIRM_BYTE_PASS) {
+                return BesOTAConstants.OTA_CMD_WHOLE_CRC_CHECK_OK;
+            }
+            return BesOTAConstants.OTA_CMD_WHOLE_CRC_CHECK_ERROR;
+        }
+        else if (data[0] == B_93) {
+            int confirmL = pl + ll;
+            if (data[confirmL] == CONFIRM_BYTE_PASS) {
+                return getReturnResult(BesOTAConstants.OTA_CMD_IMAGE_OVER_CONFIRM, curOtaResult);
+            }
+            return getReturnResult(BesOTAConstants.OTA_CMD_IMAGE_OVER_CONFIRM_ERROR, curOtaResult);
+        }
+        else if (data[0] == B_95) {
+            return BesOTAConstants.OTA_CMD_DISCONNECT;
+        }
+        else if (data[0] == B_96) {
+            return BesOTAConstants.OTA_CMD_ROLESWITCH_COMPLETE;
+        }
+        else if (data[0] == B_9A) {
+            USER_FLAG = 1;
+            setOtaUser(USER_FLAG, isSppConnect, isWithoutResponse, isTotaConnect, useTotaV2);
+            return BesOTAConstants.OTA_CMD_GET_PROTOCOL_VERSION;
+        }
+        else if (data[0] == B_98) {
+            int confirmL = pl + ll;
+            if (data[confirmL] == CONFIRM_BYTE_PASS) {
+                return BesOTAConstants.OTA_CMD_SET_OAT_USER_OK;
+            }
+            return BesOTAConstants.OTA_CMD_SET_OAT_USER_ERROR;
+        }
+        else if (data[0] == B_9E) {
+            int confirmL = pl + ll;
+            if (data[confirmL] == (byte) 0x01) {
+                return BesOTAConstants.OTA_CMD_SET_UPGRADE_TYPE_NORMAL;
+            } else if (data[confirmL] == (byte) 0x02) {
+                return BesOTAConstants.OTA_CMD_SET_UPGRADE_TYPE_FAST;
+            }
+        }
+        else if (data[0] == B_9C) {
+            String dataStr = ArrayUtil.toHex(data);
+            dataStr = dataStr.replace(",", "");
+            roleSwitchRandomID = dataStr.substring(dataStr.length() - 4);
+
+            return BesOTAConstants.OTA_CMD_ROLESWITCH_GET_RANDOMID;
+        }
+        else if (data[0] == B_8B) {
+            if (sendPackageWithAck) {
+                return BesOTAConstants.OTA_CMD_SEND_OTA_DATA;
+            }
+            return BesOTAConstants.OTA_CMD_RETURN;
+        }
+
+        else {
+        }
+
+
+        return 0;
+    }
+
+    public static void crcConfirmError() {
+        LOG("TAG", "crcConfirmError---" + curSendLength);
+        LOG("TAG", "crcConfirmError---" + curConfirmLength);
+        curSendLength = curConfirmLength;
+        LOG("TAG", "crcConfirmError---" + curSendLength);
+    }
+
+    public static int getReturnResult(int state, int curState) {
+        if (state < curState) {
+            return BesOTAConstants.OTA_CMD_RETURN;
+        }
+        return state;
+    }
+
+    public static String besOtaProgress() {
+        if (mOtaImageData == null)
+            return "";
+        int total = mOtaImageData.length;
+        if (total == 0) {
+            return "0.00";
+        }
+        double v1 = curSendLength * 100;
+        if (v1 / 100 > total) {
+            v1 = total;
+        }
+        return ArrayUtil.div(v1, total, 2) + "";
+    }
+
+    public static void setCrcConfirmState(boolean state) {
+        crcConfirm = state;
+    }
+
+    public static byte[] convertToTotaCMD(byte[] bytes) {
+        byte[] lBytes = ArrayUtil.intToBytesLittle(bytes.length);
+
+        byte[] covertBytes = ArrayUtil.bytesSplic(totaOP, new byte[]{lBytes[0]}, new byte[]{lBytes[1]}, bytes);
+        return covertBytes;
+    }
+
+    public static void LOG(String TAG, String msg) {
+        if (mContext == null) {
+            return;
+        }
+        String saveLogName = (String) SPHelper.getPreference(mContext, BesSdkConstants.BES_SAVE_LOG_NAME, "");
+        boolean saveLog = (boolean) SPHelper.getPreference(mContext, BesSdkConstants.BES_SAVE_LOG_KEY, BesSdkConstants.BES_SAVE_LOG_VALUE);
+        if (saveLog) {
+            if (saveLogName.equals(BES_SAVE_LOG_OTA)) {
+                LogUtils.writeForOTA(TAG, msg, saveLogName);
+            } else if (saveLogName.length() > 0){
+                LogUtils.writeForLOG(TAG, msg, saveLogName);
+            }
+        }
+    }
+
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/BesOtaService.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/BesOtaService.java
new file mode 100644
index 00000000..02c01577
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/BesOtaService.java
@@ -0,0 +1,902 @@
+package com.bes.bessdk.service;
+
+import android.app.usage.NetworkStatsManager;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.le.BluetoothLeScanner;
+import android.bluetooth.le.ScanResult;
+import android.bluetooth.le.ScanSettings;
+import android.content.Context;
+import android.content.res.Resources;
+import android.nfc.Tag;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.bes.bessdk.BesSdkConstants;
+import com.bes.bessdk.scan.BtHeleper;
+import com.bes.bessdk.service.base.BesBaseService;
+import com.bes.bessdk.service.base.BesServiceConfig;
+import com.bes.bessdk.service.base.BesServiceListener;
+import com.bes.bessdk.utils.ArrayUtil;
+import com.bes.bessdk.utils.SPHelper;
+import com.bes.sdk.connect.DeviceConnector;
+import com.bes.sdk.device.HmDevice;
+import com.bes.sdk.message.BaseMessage;
+import com.bes.sdk.ota.OTADfuInfo;
+import com.bes.sdk.ota.OTATask;
+import com.bes.sdk.ota.RemoteOTAConfig;
+import com.bes.sdk.utils.DeviceProtocol;
+import com.bes.sdk.utils.OTAStatus;
+
+import java.io.File;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import static com.bes.bessdk.BesSdkConstants.BES_CONNECT_ERROR;
+import static com.bes.bessdk.BesSdkConstants.BES_CONNECT_SUCCESS;
+import static com.bes.bessdk.BesSdkConstants.BES_NOTIFY_ERROR;
+import static com.bes.bessdk.BesSdkConstants.BES_NOTIFY_SUCCESS;
+import static com.bes.bessdk.service.BesOTAConstants.MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT;
+import static com.bes.bessdk.service.BesOTAConstants.MSG_GET_PROTOCOL_VERSION_TIME_OUT;
+import static com.bes.bessdk.service.BesOTAConstants.MSG_GET_RANDOMID_TIME_OUT;
+import static com.bes.bessdk.service.BesOTAConstants.MSG_GET_SELECT_SIDE_TIME_OUT;
+import static com.bes.bessdk.service.BesOTAConstants.MSG_GET_UPGRATE_TYPE_TIME_OUT;
+import static com.bes.bessdk.service.BesOTAConstants.MSG_GET_VERSION_TIME_OUT;
+import static com.bes.bessdk.service.BesOTAConstants.MSG_OTA_OVER_RECONNECT;
+import static com.bes.bessdk.service.BesOTAConstants.MSG_SET_USER_TIME_OUT;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_BREAKPOINT_CHECK;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_BREAKPOINT_CHECK_80;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_CRC_CHECK_PACKAGE_ERROR;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_CRC_CHECK_PACKAGE_OK;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_DISCONNECT;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_GET_HW_INFO;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_GET_PROTOCOL_VERSION;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_RETURN;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_ROLESWITCH_GET_RANDOMID;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_SELECT_SIDE_OK;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_SEND_CONFIGURE_OK;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_SEND_OTA_DATA;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_SET_OAT_USER_ERROR;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_SET_OAT_USER_OK;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_SET_UPGRADE_TYPE_FAST;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_SET_UPGRADE_TYPE_NORMAL;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_CMD_WHOLE_CRC_CHECK;
+import static com.bes.bessdk.service.BesOTAConstants.OTA_SEND_DATA_PROGRESS;
+import static com.bes.sdk.utils.OTAStatus.STATUS_CANCELED;
+import static com.bes.sdk.utils.OTAStatus.STATUS_FAILED;
+import static com.bes.sdk.utils.OTAStatus.STATUS_REBOOT;
+import static com.bes.sdk.utils.OTAStatus.STATUS_STARTED;
+import static com.bes.sdk.utils.OTAStatus.STATUS_SUCCEED;
+import static com.bes.sdk.utils.OTAStatus.STATUS_UNKNOWN;
+
+public class BesOtaService extends BesBaseService implements DeviceConnector.ConnectionListener, OTATask {
+
+    protected Object mOtaLock = new Object();
+
+    RemoteOTAConfig mRemoteOTAConfig;
+    OTAStatus mOTAStatus = STATUS_UNKNOWN;
+    OTADfuInfo mOTADfuInfo;
+    String progress = "0.00";
+    StatusListener mStatusListener;
+    int curOtaResult = 0;
+    int notifyRetryTimes = 0;
+    int connectRetryTimes = 0;
+    int getVersionRetryTimes = 0;
+    int getCrcConfirmRetryTimes = 0;
+    int getProtocolRetryTimes = 0;
+    int setUserRetryTimes = 0;
+    boolean sendPackageWithAck = false;
+
+    int crcPackageRetryTimes = 0;
+
+    int USER_FLAG = 1;
+    boolean isSppConect = false;
+    boolean currentOrLegacy = true;
+    int curUpgateType = 1;
+    int curUser = 1;//1:fw 2:language 3:combine
+    long sppSendDataDelay = 10;
+    int imageSideSelection = 0;
+    boolean isWithoutResponse = false;
+
+    String roleSwitchRandomID = "";
+    boolean roleSwitchDisconnect = false;
+    private Timer sppRoleSwitchTimer;
+    private TimerTask task;
+
+    public BesOtaService(BesServiceConfig serviceConfig, BesServiceListener listener, Context context) {
+        super(serviceConfig, listener, context);
+        LOG(TAG, "init");
+        USER_FLAG = serviceConfig.getUSER_FLAG();
+        isSppConect = serviceConfig.getDeviceProtocol() == DeviceProtocol.PROTOCOL_BLE ? false : true;
+        isWithoutResponse = serviceConfig.getIsWithoutResponse();
+        BesOtaCMD.setOtaUser(USER_FLAG, isSppConect, isWithoutResponse, mTotaConnect, serviceConfig.getUseTotaV2());
+        boolean defaultinterval = (boolean)SPHelper.getPreference(mContext, BesSdkConstants.BES_default_INTERVAL, BesSdkConstants.BES_default_INTERVAL_VALUE);
+        long bledelay = Long.parseLong((String) SPHelper.getPreference(mContext,BesSdkConstants.BES_BLE_INTERVAL,"50"));
+        long sppdelay = Long.parseLong((String) SPHelper.getPreference(mContext,BesSdkConstants.BES_SPP_INTERVAL,"30"));
+//        long gattdelay = (long) SPHelper.getPreference(mContext,BesSdkConstants.BES_GATT_INTERVAL,"30");
+        if (isSppConect) {
+            if (mTotaConnect) {
+                sppSendDataDelay = 20;
+            } else {
+                sppSendDataDelay = 15;
+            }
+            if (USER_FLAG == 0) {
+                sppSendDataDelay = 30;
+            }
+            if (defaultinterval == false) {
+                sppSendDataDelay = sppdelay;
+            }
+        } else  {
+            sppSendDataDelay = 50;
+            if (defaultinterval == false) {
+                sppSendDataDelay = bledelay;
+            }
+
+        }
+        if (USER_FLAG < 1) {
+            sendPackageWithAck = serviceConfig.getCurAckType();
+        }
+        if (USER_FLAG == -1) {
+            imageSideSelection = serviceConfig.getImageSideSelection();
+            BesOtaCMD.setImageSideSelection(imageSideSelection == 4 ? 1 : imageSideSelection);
+        }
+
+        curUser = serviceConfig.getCurUser();
+        curUpgateType = serviceConfig.getCurUpgateType();
+
+        LOG(TAG, "BesOtaService Protocol: --------" + serviceConfig.getDeviceProtocol());
+        if (serviceConfig.getDeviceProtocol() == DeviceProtocol.PROTOCOL_BLE) {
+            if (serviceConfig.isTotaConnect() == true) {
+                SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_SERVICE, BesSdkConstants.BES_TOTA_SERVICE_OTA_UUID.toString());
+                SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_CHARACTERISTIC, BesSdkConstants.BES_TOTA_CHARACTERISTI_OTA_UUID.toString());
+                SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_DESCRIPTOR, BesSdkConstants.BES_TOTA_DESCRIPTOR_OTA_UUID.toString());
+            } else {
+                SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_SERVICE, BesSdkConstants.BES_OTA_SERVICE_OTA_UUID.toString());
+                SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_CHARACTERISTIC, BesSdkConstants.BES_OTA_CHARACTERISTIC_OTA_UUID.toString());
+                SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_DESCRIPTOR, BesSdkConstants.BES_OTA_DESCRIPTOR_OTA_UUID.toString());
+            }
+        } else if (serviceConfig.getDeviceProtocol() == DeviceProtocol.PROTOCOL_SPP) {
+            if (serviceConfig.isTotaConnect() == true) {
+                SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_SERVICE, BesSdkConstants.BES_SPP_CONNECT.toString());
+            } else {
+                SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_SERVICE, BesSdkConstants.BES_OTA_SERVICE_OTA_UUID.toString());
+            }
+        } else if (serviceConfig.getDeviceProtocol() == DeviceProtocol.PROTOCOL_GATT_BR_EDR) {
+            SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_SERVICE, BesSdkConstants.BES_GATT_SERVICE_UUID.toString());
+            SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_CHARACTERISTIC, BesSdkConstants.BES_OTA_CHARACTERISTIC_OTA_UUID.toString());
+            SPHelper.putPreference(mContext, BesSdkConstants.BES_CONNECT_DESCRIPTOR, BesSdkConstants.BES_GATT_DESCRIPTOR_OTA_UUID.toString());
+        }
+        startConnect();
+    }
+
+    //------------------------ConnectionListener-----------------------------------
+    @Override
+    public void onStatusChanged(HmDevice device, int status, DeviceProtocol protocol) {
+        super.onStatusChanged(device, status, protocol);
+        LOG(TAG, "onStatusChanged: ------" + status);
+        if (status == BES_CONNECT_SUCCESS && mTotaConnect == false) {
+            roleSwitchDisconnect = false;
+            connectRetryTimes = 0;
+            LOG(TAG, "onStatusChanged: -----true");
+            callBackStateChangedMessage(BES_CONNECT_SUCCESS, "");
+            if (roleSwitchRandomID.length() > 0 && mDeviceProtocol == DeviceProtocol.PROTOCOL_SPP) {
+                stopSppRoleSwitchTimer();
+            }
+            if (USER_FLAG == 1) {
+                sendGetProtocolVersionData();
+            } else if (USER_FLAG == 0) {
+//                getCurrentVersion();
+                sendSetUserData();
+            }
+        } else if (status != BES_CONNECT_SUCCESS){
+            LOG(TAG, "onStatusChanged: -----false +" + mOTAStatus);
+            if (mOTAStatus == STATUS_CANCELED || mOTAStatus == STATUS_FAILED) {
+                return;
+            }
+            if (mOTAStatus != STATUS_UNKNOWN) {
+                if (mOTAStatus != STATUS_SUCCEED && mOTAStatus != STATUS_CANCELED && mOTAStatus != STATUS_FAILED && roleSwitchRandomID.length() > 0) {
+                    LOG(TAG, "onStatusChanged: -----------" + roleSwitchRandomID);
+                    //role switch
+                    if (mDeviceProtocol == DeviceProtocol.PROTOCOL_BLE) {
+                        scanToReConnected();
+                    } else if (mDeviceProtocol == DeviceProtocol.PROTOCOL_SPP || mDeviceProtocol == DeviceProtocol.PROTOCOL_GATT_BR_EDR) {
+                        startConnect();
+                    }
+                } else if (mOTAStatus == STATUS_SUCCEED) {
+                    //reconnect after ota success
+                    sendDataDelay(besOtaMsgHandler, MSG_OTA_OVER_RECONNECT, 15000);
+                } else {
+                    LOG(TAG, "onStatusChanged: ------------22222");
+                    callBackStateChangedMessage(BES_CONNECT_ERROR, "");
+                }
+                return;
+            }
+            connectRetryTimes ++;
+            if (connectRetryTimes == 3) {
+                callBackStateChangedMessage(BES_CONNECT_ERROR, "");
+                return;
+            }
+            startConnect();
+        }
+    }
+
+    @Override
+    public void callBackTotaConnectState(boolean state) {
+        super.callBackTotaConnectState(state);
+        if (state == true) {
+            roleSwitchDisconnect = false;
+            connectRetryTimes = 0;
+            LOG(TAG, "onStatusChanged: -----true");
+            callBackStateChangedMessage(BES_CONNECT_SUCCESS, "");
+            if (roleSwitchRandomID.length() > 0 && mDeviceProtocol == DeviceProtocol.PROTOCOL_SPP) {
+                stopSppRoleSwitchTimer();
+            }
+            if (USER_FLAG == 1) {
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                sendGetProtocolVersionData();
+            } else if (USER_FLAG == 0) {
+//                getCurrentVersion();
+                sendSetUserData();
+            }
+        }
+    }
+
+    @Override
+    public void onDataReceived(BaseMessage deviceMessage) {
+        super.onDataReceived(deviceMessage);
+        if (mTotaConnect && !totauccess) {
+            return;
+        }
+        byte[] receiveData = (byte[])deviceMessage.getMsgContent();
+        LOG(TAG, "onDataReceived encode: ----" + ArrayUtil.toHex(receiveData));
+        if (!sendPackageWithAck && receiveData[0] == (byte) 0x8b) {
+            return;
+        }
+        if (mTotaConnect) {
+            byte[] contentData =  new byte[receiveData.length - 4];
+            System.arraycopy(receiveData, 4, contentData, 0, receiveData.length - 4);
+            receiveData = contentData;
+        }
+        LOG(TAG, "onDataReceived: ----" + ArrayUtil.toHex(receiveData));
+        int result = BesOtaCMD.receiveData(receiveData, mContext, curOtaResult, sendPackageWithAck);
+        curOtaResult = result;
+        LOG(TAG, "onDataReceived: -----" + curOtaResult);
+        if (result == OTA_CMD_GET_HW_INFO) {
+            removeTimeoutMsg(besOtaMsgHandler, MSG_GET_VERSION_TIME_OUT);
+            getVersionRetryTimes = 0;
+            if (roleSwitchRandomID.length() > 0 && mOTAStatus != STATUS_SUCCEED) {
+                startOta();
+                return;
+            }
+
+            callBackStateChangedMessage(result, BesOtaCMD.getCurrentVersion());
+        } else if (result == OTA_CMD_GET_PROTOCOL_VERSION) {
+            removeTimeoutMsg(besOtaMsgHandler, MSG_GET_PROTOCOL_VERSION_TIME_OUT);
+            getProtocolRetryTimes = 0;
+            callBackStateChangedMessage(result, "");
+            sendSetUserData();
+        } else if (result == OTA_CMD_SET_OAT_USER_OK) {
+            removeTimeoutMsg(besOtaMsgHandler, MSG_SET_USER_TIME_OUT);
+            setUserRetryTimes = 0;
+            callBackStateChangedMessage(result, "");
+            getCurrentVersion();
+        } else if (result == OTA_CMD_SET_UPGRADE_TYPE_NORMAL) {
+            removeTimeoutMsg(besOtaMsgHandler, MSG_GET_UPGRATE_TYPE_TIME_OUT);
+            callBackStateChangedMessage(result, "");
+            sendGetROLESwitchRandomIDData();
+        } else if (result == OTA_CMD_SET_UPGRADE_TYPE_FAST) {
+            removeTimeoutMsg(besOtaMsgHandler, MSG_GET_UPGRATE_TYPE_TIME_OUT);
+            callBackStateChangedMessage(result, "");
+            sendGetROLESwitchRandomIDData();
+        } else if (result == OTA_CMD_ROLESWITCH_GET_RANDOMID) {
+            removeTimeoutMsg(besOtaMsgHandler, MSG_GET_RANDOMID_TIME_OUT);
+            roleSwitchRandomID = BesOtaCMD.getRoleSwitchRandomID();
+            LOG(TAG, "onDataReceived roleSwitchRandomID: -----" + roleSwitchRandomID);
+            callBackStateChangedMessage(result, roleSwitchRandomID);
+            sendSelectSideData();
+        } else if (result == OTA_CMD_SELECT_SIDE_OK) {
+            removeTimeoutMsg(besOtaMsgHandler, MSG_GET_SELECT_SIDE_TIME_OUT);
+            callBackStateChangedMessage(result, "");
+            sendData(BesOtaCMD.getCheckBreakPointCMD(mContext));
+        } else if (result == OTA_CMD_BREAKPOINT_CHECK_80) {
+            callBackStateChangedMessage(result, "");
+//            sendData(BesOtaCMD.getStartOTAPacketCMD(mRemoteOTAConfig.getLocalPath()));
+            //show config
+
+        } else if (result == OTA_CMD_BREAKPOINT_CHECK) {
+            callBackStateChangedMessage(result, "");
+            sendData(BesOtaCMD.getOTAConfigureCMD(mRemoteOTAConfig.getLocalPath(), mContext));
+        } else if (result == OTA_CMD_SEND_OTA_DATA) {
+            BesOtaCMD.notifySuccess();
+            besSendData();
+        } else if (result == OTA_CMD_SEND_CONFIGURE_OK) {
+            roleSwitchDisconnect = false;
+            curOtaResult = OTA_CMD_SEND_OTA_DATA;
+            callBackStateChangedMessage(result, "");
+            besSendData();
+        } else if (result == OTA_CMD_CRC_CHECK_PACKAGE_OK) {
+            removeTimeoutMsg(besOtaMsgHandler, MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT);
+            callBackStateChangedMessage(result, "crc check package ok");
+            getCrcConfirmRetryTimes = 0;
+            crcPackageRetryTimes = 0;
+            curOtaResult = OTA_CMD_SEND_OTA_DATA;
+            besSendData();
+        } else if (result == OTA_CMD_WHOLE_CRC_CHECK) {
+            removeTimeoutMsg(besOtaMsgHandler, MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT);
+            besSendData();
+        } else if (result == OTA_CMD_DISCONNECT) {
+            callBackStateChangedMessage(result, "");
+            if (roleSwitchRandomID.length() > 0) {
+                roleSwitchDisconnect = true;
+            }
+            if (mOTAStatus == STATUS_SUCCEED) {
+                sendDataDelay(besOtaMsgHandler, OTA_CMD_DISCONNECT, 3000);
+            }
+        } else if (result == BesOTAConstants.OTA_CMD_ROLESWITCH_COMPLETE) {
+            callBackStateChangedMessage(result, "");
+            //检测 spp role switch 断连
+             startSppRoleSwitchTimer();
+        } else if (result == BesOTAConstants.OTA_CMD_WHOLE_CRC_CHECK_OK) {
+            callBackStateChangedMessage(result, "");
+            sendData(BesOtaCMD.getImageOverwritingConfirmationPacketCMD());
+        } else if (result == BesOTAConstants.OTA_CMD_IMAGE_OVER_CONFIRM) {
+            LOG(TAG, "onDataReceived: -------ota success");
+            mOTAStatus = STATUS_SUCCEED;
+            callBackSuccessMessage(result);
+            SPHelper.removePreference(mContext, BesOTAConstants.BES_OTA_RANDOM_CODE_LEFT);
+        } else if (result == BesOTAConstants.OTA_CMD_CRC_CHECK_PACKAGE_ERROR && crcPackageRetryTimes < 3) {
+            removeTimeoutMsg(besOtaMsgHandler, MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT);
+            crcPackageRetryTimes ++;
+            callBackStateChangedMessage(result, "" + crcPackageRetryTimes);
+            BesOtaCMD.crcConfirmError();
+            curOtaResult = OTA_CMD_SEND_OTA_DATA;
+            besSendData();
+        }
+
+
+        else if (result == OTA_CMD_RETURN) {
+            LOG(TAG, "onDataReceived: OTA_CMD_RETURN------------OTA_CMD_RETURN");
+        }
+        //tota相关需要修改
+        else if (receiveData[0] == (byte)0x00 && receiveData[1] == (byte)0x10 && receiveData[2] == (byte)0x10) {
+            return;
+        }
+        else if (receiveData[0] == (byte)0x63 && receiveData[1] == (byte)0x6f && receiveData[2] == (byte)0x6e) {
+            return;
+        }
+        else if (receiveData[0] != (byte)0x85 && useTotaV2 == false) {
+            if (result == BesOTAConstants.OTA_CMD_CRC_CHECK_PACKAGE_ERROR) {
+                removeTimeoutMsg(besOtaMsgHandler, MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT);
+            } else if (result == BesOTAConstants.OTA_CMD_SET_OAT_USER_ERROR) {
+                removeTimeoutMsg(besOtaMsgHandler, MSG_SET_USER_TIME_OUT);
+                setUserRetryTimes = 0;
+            }
+            mOTAStatus = STATUS_FAILED;
+            callBackOTAStatusChanged(mOTAStatus);
+            callBackErrorMessage(result);
+            destoryVariable();
+        }
+    }
+
+    @Override
+    public void notifyWrite(int state) {
+        super.notifyWrite(state);
+        if (state == BES_NOTIFY_SUCCESS) {
+            if (curOtaResult == OTA_CMD_SEND_OTA_DATA && sendPackageWithAck == false && (USER_FLAG < 1 || !isWithoutResponse)) {
+               new Thread(new Runnable() {
+                   @Override
+                   public void run() {
+                       try {
+                           Thread.sleep(10);
+                           notifyRetryTimes = 0;
+                           BesOtaCMD.notifySuccess();
+                           sendPacketData();
+                       } catch (InterruptedException e) {
+                           e.printStackTrace();
+                       }
+                   }
+               }).start();
+            }
+        } else {
+            //retry
+            if (curOtaResult == OTA_CMD_SEND_OTA_DATA && sendPackageWithAck == false &&  (USER_FLAG < 1 || !isWithoutResponse)) {
+                notifyRetryTimes++;
+                if (notifyRetryTimes == 3) {
+                    callBackErrorMessage(BES_NOTIFY_ERROR);
+                    return;
+                }
+                sendPacketData();
+            }
+        }
+    }
+
+    //------------------------OTATask-----------------------------------
+    @Override
+    public void setOtaConfig(RemoteOTAConfig config) {
+        LOG(TAG, "setOtaConfig: -----" + config.getLocalPath());
+        File file = new File(config.getLocalPath());
+        if (!file.exists()) {
+            callBackErrorMessage(BesOTAConstants.OTA_START_OTA_ERROR);
+            mOTAStatus = STATUS_FAILED;
+            callBackOTAStatusChanged(mOTAStatus);
+            return;
+        }
+        if (imageSideSelection == 4) {
+            if (config.getWhatsNewContent("") == null) {
+                return;
+            }
+            File file2 = new File(config.getWhatsNewContent(""));
+            if (!file2.exists()) {
+                callBackErrorMessage(BesOTAConstants.OTA_START_OTA_ERROR);
+                mOTAStatus = STATUS_FAILED;
+                callBackOTAStatusChanged(mOTAStatus);
+                return;
+            }
+        }
+        mRemoteOTAConfig = config;
+    }
+
+    @Override
+    public HmDevice getDevice() {
+        return mHmDevice;
+    }
+
+    @Override
+    public RemoteOTAConfig getOtaConfig() {
+        return mRemoteOTAConfig;
+    }
+
+    @Override
+    public OTAStatus getOTAStatus() {
+        return mOTAStatus;
+    }
+
+    @Override
+    public int getCurrentProgress() {
+        return Float.valueOf(progress).intValue();
+    }
+
+    @Override
+    public OTADfuInfo requestDFUInfo() {
+        return mOTADfuInfo;
+    }
+
+    @Override
+    public void preTransferInit() {
+
+    }
+
+    @Override
+    public boolean startDataTransfer(OTADfuInfo dufInfo, StatusListener listener) {
+        LOG(TAG, "startDataTransfer");
+        if (curOtaResult == OTA_CMD_BREAKPOINT_CHECK_80) {
+            sendData(BesOtaCMD.getStartOTAPacketCMD(mRemoteOTAConfig.getLocalPath()));
+            return true;
+        }
+        mOTADfuInfo = dufInfo;
+        mStatusListener = listener;
+
+        if (checkOtaState() == false) {
+            callBackErrorMessage(BesOTAConstants.OTA_START_OTA_ERROR);
+            mOTAStatus = STATUS_FAILED;
+            callBackOTAStatusChanged(mOTAStatus);
+            return false;
+        }
+        if (dufInfo.getBreakpoint() == 0) {
+            SPHelper.removePreference(mContext, BesOTAConstants.BES_OTA_RANDOM_CODE_LEFT);
+        }
+        if (curOtaResult == OTA_CMD_SEND_OTA_DATA) {
+            return false;
+        }
+        startOta();
+        return true;
+    }
+
+    @Override
+    public boolean startDataTransfer(OTADfuInfo dufInfo, int threshold, boolean allowBackground, StatusListener listener) {
+        return false;
+    }
+
+    @Override
+    public boolean stopDataTransfer() {
+        LOG(TAG, "stopDataTransfer");
+        mOTAStatus = STATUS_CANCELED;
+        callBackOTAStatusChanged(mOTAStatus);
+        if (mLeScanner != null) {
+            mLeScanner.stopScan(mCallback);
+            mLeScanner = null;
+        }
+
+        // 清掉所有待发延迟消息（含成功后 MSG_OTA_OVER_RECONNECT 的 15s 自动重连）
+        // 与角色切换定时器，避免插件 stopOta 后被弃用的 service 仍发起僵尸重连/扫描。
+        besOtaMsgHandler.removeCallbacksAndMessages(null);
+        stopSppRoleSwitchTimer();
+
+        destoryVariable();
+        return true;
+    }
+
+    @Override
+    public void postTransferCleanup() {
+
+    }
+
+    @Override
+    public boolean applyNewFirmware(int threshold) {
+        return false;
+    }
+
+    @Override
+    public void registerOTAStatusListener(StatusListener listener) {
+
+    }
+
+    @Override
+    public void unregisterOTAStatusListener(StatusListener listener) {
+
+    }
+
+    private void callBackOTAStatusChanged(OTAStatus newStatus) {
+        if (mStatusListener != null) {
+            mStatusListener.onOTAStatusChanged(newStatus);
+        }
+    }
+
+    private void callBackOTAProgressChanged(int progress) {
+        if (mStatusListener != null) {
+            mStatusListener.onOTAProgressChanged(progress);
+        }
+    }
+
+//---------------------------------------------------------------------------------
+
+    private boolean checkOtaState() {
+        boolean s = true;
+        if (mRemoteOTAConfig == null || mRemoteOTAConfig.getLocalPath() == null || !(new File(mRemoteOTAConfig.getLocalPath()).exists())) {
+
+            s = false;
+        }
+
+
+
+        return s;
+    }
+
+    public void destoryVariable() {
+        LOG(TAG, "destoryVariable: --------------");
+        disconnected();
+        BesOtaCMD.destoryVariable();
+        roleSwitchRandomID = "";
+        mRemoteOTAConfig = null;
+        mOTADfuInfo = null;
+        mStatusListener = null;
+        curOtaResult = 0;
+    }
+
+    public void getCurrentVersion() {
+        LOG(TAG, "getCurrentVersion");
+        mOTAStatus = STATUS_STARTED;
+        sendData(BesOtaCMD.getCurrentVersionCMD());
+        addTimeOutMsg(besOtaMsgHandler, 5000, MSG_GET_VERSION_TIME_OUT);
+    }
+
+    private void startOta() {
+        LOG(TAG, "startOta: ------------");
+        mOTAStatus = STATUS_STARTED;
+        callBackOTAStatusChanged(mOTAStatus);
+
+        sendUpgrateTypeData();
+//        sendGetROLESwitchRandomIDData();
+    }
+
+    private void sendGetProtocolVersionData() {
+        LOG(TAG, "sendGetProtocolVersionData");
+        sendData(BesOtaCMD.getOtaProtocolVersionCMD(currentOrLegacy), 200);
+        addTimeOutMsg(besOtaMsgHandler, 3000, MSG_GET_PROTOCOL_VERSION_TIME_OUT);
+    }
+
+    private void sendSetUserData() {
+        LOG(TAG, "sendSetUserData");
+        sendData(BesOtaCMD.getSetOtaUserCMD(curUser));
+        addTimeOutMsg(besOtaMsgHandler, 5000, MSG_SET_USER_TIME_OUT);
+    }
+
+    private void sendGetROLESwitchRandomIDData() {
+        if (roleSwitchRandomID.length() > 0) {
+            sendSelectSideData();
+            return;
+        }
+
+        sendData(BesOtaCMD.getROLESwitchRandomIDCMD());
+        addTimeOutMsg(besOtaMsgHandler, 3000, MSG_GET_RANDOMID_TIME_OUT);
+    }
+
+    private void sendUpgrateTypeData() {
+        sendData(BesOtaCMD.getSetUpgrateTypeCMD(curUpgateType));
+        addTimeOutMsg(besOtaMsgHandler, 3000, MSG_GET_UPGRATE_TYPE_TIME_OUT);
+    }
+
+    private void sendSelectSideData() {
+        sendData(BesOtaCMD.getSelectSideCMD());
+        addTimeOutMsg(besOtaMsgHandler, 3000, MSG_GET_SELECT_SIDE_TIME_OUT);
+    }
+
+    private void besSendData() {
+        if ((USER_FLAG == 1 && isWithoutResponse) || (isSppConect && !sendPackageWithAck)) {
+            sendPacketDataDelay(sppSendDataDelay);
+        } else {
+            sendPacketData();
+        }
+    }
+    private boolean sendPacketData() {
+        LOG(TAG, "sendPacketData----" + roleSwitchDisconnect);
+        if (roleSwitchDisconnect) {
+            return false;
+        }
+        synchronized (mOtaLock) {
+            if (mRemoteOTAConfig == null) {
+                return false;
+            }
+            byte[] data = BesOtaCMD.getDataPacketCMD(mRemoteOTAConfig.getLocalPath(), (mDeviceProtocol == DeviceProtocol.PROTOCOL_BLE || mDeviceProtocol == DeviceProtocol.PROTOCOL_GATT_BR_EDR));
+
+            if (data[mTotaConnect ? 4 : 0] != (byte) 0x85) {
+                curOtaResult = 0;
+            }
+            if (mTotaConnect && data[mTotaConnect ? 4 : 0] == (byte) 0x85 && data[mTotaConnect ? 5 : 1] == (byte) 0x00 && data[mTotaConnect ? 6 : 2] == (byte) 0x00) {
+                curOtaResult = 0;
+                return false;
+            }
+            if (data[mTotaConnect ? 4 : 0] == (byte) 0x82) {
+                addTimeOutMsg(besOtaMsgHandler, 5000, MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT);
+            }
+            progress = BesOtaCMD.besOtaProgress();
+            if (progress.length() > 0) {
+                LOG(TAG, "sendPacketData: -----" + progress);
+                callBackOTAProgressChanged(Float.valueOf(progress).intValue());
+                callBackStateChangedMessage(OTA_SEND_DATA_PROGRESS, progress);
+            }
+            if (curOtaResult != 0 && USER_FLAG == 1 && isWithoutResponse) {
+                return sendDataWithoutResponse(data);
+            }
+            return sendData(data);
+        }
+    }
+
+    private void sendPacketDataDelay(long millis) {
+        LOG(TAG, "sendPacketDataDelay----");
+        sendDataDelay(besOtaMsgHandler, OTA_CMD_SEND_OTA_DATA, millis);
+    }
+
+    private BluetoothLeScanner mLeScanner;
+    private boolean scanSuccess = false;
+
+    private void scanToReConnected() {
+        curOtaResult = 0;
+        mOTAStatus = STATUS_REBOOT;
+        LOG(TAG, "scanToReConnected: -----------");
+        if (mLeScanner != null) {
+            mLeScanner.stopScan(mCallback);
+            mLeScanner = null;
+        }
+
+        scanSuccess = false;
+        new Thread(){
+            @Override
+            public void run() {
+                super.run();
+                try {
+                    Thread.sleep(3000);
+                    LOG(TAG, "scanSuccess: --------" + scanSuccess);
+                    if (!scanSuccess) {
+                        LOG(TAG, "!scanSuccess: --------");
+                        scanToReConnected();
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }.start();
+
+        BluetoothAdapter mBluetoothAdapter = BtHeleper.getBluetoothAdapter(mContext);
+        mLeScanner = mBluetoothAdapter.getBluetoothLeScanner();
+        mLeScanner.startScan(null, new ScanSettings.Builder().setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build(), mCallback);
+    }
+
+    private android.bluetooth.le.ScanCallback mCallback = new android.bluetooth.le.ScanCallback() {
+        @Override
+        public void onScanFailed(int errorCode) {
+            super.onScanFailed(errorCode);
+            LOG(TAG, "onScanFailed: ---------fail");
+            scanToReConnected();
+        }
+        @Override
+        public void onScanResult(int callbackType, ScanResult result) {
+            scanSuccess = true;
+            String resultStr = ArrayUtil.bytesToHexString(result.getScanRecord().getBytes());
+            String[] all = resultStr.split("03ff");
+            String needStr;
+            if (resultStr.contains("03ff03ff")) {
+                //特殊判断
+                String[] allSp = resultStr.split("03ff03ff");
+                if (allSp.length > 1) {
+                    //如果allSp[1]都是0说明是最后一个否则为其他的03ff03ff出现
+                    String spStr = allSp[1];
+                    boolean zero = true;
+                    for (int i = 0; i < spStr.length(); i ++) {
+                        String singleStr = spStr.substring(i, i + 1);
+                        if (singleStr.equals("0") == false) {
+                            zero = false;
+                            break;
+                        }
+                    }
+                    if (zero) {
+                        needStr = "03ff";
+                    } else  {
+                        needStr = all[all.length - 1];
+                        if (needStr.length() < 4){
+                            return;
+                        }
+                        needStr = needStr.substring(0, 4);
+                    }
+                } else  {
+                    needStr = "03ff";
+                }
+            } else if (all.length > 1) {
+                needStr = all[all.length - 1];
+                if (needStr.length() < 4){
+                    return;
+                }
+                needStr = needStr.substring(0, 4);
+            } else {
+                return;
+            }
+            if (needStr.equals(roleSwitchRandomID)) {
+                mLeScanner.stopScan(mCallback);
+                mLeScanner = null;
+                BluetoothDevice device = result.getDevice();
+                if (device != null) {
+                    if (mDeviceProtocol == DeviceProtocol.PROTOCOL_BLE) {
+                        mHmDevice.setBleAddress(device.getAddress());
+                    } else {
+                        mHmDevice.setDeviceMAC(device.getAddress());
+                    }
+                    startConnect();
+                }
+            }
+        }
+    };
+
+    private Handler besOtaMsgHandler = new Handler() {
+        @Override
+        public void handleMessage(@NonNull Message msg) {
+            super.handleMessage(msg);
+            LOG(TAG, "handleMessage: -----" + msg.what);
+            switch (msg.what) {
+                case MSG_GET_VERSION_TIME_OUT:
+                    if (getVersionRetryTimes > 2) {
+                        callBackErrorMessage(msg.what);
+                    } else if (isConnect) {
+                        getVersionRetryTimes ++;
+                        getCurrentVersion();
+                    } else {
+                        getVersionRetryTimes = 0;
+                    }
+                    break;
+                case OTA_CMD_DISCONNECT:
+                    disconnected();
+                    break;
+                case MSG_GET_RANDOMID_TIME_OUT:
+                    callBackStateChangedMessage(MSG_GET_RANDOMID_TIME_OUT, "");
+                    sendSelectSideData();
+                    break;
+                case MSG_OTA_OVER_RECONNECT:
+                    if (roleSwitchRandomID.length() > 0) {
+                        scanToReConnected();
+                    } else {
+                        startConnect();
+                    }
+                    break;
+                case MSG_GET_PROTOCOL_VERSION_TIME_OUT:
+                    if (roleSwitchRandomID.length() > 0) {
+                        disconnected();
+                        return;
+                    }
+                    if (USER_FLAG == 1) {
+                        if (getProtocolRetryTimes > 2 || !isConnect) {
+                            getProtocolRetryTimes = 0;
+                            mOTAStatus = STATUS_FAILED;
+                            callBackErrorMessage(MSG_GET_PROTOCOL_VERSION_TIME_OUT);
+                            mOTAStatus = STATUS_CANCELED;
+                            destoryVariable();
+                        } else {
+                            getProtocolRetryTimes ++;
+                            sendGetProtocolVersionData();
+                        }
+                        return;
+                    }
+                    sendUpgrateTypeData();
+                    break;
+                case MSG_GET_UPGRATE_TYPE_TIME_OUT:
+                    callBackStateChangedMessage(MSG_GET_UPGRATE_TYPE_TIME_OUT, "");
+                    sendGetROLESwitchRandomIDData();
+                    break;
+                case MSG_GET_SELECT_SIDE_TIME_OUT:
+                    sendData(BesOtaCMD.getCheckBreakPointCMD(mContext));
+                    break;
+                case OTA_CMD_SEND_OTA_DATA:
+                    boolean ss = sendPacketData();
+//                    Log.i(TAG, "handleMessage: ----------" + ss);
+                    if (ss && curOtaResult > 0) {
+                        BesOtaCMD.notifySuccess();
+                        besSendData();
+                    } else if (!ss && curOtaResult > 0) {
+                        besSendData();
+                    }
+                    break;
+                case MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT:
+                    //resend 82
+                    if (getCrcConfirmRetryTimes > 1) {
+                        callBackErrorMessage(OTA_CMD_CRC_CHECK_PACKAGE_ERROR);
+                        return;
+                    }
+                    getCrcConfirmRetryTimes ++;
+                    BesOtaCMD.setCrcConfirmState(true);
+                    besSendData();
+                    break;
+                case MSG_SET_USER_TIME_OUT:
+                    if (setUserRetryTimes > 1) {
+                        if (USER_FLAG == 0) {
+                            getCurrentVersion();
+                        } else {
+                            callBackErrorMessage(OTA_CMD_SET_OAT_USER_ERROR);
+                        }
+                        return;
+                    }
+                    setUserRetryTimes ++;
+                    sendSetUserData();
+                    break;
+                default:
+                    break;
+
+            }
+        }
+    };
+
+    //spp role switch
+    int sppRoleSwitchTimes = 0;
+    private void startSppRoleSwitchTimer() {
+        LOG(TAG, "startSppRoleSwitchTimer----");
+        stopSppRoleSwitchTimer();
+        sppRoleSwitchTimes = 0;
+        sppRoleSwitchTimer = new Timer();
+        task = new TimerTask()
+        {
+            @Override
+            public void run()
+            {
+                sppRoleSwitchTimes ++;
+                if (sppRoleSwitchTimes > 5) {
+                    stopSppRoleSwitchTimer();
+                    mDeviceConnector.disconnect(mHmDevice);
+                }
+            }
+        };
+        sppRoleSwitchTimer.schedule(task, 0, 1000);
+    }
+
+    private void stopSppRoleSwitchTimer() {
+        LOG(TAG, "stopSppRoleSwitchTimer----");
+        if (sppRoleSwitchTimer != null) {
+            sppRoleSwitchTimer.cancel();
+            sppRoleSwitchTimer = null;
+        }
+    }
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesBaseConnectListener.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesBaseConnectListener.java
new file mode 100644
index 00000000..bf42cca6
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesBaseConnectListener.java
@@ -0,0 +1,7 @@
+package com.bes.bessdk.service.base;
+
+public interface BesBaseConnectListener {
+
+    void notifyWrite(int state);
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesBaseService.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesBaseService.java
new file mode 100644
index 00000000..151dafb6
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesBaseService.java
@@ -0,0 +1,222 @@
+package com.bes.bessdk.service.base;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.bes.bessdk.BesSdkConstants;
+import com.bes.bessdk.connect.BTService;
+import com.bes.bessdk.connect.BleConnector;
+import com.bes.bessdk.connect.SppConnector;
+import com.bes.bessdk.utils.ArrayUtil;
+import com.bes.bessdk.utils.SPHelper;
+import com.bes.sdk.connect.DeviceConnector;
+import com.bes.sdk.device.HmDevice;
+import com.bes.sdk.message.BaseMessage;
+import com.bes.sdk.utils.DeviceProtocol;
+import com.besall.allbase.common.utils.LogUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import static com.bes.bessdk.BesSdkConstants.BES_SAVE_LOG_OTA;
+import static com.bes.bessdk.BesSdkConstants.MSG_TIME_OUT;
+
+public class BesBaseService  implements DeviceConnector.ConnectionListener, BesBaseConnectListener {
+    public final String TAG = getClass().getSimpleName();
+    static String startTime = "";
+    BesServiceListener mBesServiceListener;
+    public DeviceConnector mDeviceConnector;
+    public Context mContext;
+    public DeviceProtocol mDeviceProtocol;
+    public HmDevice mHmDevice;
+    public boolean mTotaConnect = false;
+    public boolean useTotaV2 = false;
+    public boolean totauccess = false;
+
+    public boolean isConnect = false;
+
+
+    public BesBaseService(BesServiceConfig serviceConfig, BesServiceListener listener, Context context) {
+        mContext = context;
+        mDeviceProtocol = serviceConfig.getDeviceProtocol();
+        mHmDevice = serviceConfig.getDevice();
+        mTotaConnect = serviceConfig.isTotaConnect();
+        useTotaV2 = serviceConfig.getUseTotaV2();
+        if (mContext == null || mDeviceProtocol == null || mHmDevice == null) {
+            return;
+        }
+        mBesServiceListener = listener;
+
+    }
+
+    public void startConnect() {
+        if (mDeviceProtocol == DeviceProtocol.PROTOCOL_BLE && mHmDevice.getBleAddress() != null) {
+            mDeviceConnector = BleConnector.getsConnector(mContext, this);
+            mDeviceConnector.connect(mHmDevice, this);
+        } else if (mDeviceProtocol == DeviceProtocol.PROTOCOL_SPP && mHmDevice.getDeviceMAC() != null) {
+            mDeviceConnector = SppConnector.getsConnector(mContext);
+            mDeviceConnector.connect(mHmDevice, this);
+        } else if (mDeviceProtocol == DeviceProtocol.PROTOCOL_GATT_BR_EDR && mHmDevice.getDeviceMAC() != null) {
+            mDeviceConnector = BleConnector.getsConnector(mContext, this);
+            mDeviceConnector.connect(mHmDevice, this);
+        }
+        else {
+            callBackErrorMessage(BesSdkConstants.MSG_PARAMETER_ERROR);
+        }
+    }
+
+    public void disconnected() {
+        if (mDeviceConnector != null) {
+            mDeviceConnector.disconnect(mHmDevice);
+        }
+    }
+
+    @Override
+    public void onStatusChanged(HmDevice device, int status, DeviceProtocol protocol) {
+        if (status == BesSdkConstants.BES_CONNECT_SUCCESS) {
+            isConnect = true;
+        } else {
+            isConnect = false;
+        }
+        if (mTotaConnect && !totauccess && status == BesSdkConstants.BES_CONNECT_SUCCESS) {
+            sendData(TOTAConnectCMD.totaStartData());
+        }
+        if (status == BesSdkConstants.BES_CONNECT_ERROR) {
+            totauccess = false;
+        }
+    }
+
+    @Override
+    public void onDataReceived(BaseMessage deviceMessage) {
+        if (((byte[]) deviceMessage.getMsgContent())[0] == (byte) 0x00 && ((byte[]) deviceMessage.getMsgContent())[1] == (byte) 0x00) {
+            return;
+        }
+        if (mTotaConnect && !totauccess) {
+            int result = TOTAConnectCMD.receiveData(useTotaV2 ? TOTAConnectCMD.setTotaV2PacketData((byte[]) deviceMessage.getMsgContent(), false) : (byte[]) deviceMessage.getMsgContent());
+            if (result == BesSdkConstants.BES_TOTA_CONFIRM) {
+                sendData(TOTAConnectCMD.totaConfirm());
+            } else if (result == BesSdkConstants.BES_TOTA_SUCCESS) {
+                totauccess = true;
+                callBackTotaConnectState(totauccess);
+            } else if (result == BesSdkConstants.BES_TOTA_ERROR) {
+                totauccess = false;
+                callBackTotaConnectState(totauccess);
+            }
+        } else if (totauccess) {
+            boolean totaEncryption = (boolean) SPHelper.getPreference(mContext, BesSdkConstants.BES_TOTA_ENCRYPTION_KEY, BesSdkConstants.BES_TOTA_ENCRYPTION_VALUE);
+            if (totaEncryption) {
+                deviceMessage.setMsgContent(useTotaV2 ? TOTAConnectCMD.setTotaV2PacketData((byte[]) deviceMessage.getMsgContent(), true) : TOTAConnectCMD.totaDecodeData((byte[]) deviceMessage.getMsgContent()));
+            }
+        }
+        mMsgHandler.removeMessages(MSG_TIME_OUT);
+    }
+
+    @Override
+    public void notifyWrite(int state) {
+
+    }
+
+    public void callBackTotaConnectState(boolean state) {
+        if (mBesServiceListener != null) {
+            mBesServiceListener.onTotaConnectState(state);
+        }
+    }
+
+    public void callBackErrorMessage(int msg) {
+        if (mBesServiceListener != null) {
+            mBesServiceListener.onErrorMessage(msg);
+        }
+    }
+
+    public void callBackStateChangedMessage(int msg, String msgStr) {
+        if (mBesServiceListener != null) {
+            mBesServiceListener.onStateChangedMessage(msg, msgStr);
+        }
+    }
+
+    public void callBackSuccessMessage(int msg) {
+        if (mBesServiceListener != null) {
+            mBesServiceListener.onSuccessMessage(msg);
+        }
+    }
+
+    public boolean sendData(byte[] data) {
+        if (!isConnect) {
+            return false;
+        }
+        LOG(TAG, "sendData: -----" + ArrayUtil.toHex(data));
+        LOG(TAG, "sendData: -----" + data.length);
+        boolean totaEncryption = (boolean) SPHelper.getPreference(mContext, BesSdkConstants.BES_TOTA_ENCRYPTION_KEY, BesSdkConstants.BES_TOTA_ENCRYPTION_VALUE);
+        return BTService.sendData(mContext, mDeviceProtocol, (totauccess && totaEncryption) ? (useTotaV2 ? TOTAConnectCMD.getTotaV2Packet(TOTAConnectCMD.totaEncryptData(data)) : TOTAConnectCMD.totaEncryptData(data)) : (useTotaV2 ? TOTAConnectCMD.getTotaV2Packet(data) : data));
+    }
+
+    public boolean sendDataWithoutResponse(byte[] data) {
+        if (!isConnect) {
+            return false;
+        }
+        LOG(TAG, "sendDataWithoutResponse: ----" + ArrayUtil.toHex(data));
+        LOG(TAG, "sendDataWithoutResponse: -----" + data.length);
+        boolean totaEncryption = (boolean) SPHelper.getPreference(mContext, BesSdkConstants.BES_TOTA_ENCRYPTION_KEY, BesSdkConstants.BES_TOTA_ENCRYPTION_VALUE);
+        return BTService.sendDataWithoutResponse(mContext, mDeviceProtocol, (totauccess && totaEncryption) ? (useTotaV2 ? TOTAConnectCMD.getTotaV2Packet(TOTAConnectCMD.totaEncryptData(data)) : TOTAConnectCMD.totaEncryptData(data)) : (useTotaV2 ? TOTAConnectCMD.getTotaV2Packet(data) : data));
+    }
+
+    public boolean sendData(byte[] data, long millis) {
+        addTimeOut(millis);
+        return sendData(data);
+    }
+
+
+    public void sendDataDelay(Handler handler, int what, long millis) {
+        Message message = handler.obtainMessage(what);
+        handler.sendMessageDelayed(message, millis);
+    }
+
+    public void addTimeOut(long millis) {
+        Message message = mMsgHandler.obtainMessage(MSG_TIME_OUT);
+        mMsgHandler.sendMessageDelayed(message, millis);
+    }
+
+    public void addTimeOutMsg(Handler handler, long millis, int what) {
+        Message message = handler.obtainMessage(what);
+        handler.sendMessageDelayed(message, millis);
+    }
+
+    public void removeTimeoutMsg(Handler handler, int what) {
+        handler.removeMessages(what);
+    }
+
+    public Handler mMsgHandler = new Handler() {
+        @Override
+        public void handleMessage(@NonNull Message msg) {
+            super.handleMessage(msg);
+            switch (msg.what) {
+                case MSG_TIME_OUT:
+                    LOG(TAG, "handleMessage: ------MSG_TIME_OUT");
+                    callBackErrorMessage(MSG_TIME_OUT);
+                    break;
+
+                default:
+                    break;
+            }
+        }
+    };
+
+    public void LOG(String TAG, String msg) {
+        if (mContext == null) {
+            return;
+        }
+        String saveLogName = (String) SPHelper.getPreference(mContext, BesSdkConstants.BES_SAVE_LOG_NAME, "");
+        boolean saveLog = (boolean) SPHelper.getPreference(mContext, BesSdkConstants.BES_SAVE_LOG_KEY, BesSdkConstants.BES_SAVE_LOG_VALUE);
+        if (saveLog) {
+            if (saveLogName.equals(BES_SAVE_LOG_OTA)) {
+                LogUtils.writeForOTA(TAG, msg, saveLogName);
+            } else if (saveLogName.length() > 0){
+                LogUtils.writeForLOG(TAG, msg, saveLogName);
+            }
+        }
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesServiceConfig.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesServiceConfig.java
new file mode 100644
index 00000000..a2c3562c
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesServiceConfig.java
@@ -0,0 +1,91 @@
+package com.bes.bessdk.service.base;
+
+import com.bes.sdk.device.HmDevice;
+import com.bes.sdk.utils.DeviceProtocol;
+
+import java.io.Serializable;
+
+public class BesServiceConfig implements Serializable {
+    private DeviceProtocol deviceProtocol;
+    private HmDevice device;
+    private Boolean totaConnect = false;
+    private Boolean useTotaV2 = false;
+
+    private Integer USER_FLAG = 0;
+    private Integer curUser = 1;
+    private Integer curUpgateType = 1;
+    private Boolean curAckType = false;//1:without ack 2:with ack
+    private Integer imageSideSelection = 0;//0：stereo 1：left 2:right 3:both same 4:both diff
+    private Boolean isWithoutResponse = false;
+
+    public void setDeviceProtocol(DeviceProtocol deviceProtocol) {
+        this.deviceProtocol = deviceProtocol;
+    }
+
+    public void setDevice(HmDevice device) {
+        this.device = device;
+    }
+
+    public void setTotaConnect(Boolean totaConnect) {
+        this.totaConnect = totaConnect;
+    }
+
+    public void setUseTotaV2(Boolean useTotaV2) {
+        this.useTotaV2 = useTotaV2;
+    }
+
+    public void setUSER_FLAG(Integer user_flag) {
+        this.USER_FLAG = user_flag;
+    }
+    public void setCurUser(Integer curUser) {
+        this.curUser = curUser;
+    }
+    public void setCurUpgateType(Integer curUpgateType) {
+        this.curUpgateType = curUpgateType;
+    }
+    public void setCurAckType(Boolean curAckType) {
+        this.curAckType = curAckType;
+    }
+    public void setImageSideSelection(Integer imageSideSelection) {
+        this.imageSideSelection = imageSideSelection;
+    }
+    public void setIsWithoutResponse(Boolean withoutResponse) {
+        this.isWithoutResponse = withoutResponse;
+    }
+
+    public DeviceProtocol getDeviceProtocol() {
+        return deviceProtocol;
+    }
+
+    public HmDevice getDevice() {
+        return device;
+    }
+
+    public Boolean isTotaConnect() {
+        return totaConnect;
+    }
+
+    public Boolean getUseTotaV2() {
+        return useTotaV2;
+    }
+
+    public Integer getUSER_FLAG() {
+        return USER_FLAG;
+    }
+    public Integer getCurUser() {
+        return curUser;
+    }
+    public Integer getCurUpgateType() {
+        return curUpgateType;
+    }
+    public Boolean getCurAckType() {
+        return curAckType;
+    }
+    public Integer getImageSideSelection() {
+        return imageSideSelection;
+    }
+    public Boolean getIsWithoutResponse() {
+        return isWithoutResponse;
+    }
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesServiceListener.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesServiceListener.java
new file mode 100644
index 00000000..6e57aa01
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/BesServiceListener.java
@@ -0,0 +1,11 @@
+package com.bes.bessdk.service.base;
+
+public interface BesServiceListener {
+    void onTotaConnectState(boolean state);
+
+    void onErrorMessage(int msg);
+
+    void onStateChangedMessage(int msg, String msgStr);
+
+    void onSuccessMessage(int msg);
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/TOTAConnectCMD.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/TOTAConnectCMD.java
new file mode 100644
index 00000000..9197fd69
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/service/base/TOTAConnectCMD.java
@@ -0,0 +1,171 @@
+package com.bes.bessdk.service.base;
+
+import android.util.Log;
+
+import com.bes.bessdk.BesSdkConstants;
+import com.bes.bessdk.utils.ArrayUtil;
+import com.bes.bessdk.utils.sha.Sha256;
+import com.bes.bessdk.utils.sha.aes;
+import com.bes.bessdk.utils.sha.besFunc;
+
+import java.util.Random;
+
+public class TOTAConnectCMD {
+    static byte[] random_b;
+    static byte[] random_a;
+    static byte[] aes_key;
+    static byte[] hash_key_b;
+    static byte[] cashData = new byte[0];
+    static byte[] cashReceiveData = new byte[0];
+
+    static byte[] head = ArrayUtil.toBytes(ArrayUtil.str2HexStr("HEAD"));
+    static byte[] tail = ArrayUtil.toBytes(ArrayUtil.str2HexStr("TAIL"));
+    static byte[] dataLen = new byte[4];
+    static byte[] crc = new byte[4];
+
+    public static byte[] totaStartData() {
+        random_b = new byte[10];
+        new Random(new Random().nextInt(10000)).nextBytes(random_b);
+        byte[] bytes = new byte[10 + 5];
+        System.arraycopy(random_b, 0, bytes, 5,10);
+        bytes[0] = 0x01;
+        bytes[1] = 0x10;
+        bytes[2] = (byte) 0x0b;
+        bytes[3] = (byte) 0x00;
+        bytes[4] = (byte) 0x0a;
+        return bytes;
+    }
+
+    public static byte[] totaConfirm() {
+        byte[] bytes = new byte[hash_key_b.length + 4 + 1];
+        System.arraycopy(hash_key_b, 0, bytes, 4 + 1,hash_key_b.length);
+        bytes[0] = 0x03;
+        bytes[1] = 0x10;
+        bytes[2] = (byte) 0x21;
+        bytes[3] = 0x00;
+        bytes[4] = (byte) 0x20;
+        return bytes;
+    }
+
+    public static byte[] totaEncryptData(byte[] data) {
+        return aes.encrypt(data, aes_key);
+    }
+
+    public static byte[] totaDecodeData(byte[] data) {
+        return aes.decrypt(data, aes_key);
+    }
+
+    public static byte[] getTotaV2Packet(byte[] data) {
+        byte[] crc = new byte[4];
+        byte[] dataLen = ArrayUtil.intToBytesLittle(data.length);
+        long crc32 = ArrayUtil.crc32(data, 0, data.length);
+        crc[0] = (byte) crc32;
+        crc[1] = (byte) (crc32 >> 8);
+        crc[2] = (byte) (crc32 >> 16);
+        crc[3] = (byte) (crc32 >> 24);
+
+        byte[] bytes = ArrayUtil.bytesSplic(ArrayUtil.byteMerger(head, dataLen), data, crc, tail);
+        return bytes;
+    }
+
+    public static byte[] getTotaV2PacketData(byte[] cmdCode, byte[] param) {
+        if (cmdCode == null) {
+            return param;
+        }
+        byte[] dataLen = new byte[2];
+        byte[] dataLen4 = ArrayUtil.intToBytesLittle(param.length);
+        System.arraycopy(dataLen4, 0, dataLen, 0, 2);
+
+        byte[] bytes = ArrayUtil.bytesSplic(cmdCode, dataLen, param, new byte[0]);
+        return bytes;
+    }
+
+    public static byte[][] getTotaV2LongPacket(byte[] data, int mtu) {
+        int dataLen = mtu - 4 * 4;
+        byte[] encodeData = totaEncryptData(data);
+        int count = encodeData.length % dataLen == 0 ? encodeData.length / dataLen : encodeData.length / dataLen + 1;
+        byte[][] result = new byte[count][];
+
+        for (int i = 0; i < count; i ++) {
+            byte[] bytes = new byte[(i == count - 1) ? (encodeData.length - (count - 1) * dataLen) : dataLen];
+            System.arraycopy(data, i * dataLen, bytes, 0, bytes.length);
+            result[i] = getTotaV2Packet(bytes);
+        }
+        return result;
+    }
+
+    public static byte[] setTotaV2PacketData(byte[] receiveData, boolean decode) {
+        if (!ArrayUtil.startsWith(receiveData, head) || !ArrayUtil.endWith(receiveData, tail)) {
+            receiveData = ArrayUtil.byteMerger(cashReceiveData, receiveData);
+        }
+        if (!ArrayUtil.startsWith(receiveData, head)) {
+            return new byte[]{0x00};
+        }
+        System.arraycopy(receiveData, head.length, dataLen, 0, dataLen.length);
+        int curDataLen = ArrayUtil.bytesToIntLittle(dataLen);
+        int curLen = head.length + dataLen.length + curDataLen + crc.length + tail.length;
+        if (curLen < receiveData.length) {
+            cashReceiveData = new byte[receiveData.length - curLen];
+            System.arraycopy(receiveData, curLen, cashReceiveData, 0, receiveData.length - curLen);
+        }
+
+        byte[] data = new byte[curDataLen];
+        System.arraycopy(receiveData, head.length + dataLen.length, data, 0, curDataLen);
+        byte[] mCrc = new byte[4];
+        long crc32 = ArrayUtil.crc32(data, 0, data.length);
+        mCrc[0] = (byte) crc32;
+        mCrc[1] = (byte) (crc32 >> 8);
+        mCrc[2] = (byte) (crc32 >> 16);
+        mCrc[3] = (byte) (crc32 >> 24);
+        System.arraycopy(receiveData, head.length + dataLen.length + curDataLen, crc, 0, crc.length);
+        //crc
+        for (int i = 0; i < crc.length; i ++) {
+            if (mCrc[i] != crc[i]) {
+                return new byte[]{0x01};
+            }
+        }
+        //data
+        if (cashData.length != 0) {
+            data = ArrayUtil.byteMerger(cashData, data);
+        }
+        if (decode) {
+            data = totaDecodeData(data);
+        }
+        byte[] cmdCode = new byte[2];
+        byte[] cmdDataLen = new byte[4];
+        System.arraycopy(data, cmdCode.length, cmdDataLen, 0, 2);
+        int cmdDataLenL = ArrayUtil.bytesToIntLittle(cmdDataLen);
+        if ((cmdDataLenL + cmdCode.length + 2) > data.length) {
+            cashData = data;
+            return new byte[]{0x02};
+        }
+        return data;
+    }
+
+    public static int receiveData(byte[] data) {
+        if (data[0] == 0x02 && (data[1] & 0xff) == 0x10) {
+            //random_a
+            byte[] bytes = new byte[]{data[3],data[2]};
+            String bytesStr = ArrayUtil.toHex(bytes);
+            int L = Integer.parseInt(bytesStr.replace(",", ""), 16);
+            random_a = new byte[L - 1];
+            System.arraycopy(data, 5, random_a, 0, L - 1);
+            //hash_key_b
+            byte[] random = new besFunc().func1(random_a, random_b);
+            hash_key_b = Sha256.getSHA256(random);
+            aes_key = new besFunc().func(hash_key_b);
+
+            return BesSdkConstants.BES_TOTA_CONFIRM;
+        } else if (data[0] == 0x00 && (data[1] & 0xff) == 0x10) {
+            if (data.length > 15 && data[12] == 0x73 && data[13] == 0x75 && data[14] == 0x63) {
+
+                return BesSdkConstants.BES_TOTA_SUCCESS;
+            } else {
+
+                return BesSdkConstants.BES_TOTA_ERROR;
+            }
+        }
+        return 0;
+    }
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/ArrayUtil.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/ArrayUtil.java
new file mode 100644
index 00000000..28c10a6e
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/ArrayUtil.java
@@ -0,0 +1,334 @@
+package com.bes.bessdk.utils;
+
+import java.math.BigDecimal;
+import java.util.zip.CRC32;
+
+public class ArrayUtil {
+    public static byte[] extractBytes(byte[] data, int start, int length) {
+        byte[] bytes = new byte[length];
+        System.arraycopy(data, start, bytes, 0, length);
+        return bytes;
+    }
+
+    public static boolean isEqual(byte[] array_1, byte[] array_2) {
+        if (array_1 == null) {
+            return array_2 == null;
+        }
+        if (array_2 == null) {
+            return false;
+        }
+        if (array_1 == array_2) {
+            return true;
+        }
+        if (array_1.length != array_2.length) {
+            return false;
+        }
+        for (int i = 0; i < array_1.length; i++) {
+            if (array_1[i] != array_2[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean contains(byte[] parent, byte[] child) {
+        if (parent == null) {
+            return child == null;
+        }
+        if (child == null || child.length == 0) {
+            return true;
+        }
+        if (parent == child) {
+            return true;
+        }
+        return new String(parent).contains(new String(child));
+    }
+
+    public static long crc32(byte[] data, int offset, int length) {
+        CRC32 crc32 = new CRC32();
+        crc32.update(data, offset, length);
+        return crc32.getValue();
+    }
+
+    public static byte checkSum(byte[] data, int len) {
+        byte sum = (byte) 0;
+        for (int i = 0; i < len; i++) {
+            sum ^= data[i];
+        }
+        return sum;
+    }
+
+    public static String toHex(byte[] data) {
+        StringBuffer buffer = new StringBuffer();
+        for (int i = 0; i < data.length; i++) {
+            buffer.append(String.format("%02x", data[i])).append(",");
+        }
+        return buffer.toString();
+    }
+
+    public static String toASCII(byte[] data) {
+        StringBuffer buffer = new StringBuffer();
+        for (int i = 0; i < data.length; i++) {
+            buffer.append((char)data[i]);
+        }
+        return buffer.toString();
+    }
+
+
+    public static boolean startsWith(byte[] data, byte[] param) {
+        if (data == null) {
+            return param == null;
+        }
+        if (param == null) {
+            return true;
+        }
+        if (data.length < param.length) {
+            return false;
+        }
+        for (int i = 0; i < param.length; i++) {
+            if (data[i] != param[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public static boolean endWith(byte[] data, byte[] param) {
+        if (data == null) {
+            return param == null;
+        }
+        if (param == null) {
+            return true;
+        }
+        if (data.length < param.length) {
+            return false;
+        }
+        for (int i = 0; i < param.length; i++) {
+            if (data[data.length - 1 - i] != param[param.length - 1 - i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+
+    /**
+     * 将toHex()16进制字符串转换为byte[]
+     *
+     * @param str
+     * @return
+     * add by fanxiaoli 20190102
+     */
+    public static byte[] toBytes(String str) {
+        if(str == null || str.trim().equals("")) {
+            return new byte[0];
+        }
+        str = str.replace(",","");//与toHex函数对应
+        if(str == null || str.trim().equals("")) {
+            return new byte[0];
+        }
+        byte[] bytes = new byte[str.length() / 2];
+        for(int i = 0; i < str.length() / 2; i++) {
+            String subStr = str.substring(i * 2, i * 2 + 2);
+            bytes[i] = (byte) Integer.parseInt(subStr, 16);
+        }
+        return bytes;
+    }
+
+
+
+    /**
+     * 以小端模式将byte[]转成int
+     * add by fanxiaoli 20190102
+     */
+    public static int bytesToIntLittle(byte[] src) {
+        int value = 0;
+        value = (int) ((src[0] & 0xFF)
+                | ((src[1] << 8) & 0xFF00)
+                | ((src[2] << 16) & 0xFF0000)
+                | ((src[3] << 24) & 0xFF000000));
+        return value;
+
+
+    }
+
+    /*获取如1.1.1.1格式版本号
+     * add by fanxiaoli 20190114
+     */
+
+    public static String  bytesToVersion(byte[] src) {
+        String version = "";
+        int[] version_int = new int[4];
+        if(src.length==4) {
+            for (int i = 0;i<src.length;i++) {
+                version_int[i] = (int) (src[i] & 0xff);
+                version = version + (String.valueOf(version_int[i]));
+                if (i < 3) {
+                    version = version + ".";
+                }
+            }
+        }
+        return version;
+    }
+
+    public static byte[] intToBytesLittle(int value) {
+        byte[] src = new byte[4];
+        src[3] = (byte) ((value >> 24) & 0xFF);
+        src[2] = (byte) ((value >> 16) & 0xFF);
+        src[1] = (byte) ((value >> 8) & 0xFF);
+        src[0] = (byte) (value & 0xFF);
+        return src;
+    }
+
+    public static int bytesToShortLittle(byte[] src) {
+        int value = 0;
+        value = (short) ((src[0] & 0xFF)
+                | ((src[1] << 8) & 0xFF00));
+
+        return value;
+
+
+    }
+
+    public static byte[] hexStringToByte(String hex) {
+        int len = (hex.length() / 2);
+        byte[] result = new byte[len];
+        char[] achar = hex.toCharArray();
+        for (int i = 0; i < len; i++) {
+            int pos = i * 2;
+            result[len - i -1] = (byte) (toByte(achar[pos]) << 4 | toByte(achar[pos + 1]));
+        }
+        return result;
+    }
+    private static int toByte(char c) {
+        byte b = (byte) "0123456789ABCDEF".indexOf(c);
+        return b;
+    }
+    //+++/将byte转换成16进制字符串
+    public static String bytesToHexString(byte[] src){
+        StringBuilder stringBuilder = new StringBuilder("");
+        if (src == null || src.length <= 0) {
+            return null;
+        }
+        for (int i = 0; i < src.length; i++) {
+            int v = src[i] & 0xFF;
+            String hv = Integer.toHexString(v);
+            if (hv.length() < 2) {
+                stringBuilder.append(0);
+            }
+            stringBuilder.append(hv);
+        }
+        return stringBuilder.toString();
+    }
+
+    public static byte[] int2byte(int res) {
+        byte[] targets = new byte[4];
+        targets[0] = (byte) (res & 0xff);// 最低位
+        targets[1] = (byte) ((res >> 8) & 0xff);// 次低位
+        targets[2] = (byte) ((res >> 16) & 0xff);// 次高位
+        targets[3] = (byte) (res >>> 24);// 最高位,无符号右移。
+        return targets;
+    }
+
+    public static float getFloat(byte[] b) {
+        int accum = 0;
+        accum = accum|(b[0] & 0xff) << 0;
+        accum = accum|(b[1] & 0xff) << 8;
+        accum = accum|(b[2] & 0xff) << 16;
+        accum = accum|(b[3] & 0xff) << 24;
+        return accum;
+    }
+    //ota
+    public static byte[] bytesSplic(byte[] pt, byte[] l, byte[] magic, byte[] data) {
+        byte[] bytes = new byte[pt.length + l.length + magic.length + data.length];
+        System.arraycopy(pt, 0, bytes, 0, pt.length);
+        System.arraycopy(l, 0, bytes, pt.length, l.length);
+        System.arraycopy(magic, 0, bytes, pt.length + l.length, magic.length);
+        System.arraycopy(data, 0, bytes, pt.length + l.length + magic.length, data.length);
+        return bytes;
+    }
+
+    public static byte[] byteMerger(byte[] byte_1, byte[] byte_2){
+        byte[] byte_3 = new byte[byte_1.length + byte_2.length];
+        System.arraycopy(byte_1, 0, byte_3, 0, byte_1.length);
+        System.arraycopy(byte_2, 0, byte_3, byte_1.length, byte_2.length);
+        return byte_3;
+    }
+
+    /**
+     * 字符串转换成十六进制字符串
+     * @param  str 待转换的ASCII字符串
+     * @return String 每个Byte之间空格分隔，如: [61 6C 6B]
+     */
+    public static String str2HexStr(String str)
+    {
+
+        char[] chars = "0123456789ABCDEF".toCharArray();
+        StringBuilder sb = new StringBuilder("");
+        byte[] bs = str.getBytes();
+        int bit;
+
+        for (int i = 0; i < bs.length; i++)
+        {
+            bit = (bs[i] & 0x0f0) >> 4;
+            sb.append(chars[bit]);
+            bit = bs[i] & 0x0f;
+            sb.append(chars[bit]);
+            sb.append(',');
+        }
+        return sb.toString().trim();
+    }
+
+    public static int  getRssiValue(byte data) {
+        return  Integer.valueOf(data);
+    }
+
+    public static float byte2float(byte[] b) {
+        int l;
+        int index = 0;
+        l = b[index + 0];
+        l &= 0xff;
+        l |= ((long) b[index + 1] << 8);
+        l &= 0xffff;
+        l |= ((long) b[index + 2] << 16);
+        l &= 0xffffff;
+        l |= ((long) b[index + 3] << 24);
+        return Float.intBitsToFloat(l);
+    }
+
+    public static byte[] float2byte(float f) {
+
+        // 把float转换为byte[]
+        int fbit = Float.floatToIntBits(f);
+
+        byte[] b = new byte[4];
+        for (int i = 0; i < 4; i++) {
+            b[i] = (byte) (fbit >> (24 - i * 8));
+        }
+//        // 翻转数组
+        int len = b.length;
+        // 建立一个与源数组元素类型相同的数组
+        byte[] dest = new byte[len];
+        // 为了防止修改源数组，将源数组拷贝一份副本
+        System.arraycopy(b, 0, dest, 0, len);
+        byte temp;
+        // 将顺位第i个与倒数第i个交换
+        for (int i = 0; i < len / 2; ++i) {
+            temp = dest[i];
+            dest[i] = dest[len - i - 1];
+            dest[len - i - 1] = temp;
+        }
+        return dest;
+    }
+
+
+    public static double div(double v1, double v2, int scale) {
+        if (scale < 0) {
+            throw new IllegalArgumentException(
+                    "The scale must be a positive integer or zero");
+        }
+        BigDecimal b1 = new BigDecimal(Double.toString(v1));
+        BigDecimal b2 = new BigDecimal(Double.toString(v2));
+        return b1.divide(b2, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/CmdInfo.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/CmdInfo.java
new file mode 100644
index 00000000..defc9486
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/CmdInfo.java
@@ -0,0 +1,66 @@
+package com.bes.bessdk.utils;
+
+import java.nio.ByteBuffer;
+
+public class CmdInfo {
+
+    public static final int  HEAD_LEN = 4 ;
+    short cmdType ;
+    short dataLen ;
+    byte[] extData ;
+
+    public CmdInfo(short cmdType , byte[] extData){
+        if(extData != null){
+            dataLen = (short) extData.length ;
+        }
+        this.extData = extData ;
+        this.cmdType = cmdType;
+    }
+
+    public short getCmdType() {
+        return cmdType;
+    }
+
+    public void setCmdType(short cmdType) {
+        this.cmdType = cmdType;
+    }
+
+    public short getDataLen() {
+        return dataLen;
+    }
+
+    public void setDataLen(short dataLen) {
+        this.dataLen = dataLen;
+    }
+
+    public byte[] getExtData() {
+        return extData;
+    }
+
+    public void setExtData(byte[] extData) {
+        this.extData = extData;
+    }
+
+    public byte[] toBytes() {
+        if(cmdType != 0 && dataLen != 0 && extData != null){
+            int totalLen = 2 + 2 + extData.length ;
+            ByteBuffer byteBuffer = ByteBuffer.allocate(totalLen);
+            byteBuffer.put((byte)(cmdType & 0xff));
+            byteBuffer.put((byte)((cmdType >> 8 )& 0xff));
+            byteBuffer.put((byte)(extData.length & 0xff));
+            byteBuffer.put((byte)((extData.length >> 8 )& 0xff));
+            byteBuffer.put(extData);
+            return byteBuffer.array();
+        } else if (cmdType != 0 && dataLen == 0){
+            int totalLen = 2 + 2 ;
+            ByteBuffer byteBuffer = ByteBuffer.allocate(totalLen);
+            byteBuffer.put((byte)(cmdType & 0xff));
+            byteBuffer.put((byte)((cmdType >> 8 )& 0xff));
+            byteBuffer.put((byte)(dataLen & 0xff));
+            byteBuffer.put((byte)((dataLen >> 8 )& 0xff));
+            return byteBuffer.array();
+        }
+        return  null ;
+    }
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/ProfileUtils.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/ProfileUtils.java
new file mode 100644
index 00000000..577cfe54
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/ProfileUtils.java
@@ -0,0 +1,120 @@
+package com.bes.bessdk.utils;
+
+import android.util.Log;
+
+/**
+ * Created by alloxuweibin on 2017/9/12.
+ */
+
+public class ProfileUtils {
+
+    private static final int SPP_SINGLE_CRC_BYTE_COUNTS = 1024*4 ;
+    private static final int SPP_SINGLE_PACKE_BYTES = 256 ;
+    /**
+     * SPP 固化每包的大小为 256
+     * @return
+     */
+    public static int calculateSppSinglePacketLen(int imageSize){
+        int len = SPP_SINGLE_PACKE_BYTES ;
+        if(imageSize < len){
+            len =  imageSize ;
+        }
+        return  len ;
+    }
+
+    /**
+     * 镜像文件总包数
+     * @param imageSize
+     * @return
+     */
+    public static int calculateSppTotalPacketCount(int imageSize){
+        return (imageSize + SPP_SINGLE_PACKE_BYTES - 1)/SPP_SINGLE_PACKE_BYTES ;
+    }
+
+    /**
+     * SPP 总校验次数
+     * @param imageSize 升级包总大小
+     * @return
+     */
+    public static int calculateSppTotalCrcCount(int imageSize){
+        return (imageSize + SPP_SINGLE_CRC_BYTE_COUNTS - 1)/SPP_SINGLE_CRC_BYTE_COUNTS;
+    }
+
+
+    /**
+     * BLE 限制最大单包字节数不超过 256
+     */
+    private static final int BLE_SINGLE_PACKE_MAC_BYTES = 256 ;
+    private static final int BLE_SINGLE_PACKE_MAC_BYTES_MAX_STEREO =  660;
+    private static final int BLE_SINGLE_PACKE_MAC_BYTES_MAX_TWS =  512;
+
+
+    /**
+     * @return
+     */
+    public static int calculateBLESinglePacketLen(int imageSize , int mtu , boolean isBle,int stereoFlag){
+        if(imageSize != 0 && imageSize < mtu - 1)
+        {
+            return imageSize;
+        }
+
+        if (!isBle)
+        {
+            if(stereoFlag == 1) {
+                // return ((mtu - 1) > 512)?512:(mtu - 1);
+                return ((mtu - 1) > BLE_SINGLE_PACKE_MAC_BYTES_MAX_STEREO) ? BLE_SINGLE_PACKE_MAC_BYTES_MAX_STEREO : (mtu - 1);
+            }
+            else 
+            {
+                return ((mtu - 1) > BLE_SINGLE_PACKE_MAC_BYTES_MAX_TWS) ? BLE_SINGLE_PACKE_MAC_BYTES_MAX_TWS : (mtu - 1);
+            }
+        }
+        else {
+			// mtu shouldn't bigger than (512-3)
+            return (mtu > 509)?508:(mtu - 1);
+        }
+    }
+
+    /**
+     * ble 镜像文件总包数
+     * @param imageSize
+     * @return
+     */
+    public static int calculateBLETotalPacketCount(int imageSize, int mtu, boolean isble,int  stereoFlag){
+        int totalCount = (imageSize + calculateBLESinglePacketLen(imageSize , mtu, isble,stereoFlag) - 1)/calculateBLESinglePacketLen(imageSize , mtu,isble,stereoFlag) ;
+        return  totalCount;
+    }
+
+    /**
+     * ble 计算百分之一的数据量，并按256倍数就近补齐
+     * @param imageSize 升级包总大小
+     * @return
+     */
+    public static int calculateBLEOnePercentBytes(int imageSize,boolean isBle,int  stereoFlag)
+    {
+            int onePercentBytes = imageSize / 100;
+            if (imageSize < BLE_SINGLE_PACKE_MAC_BYTES) {
+                onePercentBytes = imageSize;
+            }
+            else {
+                int rightBytes = 0;
+                if (onePercentBytes < BLE_SINGLE_PACKE_MAC_BYTES) {
+                    rightBytes = BLE_SINGLE_PACKE_MAC_BYTES - onePercentBytes;
+                }
+                else {
+                    rightBytes = BLE_SINGLE_PACKE_MAC_BYTES - onePercentBytes % BLE_SINGLE_PACKE_MAC_BYTES;
+                }
+                if (rightBytes != 0) {
+                    onePercentBytes = onePercentBytes + rightBytes;
+                }
+            }
+
+            if (onePercentBytes < 4 * 1024) {
+                onePercentBytes = 4 * 1024;
+            }
+            int tempCount = (imageSize + onePercentBytes - 1) / onePercentBytes;
+            return onePercentBytes;
+
+    }
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/SPHelper.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/SPHelper.java
new file mode 100644
index 00000000..adea67d5
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/SPHelper.java
@@ -0,0 +1,61 @@
+package com.bes.bessdk.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+public class SPHelper {
+
+
+    public static SharedPreferences getSharedPreferences(Context context) {
+        return context.getSharedPreferences("bes_app_config", Context.MODE_PRIVATE);
+    }
+
+    public static void putPreference(Context context, String key, Object value) {
+        SharedPreferences.Editor editor = getSharedPreferences(context).edit();
+        if (value instanceof Integer) {
+            editor.putInt(key, (Integer) value);
+        } else if (value instanceof Short) {
+            int data = ((Short) value).shortValue();
+            editor.putInt(key, data);
+        } else if (value instanceof Byte) {
+            int data = ((Byte) value).byteValue();
+            editor.putInt(key, data);
+        } else if (value instanceof Float) {
+            editor.putFloat(key, (Float) value);
+        } else if (value instanceof Double) {
+            float data = (float) ((Double) value).doubleValue();
+            editor.putFloat(key, data);
+        } else if (value instanceof Long) {
+            editor.putLong(key, (Long) value);
+        } else if (value instanceof Boolean) {
+            editor.putBoolean(key, (Boolean) value);
+        } else if (value instanceof String) {
+            editor.putString(key, (String) value);
+        }
+        editor.commit();
+    }
+
+    public static Object getPreference(Context context, String key, Object defaultValue) {
+        SharedPreferences sp = getSharedPreferences(context);
+        if ((defaultValue instanceof Integer) || (defaultValue instanceof Short) || (defaultValue instanceof Byte)) {
+            return sp.getInt(key, (Integer) defaultValue);
+        }
+        if ((defaultValue instanceof Float) || (defaultValue instanceof Double)) {
+            return sp.getFloat(key, (Float) defaultValue);
+        }
+        if (defaultValue instanceof Long) {
+            return sp.getLong(key, (Long) defaultValue);
+        }
+        if (defaultValue instanceof Boolean) {
+            return sp.getBoolean(key, (Boolean) defaultValue);
+        }
+        if (defaultValue instanceof String) {
+            return sp.getString(key, (String) defaultValue);
+        }
+        return null;
+    }
+
+    public static void removePreference(Context context, String key) {
+        getSharedPreferences(context).edit().remove(key).commit();
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/SendMessageCommunitor.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/SendMessageCommunitor.java
new file mode 100644
index 00000000..9db9905b
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/SendMessageCommunitor.java
@@ -0,0 +1,8 @@
+package com.bes.bessdk.utils;
+
+public interface SendMessageCommunitor {
+    /**从fragment发送消息
+     * @param msg 消息内容
+     * */
+    void sendMessage(String msg);
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/sha/Sha256.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/sha/Sha256.java
new file mode 100644
index 00000000..608b13e1
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/sha/Sha256.java
@@ -0,0 +1,24 @@
+package com.bes.bessdk.utils.sha;
+
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+
+public class Sha256 {
+    public static byte[] getSHA256(byte[] bytes){
+        MessageDigest messageDigest;
+        byte[] encodestr = new byte[]{};
+        try {
+            messageDigest = MessageDigest.getInstance("SHA-256");
+            messageDigest.update(bytes);
+            encodestr = messageDigest.digest();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+        return encodestr;
+    }
+
+
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/sha/aes.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/sha/aes.java
new file mode 100644
index 00000000..d66c8ca7
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/sha/aes.java
@@ -0,0 +1,107 @@
+package com.bes.bessdk.utils.sha;
+
+
+import android.util.Log;
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.ShortBufferException;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class aes {
+
+    /**解密
+     * @param encrypted  待解密内容
+     * @param key 解密密钥
+     * @return
+     */
+    public static byte[] decrypt(byte[] encrypted, byte[] key) {
+        SecretKeySpec skeySpec = new SecretKeySpec(key, "AES");
+        Cipher cipher = null;
+        try {
+            cipher = Cipher.getInstance("AES/CBC/NoPadding");
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (NoSuchPaddingException e) {
+            e.printStackTrace();
+        }
+        try {
+            cipher.init(Cipher.DECRYPT_MODE, skeySpec, new IvParameterSpec(new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}));
+        } catch (InvalidAlgorithmParameterException e) {
+            e.printStackTrace();
+        } catch (InvalidKeyException e) {
+            e.printStackTrace();
+        }
+        byte[] decrypted = new byte[encrypted.length];
+        try {
+            decrypted = cipher.doFinal(encrypted);
+        } catch (BadPaddingException e) {
+            e.printStackTrace();
+        } catch (IllegalBlockSizeException e) {
+            e.printStackTrace();
+        }
+        return decrypted;
+    }
+
+    /**
+     * 加密
+     *
+     * @param content 需要加密的内容
+     * @param password  加密密码
+     * @return
+     */
+    public static byte[] encrypt(byte[] content, byte[] password) {
+        int inLen = content.length;
+        int finLen = inLen % 16 != 0 ? inLen + 16 - (inLen % 16) : inLen;
+        byte[] finByte = new byte[finLen];
+        System.arraycopy(content, 0, finByte, 0, inLen);
+        try {
+            SecretKeySpec key = new SecretKeySpec(password, "AES");
+            Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+            byte[] byteContent = finByte;
+            try {
+                cipher.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(new byte[]{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}));// 初始化
+            } catch (InvalidAlgorithmParameterException e) {
+                e.printStackTrace();
+            }
+
+            byte[] resultBytes = new byte[byteContent.length];
+            try {
+                int result = cipher.doFinal(byteContent, 0, byteContent.length, resultBytes);
+            } catch (ShortBufferException e) {
+                e.printStackTrace();
+            }
+
+            return resultBytes; // 加密
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        } catch (NoSuchPaddingException e) {
+            e.printStackTrace();
+        } catch (InvalidKeyException e) {
+            e.printStackTrace();
+        } catch (IllegalBlockSizeException e) {
+            e.printStackTrace();
+        } catch (BadPaddingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static void demo() {
+        byte[] content = new byte[]{0x11, 0x22, 0x33, 0x11, 0x22, 0x33, 0x11, 0x11, 0x22, 0x33, 0x11, 0x22, 0x33, 0x11, 0x11, 0x22, 0x33, 0x11, 0x22, 0x33, 0x11};
+        byte[] password = new byte[]{0x11, 0x22, 0x33, 0x11, 0x22, 0x33, 0x11, 0x22, 0x33, 0x11, 0x22, 0x33, 0x33, 0x11, 0x22, 0x33};
+        //加密
+        byte[] encryptResult = encrypt(content, password);
+        //解密
+        byte[] decryptResult = decrypt(encryptResult, password);
+
+    }
+
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/sha/besFunc.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/sha/besFunc.java
new file mode 100644
index 00000000..5d294108
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/bessdk/utils/sha/besFunc.java
@@ -0,0 +1,57 @@
+package com.bes.bessdk.utils.sha;
+
+public class besFunc {
+
+
+    private byte[] key = new byte[16];
+
+
+    private byte generate_random_algorithm (int id, byte a, byte b) {
+        int op = id % 6;
+        switch (op) {
+            case 0:
+                return (byte) (a + b);
+            case 1:
+                return (byte) (a * b);
+            case 2:
+                return (byte) (a & b);
+            case 3:
+                return (byte) (a | b);
+            case 4:
+                return (byte) (a ^ b);
+            case 5:
+                return (byte) (a*a + b*b);
+            default:
+                return 0x00;
+        }
+    }
+
+    public byte[] func1 (byte[] a, byte[] b) {
+        if (a.length > b.length) {
+            byte[] byteB = new byte[a.length];
+            System.arraycopy(b, 0, byteB, 0, b.length);
+            b = byteB;
+        } else if(a.length < b.length) {
+            byte[] byteA = new byte[b.length];
+            System.arraycopy(a, 0, byteA, 0, a.length);
+            a = byteA;
+        }
+
+        byte[] rand_key = new byte[a.length];
+        for (int i = 0; i < a.length; i ++) {
+            rand_key[i] = generate_random_algorithm(i, a[i], b[i]);
+        }
+        return rand_key;
+    }
+
+    public byte[] func (byte[] hash_key) {
+        for (int i = 0; i < 16; i ++) {
+            key[i] = hash_key[2 * i];
+        }
+        return key;
+    }
+
+
+}
+
+
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/connect/DeviceConnector.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/connect/DeviceConnector.java
new file mode 100644
index 00000000..7216fcbe
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/connect/DeviceConnector.java
@@ -0,0 +1,78 @@
+package com.bes.sdk.connect;
+
+import com.bes.sdk.message.BaseMessage;
+import com.bes.sdk.utils.DeviceProtocol;
+import com.bes.sdk.device.HmDevice;
+
+import java.util.List;
+
+/**
+ * Device connector. Used to maintain a connection with device.
+ * It can be either SPP connection, BLE connection, or even Wi-Fi connection.
+ */
+public interface DeviceConnector
+{
+    /**
+     * Get all supported protocols.
+     *
+     * @return
+     */
+    List<DeviceProtocol> getSupportedProtocols();
+
+    /**
+     * Check if specific device protocol is supported or not. One device connector implementation can support multiple protocols.
+     */
+    boolean isProtocolSupported(DeviceProtocol deviceProtocol);
+
+    /**
+     * Connect to the device.
+     *
+     * @return
+     */
+    void connect(HmDevice device);
+
+    /**
+     * Connect to the device and register listener..
+     *
+     * @return
+     */
+    void connect(HmDevice device, ConnectionListener connectionListener);
+
+    /**
+     * Disconnect from the device.
+     *
+     * @return
+     */
+    void disconnect(HmDevice device);
+
+    /**
+     * Register a listener.
+     *
+     * @param connectionListener
+     */
+    void registerConnectionListener(ConnectionListener connectionListener);
+
+    /**
+     * Unregister a listener.
+     *
+     * @param connectionListener
+     */
+    void unregisterConnectionListener(ConnectionListener connectionListener);
+
+    public interface ConnectionListener
+    {
+        /**
+         * Callback when device connection status changed.
+         * @param device
+         * @param status
+         * @param protocol
+         */
+        void onStatusChanged(HmDevice device, int status, DeviceProtocol protocol);
+
+        /**
+         * Callback when message received from device.
+         * @param deviceMessage
+         */
+        void onDataReceived(BaseMessage deviceMessage);
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/device/HmDevice.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/device/HmDevice.java
new file mode 100644
index 00000000..3af125fd
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/device/HmDevice.java
@@ -0,0 +1,374 @@
+package com.bes.sdk.device;
+
+import com.bes.sdk.message.BatteryInfo;
+import com.bes.sdk.utils.AudioChannel;
+import com.bes.sdk.utils.DeviceProtocol;
+import com.bes.sdk.utils.DeviceRole;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class HmDevice implements Serializable
+{
+    private String devicePid;
+
+    private String deviceVid;
+
+    private String deviceMid;
+
+    private String firmwareVer;
+
+    private String deviceMAC;
+
+    private String bleAddress;
+
+    private int rssi;
+
+    /**
+     * Default device name.
+     */
+    private String deviceName;
+
+    private BatteryInfo batteryInfo;
+
+    private DeviceRole role;
+
+    private boolean isConnectable;
+
+    private long scannedTimestamp;
+
+    private String crc;
+
+    private DeviceProtocol preferredProtocol;
+
+    private String deviceUid;
+
+    private AudioChannel channel;
+
+    /**
+     * @see #getDeviceVid()
+     * @param deviceVid
+     */
+    public void setDeviceVid(String deviceVid) {
+        this.deviceVid = deviceVid;
+    }
+
+    /**
+     * @see #getDevicePid()
+     * @param devicePid
+     */
+    public void setDevicePid(String devicePid) {
+        this.devicePid = devicePid;
+    }
+
+    /**
+     * Set device model ID(color ID)
+     * @param deviceMid, value can be:
+     * <li>0 : Black</li>
+     * <li>1 : White</li>
+     * <li>2 : Blue</li>
+     * <li>3 : Red</li>
+     * <li>4 : Green</li>
+     * <li>5 : Purple</li>
+     * <li>6 : GoldSilver</li>
+     * <li>7 : Silver</li>
+     * <li>8 : Gray</li>
+     * <li>9 : Beige</li>
+     * <li>a : Pink</li>
+     */
+    public void setDeviceMid(String deviceMid) {
+        this.deviceMid = deviceMid;
+    }
+
+    /**
+     * @see #getDeviceMAC()
+     * @param deviceMAC
+     */
+    public void setDeviceMAC(String deviceMAC) {
+        this.deviceMAC = deviceMAC;
+    }
+
+    public void setBleAddress(String bleAddress) {
+        this.bleAddress = bleAddress;
+    }
+
+
+    public void setRssi(int rssi) {
+        this.rssi = rssi;
+    }
+
+    /**
+     * Default device name.
+     * @return
+     */
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    /**
+     * @see #getBatteryInfo()
+     * @param batteryInfo
+     */
+    public void setBatteryInfo(BatteryInfo batteryInfo) {
+        this.batteryInfo = batteryInfo;
+    }
+
+    /**
+     * @see #getRole()
+     * @param role
+     */
+    public void setRole(DeviceRole role) {
+        this.role = role;
+    }
+
+    /**
+     * @deprecated
+     * @see #isConnectable()
+     * @param connectable
+     */
+    public void setConnectable(boolean connectable) {
+        isConnectable = connectable;
+    }
+
+    /**
+     * @see #getScannedTimestamp()
+     * @param scannedTimestamp
+     */
+    public void setScannedTimestamp(long scannedTimestamp) {
+        this.scannedTimestamp = scannedTimestamp;
+    }
+
+    /**
+     * @see #getCrc()
+     * @param crc
+     */
+    public void setCrc(String crc) {
+        this.crc = crc;
+    }
+
+    /**
+     * @see #getPreferredProtocol()
+     * @param preferredProtocol
+     */
+    public void setPreferredProtocol(DeviceProtocol preferredProtocol) {
+        this.preferredProtocol = preferredProtocol;
+    }
+
+    /**
+     * @see #getDeviceUid()
+     *
+     * @param deviceUid
+     */
+    public void setDeviceUid(String deviceUid) {
+        this.deviceUid = deviceUid;
+    }
+
+    /**
+     * Get device vendor ID.
+     * Harman will provide to fw, sdk will get from fw
+     *
+     * @return
+     */
+    public String getDeviceVid() {
+        return deviceVid;
+    }
+
+    /**
+     * Get device product ID.
+     * Harman will provide to fw, sdk will get from fw
+     * @return
+     */
+    public String getDevicePid() {
+        return devicePid;
+    }
+
+    /**
+     * Get device model ID(color ID)
+     * @return
+     * <li>0 : Black</li>
+     * <li>1 : White</li>
+     * <li>2 : Blue</li>
+     * <li>3 : Red</li>
+     * <li>4 : Green</li>
+     * <li>5 : Purple</li>
+     * <li>6 : GoldSilver</li>
+     * <li>7 : Silver</li>
+     * <li>8 : Gray</li>
+     * <li>9 : Beige</li>
+     * <li>a : Pink</li>
+     */
+    public String getDeviceMid() {
+        return deviceMid;
+    }
+
+    /**
+     * Get MAC address of the device.
+     *
+     * @return
+     */
+    public String getDeviceMAC() {
+        return deviceMAC;
+    }
+
+    /**
+     * Get BLE address of the device
+     * @return
+     */
+    public String getBleAddress() {
+        return bleAddress;
+    }
+
+    public int getRssi() {
+        return rssi;
+    }
+
+    /**
+     * Get device battery info, which is got from broadcast.
+     * CAUTION: It might be inaccurate. Sending dedicate command to
+     * sync up real time battery info is more reliable.
+     *
+     * @return
+     */
+    public BatteryInfo getBatteryInfo() {
+        return batteryInfo;
+    }
+
+    /**
+     * Get current role of the device.
+     *
+     * @return
+     */
+    public DeviceRole getRole() {
+        return role;
+    }
+
+    /**
+     * Check if the device BLE is connectable or not.
+     * @deprecated
+     * @return
+     */
+    public boolean isConnectable() {
+        return isConnectable;
+    }
+
+    /**
+     * Get device scanned timestamp.
+     *
+     * @return
+     */
+    public long getScannedTimestamp() {
+        return scannedTimestamp;
+    }
+
+    /**
+     * Get CRC included from device broadcast.
+     *
+     * @return
+     */
+    public String getCrc() {
+        return crc;
+    }
+
+    /**
+     * Get preferred connection protocol.
+     */
+    public DeviceProtocol getPreferredProtocol() {
+        return preferredProtocol;
+    }
+
+    /**
+     * Convert to a string, can be used as UID of this HmDevice.
+     * Example: VID+PID+MAC+PROTOCOL.
+     *
+     * Possible case: One device supports both SPP and BLE, we need to try SPP first then BLE.
+     *
+     * @return
+     */
+    public String getDeviceUid() {
+        return deviceUid;
+    }
+
+    /**
+     * Get device firmware version
+     * @return
+     */
+    public String getFirmwareVer() {
+        return firmwareVer;
+    }
+
+    /**
+     * Set device firmware version
+     * @param firmwareVer
+     */
+    public void setFirmwareVer(String firmwareVer) {
+        this.firmwareVer = firmwareVer;
+    }
+
+    /**
+     * Get current channel
+     * @return
+     */
+    public AudioChannel getChannel() {
+        return channel;
+    }
+
+    public void setChannel(AudioChannel channel) {
+        this.channel = channel;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        HmDevice device = (HmDevice) o;
+        return Objects.equals(deviceMAC, device.deviceMAC);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(deviceMAC);
+    }
+
+
+    public void setDevice(HmDevice hmDevice) {
+        this.devicePid = hmDevice.devicePid;
+        this.deviceVid = hmDevice.deviceVid;
+        this.deviceMid = hmDevice.deviceMid;
+        this.firmwareVer = hmDevice.firmwareVer;
+        this.deviceMAC = hmDevice.deviceMAC;
+        this.bleAddress = hmDevice.bleAddress;
+        this.deviceName = hmDevice.deviceName;
+        this.batteryInfo = hmDevice.batteryInfo;
+        this.role = hmDevice.role;
+        this.isConnectable = hmDevice.isConnectable;
+        this.scannedTimestamp = hmDevice.scannedTimestamp;
+        this.crc = hmDevice.crc;
+        this.preferredProtocol = hmDevice.preferredProtocol;
+        this.deviceUid = hmDevice.deviceUid;
+        this.channel = hmDevice.channel;
+    }
+
+    @Override
+    public String toString() {
+        return "HmDevice{" +
+                "\ndevicePid='" + devicePid + '\'' +
+                "\ndeviceVid='" + deviceVid + '\'' +
+                "\ndeviceMid='" + deviceMid + '\'' +
+                "\nfirmwareVer='" + firmwareVer + '\'' +
+                "\ndeviceMAC='" + deviceMAC + '\'' +
+                "\ndeviceName='" + deviceName + '\'' +
+                "\nbatteryInfo=" + batteryInfo +
+                "\nrole=" + role +
+                "\nisConnectable=" + isConnectable +
+                "\nscannedTimestamp=" + scannedTimestamp +
+                "\ncrc='" + crc + '\'' +
+                "\npreferredProtocol=" + preferredProtocol +
+                "\ndeviceUid='" + deviceUid + '\'' +
+                "\nchannel=" + channel +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/A2DPConnection.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/A2DPConnection.java
new file mode 100644
index 00000000..76ece8a2
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/A2DPConnection.java
@@ -0,0 +1,51 @@
+package com.bes.sdk.message;
+
+import com.bes.sdk.device.HmDevice;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * Anc status definition
+ */
+public class A2DPConnection implements Serializable
+{
+    /**
+     * A2DP connected status
+     * <li>true - connected;
+     * <li>false - disconnected;
+     */
+    private boolean connected;
+
+    /**
+     * Address list of phones which A2DP connected with speaker/headphone.
+     */
+    private List<String> addressList;
+
+    public boolean isConnected() {
+        return connected;
+    }
+
+    public void setConnected(boolean connected) {
+        this.connected = connected;
+    }
+
+    /**
+     * Get address list of phones which A2DP connected with speaker/headphone.
+     * @return address list of phones which A2DP connected with speaker/headphone.
+     */
+    public List<String> getAddressList() {
+        return addressList;
+    }
+
+    public void setAddressList(List<String> addressList) {
+        this.addressList = addressList;
+    }
+
+    @Override
+    public String toString() {
+        return "A2DPConnection{" +
+                "connected=" + connected +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/A2DPConnectionMessage.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/A2DPConnectionMessage.java
new file mode 100644
index 00000000..a80d4894
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/A2DPConnectionMessage.java
@@ -0,0 +1,25 @@
+package com.bes.sdk.message;
+
+import com.bes.sdk.utils.MessageID;
+
+/**
+ * Message to describe A2DP connection info list.
+ */
+public class A2DPConnectionMessage extends BaseMessage
+{
+    private A2DPConnection a2dpConnection;
+
+    public A2DPConnectionMessage(A2DPConnection a2dpConnection) {
+        this.a2dpConnection = a2dpConnection;
+    }
+
+    @Override
+    public MessageID getMsgID() {
+        return MessageID.A2DP_STATUS;
+    }
+
+    @Override
+    public A2DPConnection getMsgContent() {
+        return a2dpConnection;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/AncSettings.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/AncSettings.java
new file mode 100644
index 00000000..d754ac38
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/AncSettings.java
@@ -0,0 +1,97 @@
+package com.bes.sdk.message;
+
+import java.io.Serializable;
+
+/**
+ * Anc status definition
+ */
+public class AncSettings implements Serializable
+{
+    public static final int INVALID_VALUE = -1;
+    public static final int ANC_SPORTS_OFF = 0;
+    public static final int ANC_SPORTS_ON = 1;
+    public static final int FILTER_OFF = 0;
+    public static final int FILTER_ANC = 1;
+    public static final int FILTER_TALK_THROUGH = 2;
+    public static final int FILTER_AMBIENT_AWARE = 3;
+
+    /**
+     * filter:
+     * <li>{@link #FILTER_OFF} - OFF;
+     * <li>{@link #FILTER_ANC} - ANC;
+     * <li>{@link #FILTER_TALK_THROUGH} - TalkThrough;
+     * <li>{@link #FILTER_AMBIENT_AWARE} - AmbientAware.
+     */
+    private int filter;
+
+    /**
+     * gain: for specified filter, double value.
+     */
+    private double gain;
+
+    /**
+     * ANC sports mode, only effect on {@link #filter} ANC filter.
+     * <li>{@link #INVALID_VALUE} - doesn't support ANC sports mode.
+     * <li>{@link #ANC_SPORTS_OFF} - off
+     * <li>{@link #ANC_SPORTS_ON} - on
+     */
+    private int ancSportsMode = ANC_SPORTS_OFF;
+
+    /**
+     * @see #getFilter()
+     * @param filter
+     */
+    public void setFilter(int filter) {
+        this.filter = filter;
+    }
+
+    /**
+     * @see #getGain()
+     * @param gain
+     */
+    public void setGain(double gain) {
+        this.gain = gain;
+    }
+
+    /**
+     * filter:
+     * <li>{@link #FILTER_OFF} - OFF;
+     * <li>{@link #FILTER_ANC} - ANC;
+     * <li>{@link #FILTER_TALK_THROUGH} - TalkThrough;
+     * <li>{@link #FILTER_AMBIENT_AWARE} - AmbientAware.
+     */
+    public int getFilter() {
+        return filter;
+    }
+
+    /**
+     * gain: for specified filter, 0 by default.
+     */
+    public double getGain() {
+        return gain;
+    }
+
+    /**
+     * Get ANC sports mode, status stored in device storage, {@link #ancSportsMode} only effect on {@link #filter} ANC filter.
+     * @return default value is {@link #ANC_SPORTS_OFF}
+     * <li>{@link #INVALID_VALUE} - doesn't support ANC sports mode.
+     * <li>{@link #ANC_SPORTS_OFF} - off
+     * <li>{@link #ANC_SPORTS_ON} - on
+     */
+    public int getAncSportsMode() {
+        return ancSportsMode;
+    }
+
+    public void setAncSportsMode(int ancSportsMode) {
+        this.ancSportsMode = ancSportsMode;
+    }
+
+    @Override
+    public String toString() {
+        return "AncSettings{" +
+                "filter=" + filter +
+                ", gain=" + gain +
+                ", ancSportsMode=" + ancSportsMode +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/AncStatusMessage.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/AncStatusMessage.java
new file mode 100644
index 00000000..a6068b44
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/AncStatusMessage.java
@@ -0,0 +1,27 @@
+package com.bes.sdk.message;
+
+import com.bes.sdk.utils.MessageID;
+
+import java.util.LinkedList;
+
+/**
+ * Message to describe device info list.
+ */
+public class AncStatusMessage extends BaseMessage
+{
+    private LinkedList<AncSettings> ancSettingsList;
+
+    public AncStatusMessage(LinkedList<AncSettings> ancSettingsList) {
+        this.ancSettingsList = ancSettingsList;
+    }
+
+    @Override
+    public MessageID getMsgID() {
+        return MessageID.ANC_STATUS;
+    }
+
+    @Override
+    public LinkedList<AncSettings> getMsgContent() {
+        return ancSettingsList;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/BaseMessage.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/BaseMessage.java
new file mode 100644
index 00000000..006432b3
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/BaseMessage.java
@@ -0,0 +1,65 @@
+package com.bes.sdk.message;
+
+import com.bes.sdk.utils.MessageID;
+
+import java.io.Serializable;
+
+/**
+ * Message is similar with command but it's used on high-level application layer.
+ *
+ * Message can be delivered by a single command, like most of commands; and also can be
+ * delivered by multiple commands like DeviceInfo returned from device.
+ */
+public class BaseMessage implements Serializable
+{
+    private MessageID messageId;
+
+    private Object msgContent;
+
+    private boolean isPush;
+
+    /**
+     * Message ID definition.
+     * @return
+     */
+    public MessageID getMsgID()  {
+        return messageId;
+    }
+
+    /**
+     * Different message will contain different types of content.
+     *
+     * @return object. Return value must can be serialized.
+     */
+    public Object getMsgContent()  {
+        return msgContent;
+    }
+
+    /**
+     * Check if message pushed from device.
+     * @return true pushed from device, is not response to app request; otherwise indicates this message is response to app request.
+     */
+    public boolean isPush() {
+        return isPush;
+    }
+
+    public void setPush(boolean push) {
+        isPush = push;
+    }
+
+    /**
+     * @see #getMsgID()
+     * @param messageId
+     */
+    public void setMessageId(MessageID messageId) {
+        this.messageId = messageId;
+    }
+
+    /**
+     * @see #getMsgContent()
+     * @param msgContent
+     */
+    public void setMsgContent(Object msgContent) {
+        this.msgContent = msgContent;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/BatteryInfo.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/BatteryInfo.java
new file mode 100644
index 00000000..e3e19446
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/BatteryInfo.java
@@ -0,0 +1,118 @@
+package com.bes.sdk.message;
+
+
+import java.io.Serializable;
+
+/**
+ * Battery info
+ */
+public class BatteryInfo implements Serializable
+{
+    public static final int INVALID_LEVEL = -1;
+
+    private boolean masterCharging;
+
+    private int masterLevel;
+
+    private boolean slaveCharging;
+
+    private int slaveLevel;
+
+    private boolean boxCharging;
+
+    private int boxLevel;
+
+    private int masterVoltage;
+
+    private int slaveVoltage;
+
+    public boolean isMasterCharging() {
+        return masterCharging;
+    }
+
+    public void setMasterCharging(boolean masterCharging) {
+        this.masterCharging = masterCharging;
+    }
+
+    /**
+     * Get master battery level.
+     * @return master battery level, {@link #INVALID_LEVEL} means invalid value.
+     */
+    public int getMasterLevel() {
+        return masterLevel;
+    }
+
+    public void setMasterLevel(int masterLevel) {
+        this.masterLevel = masterLevel;
+    }
+
+    public boolean isSlaveCharging() {
+        return slaveCharging;
+    }
+
+    public void setSlaveCharging(boolean slaveCharging) {
+        this.slaveCharging = slaveCharging;
+    }
+
+    /**
+     * Get slave level
+     * @return slave battery level, {@link #INVALID_LEVEL} means invalid value.
+     */
+    public int getSlaveLevel() {
+        return slaveLevel;
+    }
+
+    public void setSlaveLevel(int slaveLevel) {
+        this.slaveLevel = slaveLevel;
+    }
+
+    public boolean isBoxCharging() {
+        return boxCharging;
+    }
+
+    public void setBoxCharging(boolean boxCharging) {
+        this.boxCharging = boxCharging;
+    }
+
+    /**
+     * Box battery level
+     * @return box battery level, {@link #INVALID_LEVEL} means invalid value.
+     */
+    public int getBoxLevel() {
+        return boxLevel;
+    }
+
+    public void setBoxLevel(int boxLevel) {
+        this.boxLevel = boxLevel;
+    }
+
+    public int getMasterVoltage() {
+        return masterVoltage;
+    }
+
+    public void setMasterVoltage(int masterVoltage) {
+        this.masterVoltage = masterVoltage;
+    }
+
+    public int getSlaveVoltage() {
+        return slaveVoltage;
+    }
+
+    public void setSlaveVoltage(int slaveVoltage) {
+        this.slaveVoltage = slaveVoltage;
+    }
+
+    @Override
+    public String toString() {
+        return "BatteryInfo{" +
+                "\nmasterCharging=" + masterCharging +
+                "\nmasterLevel=" + masterLevel +
+                "\nslaveCharging=" + slaveCharging +
+                "\nslaveLevel=" + slaveLevel +
+                "\nboxCharging=" + boxCharging +
+                "\nboxLevel=" + boxLevel +
+                "\nmasterVoltage=" + masterVoltage +
+                "\nslaveVoltage=" + slaveVoltage +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/DeviceInfoMessage.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/DeviceInfoMessage.java
new file mode 100644
index 00000000..7f46cef6
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/DeviceInfoMessage.java
@@ -0,0 +1,28 @@
+package com.bes.sdk.message;
+
+import com.bes.sdk.device.HmDevice;
+import com.bes.sdk.utils.MessageID;
+
+import java.util.LinkedList;
+
+/**
+ * Message to describe device info list.
+ */
+public class DeviceInfoMessage extends BaseMessage
+{
+    private LinkedList<? extends HmDevice> deviceList;
+
+    public DeviceInfoMessage(LinkedList<? extends HmDevice> deviceList) {
+        this.deviceList = deviceList;
+    }
+
+    @Override
+    public MessageID getMsgID() {
+        return MessageID.DEVICE_INFO;
+    }
+
+    @Override
+    public LinkedList<? extends HmDevice> getMsgContent() {
+        return deviceList;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/EQPayload.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/EQPayload.java
new file mode 100644
index 00000000..6a79f408
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/EQPayload.java
@@ -0,0 +1,192 @@
+package com.bes.sdk.message;
+
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.Objects;
+
+public class EQPayload implements Serializable {
+
+    private int index = -1;
+
+    private float calibration;
+
+    private int sampleRate;
+
+    private float leftGain;
+
+    private float rightGain;
+
+    private float bandCount;
+
+    private LinkedList<EQIDParam> iirParams;
+
+    /**
+     * Index in the category. For the preset EQ, index is always -1.
+     * @return
+     */
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public float getCalibration() {
+        return calibration;
+    }
+
+    public void setCalibration(float calibration) {
+        this.calibration = calibration;
+    }
+
+    public int getSampleRate() {
+        return sampleRate;
+    }
+
+    public void setSampleRate(int sampleRate) {
+        this.sampleRate = sampleRate;
+    }
+
+    public float getLeftGain() {
+        return leftGain;
+    }
+
+    public void setLeftGain(float leftGain) {
+        this.leftGain = leftGain;
+    }
+
+    public float getRightGain() {
+        return rightGain;
+    }
+
+    public void setRightGain(float rightGain) {
+        this.rightGain = rightGain;
+    }
+
+    public float getBandCount() {
+        return bandCount;
+    }
+
+    public void setBandCount(float bandCount) {
+        this.bandCount = bandCount;
+    }
+
+    /**
+     * Get list of EQID parameter
+     * @return might be null.
+     */
+    public LinkedList<EQIDParam> getIirParams() {
+        return iirParams;
+    }
+
+    public void setIirParams(LinkedList<EQIDParam> iirParams) {
+        this.iirParams = iirParams;
+    }
+
+
+    /**
+     * Compare without index.
+     * @param o
+     * @return
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        EQPayload eqPayload = (EQPayload) o;
+        return Float.compare(eqPayload.calibration, calibration) == 0 &&
+                sampleRate == eqPayload.sampleRate &&
+                Float.compare(eqPayload.leftGain, leftGain) == 0 &&
+                Float.compare(eqPayload.rightGain, rightGain) == 0 &&
+                Objects.equals(iirParams, eqPayload.iirParams);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(calibration, sampleRate, leftGain, rightGain, iirParams);
+    }
+
+    public static class EQIDParam implements Serializable {
+
+        int bandType;
+
+        float gainValue;
+
+        float frequency;
+
+        float qValue;
+
+        public int getBandType() {
+            return bandType;
+        }
+
+        public void setBandType(int bandType) {
+            this.bandType = bandType;
+        }
+
+        public float getGainValue() {
+            return gainValue;
+        }
+
+        public void setGainValue(float gainValue) {
+            this.gainValue = gainValue;
+        }
+
+        public float getFrequency() {
+            return frequency;
+        }
+
+        public void setFrequency(float frequency) {
+            this.frequency = frequency;
+        }
+
+        public float getQValue() {
+            return qValue;
+        }
+
+        public void setQValue(float qValue) {
+            this.qValue = qValue;
+        }
+
+        @Override
+        public String toString() {
+            return  "\ntype=" + bandType +
+                    ",gain=" + gainValue +
+                    ",freq=" + frequency +
+                    ",qValue=" + qValue ;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (o == null || getClass() != o.getClass()) return false;
+            EQIDParam eqidParam = (EQIDParam) o;
+            return bandType == eqidParam.bandType &&
+                    Float.compare(eqidParam.gainValue, gainValue) == 0 &&
+                    Float.compare(eqidParam.frequency, frequency) == 0 &&
+                    Float.compare(eqidParam.qValue, qValue) == 0;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(bandType, gainValue, frequency, qValue);
+        }
+    }
+
+    @Override
+    public String toString() {
+        String iir ="";
+        if (iirParams != null){
+            iir = iirParams.toString();
+        }
+        return  "\nindex=" + index +
+                "\ncalibration=" + calibration +
+                "\nsampleRate=" + sampleRate +
+                "\nleftGain=" + leftGain +
+                "\nrightGain=" + rightGain +
+                "\nbandCount=" + bandCount
+                + "\n" + iir;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/EQSettings.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/EQSettings.java
new file mode 100644
index 00000000..532a424b
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/EQSettings.java
@@ -0,0 +1,70 @@
+package com.bes.sdk.message;
+
+import java.io.Serializable;
+
+/**
+ * Anc status definition
+ */
+public class EQSettings implements Serializable
+{
+    private int categoryId;
+
+    private int status;
+
+    /**
+     * gain: for specified filter, double value.
+     */
+    private EQPayload eqPayload;
+
+    /**
+     * EQ category number. Preset ID scope in [1 ~ 100], customized EQ ID start with 101.
+     * <li> -1 - turn off EQ (no any EQ enabled),
+     * <li> 0 - default EQ,
+     * <li> 1 - Preset EQ 1,
+     * <li> 2 - Preset EQ 2,
+     * <li> 3 - Preset EQ 3,
+     * <li>...
+     * <li>101 - Customized EQ 1 (DJ-Signature),
+     * <li>102 - Customized EQ 2 (Personi-Fi),
+     * <li>103 - Customized EQ 3 (My-EQ),
+     * <li>...
+     * <li>200 - Combined EQ. Means combined several EQ available on device together as output.
+     */
+    public int getCategoryId() {
+        return categoryId;
+    }
+
+    public void setCategoryId(int categoryId) {
+        this.categoryId = categoryId;
+    }
+
+    /**
+     * status:
+     * <li>0 for OFF;
+     * <li>1 for ON;
+     */
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public EQPayload getEqPayload() {
+        return eqPayload;
+    }
+
+    public void setEqPayload(EQPayload eqPayload) {
+        this.eqPayload = eqPayload;
+    }
+
+    @Override
+    public String toString() {
+        return "\nEQSettings{" +
+                "\ncategoryId=" + categoryId +
+                "\nstatus=" + status +
+                "\neqPayload=" + eqPayload +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/EQStatusMessage.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/EQStatusMessage.java
new file mode 100644
index 00000000..12466bb3
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/EQStatusMessage.java
@@ -0,0 +1,20 @@
+package com.bes.sdk.message;
+
+import java.util.LinkedList;
+
+/**
+ * Message to describe device info list.
+ */
+public class EQStatusMessage extends BaseMessage
+{
+    private LinkedList<EQSettings> eqList;
+
+    public EQStatusMessage(LinkedList<EQSettings> eqList) {
+        this.eqList = eqList;
+    }
+
+    @Override
+    public LinkedList<EQSettings> getMsgContent() {
+        return eqList;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/GestureInfo.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/GestureInfo.java
new file mode 100644
index 00000000..ff951568
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/GestureInfo.java
@@ -0,0 +1,153 @@
+package com.bes.sdk.message;
+
+import java.io.Serializable;
+
+/**
+ * Anc status definition
+ */
+public class GestureInfo implements Serializable
+{
+    // Gestures IDs
+    public static final int SINGLE_TAP_LEFT = 0x01;
+    public static final int SINGLE_TAP_RIGHT = 0x02;
+    public static final int DOUBLE_TAP_LEFT = 0x03;
+    public static final int DOUBLE_TAP_RIGHT = 0x04;
+    public static final int LONG_PRESS_LEFT = 0x05;
+    public static final int LONG_PRESS_RIGHT = 0x06;
+    public static final int TRIPLE_TAP_LEFT = 0x07;
+    public static final int TRIPLE_TAP_RIGHT = 0x08;
+
+    public static final int SWIPE_FORWARD_LEFT = 0x11;
+    public static final int SWIPE_FORWARD_RIGHT = 0x12;
+    public static final int SWIPE_BACKWARD_LEFT = 0x13;
+    public static final int SWIPE_BACKWARD_RIGHT = 0x14;
+    public static final int SWIPE_UP_LEFT = 0x15;
+    public static final int SWIPE_UP_RIGHT = 0x16;
+    public static final int SWIPE_DOWN_LEFT = 0x17;
+    public static final int SWIPE_DOWN_RIGHT = 0x18;
+
+    public static final int SINGLE_TAP_HOLD_LEFT = 0x31;
+    public static final int SINGLE_TAP_HOLD_RIGHT = 0x32;
+    public static final int DOUBLE_TAP_HOLD_LEFT = 0x33;
+    public static final int DOUBLE_TAP_HOLD_RIGHT = 0x34;
+    public static final int RELEASE_TAP_HOLD_LEFT = 0x35;
+    public static final int RELEASE_TAP_HOLD_RIGHT = 0x36;
+
+    public static final int LEFT_ALL = 0xFD;
+    public static final int RIGHT_ALL = 0xFE;
+    public static final int ALL = 0xFF;
+
+    // Action IDs
+    // No any action, always used to reset gesture's action.
+    public static final int ACTION_NONE = 0x0;
+    public static final int VOLUME_UP = 0x01;
+    public static final int VOLUME_DOWN =0x02;
+    public static final int ANC = 0x03;
+    public static final int AMBIENT_AWARE = 0x04;
+    public static final int TALK_THROUGH = 0x05;
+    public static final int NEXT_TRACK = 0x06;
+    public static final int PREVIOUS_TRACK = 0x07;
+    public static final int PLAY_PAUSE = 0x08;
+    // switch function between ANC / AMBIENT AWARE / OFF
+    public static final int ANC_AMBIENT_AWARE_OFF = 0x09;
+
+    public static final int CANCEL_DEFAULT_ASSISTANT = 0xa0;
+    public static final int TALK_TO_DEFAULT_ASSISTANT = 0xa1;
+    public static final int CANCEL_GOOGLE_ASSISTANT = 0xa2;
+    public static final int GOOGLE_ASSISTANT_NOTIFICATION_CALL_OUT = 0xa3;
+    public static final int TALK_TO_GOOGLE_ASSISTANT = 0xa4;
+    public static final int CANCEL_AMAZON_ALEXA = 0xa5;
+    public static final int TALK_TO_AMAZON_ALEXA = 0xa6;
+    public static final int CANCEL_TENCENT_XIAOWEI = 0xa7;
+    public static final int TALK_TO_TENCENT_XIAOWEI = 0xa8;
+
+    public GestureInfo() {
+    }
+
+    public GestureInfo(int gestureId, int actionId) {
+        this.gestureId = gestureId;
+        this.actionId = actionId;
+    }
+
+    private int gestureId;
+
+    private int actionId;
+
+    /**
+     * Get gestureId
+     * <li>0x01 - Single click on left {@link #SINGLE_TAP_LEFT};
+     * <li>0x02 - Single click on right {@link #SINGLE_TAP_RIGHT};
+     * <li>0x03 - Double click on left {@link #DOUBLE_TAP_LEFT};
+     * <li>0x04 - Double click on right {@link #DOUBLE_TAP_RIGHT};
+     * <li>0x05 - Long press on left {@link #LONG_PRESS_LEFT};
+     * <li>0x06 - Long press on right {@link #LONG_PRESS_RIGHT};
+     * <li>0x07 - Triple click on left {@link #TRIPLE_TAP_LEFT};
+     * <li>0x08 - Triple click on right {@link #TRIPLE_TAP_RIGHT};
+     *
+     * <li>0x11 - Swipe forward on left {@link #SWIPE_FORWARD_LEFT};
+     * <li>0x12 - Swipe forward on right {@link #SWIPE_FORWARD_RIGHT};
+     * <li>0x13 - Swipe backward on left {@link #SWIPE_BACKWARD_LEFT};
+     * <li>0x14 - Swipe backward on right {@link #SWIPE_BACKWARD_RIGHT};
+     * <li>0x15 - Swipe up on left {@link #SWIPE_UP_LEFT};
+     * <li>0x16 - Swipe up on right {@link #SWIPE_UP_RIGHT};
+     * <li>0x17 - Swipe down on left {@link #SWIPE_DOWN_LEFT};
+     * <li>0x18 - Swipe down on right {@link #SWIPE_DOWN_RIGHT};
+     *
+     * <li>0x31 - Single click and hold on left {@link #SINGLE_TAP_HOLD_LEFT};
+     * <li>0x32 - Single click and hold on right {@link #SINGLE_TAP_HOLD_RIGHT};
+     * <li>0x33 - Double click and hold on left {@link #DOUBLE_TAP_HOLD_LEFT};
+     * <li>0x34 - Double click and hold on right {@link #DOUBLE_TAP_HOLD_RIGHT};
+     *
+     * <li>0xFD - {@link #LEFT_ALL} always used to reset actions on left
+     * <li>0xFE - {@link #RIGHT_ALL} always used to reset actions on right
+     * <li>0xFF - {@link #LEFT_ALL} always used to reset actions both on left and right
+     * <li> ...
+     * */
+    public int getGestureId() {
+        return gestureId;
+    }
+
+    public void setGestureId(int gestureId) {
+        this.gestureId = gestureId;
+    }
+
+    /**
+     * actionId
+     * <li>0x00 - no any action {@link #ACTION_NONE};
+     * <li>0x01 - Volume Up {@link #VOLUME_UP};
+     * <li>0x02 - Volume Down {@link #VOLUME_DOWN};
+     * <li>0x03 - ANC {@link #ANC};
+     * <li>0x04 - Ambient Aware {@link #AMBIENT_AWARE};
+     * <li>0x05 - Talk Through {@link #TALK_THROUGH};
+     * <li>0x06 - Next Track {@link #NEXT_TRACK};
+     * <li>0x07 - Previous Track {@link #PREVIOUS_TRACK};
+     * <li>0x08 - Play/Pause {@link #PLAY_PAUSE};
+     * <li>0x09 - ANC(default)/Ambient Aware On/Off {@link #ANC_AMBIENT_AWARE_OFF};
+     *
+     * <li>0xa0 - Cancel Default Assistant {@link #CANCEL_DEFAULT_ASSISTANT}
+     * <li>0xa1 - Talk to Default Assistant {@link #TALK_THROUGH}
+     * <li>0xa2 - Cancel Google Assistant {@link #CANCEL_GOOGLE_ASSISTANT}
+     * <li>0xa3 - Google Assistant notification call-out {@link #GOOGLE_ASSISTANT_NOTIFICATION_CALL_OUT}
+     * <li>0xa4 - Talk to Google Assistant {@link #TALK_TO_GOOGLE_ASSISTANT}
+     * <li>0xa5 - Cancel Amazon Assistant {@link #CANCEL_AMAZON_ALEXA}
+     * <li>0xa6 - Talk to Amazon Alexa {@link #TALK_TO_AMAZON_ALEXA}
+     * <li>0xa7 - Cancel Tencent XiaoWei {@link #CANCEL_TENCENT_XIAOWEI}
+     * <li>0xa8 - Talk to Tencent XiaoWei {@link #TALK_TO_TENCENT_XIAOWEI}
+     * <li>...
+     * */
+    public int getActionId() {
+        return actionId;
+    }
+
+    public void setActionId(int actionId) {
+        this.actionId = actionId;
+    }
+
+    @Override
+    public String toString() {
+        return "GestureInfo{" +
+                "gestureId=" + gestureId +
+                ", actionId=" + actionId +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/GestureMessage.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/GestureMessage.java
new file mode 100644
index 00000000..8a56cc7d
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/GestureMessage.java
@@ -0,0 +1,24 @@
+package com.bes.sdk.message;
+
+import com.bes.sdk.utils.MessageID;
+
+import java.util.List;
+
+public class GestureMessage extends BaseMessage {
+
+    private List<GestureInfo> gestureInfoList;
+
+    public GestureMessage(List<GestureInfo> gestureInfoList) {
+        this.gestureInfoList = gestureInfoList;
+    }
+
+    @Override
+    public MessageID getMsgID() {
+        return MessageID.GESTURE_STATUS;
+    }
+
+    @Override
+    public List<GestureInfo> getMsgContent() {
+        return gestureInfoList;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/InEarInfo.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/InEarInfo.java
new file mode 100644
index 00000000..bf32c9f2
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/InEarInfo.java
@@ -0,0 +1,49 @@
+package com.bes.sdk.message;
+
+import java.io.Serializable;
+
+/**
+ * In ear info
+ */
+public class InEarInfo implements Serializable {
+
+    public static final int INVALID = -1;
+    public static final int NOT_READY = 0;
+    public static final int READY = 1;
+
+    private int leftInEar;
+
+    private int rightInEar;
+
+    /**
+     * Get left device in ear status
+     * @return {@link #NOT_READY} for not ready, {@link #READY} ready or {@link #INVALID} invalid.
+     */
+    public int getLeftInEar() {
+        return leftInEar;
+    }
+
+    public void setLeftInEar(int leftInEar) {
+        this.leftInEar = leftInEar;
+    }
+
+    /**
+     * Get right device in ear status
+     * @return {@link #NOT_READY} for not ready, {@link #READY} ready or {@link #INVALID} invalid.
+     */
+    public int getRightInEar() {
+        return rightInEar;
+    }
+
+    public void setRightInEar(int rightInEar) {
+        this.rightInEar = rightInEar;
+    }
+
+    @Override
+    public String toString() {
+        return "InEarInfo{" +
+                "leftInEar=" + leftInEar +
+                ", rightInEar=" + rightInEar +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/MyBudsInfo.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/MyBudsInfo.java
new file mode 100644
index 00000000..6609ab9e
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/MyBudsInfo.java
@@ -0,0 +1,102 @@
+package com.bes.sdk.message;
+
+import java.io.Serializable;
+
+/**
+ * My buds info
+ */
+public class MyBudsInfo implements Serializable {
+
+    public static final int INVALID_STATUS = -1;
+    public static final int OFF = 0;
+
+    private int leftBeeping = INVALID_STATUS;
+
+    private int rightBeeping = INVALID_STATUS;
+
+    private int leftLighting = INVALID_STATUS;
+
+    private int rightLighting = INVALID_STATUS;
+
+    /**
+     * Get left beeping statue
+     *
+     * @return {@link #OFF} means off, other positive digit is beep numbers, {@link #INVALID_STATUS} means invalid beeping
+     */
+    public int getLeftBeeping() {
+        return leftBeeping;
+    }
+
+    /**
+     * Set left beeping statue
+     *
+     * @param leftBeeping  {@link #OFF} means off, other positive digit is beep numbers, {@link #INVALID_STATUS} means invalid beeping
+     */
+    public void setLeftBeeping(int leftBeeping) {
+        this.leftBeeping = leftBeeping;
+    }
+
+    /**
+     * Get right beeping statue
+     *
+     * @return {@link #OFF} means off, other positive digit is beep numbers, {@link #INVALID_STATUS} means invalid beeping
+     */
+    public int getRightBeeping() {
+        return rightBeeping;
+    }
+
+    /**
+     * Set right beeping statue
+     *
+     * @param rightBeeping {@link #OFF} means off, other positive digit is beep numbers, {@link #INVALID_STATUS} means invalid beeping
+     */
+    public void setRightBeeping(int rightBeeping) {
+        this.rightBeeping = rightBeeping;
+    }
+
+    /**
+     * Get left lighting statue
+     *
+     * @return {@link #OFF} means off, other positive digit is lighting numbers, {@link #INVALID_STATUS} means invalid lighting
+     */
+    public int getLeftLighting() {
+        return leftLighting;
+    }
+
+    /**
+     * Set left lighting statue
+     *
+     * @param leftLighting {@link #OFF} means off, other positive digit is lighting numbers, {@link #INVALID_STATUS} means invalid lighting
+     */
+    public void setLeftLighting(int leftLighting) {
+        this.leftLighting = leftLighting;
+    }
+
+    /**
+     * Get right lighting statue
+     *
+     * @return  {@link #OFF} means off, other positive digit is lighting numbers, {@link #INVALID_STATUS} means invalid lighting
+     */
+    public int getRightLighting() {
+        return rightLighting;
+    }
+
+    /**
+     * Set right lighting statue
+     *
+     * @param rightLighting {@link #OFF} means off, other positive digit is lighting numbers, {@link #INVALID_STATUS} means invalid lighting
+     */
+    public void setRightLighting(int rightLighting) {
+        this.rightLighting = rightLighting;
+    }
+
+    @Override
+    public String toString() {
+        return "MyBudsInfo{" +
+                "leftBeeping=" + leftBeeping +
+                ", rightBeeping=" + rightBeeping +
+                ", leftLighting=" + leftLighting +
+                ", rightLighting=" + rightLighting +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/MyBudsMessage.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/MyBudsMessage.java
new file mode 100644
index 00000000..f28ecca9
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/MyBudsMessage.java
@@ -0,0 +1,24 @@
+package com.bes.sdk.message;
+
+import com.bes.sdk.utils.MessageID;
+
+import static com.bes.sdk.utils.MessageID.FIND_ME_STATUS;
+
+public class MyBudsMessage extends BaseMessage {
+
+    private MyBudsInfo budsInfo;
+
+    public MyBudsMessage(MyBudsInfo budsInfo) {
+        this.budsInfo = budsInfo;
+    }
+
+    @Override
+    public MessageID getMsgID() {
+        return FIND_ME_STATUS;
+    }
+
+    @Override
+    public MyBudsInfo getMsgContent() {
+        return budsInfo;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/OTAInfo.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/OTAInfo.java
new file mode 100644
index 00000000..cf01ef42
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/OTAInfo.java
@@ -0,0 +1,48 @@
+package com.bes.sdk.message;
+
+import androidx.annotation.NonNull;
+
+import com.bes.sdk.utils.OTAChannel;
+import com.bes.sdk.utils.OTAStatus;
+
+import java.io.Serializable;
+
+/**
+ * Anc status definition
+ */
+public class OTAInfo implements Serializable
+{
+    /**
+     * OTA channel
+     */
+    private OTAChannel otaChannel;
+
+    /**
+     * OTA status.
+     */
+    private OTAStatus otaStatus;
+
+    public @NonNull OTAChannel getOtaChannel() {
+        return otaChannel;
+    }
+
+    public void setOtaChannel(OTAChannel otaChannel) {
+        this.otaChannel = otaChannel;
+    }
+
+    public OTAStatus getOtaStatus() {
+        return otaStatus;
+    }
+
+    public void setOtaStatus(OTAStatus otaStatus) {
+        this.otaStatus = otaStatus;
+    }
+
+    @Override
+    public String toString() {
+        return "OTAInfo{" +
+                "otaChannel=" + otaChannel +
+                ", otaStatus=" + otaStatus +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/OTAInfoMessage.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/OTAInfoMessage.java
new file mode 100644
index 00000000..4bc3bb33
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/OTAInfoMessage.java
@@ -0,0 +1,25 @@
+package com.bes.sdk.message;
+
+import com.bes.sdk.utils.MessageID;
+
+/**
+ * Message to describe OTA info.
+ */
+public class OTAInfoMessage extends BaseMessage
+{
+    private OTAInfo otaInfo;
+
+    public OTAInfoMessage(OTAInfo otaInfo) {
+        this.otaInfo = otaInfo;
+    }
+
+    @Override
+    public MessageID getMsgID() {
+        return MessageID.OTA_STATUS;
+    }
+
+    @Override
+    public OTAInfo getMsgContent() {
+        return otaInfo;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/SealingInfo.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/SealingInfo.java
new file mode 100644
index 00000000..eb0e5d4b
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/SealingInfo.java
@@ -0,0 +1,50 @@
+package com.bes.sdk.message;
+
+
+import java.io.Serializable;
+
+/**
+ * Sealing info
+ */
+public class SealingInfo implements Serializable {
+
+    public static final int INVALID = -1;
+    public static final int NOT_READY = 0;
+    public static final int READY = 1;
+
+    private int leftSealing;
+
+    private int rightSealing;
+
+    /**
+     * Get left device sealing status
+     * @return {@link #NOT_READY} for not ready, {@link #READY} ready or {@link #INVALID} invalid.
+     */
+    public int getLeftSealing() {
+        return leftSealing;
+    }
+
+    public void setLeftSealing(int leftSealing) {
+        this.leftSealing = leftSealing;
+    }
+
+    /**
+     * Get right device sealing status
+     * @return {@link #NOT_READY} for not ready, {@link #READY} ready or {@link #INVALID} invalid.
+     */
+    public int getRightSealing() {
+        return rightSealing;
+    }
+
+    public void setRightSealing(int rightSealing) {
+        this.rightSealing = rightSealing;
+    }
+
+    @Override
+    public String toString() {
+        return "SealingInfo{" +
+                "leftSealing=" + leftSealing +
+                ", rightSealing=" + rightSealing +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/SmartSwitchInfo.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/SmartSwitchInfo.java
new file mode 100644
index 00000000..f503c660
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/message/SmartSwitchInfo.java
@@ -0,0 +1,104 @@
+package com.bes.sdk.message;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * Smart Switch Info
+ */
+public class SmartSwitchInfo implements Serializable {
+
+    /**
+     * Invalid value -1.
+     */
+    public static final int INVALID = -1;
+
+    private int aac;
+
+    private int sbc;
+
+    private int latency = -1;
+
+    private int latency2 = -1;
+
+    public SmartSwitchInfo() {}
+
+    public SmartSwitchInfo(int aac, int sbc, int latency, int latency2) {
+        this.aac = aac;
+        this.sbc = sbc;
+        this.latency = latency;
+        this.latency2 = latency2;
+    }
+
+    /**
+     * Get AAC value
+     */
+    public int getAac() {
+        return aac;
+    }
+
+    public void setAac(int aac) {
+        this.aac = aac;
+    }
+
+    /**
+     * Get SBC value
+     */
+    public int getSbc() {
+        return sbc;
+    }
+
+    public void setSbc(int sbc) {
+        this.sbc = sbc;
+    }
+
+    /**
+     * Get latency
+     * @return
+     */
+    public int getLatency() {
+        return latency;
+    }
+
+    public void setLatency(int latency) {
+        this.latency = latency;
+    }
+
+    /**
+     * Get the 2nd latency, some device doesn't support 2nd latency, then return {@link #INVALID}.
+     * @return
+     */
+    public int getLatency2() {
+        return latency2;
+    }
+
+    public void setLatency2(int latency2) {
+        this.latency2 = latency2;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        SmartSwitchInfo that = (SmartSwitchInfo) o;
+        return aac == that.aac &&
+                sbc == that.sbc &&
+                latency == that.latency &&
+                latency2 == that.latency2;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(aac, sbc, latency, latency2);
+    }
+
+    @Override
+    public String toString() {
+        return "SmartSwitchInfo{" +
+                "aac=" + aac +
+                ", sbc=" + sbc +
+                ", latency=" + latency +
+                ", latency2=" + latency2 +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/ota/OTADfuInfo.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/ota/OTADfuInfo.java
new file mode 100644
index 00000000..c1cf4084
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/ota/OTADfuInfo.java
@@ -0,0 +1,36 @@
+package com.bes.sdk.ota;
+
+public class OTADfuInfo
+{
+    // OTA DFU version.
+    private String mVer;
+
+    // OTA DFU breakpoint.
+    private int mBp;
+
+    public OTADfuInfo(String version, int breakpoint)
+    {
+        mVer = version;
+        mBp = breakpoint;
+    }
+
+    /**
+     * Get the DFU version, can be null if there is no DFU available.
+     * @return
+     */
+    public String getVersion() { return mVer; };
+
+    /**
+     * Get DFU breakpoint, the data length that already transferred to device.
+     * @return
+     */
+    public int getBreakpoint() { return mBp; }
+
+    @Override
+    public String toString() {
+        return "OTADfuInfo{" +
+                "\nmVer='" + mVer + '\'' +
+                "\nmBp=" + mBp +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/ota/OTATask.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/ota/OTATask.java
new file mode 100644
index 00000000..23c28232
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/ota/OTATask.java
@@ -0,0 +1,127 @@
+package com.bes.sdk.ota;
+
+import com.bes.sdk.device.HmDevice;
+import com.bes.sdk.utils.OTAStatus;
+
+/**
+ * Firmware OTA task interface. Only for OTA process initiated from app side.
+ * Concrete implementation of this interface will need HmDevice and RemoteOTAConfig also.
+ *
+ * The APIs defined here in OTATask basically follow the Harman Lifestyle OTA Standard Flow.
+ * Please refer to related document.
+ */
+public interface OTATask {
+    /**
+     * Set remoteConfig for this OTATask.
+     * @param config
+     */
+    void setOtaConfig(RemoteOTAConfig config);
+    /**
+     * Get HmDevice this OTATask is running for.
+     *
+     * @return
+     */
+    HmDevice getDevice();
+
+    /**
+     * Get RemoteOTAConfig this OTATask is using.
+     *
+     * @return
+     */
+    RemoteOTAConfig getOtaConfig();
+
+    /**
+     * Get current OTATask status.
+     */
+    OTAStatus getOTAStatus();
+
+    /**
+     * Get current data transfer progress, number of percentage.
+     */
+    int getCurrentProgress();
+
+    /**
+     * Request DFU (Device Firmware Upgrade) info on device.
+     * The main purpose is to check whether there was an incomplete OTA happened before. Details include:
+     * - Firmware version,
+     * - Breakpoint index.
+     * If the version matches the latest one, app will try to resume from the breakpoint.
+     * If the device holds an complete firmware, app can send a command to request APPLY it directly.
+     * <p>
+     * For those device doesn't support Breakpoint Resume, just return 0 that means starting from the beginning.
+     */
+    OTADfuInfo requestDFUInfo();
+
+    /**
+     * A plugin API to provide an opportunity to initialize the OTA data transfer.
+     * For some platforms, app or client needs to explicitly tell the device such as flash address and so on.
+     */
+    void preTransferInit();
+
+    /**
+     * Request to start data transfer with given DFU info. With threshold 0, allowBackground true.
+     * Same as startDataTransfer(dufInfo, 0, true, listener).
+     *
+     * @param dufInfo
+     * @param listener, to the data transfer progress.
+     */
+    boolean startDataTransfer(OTADfuInfo dufInfo, StatusListener listener);
+
+    /**
+     * Request to start data transfer with given DFU info.
+     *
+     * @param dufInfo
+     * @param threshold battery level threshold. OTA would be canceled once battery less than threshold.
+     * @param allowBackground if allow OTA in background. In case false(don't allow in background), OTA would be canceled once app in background.
+     * @param listener, to the data transfer progress.
+     */
+    boolean startDataTransfer(OTADfuInfo dufInfo, int threshold, boolean allowBackground, StatusListener listener);
+
+    /**
+     * Request to stop data transfer.
+     * User may need to stop OTA transfer for higher priority actions.
+     */
+    boolean stopDataTransfer();
+
+    /**
+     * A plugin API to provide an opportunity to clean up after OTA data transfer if needs.
+     */
+    void postTransferCleanup();
+
+    /**
+     * Request device to apply new transfer after data transfer completed.
+     * @param threshold battery level threshold. OTA would not apply new firmware if battery level less than threshold.
+     */
+    boolean applyNewFirmware(int threshold);
+
+    /**
+     * Register data transfer listener.
+     *
+     * @param listener
+     */
+    void registerOTAStatusListener(StatusListener listener);
+
+    /**
+     * Unregister data transfer listener.
+     *
+     * @param listener
+     */
+    void unregisterOTAStatusListener(StatusListener listener);
+
+    /**
+     * OTA status listener interface.
+     */
+    interface StatusListener
+    {
+        /**
+         * Callback when OTA status changed.
+         */
+        void onOTAStatusChanged(OTAStatus newStatus);
+
+        /**
+         * Callback when OTA transfer progress changed. Transfer progress is between 0 and 100.
+         * @param progress
+         */
+        void onOTAProgressChanged(int progress);
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/ota/RemoteOTAConfig.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/ota/RemoteOTAConfig.java
new file mode 100644
index 00000000..54d450d4
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/ota/RemoteOTAConfig.java
@@ -0,0 +1,155 @@
+package com.bes.sdk.ota;
+
+import java.io.Serializable;
+
+/**
+ * OTA configuration API.
+ */
+public class RemoteOTAConfig implements Serializable {
+
+    private String pid;
+
+    private String version;
+
+    private String downloadUrl;
+
+    private String localPath;
+
+    private String checkSum;
+
+    private String whatsNewTitle;
+
+    private String whatsNewContent;
+
+    /**
+     * Get PID. Remote OTA configuration is identified by PID.
+     *
+     * @return
+     */
+    public String getPid() { return pid;}
+
+    /**
+     * @see #getPid()
+     * @param pid
+     */
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    /**
+     * Get firmware version defined in remote configuration.
+     *
+     * @return
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * @see #getVersion()
+     * @param version
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * Get OTA download URL defined in remote configuration.
+     *
+     * @return
+     */
+    public String getDownloadUrl() {
+        return downloadUrl;
+    }
+
+    /**
+     * @see #getDownloadUrl()
+     * @param downloadUrl
+     */
+    public void setDownloadUrl(String downloadUrl) {
+        this.downloadUrl = downloadUrl;
+    }
+
+    /**
+     * Local path that ScanManager downloads and store the latest firmware.
+     *
+     * @return
+     */
+    public String getLocalPath() {
+        return localPath;
+    }
+
+    /**
+     * @see #getLocalPath()
+     * @param localPath
+     */
+    public void setLocalPath(String localPath) {
+        this.localPath = localPath;
+    }
+
+    /**
+     * Get firmware MD5 checksum defined in remote configuration.
+     *
+     * @return
+     */
+    public String getCheckSum() {
+        return checkSum;
+    }
+
+    /**
+     * @see #getCheckSum()
+     * @param checkSum
+     */
+    public void setCheckSum(String checkSum) {
+        this.checkSum = checkSum;
+    }
+
+    /**
+     * Get What's New title for specific language.
+     *
+     * @param locale
+     * @return
+     */
+    public String getWhatsNewTitle(String locale) {
+        return whatsNewTitle;
+    }
+
+    /**
+     * @see #getWhatsNewTitle(String)
+     * @param whatsNewTitle
+     */
+    public void setWhatsNewTitle(String whatsNewTitle) {
+        this.whatsNewTitle = whatsNewTitle;
+    }
+
+    /**
+     * Get What's New content for specific language.
+     *
+     * @param locale
+     * @return
+     */
+    public String getWhatsNewContent(String locale) {
+        return whatsNewContent;
+    }
+
+    /**
+     * @see #getWhatsNewContent(String)
+     * @param whatsNewContent
+     */
+    public void setWhatsNewContent(String whatsNewContent) {
+        this.whatsNewContent = whatsNewContent;
+    }
+
+    @Override
+    public String toString() {
+        return "RemoteOTAConfig{" +
+                "pid='" + pid + '\'' +
+                ", version='" + version + '\'' +
+                ", downloadUrl='" + downloadUrl + '\'' +
+                ", localPath='" + localPath + '\'' +
+                ", checkSum='" + checkSum + '\'' +
+                ", whatsNewTitle='" + whatsNewTitle + '\'' +
+                ", whatsNewContent='" + whatsNewContent + '\'' +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/scan/BleBroadCastParser.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/scan/BleBroadCastParser.java
new file mode 100644
index 00000000..8f6ffb80
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/scan/BleBroadCastParser.java
@@ -0,0 +1,9 @@
+package com.bes.sdk.scan;
+
+import android.bluetooth.le.ScanRecord;
+
+import java.util.Map;
+
+public interface BleBroadCastParser {
+    Map<String, String> parseBleScanRecordData(ScanRecord record);
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/scan/ScanFilter.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/scan/ScanFilter.java
new file mode 100644
index 00000000..54e54e00
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/scan/ScanFilter.java
@@ -0,0 +1,14 @@
+package com.bes.sdk.scan;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public interface ScanFilter {
+    /**
+     * Check if given param object is useful
+     * @param scanRecord
+     * @param parser scanRecord parser.
+     * @return true param object is useful, false ignore the given param object.
+     */
+    boolean filter(@NonNull Object scanRecord, @Nullable Object parser);
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/scan/ScanManager.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/scan/ScanManager.java
new file mode 100644
index 00000000..6273b2dc
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/scan/ScanManager.java
@@ -0,0 +1,82 @@
+package com.bes.sdk.scan;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bes.sdk.utils.DeviceProtocol;
+import com.bes.sdk.device.HmDevice;
+
+import java.util.Collection;
+
+/**
+ * Device scan manager interface.
+ */
+public interface ScanManager
+{
+    /**
+     * Check if a scan process of specified protocol is running in progress or not.
+     * @param deviceProtocol
+     * @return
+     */
+    boolean isScanInProgress(@NonNull DeviceProtocol deviceProtocol);
+
+    /**
+     * Start a device  scan process for specified protocol, with specified strategy, listener and filter.
+     *
+     * @param deviceProtocols
+     * @param scanListener
+     * @param scanFilter
+     */
+    void startScan(@NonNull Collection<DeviceProtocol> deviceProtocols,
+                   @NonNull ScanListener scanListener, @Nullable ScanFilter scanFilter);
+
+    /**
+     * Start a device  scan process for specified protocol, with specified strategy, listener, filter and BLE broadcast parser.
+     *
+     * @param deviceProtocols
+     * @param scanListener
+     * @param scanFilter
+     * @param parser
+     */
+    void startScan(@NonNull Collection<DeviceProtocol> deviceProtocols,
+                   @NonNull ScanListener scanListener, @Nullable ScanFilter scanFilter, @Nullable BleBroadCastParser parser);
+
+    /**
+     * Stop device scan process of specified protocol.
+     *
+     * @param deviceProtocols
+     */
+    void stopScan(@NonNull Collection<DeviceProtocol> deviceProtocols);
+
+    /**
+     * Stop all device scan processes.
+     */
+    void stopAllScan();
+
+
+    /**
+     * Return all scanned devices (include master, slave), might be null
+     *
+     */
+    Collection<HmDevice> getDeviceList();
+
+    /**
+     * Scan manager listener, defines the callback of scan events.
+     */
+    interface ScanListener
+    {
+        void onScanResult(HmDevice scannedDevice);
+        /**
+         * Device offline. No message received from this device in long time
+         * (default 3 minutes, configurable).
+         * @param device
+         */
+        void onDeviceOffline(HmDevice device);
+
+        /**
+         * Scan failed with message
+         * @param message
+         */
+        void onScanFailed(String message);
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/AudioChannel.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/AudioChannel.java
new file mode 100644
index 00000000..748d52c4
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/AudioChannel.java
@@ -0,0 +1,51 @@
+package com.bes.sdk.utils;
+
+/**
+ * Enum of device stereo channel.
+ */
+public enum AudioChannel
+{
+    // Channel info.
+    UNKNOWN         (-1,    "Unknown"),
+    NONE_CHANNEL    (0,     "NONE_CHANNEL"),
+    STEREO_LEFT     (1,     "LEFT_CHANNEL"),
+    STEREO_RIGHT    (2,     "RIGHT_CHANNEL");
+
+    private int mValue;
+    private String mName;
+
+    AudioChannel(int value, String name)
+    {
+        mValue = value;
+        mName = name;
+    }
+
+    public static AudioChannel getChannel(int channel)
+    {
+        switch (channel) {
+            case 0:
+                return NONE_CHANNEL;
+            case 1:
+                return STEREO_LEFT;
+            case 2:
+                return STEREO_RIGHT;
+        }
+        return UNKNOWN;
+    }
+
+    public int getValue() {
+        return mValue;
+    }
+
+    public String getName() {
+        return mName;
+    }
+
+    @Override
+    public String toString() {
+        return "AudioChannel{" +
+                "mValue=" + mValue +
+                ", mName='" + mName + '\'' +
+                '}';
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/DeviceProtocol.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/DeviceProtocol.java
new file mode 100644
index 00000000..4d0a6886
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/DeviceProtocol.java
@@ -0,0 +1,31 @@
+package com.bes.sdk.utils;
+
+/**
+ * Enum of protocol might be used, mainly use BLE, SPP for now.
+ */
+public enum DeviceProtocol
+{
+    PROTOCOL_UNKNOWN     (0,            "Unknown"),
+    PROTOCOL_BLE         (0x00000001,   "Bluetooth Low Energy"),
+    PROTOCOL_SPP         (0x00000010,   "Serial Port Profile"),
+    PROTOCOL_WIFI        (0x00000100,   "Wi-Fi"),
+    PROTOCOL_CABLE       (0x00001000,   "Cable"),
+    PROTOCOL_USB         (0x00010000,   "USB"),
+    PROTOCOL_GATT_BR_EDR (0x00100000,   "GATT_BR_EDR");
+
+    private int mValue;
+    private String mName;
+
+    DeviceProtocol(int value, String name) {
+        mValue = value;
+        mName = name;
+    }
+
+    public int getValue() {
+        return mValue;
+    }
+
+    public String getName() {
+        return mName;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/DeviceRole.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/DeviceRole.java
new file mode 100644
index 00000000..e9fe6283
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/DeviceRole.java
@@ -0,0 +1,72 @@
+package com.bes.sdk.utils;
+
+import android.text.TextUtils;
+
+/**
+ * Enum of device roles.
+ */
+public enum DeviceRole
+{
+    // General roles.
+    UNKNOWN         (-1,    "Unknown"),
+    NORMAL          (0,     "Normal"),
+    MASTER          (1,     "Master"),
+    SLAVE           (2,     "Slave"),
+
+    // Roles for TWS.
+    TWS_MASTER      (101, "TWS_MASTER"),
+    TWS_SLAVE       (102, "TWS_SLAVE");
+
+    private int mValue;
+    private String mName;
+
+    DeviceRole(int value, String name)
+    {
+        mValue = value;
+        mName = name;
+    }
+
+    public static DeviceRole getRole(int role)
+    {
+        switch (role) {
+            case 0:
+                return NORMAL;
+            case 1:
+                return MASTER;
+            case 2:
+                return SLAVE;
+            case 101:
+                return TWS_MASTER;
+            case 102:
+                return TWS_SLAVE;
+        }
+        return UNKNOWN;
+    }
+
+    public static DeviceRole getRole(String role) {
+        if (TextUtils.isEmpty(role)){
+            return UNKNOWN;
+        }
+        switch (role) {
+            case "00":
+            case "0":
+                return NORMAL;
+            case "01":
+            case "1":
+                return MASTER;
+            case "02":
+            case "2":
+            case "10":
+                return SLAVE;
+        }
+        return NORMAL;
+    }
+
+    public int getValue() {
+        return mValue;
+    }
+
+    public String getName() {
+        return mName;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/MessageID.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/MessageID.java
new file mode 100644
index 00000000..df4a6ea6
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/MessageID.java
@@ -0,0 +1,53 @@
+package com.bes.sdk.utils;
+
+/**
+ * Define the enum of messages that used to control device.
+ *
+ */
+public enum MessageID {
+    UNKNOWN(-1, "UnknownCommand"),
+
+    /**
+     * Device control request messages.
+     */
+    DEVICE_LIST_INFO    (1001,      "DEVICE_LIST_INFO"),
+    DEVICE_NAME         (1002,      "DEVICE_NAME"),
+    ANC_STATUS          (1003,      "ANC_STATUS"),
+    AUTO_PAUSE          (1004,      "AUTO_PAUSE"),
+    AUTO_POWER_OFF      (1005,      "AUTO_POWER_OFF"),
+    MULTI_AI_STATUS     (1006,      "MULTI_AI_STATUS"),
+    A2DP_STATUS         (1007,      "A2DP_STATUS"),
+    FIND_ME_STATUS      (1008,      "FIND_ME_STATUS"),
+    TWS_STATUS          (1009,      "TWS_STATUS"),
+    SEALING_STATUS      (1010,      "SEALING_STATUS"),
+    GESTURE_STATUS      (1011,      "GESTURE_STATUS"),
+    SYNC_CRC_STATUS     (1012,      "SYNC_CRC_STATUS"),
+    DEVICE_INFO         (1013,      "DEVICE_INFO"),
+    BATTERY_STATUS      (1014,      "BATTERY_STATUS"),
+    IN_EAR_STATUS       (1015,      "IN_EAR_STATUS"),
+    SMART_SWITCH_STATUS (1016,      "SMART_SWITCH_STATUS"),
+
+    /**
+     * OTA control request messages. Start from 2001.
+     */
+    OTA_STATUS          (2001,      "OTA_STATUS"),
+
+    /**
+     * EQ control request messages. Start from 3001.
+     */
+    EQ_STATUS           (3001,      "EQ_STATUS"),
+    RUNNING_EQ_STATUS   (3002,      "RUNNING_EQ_STATUS"),
+    COMBINED_EQ_STATUS  (3003,      "COMBINED_EQ_STATUS");
+
+    private int mValue;
+    private String mName;
+
+    MessageID(int value, String name) {
+        mValue = value;
+        mName = name;
+    }
+
+    public int getValue() { return mValue; }
+
+    public String getCmdName() { return mName; }
+}
\ No newline at end of file
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/OTAChannel.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/OTAChannel.java
new file mode 100644
index 00000000..7a0b64c6
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/OTAChannel.java
@@ -0,0 +1,26 @@
+package com.bes.sdk.utils;
+
+public enum OTAChannel
+{
+    CHANNEL_UNKNOWN     (-1,    "OTA Channel Unknown"),
+    CHANNEL_APP         (0,     "OTA Channel App"),
+    CHANNEL_GOOGLE_AI   (1,     "OTA Channel Google Assistant"),
+    CHANNEL_AMAZON_AI   (2,     "OTA Channel Amazon Alexa"),
+    STATUS_XIAOWEI_AI   (3,     "OTA Channel Xiaowei");
+
+    private int mValue;
+    private String mName;
+
+    OTAChannel(int value, String name) {
+        mValue = value;
+        mName = name;
+    }
+
+    public int getValue() {
+        return mValue;
+    }
+
+    public String getName() {
+        return mName;
+    }
+}
\ No newline at end of file
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/OTAStatus.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/OTAStatus.java
new file mode 100644
index 00000000..8520e73f
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/OTAStatus.java
@@ -0,0 +1,27 @@
+package com.bes.sdk.utils;
+
+public enum OTAStatus
+{
+    STATUS_UNKNOWN     (-1, "Status Unknown"),
+    STATUS_STARTED     (0, "Status Started"),
+    STATUS_CANCELED    (1, "Status Canceled"),
+    STATUS_FAILED      (2, "Status Failed"),
+    STATUS_SUCCEED     (3, "Status Succeed"),
+    STATUS_REBOOT      (4, "Status Reboot");
+
+    private int mValue;
+    private String mName;
+
+    OTAStatus(int value, String name) {
+        mValue = value;
+        mName = name;
+    }
+
+    public int getValue() {
+        return mValue;
+    }
+
+    public String getName() {
+        return mName;
+    }
+}
\ No newline at end of file
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/StatusCode.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/StatusCode.java
new file mode 100644
index 00000000..c643c273
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/bes/sdk/utils/StatusCode.java
@@ -0,0 +1,26 @@
+package com.bes.sdk.utils;
+
+public enum StatusCode
+{
+    STATUS_UNKNOWN          (-1,    "Status Unknown"),
+    STATUS_SUCCESS          (0,     "Status Success"),
+    STATUS_TIMEOUT          (1,     "Status Timeout"),
+    STATUS_CANCEL           (2,     "Status Canceled"),
+    STATUS_FAIL             (3,     "Status Failed");
+
+    private int mValue;
+    private String mDescription;
+
+    StatusCode(int value, String description) {
+        mValue = value;
+        mDescription = description;
+    }
+
+    public int getValue() {
+        return mValue;
+    }
+
+    public String getDescription() {
+        return mDescription;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/besall/allbase/common/utils/LogUtils.java b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/besall/allbase/common/utils/LogUtils.java
new file mode 100644
index 00000000..fcf91587
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/java/com/besall/allbase/common/utils/LogUtils.java
@@ -0,0 +1,34 @@
+package com.besall.allbase.common.utils;
+
+import android.util.Log;
+
+/**
+ * Minimal stand-in for the BES demo app's {@code LogUtils} helper.
+ *
+ * <p>The official BES OTA SDK sources reference {@code com.besall.allbase.common.utils.LogUtils}
+ * for optional on-disk log files. Those calls are gated behind a SharedPreferences flag
+ * ({@code BesSdkConstants.BES_SAVE_LOG_KEY}) that defaults to {@code false}, so in the plugin
+ * they are effectively no-ops. This stub keeps the OTA path self-contained (no demo UI/file
+ * tooling) while preserving the exact method signatures the SDK calls. Output is mirrored to
+ * logcat so on-device OTA traces remain inspectable.
+ */
+public class LogUtils {
+
+    private static final String DEFAULT_TAG = "BesOta";
+
+    /** Called by the SDK when the "save OTA log" preference is enabled. */
+    public static void writeForOTA(String tag, String logMsg, String logName) {
+    }
+
+    /** Called by the SDK when a generic "save log" preference is enabled. */
+    public static void writeForLOG(String tag, String logMsg, String logName) {
+    }
+
+    private static String safeTag(String tag) {
+        return tag == null || tag.length() == 0 ? DEFAULT_TAG : tag;
+    }
+
+    private static String str(String msg) {
+        return msg == null ? "" : msg;
+    }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/android/src/main/kotlin/com/example/bes_ota_manager/BesOtaManagerPlugin.kt b/apps/client/local_plugins/bes_ota_manager/android/src/main/kotlin/com/example/bes_ota_manager/BesOtaManagerPlugin.kt
new file mode 100644
index 00000000..1e4d24fe
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/android/src/main/kotlin/com/example/bes_ota_manager/BesOtaManagerPlugin.kt
@@ -0,0 +1,385 @@
+package com.example.bes_ota_manager
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+
+import com.bes.bessdk.BesSdkConstants
+import com.bes.bessdk.service.BesOTAConstants
+import com.bes.bessdk.service.BesOtaService
+import com.bes.bessdk.service.base.BesServiceConfig
+import com.bes.bessdk.service.base.BesServiceListener
+import com.bes.sdk.device.HmDevice
+import com.bes.sdk.ota.OTADfuInfo
+import com.bes.sdk.ota.OTATask
+import com.bes.sdk.ota.RemoteOTAConfig
+import com.bes.sdk.utils.DeviceProtocol
+import com.bes.sdk.utils.OTAStatus
+
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.EventChannel.EventSink
+import io.flutter.plugin.common.EventChannel.StreamHandler
+import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.MethodChannel
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler
+import io.flutter.plugin.common.MethodChannel.Result
+
+/**
+ * BesOtaManagerPlugin — native (Android) bridge wrapping the official BES (Bestechnic) OTA SDK.
+ *
+ * Channel contract (must match the Dart layer):
+ *  - MethodChannel  "bes_ota_manager"
+ *  - EventChannel   "bes_ota_manager/events"
+ *
+ * Methods: init -> Bool, startOta(args) -> Bool, stopOta -> void.
+ *
+ * Product decision: SPP OTA 2.0 (USER_FLAG = 1, curUser = 1 firmware, curUpgateType = 1 normal).
+ * The plugin owns its own connection to the device (it connects using the given address/name and
+ * does NOT reuse any existing app connection).
+ *
+ * Orchestration mirrors the BES demo (OtaUIPresenter / OtaUIActivity):
+ *  1. Build HmDevice(MAC = address, name) + BesServiceConfig(SPP, USER_FLAG=1, curUser=1,
+ *     curUpgateType=1).
+ *  2. `new BesOtaService(config, listener, applicationContext)` — the SDK auto-starts the
+ *     connect + handshake (protocol-version -> set-user -> get-hw-info) from its constructor.
+ *  3. Pre-set the OTA file via `setOtaConfig(RemoteOTAConfig{localPath = filePath})` so the
+ *     SDK's breakpoint-check path has a valid local path.
+ *  4. When the handshake reaches the configure-ready gate (the demo stops auto-progressing and
+ *     waits for the user at OTA_CMD_GET_HW_INFO), call
+ *     `startDataTransfer(OTADfuInfo("001", 0), statusListener)` to drive the upgrade. We also
+ *     re-enter `startDataTransfer` on OTA_CMD_BREAKPOINT_CHECK_80 (the demo's "config OK" path).
+ *  5. Forward StatusListener.onOTAProgressChanged(0..100) -> onProgress (progress / 100.0);
+ *     onOTAStatusChanged(OTAStatus) -> onStatus, with STATUS_SUCCEED -> onSuccess and
+ *     STATUS_FAILED/STATUS_CANCELED -> onError. BesServiceListener errors/success also map to
+ *     onError/onSuccess. All EventSink emissions are marshalled to the main thread.
+ */
+class BesOtaManagerPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
+
+    private lateinit var channel: MethodChannel
+    private lateinit var eventChannel: EventChannel
+    private var eventSink: EventSink? = null
+
+    private val mainHandler = Handler(Looper.getMainLooper())
+
+    private var applicationContext: Context? = null
+
+    // Held until terminal status (success / failure / cancel).
+    private var otaService: BesOtaService? = null
+    private var otaTask: OTATask? = null
+
+    /** True once we have already kicked off the data transfer for the current session. */
+    private var transferStarted = false
+
+    /**
+     * 会话终结标志：发出 onSuccess/onError 或调用 stopOta 后置 true。
+     * 成功后我们会调 stopDataTransfer 清理、设备也会重启断链，SDK 此时会再回调
+     * STATUS_CANCELED——这些"尾巴事件"必须抑制，否则会把"升级成功"覆盖成"升级失败"。
+     */
+    @Volatile
+    private var sessionEnded = false
+
+    /** Local firmware path for the current OTA session. */
+    private var currentFilePath: String? = null
+
+    // ---------------------------------------------------------------------------------------
+    // FlutterPlugin
+    // ---------------------------------------------------------------------------------------
+
+    override fun onAttachedToEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        applicationContext = binding.applicationContext
+        channel = MethodChannel(binding.binaryMessenger, "bes_ota_manager")
+        channel.setMethodCallHandler(this)
+
+        eventChannel = EventChannel(binding.binaryMessenger, "bes_ota_manager/events")
+        eventChannel.setStreamHandler(object : StreamHandler {
+            override fun onListen(arguments: Any?, events: EventSink?) {
+                eventSink = events
+            }
+
+            override fun onCancel(arguments: Any?) {
+                eventSink = null
+            }
+        })
+    }
+
+    override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
+        stopOtaInternal()
+        channel.setMethodCallHandler(null)
+        eventChannel.setStreamHandler(null)
+        eventSink = null
+        applicationContext = null
+    }
+
+    // ---------------------------------------------------------------------------------------
+    // MethodCallHandler
+    // ---------------------------------------------------------------------------------------
+
+    override fun onMethodCall(call: MethodCall, result: Result) {
+        when (call.method) {
+            "init" -> {
+                // No special native init is required; bluetooth runtime permissions are
+                // requested by the host app. Just confirm the native side is ready.
+                result.success(true)
+            }
+
+            "startOta" -> {
+                try {
+                    val address = call.argument<String>("address")
+                    val name = call.argument<String>("name")
+                    val filePath = call.argument<String>("filePath")
+                    val protocol = call.argument<String>("protocol") ?: "SPP"
+                    val userFlag = call.argument<Int>("userFlag") ?: 1
+                    val upgradeType = call.argument<Int>("upgradeType") ?: 1
+                    val user = call.argument<Int>("user") ?: 1
+
+                    if (address.isNullOrEmpty() || filePath.isNullOrEmpty()) {
+                        result.error(
+                            "invalid_argument",
+                            "address and filePath are required",
+                            null
+                        )
+                        return
+                    }
+
+                    val started = startOta(
+                        address = address,
+                        name = name ?: "",
+                        filePath = filePath,
+                        protocol = protocol,
+                        userFlag = userFlag,
+                        upgradeType = upgradeType,
+                        user = user
+                    )
+                    result.success(started)
+                } catch (t: Throwable) {
+                    result.error("start_ota_failed", t.message, null)
+                }
+            }
+
+            "stopOta" -> {
+                stopOtaInternal()
+                result.success(null)
+            }
+
+            else -> result.notImplemented()
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------
+    // OTA control
+    // ---------------------------------------------------------------------------------------
+
+    private fun startOta(
+        address: String,
+        name: String,
+        filePath: String,
+        protocol: String,
+        userFlag: Int,
+        upgradeType: Int,
+        user: Int
+    ): Boolean {
+        val context = applicationContext ?: return false
+
+        // A previous session must be torn down first.
+        stopOtaInternal()
+
+        currentFilePath = filePath
+        transferStarted = false
+        sessionEnded = false
+
+        val deviceProtocol = mapProtocol(protocol)
+
+        // Build the target device. SPP/GATT_BR_EDR connect via the classic MAC; BLE via the
+        // BLE address. The plugin always uses the address it was given (own connection).
+        val device = HmDevice()
+        device.setDeviceName(name)
+        if (deviceProtocol == DeviceProtocol.PROTOCOL_BLE) {
+            device.setBleAddress(address)
+        } else {
+            device.setDeviceMAC(address)
+        }
+
+        // SPP OTA 2.0 service config.
+        val config = BesServiceConfig()
+        config.setDeviceProtocol(deviceProtocol)
+        config.setDevice(device)
+        config.setUSER_FLAG(userFlag)          // 1 = OTA 2.0
+        config.setCurUser(user)                // 1 = firmware
+        config.setCurUpgateType(upgradeType)   // 1 = normal
+        // 对齐官方 demo 默认值（OtaUIActivity: ackType 默认 false -> setIsWithoutResponse(true)）。
+        // withoutResponse=true 走 32KB 固定长度校验分支；false 会进入 1% 校验分支，
+        // 该分支的末包边界计算有官方源码 bug（曾在 99% 处 arraycopy 越界闪退）。
+        config.setIsWithoutResponse(true)
+        config.setTotaConnect(false)
+
+        // Constructing the service auto-starts connect + handshake (see BesOtaService ctor).
+        val service = BesOtaService(config, serviceListener, context)
+        otaService = service
+        otaTask = service
+
+        // Pre-set the OTA file so the SDK's breakpoint-check path has a valid local path
+        // (BesOtaService references mRemoteOTAConfig.getLocalPath() during configure).
+        val remoteConfig = RemoteOTAConfig()
+        remoteConfig.setLocalPath(filePath)
+        service.setOtaConfig(remoteConfig)
+
+        return true
+    }
+
+    /**
+     * Kick off (or resume) the firmware data transfer once the handshake is ready.
+     * Mirrors OtaUIPresenter.startOta: setOtaConfig (already done) + startDataTransfer.
+     * Breakpoint 0 = fresh transfer from the beginning.
+     */
+    private fun beginDataTransfer() {
+        val task = otaTask ?: return
+        val path = currentFilePath ?: return
+        // Ensure config is set (idempotent).
+        val remoteConfig = RemoteOTAConfig()
+        remoteConfig.setLocalPath(path)
+        task.setOtaConfig(remoteConfig)
+
+        val dfuInfo = OTADfuInfo("001", 0)
+        task.startDataTransfer(dfuInfo, statusListener)
+    }
+
+    private fun stopOtaInternal() {
+        // 先终结会话：stopDataTransfer 会同步触发 STATUS_CANCELED 回调，不能再转发给 Dart。
+        sessionEnded = true
+        val task = otaTask
+        if (task != null) {
+            try {
+                task.stopDataTransfer()
+            } catch (_: Throwable) {
+                // best-effort cleanup
+            }
+        }
+        otaTask = null
+        otaService = null
+        transferStarted = false
+        currentFilePath = null
+    }
+
+    private fun mapProtocol(protocol: String): DeviceProtocol {
+        return when (protocol.uppercase()) {
+            "BLE" -> DeviceProtocol.PROTOCOL_BLE
+            "GATT" -> DeviceProtocol.PROTOCOL_GATT_BR_EDR
+            else -> DeviceProtocol.PROTOCOL_SPP // default: SPP OTA 2.0
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------
+    // SDK callbacks -> EventChannel (always emitted on the main thread)
+    // ---------------------------------------------------------------------------------------
+
+    /** Connection / handshake status + terminal success/error from the service. */
+    private val serviceListener = object : BesServiceListener {
+        override fun onTotaConnectState(state: Boolean) {
+            // TOTA is disabled for SPP OTA 2.0; nothing to forward.
+        }
+
+        override fun onStateChangedMessage(msg: Int, msgStr: String?) {
+            if (sessionEnded) return
+            // 连接/notify 失败是经状态回调下发的（SDK 在连接重试用尽后
+            // callBackStateChangedMessage(BES_CONNECT_ERROR)，而非 onErrorMessage），
+            // 必须映射成 onError，否则 UI 会永久停在“正在连接”。
+            if (msg == BesSdkConstants.BES_CONNECT_ERROR ||
+                msg == BesSdkConstants.BES_NOTIFY_ERROR) {
+                emitError(msg, if (msgStr.isNullOrEmpty()) "connect failed" else msgStr)
+                return
+            }
+            emitStatus(msg, msgStr)
+
+            // Drive the transfer at the demo's "configure-ready" gate. OTA_CMD_GET_HW_INFO is
+            // where the demo stops auto-progressing and waits for the user to start; here we
+            // start automatically since the file path is already known.
+            when (msg) {
+                BesOTAConstants.OTA_CMD_GET_HW_INFO -> {
+                    if (!transferStarted) {
+                        transferStarted = true
+                        beginDataTransfer()
+                    }
+                }
+                // No-breakpoint-resume path: the demo shows a config dialog whose "OK" re-enters
+                // startDataTransfer (which then sends the start packet). Do the same headlessly.
+                BesOTAConstants.OTA_CMD_BREAKPOINT_CHECK_80 -> {
+                    beginDataTransfer()
+                }
+            }
+        }
+
+        override fun onErrorMessage(msg: Int) {
+            if (sessionEnded) return
+            emitError(msg, null)
+        }
+
+        override fun onSuccessMessage(msg: Int) {
+            if (sessionEnded) return
+            emitSuccess(msg)
+        }
+    }
+
+    /** Firmware transfer progress + OTA status terminal events. */
+    private val statusListener = object : OTATask.StatusListener {
+        override fun onOTAStatusChanged(newStatus: OTAStatus?) {
+            if (sessionEnded || newStatus == null) return
+            emitStatus(newStatus.getValue(), newStatus.getName())
+            when (newStatus) {
+                OTAStatus.STATUS_SUCCEED -> emitSuccess(newStatus.getValue())
+                OTAStatus.STATUS_FAILED -> emitError(newStatus.getValue(), newStatus.getName())
+                OTAStatus.STATUS_CANCELED -> emitError(newStatus.getValue(), newStatus.getName())
+                else -> { /* STARTED / REBOOT / UNKNOWN: status only */ }
+            }
+        }
+
+        override fun onOTAProgressChanged(progress: Int) {
+            if (sessionEnded) return
+            emitProgress(progress)
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------
+    // Event emission helpers
+    // ---------------------------------------------------------------------------------------
+
+    private fun emit(map: Map<String, Any?>) {
+        mainHandler.post {
+            eventSink?.success(map)
+        }
+    }
+
+    private fun emitStatus(status: Int, message: String?) {
+        emit(mapOf("event" to "onStatus", "status" to status, "message" to message))
+    }
+
+    private fun emitProgress(progress0to100: Int) {
+        val clamped = progress0to100.coerceIn(0, 100)
+        emit(mapOf("event" to "onProgress", "progress" to clamped / 100.0, "status" to null))
+    }
+
+    private fun emitSuccess(status: Int?) {
+        sessionEnded = true
+        emit(mapOf("event" to "onSuccess", "status" to status))
+    }
+
+    private fun emitError(code: Int, message: String?) {
+        sessionEnded = true
+        emit(mapOf("event" to "onError", "code" to code, "message" to message))
+    }
+
+    // ---------------------------------------------------------------------------------------
+    // ActivityAware (OTA itself runs against the application context; activity is not required,
+    // but we implement the interface to mirror the working bluetooth_manager plugin).
+    // ---------------------------------------------------------------------------------------
+
+    override fun onAttachedToActivity(binding: ActivityPluginBinding) {}
+
+    override fun onDetachedFromActivityForConfigChanges() {}
+
+    override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {}
+
+    override fun onDetachedFromActivity() {}
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/BesOtaManagerPlugin.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/BesOtaManagerPlugin.h
new file mode 100644
index 00000000..b5208da9
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/BesOtaManagerPlugin.h
@@ -0,0 +1,21 @@
+//
+//  BesOtaManagerPlugin.h
+//  bes_ota_manager
+//
+//  Objective-C Flutter bridge for the BES (Bestechnic) OTA SDK.
+//
+
+#import <Flutter/Flutter.h>
+#import <CoreBluetooth/CoreBluetooth.h>
+
+#import "BesTotaDemoService.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BesOtaManagerPlugin : NSObject <FlutterPlugin,
+                                           FlutterStreamHandler,
+                                           BesOTAServiceDelegate,
+                                           CBCentralManagerDelegate>
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/BesOtaManagerPlugin.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/BesOtaManagerPlugin.m
new file mode 100644
index 00000000..b6a79df0
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/BesOtaManagerPlugin.m
@@ -0,0 +1,412 @@
+//
+//  BesOtaManagerPlugin.m
+//  bes_ota_manager
+//
+//  Objective-C Flutter bridge for the BES (Bestechnic) OTA SDK.
+//
+//  Channel contract:
+//    MethodChannel: 'bes_ota_manager'
+//    EventChannel : 'bes_ota_manager/events'
+//
+//  Product target: SPP OTA 2.0 == GATT over BR/EDR on iOS.
+//    USER_FLAG = 1, curUser = 1 (firmware), curUpgateType = 1 (normal),
+//    protocol = BES_PROTOCOL_GATT, totaConnect = NO.
+//
+//  The plugin owns its OWN CoreBluetooth connection: on startOta it resolves a
+//  CBPeripheral (by stored UUID identifier, or by scanning + matching name),
+//  hands it to BesOtaService via BesServiceConfig.device, then drives the
+//  SDK's connect -> handshake -> startDataTransfer sequence (mirrors the demo's
+//  OTAViewController).
+//
+
+#import "BesOtaManagerPlugin.h"
+
+#import "BesSdkConstants.h"
+#import "BesServiceConfig.h"
+#import "BesUUID.h"
+#import "BesTotaDemoConstants.h"
+
+static NSTimeInterval const kBesOtaScanTimeout = 20.0; // seconds
+
+@interface BesOtaManagerPlugin ()
+
+@property (nonatomic, strong, nullable) FlutterEventSink eventSink;
+@property (nonatomic, strong, nullable) BesOtaService *otaService;
+@property (nonatomic, strong, nullable) BesServiceConfig *serviceConfig;
+
+// Bridge-owned scan for resolving the target CBPeripheral.
+@property (nonatomic, strong, nullable) CBCentralManager *scanCentral;
+@property (nonatomic, copy, nullable) NSString *targetName;
+@property (nonatomic, copy, nullable) NSString *targetAddress;
+@property (nonatomic, strong, nullable) CBPeripheral *resolvedPeripheral;
+@property (nonatomic, assign) BOOL scanning;
+
+// 会话终结标志：发出 onSuccess/onError 或调用 stopOta 后置 YES。
+// 成功后 stopOta 的清理（stopDataTransfer/disconnect）与设备重启断链会再触发
+// onFailed/onOtaStatusChanged 等回调，必须抑制，否则会把"升级成功"覆盖成"升级失败"。
+@property (nonatomic, assign) BOOL sessionEnded;
+
+@end
+
+@implementation BesOtaManagerPlugin
+
+#pragma mark - FlutterPlugin
+
++ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
+    FlutterMethodChannel *methodChannel =
+        [FlutterMethodChannel methodChannelWithName:@"bes_ota_manager"
+                                    binaryMessenger:[registrar messenger]];
+    FlutterEventChannel *eventChannel =
+        [FlutterEventChannel eventChannelWithName:@"bes_ota_manager/events"
+                                  binaryMessenger:[registrar messenger]];
+
+    BesOtaManagerPlugin *instance = [[BesOtaManagerPlugin alloc] init];
+    [registrar addMethodCallDelegate:instance channel:methodChannel];
+    [eventChannel setStreamHandler:instance];
+}
+
+#pragma mark - FlutterStreamHandler
+
+- (FlutterError *)onListenWithArguments:(id)arguments eventSink:(FlutterEventSink)events {
+    self.eventSink = events;
+    return nil;
+}
+
+- (FlutterError *)onCancelWithArguments:(id)arguments {
+    self.eventSink = nil;
+    return nil;
+}
+
+#pragma mark - Method dispatch
+
+- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
+    if ([call.method isEqualToString:@"init"]) {
+        // Nothing to bootstrap up-front; CoreBluetooth is created lazily on startOta.
+        result(@YES);
+        return;
+    }
+
+    if ([call.method isEqualToString:@"startOta"]) {
+        NSDictionary *args = call.arguments;
+        if (![args isKindOfClass:[NSDictionary class]]) {
+            result(@NO);
+            return;
+        }
+        BOOL started = [self startOtaWithArgs:args];
+        result(@(started));
+        return;
+    }
+
+    if ([call.method isEqualToString:@"stopOta"]) {
+        [self stopOta];
+        result(nil);
+        return;
+    }
+
+    result(FlutterMethodNotImplemented);
+}
+
+#pragma mark - startOta
+
+- (BOOL)startOtaWithArgs:(NSDictionary *)args {
+    NSString *address  = [self stringForKey:@"address"  in:args];
+    NSString *name     = [self stringForKey:@"name"     in:args];
+    NSString *filePath = [self stringForKey:@"filePath" in:args];
+    NSString *protocol = [self stringForKey:@"protocol" in:args] ?: @"SPP";
+
+    int userFlag    = [self intForKey:@"userFlag"    in:args defaultValue:1];
+    int upgradeType = [self intForKey:@"upgradeType" in:args defaultValue:1];
+    int user        = [self intForKey:@"user"        in:args defaultValue:1];
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+    if (filePath.length == 0 || ![fm fileExistsAtPath:filePath]) {
+        [self emitError:OTA_START_OTA_ERROR message:@"firmware file not found"];
+        return NO;
+    }
+
+    // Tear down any previous session before starting a new one.
+    [self releaseOta];
+    self.sessionEnded = NO;
+
+    // Build the OTA config. SPP OTA 2.0 maps to GATT over BR/EDR on iOS.
+    BesServiceConfig *config = [[BesServiceConfig alloc] init];
+    config.serviceUUID         = [BesUUID getBesOTAServicesUUID];
+    config.characteristicsUUID = [BesUUID getBesOTACharacteristicsUUID];
+    // 'SPP' (product default) and 'GATT' both use GATT over BR/EDR on iOS.
+    // 'BLE' uses the LE transport.
+    config.protocol            = [protocol isEqualToString:@"BLE"] ? BES_PROTOCOL_BLE : BES_PROTOCOL_GATT;
+    config.USER_FLAG           = userFlag;        // 1 -> OTA 2.0
+    config.curUser             = user;            // 1 -> firmware
+    config.curUpgateType       = upgradeType;     // 1 -> normal
+    // OTA 2.0 transfers without response (matches demo: USER_FLAG==1 default).
+    config.isWithoutResponse   = (userFlag == 1);
+    config.totaConnect         = NO;
+    config.useTotaV2           = NO;
+    config.getBreakpoint       = 1;               // demo default (non-resume)
+    config.localPath           = filePath;
+    self.serviceConfig = config;
+
+    self.targetName    = name.length > 0 ? name : nil;
+    self.targetAddress = address.length > 0 ? address : nil;
+
+    [self emitStatus:BES_CONNECT_SUCCESS message:@"resolving device"];
+
+    // Resolve the CBPeripheral with the bridge-owned central manager, then
+    // hand it to BesOtaService.
+    [self beginPeripheralResolution];
+    return YES;
+}
+
+#pragma mark - Peripheral resolution (bridge-owned CoreBluetooth)
+
+- (void)beginPeripheralResolution {
+    self.resolvedPeripheral = nil;
+    self.scanning = NO;
+    // Create on the main queue so delegate callbacks come back on main.
+    self.scanCentral = [[CBCentralManager alloc] initWithDelegate:self queue:dispatch_get_main_queue()];
+    // centralManagerDidUpdateState: will kick off resolution when powered on.
+
+    // Safety timeout: if we never resolve/connect, surface an error.
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(kBesOtaScanTimeout * NSEC_PER_SEC)),
+                   dispatch_get_main_queue(), ^{
+        if (self.scanCentral && self.resolvedPeripheral == nil) {
+            [self.scanCentral stopScan];
+            self.scanning = NO;
+            [self emitError:MSG_TIME_OUT message:@"device scan timeout"];
+        }
+    });
+}
+
+- (void)tryResolvePeripheral {
+    if (self.scanCentral.state != CBManagerStatePoweredOn) {
+        return;
+    }
+
+    // 1) If the address parses as a CoreBluetooth UUID, retrieve directly.
+    if (self.targetAddress.length > 0) {
+        NSUUID *uuid = [[NSUUID alloc] initWithUUIDString:self.targetAddress];
+        if (uuid) {
+            NSArray<CBPeripheral *> *known =
+                [self.scanCentral retrievePeripheralsWithIdentifiers:@[uuid]];
+            if (known.count > 0) {
+                [self handleResolvedPeripheral:known.firstObject];
+                return;
+            }
+        }
+    }
+
+    // 2) Otherwise scan and match by advertised / peripheral name.
+    self.scanning = YES;
+    [self.scanCentral scanForPeripheralsWithServices:nil
+                                             options:@{ CBCentralManagerScanOptionAllowDuplicatesKey : @NO }];
+}
+
+- (void)handleResolvedPeripheral:(CBPeripheral *)peripheral {
+    if (self.resolvedPeripheral != nil) {
+        return; // already resolved
+    }
+    self.resolvedPeripheral = peripheral;
+    if (self.scanning) {
+        [self.scanCentral stopScan];
+        self.scanning = NO;
+    }
+
+    self.serviceConfig.device = peripheral;
+    [self emitStatus:BES_CONNECT_SUCCESS message:@"device resolved, connecting"];
+
+    // Build the OTA service and start the SDK connect sequence.
+    self.otaService = [[BesOtaService alloc] initWithConfig:self.serviceConfig];
+    self.otaService.delegate = self;
+    [self.otaService connectDecviceWithConfig:self.serviceConfig];
+}
+
+#pragma mark - CBCentralManagerDelegate
+
+- (void)centralManagerDidUpdateState:(CBCentralManager *)central {
+    if (central.state == CBManagerStatePoweredOn) {
+        [self tryResolvePeripheral];
+    } else if (central.state == CBManagerStateUnauthorized ||
+               central.state == CBManagerStateUnsupported) {
+        [self emitError:MSG_PARAMETER_ERROR message:@"bluetooth unavailable / unauthorized"];
+    }
+    // PoweredOff / Resetting: wait; the safety timeout will fire if it never recovers.
+}
+
+- (void)centralManager:(CBCentralManager *)central
+ didDiscoverPeripheral:(CBPeripheral *)peripheral
+     advertisementData:(NSDictionary<NSString *, id> *)advertisementData
+                  RSSI:(NSNumber *)RSSI {
+    if (self.resolvedPeripheral != nil || self.targetName.length == 0) {
+        return;
+    }
+    NSString *advName = advertisementData[CBAdvertisementDataLocalNameKey];
+    NSString *periName = peripheral.name;
+    if ([self name:advName matches:self.targetName] ||
+        [self name:periName matches:self.targetName]) {
+        [self handleResolvedPeripheral:peripheral];
+    }
+}
+
+- (BOOL)name:(NSString *)candidate matches:(NSString *)target {
+    if (candidate.length == 0 || target.length == 0) {
+        return NO;
+    }
+    return [candidate caseInsensitiveCompare:target] == NSOrderedSame;
+}
+
+#pragma mark - BesOTAServiceDelegate
+
+// Connection / GATT handshake state. When notify is established the device is
+// ready, so we push the firmware path and start the transfer (mirrors demo).
+- (void)onStatusChanged:(BesConnectStateCorrect)state msg:(NSString *)msg {
+    if (self.sessionEnded) return;
+    [self emitStatus:(int)state message:msg];
+    if (state == BES_CONNECT_NOTIFY_SUCCESS) {
+        [self.otaService setOtaConfig:self.serviceConfig]; // sets localPath
+        [self.otaService startDataTransfer];
+    }
+}
+
+- (void)onFailed:(BesConnectStateError)state msg:(NSString *)msg {
+    if (self.sessionEnded) return;
+    [self emitError:(int)state message:(msg.length > 0 ? msg : @"connection failed")];
+}
+
+- (void)onDataReceived:(NSData *)data {
+    // Raw notify payloads are consumed by the SDK; not forwarded to Dart.
+}
+
+// OTA protocol step status (version / user / breakpoint / configure / crc ...).
+- (void)onOtaStatusChanged:(int)state msg:(NSString *)msg {
+    if (self.sessionEnded) return;
+    [self emitStatus:state message:msg];
+    // 断点检查返回"全新传输"（0x8D 断点为 0）后 SDK 会停下等 UI 确认——demo 在此弹
+    // 设置框，用户点确认后再次调 startDataTransfer 才发 0x80 开始包（见
+    // BesTotaDemoService.m 中被注释掉的 sendData 与 startDataTransfer 的
+    // curOtaResult == OTA_CMD_BREAKPOINT_CHECK_80 分支）。无头桥接直接自动继续，
+    // 与 Android 桥接的 BREAKPOINT_CHECK_80 -> beginDataTransfer 行为对齐。
+    if (state == OTA_CMD_BREAKPOINT_CHECK_80) {
+        [self.otaService startDataTransfer];
+    }
+}
+
+// progress is a percent string like "45.50" (0-100). Dart wants 0.0-1.0.
+- (void)onOTAProgressChanged:(NSString *)progress {
+    if (self.sessionEnded) return;
+    double pct = progress.doubleValue;     // 0..100
+    double normalized = pct / 100.0;        // 0..1
+    if (normalized < 0.0) normalized = 0.0;
+    if (normalized > 1.0) normalized = 1.0;
+    [self emitOnMain:@{ @"event"    : @"onProgress",
+                        @"progress" : @(normalized) }];
+}
+
+- (void)onOtaError:(int)state {
+    if (self.sessionEnded) return;
+    [self emitError:state message:nil];
+}
+
+- (void)onOtaSuccess:(int)state {
+    if (self.sessionEnded) return;
+    self.sessionEnded = YES;
+    [self emitOnMain:@{ @"event"  : @"onSuccess",
+                        @"status" : @(state) }];
+}
+
+#pragma mark - stopOta / teardown
+
+- (void)stopOta {
+    // 先终结会话：stopDataTransfer/disconnect 会同步触发回调，不能再转发给 Dart。
+    self.sessionEnded = YES;
+    if (self.otaService) {
+        // 顺序很关键：必须先 disconnect 再 stopDataTransfer。
+        // BesTotaDemoService.stopDataTransfer 会把内部 self.service 置 nil，
+        // 之后再 disconnect: 就成了向 nil 发消息的空操作，cancelPeripheralConnection
+        // 永不执行、OTA 连接被遗留。故先断开外设连接，再停传输。
+        if (self.serviceConfig.device) {
+            [self.otaService disconnect:self.serviceConfig.device];
+        }
+        [self.otaService stopDataTransfer];
+    }
+    [self releaseOta];
+}
+
+- (void)releaseOta {
+    if (self.scanning && self.scanCentral) {
+        [self.scanCentral stopScan];
+    }
+    self.scanning = NO;
+    self.scanCentral = nil;
+    self.resolvedPeripheral = nil;
+    self.otaService = nil;
+    self.serviceConfig = nil;
+    self.targetName = nil;
+    self.targetAddress = nil;
+}
+
+#pragma mark - Event helpers (always dispatch on the main/UI thread)
+
+- (void)emitStatus:(int)status message:(NSString *)message {
+    NSMutableDictionary *m = [@{ @"event"  : @"onStatus",
+                                 @"status" : @(status) } mutableCopy];
+    if (message.length > 0) {
+        m[@"message"] = message;
+    }
+    [self emitOnMain:m];
+}
+
+- (void)emitError:(int)code message:(NSString *)message {
+    self.sessionEnded = YES;
+    // 终态：立即停止 bridge 自管扫描，避免出错后扫描态滞留持续耗电
+    //（scanCentral 的彻底释放仍由 stopOta/onClose 的 releaseOta 负责，
+    // 此处不 nil 掉它，避免在其 delegate 回调内被释放）。
+    if (self.scanning && self.scanCentral) {
+        [self.scanCentral stopScan];
+        self.scanning = NO;
+    }
+    NSMutableDictionary *m = [@{ @"event" : @"onError",
+                                 @"code"  : @(code) } mutableCopy];
+    if (message.length > 0) {
+        m[@"message"] = message;
+    }
+    [self emitOnMain:m];
+}
+
+- (void)emitOnMain:(NSDictionary *)event {
+    if (self.eventSink == nil) {
+        return;
+    }
+    if ([NSThread isMainThread]) {
+        if (self.eventSink) {
+            self.eventSink(event);
+        }
+    } else {
+        __weak typeof(self) weakSelf = self;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if (strongSelf.eventSink) {
+                strongSelf.eventSink(event);
+            }
+        });
+    }
+}
+
+#pragma mark - Arg parsing helpers
+
+- (nullable NSString *)stringForKey:(NSString *)key in:(NSDictionary *)args {
+    id v = args[key];
+    if ([v isKindOfClass:[NSString class]]) {
+        return (NSString *)v;
+    }
+    return nil;
+}
+
+- (int)intForKey:(NSString *)key in:(NSDictionary *)args defaultValue:(int)def {
+    id v = args[key];
+    if ([v isKindOfClass:[NSNumber class]]) {
+        return ((NSNumber *)v).intValue;
+    }
+    return def;
+}
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/BesSdkConstants.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/BesSdkConstants.h
new file mode 100644
index 00000000..978d87d6
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/BesSdkConstants.h
@@ -0,0 +1,61 @@
+//
+//  BesSdkConstants.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/28.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+typedef enum : NSUInteger {
+    BES_PROTOCOL_BLE,
+    BES_PROTOCOL_GATT,
+} BesDeviceProtocol;
+
+typedef enum : NSUInteger {
+    BES_CONNECT_SUCCESS,
+    BES_CONNECT_DISCOVERSERVICE_SUCCESS,
+    BES_CONNECT_NOTIFY_SUCCESS,
+
+} BesConnectStateCorrect;
+
+typedef enum : NSUInteger {
+    BES_DISCONNECT,
+    BES_CONNECT_FAIL,
+    BES_CONNECT_DISCOVERSERVICE_FAIL,
+    BES_CONNECT_NOTIFY_FAIL,
+    BES_SENDDATA_ERROR
+
+} BesConnectStateError;
+
+//handle_msg
+   static int                     MSG_TIME_OUT = 0x00000404;
+   static int              MSG_PARAMETER_ERROR = 0x00000405;
+
+   static int DEFAULT_MTU = 509;
+
+   static NSString           *BES_SAVE_LOG_KEY = @"BES_SAVE_LOG";//YES:NO
+   static NSString     *BES_SAVE_DEFAULT_VALUE = @"YES";
+   static NSString     *BES_SAVE_LOG_TITLE_KEY = @"BES_SAVE_LOG_TITLE";
+   static BOOL            BES_SHOW_CONSOLE_LOG = false; // 联调完毕，关闭 SDK 控制台日志
+
+//TOTA
+   static int                   BES_TOTA_START = 0x00000300;
+   static int                 BES_TOTA_CONFIRM = 0x00000301;
+   static int                 BES_TOTA_SUCCESS = 0x00000302;
+   static int                   BES_TOTA_ERROR = 0x00000303;
+   static NSString    *BES_TOTA_ENCRYPTION_KEY = @"BES_TOTA_ENCRYPTION_KEY";
+   static NSString        *BES_TOTA_USE_TOTAV2 = @"BES_TOTA_USE_TOTAV2";
+   static NSString  *BES_TOTA_ENCRYPTION_VALUE = @"YES";
+   static NSString  *BES_TOTA_USE_TOTAV2_VALUE = @"YES";
+
+@interface BesSdkConstants : NSObject
+
+
+
+
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/connect/BesBTConnector.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/connect/BesBTConnector.h
new file mode 100644
index 00000000..f9771702
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/connect/BesBTConnector.h
@@ -0,0 +1,42 @@
+//
+//  BesBTConnector.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/22.
+//
+
+#import <Foundation/Foundation.h>
+#import "BesUUID.h"
+#import "BesSdkConstants.h"
+#import "BesServiceConfig.h"
+
+@protocol BesCentralManagerDelegate <NSObject>
+
+@optional
+- (void)onStatusChanged:(BesConnectStateCorrect)state msg:(NSString *)msg;
+- (void)onFailed:(BesConnectStateError)state msg:(NSString *)msg;
+- (void)onDataReceived:(NSData *)data;
+- (void)onWriteSuccessOrError:(NSError *)error;
+
+//scan
+- (void)onScanResult:(CBPeripheral *)device advertisementData:(NSDictionary<NSString *,id> *)advertisementData RSSI:(NSNumber *)RSSI;
+- (void)onScanFailed:(NSString *)error;
+
+@end
+
+@interface BesBTConnector : NSObject
+
+@property (nonatomic, weak) id<BesCentralManagerDelegate> centralManagerDelegate;
+
+- (instancetype)initWithDelegate:(id<BesCentralManagerDelegate>)delegate;
+- (void)addCenterManagerDelegate:(id<BesCentralManagerDelegate>)delegate;
+- (void)destroy;
+- (void)startScanWithServices:(NSArray<CBUUID *>*)services options:(NSDictionary<NSString *,id> *)options isGatt:(BOOL)isGatt;
+- (void)stopScan;
+- (void)connectDecvice:(CBPeripheral *)device config:(BesServiceConfig *)config;
+- (void)disconnect:(CBPeripheral *)device;
+- (void)sendData:(NSData *)data;
+- (void)sendDataWithOutResponse:(NSData *)data;
+
+@end
+
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/connect/BesBTConnector.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/connect/BesBTConnector.m
new file mode 100644
index 00000000..d41ac158
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/connect/BesBTConnector.m
@@ -0,0 +1,341 @@
+//
+//  BesBTCenterManager.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/22.
+//
+
+
+#import "BesBTConnector.h"
+#import "NSString+XCYCoreOperation.h"
+#import "ArrayUtil.h"
+#import "FileUtils.h"
+
+typedef enum : NSUInteger {
+    BES_WORKTYPE_UNKNOW,
+    BES_WORKTYPE_SCAN_DEVICE,
+    BES_WORKTYPE_CONNECT_DEVICE,
+} CentralManagerWorkType;
+
+@interface BesBTConnector()<CBCentralManagerDelegate,CBPeripheralDelegate>
+{
+    NSDictionary *gattOptions;
+    BOOL connectTimeout;
+}
+@property (nonatomic, strong) CBCentralManager *centralManager;
+@property (nonatomic, assign) CBManagerState centralManagerState;
+@property (nonatomic, strong) CBPeripheral *mDevice;
+@property (nonatomic, strong) CBCharacteristic *characteristic;
+@property (nonatomic, strong) NSMutableSet<CBPeripheral *> *connectedPeripherals;
+@property (nonatomic, strong) NSMutableSet<CBPeripheral *> *discoverPeripherals;
+@property (nonatomic, strong) BesServiceConfig *serviceConfig;
+@property (nonatomic, assign) BesDeviceProtocol protocol;
+@property (nonatomic, assign) CentralManagerWorkType workType;
+
+
+@end
+
+@implementation BesBTConnector
+
+- (instancetype)initWithDelegate:(id<BesCentralManagerDelegate>)delegate {
+    if (self = [super init]) {
+        _centralManagerState = CBManagerStateUnknown;
+        self.workType = BES_WORKTYPE_UNKNOW;
+        if (!self.centralManager) {
+            [self initCentralManager];
+        }
+        if (delegate) {
+            self.centralManagerDelegate = delegate;
+        }
+    }
+    return self;
+}
+
+- (void)addCenterManagerDelegate:(id<BesCentralManagerDelegate>)delegate {
+    self.centralManagerDelegate = delegate;
+}
+
+- (void)destroy {
+    [self.centralManager stopScan];
+    for (CBPeripheral *peropheral in _connectedPeripherals) {
+        [self.centralManager cancelPeripheralConnection:peropheral];
+    }
+    self.centralManager = nil;
+}
+
+#pragma mark---connect
+- (void)connectDecvice:(CBPeripheral *)device config:(BesServiceConfig *)config {
+    if (self.centralManager == nil || device == nil) {
+        [self LOG:[NSString stringWithFormat:@"connectDecvice------%@---%@", self.centralManager, device]];
+        [self statusChangedErrorDelegate:BES_CONNECT_FAIL msg:@"设备或控制器为空"];
+        return;
+    }
+    // CBPeripheral 与创建它的 CBCentralManager 绑定：插件桥接用自己的 central 解析出的
+    // 外设不能直接拿来 connectPeripheral（命令被 iOS 丢弃，只会反复 Connect Device Timeout）。
+    // 用本 central 按 identifier 重取；同 central 的外设重取仍是原对象，原 demo 路径不受影响。
+    if (self.centralManager.state == CBManagerStatePoweredOn && device.identifier != nil) {
+        NSArray<CBPeripheral *> *owned =
+            [self.centralManager retrievePeripheralsWithIdentifiers:@[device.identifier]];
+        if (owned.count > 0) {
+            device = owned.firstObject;
+            config.device = device;
+        }
+    }
+    connectTimeout = true;
+    [self performSelector:@selector(connectDeviceTimeout) withObject:nil afterDelay:15];
+    [self LOG:[NSString stringWithFormat:@"connectDecvice------------"]];
+    self.serviceConfig = config;
+    self.mDevice = device;
+    self.workType = BES_WORKTYPE_CONNECT_DEVICE;
+    [self.centralManager connectPeripheral:device options:nil];
+}
+
+- (void)connectDeviceTimeout {
+    if (connectTimeout) {
+        [self statusChangedErrorDelegate:BES_CONNECT_FAIL msg:@"Connect Device Timeout"];
+    }
+}
+
+- (void)disconnect:(CBPeripheral *)device {
+    if (self.centralManager && device) {
+        [self.centralManager cancelPeripheralConnection:device];
+    }
+}
+
+- (void)startScanWithServices:(NSArray<CBUUID *>*)services options:( NSDictionary<NSString *,id> *)options isGatt:(BOOL)isGatt {
+    self.workType = BES_WORKTYPE_SCAN_DEVICE;
+    if (isGatt) {
+        if (!gattOptions) {
+            gattOptions = options;
+        }
+        if (@available(iOS 13.0, *)) {
+            [self.centralManager registerForConnectionEventsWithOptions:gattOptions];
+        } else {
+            // Fallback on earlier versions
+        }
+    } else {
+        [self.centralManager scanForPeripheralsWithServices:services options:gattOptions];
+    }
+}
+
+- (void)stopScan {
+    [self.centralManager stopScan];
+}
+
+- (void)sendData:(NSData *)data {
+    [self LOG:[NSString stringWithFormat:@"sendData------%@", [ArrayUtil toHex:data]]];
+    [self LOG:[NSString stringWithFormat:@"sendData-------%lu", (unsigned long)data.length]];
+    [self.mDevice writeValue:data forCharacteristic:self.characteristic type:CBCharacteristicWriteWithResponse];
+}
+
+- (void)sendDataWithOutResponse:(NSData *)data {
+    [self LOG:[NSString stringWithFormat:@"sendDataWithOutResponse------%@", [ArrayUtil toHex:data]]];
+    [self LOG:[NSString stringWithFormat:@"sendDataWithOutResponse-------%lu", (unsigned long)data.length]];
+    [self.mDevice writeValue:data forCharacteristic:self.characteristic type:CBCharacteristicWriteWithoutResponse];
+}
+
+#pragma mark-------------CBCentralManagerDelegate
+- (void)centralManagerDidUpdateState:(nonnull CBCentralManager *)central {
+    CBManagerState state = (CBManagerState)central.state;
+    _centralManagerState = state;
+    switch (central.state) {
+        case CBManagerStateUnknown:
+            break;
+        case CBManagerStateResetting:
+            break;
+        case CBManagerStateUnsupported:
+            break;
+        case CBManagerStateUnauthorized:
+            break;
+        case CBManagerStatePoweredOff:
+            break;
+        case CBManagerStatePoweredOn:
+            if (self.workType == BES_WORKTYPE_SCAN_DEVICE) {
+                [self startScanWithServices:nil options:gattOptions isGatt:gattOptions ? YES : NO];
+            } else if (self.workType == BES_WORKTYPE_CONNECT_DEVICE) {
+                [self connectDecvice:self.mDevice config:self.serviceConfig];
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+- (void)centralManager:(CBCentralManager *)central didConnectPeripheral:(CBPeripheral *)peripheral {
+    [self LOG:[NSString stringWithFormat:@"didConnectPeripheral"]];
+    self.workType = BES_WORKTYPE_UNKNOW;
+    [self.centralManager stopScan];
+    [self statusChangedDelegate:BES_CONNECT_SUCCESS msg:@""];
+    peripheral.delegate = self;
+    self.mDevice = peripheral;
+    [self discoverServices:@[self.serviceConfig.serviceUUID]];
+}
+
+- (void)centralManager:(CBCentralManager *)central connectionEventDidOccur:(CBConnectionEvent)event forPeripheral:(CBPeripheral *)peripheral {
+    if ([self.centralManagerDelegate respondsToSelector:@selector(onScanResult:advertisementData:RSSI:)]) {
+        [self.centralManagerDelegate onScanResult:peripheral advertisementData:nil RSSI:nil];
+    }
+}
+#pragma mark---discoverServices
+- (void)discoverServices:(nullable NSArray<CBUUID *> *)serviceUUIDs {
+    [self.mDevice discoverServices:serviceUUIDs];
+}
+
+- (void)peripheral:(CBPeripheral *)peripheral didDiscoverServices:(NSError *)error {
+    connectTimeout = false;
+    CBService * __nullable findService = nil;
+    for (CBService *service in peripheral.services) {
+        if ([[service UUID] isEqual:self.serviceConfig.serviceUUID]) {
+            findService = service;
+        }
+    }
+    if (findService) {
+        [self LOG:[NSString stringWithFormat:@"findService-------%@", findService]];
+        [peripheral discoverCharacteristics:@[self.serviceConfig.characteristicsUUID] forService:findService];
+        [self statusChangedDelegate:BES_CONNECT_DISCOVERSERVICE_SUCCESS msg:@""];
+    } else {
+        [self statusChangedErrorDelegate:BES_CONNECT_DISCOVERSERVICE_FAIL msg:error.userInfo.description];
+    }
+}
+#pragma mark---DiscoverCharacteristics
+- (void)peripheral:(CBPeripheral *)peripheral didDiscoverCharacteristicsForService:(CBService *)service error:(NSError *)error {
+    [self LOG:[NSString stringWithFormat:@"didDiscoverCharacteristicsForService---------%@", service]];
+    for (CBCharacteristic *characteristic in service.characteristics) {
+        [self LOG:[NSString stringWithFormat:@"characteristic---------%@", characteristic.UUID]];
+        if ([characteristic.UUID isEqual:self.serviceConfig.characteristicsUUID]) {
+            self.characteristic = characteristic;
+            [peripheral setNotifyValue:YES forCharacteristic:characteristic];
+        }
+    }
+}
+#pragma mark---notify
+- (void)peripheral:(CBPeripheral *)peripheral didUpdateValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
+    if (error) {
+        [self statusChangedErrorDelegate:BES_SENDDATA_ERROR msg:error.userInfo.description];
+    } else {
+        if ([self.centralManagerDelegate respondsToSelector:@selector(onDataReceived:)]) {
+            [self.centralManagerDelegate onDataReceived:characteristic.value];
+        }
+    }
+}
+
+
+- (void)peripheral:(CBPeripheral *)peripheral didUpdateNotificationStateForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
+    [self LOG:[NSString stringWithFormat:@"didUpdateNotification------%@", error]];
+    if (characteristic.isNotifying) {
+        [self LOG:[NSString stringWithFormat:@"didUpdateNotification-----------%@", characteristic.UUID]];
+        [self statusChangedDelegate:BES_CONNECT_NOTIFY_SUCCESS msg:@""];
+    } else {
+        [self.centralManager cancelPeripheralConnection:peripheral];
+        if (error.userInfo.description && [error.userInfo.description containsString:@"Encryption is insufficient"]) {
+            [self.centralManager connectPeripheral:self.mDevice options:nil];
+            return;
+        }
+        [self statusChangedErrorDelegate:BES_CONNECT_NOTIFY_FAIL msg:error.userInfo.description];
+    }
+}
+
+- (void)peripheral:(CBPeripheral *)peripheral didWriteValueForCharacteristic:(CBCharacteristic *)characteristic error:(NSError *)error {
+//    [self LOG:[NSString stringWithFormat:@"didWriteValueForCharacteristic---"]];
+    if ([self.centralManagerDelegate respondsToSelector:@selector(onWriteSuccessOrError:)]) {
+        [self.centralManagerDelegate onWriteSuccessOrError:error];
+    }
+}
+
+- (void)centralManager:(CBCentralManager *)central didFailToConnectPeripheral:(CBPeripheral *)peripheral error:(NSError *)error {
+    connectTimeout = false;
+    [self LOG:[NSString stringWithFormat:@"---------didFailToConnectPeripheral"]];
+    [self statusChangedErrorDelegate:BES_CONNECT_FAIL msg:error.userInfo.description];
+}
+
+- (void)centralManager:(CBCentralManager *)central didDisconnectPeripheral:(CBPeripheral *)peripheral error:(NSError *)error {
+    [self LOG:[NSString stringWithFormat:@"---------didDisconnectPeripheral"]];
+    [self statusChangedErrorDelegate:BES_DISCONNECT msg:error.userInfo.description];
+}
+
+- (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeripheral *)peripheral advertisementData:(NSDictionary<NSString *,id> *)advertisementData RSSI:(NSNumber *)RSSI {
+    self.workType = BES_WORKTYPE_UNKNOW;
+    if ([self.centralManagerDelegate respondsToSelector:@selector(onScanResult:advertisementData:RSSI:)]) {
+        [self.centralManagerDelegate onScanResult:peripheral advertisementData:advertisementData RSSI:RSSI];
+    }
+}
+
+// 宿主 app 声明了 bluetooth-central 后台模式时，initCentralManager 会带
+// CBCentralManagerOptionRestoreIdentifierKey 初始化；现代 iOS 强制要求 delegate
+// 实现本方法，否则 init 直接断言崩溃（官方 demo 无后台模式走不到该分支，故未暴露）。
+// OTA 是前台会话，无需恢复任何状态，空实现即可。
+- (void)centralManager:(CBCentralManager *)central willRestoreState:(NSDictionary<NSString *, id> *)dict {
+}
+
+#pragma mark-------------method
+- (void)initCentralManager {
+#if  __IPHONE_OS_VERSION_MIN_REQUIRED > __IPHONE_6_0
+    NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:
+                             [NSNumber numberWithBool:YES],CBCentralManagerOptionShowPowerAlertKey,
+                             @"XCYBluetoothRestore",CBCentralManagerOptionRestoreIdentifierKey,
+                             nil];
+    
+#else
+    NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:
+                             
+                             [NSNumber numberWithBool:YES],CBCentralManagerOptionShowPowerAlertKey,
+                             nil];
+#endif
+    
+    NSArray *backgroundModes = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"UIBackgroundModes"];
+    if ([backgroundModes containsObject:@"bluetooth-central"]) {
+        // The background model
+        self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil options:options];
+    }
+    else {
+        // Non-background mode
+        self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil];
+    }
+}
+
+#pragma mark - getter/Setter
+
+- (NSMutableSet<CBPeripheral *> *)connectedPeripherals {
+    if (_connectedPeripherals) {
+        return _connectedPeripherals;
+    }
+    _connectedPeripherals = [[NSMutableSet alloc] initWithCapacity:1];
+    return _connectedPeripherals;
+}
+
+- (NSMutableSet<CBPeripheral *> *)discoverPeripherals {
+    if (_discoverPeripherals) {
+        return _discoverPeripherals;
+    }
+    
+    _discoverPeripherals = [[NSMutableSet alloc] initWithCapacity:1];
+    return _discoverPeripherals;
+}
+
+#pragma mark-----------simplify delegate
+- (void)statusChangedDelegate:(BesConnectStateCorrect)state msg:(NSString *)msg {
+    if ([self.centralManagerDelegate respondsToSelector:@selector(onStatusChanged:msg:)]) {
+        [self.centralManagerDelegate onStatusChanged:state msg:msg];
+    }
+}
+
+- (void)statusChangedErrorDelegate:(BesConnectStateError)state msg:(NSString *)msg {
+    if ([self.centralManagerDelegate respondsToSelector:@selector(onFailed:msg:)]) {
+        [self.centralManagerDelegate onFailed:state msg:msg];
+    }
+}
+
+- (void)LOG:(NSString *)text {
+    if (BES_SHOW_CONSOLE_LOG) {
+        NSLog(@"%@", text);
+    }
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    if (![defaults valueForKey:BES_SAVE_LOG_KEY]) {
+        [defaults setObject:BES_SAVE_DEFAULT_VALUE forKey:BES_SAVE_LOG_KEY];
+    }
+    if ([[defaults valueForKey:BES_SAVE_LOG_KEY] isEqual:@"YES"] && [defaults valueForKey:BES_SAVE_LOG_TITLE_KEY]) {
+        [FileUtils saveStringToDocumentWithName:[NSString stringWithFormat:@"%@.txt", [defaults valueForKey:BES_SAVE_LOG_TITLE_KEY]] text:text];
+    }
+}
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesBaseService.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesBaseService.h
new file mode 100644
index 00000000..f68ef571
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesBaseService.h
@@ -0,0 +1,52 @@
+//
+//  BesBaseService.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/29.
+//
+
+#import <Foundation/Foundation.h>
+#import "BesBTConnector.h"
+#import "BesServiceConfig.h"
+
+NS_ASSUME_NONNULL_BEGIN
+@protocol BesBseServiceDelegate <NSObject>
+
+@optional
+- (void)onStatusChanged:(BesConnectStateCorrect)state msg:(NSString *)msg;
+- (void)onFailed:(BesConnectStateError)state msg:(NSString *)msg;
+- (void)onDataReceived:(NSData *)data;
+- (void)onTotaConnectState:(BOOL)state;
+- (void)onWriteSuccessOrError:(NSError *)error;
+- (void)msgTimeOut;
+- (void)msgTimeOutWithWhat:(int)what;
+
+//scan
+- (void)onScanResult:(CBPeripheral *)device advertisementData:(NSDictionary<NSString *,id> *)advertisementData RSSI:(NSNumber *)RSSI;
+- (void)onScanFailed:(NSString *)error;
+
+@end
+
+@interface BesBaseService : NSObject<BesCentralManagerDelegate>
+
+@property (nonatomic, strong) BesBTConnector *btConnector;
+@property (nonatomic, weak) id<BesBseServiceDelegate> delegate;
+@property (nonatomic, strong) BesServiceConfig *serviceConfig;
+
++ (instancetype)shareInstance;
+- (void)startScanWithServices:(NSArray<CBUUID *>*)services options:(NSDictionary<NSString *,id> *)options isGatt:(BOOL)isGatt;
+- (void)stopScan;
+- (void)connectDecvice:(BesServiceConfig *)config;
+- (void)disconnect:(CBPeripheral *)device;
+
+- (void)sendData:(NSData *)data;
+- (void)sendDataWithOutResponse:(NSData *)data;
+- (void)sendData:(NSData *)data delay:(int)millis;
+
+- (void)addTimeOut:(int)millis;
+- (void)addTimeOut:(int)millis what:(int)what;
+- (void)removeTimeOutWithWhat:(int)what;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesBaseService.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesBaseService.m
new file mode 100644
index 00000000..904bda08
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesBaseService.m
@@ -0,0 +1,172 @@
+//
+//  BesBaseService.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/29.
+//
+
+#import "BesBaseService.h"
+#import "TOTAConnectCMD.h"
+
+@interface BesBaseService()
+
+@property (nonatomic, assign) BOOL mTotaConnect;
+@property (nonatomic, assign) BOOL useTotaV2;
+@property (nonatomic, assign) BOOL totauccess;
+@property (nonatomic, strong) TOTAConnectCMD *mTotaConnectCMD;
+
+@end
+
+@implementation BesBaseService
+- (instancetype)init {
+    if (self = [super init]) {
+        self.btConnector = [[BesBTConnector alloc] initWithDelegate:self];
+    }
+    
+    return self;
+}
+
++ (instancetype)shareInstance {
+    static BesBaseService *instance = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        instance = [[self alloc] init];
+    });
+    return instance;
+}
+
+- (void)startScanWithServices:(NSArray<CBUUID *>*)services options:(NSDictionary<NSString *,id> *)options isGatt:(BOOL)isGatt {
+    [self.btConnector startScanWithServices:services options:options isGatt:isGatt];
+}
+
+- (void)stopScan {
+    [self.btConnector stopScan];
+}
+
+- (void)connectDecvice:(BesServiceConfig *)config {
+    if (!config.device) {
+        return;
+    }
+    
+    self.mTotaConnect = config.totaConnect;
+    self.useTotaV2 = config.useTotaV2;
+    self.totauccess = NO;
+    if (self.mTotaConnect) {
+        self.mTotaConnectCMD = [[TOTAConnectCMD alloc] init];
+    } else {
+        self.mTotaConnectCMD = nil;
+    }
+    
+    [self.btConnector connectDecvice:config.device config:config];
+}
+
+- (void)disconnect:(CBPeripheral *)device {
+    [self.btConnector disconnect:device];
+}
+
+- (void)sendData:(NSData *)data {
+    [self addTimeOut:10000];
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    BOOL totaEncryption = ([defaults valueForKey:BES_TOTA_ENCRYPTION_KEY] && [[defaults valueForKey:BES_TOTA_ENCRYPTION_KEY] isEqual:@"YES"]) ? YES : NO;
+    [self.btConnector sendData:(self.totauccess && totaEncryption) ? (self.useTotaV2 ? [self.mTotaConnectCMD getTotaV2Packet:[self.mTotaConnectCMD totaEncryptData:data]] : [self.mTotaConnectCMD totaEncryptData:data]) : self.useTotaV2 ? [self.mTotaConnectCMD getTotaV2Packet:data] : data];
+}
+
+- (void)sendDataWithOutResponse:(NSData *)data {
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    BOOL totaEncryption = ([defaults valueForKey:BES_TOTA_ENCRYPTION_KEY] && [[defaults valueForKey:BES_TOTA_ENCRYPTION_KEY] isEqual:@"YES"]) ? YES : NO;
+    [self.btConnector sendDataWithOutResponse:(self.totauccess && totaEncryption) ? (self.useTotaV2 ? [self.mTotaConnectCMD getTotaV2Packet:[self.mTotaConnectCMD totaEncryptData:data]] : [self.mTotaConnectCMD totaEncryptData:data]) : self.useTotaV2 ? [self.mTotaConnectCMD getTotaV2Packet:data] : data];
+}
+
+- (void)sendData:(NSData *)data delay:(int)millis {
+    [self performSelector:@selector(sendData:) withObject:data afterDelay:millis / 1000];
+}
+
+- (void)addTimeOut:(int)millis {
+    [self performSelector:@selector(msgTimeOut) withObject:nil afterDelay:millis / 1000];
+}
+
+- (void)addTimeOut:(int)millis what:(int)what {
+    [self performSelector:@selector(msgTimeOutWithWhat:) withObject:[NSString stringWithFormat:@"%d", what] afterDelay:millis / 1000];
+}
+
+- (void)msgTimeOut {
+    if ([self.delegate respondsToSelector:@selector(msgTimeOut)]) {
+        [self.delegate msgTimeOut];
+    }
+}
+
+- (void)msgTimeOutWithWhat:(NSString *)what {
+    if ([self.delegate respondsToSelector:@selector(msgTimeOutWithWhat:)]) {
+        [self.delegate msgTimeOutWithWhat:[what intValue]];
+    }
+}
+
+- (void)removeTimeOut {
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(msgTimeOut) object:nil];
+}
+
+- (void)removeTimeOutWithWhat:(int)what {
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(msgTimeOutWithWhat:) object:[NSString stringWithFormat:@"%d", what]];
+}
+
+#pragma mark-------BesCentralManagerDelegate
+- (void)onScanResult:(CBPeripheral *)device advertisementData:(NSDictionary<NSString *,id> *)advertisementData RSSI:(NSNumber *)RSSI {
+    if ([self.delegate respondsToSelector:@selector(onScanResult:advertisementData:RSSI:)]) {
+        [self.delegate onScanResult:device advertisementData:advertisementData RSSI:RSSI];
+    }
+}
+
+- (void)onStatusChanged:(BesConnectStateCorrect)state msg:(NSString *)msg {
+    [self removeTimeOut];
+    if (self.mTotaConnect && !self.totauccess && state == BES_CONNECT_NOTIFY_SUCCESS) {
+        [self sendData:[self.mTotaConnectCMD totaStartData]];
+        return;
+    }
+    if ([self.delegate respondsToSelector:@selector(onStatusChanged:msg:)]) {
+        [self.delegate onStatusChanged:state msg:msg];
+    }
+}
+
+- (void)onFailed:(BesConnectStateError)state msg:(NSString *)msg {
+    self.totauccess = NO;
+    if ([self.delegate respondsToSelector:@selector(onFailed:msg:)]) {
+        [self.delegate onFailed:state msg:msg];
+    }
+}
+
+- (void)onDataReceived:(NSData *)data {
+    [self removeTimeOut];
+    if (self.mTotaConnect && !self.totauccess) {
+        int result = [self.mTotaConnectCMD receiveData:self.useTotaV2 ? [self.mTotaConnectCMD setTotaV2PacketData:data decode:NO] : data];
+        if (result == BES_TOTA_CONFIRM) {
+            [self sendData:[self.mTotaConnectCMD totaConfirm]];
+        } else if (result == BES_TOTA_SUCCESS) {
+            self.totauccess = YES;
+            if ([self.delegate respondsToSelector:@selector(onTotaConnectState:)]) {
+                [self.delegate onTotaConnectState:YES];
+            }
+        } else if (result == BES_TOTA_ERROR) {
+            self.totauccess = NO;
+            if ([self.delegate respondsToSelector:@selector(onTotaConnectState:)]) {
+                [self.delegate onTotaConnectState:NO];
+            }
+        }
+        return;
+    }
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    BOOL totaEncryption = ([defaults valueForKey:BES_TOTA_ENCRYPTION_KEY] && [[defaults valueForKey:BES_TOTA_ENCRYPTION_KEY] isEqual:@"YES"]) ? YES : NO;
+    if ([self.delegate respondsToSelector:@selector(onDataReceived:)]) {
+        [self.delegate onDataReceived:(self.totauccess && totaEncryption) ? (self.useTotaV2 ? [self.mTotaConnectCMD setTotaV2PacketData:data decode:YES] : [self.mTotaConnectCMD totaDecodeData:data]) : data];
+    }
+}
+
+- (void)onWriteSuccessOrError:(NSError *)error {
+    if ([self.delegate respondsToSelector:@selector(onWriteSuccessOrError:)]) {
+        [self.delegate onWriteSuccessOrError:error];
+    }
+}
+
+
+
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesServiceConfig.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesServiceConfig.h
new file mode 100644
index 00000000..d9e83835
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesServiceConfig.h
@@ -0,0 +1,33 @@
+//
+//  BesServiceConfig.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/28.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreBluetooth/CoreBluetooth.h>
+#import "BesSdkConstants.h"
+@class BesSdkConstants;
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BesServiceConfig : NSObject
+
+@property (nonatomic, assign) BesDeviceProtocol protocol;
+@property (nonatomic, strong) CBPeripheral *device;
+@property (nonatomic, strong) CBUUID *serviceUUID;
+@property (nonatomic, strong) CBUUID *characteristicsUUID;
+//ota
+@property (nonatomic, assign) int USER_FLAG;
+@property (nonatomic, strong) NSString *localPath;
+@property (nonatomic, assign) int getBreakpoint;
+@property (nonatomic, assign) int curUser;//1:fw 2:language 3:combine
+@property (nonatomic, assign) int curUpgateType;//0x01: apply NORMAL MODE //0x02: apply FAST MODE
+@property (nonatomic, assign) BOOL isWithoutResponse;
+
+@property (nonatomic, assign) BOOL totaConnect;
+@property (nonatomic, assign) BOOL useTotaV2;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesServiceConfig.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesServiceConfig.m
new file mode 100644
index 00000000..cab139b3
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesServiceConfig.m
@@ -0,0 +1,12 @@
+//
+//  BesServiceConfig.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/28.
+//
+
+#import "BesServiceConfig.h"
+
+@implementation BesServiceConfig
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesUUID.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesUUID.h
new file mode 100644
index 00000000..61720d12
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesUUID.h
@@ -0,0 +1,21 @@
+//
+//  BesUUID.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/30.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreBluetooth/CoreBluetooth.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BesUUID : NSObject
+
++ (CBUUID *)getBesOTAServicesUUID;
++ (CBUUID *)getBesOTACharacteristicsUUID;
++ (CBUUID *)getBesTotaServicesUUID;
++ (CBUUID *)getBesTotaCharacteristicsUUID;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesUUID.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesUUID.m
new file mode 100644
index 00000000..16ef1b66
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/BesUUID.m
@@ -0,0 +1,53 @@
+//
+//  BesUUID.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/30.
+//
+
+#import "BesUUID.h"
+#import "NSString+XCYCoreOperation.h"
+
+@implementation BesUUID
+
+//获取已经进入OTA模式，重置后的Services的UUID
++ (CBUUID *)getBesOTAServicesUUID
+{
+    //Service的UUID
+    NSString *dataStr = @"66666666666666666666666666666666";
+    NSData *serviceuuidData = [dataStr dataFromHexString_xcy];
+    CBUUID *serviceuuid = [CBUUID UUIDWithData:serviceuuidData];
+    
+    return serviceuuid;
+}
+
+//获取已经进入OTA模式，重置后的Characteristics的UUID
++ (CBUUID *)getBesOTACharacteristicsUUID
+{
+    NSString *dataStr = @"77777777777777777777777777777777";
+    NSData *uuidData = [dataStr dataFromHexString_xcy];
+    CBUUID *uuid = [CBUUID UUIDWithData:uuidData];
+    
+    return uuid;
+}
+//TOTA
++ (CBUUID *)getBesTotaServicesUUID
+{
+    //Service的UUID
+    NSString *dataStr = @"86868686868686868686868686868686";
+    NSData *serviceuuidData = [dataStr dataFromHexString_xcy];
+    CBUUID *serviceuuid = [CBUUID UUIDWithData:serviceuuidData];
+    
+    return serviceuuid;
+}
+//TOTA
++ (CBUUID *)getBesTotaCharacteristicsUUID
+{
+    NSString *dataStr = @"97979797979797979797979797979797";
+    NSData *uuidData = [dataStr dataFromHexString_xcy];
+    CBUUID *uuid = [CBUUID UUIDWithData:uuidData];
+    
+    return uuid;
+}
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/TOTAConnectCMD.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/TOTAConnectCMD.h
new file mode 100644
index 00000000..fd1f15f5
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/TOTAConnectCMD.h
@@ -0,0 +1,24 @@
+//
+//  TOTAConnectCMD.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/9/26.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TOTAConnectCMD : NSObject
+
+- (NSData *)totaStartData;
+- (NSData *)totaConfirm;
+- (NSData *)totaEncryptData:(NSData *)data;
+- (NSData *)totaDecodeData:(NSData *)data;
+- (NSData *)getTotaV2Packet:(NSData *)data;
+- (NSData *)setTotaV2PacketData:(NSData *)receiveData decode:(BOOL)decode;
+- (int)receiveData:(NSData *)receiveData;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/TOTAConnectCMD.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/TOTAConnectCMD.m
new file mode 100644
index 00000000..85538698
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/TOTAConnectCMD.m
@@ -0,0 +1,178 @@
+//
+//  TOTAConnectCMD.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/9/26.
+//
+
+#import "TOTAConnectCMD.h"
+#import "ArrayUtil.h"
+#import "BesFunc.h"
+#import "sha/Sha256.h"
+#import "BesSdkConstants.h"
+#import "aes.h"
+#import "NSData+XCYCoreTransfor.h"
+
+static Byte B_OP = (Byte) 0x10;
+static Byte B_01 = (Byte) 0x01;
+static Byte B_02 = (Byte) 0x02;
+static Byte B_03 = (Byte) 0x03;
+static Byte B_04 = (Byte) 0x04;
+static int L_OP = 2;//OPCode length
+
+@implementation TOTAConnectCMD
+
+{
+    NSData *random_b;
+    NSData *random_a;
+    NSData *aes_key;
+    NSData *hash_key_b;
+    
+    NSData *cashData;
+    NSData *cashReceiveData;
+    NSData *head;
+    NSData *tail;
+    NSData *dataLen;
+    NSData *crc;
+}
+
+- (NSData *)totaStartData {
+    int rbl = 0;
+    rbl = arc4random() % 112 + 16;
+    int opl = 5;
+    Byte rbb[rbl + opl];
+    Byte random_bb[rbl];
+    for (int i = 0; i < rbl; i ++) {
+        int rb = arc4random() % 255;
+        rbb[i + opl] = rb;
+        random_bb[i] = rb;
+    }
+    random_b = [NSData dataWithBytes:random_bb length:rbl];
+    rbb[0] = B_01;
+    rbb[1] = B_OP;
+    NSData *rbld = [ArrayUtil intToLittleBytes:rbl + 1];
+    Byte *dByte = (Byte *)[rbld bytes];
+    rbb[2] = dByte[0];
+    rbb[3] = dByte[1];
+    NSData *rblld = [ArrayUtil intToOneBytes:rbl];
+    Byte *dlByte = (Byte *)[rblld bytes];
+    rbb[4] = dlByte[0];
+    NSData *bData = [NSData dataWithBytes:rbb length:rbl + opl];
+    return bData;
+}
+
+- (NSData *)totaConfirm {
+    Byte hbb[hash_key_b.length + L_OP + 2 + 1];
+    hbb[0] = B_03;
+    hbb[1] = B_OP;
+    NSData *hbld = [ArrayUtil intToLittleBytes:hash_key_b.length + 1];
+    Byte *dByte = (Byte *)[hbld bytes];
+    hbb[2] = dByte[0];
+    hbb[3] = dByte[1];
+    NSData *hblld = [ArrayUtil intToOneBytes:hash_key_b.length];
+    Byte *dlByte = (Byte *)[hblld bytes];
+    hbb[4] = dlByte[0];
+    
+    Byte hash_key_bb[hash_key_b.length];
+    [hash_key_b getBytes:hash_key_bb length:hash_key_b.length];
+    for (int i = L_OP + 2 + 1; i < hash_key_b.length + L_OP + 2 + 1; i ++) {
+        hbb[i] = hash_key_bb[i - (L_OP + 2 + 1)];
+    }
+    NSData *hData = [NSData dataWithBytes:hbb length:hash_key_b.length + L_OP + 2 + 1];
+    return hData;
+}
+
+- (NSData *)totaEncryptData:(NSData *)data {
+    return [aes encryptWithContent:data password:aes_key];
+}
+
+- (NSData *)totaDecodeData:(NSData *)data {
+    return [aes decryptWithContent:data password:aes_key];
+}
+
+- (NSData *)getTotaV2Packet:(NSData *)data {
+    head = [ArrayUtil strToData:@"HEAD"];
+    tail = [ArrayUtil strToData:@"TAIL"];
+    dataLen = [NSData dataWithBytes:(Byte[]){(Byte)0x00, (Byte)0x00, (Byte)0x00, (Byte)0x00} length:4];
+    crc = [NSData dataWithBytes:(Byte[]){(Byte)0x00, (Byte)0x00, (Byte)0x00, (Byte)0x00} length:4];
+
+    NSData *dataLen = [ArrayUtil intToBytes:data.length];
+    int32_t crc32 = [data CRC32Value_xcy];
+    NSData *crc32Bytes = [NSData dataWithBytes:&crc32 length:4];
+    NSData *bytes = [ArrayUtil dataSplic:[ArrayUtil dataMerger:head data2:dataLen] l:data magic:crc32Bytes data:tail];
+    return bytes;
+}
+
+- (NSData *)setTotaV2PacketData:(NSData *)receiveData decode:(BOOL)decode {
+    if (![head isEqualToData:[receiveData subdataWithRange:NSMakeRange(0, head.length)]] || ![tail isEqualToData:[receiveData subdataWithRange:NSMakeRange(receiveData.length - tail.length, tail.length)]]) {
+        receiveData = [ArrayUtil dataMerger:cashReceiveData data2:receiveData];
+    }
+    if (![head isEqualToData:[receiveData subdataWithRange:NSMakeRange(0, head.length)]]) {
+        return [NSData dataWithBytes:(Byte[]){(Byte)0x00} length:1];
+    }
+    dataLen = [receiveData subdataWithRange:NSMakeRange(head.length, dataLen.length)];
+    int curDataLen = 0;
+    [dataLen getBytes:&curDataLen length:4];
+    long curLen = head.length + dataLen.length + curDataLen + crc.length + tail.length;
+    if (curLen < receiveData.length) {
+        cashReceiveData = [receiveData subdataWithRange:NSMakeRange(curLen, receiveData.length - curLen)];
+    }
+    NSData *data = [receiveData subdataWithRange:NSMakeRange(head.length + dataLen.length, curDataLen)];
+    int32_t crc32 = [data CRC32Value_xcy];
+    NSData *mCrc = [NSData dataWithBytes:&crc32 length:4];
+    //crc
+    crc = [receiveData subdataWithRange:NSMakeRange(head.length + dataLen.length + curDataLen, crc.length)];
+    if (![crc isEqualToData:mCrc]) {
+        return [NSData dataWithBytes:(Byte[]){(Byte)0x01} length:1];
+    }
+    //data
+    if (cashData != nil && cashData.length > 0) {
+        data = [ArrayUtil dataMerger:cashData data2:data];
+    }
+    if (decode) {
+        data = [self totaDecodeData:data];
+    }
+    
+    int cmdCodeLen = 2;
+    int cmdDataLen = 2;
+    NSData *cmdDataLenD = [data subdataWithRange:NSMakeRange(cmdCodeLen, cmdDataLen)];
+    int cmdDataLenL = 0;
+    [cmdDataLenD getBytes:&cmdDataLenL length:4];
+    if (cmdDataLenL + cmdCodeLen + cmdDataLen > data.length) {
+        cashData = data;
+        return [NSData dataWithBytes:(Byte[]){(Byte)0x02} length:1];
+    }
+    return data;
+}
+
+- (int)receiveData:(NSData *)receiveData {
+    Byte data[receiveData.length];
+    [receiveData getBytes:data length:receiveData.length];
+    if (data[0] == B_02 && data[1] == B_OP) {
+        //random_a
+        Byte random_alb[2];
+        int random_al = 0;
+        [receiveData getBytes:random_alb range:NSMakeRange(L_OP, 2)];
+        [[NSData dataWithBytes:random_alb length:2] getBytes:&random_al length:2];
+        
+        Byte random_ab[random_al - 1];
+        [receiveData getBytes:random_ab range:NSMakeRange(L_OP + 2 + 1, random_al - 1)];
+        random_a = [NSData dataWithBytes:random_ab length:random_al - 1];
+        //hash_key_b
+        NSData *random = [BesFunc func1WithA:random_a b:random_b];
+        hash_key_b = [Sha256 getSHA256WithData:random];
+        aes_key = [BesFunc funcWithHash:hash_key_b];
+        return BES_TOTA_CONFIRM;
+    } else if (data[0] == (Byte) 0x00 && data[1] == B_OP) {
+        if (receiveData.length > 15 && data[12] == (Byte) 0x73 && data[13] == (Byte) 0x75 && data[14] == (Byte) 0x63) {
+            return BES_TOTA_SUCCESS;
+        } else {
+            return BES_TOTA_ERROR;
+        }
+    }
+    return 0;
+}
+
+
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/BesFunc.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/BesFunc.h
new file mode 100644
index 00000000..8fc0103b
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/BesFunc.h
@@ -0,0 +1,19 @@
+//
+//  BesFunc.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/9/28.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BesFunc : NSObject
+
++ (NSData *)func1WithA:(NSData *)a b:(NSData *)b;
++ (NSData *)funcWithHash:(NSData *)hash_key;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/BesFunc.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/BesFunc.m
new file mode 100644
index 00000000..5eaafbc3
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/BesFunc.m
@@ -0,0 +1,80 @@
+//
+//  BesFunc.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/9/28.
+//
+
+#import "BesFunc.h"
+#import "ArrayUtil.h"
+
+@implementation BesFunc
+
++ (NSData *)func1WithA:(NSData *)a b:(NSData *)b {
+    if (a.length > b.length) {
+        Byte ob[b.length];
+        [b getBytes:ob length:b.length];
+        Byte nb[a.length];
+        for (int i = 0; i < b.length; i ++) {
+            nb[i] = ob[i];
+        }
+        for (int i = (int)b.length; i < a.length; i ++) {
+            nb[i] = (Byte) 0x00;
+        }
+        b = [NSData dataWithBytes:nb length:a.length];
+    } else if (a.length < b.length) {
+        Byte oa[a.length];
+        [a getBytes:oa length:a.length];
+        Byte na[b.length];
+        for (int i = 0; i < a.length; i ++) {
+            na[i] = oa[i];
+        }
+        for (int i = (int)a.length; i < b.length; i ++) {
+            na[i] = (Byte) 0x00;
+        }
+        a = [NSData dataWithBytes:na length:b.length];
+    }
+    Byte rand_key[a.length];
+    Byte ab[a.length];
+    Byte bb[a.length];
+    [a getBytes:ab length:a.length];
+    [b getBytes:bb length:a.length];
+    for (int i = 0; i < a.length; i ++) {
+        rand_key[i] = [self generate_random_algorithmWithId:i a:ab[i] b:bb[i]];
+    }
+        
+    return [NSData dataWithBytes:rand_key length:a.length];
+}
+
++ (NSData *)funcWithHash:(NSData *)hash_key {
+    Byte key[16];
+    Byte hash_key_b[hash_key.length];
+    [hash_key getBytes:hash_key_b length:hash_key.length];
+    for (int i = 0; i < 16; i ++) {
+        key[i] = hash_key_b[2 * i];
+    }
+    return [NSData dataWithBytes:key length:16];
+}
+
+
++ (Byte)generate_random_algorithmWithId:(int)i a:(Byte)a b:(Byte)b {
+    int op = i % 6;
+    switch (op) {
+        case 0:
+            return (Byte) (a + b);
+        case 1:
+            return (Byte) (a * b);
+        case 2:
+            return (Byte) (a & b);
+        case 3:
+            return (Byte) (a | b);
+        case 4:
+            return (Byte) (a ^ b);
+        case 5:
+            return (Byte) (a*a + b*b);
+        default:
+            return 0x00;
+    }
+}
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/Sha256.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/Sha256.h
new file mode 100644
index 00000000..d45f2418
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/Sha256.h
@@ -0,0 +1,18 @@
+//
+//  Sha256.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/9/28.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface Sha256 : NSObject
+
++ (NSData *)getSHA256WithData:(NSData *)data;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/Sha256.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/Sha256.m
new file mode 100644
index 00000000..28be8c87
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/Sha256.m
@@ -0,0 +1,19 @@
+//
+//  Sha256.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/9/28.
+//
+
+#import "Sha256.h"
+#import <CommonCrypto/CommonDigest.h>
+
+@implementation Sha256
+
++ (NSData *)getSHA256WithData:(NSData *)data {
+    unsigned char result[CC_SHA256_DIGEST_LENGTH];
+    CC_SHA256(data.bytes, (CC_LONG)data.length, result);
+    return [NSData dataWithBytes:result length:CC_SHA256_DIGEST_LENGTH];
+}
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/aes.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/aes.h
new file mode 100644
index 00000000..d407b600
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/aes.h
@@ -0,0 +1,19 @@
+//
+//  aes.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/9/28.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface aes : NSObject
+
++ (NSData *)encryptWithContent:(NSData *)content password:(NSData *)password;
++ (NSData *)decryptWithContent:(NSData *)content password:(NSData *)password;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/aes.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/aes.m
new file mode 100644
index 00000000..cbb35788
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/Base/sha/aes.m
@@ -0,0 +1,56 @@
+//
+//  aes.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/9/28.
+//
+
+#import "aes.h"
+#import <CommonCrypto/CommonDigest.h>
+#import <CommonCrypto/CommonCryptor.h>
+
+@implementation aes
+
++ (NSData *)encryptWithContent:(NSData *)content password:(NSData *)password {
+    int inLen = (int)content.length;
+    int finLen = inLen % 16 != 0 ? inLen + 16 - (inLen % 16) : inLen;
+    Byte ob[inLen];
+    [content getBytes:ob length:inLen];
+    Byte nb[finLen];
+    for (int i = 0; i < inLen; i ++) {
+        nb[i] = ob[i];
+    }
+    for (int i = inLen; i < finLen; i ++) {
+        nb[i] = (Byte) 0x00;
+    }
+    content = [NSData dataWithBytes:nb length:finLen];
+    NSUInteger dataLength = content.length;
+    size_t bufferSize = dataLength;
+    void *buffer = malloc(bufferSize);
+    size_t numBytesEncrypted = 0;
+    Byte iv[16] = {(Byte) 0x00, (Byte) 0x01, (Byte) 0x02, (Byte) 0x03, (Byte) 0x04, (Byte) 0x05, (Byte) 0x06, (Byte) 0x07, (Byte) 0x08, (Byte) 0x09, (Byte) 0x0a, (Byte) 0x0b, (Byte) 0x0c, (Byte) 0x0d, (Byte) 0x0e, (Byte) 0x0f};
+
+    CCCryptorStatus cryptStatus = CCCrypt(kCCEncrypt, kCCAlgorithmAES, 0, password.bytes, password.length, iv, content.bytes, dataLength, buffer, bufferSize, &numBytesEncrypted);
+    if (cryptStatus == kCCSuccess) {
+        return [NSData dataWithBytesNoCopy:buffer length:numBytesEncrypted];
+    }
+    free(buffer);
+    return nil;
+}
+
++ (NSData *)decryptWithContent:(NSData *)content password:(NSData *)password {
+    NSUInteger dataLength = content.length;
+    size_t bufferSize = dataLength;
+    void *buffer = malloc(bufferSize);
+    size_t numBytesEncrypted = 0;
+    Byte iv[16] = {(Byte) 0x00, (Byte) 0x01, (Byte) 0x02, (Byte) 0x03, (Byte) 0x04, (Byte) 0x05, (Byte) 0x06, (Byte) 0x07, (Byte) 0x08, (Byte) 0x09, (Byte) 0x0a, (Byte) 0x0b, (Byte) 0x0c, (Byte) 0x0d, (Byte) 0x0e, (Byte) 0x0f};
+
+    CCCryptorStatus cryptStatus = CCCrypt(kCCDecrypt, kCCAlgorithmAES, 0, password.bytes, password.length, iv, content.bytes, dataLength, buffer, bufferSize, &numBytesEncrypted);
+    if (cryptStatus == kCCSuccess) {
+        return [NSData dataWithBytesNoCopy:buffer length:numBytesEncrypted];
+    }
+    free(buffer);
+    return nil;
+}
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesOtaSetting.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesOtaSetting.h
new file mode 100644
index 00000000..1dc23c48
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesOtaSetting.h
@@ -0,0 +1,40 @@
+//
+//  BesOtaSetting.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/2/8.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BesOtaSetting : NSObject
+
+@property (copy, nonatomic) NSData *flashOffsetData;
+@property (copy, nonatomic) NSString *btAddr;
+@property (copy, nonatomic) NSString *btName;
+@property (copy, nonatomic) NSString *bleAddr;
+@property (copy, nonatomic) NSString *bleName;
+
+@property (assign, nonatomic) BOOL isClearData;
+@property (assign, nonatomic) BOOL isBTAddrOpen;
+@property (assign, nonatomic) BOOL isBTNameOpen;
+@property (assign, nonatomic) BOOL isBLEAddrOpen;
+@property (assign, nonatomic) BOOL isBLENameOpen;
+
+- (void)updateFlashOffsetData:(NSData *)offsetData;
+
+- (NSData *)getFlashOffsetData;
+- (NSData *)getSwitchData;
+- (NSData *)getBTAddrData;
+- (NSData *)getBTNameData;
+- (NSData *)getBLEAddrData;
+- (NSData *)getBLENameData;
+
+
+- (NSData *)getTotalSettingData;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesOtaSetting.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesOtaSetting.m
new file mode 100644
index 00000000..059c4ad2
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesOtaSetting.m
@@ -0,0 +1,183 @@
+//
+//  BesOtaSetting.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/2/8.
+//
+
+#import "BesOtaSetting.h"
+#import "NSString+XCYCoreOperation.h"
+#import "NSData+XCYCoreTransfor.h"
+#import "BesTotaDemoConstants.h"
+
+
+@implementation BesOtaSetting
+
+- (void)updateFlashOffsetData:(NSData *)offsetData {
+    _flashOffsetData = offsetData;
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    self.isClearData = DEFAULT_CLEAR_USER_DATA;
+    self.isBTAddrOpen = DEFAULT_UPDATE_BT_ADDRESS;
+    self.isBTNameOpen = DEFAULT_UPDATE_BT_NAME;
+    self.isBLEAddrOpen = DEFAULT_UPDATE_BLE_ADDRESS;
+    self.isBLENameOpen = DEFAULT_UPDATE_BLE_NAME;
+    
+    if ([defaults valueForKey:KEY_OTA_CONFIG_CLEAR_USER_DATA]) {
+        self.isClearData = [[defaults valueForKey:KEY_OTA_CONFIG_CLEAR_USER_DATA] isEqualToString:@"YES"] ? YES : NO;
+    }
+    if ([defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BT_ADDRESS] && [[defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BT_ADDRESS] isEqualToString:@"YES"] && [defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BT_ADDRESS_VALUE]) {
+        self.isBTAddrOpen = YES;
+        self.btAddr = [defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BT_ADDRESS_VALUE];
+    }
+    if ([defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BT_NAME] && [[defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BT_NAME] isEqualToString:@"YES"] && [defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BT_NAME_VALUE]) {
+        self.isBTNameOpen = YES;
+        self.btName = [defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BT_NAME_VALUE];
+    }
+    if ([defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BLE_ADDRESS] && [[defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BLE_ADDRESS] isEqualToString:@"YES"] && [defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BLE_ADDRESS_VALUE]) {
+        self.isBLEAddrOpen = YES;
+        self.bleAddr = [defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BLE_ADDRESS_VALUE];
+    }
+    if ([defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BLE_NAME] && [[defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BLE_NAME] isEqualToString:@"YES"] && [defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BLE_NAME_VALUE]) {
+        self.isBLENameOpen = YES;
+        self.bleName = [defaults valueForKey:KEY_OTA_CONFIG_UPDATE_BLE_NAME_VALUE];
+    }
+}
+
+- (NSData *)getFlashOffsetData {
+
+    NSData *subData = [_flashOffsetData subdataWithRange:NSMakeRange(0, 3)];
+    NSMutableData *data = [NSMutableData dataWithData:subData];
+    [data appendData:[@"00" dataFromHexString_xcy]];
+    return data;
+}
+
+- (NSData *)getSwitchData {
+    
+    int switchInt = 0;
+    NSNumber *switchNumber = [NSNumber numberWithBool:_isBLEAddrOpen];
+    int subInt = [switchNumber intValue];
+    switchInt = subInt;
+    
+    switchNumber = [NSNumber numberWithBool:_isBTAddrOpen];
+    subInt = [switchNumber intValue];
+    switchInt = (switchInt << 1) + subInt;
+    
+    switchNumber = [NSNumber numberWithBool:_isBLENameOpen];
+    subInt = [switchNumber intValue];
+    switchInt = (switchInt << 1) + subInt;
+    
+    switchNumber = [NSNumber numberWithBool:_isBTNameOpen];
+    subInt = [switchNumber intValue];
+    switchInt = (switchInt << 1) + subInt;
+    
+    switchNumber = [NSNumber numberWithBool:_isClearData];
+    subInt = [switchNumber intValue];
+    switchInt = (switchInt << 1) + subInt;
+    
+    NSData *data = [NSData dataWithBytes:&switchInt length:1];
+    NSMutableData *paddingData = [[NSMutableData alloc] initWithLength:3];
+    NSMutableData *fullData = [[NSMutableData alloc] initWithCapacity:1];
+    [fullData appendData:data];
+    [fullData appendData:paddingData];
+    
+    return fullData;
+}
+
+- (NSData *)getBTAddrData {
+    
+    if (!_isBTAddrOpen) {
+    
+        NSMutableData *defaultdata = [[NSMutableData alloc] initWithLength:6];
+        return defaultdata;
+    }
+    
+    NSData *data = [_btAddr dataFromHexString_xcy];
+    NSMutableData *fullData = [[NSMutableData alloc] initWithData:data];
+    NSMutableData *paddingData = [[NSMutableData alloc] initWithLength:(6-data.length)];
+    [fullData appendData:paddingData];
+    
+    return fullData;
+}
+
+- (NSData *)getBTNameData {
+    
+    if (!_isBTNameOpen) {
+        
+        return [[NSMutableData alloc] initWithLength:32];
+    }
+    
+    NSData *data = [_btName dataUsingEncoding:NSASCIIStringEncoding];
+    NSMutableData *fullData = [[NSMutableData alloc] initWithData:data];
+    NSMutableData *paddingData = [[NSMutableData alloc] initWithLength:(32-data.length)];
+    [fullData appendData:paddingData];
+    
+    return fullData;
+    
+}
+
+- (NSData *)getBLEAddrData {
+    
+    if (!_isBLEAddrOpen) {
+        
+        NSMutableData *defaultdata = [[NSMutableData alloc] initWithLength:6];
+        return defaultdata;
+    }
+    
+    NSData *data = [_bleAddr dataFromHexString_xcy];
+    NSMutableData *fullData = [[NSMutableData alloc] initWithData:data];
+    NSMutableData *paddingData = [[NSMutableData alloc] initWithLength:(6 - data.length)];
+    [fullData appendData:paddingData];
+    
+    return fullData;
+}
+
+- (NSData *)getBLENameData {
+    
+    if (!_isBLENameOpen) {
+        
+        return [[NSMutableData alloc] initWithLength:32];
+    }
+    
+    NSData *data = [_bleName dataUsingEncoding:NSASCIIStringEncoding];
+    
+    NSMutableData *fullData = [[NSMutableData alloc] initWithData:data];
+    NSMutableData *paddingData = [[NSMutableData alloc] initWithLength:(32 - data.length)];
+    [fullData appendData:paddingData];
+    
+    return fullData;
+}
+
+- (NSData *)getTotalSettingData {
+    NSData *switchData = [self getSwitchData];
+    NSData *offSetData = [self getFlashOffsetData];
+    NSData *btAddrData = [self getBTAddrData];
+    NSData *btNameData = [self getBTNameData];
+    NSData *bleAddrData = [self getBLEAddrData];
+    NSData *bleNameData = [self getBLENameData];
+    
+    NSMutableData *infoData = [[NSMutableData alloc] initWithCapacity:1];
+    [infoData appendData:offSetData];
+    [infoData appendData:switchData];
+    [infoData appendData:btNameData];
+    [infoData appendData:bleNameData];
+    [infoData appendData:btAddrData];
+    [infoData appendData:bleAddrData];
+    
+    //
+    NSInteger totalLength = infoData.length + 4;
+    NSData *lengthData = [NSData dataWithBytes:&totalLength length:4];
+    
+    NSMutableData *totalData = [[NSMutableData alloc] initWithCapacity:1];
+    [totalData appendData:lengthData];
+    [totalData appendData:infoData];
+    
+    //
+    int32_t crc32 = [totalData CRC32Value_xcy];
+    NSData *crc32Data = [NSData dataWithBytes:&crc32 length:4];
+    
+    [totalData appendData:crc32Data];
+
+    return totalData;
+}
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoCMD.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoCMD.h
new file mode 100644
index 00000000..12fec8b7
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoCMD.h
@@ -0,0 +1,38 @@
+//
+//  BesOtaCMD.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/2/1.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+@interface BesOtaCMD : NSObject
+
+- (void)setOtaUser:(int)user isGatt:(BOOL)isGatt isWithoutRsp:(BOOL)withoutResponse isTota:(BOOL)isTota useTotaV2:(BOOL)totaV2;
+
+- (NSData *)getCurrentVersionCMD;
+- (NSData *)getROLESwitchRandomIDCMD;
+
+- (int)receiveData:(NSData *)receiveData curOtaResult:(int)curOtaResult;
+
+- (int)getCurrentDeviceType;
+- (NSString *)getCurrentVersion;
+- (NSString *)getRoleSwitchRandomID;
+- (NSData *)getOtaProtocolVersionCMD:(BOOL)currentOrLegacy;
+- (NSData *)getSetOtaUserCMD:(int)curUser;
+- (NSData *)getSetUpgrateTypeCMD:(int)curUpgateType;
+- (NSData *)getSelectSideCMD;
+- (NSData *)getCheckBreakPointCMD;
+- (NSData *)getStartOTAPacketCMD:(NSData *)data;
+- (NSData *)getOTAConfigureCMD:(NSData *)data;
+- (NSData *)getDataPacketCMD:(NSData *)data;
+- (NSData *)getImageOverwritingConfirmationPacketCMD;
+- (void)notifySuccess;
+- (NSString *)besOtaProgress:(int)total;
+- (void)crcConfirmError;
+- (void)setCrcConfirmState:(BOOL)state;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoCMD.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoCMD.m
new file mode 100644
index 00000000..d0aeffe3
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoCMD.m
@@ -0,0 +1,677 @@
+//
+//  BesOtaCMD.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/2/1.
+//
+
+#import "BesTotaDemoCMD.h"
+#import "ArrayUtil.h"
+#import "BesSdkConstants.h"
+#import "BesTotaDemoConstants.h"
+#import "NSData+XCYCoreTransfor.h"
+#import "BesOtaSetting.h"
+
+    static Byte B_8C = (Byte) 0x8C;
+    static Byte B_8D = (Byte) 0x8D;
+    static Byte B_80 = (Byte) 0x80;
+    static Byte B_81 = (Byte) 0x81;
+    static Byte B_85 = (Byte) 0x85;
+    static Byte B_86 = (Byte) 0x86;
+    static Byte B_87 = (Byte) 0x87;
+    static Byte B_82 = (Byte) 0x82;
+    static Byte B_83 = (Byte) 0x83;
+    static Byte B_88 = (Byte) 0x88;
+    static Byte B_84 = (Byte) 0x84;
+    static Byte B_8B = (Byte) 0x8B;
+    static Byte B_8E = (Byte) 0x8E;
+    static Byte B_8F = (Byte) 0x8F;
+    static Byte B_90 = (Byte) 0x90;
+    static Byte B_91 = (Byte) 0x91;
+    static Byte B_92 = (Byte) 0x92;
+    static Byte B_93 = (Byte) 0x93;
+    static Byte B_95 = (Byte) 0x95;
+    static Byte B_99 = (Byte) 0x99;
+    static Byte B_9A = (Byte) 0x9A;
+    static Byte B_97 = (Byte) 0x97;
+    static Byte B_98 = (Byte) 0x98;
+    static Byte B_9B = (Byte) 0x9B;
+    static Byte B_9C = (Byte) 0x9C;
+    static Byte B_9D = (Byte) 0x9D;
+    static Byte B_9E = (Byte) 0x9E;
+
+    static int pl = 1; //packetType length
+    static int ll = 0; //USER length bytes' length: USER_FLAG == 0 ? 0 : 4
+
+    static int checkBytesLength = 8 * 1024;
+    static int BLE_SINGLE_PACKE_MAC_BYTES = 256 ;
+
+
+@interface BesOtaCMD()
+{
+    NSData *emptyByte, *magicCode;
+    int deviceType;
+    NSString *versionMsg;
+    int USER_FLAG;
+    BOOL isWithoutResponse;
+    BOOL isTotaConnect;
+    BOOL useTotaV2;
+
+    Byte deviceTypeBytes;
+    NSString *curVersionLeft;
+    NSString *curVersionRight;
+    NSString *roleSwitchRandomID;
+    NSData *beforeRandomCode;
+    int curSendLength;
+    int curSendPacketLength;
+    int curConfirmLength;
+    int beforeSendLength;
+    int mMtu;
+    NSString *mSwVersion;
+    NSString *mHwVersion;
+    BOOL crcConfirm;
+    int crcConfirmTimes;
+    int packetPayload;
+    int onePercentBytes;
+    NSData *mOtaImageData;
+    
+    BOOL isGattConnect;
+}
+
+@end
+
+@implementation BesOtaCMD
+
+- (void)setOtaUser:(int)user isGatt:(BOOL)isGatt isWithoutRsp:(BOOL)withoutResponse isTota:(BOOL)isTota useTotaV2:(BOOL)totaV2 {
+    USER_FLAG = user;
+    isWithoutResponse = withoutResponse;
+    isTotaConnect = isTota;
+    isGattConnect = isGatt;
+    useTotaV2 = totaV2;
+    if (isGattConnect) {
+        checkBytesLength = 32 * 1024;
+    }
+    if (USER_FLAG == 1) {
+        ll = 4;
+    } else {
+        ll = 0;
+    }
+    roleSwitchRandomID = @"";
+    versionMsg = @"";
+    emptyByte = [NSData data];
+    Byte b1[4] = {0x42, 0x45, 0x53, 0x54};
+    magicCode = [NSData dataWithBytes:b1 length:4];
+    mMtu = DEFAULT_MTU;
+    crcConfirm = false;
+    crcConfirmTimes = 0;
+    packetPayload = 0;
+    onePercentBytes = 0;
+}
+
+- (NSData *)getCurrentVersionCMD {
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_8E} length:pl];
+    NSData *lBytes = emptyByte;
+    if (USER_FLAG  == 1) {
+        lBytes = [ArrayUtil intToBytes:magicCode.length];
+    }
+
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:magicCode data:emptyByte];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+
+- (int)getCurrentDeviceType {
+    return deviceType;
+}
+
+- (NSString *)getCurrentVersion {
+    NSString *v = @"";
+    if (deviceType == DEVICE_TYPE_STEREO) {
+        v = [NSString stringWithFormat:@"stereo:%@ \n%@", curVersionLeft, versionMsg];
+        versionMsg = @"";
+    } else if (deviceType == DEVICE_TYPE_TWS_CONNECT_LEFT) {
+        v = [NSString stringWithFormat:@"TWS left:%@", curVersionLeft];
+    } else if (deviceType == DEVICE_TYPE_TWS_CONNECT_RIGHT) {
+        v = [NSString stringWithFormat:@"TWS right:%@", curVersionRight];
+    }
+    return v;
+}
+
+- (NSData *)getOtaProtocolVersionCMD:(BOOL)currentOrLegacy {
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_99} length:pl];
+    NSData *lBytes = emptyByte;
+    Byte vBytesB[4] = {0x00};
+    vBytesB[3] = currentOrLegacy ? 0x01 : 0x00;
+    NSData *vBytes = [NSData dataWithBytes:vBytesB length:4];
+    if (USER_FLAG  == 1) {
+        lBytes = [ArrayUtil intToBytes:vBytes.length];
+    }
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:emptyByte data:vBytes];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+
+- (NSData *)getSetOtaUserCMD:(int)curUser {
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_97} length:pl];
+    NSData *lBytes = emptyByte;
+    Byte vBytesB[1] = {0x00};
+    if (curUser == 1) {
+        vBytesB[0] = 0x01;
+    } else if (curUser == 2) {
+        vBytesB[0] = 0x02;
+    } else if (curUser == 3) {
+        vBytesB[0] = 0x03;
+    } else if (curUser == 4) {
+        vBytesB[0] = 0x04;
+    } else if (curUser == 5) {
+        vBytesB[0] = 0x05;
+    } else if (curUser == 6) {
+        vBytesB[0] = 0x06;
+    }
+    NSData *vBytes = [NSData dataWithBytes:vBytesB length:1];
+
+    if (USER_FLAG  == 1) {
+        lBytes = [ArrayUtil intToBytes:vBytes.length];
+    }
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:emptyByte data:vBytes];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+//0x01: apply NORMAL MODE
+//0x02: apply FAST MODE
+- (NSData *)getSetUpgrateTypeCMD:(int)curUpgateType {
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_9D} length:pl];
+    NSData *lBytes = emptyByte;
+    Byte vBytesB[1] = {0x01};
+    if (curUpgateType == 1) {
+        vBytesB[0] = 0x01;
+    } else if (curUpgateType == 2) {
+        vBytesB[0] = 0x02;
+    }
+    NSData *vBytes = [NSData dataWithBytes:vBytesB length:1];
+    if (USER_FLAG  == 1) {
+        lBytes = [ArrayUtil intToBytes:vBytes.length];
+    }
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:emptyByte data:vBytes];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+
+
+- (NSString *)getRoleSwitchRandomID {
+    return roleSwitchRandomID;
+}
+
+
+- (NSData *)getROLESwitchRandomIDCMD {
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_9B} length:pl];
+    NSData *lBytes = emptyByte;
+    if (USER_FLAG  == 1) {
+        lBytes = [ArrayUtil intToBytes:0];
+    }
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:emptyByte data:emptyByte];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+
+- (NSData *)getSelectSideCMD {
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_90} length:pl];
+    NSData *lBytes = emptyByte;
+    if (USER_FLAG  == 1) {
+        lBytes = [ArrayUtil intToBytes:1];
+    }
+    Byte b1[4] = {deviceTypeBytes};
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:emptyByte data:[NSData dataWithBytes:b1 length:1]];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+
+- (NSData *)getCheckBreakPointCMD {
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_8C} length:pl];
+    NSData *lBytes = emptyByte;
+    Byte randomCodeB[32] = {0x00};
+    NSData *randomCode = [NSData dataWithBytes:randomCodeB length:32];
+    Byte segmentBytesB[4] = {0x01, 0x02, 0x03, 0x04};
+    
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    if ([defaults valueForKey:BES_OTA_RANDOM_CODE_LEFT]) {
+        randomCode = [ArrayUtil toData:[defaults valueForKey:BES_OTA_RANDOM_CODE_LEFT]];
+    }
+    beforeRandomCode = randomCode;
+    NSData *segmentBytes = [NSData dataWithBytes:segmentBytesB length:4];
+    
+    NSMutableData *subData = [[NSMutableData alloc] initWithCapacity:1];
+    [subData appendData:randomCode];
+    [subData appendData:segmentBytes];
+    int32_t crc32 = [subData CRC32Value_xcy];
+    NSData *crc32Bytes = [NSData dataWithBytes:&crc32 length:4];
+    
+    int dataL = (int)(randomCode.length + segmentBytes.length + crc32Bytes.length);
+    if (USER_FLAG  == 1) {
+        lBytes = [ArrayUtil intToBytes:magicCode.length + dataL];
+    }
+    NSMutableData *fullData = [[NSMutableData alloc] initWithCapacity:1];
+    [fullData appendData:randomCode];
+    [fullData appendData:segmentBytes];
+    [fullData appendData:crc32Bytes];
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:magicCode data:fullData];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+
+- (NSData *)getStartOTAPacketCMD:(NSData *)data {
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_80} length:pl];
+    NSData *lBytes = emptyByte;
+    NSUInteger dataLength = data.length;
+    NSData *imageSize = [NSData dataWithBytes:&dataLength length:4];
+    NSData *subData = [data subdataWithRange:NSMakeRange(0, data.length)];
+    int32_t crc32 = [subData CRC32Value_xcy];
+    NSData *crc32OfImage = [NSData dataWithBytes:&crc32 length:4];
+    if (USER_FLAG  == 1) {
+        lBytes = [ArrayUtil intToBytes:magicCode.length + imageSize.length + crc32OfImage.length];
+    }
+    NSMutableData *fullData = [[NSMutableData alloc] initWithCapacity:1];
+    [fullData appendData:imageSize];
+    [fullData appendData:crc32OfImage];
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:magicCode data:fullData];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+
+- (NSData *)getOTAConfigureCMD:(NSData *)data {
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_86} length:pl];
+    NSData *lBytes = emptyByte;
+    BesOtaSetting *setting = [[BesOtaSetting alloc] init];
+    [setting updateFlashOffsetData:[data subdataWithRange:NSMakeRange(data.length - 4, 4)]];
+    NSData *settingData = [setting getTotalSettingData];
+    if (USER_FLAG  == 1) {
+        lBytes = [ArrayUtil intToBytes:settingData.length];
+    }
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:emptyByte data:settingData];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+
+- (NSData *)getDataPacketCMD:(NSData *)data {
+    if (onePercentBytes == 0) {
+        [self readlocalImageData:(int)data.length];
+    }
+    mOtaImageData = data;
+    NSData *lBytes = emptyByte;
+    if (crcConfirm) {
+        crcConfirm = false;
+        NSData *crcPt = [NSData dataWithBytes:(Byte *){&B_82} length:pl];
+        NSData *crc32OfSegment = [self getCrc32OfSegment:data];
+        int crcDataL = (int)magicCode.length + (int)crc32OfSegment.length;
+        if (USER_FLAG == 1) {
+            lBytes = [ArrayUtil intToBytes:crcDataL];
+        }
+        NSData *bytes = [ArrayUtil dataSplic:crcPt l:lBytes magic:magicCode data:crc32OfSegment];
+        if (isTotaConnect) {
+            return [self convertToTotaCMD:bytes];
+        }
+        return bytes;
+    }
+    if (beforeSendLength == data.length || curSendLength == data.length) {
+        NSData *wholeCrcPt = [NSData dataWithBytes:(Byte *){&B_88} length:pl];
+        if (USER_FLAG == 1) {
+            lBytes = [ArrayUtil intToBytes:0];
+        }
+        NSData *bytes = [ArrayUtil dataSplic:wholeCrcPt l:lBytes magic:emptyByte data:emptyByte];
+        if (isTotaConnect) {
+            return [self convertToTotaCMD:bytes];
+        }
+        return bytes;
+    }
+    
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_85} length:pl];
+    NSData *packetData = [self getDataPacket:data];
+    int dataL = (int)packetData.length;
+    if (USER_FLAG  == 1) {
+        lBytes = [ArrayUtil intToBytes:dataL];
+    }
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:emptyByte data:packetData];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+
+- (NSData *)getDataPacket:(NSData *)mOtaImageData {
+//    if (USER_FLAG == 1 && isWithoutResponse) {
+        //特定长度校验
+        if (beforeSendLength > 0 && crcConfirmTimes == 0) {
+            crcConfirmTimes = beforeSendLength / checkBytesLength;
+            curSendPacketLength = packetPayload;
+        }
+        else if (curSendLength + packetPayload > checkBytesLength * (crcConfirmTimes + 1) || curSendLength + packetPayload == checkBytesLength * (crcConfirmTimes + 1)) {
+            curSendPacketLength = checkBytesLength * (crcConfirmTimes + 1) - curSendLength;
+            crcConfirm = true;
+        }
+        else if (curSendLength + packetPayload > mOtaImageData.length) {
+            curSendPacketLength = (int)mOtaImageData.length - curSendLength;
+            crcConfirm = true;
+        }
+        else {
+            curSendPacketLength = packetPayload;
+        }
+        if (curSendLength + curSendPacketLength == (crcConfirmTimes + 1) * checkBytesLength) {
+            crcConfirm = true;
+        }
+//    } else {
+//        //每1%校验
+//        if (beforeSendLength > 0 && crcConfirmTimes == 0) {
+//            crcConfirmTimes = beforeSendLength / onePercentBytes;
+//            curSendPacketLength = packetPayload;
+//        }
+//        else if (curSendLength + packetPayload > onePercentBytes * (crcConfirmTimes + 1) || curSendLength + packetPayload == onePercentBytes * (crcConfirmTimes + 1)) {
+//            curSendPacketLength = onePercentBytes * (crcConfirmTimes + 1) - curSendLength;
+//            crcConfirm = true;
+//        }
+//        else if (curSendLength + packetPayload > mOtaImageData.length) {
+//            curSendPacketLength = (int)mOtaImageData.length - curSendLength;
+//            crcConfirm = true;
+//        }
+//        else {
+//            curSendPacketLength = packetPayload;
+//        }
+//    }
+    // 固件长度不是校验块整数倍且尾部贴近校验边界时，上面的边界分支会算出越过文件末尾的包长
+    //（Android 版同款 bug 已在 99% 处 arraycopy 越界崩溃过），统一钳制到剩余字节。
+    if (curSendLength + curSendPacketLength > mOtaImageData.length) {
+        curSendPacketLength = (int)mOtaImageData.length - curSendLength;
+        crcConfirm = true;
+    }
+    return [mOtaImageData subdataWithRange:NSMakeRange(curSendLength, curSendPacketLength)];
+}
+
+- (void)readlocalImageData:(int)imageSize {
+    onePercentBytes = [self calculateBLEOnePercentBytes:imageSize];
+}
+
+- (int)calculateBLEOnePercentBytes:(int)imageSize {
+    int onePercentBytesL = imageSize / 100;
+    if (imageSize < BLE_SINGLE_PACKE_MAC_BYTES) {
+        onePercentBytesL = imageSize;
+    }
+    else {
+        int rightBytes = 0;
+        if (onePercentBytesL < BLE_SINGLE_PACKE_MAC_BYTES) {
+            rightBytes = BLE_SINGLE_PACKE_MAC_BYTES - onePercentBytesL;
+        }
+        else {
+            rightBytes = BLE_SINGLE_PACKE_MAC_BYTES - onePercentBytesL % BLE_SINGLE_PACKE_MAC_BYTES;
+        }
+        if (rightBytes != 0) {
+            onePercentBytesL = onePercentBytesL + rightBytes;
+        }
+    }
+    if (onePercentBytesL < 4 * 1024) {
+        onePercentBytesL = 4 * 1024;
+    }
+    int tempCount = (imageSize + onePercentBytesL - 1) / onePercentBytesL;
+    return onePercentBytesL;
+}
+
+- (NSData *)getCrc32OfSegment:(NSData *)data {
+    NSData *crcSegmentData;
+//    if (USER_FLAG == 1 && isWithoutResponse) {
+        //特定长度校验
+        crcSegmentData = [data subdataWithRange:NSMakeRange(checkBytesLength * crcConfirmTimes, curSendLength - checkBytesLength * crcConfirmTimes)];
+//    } else {
+//        //每1%校验
+//        crcSegmentData = [data subdataWithRange:NSMakeRange(onePercentBytes * crcConfirmTimes, curSendLength - onePercentBytes * crcConfirmTimes)];
+//    }
+    int32_t crc32 = [crcSegmentData CRC32Value_xcy];
+    NSData *crc32Bytes = [NSData dataWithBytes:&crc32 length:4];
+    return crc32Bytes;
+}
+
+- (NSData *)getImageOverwritingConfirmationPacketCMD {
+    NSData *pt = [NSData dataWithBytes:(Byte *){&B_92} length:pl];
+    NSData *lBytes = emptyByte;
+    if (USER_FLAG == 1) {
+        lBytes = [ArrayUtil intToBytes:magicCode.length];
+    }
+    NSData *bytes = [ArrayUtil dataSplic:pt l:lBytes magic:magicCode data:emptyByte];
+    if (isTotaConnect) {
+        return [self convertToTotaCMD:bytes];
+    }
+    return bytes;
+}
+
+
+
+- (void)notifySuccess {
+//    NSLog(@"notifySuccess---------%d", curSendPacketLength);
+    curSendLength += curSendPacketLength;
+}
+
+- (int)receiveData:(NSData *)receiveData curOtaResult:(int)curOtaResult {
+    if (receiveData == nil || receiveData.length < 1) {
+        return 0;
+    }
+    Byte data[receiveData.length];
+    [receiveData getBytes:data length:receiveData.length];
+    if (data[0] == B_8F) {
+        int typeL = pl + ll + (int)magicCode.length;
+        deviceTypeBytes = data[typeL];
+        if (deviceTypeBytes == 0x00) {
+            deviceType = DEVICE_TYPE_STEREO;
+            if (USER_FLAG == 1) {
+                int lbl = 0;
+                NSData *lb = [receiveData subdataWithRange:NSMakeRange(pl, ll)];
+                [lb getBytes:&lbl length:4];
+                if (lbl > 15) {
+                    NSData *msgData = [receiveData subdataWithRange:NSMakeRange(typeL + 8 + 1, receiveData.length - (typeL + 8 + 1))];
+                    versionMsg = [[[NSString alloc] initWithBytes:msgData.bytes length:msgData.length encoding:NSASCIIStringEncoding] stringByReplacingOccurrencesOfString:@"-" withString:@" "];
+                }
+            }
+            
+        } else if (deviceTypeBytes == 0x01) {
+            deviceType = DEVICE_TYPE_TWS_CONNECT_LEFT;
+        } else if (deviceTypeBytes == 0x02) {
+            deviceType = DEVICE_TYPE_TWS_CONNECT_RIGHT;
+        }
+        int vl = 4;
+        NSData *curVersionLeftData = [receiveData subdataWithRange:NSMakeRange(typeL + 1, vl)];
+        NSData *curVersionRightData = [receiveData subdataWithRange:NSMakeRange(typeL + 1 + vl, vl)];
+        curVersionLeft = [ArrayUtil dealWithString:[ArrayUtil toHex:curVersionLeftData]];
+        curVersionRight = [ArrayUtil dealWithString:[ArrayUtil toHex:curVersionRightData]];
+        return [self getReturnResultWith:OTA_CMD_GET_HW_INFO curState:curOtaResult];
+    }
+    else if (data[0] == B_91) {
+        int confirmL = pl + ll;
+        if (data[confirmL] == CONFIRM_BYTE_PASS) {
+            return [self getReturnResultWith:OTA_CMD_SELECT_SIDE_OK curState:curOtaResult];
+        }
+        return [self getReturnResultWith:OTA_CMD_SELECT_SIDE_ERROR curState:curOtaResult];
+    }
+    else if (data[0] == B_8D) {
+        int breakpointL = pl + ll;
+        Byte bpLengthBytes[4];
+        [receiveData getBytes:bpLengthBytes range:NSMakeRange(breakpointL, 4)];
+        [[NSData dataWithBytes:bpLengthBytes length:4] getBytes:&curSendLength length:4];
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        if (curSendLength > 0) {
+            beforeSendLength = curSendLength;
+            curConfirmLength = curSendLength;
+            if ([defaults valueForKey:BES_OTA_CURRENT_MTU]) {
+                mMtu = [[defaults valueForKey:BES_OTA_CURRENT_MTU] intValue];
+                packetPayload = mMtu - pl - ll;
+                if (useTotaV2) {
+                    packetPayload = (packetPayload - 20) / 16 * 15 + 16;
+                }
+                curSendPacketLength = packetPayload;
+            }
+            return [self getReturnResultWith:OTA_CMD_BREAKPOINT_CHECK curState:curOtaResult];
+        } else {
+            Byte bpRandomBytes[32];
+            [receiveData getBytes:bpRandomBytes range:NSMakeRange(breakpointL + 4, 32)];
+            [defaults setObject:[ArrayUtil toHex:[NSData dataWithBytes:bpRandomBytes length:32]] forKey:BES_OTA_RANDOM_CODE_LEFT];
+            return [self getReturnResultWith:OTA_CMD_BREAKPOINT_CHECK_80 curState:curOtaResult];
+        }
+    }
+    else if (data[0] == B_81) {
+        int vl = pl + ll + (int)magicCode.length;
+        NSData *swVersionBytes = [receiveData subdataWithRange:NSMakeRange(vl, 2)];
+        mSwVersion = [ArrayUtil dealWithString:[ArrayUtil toHex:swVersionBytes]];
+        NSData *hwVersionBytes = [receiveData subdataWithRange:NSMakeRange(vl + swVersionBytes.length, 2)];
+        mHwVersion = [ArrayUtil dealWithString:[ArrayUtil toHex:hwVersionBytes]];
+
+        NSData *mtuBytes = [receiveData subdataWithRange:NSMakeRange(vl + swVersionBytes.length + hwVersionBytes.length, 2)];
+        NSUInteger maxLength = 0;
+        [mtuBytes getBytes:&maxLength length:2];
+        if (maxLength == 0 ||
+            maxLength > DEFAULT_MTU) {
+            maxLength = DEFAULT_MTU;
+        }
+        mMtu = (int)maxLength;
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setObject:[NSString stringWithFormat:@"%lu", (unsigned long)maxLength] forKey:BES_OTA_CURRENT_MTU];
+        packetPayload = mMtu - pl - ll;
+        if (useTotaV2) {
+            packetPayload = (packetPayload - 20) / 16 * 15 + 16;
+        }
+        return [self getReturnResultWith:OTA_CMD_BREAKPOINT_CHECK curState:curOtaResult];
+    }
+    else if (data[0] == B_87) {
+        int confirmL = pl + ll;
+        if (data[confirmL] == CONFIRM_BYTE_PASS) {
+            return OTA_CMD_SEND_CONFIGURE_OK;
+        }
+        return [self getReturnResultWith:OTA_CMD_SEND_CONFIGURE_ERROR curState:curOtaResult];
+    }
+    else if (data[0] == B_83) {
+        int confirmL = pl + ll;
+        if (data[confirmL] == CONFIRM_BYTE_PASS) {
+            crcConfirmTimes ++;
+            curConfirmLength = curSendLength;
+            crcConfirm = false;
+            if (curSendLength == mOtaImageData.length) {
+                return OTA_CMD_WHOLE_CRC_CHECK;
+            }
+            return OTA_CMD_CRC_CHECK_PACKAGE_OK;
+        }
+        return OTA_CMD_CRC_CHECK_PACKAGE_ERROR;
+    }
+    else if (data[0] == B_84) {
+        int confirmL = pl + ll;
+        if (data[confirmL] == CONFIRM_BYTE_PASS) {
+            return OTA_CMD_WHOLE_CRC_CHECK_OK;
+        }
+        return OTA_CMD_WHOLE_CRC_CHECK_ERROR;
+    }
+    else if (data[0] == B_93) {
+        int confirmL = pl + ll;
+        if (data[confirmL] == CONFIRM_BYTE_PASS) {
+            return [self getReturnResultWith:OTA_CMD_IMAGE_OVER_CONFIRM curState:curOtaResult];
+        }
+        return [self getReturnResultWith:OTA_CMD_IMAGE_OVER_CONFIRM_ERROR curState:curOtaResult];
+    }
+    else if (data[0] == B_95) {
+        return OTA_CMD_DISCONNECT;
+    }
+    else if (data[0] == B_9A) {
+        USER_FLAG = 1;
+        [self setOtaUser:USER_FLAG isGatt:isGattConnect isWithoutRsp:isWithoutResponse isTota:isTotaConnect useTotaV2:useTotaV2];
+        return OTA_CMD_GET_PROTOCOL_VERSION;
+    }
+    else if (data[0] == B_98) {
+        int confirmL = pl + ll;
+        if (data[confirmL] == CONFIRM_BYTE_PASS) {
+            return OTA_CMD_SET_OAT_USER_OK;
+        }
+        return OTA_CMD_SET_OAT_USER_ERROR;
+    }
+    else if (data[0] == B_9E) {
+        int confirmL = pl + ll;
+        if (data[confirmL] == 0x01) {
+            return OTA_CMD_SET_UPGRADE_TYPE_NORMAL;
+        } else if (data[confirmL] == 0x02) {
+            return OTA_CMD_SET_UPGRADE_TYPE_FAST;
+        }
+    }
+    else if (data[0] == B_9C) {
+        NSString *dataStr = [ArrayUtil toHex:receiveData];
+        roleSwitchRandomID = [dataStr substringWithRange:NSMakeRange(dataStr.length - 4, 4)];
+        return OTA_CMD_ROLESWITCH_GET_RANDOMID;
+    }
+    else if (data[0] == B_8B) {
+        return OTA_CMD_SEND_OTA_DATA;
+    }
+    else {
+    }
+
+    
+    return 0;
+}
+
+- (void)crcConfirmError {
+    curSendLength = curConfirmLength;
+}
+
+- (NSData *)convertToTotaCMD:(NSData *)data {
+    int totaBytesL = (int)data.length + 2 + 2;
+    Byte totaBytes[totaBytesL];
+    NSData *dataDL = [ArrayUtil intToLittleBytes:data.length];
+    Byte dataDB[dataDL.length];
+    [dataDL getBytes:dataDB length:dataDL.length];
+    totaBytes[0] = (Byte) 0x00;
+    totaBytes[1] = (Byte) 0x90;
+    totaBytes[2] = dataDB[0];
+    totaBytes[3] = dataDB[1];
+    Byte dataB[data.length];
+    [data getBytes:dataB length:data.length];
+    for (int i = 4; i < totaBytesL; i ++) {
+        totaBytes[i] = dataB[i - 4];
+    }
+    return [NSData dataWithBytes:totaBytes length:totaBytesL];
+}
+
+- (int)getReturnResultWith:(int)state curState:(int)curState {
+    if (state < curState) {
+        return OTA_CMD_RETURN;
+    }
+    return state;
+}
+
+- (NSString *)besOtaProgress:(int)total {
+    if (total == 0) {
+        return @"0.00";
+    }
+    double v1 = curSendLength * 100;
+    return [NSString stringWithFormat:@"%0.2f", v1 / total];
+}
+
+- (void)setCrcConfirmState:(BOOL)state {
+    crcConfirm = state;
+}
+
+
+
+
+
+
+
+
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoConstants.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoConstants.h
new file mode 100644
index 00000000..00af9de1
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoConstants.h
@@ -0,0 +1,99 @@
+//
+//  BesOtaConstants.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/2/1.
+//
+
+#import <Foundation/Foundation.h>
+
+typedef enum : NSUInteger {
+    STATUS_UNKNOWN,
+    STATUS_STARTED,
+    STATUS_CANCELED,
+    STATUS_FAILED,
+    STATUS_SUCCEED,
+    STATUS_REBOOT
+} BesOTAStatus;
+
+
+NS_ASSUME_NONNULL_BEGIN
+    //cmd msg
+    static int                        OTA_CMD_RETURN = 0x00000900;
+    static int          OTA_CMD_GET_PROTOCOL_VERSION = 0x00000901;
+    static int               OTA_CMD_SET_OAT_USER_OK = 0x00000902;
+    static int                   OTA_CMD_GET_HW_INFO = 0x00000903;
+    static int       OTA_CMD_SET_UPGRADE_TYPE_NORMAL = 0x00000904;
+    static int         OTA_CMD_SET_UPGRADE_TYPE_FAST = 0x00000905;
+    static int       OTA_CMD_ROLESWITCH_GET_RANDOMID = 0x00000906;
+    static int                OTA_CMD_SELECT_SIDE_OK = 0x00000907;
+    static int           OTA_CMD_BREAKPOINT_CHECK_80 = 0x00000908;
+    static int              OTA_CMD_BREAKPOINT_CHECK = 0x00000909;
+    static int             OTA_CMD_SEND_CONFIGURE_OK = 0x00000910;
+    static int                    OTA_CMD_DISCONNECT = 0x00000911;
+    static int                 OTA_CMD_SEND_OTA_DATA = 0x00000912;
+    static int             OTA_CMD_CRC_CHECK_PACKAGE = 0x00000913;
+    static int          OTA_CMD_CRC_CHECK_PACKAGE_OK = 0x00000914;
+    static int               OTA_CMD_WHOLE_CRC_CHECK = 0x00000915;
+    static int            OTA_CMD_WHOLE_CRC_CHECK_OK = 0x00000916;
+    static int            OTA_CMD_IMAGE_OVER_CONFIRM = 0x00000917;
+    static int                OTA_SEND_DATA_PROGRESS = 0x00000918;
+    static int                OTA_STOP_DATA_TRANSFER = 0x00000919;
+//error
+    static int                   OTA_START_OTA_ERROR = 0x00000940;
+    static int             OTA_CMD_SELECT_SIDE_ERROR = 0x00000941;
+    static int          OTA_CMD_SEND_CONFIGURE_ERROR = 0x00000942;
+    static int       OTA_CMD_CRC_CHECK_PACKAGE_ERROR = 0x00000943;
+    static int         OTA_CMD_WHOLE_CRC_CHECK_ERROR = 0x00000944;
+    static int      OTA_CMD_IMAGE_OVER_CONFIRM_ERROR = 0x00000945;
+    static int            OTA_CMD_SET_OAT_USER_ERROR = 0x00000946;
+
+//handle_msg
+   static int              MSG_GET_VERSION_TIME_OUT = 0x00000950;
+   static int             MSG_GET_RANDOMID_TIME_OUT = 0x00000951;
+   static int                MSG_OTA_OVER_RECONNECT = 0x00000952;
+   static int     MSG_GET_PROTOCOL_VERSION_TIME_OUT = 0x00000953;
+   static int         MSG_GET_UPGRATE_TYPE_TIME_OUT = 0x00000954;
+   static int          MSG_GET_SELECT_SIDE_TIME_OUT = 0x00000955;
+   static int    MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT = 0x00000956;
+   static int                 MSG_SET_USER_TIME_OUT = 0x00000957;
+
+   //devicetype
+    static int                    DEVICE_TYPE_STEREO = 0x00000930;
+    static int          DEVICE_TYPE_TWS_CONNECT_LEFT = 0x00000931;
+    static int         DEVICE_TYPE_TWS_CONNECT_RIGHT = 0x00000932;
+
+
+    static Byte               CONFIRM_BYTE_PASS = 0x01;
+    static Byte               CONFIRM_BYTE_FAIL = 0x00;
+
+
+  //SPHelper
+    static NSString*                    BES_OTA_RANDOM_CODE_LEFT = @"BES_OTA_RANDOM_CODE_LEFT";
+    static NSString*                   BES_OTA_RANDOM_CODE_RIGHT = @"BES_OTA_RANDOM_CODE_RIGHT";
+    static NSString*                         BES_OTA_CURRENT_MTU = @"BES_OTA_CURRENT_MTU";
+
+    static BOOL                    DEFAULT_CLEAR_USER_DATA = false;
+    static BOOL                  DEFAULT_UPDATE_BT_ADDRESS = false;
+    static BOOL                     DEFAULT_UPDATE_BT_NAME = false;
+    static BOOL                 DEFAULT_UPDATE_BLE_ADDRESS = false;
+    static BOOL                    DEFAULT_UPDATE_BLE_NAME = false;
+
+    //@"YES" : @"NO"
+    static NSString*               KEY_OTA_CONFIG_CLEAR_USER_DATA = @"ota_config_clear_user_data";
+    static NSString*             KEY_OTA_CONFIG_UPDATE_BT_ADDRESS = @"ota_config_update_bt_address";
+    static NSString*       KEY_OTA_CONFIG_UPDATE_BT_ADDRESS_VALUE = @"ota_config_update_bt_address_value";
+    static NSString*                KEY_OTA_CONFIG_UPDATE_BT_NAME = @"ota_config_update_bt_name";
+    static NSString*          KEY_OTA_CONFIG_UPDATE_BT_NAME_VALUE = @"ota_config_update_bt_name_value";
+    static NSString*            KEY_OTA_CONFIG_UPDATE_BLE_ADDRESS = @"ota_config_update_ble_address";
+    static NSString*      KEY_OTA_CONFIG_UPDATE_BLE_ADDRESS_VALUE = @"ota_config_update_ble_address_value";
+    static NSString*               KEY_OTA_CONFIG_UPDATE_BLE_NAME = @"ota_config_update_ble_name";
+    static NSString*         KEY_OTA_CONFIG_UPDATE_BLE_NAME_VALUE = @"ota_config_update_ble_name_value";
+
+@interface BesOtaConstants : NSObject
+
+
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoConstants.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoConstants.m
new file mode 100644
index 00000000..41e88364
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoConstants.m
@@ -0,0 +1,12 @@
+//
+//  BesOtaConstants.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/2/1.
+//
+
+#import "BesTotaDemoConstants.h"
+
+@implementation BesOtaConstants
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoService.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoService.h
new file mode 100644
index 00000000..c33a4c95
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoService.h
@@ -0,0 +1,40 @@
+//
+//  BesOtaService.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/30.
+//
+
+#import <Foundation/Foundation.h>
+#import "BesBaseService.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol BesOTAServiceDelegate <NSObject>
+
+@required
+- (void)onStatusChanged:(BesConnectStateCorrect)state msg:(NSString *)msg;
+- (void)onFailed:(BesConnectStateError)state msg:(NSString *)msg;
+- (void)onDataReceived:(NSData *)data;
+- (void)onOtaStatusChanged:(int)state msg:(NSString *)msg;
+- (void)onOTAProgressChanged:(NSString *)progress;
+- (void)onOtaError:(int)state;
+- (void)onOtaSuccess:(int)state;
+
+@end
+
+@interface BesOtaService : NSObject
+@property (nonatomic, strong) BesServiceConfig *serviceConfig;
+@property (nonatomic, weak) id<BesOTAServiceDelegate> delegate;
+
+- (instancetype)initWithConfig:(BesServiceConfig *)config;
+
+- (void)connectDecviceWithConfig:(BesServiceConfig *)config;
+- (void)disconnect:(CBPeripheral *)device;
+- (void)setOtaConfig:(BesServiceConfig *)config;
+- (BOOL)startDataTransfer;
+- (void)stopDataTransfer;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoService.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoService.m
new file mode 100644
index 00000000..0ddae3db
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/service/TotaDemo/BesTotaDemoService.m
@@ -0,0 +1,613 @@
+//
+//  BesOtaService.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/1/30.
+//
+
+#import "BesTotaDemoService.h"
+#import "BesTotaDemoCMD.h"
+#import "BesTotaDemoConstants.h"
+#import "ArrayUtil.h"
+#import "FileUtils.h"
+
+@interface BesOtaService()<BesBseServiceDelegate>
+{
+    int curOtaResult;
+    NSString *roleSwitchRandomID;
+    BOOL roleSwitchDisconnect;
+    NSData *totaData;
+    BesOTAStatus mOTAStatus;
+    BOOL isConnect;
+    int getVersionRetryTimes;
+    int getProtocolRetryTimes;
+    int setUserRetryTimes;
+    int crcPackageRetryTimes;
+    int connectRetryTimes;
+    int getCrcConfirmRetryTimes;
+    BOOL currentOrLegacy;
+    int USER_FLAG;
+    int curUser;//1:fw 2:language 3:combine
+    int curUpgateType;
+    BOOL isWithoutResponse;
+    
+    BOOL scanSuccess;
+}
+@property (nonatomic, strong) NSTimer *timer;
+@property (nonatomic, assign) int timerCount;
+@property (nonatomic, strong) BesBaseService *service;
+@property (nonatomic, strong) BesOtaCMD *besOtaCMD;
+
+@end
+
+@implementation BesOtaService
+
+- (instancetype)initWithConfig:(BesServiceConfig *)config {
+    if (self = [super init]) {
+        curOtaResult = 0;
+        isWithoutResponse = NO;
+        mOTAStatus = STATUS_UNKNOWN;
+        roleSwitchRandomID = @"";
+        roleSwitchDisconnect = NO;
+        getVersionRetryTimes = 0;
+        getProtocolRetryTimes = 0;
+        setUserRetryTimes = 0;
+        crcPackageRetryTimes = 0;
+        connectRetryTimes = 0;
+        getCrcConfirmRetryTimes = 0;
+        isConnect = NO;
+        currentOrLegacy = YES;
+        scanSuccess = NO;
+
+        self.serviceConfig = config;
+        USER_FLAG = self.serviceConfig.USER_FLAG ? self.serviceConfig.USER_FLAG : 0;
+        curUser = self.serviceConfig.curUser ? self.serviceConfig.curUser : 1;
+        curUpgateType = self.serviceConfig.curUpgateType ? self.serviceConfig.curUpgateType : 1;
+        isWithoutResponse = self.serviceConfig.isWithoutResponse ? self.serviceConfig.isWithoutResponse : isWithoutResponse;
+        self.service = [BesBaseService shareInstance];
+        self.service.delegate = self;
+        self.besOtaCMD = [[BesOtaCMD alloc] init];
+        [self.besOtaCMD setOtaUser:USER_FLAG isGatt:(self.serviceConfig.protocol == BES_PROTOCOL_GATT ? YES : NO) isWithoutRsp:isWithoutResponse isTota:self.serviceConfig.totaConnect useTotaV2:self.serviceConfig.useTotaV2];
+    }
+    return self;
+}
+
+- (void)connectDecviceWithConfig:(BesServiceConfig *)config {
+    [self.service connectDecvice:config];
+}
+
+- (void)disconnect:(CBPeripheral *)device {
+    [self.service disconnect:device];
+}
+
+- (void)sendData:(NSData *)data {
+    [self.service sendData:data];
+}
+
+- (void)sendDataWithOutResponse:(NSData *)data {
+    [self.service sendDataWithOutResponse:data];
+}
+
+- (void)sendData:(NSData *)data delay:(int)millis {
+    [self.service sendData:data delay:millis];
+}
+
+- (void)setOtaConfig:(BesServiceConfig *)config {
+    self.serviceConfig.localPath = config.localPath;
+}
+
+- (BOOL)startDataTransfer {
+    if (curOtaResult == OTA_CMD_BREAKPOINT_CHECK_80) {
+        [self sendData:[self.besOtaCMD getStartOTAPacketCMD:totaData]];
+        return true;
+    }
+    
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    if (self.serviceConfig.localPath == nil || ![fileManager fileExistsAtPath:self.serviceConfig.localPath]) {
+        [self callBackErrorMessage:OTA_START_OTA_ERROR];
+        return NO;
+    }
+    totaData = [NSData dataWithContentsOfFile:self.serviceConfig.localPath];
+    if (self.serviceConfig.getBreakpoint == 0) {
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        [defaults removeObjectForKey:BES_OTA_RANDOM_CODE_LEFT];
+    }
+    if (curOtaResult == OTA_CMD_SEND_OTA_DATA) {
+        return false;
+    }
+    [self startOta];
+    return YES;
+}
+
+- (void)stopDataTransfer {
+    mOTAStatus = STATUS_CANCELED;
+    [self callBackStateChangedMessage:OTA_STOP_DATA_TRANSFER msg:@""];
+    if (self.service) {
+        [self.service stopScan];
+        self.service = nil;
+        //destoryVariable
+        
+        
+    }
+}
+
+- (void)getCurrentVersion {
+    mOTAStatus = STATUS_STARTED;
+    [self sendData:[self.besOtaCMD getCurrentVersionCMD]];
+    [self.service addTimeOut:3000 what:MSG_GET_VERSION_TIME_OUT];
+}
+
+- (void)startOta {
+    mOTAStatus = STATUS_STARTED;
+
+    [self sendUpgrateTypeData];
+//    [self sendGetROLESwitchRandomIDData];
+}
+
+- (void)sendGetProtocolVersionData {
+    [self sendData:[self.besOtaCMD getOtaProtocolVersionCMD:currentOrLegacy] delay:200];
+    [self.service addTimeOut:3000 what:MSG_GET_PROTOCOL_VERSION_TIME_OUT];
+}
+
+- (void)sendSetUserData {
+    [self sendData:[self.besOtaCMD getSetOtaUserCMD:curUser]];
+    [self.service addTimeOut:3000 what:MSG_SET_USER_TIME_OUT];
+}
+
+- (void)sendUpgrateTypeData {
+    [self sendData:[self.besOtaCMD getSetUpgrateTypeCMD:curUpgateType]];
+    [self.service addTimeOut:3000 what:MSG_GET_UPGRATE_TYPE_TIME_OUT];
+}
+
+- (void)sendGetROLESwitchRandomIDData {
+    if (roleSwitchRandomID.length > 0) {
+        [self sendSelectSideData];
+        return;
+    }
+    [self sendData:[self.besOtaCMD getROLESwitchRandomIDCMD]];
+    [self.service addTimeOut:3000 what:MSG_GET_RANDOMID_TIME_OUT];
+}
+
+- (void)sendSelectSideData {
+    [self sendData:[self.besOtaCMD getSelectSideCMD]];
+    [self.service addTimeOut:3000 what:MSG_GET_SELECT_SIDE_TIME_OUT];
+}
+
+- (void)besSendData {
+    if (roleSwitchDisconnect) {
+        [self.timer invalidate];
+        self.timer = nil;
+        return;
+    }
+    
+    int interval = 50;
+    if (USER_FLAG == 1 && isWithoutResponse) {
+        if (self.serviceConfig.protocol == BES_PROTOCOL_GATT) {
+            interval = 50;
+            if ([[NSUserDefaults standardUserDefaults] valueForKey:@"BESINTERVAL_gatt"]) {
+                interval = ((NSString *)[[NSUserDefaults standardUserDefaults] valueForKey:@"BESINTERVAL_gatt"]).intValue;
+            }
+        } else if (self.serviceConfig.protocol == BES_PROTOCOL_BLE) {
+            interval = 50;
+            if ([[NSUserDefaults standardUserDefaults] valueForKey:@"BESINTERVAL_ble"]) {
+                interval = ((NSString *)[[NSUserDefaults standardUserDefaults] valueForKey:@"BESINTERVAL_ble"]).intValue;
+            }
+        }
+        self.timer = [NSTimer scheduledTimerWithTimeInterval:(double)interval / 1000 target:self selector:@selector(timerSendData) userInfo:nil repeats:YES];
+        [self.timer fire];
+    } else {
+        [self sendPacketDataOld];
+    }
+}
+
+- (void)timerSendData {
+    [self sendPacketData];
+}
+
+- (void)sendPacketData {
+    if (roleSwitchDisconnect) {
+        [self.timer invalidate];
+        self.timer = nil;
+        return;
+    }
+    if (!totaData) {
+        return;
+    }
+    if ([self.delegate respondsToSelector:@selector(onOTAProgressChanged:)]) {
+        [self.delegate onOTAProgressChanged:[self.besOtaCMD besOtaProgress:(int)totaData.length]];
+    }
+    
+    NSData *data = [self.besOtaCMD getDataPacketCMD:totaData];
+    Byte dataB[data.length];
+    [data getBytes:dataB length:data.length];
+    if (dataB[self.serviceConfig.totaConnect ? 4 : 0] != 0x85) {
+        curOtaResult = 0;
+        [self.timer invalidate];
+        self.timer = nil;
+    } else {
+        [self.besOtaCMD notifySuccess];
+    }
+    if (dataB[self.serviceConfig.totaConnect ? 4 : 0] == (Byte)0x82) {
+        [self.service addTimeOut:5000 what:MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT];
+    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (self.timer) {
+            [self.service sendDataWithOutResponse:data];
+        } else {
+            [self.service sendData:data];
+        }
+    });
+}
+
+- (void)sendPacketDataOld {
+    if (!totaData) {
+        return;
+    }
+    
+    if ([self.delegate respondsToSelector:@selector(onOTAProgressChanged:)]) {
+        [self.delegate onOTAProgressChanged:[self.besOtaCMD besOtaProgress:(int)totaData.length]];
+    }
+    
+    NSData *data = [self.besOtaCMD getDataPacketCMD:totaData];
+    Byte dataB[data.length];
+    [data getBytes:dataB length:data.length];
+    if (dataB[0] != 0x85) {
+        curOtaResult = 0;
+    }
+    if (dataB[0] == (Byte)0x82) {
+        [self.service addTimeOut:5000 what:MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT];
+    }
+    [self.service sendData:data];
+}
+
+- (void)scanToReConnected {
+    [self LOG:[NSString stringWithFormat:@"scanToReConnected--------"]];
+    curOtaResult = 0;
+    mOTAStatus = STATUS_REBOOT;
+    [self.service stopScan];
+    
+    scanSuccess = NO;
+    dispatch_async(dispatch_get_global_queue(0, 0), ^{
+        sleep(3);
+        if (!(self->scanSuccess)) {
+            [self scanToReConnected];
+        }
+    });
+    
+    [self.service startScanWithServices:@[] options:@{} isGatt:self.serviceConfig.protocol == BES_PROTOCOL_GATT ? YES : NO];
+}
+
+- (void)onScanResult:(CBPeripheral *)device advertisementData:(NSDictionary<NSString *,id> *)advertisementData RSSI:(NSNumber *)RSSI {
+    [self LOG:[NSString stringWithFormat:@"onScanResult-------------%@", device]];
+    scanSuccess = YES;
+
+    NSData *data = advertisementData[@"kCBAdvDataManufacturerData"];
+    if (data) {
+        Byte bytes[[data length]];
+        [data getBytes:bytes range:NSMakeRange(0, data.length)];
+        for(int i = 0; i < data.length; i ++) {
+            NSData *idata = [data subdataWithRange:NSMakeRange(i, 1)];
+            bytes[i] =((Byte*)[idata bytes])[0];
+        }
+                  
+        NSString *macs = @"";
+        for (int i = 0; i < data.length; i ++) {
+            NSString *strByte = [[NSString stringWithFormat:@"%02x",bytes[i]] uppercaseString];
+            macs = [NSString stringWithFormat:@"%@%@", macs, strByte];
+        }
+        macs = [macs substringFromIndex:macs.length - 4];
+        [self LOG:[NSString stringWithFormat:@"scanToReConnected -->macs----%@", macs]];
+
+        if ([roleSwitchRandomID.uppercaseString isEqualToString:macs.uppercaseString]) {
+            [self.service stopScan];
+            self.serviceConfig.device = device;
+            [self connectDecviceWithConfig:self.serviceConfig];
+        }
+    }
+    
+}
+
+#pragma mark-----------BesBseServiceDelegate
+- (void)onTotaConnectState:(BOOL)state {
+    if (state == true) {
+        [self LOG:[NSString stringWithFormat:@"onStatusChanged: ------TotaSUCCESS"]];
+        if ([self.delegate respondsToSelector:@selector(onStatusChanged:msg:)]) {
+            [self.delegate onStatusChanged:BES_CONNECT_NOTIFY_SUCCESS msg:@""];
+        }
+        roleSwitchDisconnect = NO;
+        connectRetryTimes = 0;
+        isConnect = YES;
+        [self callBackStateChangedMessage:BES_CONNECT_SUCCESS msg:@""];
+        if (self.serviceConfig.USER_FLAG == 1) {
+            [self sendGetProtocolVersionData];
+        } else {
+//            [self getCurrentVersion];
+            [self sendSetUserData];
+        }
+        
+    } else {
+        if ([self.delegate respondsToSelector:@selector(onFailed:msg:)]) {
+            [self.delegate onFailed:BES_CONNECT_NOTIFY_FAIL msg:@"TOTA Error"];
+        }
+    }
+}
+
+- (void)onStatusChanged:(BesConnectStateCorrect)state msg:(NSString *)msg {
+    if ([self.delegate respondsToSelector:@selector(onStatusChanged:msg:)]) {
+        [self.delegate onStatusChanged:state msg:msg];
+    }
+    if (state == BES_CONNECT_NOTIFY_SUCCESS) {
+        [self LOG:[NSString stringWithFormat:@"onStatusChanged: ------SUCCESS"]];
+        roleSwitchDisconnect = NO;
+        connectRetryTimes = 0;
+        isConnect = YES;
+        [self callBackStateChangedMessage:BES_CONNECT_SUCCESS msg:@""];
+        if (self.serviceConfig.USER_FLAG == 1) {
+            [self sendGetProtocolVersionData];
+        } else {
+//            [self getCurrentVersion];
+            [self sendSetUserData];
+        }
+    }
+}
+
+- (void)onFailed:(BesConnectStateError)state msg:(NSString *)msg {
+    [self LOG:[NSString stringWithFormat:@"onFailed----------%lu----%@", (unsigned long)state, msg]];
+    
+    isConnect = NO;
+    if (mOTAStatus == STATUS_CANCELED) {
+        return;
+    }
+    if (mOTAStatus != STATUS_UNKNOWN) {
+        if (mOTAStatus != STATUS_SUCCEED && mOTAStatus != STATUS_CANCELED && mOTAStatus != STATUS_FAILED && roleSwitchRandomID.length > 0) {
+            [self scanToReConnected];
+        } else if (mOTAStatus == STATUS_SUCCEED) {
+            //耳机升级后重连
+            [self.service addTimeOut:15000 what:MSG_OTA_OVER_RECONNECT];
+        } else {
+            [self callBackErrorMessage:BES_CONNECT_FAIL];
+        }
+        return;
+    }
+    connectRetryTimes ++;
+    if (connectRetryTimes > 2) {
+        [self callBackStateChangedMessage:BES_CONNECT_FAIL msg:@"重试3次后失败"];
+        [self.service stopScan];
+        return;
+    }
+    [self connectDecviceWithConfig:self.serviceConfig];
+}
+
+- (void)onDataReceived:(NSData *)data {
+    [self LOG:[NSString stringWithFormat:@"onDataReceived-------%@", data]];
+
+    if ([self.delegate respondsToSelector:@selector(onDataReceived:)]) {
+        [self.delegate onDataReceived:data];
+    }
+    if (self.serviceConfig.totaConnect) {
+        Byte finData[data.length - 4];
+        [data getBytes:finData range:NSMakeRange(4, data.length - 4)];
+        data = [NSData dataWithBytes:finData length:data.length - 4];
+    }
+    int result = [self.besOtaCMD receiveData:data curOtaResult:curOtaResult];
+    curOtaResult = result;
+    if (result == OTA_CMD_GET_HW_INFO) {
+        getVersionRetryTimes = 0;
+        [self.service removeTimeOutWithWhat:MSG_GET_VERSION_TIME_OUT];
+        [self callBackStateChangedMessage:result msg:[self.besOtaCMD getCurrentVersion]];
+        if (roleSwitchRandomID.length > 0 && mOTAStatus != STATUS_SUCCEED) {
+            [self startOta];
+            return;
+        }
+    } else if (result == OTA_CMD_GET_PROTOCOL_VERSION) {
+        [self.service removeTimeOutWithWhat:MSG_GET_PROTOCOL_VERSION_TIME_OUT];
+        getProtocolRetryTimes = 0;
+        [self callBackStateChangedMessage:result msg:@""];
+        [self sendData:[self.besOtaCMD getSetOtaUserCMD:curUser]];
+    } else if (result == OTA_CMD_SET_OAT_USER_OK) {
+        setUserRetryTimes = 0;
+        [self.service removeTimeOutWithWhat:MSG_SET_USER_TIME_OUT];
+        [self callBackStateChangedMessage:result msg:@""];
+        [self getCurrentVersion];
+    } else if (result == OTA_CMD_SET_UPGRADE_TYPE_NORMAL) {
+        [self.service removeTimeOutWithWhat:MSG_GET_UPGRATE_TYPE_TIME_OUT];
+        [self callBackStateChangedMessage:result msg:@""];
+        [self sendGetROLESwitchRandomIDData];
+    } else if (result == OTA_CMD_SET_UPGRADE_TYPE_FAST) {
+        [self.service removeTimeOutWithWhat:MSG_GET_UPGRATE_TYPE_TIME_OUT];
+        [self callBackStateChangedMessage:result msg:@""];
+        [self sendGetROLESwitchRandomIDData];
+    } else if (result == OTA_CMD_ROLESWITCH_GET_RANDOMID) {
+        [self.service removeTimeOutWithWhat:MSG_GET_RANDOMID_TIME_OUT];
+        roleSwitchRandomID = [self.besOtaCMD getRoleSwitchRandomID];
+        [self callBackStateChangedMessage:result msg:roleSwitchRandomID];
+        [self sendSelectSideData];
+    } else if (result == OTA_CMD_SELECT_SIDE_OK) {
+        [self.service removeTimeOutWithWhat:MSG_GET_SELECT_SIDE_TIME_OUT];
+        [self callBackStateChangedMessage:result msg:@""];
+        [self sendData:[self.besOtaCMD getCheckBreakPointCMD]];
+    } else if (result == OTA_CMD_BREAKPOINT_CHECK_80) {
+        [self callBackStateChangedMessage:result msg:@""];
+        //sendData
+        //show config
+//        [self sendData:[self.besOtaCMD getStartOTAPacketCMD:totaData]];
+    } else if (result == OTA_CMD_BREAKPOINT_CHECK) {
+        [self callBackStateChangedMessage:result msg:@""];
+        [self sendData:[self.besOtaCMD getOTAConfigureCMD:totaData]];
+    } else if (result == OTA_CMD_SEND_OTA_DATA) {
+        [self.besOtaCMD notifySuccess];
+        [self besSendData];
+    } else if (result == OTA_CMD_SEND_CONFIGURE_OK) {
+        curOtaResult = OTA_CMD_SEND_OTA_DATA;
+        [self callBackStateChangedMessage:result msg:@""];
+        [self besSendData];
+    } else if (result == OTA_CMD_CRC_CHECK_PACKAGE_OK) {
+        [self.service removeTimeOutWithWhat:MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT];
+        getCrcConfirmRetryTimes = 0;
+        crcPackageRetryTimes = 0;
+        curOtaResult = OTA_CMD_SEND_OTA_DATA;
+//        trapezoidData = YES;
+        [self besSendData];
+    } else if (result == OTA_CMD_WHOLE_CRC_CHECK) {
+        [self.service removeTimeOutWithWhat:MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT];
+        [self besSendData];
+    } else if (result == OTA_CMD_DISCONNECT) {
+        [self callBackStateChangedMessage:result msg:@""];
+        roleSwitchDisconnect = true;
+        //疑问
+        if (mOTAStatus == STATUS_SUCCEED) {
+            [self.service addTimeOut:3000 what:OTA_CMD_DISCONNECT];
+        }
+    } else if (result == OTA_CMD_WHOLE_CRC_CHECK_OK) {
+        [self callBackStateChangedMessage:result msg:@""];
+        [self sendData:[self.besOtaCMD getImageOverwritingConfirmationPacketCMD]];
+    } else if (result == OTA_CMD_IMAGE_OVER_CONFIRM) {
+        [self LOG:[NSString stringWithFormat:@"onDataReceived: -------ota success"]];
+
+        mOTAStatus = STATUS_SUCCEED;
+        [self callBackSuccessMessage:result];
+        [[NSUserDefaults standardUserDefaults] removeObjectForKey:BES_OTA_RANDOM_CODE_LEFT];
+    } else if (result == OTA_CMD_CRC_CHECK_PACKAGE_ERROR && crcPackageRetryTimes < 3) {
+        [self.service removeTimeOutWithWhat:MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT];
+        crcPackageRetryTimes ++;
+        [self callBackStateChangedMessage:result msg:[NSString stringWithFormat:@"%d", crcPackageRetryTimes]];
+        [self.besOtaCMD crcConfirmError];
+        curOtaResult = OTA_CMD_SEND_OTA_DATA;
+        [self besSendData];
+    }
+    else if (result == OTA_CMD_RETURN) {
+        [self LOG:[NSString stringWithFormat:@"onDataReceived: OTA_CMD_RETURN------------OTA_CMD_RETURN"]];
+
+    }
+    else {
+        if (result == OTA_CMD_CRC_CHECK_PACKAGE_ERROR) {
+            [self.service removeTimeOutWithWhat:MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT];
+        } else if (result == OTA_CMD_SET_OAT_USER_ERROR) {
+            setUserRetryTimes = 0;
+            [self.service removeTimeOutWithWhat:MSG_SET_USER_TIME_OUT];
+        }
+        mOTAStatus = STATUS_FAILED;
+        [self callBackErrorMessage:result];
+        //destoryVariable
+        
+    }
+}
+
+- (void)onWriteSuccessOrError:(NSError *)error {
+    if (USER_FLAG < 1 || !isWithoutResponse) {
+        [self LOG:[NSString stringWithFormat:@"写入成功----%@", error]];
+        if (curOtaResult == OTA_CMD_SEND_OTA_DATA) {
+            [self.besOtaCMD notifySuccess];
+            [self besSendData];
+        }
+    }
+}
+
+- (void)msgTimeOut {
+//    [self LOG:[NSString stringWithFormat:@"--------msgTimeOut"]];
+
+
+}
+
+- (void)msgTimeOutWithWhat:(int)what {
+    [self LOG:[NSString stringWithFormat:@"--------msgTimeOutWithWhat----%d", what]];
+
+    if (what == MSG_GET_VERSION_TIME_OUT) {
+        if (getVersionRetryTimes > 2) {
+            [self callBackErrorMessage:what];
+        } else if (isConnect) {
+            getVersionRetryTimes ++;
+            [self getCurrentVersion];
+        } else {
+            getVersionRetryTimes = 0;
+        }
+    }
+    else if (what == OTA_CMD_DISCONNECT || !isConnect) {
+        [self.service disconnect:self.serviceConfig.device];
+    }
+    else if (what == MSG_GET_RANDOMID_TIME_OUT) {
+        [self callBackStateChangedMessage:what msg:@""];
+        [self sendSelectSideData];
+    } else if (what == MSG_OTA_OVER_RECONNECT) {
+        //
+        [self LOG:[NSString stringWithFormat:@"升级成功后扫描重连"]];
+
+    } else if (what == MSG_GET_PROTOCOL_VERSION_TIME_OUT) {
+        if (roleSwitchRandomID.length > 0) {
+            [self disconnect:self.serviceConfig.device];
+            return;
+        }
+        if (USER_FLAG == 1) {
+            if (getProtocolRetryTimes > 2 || !isConnect) {
+                mOTAStatus = STATUS_FAILED;
+                [self callBackErrorMessage:MSG_GET_PROTOCOL_VERSION_TIME_OUT];
+            } else {
+                getProtocolRetryTimes ++;
+                [self sendGetProtocolVersionData];
+            }
+            return;
+        }
+        [self sendUpgrateTypeData];
+    } else if (what == MSG_GET_UPGRATE_TYPE_TIME_OUT) {
+        [self callBackStateChangedMessage:what msg:@""];
+        [self sendGetROLESwitchRandomIDData];
+    } else if (what == MSG_GET_CRC_CHECK_PACKAGE_TIME_OUT) {
+        //resend 82
+        if (getCrcConfirmRetryTimes > 1) {
+            [self callBackErrorMessage:OTA_CMD_CRC_CHECK_PACKAGE_ERROR];
+            return;
+        }
+        getCrcConfirmRetryTimes ++;
+        [self.besOtaCMD setCrcConfirmState:true];
+        [self besSendData];
+    } else if (what == MSG_SET_USER_TIME_OUT) {
+        if (setUserRetryTimes > 1) {
+            if (USER_FLAG == 0) {
+                [self getCurrentVersion];
+            } else {
+                [self callBackErrorMessage:OTA_CMD_SET_OAT_USER_ERROR];
+            }
+            return;
+        }
+        setUserRetryTimes ++;
+        [self sendSetUserData];
+    }
+
+
+}
+
+
+//callback
+- (void)callBackStateChangedMessage:(int)state msg:(NSString *)msg {
+    if ([self.delegate respondsToSelector:@selector(onOtaStatusChanged:msg:)]) {
+        [self.delegate onOtaStatusChanged:state msg:msg];
+    }
+}
+
+- (void)callBackErrorMessage:(int)state {
+    if ([self.delegate respondsToSelector:@selector(onOtaError:)]) {
+        [self.delegate onOtaError:state];
+    }
+}
+
+- (void)callBackSuccessMessage:(int)state {
+    if ([self.delegate respondsToSelector:@selector(onOtaSuccess:)]) {
+        [self.delegate onOtaSuccess:state];
+    }
+}
+
+- (void)LOG:(NSString *)text {
+    if (BES_SHOW_CONSOLE_LOG) {
+        NSLog(@"%@", text);
+    }
+    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+    if (![defaults valueForKey:BES_SAVE_LOG_KEY]) {
+        [defaults setObject:BES_SAVE_DEFAULT_VALUE forKey:BES_SAVE_LOG_KEY];
+    }
+    if ([[defaults valueForKey:BES_SAVE_LOG_KEY] isEqual:@"YES"] && [defaults valueForKey:BES_SAVE_LOG_TITLE_KEY]) {
+        [FileUtils saveStringToDocumentWithName:[NSString stringWithFormat:@"%@.txt", [defaults valueForKey:BES_SAVE_LOG_TITLE_KEY]] text:text];
+    }
+}
+
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSData+XCYCoreTransfor.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSData+XCYCoreTransfor.h
new file mode 100644
index 00000000..54acb0b7
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSData+XCYCoreTransfor.h
@@ -0,0 +1,15 @@
+//
+//  XCYCoreTransfor.h
+//  XCYCoreTransfor
+//
+//  Created by XCY on 15/7/22.
+//  Copyright (c) 2015年 CMBC. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSData (XCYCoreTransfor)
+
+- (uint32_t)CRC32Value_xcy;
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSData+XCYCoreTransfor.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSData+XCYCoreTransfor.m
new file mode 100644
index 00000000..f9a85b67
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSData+XCYCoreTransfor.m
@@ -0,0 +1,23 @@
+//
+//  XCYCoreTransfor
+//  CMBCBaseCore
+//
+//  Created by XCYCoreTransfor on 15/7/22.
+//  Copyright (c) 2015年 XCYCoreTransfor. All rights reserved.
+//
+
+#import "NSData+XCYCoreTransfor.h"
+#include <zlib.h>
+
+
+@implementation NSData (CMBCCoreTransfor)
+
+
+- (uint32_t)CRC32Value_xcy {
+    
+    uLong crc = crc32(0L, Z_NULL, 0);
+    crc = crc32(crc, [self bytes], (uInt)[self length]);
+    return (uint32_t)crc;
+}
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSString+XCYCoreOperation.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSString+XCYCoreOperation.h
new file mode 100644
index 00000000..59f8920e
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSString+XCYCoreOperation.h
@@ -0,0 +1,28 @@
+//
+//  NSString+XCYStrOperation.h
+//  XCY
+//
+//  Created by XCY on 15/7/22.
+//  Copyright (c) 2015年 XCY. All rights reserved.
+//
+
+
+#import <Foundation/Foundation.h>
+
+@interface NSString (XCYCoreOperation)
+- (NSString *)trimString_xcy;
+/**
+ *  安全获取，如果str为空那么返回@""
+ *
+ *  @param str 目标字符串
+ *
+ *  @return 字符串
+ */
++ (NSString *)safeGet_xcy:(NSString *)str;
+
+
++ (NSString*)stringFromData_cmbc:(NSData *)data;
+
+
+- (NSData *)dataFromHexString_xcy;
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSString+XCYCoreOperation.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSString+XCYCoreOperation.m
new file mode 100644
index 00000000..51dd8b4f
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/tools/category/NSString+XCYCoreOperation.m
@@ -0,0 +1,64 @@
+//
+//  NSString+XCYOperation.m
+//  XCy
+//
+//  Created by XCY on 15/7/22.
+//  Copyright (c) 2015年 XCY. All rights reserved.
+//
+#import "NSString+XCYCoreOperation.h"
+
+
+@implementation NSString (XCYCoreOperation)
+-(NSString *)trimString_xcy
+{
+    return [self stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+
+}
+
+
++ (NSString *)safeGet_xcy:(NSString *)str
+{
+    if (!str) {
+        return @"";
+    }
+    return str;
+}
+
+- (nullable NSData *)dataFromHexString_xcy
+{
+    const char *chars = [self UTF8String];
+    int i = 0;
+    NSUInteger len = self.length;
+    
+    NSMutableData *data = [NSMutableData dataWithCapacity:len / 2];
+    char byteChars[3] = {'\0','\0','\0'};
+    unsigned long wholeByte;
+    
+    while (i < len) {
+        byteChars[0] = chars[i++];
+        byteChars[1] = chars[i++];
+        wholeByte = strtoul(byteChars, NULL, 16);
+        [data appendBytes:&wholeByte length:1];
+    }
+    
+    return data;
+}
+
++ (NSString*)stringFromData_cmbc:(NSData *)data
+{
+    if (!data) {
+        return @"";
+    }
+    
+    NSMutableString *stringBuffer = [NSMutableString stringWithCapacity:([data length] * 2)];
+    const unsigned char *dataBuffer = [data bytes];
+    for (int i = 0; i < [data length]; ++i)
+    {
+        [stringBuffer appendFormat:@"%02lX", (unsigned long)dataBuffer[i]];
+    }
+    
+    return stringBuffer;
+}
+
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/ArrayUtil.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/ArrayUtil.h
new file mode 100644
index 00000000..ab04201b
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/ArrayUtil.h
@@ -0,0 +1,33 @@
+//
+//  ArrayUtil.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/2/1.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ArrayUtil : NSObject
+
++ (NSData *)strToData:(NSString *)str;
+
++ (NSData *)toData:(NSString *)str;
+
++ (NSData *)intToBytes:(long)length;
+
++ (NSData *)intToLittleBytes:(long)length;
+
++ (NSData *)intToOneBytes:(long)length;
+
++ (NSString *)dealWithString:(NSString *)str;
+
++ (NSData *)dataSplic:(NSData *)pt l:(NSData *)l magic:(NSData *)magic data:(NSData *)data;
+
++ (NSData *)dataMerger:(NSData *)data1 data2:(NSData *)data2;
+
++ (NSString *)toHex:(NSData *)data;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/ArrayUtil.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/ArrayUtil.m
new file mode 100644
index 00000000..ec0b5925
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/ArrayUtil.m
@@ -0,0 +1,140 @@
+//
+//  ArrayUtil.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/2/1.
+//
+
+#import "ArrayUtil.h"
+#import "NSString+XCYCoreOperation.h"
+
+@implementation ArrayUtil
+
++ (NSData *)strToData:(NSString *)str {
+    return [str dataUsingEncoding:NSUTF8StringEncoding];
+}
+
++ (NSData *)toData:(NSString *)str {
+    NSString *dataStr = str;
+    NSMutableData *fullData = [[NSMutableData alloc] initWithCapacity:1];
+    [fullData appendData:[dataStr dataFromHexString_xcy]];
+    return fullData.copy;
+}
+
++ (NSData *)intToBytes:(long)length {
+    int value = (int)length;
+    Byte byte[4] = {};
+    byte[3] = (Byte) ((value>>24) & 0xFF);
+    byte[2] = (Byte) ((value>>16) & 0xFF);
+    byte[1] = (Byte) ((value>>8) & 0xFF);
+    byte[0] = (Byte) (value & 0xFF);
+    return [NSData dataWithBytes:byte length:4];
+}
+
++ (NSData *)intToLittleBytes:(long)length {
+    int value = (int)length;
+    Byte byte[2] = {};
+    byte[1] = (Byte) ((value>>8) & 0xFF);
+    byte[0] = (Byte) (value & 0xFF);
+    return [NSData dataWithBytes:byte length:2];
+}
+
++ (NSData *)intToOneBytes:(long)length {
+    int value = (int)length;
+    Byte byte[1] = {};
+    byte[0] = (Byte) (value & 0xFF);
+    return [NSData dataWithBytes:byte length:1];
+}
+
++ (NSString *)decimalToHex:(int)value {
+    long long int tmpid = value;
+    NSString *nLetterValue;
+    NSString *str = @"";
+    long long int ttmpig;
+    for (int i = 0; i < 9; i++) {
+        ttmpig = tmpid % 16;
+        tmpid = tmpid / 16;
+        switch (ttmpig) {
+            case 10:
+                nLetterValue = @"A";
+                break;
+            case 11:
+                nLetterValue = @"B";
+                break;
+            case 12:
+                nLetterValue = @"C";
+                break;
+            case 13:
+                nLetterValue = @"D";
+                break;
+            case 14:
+                nLetterValue = @"E";
+                break;
+            case 15:
+                nLetterValue = @"F";
+                break;
+            default:
+                nLetterValue = [[NSString alloc] initWithFormat:@"%lli", ttmpig];
+        }
+        str = [nLetterValue stringByAppendingString:str];
+        if (tmpid == 0) {
+            break;
+        }
+    }
+    return [NSString stringWithFormat:@"%@%@", str.length == 1 ? @"0" : @"", str];
+}
+
++ (NSString *)dealWithString:(NSString *)str
+{
+    NSString *doneTitle = @"";
+    int count = 0;
+    for (int i = 0; i < str.length; i ++) {
+
+        count++;
+        doneTitle = [doneTitle stringByAppendingString:[str substringWithRange:NSMakeRange(i, 1)]];
+        if (count == 2) {
+            doneTitle = [NSString stringWithFormat:@"%@.", doneTitle];
+            count = 0;
+        }
+    }
+    return doneTitle;
+}
+
++ (NSData *)dataSplic:(NSData *)pt l:(NSData *)l magic:(NSData *)magic data:(NSData *)data {
+    NSMutableData *mutData = [NSMutableData dataWithData:pt];
+    [mutData appendData:l];
+    [mutData appendData:magic];
+    [mutData appendData:data];
+    return mutData.copy;
+}
+
++ (NSData *)dataMerger:(NSData *)data1 data2:(NSData *)data2 {
+    NSMutableData *mutData = [NSMutableData dataWithData:data1];
+    if (data2 != nil) {
+        [mutData appendData:data2];
+    }
+    return mutData.copy;
+}
+
++ (NSString *)toHex:(NSData *)data {
+    if (!data || [data length] == 0) {
+        return @"";
+    }
+    NSMutableString *string = [[NSMutableString alloc] initWithCapacity:[data length]];
+    
+    [data enumerateByteRangesUsingBlock:^(const void *bytes, NSRange byteRange, BOOL *stop) {
+        unsigned char *dataBytes = (unsigned char*)bytes;
+        for (NSInteger i = 0; i < byteRange.length; i++) {
+            NSString *hexStr = [NSString stringWithFormat:@"%x", (dataBytes[i]) & 0xff];
+            if ([hexStr length] == 2) {
+                [string appendString:hexStr];
+            } else {
+                [string appendFormat:@"0%@", hexStr];
+            }
+        }
+    }];
+    
+    return string;
+}
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/FileUtils.h b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/FileUtils.h
new file mode 100644
index 00000000..208991d9
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/FileUtils.h
@@ -0,0 +1,24 @@
+//
+//  FileUtils.h
+//  BesAll
+//
+//  Created by 范羽 on 2021/2/25.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FileUtils : NSObject
+
++ (NSString *)getDocumentPath;
+
++ (void)saveStringToDocumentWithName:(NSString *)name text:(NSString *)text;
+
++ (void)delegateFile:(NSString *)path;
+
++ (void)dealAirDropFile;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/FileUtils.m b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/FileUtils.m
new file mode 100644
index 00000000..ff17a252
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/Classes/bessdk/utils/FileUtils.m
@@ -0,0 +1,80 @@
+//
+//  FileUtils.m
+//  BesAll
+//
+//  Created by 范羽 on 2021/2/25.
+//
+
+#import "FileUtils.h"
+
+@implementation FileUtils
+
++ (NSString *)getDocumentPath {
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *documentDir = ([paths count] > 0) ? [paths objectAtIndex:0] : nil;
+    return documentDir;
+}
+
++ (void)saveStringToDocumentWithName:(NSString *)name text:(NSString *)text {
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss:sss"];
+    NSString *currentDateStr = [dateFormatter stringFromDate:[NSDate date]];
+    NSString *saveText = [NSString stringWithFormat:@"%@ %@", currentDateStr, text];
+    NSString *filePath = [NSString stringWithFormat:@"%@/BESLOG/%@", [self getDocumentPath], [name stringByReplacingOccurrencesOfString:@"/" withString:@""]];
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSData *stringData = [[NSString stringWithFormat:@"\n%@", saveText] dataUsingEncoding:NSUTF8StringEncoding];
+    if ([fileManager fileExistsAtPath:filePath]) {
+        NSFileHandle *fileHandle = [NSFileHandle fileHandleForUpdatingAtPath:filePath];
+        [fileHandle seekToEndOfFile]; //将节点跳到文件的末尾
+        [fileHandle writeData:stringData]; // 追加写入数据
+        [fileHandle closeFile];
+    } else {
+        [fileManager createDirectoryAtPath:[NSString stringWithFormat:@"%@/BESLOG", [self getDocumentPath]] withIntermediateDirectories:NO attributes:nil error:nil];
+        [fileManager createFileAtPath:filePath contents:stringData attributes:nil];
+    }
+}
+
++ (void)delegateFile:(NSString *)path {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    if ([fileManager fileExistsAtPath:path]) {
+        [fileManager removeItemAtPath:path error:nil];
+    }
+}
+
++ (void)dealAirDropFile {
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+    NSError *error = nil;
+    NSArray *docFileList = [[NSArray alloc] init];
+    NSMutableArray *mutDocFileList = [NSMutableArray array];
+    docFileList = [fileManager contentsOfDirectoryAtPath:[self getDocumentPath] error:&error];
+    BOOL docIsDirectory = NO;
+    for (NSString *file in docFileList) {
+        if ([fileManager fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", [self getDocumentPath], file] isDirectory:&docIsDirectory] && !docIsDirectory) {
+            [mutDocFileList addObject:file];
+        }
+    }    
+    NSString *airDropFile = [NSString stringWithFormat:@"%@/Inbox", [self getDocumentPath]];
+    NSArray *fileList = [[NSArray alloc] init];
+    fileList = [fileManager contentsOfDirectoryAtPath:airDropFile error:&error];
+    BOOL isDirectory = NO;
+    for (NSString *file in fileList) {
+        if ([fileManager fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", airDropFile, file] isDirectory:&isDirectory] && !isDirectory) {
+            NSString *name = file;
+            //是否重复
+            if ([mutDocFileList containsObject:file]) {
+                int i = 0;
+                name = [NSString stringWithFormat:@"0-%@", file];
+                while ([mutDocFileList containsObject:name]) {
+                    i ++;
+                    name = [NSString stringWithFormat:@"%d-%@", i, file];
+                }
+            }
+            [fileManager moveItemAtPath:[NSString stringWithFormat:@"%@/%@", airDropFile, file] toPath:[NSString stringWithFormat:@"%@/%@", [self getDocumentPath], name] error:nil];
+        }
+    }
+
+}
+
+
+
+@end
diff --git a/apps/client/local_plugins/bes_ota_manager/ios/bes_ota_manager.podspec b/apps/client/local_plugins/bes_ota_manager/ios/bes_ota_manager.podspec
new file mode 100644
index 00000000..6fec0b33
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/ios/bes_ota_manager.podspec
@@ -0,0 +1,43 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint bes_ota_manager.podspec` to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'bes_ota_manager'
+  s.version          = '0.0.1'
+  s.summary          = 'BES (Bestechnic) firmware OTA upgrade plugin for DeapVoice.'
+  s.description      = <<-DESC
+Self-contained BES OTA SDK + Objective-C Flutter bridge. SPP OTA 2.0
+(GATT over BR/EDR) firmware upgrade. Owns its own CoreBluetooth connection.
+                       DESC
+  s.homepage         = 'http://example.com'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Your Company' => 'email@example.com' }
+  s.source           = { :path => '.' }
+
+  # Objective-C bridge + the whole copied BES OTA SDK (bessdk/**).
+  s.source_files = 'Classes/**/*.{h,m}'
+
+  s.dependency 'Flutter'
+  s.platform = :ios, '13.0'
+  s.requires_arc = true
+
+  s.frameworks = 'CoreBluetooth'
+
+  # The BES SDK uses quoted imports without relative paths (e.g. #import "BesBaseService.h"),
+  # so every bessdk subdir must be on the header search path for cross-imports to resolve.
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE'                       => 'YES',
+    'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386',
+    'HEADER_SEARCH_PATHS' => [
+      '$(PODS_TARGET_SRCROOT)/Classes',
+      '$(PODS_TARGET_SRCROOT)/Classes/bessdk',
+      '$(PODS_TARGET_SRCROOT)/Classes/bessdk/connect',
+      '$(PODS_TARGET_SRCROOT)/Classes/bessdk/service/Base',
+      '$(PODS_TARGET_SRCROOT)/Classes/bessdk/service/Base/sha',
+      '$(PODS_TARGET_SRCROOT)/Classes/bessdk/service/TotaDemo',
+      '$(PODS_TARGET_SRCROOT)/Classes/bessdk/tools/category',
+      '$(PODS_TARGET_SRCROOT)/Classes/bessdk/utils',
+    ].join(' '),
+  }
+end
diff --git a/apps/client/local_plugins/bes_ota_manager/lib/bes_ota_manager.dart b/apps/client/local_plugins/bes_ota_manager/lib/bes_ota_manager.dart
new file mode 100644
index 00000000..2f387721
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/lib/bes_ota_manager.dart
@@ -0,0 +1,109 @@
+import 'bes_ota_manager_platform_interface.dart';
+
+/// OTA 升级事件。字段对齐 BES SDK 的 OTAStatus / OTA_CMD_* 回调。
+class BesOtaEvent {
+  /// 事件类型：
+  /// - 'onStatus'   连接/握手状态变化（见 [status]）
+  /// - 'onProgress' 传输进度（见 [progress]，0.0~1.0）
+  /// - 'onSuccess'  升级成功（设备将重启）
+  /// - 'onError'    升级失败（见 [code]/[message]）
+  final String event;
+
+  /// 透传 BES OTAStatus / OTA_CMD_* 原始状态码（可空）。
+  final int? status;
+
+  /// 传输进度，0.0~1.0（仅 'onProgress' 有效）。
+  final double? progress;
+
+  /// 错误码（仅 'onError' 有效）。
+  final int? code;
+
+  /// 描述信息 / 错误信息。
+  final String? message;
+
+  const BesOtaEvent({
+    required this.event,
+    this.status,
+    this.progress,
+    this.code,
+    this.message,
+  });
+
+  factory BesOtaEvent.fromMap(Map<dynamic, dynamic> map) {
+    final rawProgress = map['progress'];
+    return BesOtaEvent(
+      event: (map['event'] as String?) ?? 'onStatus',
+      status: (map['status'] as num?)?.toInt(),
+      progress: rawProgress == null ? null : (rawProgress as num).toDouble(),
+      code: (map['code'] as num?)?.toInt(),
+      message: map['message'] as String?,
+    );
+  }
+
+  @override
+  String toString() =>
+      'BesOtaEvent(event: $event, status: $status, progress: $progress, code: $code, message: $message)';
+}
+
+/// BES（恒玄）固件 OTA 升级插件。
+///
+/// 插件自包含 BES OTA SDK 与原生桥接，自管到设备的连接（不复用 app 现有
+/// 的 bluetooth_manager 连接）。典型用法：
+/// ```dart
+/// final ota = BesOtaManager();
+/// ota.events.listen((e) { ... });
+/// await ota.init();
+/// await ota.startOta(address: mac, name: name, filePath: localBinPath);
+/// ```
+class BesOtaManager {
+  /// 初始化原生环境（申请蓝牙权限等）。返回是否成功。
+  Future<bool> init() {
+    return BesOtaManagerPlatform.instance.init();
+  }
+
+  /// 启动 OTA 升级。
+  ///
+  /// - [address] 目标设备标识：Android 为 MAC 地址；iOS 为外设名/UUID（用于扫描匹配）。
+  /// - [name]    设备名称。
+  /// - [filePath] 已下载到本地的固件文件绝对路径。
+  /// - [protocol] 传输模式：'SPP' | 'BLE' | 'GATT'（默认 'SPP'，对应 SPP OTA 2.0；
+  ///   iOS 上 SPP 会映射为 BES 的 GATT over BR/EDR）。
+  /// - [userFlag] OTA 协议版本：1 = OTA 2.0（默认），0 = 1.0。
+  /// - [upgradeType] 1 = normal（默认），2 = fast。
+  /// - [user] 升级目标：1 = 固件（默认），2 = 语言包，3 = combo。
+  Future<bool> startOta({
+    required String address,
+    required String name,
+    required String filePath,
+    String protocol = 'SPP',
+    int userFlag = 1,
+    int upgradeType = 1,
+    int user = 1,
+  }) {
+    return BesOtaManagerPlatform.instance.startOta(
+      address: address,
+      name: name,
+      filePath: filePath,
+      protocol: protocol,
+      userFlag: userFlag,
+      upgradeType: upgradeType,
+      user: user,
+    );
+  }
+
+  /// 取消/停止当前升级并释放原生资源。
+  Future<void> stopOta() {
+    return BesOtaManagerPlatform.instance.stopOta();
+  }
+
+  /// 释放事件通道订阅（退出固件升级页面时调用）。
+  /// 再次监听 [events] 时会自动重新订阅，无需重新创建实例。
+  void dispose() {
+    BesOtaManagerPlatform.instance.dispose();
+  }
+
+  /// OTA 事件流（进度 / 状态 / 成功 / 失败）。
+  Stream<BesOtaEvent> get events {
+    return BesOtaManagerPlatform.instance.events();
+  }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/lib/bes_ota_manager_method_channel.dart b/apps/client/local_plugins/bes_ota_manager/lib/bes_ota_manager_method_channel.dart
new file mode 100644
index 00000000..e446dc94
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/lib/bes_ota_manager_method_channel.dart
@@ -0,0 +1,78 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+
+import 'bes_ota_manager.dart';
+import 'bes_ota_manager_platform_interface.dart';
+
+/// An implementation of [BesOtaManagerPlatform] that uses method channels.
+class MethodChannelBesOtaManager extends BesOtaManagerPlatform {
+  @visibleForTesting
+  final methodChannel = const MethodChannel('bes_ota_manager');
+
+  final eventChannel = const EventChannel('bes_ota_manager/events');
+
+  StreamSubscription? _eventSubscription;
+  final StreamController<BesOtaEvent> _eventStream =
+      StreamController.broadcast();
+
+  @override
+  Future<bool> init() async {
+    return await methodChannel.invokeMethod<bool>('init') ?? false;
+  }
+
+  @override
+  Future<bool> startOta({
+    required String address,
+    required String name,
+    required String filePath,
+    String protocol = 'SPP',
+    int userFlag = 1,
+    int upgradeType = 1,
+    int user = 1,
+  }) async {
+    return await methodChannel.invokeMethod<bool>('startOta', {
+          'address': address,
+          'name': name,
+          'filePath': filePath,
+          'protocol': protocol,
+          'userFlag': userFlag,
+          'upgradeType': upgradeType,
+          'user': user,
+        }) ??
+        false;
+  }
+
+  @override
+  Future<void> stopOta() async {
+    await methodChannel.invokeMethod<void>('stopOta');
+  }
+
+  @override
+  void dispose() {
+    // 取消上游 EventChannel 订阅（原生 onCancel 会把 eventSink 置空）。
+    // 广播 StreamController 保留不关闭，下次 events() 经 _ensureSubscription 重新订阅。
+    _eventSubscription?.cancel();
+    _eventSubscription = null;
+  }
+
+  void _ensureSubscription() {
+    if (_eventSubscription != null) return;
+    _eventSubscription = eventChannel.receiveBroadcastStream().listen(
+      (event) {
+        if (event is Map) {
+          _eventStream.add(BesOtaEvent.fromMap(event));
+        }
+      },
+      onError: (_) => _eventSubscription = null,
+      onDone: () => _eventSubscription = null,
+    );
+  }
+
+  @override
+  Stream<BesOtaEvent> events() {
+    _ensureSubscription();
+    return _eventStream.stream;
+  }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/lib/bes_ota_manager_platform_interface.dart b/apps/client/local_plugins/bes_ota_manager/lib/bes_ota_manager_platform_interface.dart
new file mode 100644
index 00000000..120d412f
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/lib/bes_ota_manager_platform_interface.dart
@@ -0,0 +1,51 @@
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+
+import 'bes_ota_manager.dart';
+import 'bes_ota_manager_method_channel.dart';
+
+abstract class BesOtaManagerPlatform extends PlatformInterface {
+  /// Constructs a BesOtaManagerPlatform.
+  BesOtaManagerPlatform() : super(token: _token);
+
+  static final Object _token = Object();
+
+  static BesOtaManagerPlatform _instance = MethodChannelBesOtaManager();
+
+  /// The default instance of [BesOtaManagerPlatform] to use.
+  ///
+  /// Defaults to [MethodChannelBesOtaManager].
+  static BesOtaManagerPlatform get instance => _instance;
+
+  static set instance(BesOtaManagerPlatform instance) {
+    PlatformInterface.verifyToken(instance, _token);
+    _instance = instance;
+  }
+
+  Future<bool> init() {
+    throw UnimplementedError('init() has not been implemented.');
+  }
+
+  Future<bool> startOta({
+    required String address,
+    required String name,
+    required String filePath,
+    String protocol = 'SPP',
+    int userFlag = 1,
+    int upgradeType = 1,
+    int user = 1,
+  }) {
+    throw UnimplementedError('startOta() has not been implemented.');
+  }
+
+  Future<void> stopOta() {
+    throw UnimplementedError('stopOta() has not been implemented.');
+  }
+
+  void dispose() {
+    throw UnimplementedError('dispose() has not been implemented.');
+  }
+
+  Stream<BesOtaEvent> events() {
+    throw UnimplementedError('events() has not been implemented.');
+  }
+}
diff --git a/apps/client/local_plugins/bes_ota_manager/pubspec.yaml b/apps/client/local_plugins/bes_ota_manager/pubspec.yaml
new file mode 100644
index 00000000..b889e20c
--- /dev/null
+++ b/apps/client/local_plugins/bes_ota_manager/pubspec.yaml
@@ -0,0 +1,27 @@
+name: bes_ota_manager
+description: "BES (Bestechnic) firmware OTA upgrade plugin for DeapVoice."
+version: 0.0.1
+homepage:
+
+environment:
+  sdk: ">=3.8.0 <4.0.0"
+  flutter: ">=3.3.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+  plugin_platform_interface: ^2.0.2
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_lints: ^5.0.0
+
+flutter:
+  plugin:
+    platforms:
+      android:
+        package: com.example.bes_ota_manager
+        pluginClass: BesOtaManagerPlugin
+      ios:
+        pluginClass: BesOtaManagerPlugin
diff --git a/apps/client/local_plugins/bluetooth_manager/android/src/main/kotlin/com/example/bluetooth_manager/BluetoothManager.kt b/apps/client/local_plugins/bluetooth_manager/android/src/main/kotlin/com/example/bluetooth_manager/BluetoothManager.kt
index a4ed68cf..b1637118 100644
--- a/apps/client/local_plugins/bluetooth_manager/android/src/main/kotlin/com/example/bluetooth_manager/BluetoothManager.kt
+++ b/apps/client/local_plugins/bluetooth_manager/android/src/main/kotlin/com/example/bluetooth_manager/BluetoothManager.kt
@@ -59,6 +59,10 @@ object BluetoothManager : PluginRegistry.RequestPermissionsResultListener {
   private const val RFCOMM_RETRY_DELAY_MS = 2000L
   private const val RFCOMM_MAX_RETRIES = 3
 
+  // 新的 connect 等上一次连接退出的上限。cancelReconnect() 已经把旧 socket 关了，
+  // 阻塞中的 sock.connect() 会立刻抛异常，正常情况远用不到这个上限。
+  private const val CONNECT_TAKEOVER_TIMEOUT_MS = 2000L
+
   var bluetoothReadChannel: ((ByteArray) -> Unit)? = null
   var bluetoothStatusChannel: ((Int) -> Unit)? = null
   var bluetoothCmdChannel: ((Map<String, Any>) -> Unit)? = null
@@ -625,13 +629,43 @@ object BluetoothManager : PluginRegistry.RequestPermissionsResultListener {
     result.success(true)
   }
 
+  // 发起连接。
+  //
+  // ⚠️ **不要把等待 isConnecting 的循环挪回调用线程**：connect 是 MethodChannel
+  // 在主线程上调的，在那儿 sleep 会卡住整个 UI。
+  //
+  // ⚠️ **也不要退回「CAS 失败就直接 return」**。cancelReconnect() 只 interrupt
+  // 线程 + 关 socket，**不复位 isConnecting**——它只在下面那个 finally 里清。
+  // 而原来的 CAS 紧接着同步执行，上一次的线程还没被调度到 finally，
+  // 这个竞态新调用几乎必输，于是这次 connect 被**静默丢弃**：不报错、不改状态。
+  // 上层按候选地址逐个重试时，第二个候选就这样人间蒸发，表现为「换个耳机连不上」。
+  //
+  // 现在：先给在飞的那次一点时间退出（cancelReconnect 已经把它的 socket 关了，
+  // 阻塞中的 sock.connect() 会立刻抛异常并走到 finally），仍抢不到就上报
+  // 状态 0，让上层立刻知道这次没成，而不是干等超时。
   fun connect(deviceId: String, serviceUuid: String = "aeaf5241-5453-7070-7353-445542594c46") {
     cancelReconnect()
-    if (!isConnecting.compareAndSet(false, true)) return
-    lastDeviceId = deviceId
-    lastServiceUuid = serviceUuid
-    isUserInitiatedDisconnect = false
     Thread {
+      val deadline = System.currentTimeMillis() + CONNECT_TAKEOVER_TIMEOUT_MS
+      while (isConnecting.get() && System.currentTimeMillis() < deadline) {
+        try {
+          Thread.sleep(20)
+        } catch (_: InterruptedException) {
+          Thread.currentThread().interrupt()
+          break
+        }
+      }
+      if (!isConnecting.compareAndSet(false, true)) {
+        android.util.Log.w("Bluetooth Connection", "connect($deviceId) 放弃：上一次连接仍在进行")
+        publishBluetoothStatus(0)
+        return@Thread
+      }
+      // lastDeviceId 的赋值跟着挪进来：抢到之前就写，会让一次被放弃的 connect
+      // 污染 ACL 自动回连的目标（耳机开机后回连到用户并没有选的那一台）。
+      // 唯一的读者 getConnectedDeviceInfo() 先判 isConnected，不依赖同步写入。
+      lastDeviceId = deviceId
+      lastServiceUuid = serviceUuid
+      isUserInitiatedDisconnect = false
       try {
         connectBlocking(deviceId, serviceUuid)
       } finally {
diff --git a/apps/client/pubspec.lock b/apps/client/pubspec.lock
index 79d21ae0..0b195f50 100644
--- a/apps/client/pubspec.lock
+++ b/apps/client/pubspec.lock
@@ -134,6 +134,13 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.9"
+  bes_ota_manager:
+    dependency: "direct main"
+    description:
+      path: "local_plugins/bes_ota_manager"
+      relative: true
+    source: path
+    version: "0.0.1"
   bidi:
     dependency: transitive
     description:
@@ -2004,6 +2011,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "15.2.0"
+  wakelock_plus:
+    dependency: "direct main"
+    description:
+      name: wakelock_plus
+      sha256: "61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.3"
+  wakelock_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: wakelock_plus_platform_interface
+      sha256: "0618d1799f0b28bcf98255b4ee8313e6fc4d38589dc4ee5fe5840d57d1aff6da"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.6.0"
   watcher:
     dependency: transitive
     description:
diff --git a/apps/client/pubspec.yaml b/apps/client/pubspec.yaml
index b43e95cd..2845edd6 100644
--- a/apps/client/pubspec.yaml
+++ b/apps/client/pubspec.yaml
@@ -92,6 +92,7 @@ dependencies:
   path: ^1.9.1
   pip: ^0.0.3
   connectivity_plus: ^6.1.5 # 网络连接检测依赖
+  wakelock_plus: ^1.2.8 # 固件升级期间保持屏幕常亮
   speech:
     path: local_plugins/speech
   azure_speech:
@@ -108,6 +109,11 @@ dependencies:
     path: local_plugins/classic_bluetooth
   bluetooth_manager:
     path: local_plugins/bluetooth_manager
+  # 恒玄(BES)固件 OTA 升级：自包含 BES OTA SDK(Android Java / iOS ObjC)与原生桥接。
+  # ⚠️ 它自管到耳机的 SPP 连接，不复用 bluetooth_manager 的连接——多数固件同时
+  #    只接受一条 SPP 链路，升级前必须先 disconnectDevice() 让路，见 ota_upgrade_controller。
+  bes_ota_manager:
+    path: local_plugins/bes_ota_manager
   # deepvoice 的通话/面对面/同声翻译 native 实现（ASR+翻译+TTS 端到端），
   # 直接吃 bluetooth_manager 的 translationCallback，恒玄耳机链路专用
   # ⚠️ 暂时注释：它还依赖 deepvoice 的 audio_recorder 插件，没搬过来会导致
@@ -157,6 +163,7 @@ flutter:
     - assets/images/explore1.png
     - assets/images/explore2.jpg
     - assets/images/mine-background.png
+    - assets/images/app_icon.png
     - assets/fonts/NotoSansSC-Regular.ttf
     - assets/lottie/
     - assets/js/
diff --git a/apps/proto/api/api_msg.proto b/apps/proto/api/api_msg.proto
index 742c5c8c..4ee01eec 100644
--- a/apps/proto/api/api_msg.proto
+++ b/apps/proto/api/api_msg.proto
@@ -249,16 +249,17 @@ message ApiDelBrandResp {
 /*月结算管理--------------------------------------------------------------------------------*/
 //结算单列表（品牌商/渠道商账号由后端按归属强制收敛）
 message ApiGetSettlementsReq {
+    reserved 2;             //【已废弃】brandid：结算已不按品牌商出行
     uint32 period = 1;      //@go_tags(`json:"period"`) 结算月 YYYYMM，0=最近一个有数据的月
-    uint32 brandid = 2;     //@go_tags(`json:"brandid"`) 品牌商id 0=不限
     string channelid = 3;   //@go_tags(`json:"channelid"`) 渠道商id 空=不限
     int32 status = 4;       //@go_tags(`json:"status"`) 状态过滤 -1=不限(默认)
+    string batchno = 5;     //@go_tags(`json:"batchno"`) 生产批次号 空=不限
 }
 
 message ApiGetSettlementsResp {
+    reserved 3;                            //【已废弃】total_brand_net
     repeated DBSettlementMonth items = 1;  //@go_tags(`json:"items"`) 结算明细
     int64 total_base = 2;                  //@go_tags(`json:"total_base"`) 合计基数(分)
-    int64 total_brand_net = 3;             //@go_tags(`json:"total_brand_net"`) 合计品牌商实得(分)
     int64 total_channel = 4;               //@go_tags(`json:"total_channel"`) 合计渠道商分成(分)
     int64 total_platform = 5;              //@go_tags(`json:"total_platform"`) 合计平台留存(分)
 }
@@ -276,11 +277,12 @@ message ApiGenSettlementResp {
 
 //确认/标记已支付结算单（仅超管/管理员）
 message ApiConfirmSettlementReq {
+    reserved 2;             //【已废弃】brandid
     uint32 period = 1;      //@go_tags(`json:"period"`) 结算月
-    uint32 brandid = 2;     //@go_tags(`json:"brandid"`) 品牌商id
     string channelid = 3;   //@go_tags(`json:"channelid"`) 渠道商id(空=无渠道归属那一行)
     int32 status = 4;       //@go_tags(`json:"status"`) 目标状态 1:已确认 2:已支付 0:退回草稿
     string remark = 5;      //@go_tags(`json:"remark"`) 备注
+    string batchno = 6;     //@go_tags(`json:"batchno"`) 生产批次号(结算行主键的一部分,空=无法归到批次那一行)
 }
 
 message ApiConfirmSettlementResp {
@@ -466,11 +468,19 @@ message ApiCreateAuthCodesReq {
     uint32 productid = 2;    //@go_tags(`json:"productid"`) 设备类型
     int32 createtype = 3;  //@go_tags(`json:"createtype"`) 生成类型 1 生产模式 2 导入模式
     uint32 number = 4;       //@go_tags(`json:"number"`) 生成的授权码数量
-    bool isbindmac = 5;      //@go_tags(`json:"isbindmac"`) 是否绑定mac地址
+    //【已废弃 2026-09-02】服务端从来没读过它，前端也已删掉那个开关。
+    //是否生成 MAC 只看产品的 devicetype（经典蓝牙耳机）或是不是导入模式——
+    //MAC 本身就是设备凭据，没有「绑不绑」这个选择。字段号保留占位，不要复用。
+    bool isbindmac = 5;      //@go_tags(`json:"isbindmac"`) [已废弃]是否绑定mac地址
     string macaddresses = 6; //@go_tags(`json:"macaddresses"`) 自定义mac地址
     string remark = 7;       //@go_tags(`json:"remark"`) 批次备注
     string batchno = 8;      //@go_tags(`json:"batchno"`) 可选:预分配批次号(预览确认流程回传,空=服务端生成)
-    string channelid = 9;    //@go_tags(`json:"channelid"`) 渠道商id(短码)，须归属 brandid 且状态为启用
+    string channelid = 9;    //@go_tags(`json:"channelid"`) 渠道商id(短码)，须为启用状态（不再要求归属 brandid）
+    uint32 factoryid = 10;   //@go_tags(`json:"factoryid"`) 代工厂id(oem_factory.id)，0=不指定；非 0 时须存在且未停用
+    int32 sharerate = 11;    //@go_tags(`json:"sharerate"`) 本批次渠道分成比例(万分比 0~10000)，生产时冻结进批次台账
+    uint32 rewardvip = 12;       //@go_tags(`json:"rewardvip"`) 本批次绑定赠送VIP天数(0=不送)
+    uint32 rewardtranslate = 13; //@go_tags(`json:"rewardtranslate"`) 本批次绑定赠送翻译时长(分钟,0=不送)
+    uint32 rewardmeeting = 14;   //@go_tags(`json:"rewardmeeting"`) 本批次绑定赠送会议时长(分钟,0=不送)
 }
 
 message ApiCreateAuthCodesResp {
@@ -793,6 +803,10 @@ message ApiGetUserUseLogsResp{
 //重置License状态
 message ApiResetLicenseStatusReq{
     string license = 1; //@go_tags(`json:"licenses"`) //license列表
+    //授权码分表按产品切，重置前必须知道 PID。**传了就用它**，别让服务端去反解设备码——
+    //2026-09-02 起经典蓝牙耳机的 code 就是 MAC，而导入进来的 MAC 前两字节是外部厂商的 OUI，
+    //反解出来是别人的 PID，会去改错误的分表。0=不传，服务端退回反解（只对存量 license 码有效）。
+    uint32 productid = 2; //@go_tags(`json:"productid"`) //产品ID(PID)，0=让服务端从设备码反解
 }
 
 message ApiResetLicenseStatusResp{
@@ -801,6 +815,7 @@ message ApiResetLicenseStatusResp{
 //批量重置License状态
 message ApiBatchResetLicenseStatusReq{
     repeated string licenses = 1; //@go_tags(`json:"licenses"`) //license列表
+    uint32 productid = 2;         //@go_tags(`json:"productid"`) //产品ID(PID)，0=让服务端从设备码反解（同上）
 }
 
 message ApiBatchResetLicenseStatusResp{
diff --git a/apps/proto/db.proto b/apps/proto/db.proto
index 9c115a2f..80ab8860 100644
--- a/apps/proto/db.proto
+++ b/apps/proto/db.proto
@@ -164,7 +164,12 @@ message DBAppConfigItem{
 
 //厂家数据管理
 //方案商所属芯片厂商（分组维度）。一个芯片厂商可以有多套方案，每套方案一条 DBSolutionProvider 记录。
-//新增厂商在这里加值，同时补 modules/console/api_device.go 的 chipVendorNames 与前端 utils/chipvendors.ts。
+//
+//⚠️【2026-09-01 已停止扩充】芯片厂商已转成 chip_vendor 表（后台「芯片管理」页自助增删改，
+//见 modules/console/model_chipvendor.go）。DBSolutionProvider.vendor 存的是那张表的 id，
+//表 id 与下面这几个枚举值一一对应（启动时幂等补种），故存量数据无需迁移。
+//新增厂商请到后台加，**不要再往这个枚举里加值**——加了也没人读，反而会让人以为还得改代码发版。
+//本枚举保留是为了字段类型不变（proto3 开放枚举按数值收发，表 id ≥5 也能正常传输）。
 enum SolutionVendor {
     VENDOR_UNKNOWN = 0;   //未指定
     VENDOR_JIELI = 1;     //杰里
@@ -204,12 +209,17 @@ message DBBrand{
 //且作为统计与结算的维度键（string）跨库不冲突。新增走审批：status=0 时不可用于生产。
 message DBChannel{
     string id = 1;                                       //@go_tags(`gorm:"column:id;size:16;primaryKey" json:"id"`) 渠道商id(短码)
-    uint32 brandid = 2;                                  //@go_tags(`gorm:"brandid;index" json:"brandid"`) 归属品牌商id
+    //归属品牌商id。**0 = 不归属任何品牌商**（后台新增渠道商时已不再要求选品牌商，
+    //渠道商是全局实体）。仅 addOfficialChannel 生成的「品牌官方渠道」才带非 0 值。
+    uint32 brandid = 2;                                  //@go_tags(`gorm:"brandid;index" json:"brandid"`) 归属品牌商id(0=全局渠道商)
     string name = 3;                                     //@go_tags(`gorm:"name;index" json:"name"`) 渠道商名称
     string contact = 4;                                  //@go_tags(`gorm:"contact" json:"contact"`) 联系人/电话
     string contactmails = 5;                             //@go_tags(`gorm:"contactmails" json:"contactmails"`) 联系人邮箱 xxx@qq.com,xxx@gmail.com
     string remark = 6;                                   //@go_tags(`gorm:"remark" json:"remark"`) 备注
-    int32 sharerate = 7;                                 //@go_tags(`gorm:"sharerate" json:"sharerate"`) 分成比例(万分比,从品牌商那份里再切)
+    //【已停止在后台维护，2026-09-02】分成比例改为按【生产批次】设置（production_batch.sharerate），
+    //因为同一渠道商不同批次的比例可能不同。本列保留存量值，月结算暂时仍读它（见 api_settlement.go），
+    //新建渠道商一律为 0。别再在渠道商表单里加回这个字段。
+    int32 sharerate = 7;                                 //@go_tags(`gorm:"sharerate" json:"sharerate"`) [遗留]渠道商级分成比例(万分比)
     int32 status = 8;                                    //@go_tags(`gorm:"status;index" json:"status"`) 状态 0:待审核 1:启用 2:停用 3:驳回
     string applyaccount = 9;                             //@go_tags(`gorm:"applyaccount" json:"applyaccount"`) 申请人账号(品牌商自助添加时记录)
     string auditaccount = 10;                            //@go_tags(`gorm:"auditaccount" json:"auditaccount"`) 审核人账号
@@ -220,28 +230,36 @@ message DBChannel{
     bool official = 15;                                  //@go_tags(`gorm:"official;index" json:"official"`) 品牌官方渠道：随品牌商创建自动生成、直接启用，不可删除（品牌自营的那条销售线）
 }
 
-//月结算单（每 结算月×品牌商×渠道商 一行）
+//月结算单（每 结算月×渠道商×生产批次 一行）
+//
+//分成算法（2026-09-02 起）：
+//  base            = 该月归属该 (渠道商, 批次) 的订单实付金额之和（分）
+//  channel_amount  = base * channel_rate    渠道商分成
+//  platform_amount = base - channel_amount  平台留存
+//
+//⚠️ 为什么按【批次】而不是按渠道商出行：分成比例是一批一谈的，存在
+//  production_batch.sharerate 上（见「MAC生成管理 → 生成MAC」的表单）。同一家渠道商
+//  不同批次比例可以不同，一个渠道商一行只能装一个比例，装不下。
+//
+//订单如何落到批次：payorder 下单时冻结了来源设备快照（src_license / src_mac / src_productid），
+//拿它去 license_<pid> 分表反查到 batchno。查不到（用户没绑过设备、批次被撤销）的订单
+//落 batchno='' 的行，比例 0、全归平台。
+//
+//比例按【结算时快照】存进本行，事后改批次比例不影响已确认的月份。
 //
-//分成算法（渠道商从品牌商那份里再切）：
-//  base            = 该月归属该渠道商的订单实付金额之和（分）
-//  brand_gross     = base * brand_rate      品牌商总提成
-//  channel_amount  = brand_gross * channel_rate  渠道商从品牌商那份里再切
-//  brand_net       = brand_gross - channel_amount 品牌商实得
-//  platform_amount = base - brand_gross     平台留存
-//比例按【结算时快照】存进本行，事后调比例不影响已确认的月份。
-//无渠道归属的订单落 channelid='' 的行（品牌那份全归品牌）；无品牌归属的落 brandid=0（全归平台）。
+//⚠️ 品牌商维度已移除：生产链路不再涉及品牌商（生成MAC 表单已去掉该字段），
+//  留着只会产出一堆 brandid=0 的行。字段号 2/6/7/10 保留不复用。
 message DBSettlementMonth{
+    reserved 2, 6, 7, 10;                                //【已废弃】brandid / brand_rate / brand_gross / brand_net
     uint32 period = 1;                                   //@go_tags(`gorm:"period;primaryKey;index" json:"period"`) 结算月 YYYYMM
-    uint32 brandid = 2;                                  //@go_tags(`gorm:"brandid;primaryKey;index" json:"brandid"`) 品牌商id(0=无品牌归属)
     string channelid = 3;                                //@go_tags(`gorm:"channelid;size:16;primaryKey;index" json:"channelid"`) 渠道商id(空=无渠道归属)
+    string batchno = 17;                                 //@go_tags(`gorm:"batchno;size:16;primaryKey;index" json:"batchno"`) 生产批次号(空=无法归到批次)
+    uint32 productid = 18;                               //@go_tags(`gorm:"productid;index" json:"productid"`) 该批次的产品id(展示用,0=未知)
     int64 order_count = 4;                               //@go_tags(`gorm:"order_count" json:"order_count"`) 已支付订单数
     int64 base_amount = 5;                               //@go_tags(`gorm:"base_amount" json:"base_amount"`) 结算基数=订单实付金额合计(分)
-    int32 brand_rate = 6;                                //@go_tags(`gorm:"brand_rate" json:"brand_rate"`) 品牌商分成比例快照(万分比)
-    int64 brand_gross = 7;                               //@go_tags(`gorm:"brand_gross" json:"brand_gross"`) 品牌商总提成(分)
-    int32 channel_rate = 8;                              //@go_tags(`gorm:"channel_rate" json:"channel_rate"`) 渠道商分成比例快照(万分比,从品牌那份里切)
+    int32 channel_rate = 8;                              //@go_tags(`gorm:"channel_rate" json:"channel_rate"`) 渠道分成比例快照(万分比,取自该批次)
     int64 channel_amount = 9;                            //@go_tags(`gorm:"channel_amount" json:"channel_amount"`) 渠道商分成金额(分)
-    int64 brand_net = 10;                                //@go_tags(`gorm:"brand_net" json:"brand_net"`) 品牌商实得(分)=总提成-渠道商分成
-    int64 platform_amount = 11;                          //@go_tags(`gorm:"platform_amount" json:"platform_amount"`) 平台留存(分)=基数-品牌商总提成
+    int64 platform_amount = 11;                          //@go_tags(`gorm:"platform_amount" json:"platform_amount"`) 平台留存(分)=基数-渠道分成
     int32 status = 12;                                   //@go_tags(`gorm:"status;index" json:"status"`) 状态 0:草稿(可重算) 1:已确认(锁定) 2:已支付
     int64 gen_time = 13;                                 //@go_tags(`gorm:"gen_time" json:"gen_time"`) 生成/重算时间
     string confirm_account = 14;                         //@go_tags(`gorm:"confirm_account" json:"confirm_account"`) 确认人账号
@@ -263,6 +281,19 @@ message DBProductionBatch{
     string batchno = 10;                                 //@go_tags(`gorm:"batchno;size:16;uniqueIndex" json:"batchno"`) 可读批次号(短码,全局唯一)
     string remark = 11;                                  //@go_tags(`gorm:"remark" json:"remark"`) 备注
     string channelid = 12;                               //@go_tags(`gorm:"channelid;size:16;index" json:"channelid"`) 渠道商id(短码,空=未分配渠道)
+    //这批货由哪家代工厂生产（oem_factory.id，0=未指定）。与 brandid「挂谁的牌子卖」是两回事：
+    //同一品牌可以换厂、同一家厂也给多个品牌代工，故独立成维度。存量批次为 0（当时还没有工厂档案）。
+    uint32 factoryid = 13;                               //@go_tags(`gorm:"factoryid;index" json:"factoryid"`) 代工厂id(0=未指定)
+    //这一批货给渠道商的分成比例（万分比，0~10000）。放在批次而不是渠道商上：
+    //同一家渠道商不同批次谈的比例可能不同，挂在渠道商上只能存一个值。
+    //⚠️ 生产时冻结，事后改批次比例不影响已算完的结算单。
+    int32 sharerate = 14;                                //@go_tags(`gorm:"sharerate" json:"sharerate"`) 本批次渠道分成比例(万分比)
+    //这一批设备的「绑定赠送」。放在批次而不是产品上：同一款产品不同批次（不同渠道/不同活动）
+    //送的东西经常不一样，挂在产品上只能存一套，改一次会连带改掉已发出去的货的权益。
+    //绑定时按设备所属批次发放，批次三项全为 0 才回退到产品上的旧字段（见 api_binddevice.go）。
+    uint32 rewardvip = 15;                               //@go_tags(`gorm:"rewardvip" json:"rewardvip"`) 绑定赠送VIP天数(0=不送)
+    uint32 rewardtranslate = 16;                         //@go_tags(`gorm:"rewardtranslate" json:"rewardtranslate"`) 绑定赠送翻译时长(分钟,0=不送)
+    uint32 rewardmeeting = 17;                           //@go_tags(`gorm:"rewardmeeting" json:"rewardmeeting"`) 绑定赠送会议时长(分钟,0=不送)
 }
 
 //工厂产品
@@ -307,12 +338,27 @@ message DBProduct{
     //产品归属的应用（应用中心 app_product.name，如 Voitrans,Lumi），CSV 可多选、空=未绑定。
     //品牌商/渠道商账号的「应用」下拉即由本字段推导：只列出自己品牌名下产品绑定过的应用。
     string appnames = 35;                                //@go_tags(`gorm:"appnames;size:255" json:"appnames"`) 绑定应用名CSV(空=未绑定)
-    //产品用的是哪套芯片方案（DBSolutionProvider.id）。生产设备码时的服务ID(CID)直接取这里——
+    //产品用的是哪套芯片方案（DBSolutionProvider.id），也就是**方案ID(BID)**。
+    //三个烧进固件的标识口径固定：CID=芯片公司(chip_vendor.id) / BID=方案公司(本字段) / PID=产品(本表 id)；
+    //CID 由本字段 → solution_provider.vendor 推出，不在产品上另存（另存会在方案商换芯片时变成对不上的旧值）。
     //以前从品牌商推导，但同一品牌的不同产品可能用不同方案商的方案，推导会串号，故改为产品级绑定，新建产品必填。
     uint32 providerid = 36;                              //@go_tags(`gorm:"providerid;index" json:"providerid"`) 归属方案商id(CID)
     int64 createtime = 37;                               //@go_tags(`gorm:"createtime" json:"createtime"`) 创建时间(秒);历史产品为0
     //产品说明：这款产品是什么、有什么特性，给后台运营与客户看的，与版本更新说明(updatedescription)无关。
     string description = 38;                             //@go_tags(`gorm:"description" json:"description"`) 产品说明(特性描述)
+    //这款产品由哪家代工厂生产（oem_factory.id，0=未指定）。产品级是「默认由谁生产」，
+    //生产批次上还有一个 factoryid，那个是「这一批实际由谁生产」——换厂时批次能覆盖，产品不用改。
+    //⚠️ 字段名不能叫 factoryid：上面 34 号已被【老客户端兼容字段】占着，那个 factoryid 是
+    //「厂家→品牌商」改名前老 App 解析用的，值恒等于 brandid、由 user 模块读取层填充，
+    //复用它会让代工厂 id 被 brandid 覆盖掉。
+    //注意芯片没有产品级字段：芯片由 providerid → solution_provider.vendor 推导，
+    //存一份到产品上会在方案商换芯片时变成对不上的旧值，而 CID 是要烧进固件的。
+    uint32 oemfactoryid = 39;                            //@go_tags(`gorm:"oemfactoryid;index" json:"oemfactoryid"`) 代工厂id(0=未指定)
+    //固件升级判定放宽：开着时「设备版本 != 服务端版本」就允许升级，而不是只允许升到更高版本。
+    //给开发/测试环境用——测试机的固件常常比后台挂的还新，按「更高才升级」会永远点不动升级按钮，
+    //也没法把耳机刷回旧固件反复验证 OTA 流程。
+    //⚠️ 正式产品别开：一次配置失误（比如后台挂了个旧版固件）就会把全量用户降级。
+    bool updateonmismatch = 40;                          //@go_tags(`gorm:"updateonmismatch" json:"updateonmismatch"`) 版本不一致即可升级(开发用,默认关)
 }
    
 
diff --git a/apps/services/comm/apprelease.go b/apps/services/comm/apprelease.go
new file mode 100644
index 00000000..e8e4981b
--- /dev/null
+++ b/apps/services/comm/apprelease.go
@@ -0,0 +1,129 @@
+package comm
+
+import "strings"
+
+// 应用发版与入口控制配置（表 TableAppRelease，存 console 共享库 postgres）。
+//
+// 一行 = 一个应用（`app_name=”` 为全局默认兜底），**不分渠道**。对应后台
+// 「服务配置 → 版本控制」与「服务配置 → 游客显隐控制」两个页面。
+//
+// 为什么从 ChannelApp 里拆出来：版本号、强更、游客开关这几项本来就是「整个应用一套」，
+// 按渠道各存一份的直接后果是同一个开关有 8 处能改、客户端只读其中一处 —— 线上真出过
+// 「后台明明开了游客登录、App 就是不显示」的事故。拆出来之后这些字段**只有这一个来源**。
+//
+// 仍留在 ChannelApp 里的是真正因渠道而异的东西：下载地址、上架状态、支付渠道、
+// 是否允许跳过设备绑定。其中下载地址在这里也有一份**默认值**，渠道没单独填时用它 ——
+// 华为/小米/App Store 的商店链接各不相同，客户端是直接把它当 URL 打开的，
+// 一套地址会把小米用户引到华为商店，所以渠道级覆盖必须保留。
+type AppRelease struct {
+	RowId   uint64 `gorm:"primaryKey;autoIncrement;column:row_id" json:"row_id"`
+	AppName string `gorm:"column:app_name;size:64;uniqueIndex:uidx_app_release" json:"app_name"` // ''=全局默认
+
+	// ── 版本控制 ──
+	Version       string `gorm:"column:version;size:32" json:"version"`               // 当前线上版本
+	MinVersion    string `gorm:"column:min_version;size:32" json:"min_version"`       // 最低支持版本，低于它的客户端必须更新
+	ForceUpdate   bool   `gorm:"column:force_update" json:"force_update"`             // 强制更新总开关（配合 MinVersion）
+	Changelog     string `gorm:"column:changelog" json:"changelog"`                   // 更新日志，下发给客户端展示
+	Address       string `gorm:"column:address" json:"address"`                       // 默认下载地址；渠道填了自己的则以渠道为准
+	ReviewVersion string `gorm:"column:review_version;size:32" json:"review_version"` // 送审版本号；客户端报这一版时隐藏未过审功能
+
+	// ── 游客显隐 ──
+	Tourists        bool   `gorm:"column:tourists" json:"tourists"`                       // 允许游客登录（总开关）
+	TouristsVersion string `gorm:"column:touristsversion;size:32" json:"touristsversion"` // 生效版本，白名单语义见 ShowTourists
+
+	Createtime int64 `gorm:"column:createtime" json:"createtime"`
+	Updatetime int64 `gorm:"column:updatetime" json:"updatetime"`
+}
+
+// NeedForceUpdate 判断某客户端版本是否必须更新：开了强更开关、配了最低版本、且客户端版本低于它。
+//
+// 客户端版本为空（老客户端没上报）时不强更，避免把所有人挡在门外 —— 这个判定一旦判宽只是
+// 少弹一次强更框，判严就是全员无法使用，失败方向必须偏向放行。
+func (r *AppRelease) NeedForceUpdate(clientVersion string) bool {
+	if r == nil || !r.ForceUpdate || strings.TrimSpace(r.MinVersion) == "" {
+		return false
+	}
+	if strings.TrimSpace(clientVersion) == "" {
+		return false
+	}
+	return CompareVersion(clientVersion, r.MinVersion) < 0
+}
+
+// NeedUpdate 判断是否有更新可用：线上版本高于客户端版本。
+func (r *AppRelease) NeedUpdate(clientVersion string) bool {
+	if r == nil || strings.TrimSpace(r.Version) == "" || strings.TrimSpace(clientVersion) == "" {
+		return false
+	}
+	return CompareVersion(clientVersion, r.Version) < 0
+}
+
+// IsReviewing 判断某客户端版本是否正是「送审版本」——客户端据此隐藏未过审的功能。
+func (r *AppRelease) IsReviewing(clientVersion string) bool {
+	if r == nil || strings.TrimSpace(r.ReviewVersion) == "" {
+		return false
+	}
+	return CompareVersion(clientVersion, r.ReviewVersion) == 0
+}
+
+// ShowTourists 判断某客户端版本是否该看到「游客登录」入口。
+//
+// 判定一律在服务端做：客户端只拿结论，不拿规则。各端各写一遍版本比较必然出现实现不一致，
+// 而这个开关直接关系到应用商店过审，判错代价很高。
+//
+// 语义是「白名单」：**只有被点名的那一个版本可见，其余一律隐藏**。
+//   - Tourists=false                      → 一律隐藏（总开关关掉）
+//   - Tourists=true  且 TouristsVersion="" → 一律隐藏（没点名任何版本 = 谁都不放行）
+//   - Tourists=true  且 TouristsVersion=X → 只有版本号等于 X 的客户端可见
+//
+// 送审场景：只给正在审核的那一版开游客登录，线上其它版本不受影响。
+//
+// ⚠️ 留空按「全隐藏」而非「全放行」处理，是刻意选的失败方向：这个开关一旦判宽，
+// 后果是不该露出游客入口的版本露了出去（过审风险、白嫖开户礼）；判严只是入口少显示。
+// 后台保存时会拦住「勾了开关却没填版本」这种等于没开的配置，避免运营踩空。
+//
+// 客户端没上报版本时同样隐藏——点名了版本却认不出来是哪一版，只能从严。
+func (r *AppRelease) ShowTourists(clientVersion string) bool {
+	if r == nil || !r.Tourists {
+		return false
+	}
+	want := strings.TrimSpace(r.TouristsVersion)
+	if want == "" {
+		return false
+	}
+	if strings.TrimSpace(clientVersion) == "" {
+		return false
+	}
+	return CompareVersion(clientVersion, want) == 0
+}
+
+// DownloadAddress 取该渠道实际生效的下载地址：渠道填了就用渠道的，没填回退到应用默认。
+func (r *AppRelease) DownloadAddress(channelAddress string) string {
+	if s := strings.TrimSpace(channelAddress); s != "" {
+		return channelAddress
+	}
+	if r == nil {
+		return ""
+	}
+	return r.Address
+}
+
+// PickAppRelease 从「应用行 + 全局行」里挑生效的一条：应用行覆盖全局行，都没有返回 nil。
+// 与 agent / 第三方服务 / 渠道分发下发同语义（应用优先、无则回退全局）。
+func PickAppRelease(rows []*AppRelease, app string) *AppRelease {
+	var global, scoped *AppRelease
+	for _, r := range rows {
+		if r == nil {
+			continue
+		}
+		switch r.AppName {
+		case app:
+			scoped = r
+		case "":
+			global = r
+		}
+	}
+	if scoped != nil {
+		return scoped
+	}
+	return global
+}
diff --git a/apps/services/comm/apprelease_test.go b/apps/services/comm/apprelease_test.go
new file mode 100644
index 00000000..0aaad8ba
--- /dev/null
+++ b/apps/services/comm/apprelease_test.go
@@ -0,0 +1,131 @@
+package comm
+
+import "testing"
+
+func TestAppReleaseNeedForceUpdate(t *testing.T) {
+	on := &AppRelease{ForceUpdate: true, MinVersion: "2.0.0"}
+	if !on.NeedForceUpdate("1.9.9") {
+		t.Fatal("低于最低版本应强更")
+	}
+	if on.NeedForceUpdate("2.0.0") || on.NeedForceUpdate("2.1.0") {
+		t.Fatal("达到或高于最低版本不该强更")
+	}
+	if on.NeedForceUpdate("") {
+		t.Fatal("客户端未上报版本时不该强更，否则老客户端会被全挡在门外")
+	}
+	off := &AppRelease{ForceUpdate: false, MinVersion: "2.0.0"}
+	if off.NeedForceUpdate("1.0.0") {
+		t.Fatal("强更开关关闭时不该强更")
+	}
+	noMin := &AppRelease{ForceUpdate: true}
+	if noMin.NeedForceUpdate("1.0.0") {
+		t.Fatal("未配最低版本时不该强更")
+	}
+	var nilRel *AppRelease
+	if nilRel.NeedForceUpdate("1.0.0") {
+		t.Fatal("nil 配置不该强更")
+	}
+}
+
+func TestAppReleaseNeedUpdate(t *testing.T) {
+	r := &AppRelease{Version: "1.2.0"}
+	if !r.NeedUpdate("1.1.9") {
+		t.Fatal("低于线上版本应提示有更新")
+	}
+	if r.NeedUpdate("1.2.0") || r.NeedUpdate("1.3.0") {
+		t.Fatal("不低于线上版本时不该提示更新")
+	}
+	if r.NeedUpdate("") {
+		t.Fatal("客户端未上报版本时不该提示更新")
+	}
+	if (&AppRelease{}).NeedUpdate("1.0.0") {
+		t.Fatal("未配线上版本时恒为 false")
+	}
+}
+
+func TestAppReleaseIsReviewing(t *testing.T) {
+	r := &AppRelease{ReviewVersion: "3.1.0"}
+	if !r.IsReviewing("3.1.0") {
+		t.Fatal("送审版本应识别为审核中")
+	}
+	if r.IsReviewing("3.0.0") || r.IsReviewing("3.2.0") {
+		t.Fatal("非送审版本不该识别为审核中")
+	}
+	if (&AppRelease{}).IsReviewing("3.1.0") {
+		t.Fatal("未配送审版本时恒为 false")
+	}
+}
+
+// 游客登录的版本限定：这是应用商店过审期的开关，判错要么违规放行、要么审核员看不到入口被拒，
+// 三段语义各钉一条。
+func TestAppReleaseShowTourists(t *testing.T) {
+	// 总开关关掉：无论版本、无论有没有配生效版本，一律隐藏。
+	off := &AppRelease{Tourists: false, TouristsVersion: "1.0.2"}
+	if off.ShowTourists("1.0.2") {
+		t.Fatal("总开关关掉时不该显示游客登录")
+	}
+
+	// 开关开、但没点名任何版本：一律隐藏。白名单语义，不是「没限定就全放行」——
+	// 判宽的后果是不该露游客入口的版本露了出去，判严只是入口少显示。
+	none := &AppRelease{Tourists: true}
+	for _, v := range []string{"1.0.2", "9.9.9", ""} {
+		if none.ShowTourists(v) {
+			t.Fatalf("未填生效版本时 %q 不该可见", v)
+		}
+	}
+
+	// 开关开、点名 1.0.2：只有这一版可见，高于/低于/没上报一律隐藏。
+	only := &AppRelease{Tourists: true, TouristsVersion: "1.0.2"}
+	if !only.ShowTourists("1.0.2") {
+		t.Fatal("被点名的版本应可见")
+	}
+	// "1.0.2" == "1.0.2.0"：段数不同按 0 补齐，别因为后台填了三段、客户端报四段就判不匹配。
+	if !only.ShowTourists("1.0.2.0") {
+		t.Fatal("补零等价的版本应可见")
+	}
+	for _, v := range []string{"1.0.1", "1.0.3", "1.0.20", "2.0.0", ""} {
+		if only.ShowTourists(v) {
+			t.Fatalf("点名 1.0.2 时 %q 不该可见", v)
+		}
+	}
+
+	var nilRel *AppRelease
+	if nilRel.ShowTourists("1.0.2") {
+		t.Fatal("未配置发版信息时不该显示游客登录")
+	}
+}
+
+// 下载地址必须允许按渠道覆盖：华为/小米/App Store 的商店链接各不相同，
+// 客户端是直接把它当 URL 打开的，一套地址会把小米用户引到华为商店。
+func TestAppReleaseDownloadAddress(t *testing.T) {
+	r := &AppRelease{Address: "https://default/app.apk"}
+	if got := r.DownloadAddress("https://xiaomi/store"); got != "https://xiaomi/store" {
+		t.Fatalf("渠道填了地址应以渠道为准，实际 %q", got)
+	}
+	if got := r.DownloadAddress("   "); got != "https://default/app.apk" {
+		t.Fatalf("渠道留空应回退应用默认地址，实际 %q", got)
+	}
+	var nilRel *AppRelease
+	if got := nilRel.DownloadAddress(""); got != "" {
+		t.Fatalf("两边都没有时应为空串，实际 %q", got)
+	}
+	if got := nilRel.DownloadAddress("https://only-channel"); got != "https://only-channel" {
+		t.Fatalf("发版配置缺失时仍应用渠道地址，实际 %q", got)
+	}
+}
+
+func TestPickAppRelease(t *testing.T) {
+	rows := []*AppRelease{
+		{AppName: "", Version: "1.0.0"},
+		{AppName: "ym", Version: "2.0.0"},
+	}
+	if got := PickAppRelease(rows, "ym"); got == nil || got.Version != "2.0.0" {
+		t.Fatalf("应用行应覆盖全局行，实际 %+v", got)
+	}
+	if got := PickAppRelease(rows, "other"); got == nil || got.Version != "1.0.0" {
+		t.Fatalf("没有应用行时应回退全局行，实际 %+v", got)
+	}
+	if got := PickAppRelease([]*AppRelease{{AppName: "ym"}}, "other"); got != nil {
+		t.Fatalf("既无应用行也无全局行时应返回 nil，实际 %+v", got)
+	}
+}
diff --git a/apps/services/comm/appscope.go b/apps/services/comm/appscope.go
index 6e8bf831..7ad4736d 100644
--- a/apps/services/comm/appscope.go
+++ b/apps/services/comm/appscope.go
@@ -9,17 +9,27 @@ import (
 // 部署身份（应用名/区域）解析——全服务唯一入口。
 //
 // 一份部署只用一组环境变量声明「我是谁」，就是统计上报那一组：
-//   - ANALYZE_APP_NAME —— 应用名，须与 console 注册表 app_registry.app_name 完全一致
+//   - ANALYZE_APP_NAME —— 应用名，须与 console 注册表 app_registry 的 name 与 app_name
+//     【两列同时】完全一致（大小写敏感）
 //   - ANALYZE_REGION   —— 区域，pb.Region 枚举整数（1=中国 2=美国 …，见 region.go）
 //
+// ⚠️ 为什么是「两列同时」：这一个变量被两处以不同口径消费，缺一不可——
+//   - 按应用作用域读配置（本文件的 AppName()）：配置表按 app_registry.app_name 存；
+//   - 统计落库：console 消费快照时先过 isRegisteredApp() → getAppByName()，那里查的是
+//     `app_registry.name`（见 modules/console/model_registry.go）。对不上就整条丢弃，
+//     只在 console 日志留一行 `console.stat: 快照应用未在 console 注册，未落库`，
+//     数据滞留在业务侧 Redis，看板恒为 0 且不报任何错。
+// 所以注册应用时要把 name 与 app_name 填成同一个值；只满足一半必然坏掉另一半。
+// （2026-09-01 在阿龙测试机实测：两列不一致，实时统计累计 152 条被拒、一条都没落库。）
+//
 // 历史上还有一组同义的 APP_NAME / APP_REGION（服务配置托管、会议记录编排在用），
 // 与 ANALYZE_* 语义完全重复，却因为一个走 yaml options、一个走裸 env 而长期并存：
 // 线上普遍只填了 ANALYZE_*，于是按作用域读配置的地方全部静默退化成「全局默认」，
 // 后台明明按应用配好了却下发不到客户端。2026-08-12 已删除 APP_NAME/APP_REGION，
 // 所有消费方一律走本文件的 AppName/AppRegion/AppRegionId。
 
-// AppName 返回本部署的应用名（console 注册表 app_registry.app_name）。
-// 返回 "" 表示未声明部署身份，调用方按「全局默认」作用域处理。
+// AppName 返回本部署的应用名（console 注册表 app_registry.app_name；该列须与 name 列同值，
+// 理由见上方说明）。返回 "" 表示未声明部署身份，调用方按「全局默认」作用域处理。
 func AppName() string {
 	return strings.TrimSpace(os.Getenv("ANALYZE_APP_NAME"))
 }
diff --git a/apps/services/comm/channelapp.go b/apps/services/comm/channelapp.go
index a8510674..e33fbd9b 100644
--- a/apps/services/comm/channelapp.go
+++ b/apps/services/comm/channelapp.go
@@ -10,9 +10,9 @@ import (
 // 与 svcpool.go / agentcfg.go / calltranslate.go 同一模式：console 后台读写（管理端 CRUD），
 // 业务服务（home 的 user 模块）运行时按 (app_name=? OR app_name='') 直读、下发客户端。
 //
-// 取代旧的 channelapp 表（存各应用业务库 mysql、主键只有 channel、只有一个 version 字段）：
-// 现在按 app_name 分作用域统一收在 console 主库，且版本信息扩展为「线上版本 / 最低支持版本 /
-// 强制更新 / 更新日志 / 审核中版本 / 上架状态」，够客户端做强更与审核期功能开关判断。
+// 取代旧的 channelapp 表（存各应用业务库 mysql、主键只有 channel）：现在按 app_name
+// 分作用域统一收在 console 主库。版本与游客登录那几项后来又进一步拆到 AppRelease
+// （按应用、不分渠道），本表只留真正因渠道而异的：下载地址、上架状态、支付渠道、跳过绑定。
 
 // 渠道枚举（与 pb.UserChannel 一致，此处冗余一份便于 comm 层独立使用）。
 const (
@@ -55,25 +55,25 @@ var PayChannelModule = map[string]string{
 }
 
 // ChannelApp 一个应用在一个分发渠道上的配置。(app_name, channel) 唯一。
+//
+// ⚠️ 版本号 / 最低支持版本 / 强制更新 / 更新日志 / 送审版本 / 游客登录开关这 7 项
+// **已搬到 [AppRelease]**（后台「服务配置 → 版本控制 / 游客显隐控制」），本结构不再持有。
+// 它们本来就是「整个应用一套」，按渠道各存一份意味着同一个开关有 8 处能改而客户端只读一处 ——
+// 别再加回来。数据库里的旧列不会被删除（gorm 从不删列），只是不再读写。
 type ChannelApp struct {
 	RowId   uint64 `gorm:"primaryKey;autoIncrement;column:row_id" json:"row_id"`
 	AppName string `gorm:"column:app_name;size:64;uniqueIndex:uidx_channel_app,priority:1" json:"app_name"` // ''=全局默认
 	Channel int32  `gorm:"column:channel;uniqueIndex:uidx_channel_app,priority:2" json:"channel"`
 
-	// 版本
-	Version       string `gorm:"column:version;size:32" json:"version"`         // 当前线上版本
-	MinVersion    string `gorm:"column:min_version;size:32" json:"min_version"` // 最低支持版本，低于它的客户端必须更新
-	ForceUpdate   bool   `gorm:"column:force_update" json:"force_update"`       // 强制更新总开关（低于 MinVersion 时才有意义）
-	Changelog     string `gorm:"column:changelog" json:"changelog"`
-	Address       string `gorm:"column:address" json:"address"`                       // 下载/商店地址
-	ReviewVersion string `gorm:"column:review_version;size:32" json:"review_version"` // 审核中的版本号；客户端报这个版本时可隐藏敏感功能
-	Status        int32  `gorm:"column:status" json:"status"`                         // 见 ChannelStatus*
+	// 下载地址是**本渠道**的商店链接，留在这里：华为/小米/App Store 各不相同，
+	// 客户端直接把它当 URL 打开，一套地址会把小米用户引到华为商店。
+	// 留空则回退到 AppRelease.Address（见 AppRelease.DownloadAddress）。
+	Address string `gorm:"column:address" json:"address"`
+	Status  int32  `gorm:"column:status" json:"status"` // 见 ChannelStatus*，各商店各自的上架进度
 
 	Description string `gorm:"column:description" json:"description"`
 
 	// 能力开关（沿用旧 DBChannelApp 语义）
-	Tourists               bool   `gorm:"column:tourists" json:"tourists"`                             // 允许游客登录（总开关）
-	TouristsVersion        string `gorm:"column:touristsversion;size:32" json:"touristsversion"`       // 游客登录生效版本；非空时只有该版本客户端可见，其余版本一律隐藏
 	AllowSkipDeviceBinding bool   `gorm:"column:allowskipdevicebinding" json:"allowskipdevicebinding"` // 允许跳过设备绑定
 	PayChannels            string `gorm:"column:paychannels;size:128" json:"paychannels"`              // 逗号分隔，见 Pay* 常量
 
@@ -139,56 +139,9 @@ func leadingInt(s string) int {
 	return n
 }
 
-// NeedForceUpdate 判断某客户端版本是否必须更新：开了强更开关、配了最低版本、且客户端版本低于它。
-// 客户端版本为空（老客户端没上报）时不强更，避免把所有人挡在门外。
-func (c *ChannelApp) NeedForceUpdate(clientVersion string) bool {
-	if c == nil || !c.ForceUpdate || strings.TrimSpace(c.MinVersion) == "" {
-		return false
-	}
-	if strings.TrimSpace(clientVersion) == "" {
-		return false
-	}
-	return CompareVersion(clientVersion, c.MinVersion) < 0
-}
-
-// IsReviewing 判断某客户端版本是否正处于「送审版本」——客户端据此隐藏未过审的功能。
-func (c *ChannelApp) IsReviewing(clientVersion string) bool {
-	if c == nil || strings.TrimSpace(c.ReviewVersion) == "" {
-		return false
-	}
-	return CompareVersion(clientVersion, c.ReviewVersion) == 0
-}
-
-// ShowTourists 判断某客户端版本是否该看到「游客登录」入口。
-//
-// 判定一律在服务端做（同 NeedForceUpdate/IsReviewing）：客户端只拿结论，不拿规则。
-// 各端各写一遍版本比较必然出现实现不一致，而这个开关直接关系到应用商店过审，判错代价很高。
-//
-// 语义是「白名单」：**只有被点名的那一个版本可见，其余一律隐藏**。
-//   - Tourists=false                      → 一律隐藏（总开关关掉）
-//   - Tourists=true  且 TouristsVersion="" → 一律隐藏（没点名任何版本 = 谁都不放行）
-//   - Tourists=true  且 TouristsVersion=X → 只有版本号等于 X 的客户端可见
-//
-// 送审场景：只给正在审核的那一版开游客登录，线上其它版本不受影响。
-//
-// ⚠️ 留空按「全隐藏」而非「全放行」处理，是刻意选的失败方向：这个开关一旦判宽，
-// 后果是不该露出游客入口的版本露了出去（过审风险、白嫖开户礼）；判严只是入口少显示。
-// 后台 saveChannelApp 会拦住「勾了开关却没填版本」这种等于没开的配置，避免运营踩空。
-//
-// 客户端没上报版本时同样隐藏——点名了版本却认不出来是哪一版，只能从严。
-func (c *ChannelApp) ShowTourists(clientVersion string) bool {
-	if c == nil || !c.Tourists {
-		return false
-	}
-	want := strings.TrimSpace(c.TouristsVersion)
-	if want == "" {
-		return false
-	}
-	if strings.TrimSpace(clientVersion) == "" {
-		return false
-	}
-	return CompareVersion(clientVersion, want) == 0
-}
+// 升级/游客登录的判定方法已随字段一起搬到 AppRelease：
+// NeedForceUpdate / NeedUpdate / IsReviewing / ShowTourists 见 comm/apprelease.go。
+// CompareVersion 仍留在本文件，两边共用。
 
 // PickChannelApp 从「应用行 + 全局行」里挑出该渠道生效的一条：应用行覆盖全局行，都没有返回 nil。
 // 与 agent / 第三方服务下发同语义（应用优先、无则回退全局）。
diff --git a/apps/services/comm/channelapp_test.go b/apps/services/comm/channelapp_test.go
index 71ec9210..1fb78a9d 100644
--- a/apps/services/comm/channelapp_test.go
+++ b/apps/services/comm/channelapp_test.go
@@ -25,54 +25,16 @@ func TestCompareVersion(t *testing.T) {
 	}
 }
 
-func TestNeedForceUpdate(t *testing.T) {
-	on := &ChannelApp{ForceUpdate: true, MinVersion: "2.0.0"}
-	if !on.NeedForceUpdate("1.9.9") {
-		t.Fatal("低于最低版本应强更")
-	}
-	if on.NeedForceUpdate("2.0.0") || on.NeedForceUpdate("2.1.0") {
-		t.Fatal("达到或高于最低版本不该强更")
-	}
-	if on.NeedForceUpdate("") {
-		t.Fatal("客户端未上报版本时不该强更，否则老客户端会被全挡在门外")
-	}
-	off := &ChannelApp{ForceUpdate: false, MinVersion: "2.0.0"}
-	if off.NeedForceUpdate("1.0.0") {
-		t.Fatal("强更开关关闭时不该强更")
-	}
-	noMin := &ChannelApp{ForceUpdate: true}
-	if noMin.NeedForceUpdate("1.0.0") {
-		t.Fatal("未配最低版本时不该强更")
-	}
-	var nilApp *ChannelApp
-	if nilApp.NeedForceUpdate("1.0.0") {
-		t.Fatal("nil 配置不该强更")
-	}
-}
-
-func TestIsReviewing(t *testing.T) {
-	c := &ChannelApp{ReviewVersion: "3.1.0"}
-	if !c.IsReviewing("3.1.0") {
-		t.Fatal("送审版本应识别为审核中")
-	}
-	if c.IsReviewing("3.0.0") || c.IsReviewing("3.2.0") {
-		t.Fatal("非送审版本不该识别为审核中")
-	}
-	if (&ChannelApp{}).IsReviewing("3.1.0") {
-		t.Fatal("未配送审版本时恒为 false")
-	}
-}
-
 func TestPickChannelApp(t *testing.T) {
 	rows := []*ChannelApp{
-		{AppName: "", Channel: ChannelGlobalApple, Version: "1.0.0"},
-		{AppName: "voitrans", Channel: ChannelGlobalApple, Version: "2.0.0"},
-		{AppName: "", Channel: ChannelGlobalGoogle, Version: "1.5.0"},
+		{AppName: "", Channel: ChannelGlobalApple, Address: "global-apple"},
+		{AppName: "voitrans", Channel: ChannelGlobalApple, Address: "app-apple"},
+		{AppName: "", Channel: ChannelGlobalGoogle, Address: "global-google"},
 	}
-	if got := PickChannelApp(rows, ChannelGlobalApple); got == nil || got.Version != "2.0.0" {
+	if got := PickChannelApp(rows, ChannelGlobalApple); got == nil || got.Address != "app-apple" {
 		t.Fatalf("应用行应覆盖全局行，实际 %+v", got)
 	}
-	if got := PickChannelApp(rows, ChannelGlobalGoogle); got == nil || got.Version != "1.5.0" {
+	if got := PickChannelApp(rows, ChannelGlobalGoogle); got == nil || got.Address != "global-google" {
 		t.Fatalf("只有全局行时应回退全局，实际 %+v", got)
 	}
 	if got := PickChannelApp(rows, ChannelChinaHuawei); got != nil {
@@ -86,42 +48,3 @@ func TestSplitPayChannels(t *testing.T) {
 		t.Fatalf("SplitPayChannels 结果异常: %#v", got)
 	}
 }
-
-// 游客登录的版本限定：这是应用商店过审期的开关，判错要么违规放行、要么审核员看不到入口被拒，
-// 三段语义各钉一条。
-func TestShowTourists(t *testing.T) {
-	// 总开关关掉：无论版本、无论有没有配生效版本，一律隐藏。
-	off := &ChannelApp{Tourists: false, TouristsVersion: "1.0.2"}
-	if off.ShowTourists("1.0.2") {
-		t.Fatal("总开关关掉时不该显示游客登录")
-	}
-
-	// 开关开、但没点名任何版本：一律隐藏。白名单语义，不是「没限定就全放行」——
-	// 判宽的后果是不该露游客入口的版本露了出去，判严只是入口少显示。
-	none := &ChannelApp{Tourists: true}
-	for _, v := range []string{"1.0.2", "9.9.9", ""} {
-		if none.ShowTourists(v) {
-			t.Fatalf("未填生效版本时 %q 不该可见", v)
-		}
-	}
-
-	// 开关开、点名 1.0.2：只有这一版可见，高于/低于/没上报一律隐藏。
-	only := &ChannelApp{Tourists: true, TouristsVersion: "1.0.2"}
-	if !only.ShowTourists("1.0.2") {
-		t.Fatal("被点名的版本应可见")
-	}
-	// "1.0.2" == "1.0.2.0"：段数不同按 0 补齐，别因为后台填了三段、客户端报四段就判不匹配。
-	if !only.ShowTourists("1.0.2.0") {
-		t.Fatal("补零等价的版本应可见")
-	}
-	for _, v := range []string{"1.0.1", "1.0.3", "1.0.20", "2.0.0", ""} {
-		if only.ShowTourists(v) {
-			t.Fatalf("点名 1.0.2 时 %q 不该可见", v)
-		}
-	}
-
-	var nilApp *ChannelApp
-	if nilApp.ShowTourists("1.0.2") {
-		t.Fatal("未配置渠道不该显示游客登录")
-	}
-}
diff --git a/apps/services/comm/nats.go b/apps/services/comm/nats.go
index fb7ce6fb..6e1b61d4 100644
--- a/apps/services/comm/nats.go
+++ b/apps/services/comm/nats.go
@@ -29,16 +29,17 @@ const (
 
 // 配置变更类型（ConfigChangedEvent.Kind 取值）：业务侧据此重载对应缓存。
 const (
-	ConfigKindGlobalConfig  = "global_config" // 全局第三方服务配置（user 模块重载）
-	ConfigKindMcp           = "mcp"           // MCP 服务器（user 模块重载）
-	ConfigKindTemplate      = "template"      // 会议公共模板（echomeet 模块重载）
-	ConfigKindThirdSvc      = "third_svc"     // 依赖服务配置（业务侧重载字段缓存）
+	ConfigKindGlobalConfig  = "global_config"  // 全局第三方服务配置（user 模块重载）
+	ConfigKindMcp           = "mcp"            // MCP 服务器（user 模块重载）
+	ConfigKindTemplate      = "template"       // 会议公共模板（echomeet 模块重载）
+	ConfigKindThirdSvc      = "third_svc"      // 依赖服务配置（业务侧重载字段缓存）
 	ConfigKindCallTranslate = "call_translate" // 通话翻译配置（translate 模块重载）
 	ConfigKindServiceConfig = "service_config" // 应用×服务基础设施/运行配置（后台改后广播；DSN 等多需重启才生效）
 	ConfigKindAgent         = "agent"          // yunyan 自管 Agent 配置（后台改后广播；下发客户端）
 	ConfigKindModuleConfig  = "module_config"  // 应用业务功能配置（登录/短信/邮件/支付；存业务库，后台改后广播、业务侧重载）
 	ConfigKindEchomeetOrch  = "echomeet_orch"  // 会议记录服务编排（引用 svc_config 的服务，按 app_name+region 分层；存 console 库，下发/运行时接入后用）
-	ConfigKindChannelApp    = "channel_app"    // 渠道分发配置（版本/强更/下载地址/支付渠道开关；存 console 库，user 模块下发客户端）
+	ConfigKindChannelApp    = "channel_app"    // 渠道分发配置（下载地址/上架状态/支付渠道开关；存 console 库，user 模块下发客户端）
+	ConfigKindAppRelease    = "app_release"    // 应用发版与入口控制（版本/强更/送审版本/游客显隐；存 console 库，user 模块下发客户端）
 )
 
 // ConfigChangedEvent console→业务 的「配置已变更」广播事件。
diff --git a/apps/services/lego/sys/log/log.log b/apps/services/lego/sys/log/log.log
index 9ad4dd31..f1ff9470 100644
--- a/apps/services/lego/sys/log/log.log
+++ b/apps/services/lego/sys/log/log.log
@@ -1 +1 @@
-2026/08/20 17:13:42.666	ERROR	log/sys_test.go:36	妈妈咪呀!
+2026/09/04 00:52:33.329	ERROR	log/sys_test.go:36	妈妈咪呀!
diff --git a/apps/services/modules/analyze/options.go b/apps/services/modules/analyze/options.go
index bbdfc653..67088c5a 100644
--- a/apps/services/modules/analyze/options.go
+++ b/apps/services/modules/analyze/options.go
@@ -7,7 +7,10 @@ import (
 
 type Options struct {
 	modules.Options
-	AppName      string // 本部署应用名称；落 stats_global_day.app_id（须与 console 注册表名称一致）。统计上报的核心维度
+	AppName string // 本部署应用名称；落 stats_global_day.app_id。统计上报的核心维度。
+	// ⚠️ 须与 console 注册表的 app_registry.**name** 列完全一致（大小写敏感）：console 消费端
+	// isRegisteredApp() 就是拿它查 `name=?`，对不上整条快照丢弃且只留一行 WARN 日志。
+	// 同时它也是 comm.AppName()（按应用作用域读配置，认 app_name 列），故注册时两列须同值。
 	Region       int32  // 本部署所属区域；取值见 pb.Region 枚举。每区域只写自己的行，多区域同步不冲突
 	SyncInterval int    // Redis→DB 同步间隔(秒)，默认 600；设为 86400 即每天同步一次
 	Subject      string // 转发到运维服务的 NATS subject（如 stats.event）；为空则不转发（双写过渡开关）
diff --git a/apps/services/modules/api/api_batchresetlicensestatus.go b/apps/services/modules/api/api_batchresetlicensestatus.go
index 4625ef35..1485a40d 100644
--- a/apps/services/modules/api/api_batchresetlicensestatus.go
+++ b/apps/services/modules/api/api_batchresetlicensestatus.go
@@ -1,16 +1,18 @@
 package api
 
 import (
+	"fmt"
+
 	"yunyan/comm"
 	"yunyan/pb"
-	"yunyan/utils/license"
+	"yunyan/utils/devcode"
 )
 
 // 批量重置License状态
 func (this *apiComp) BatchResetLicenseStatus(session comm.IUserSession, req *pb.ApiBatchResetLicenseStatusReq) (resp *pb.ApiBatchResetLicenseStatusResp, errdata *pb.ErrorData) {
 	resp = &pb.ApiBatchResetLicenseStatusResp{}
 	for _, code := range req.Licenses {
-		if err := this.resetOneLicense(code); err != nil {
+		if err := this.resetOneLicense(req.Productid, code); err != nil {
 			resp.FailCount++
 		} else {
 			resp.SuccessCount++
@@ -19,14 +21,20 @@ func (this *apiComp) BatchResetLicenseStatus(session comm.IUserSession, req *pb.
 	return
 }
 
-// resetOneLicense 重置单条 License 到初始状态（复用逻辑，供单条和批量共享）
-func (this *apiComp) resetOneLicense(licenseCode string) error {
-	pid, err := license.ProductID(licenseCode)
-	if err != nil {
-		err = nil
-		pid = uint16(45058)
+// resetOneLicense 重置单条设备码（license 或 MAC）到初始状态（供单条和批量共享）。
+//
+// productid 由调用方给；传 0 才从设备码反解。
+// ⚠️ 别把反解失败回退成写死的 PID：那会去改另一个产品的分表。宁可报错。
+func (this *apiComp) resetOneLicense(productid uint32, licenseCode string) error {
+	pid := productid
+	if pid == 0 {
+		p, err := devcode.ProductID(licenseCode)
+		if err != nil {
+			return fmt.Errorf("无法确定该设备码所属产品，请带上 productid: %s", licenseCode)
+		}
+		pid = uint32(p)
 	}
-	model, err := this.module.model.factoryDevic(uint32(pid), licenseCode)
+	model, err := this.module.model.factoryDevic(pid, licenseCode)
 	if err != nil {
 		return err
 	}
@@ -38,9 +46,15 @@ func (this *apiComp) resetOneLicense(licenseCode string) error {
 	}
 	model.Status = 0
 	model.Uid = ""
-	model.Devicemac = ""
+	// ⚠️ 只有认证码(AUTHCODE)的 devicemac 是绑定时填进去的，重置要清掉。
+	// 设备码(DEVICECODE)的 devicemac 是这台设备出厂就定死的身份——2026-09-02 起 code 就是它——
+	// 清掉等于把设备从库里抹了：按 MAC 反查绑定的路径再也找不到它，而 code 那一列还留着，
+	// 两列从此对不上。解绑路径(api_unbinddevice.go)一直是按这个规则做的，这里以前漏了。
+	// ⚠️ 不清 devicemac：设备码 = MAC = 分表主键 code（授权码字符串已于 2026-09-02 移除），
+	// 清掉等于把这台设备从库里抹掉——按 MAC 反查绑定的路径再也找不到它，
+	// 而 code 那一列还留着，两列从此对不上。
 	model.Usedtime = 0
-	if err = this.module.model.updatefactoryDevic(uint32(pid), model); err != nil {
+	if err = this.module.model.updatefactoryDevic(pid, model); err != nil {
 		return err
 	}
 	if wasActivated && model.Productid > 0 {
diff --git a/apps/services/modules/api/api_createauthcodes.go b/apps/services/modules/api/api_createauthcodes.go
index 083f6ed0..e81bd5ee 100644
--- a/apps/services/modules/api/api_createauthcodes.go
+++ b/apps/services/modules/api/api_createauthcodes.go
@@ -1,16 +1,35 @@
 package api
 
 import (
+	"fmt"
 	"strings"
 	"time"
 
 	"yunyan/comm"
 	"yunyan/lego/sys/log"
+	"yunyan/lego/sys/postgres"
 	"yunyan/pb"
-	"yunyan/utils/license"
+	"yunyan/utils/devcode"
 	"yunyan/utils/mac"
 )
 
+// checkProductionFactory 校验批次要记的代工厂：0=不指定直接放行；非 0 时必须存在且未停用。
+// 直接查表而不建 model 层：oem_factory 是后台(console 模块)维护的档案，api 这边只读一个存在性，
+// 为它在 api 模块再复制一份 struct 反而会两处定义漂移。
+func (this *apiComp) checkProductionFactory(id uint32) *pb.ErrorData {
+	if id == 0 {
+		return nil // 可选：存量流程没有工厂概念，不强制填
+	}
+	var n int64
+	if err := postgres.Table(comm.TableOemFactory).Where("id=? AND enabled=?", id, true).Count(&n).Error; err != nil {
+		return &pb.ErrorData{Code: pb.ErrorCode_DBError, Message: err.Error()}
+	}
+	if n == 0 {
+		return &pb.ErrorData{Code: pb.ErrorCode_ReqParameterError, Message: "代工厂不存在或已停用，请到后台「工厂管理」确认"}
+	}
+	return nil
+}
+
 // CreateAuthCodes 创建授权码/设备码（一次生产 = 一个批次）。
 //
 // 序号采用「产品级全局游标」：每次生产原子地从 product.serialcursor 上分配一段连续区间
@@ -35,6 +54,11 @@ func (this *apiComp) CreateAuthCodes(session comm.IUserSession, req *pb.ApiCreat
 	if errdata != nil {
 		return
 	}
+	// 代工厂可选（0=不指定）：只落在批次台账上，不写进每条授权码——
+	// 换厂是批次级的事，授权码里再存一份只会在改厂时产生两处不一致。
+	if errdata = this.checkProductionFactory(req.Factoryid); errdata != nil {
+		return
+	}
 	if product, err = this.module.model.product(pid); err != nil {
 		errdata = &pb.ErrorData{Code: pb.ErrorCode_DBError, Message: err.Error()}
 		return
@@ -45,9 +69,7 @@ func (this *apiComp) CreateAuthCodes(session comm.IUserSession, req *pb.ApiCreat
 	if codeCount == 0 {
 		codeCount = 1
 	}
-	isClassicBT := product.Devicetype == pb.DeviceType_Classic_bluetooth_Headset
-
-	// 计算本次生产的授权码总数
+	// 计算本次生产的设备总数
 	var (
 		total        int64
 		macaddresses []string
@@ -76,54 +98,40 @@ func (this *apiComp) CreateAuthCodes(session comm.IUserSession, req *pb.ApiCreat
 	}
 	start := end - total + 1
 
+	// ⚠️ 一条设备 = 一个 MAC，code 就是 MAC（2026-09-02 起，与 modules/console 同一口径）。
+	// 授权码字符串已彻底移除：绑定/禁用/重置/结算反查批次全走 MAC，
+	// MAC 前 2 字节就是 PID，产品/批次/渠道都能从它查回来，不需要第二套标识。
 	models := make([]*pb.DBAuthCode, 0, total)
-	if req.Createtype == 1 {
-		for i := int64(0); i < total; i++ {
-			serial := start + i
-			var code string
-			if code, err = license.GenerateV2(uint16(pid), uint32(serial)); err != nil {
-				errdata = &pb.ErrorData{Code: pb.ErrorCode_SystemError, Message: err.Error()}
-				return
-			}
-			device := &pb.DBAuthCode{
-				Code:       code,
-				Codetype:   pb.Codetype_AUTHCODE,
-				Brandid:    req.Brandid,
-				Channelid:  channel.Id,
-				Productid:  pid,
-				Number:     serial,
-				Createtime: now,
-			}
-			if isClassicBT { // 经典蓝牙耳机：生成设备码 + MAC
-				device.Codetype = pb.Codetype_DEVICECODE
-				device.Devicemac = mac.Generate(uint16(pid), uint32(serial))
-			}
-			models = append(models, device)
+	for i := int64(0); i < total; i++ {
+		device := &pb.DBAuthCode{
+			Codetype:   pb.Codetype_DEVICECODE,
+			Brandid:    req.Brandid,
+			Channelid:  channel.Id,
+			Productid:  pid,
+			Number:     start + i,
+			Createtime: now,
 		}
-	} else { // 导入模式
-		for i := int64(0); i < total; i++ {
-			serial := start + i
-			var code string
-			if code, err = license.GenerateV2(uint16(pid), uint32(serial)); err != nil {
-				errdata = &pb.ErrorData{Code: pb.ErrorCode_SystemError, Message: err.Error()}
+		if req.Createtype == 1 {
+			// MAC 只是 (PID,序号) 的一种编码，与设备是不是经典蓝牙无关，所有产品一视同仁。
+			device.Devicemac = mac.Generate(uint16(pid), uint32(start+i))
+		} else { // 导入模式：外部已烧录好的 MAC
+			norm, ok := devcode.NormalizeMac(macaddresses[i])
+			if !ok {
+				errdata = &pb.ErrorData{Code: pb.ErrorCode_ReqParameterError,
+					Message: fmt.Sprintf("第 %d 个 MAC 格式不对: %s", i+1, macaddresses[i])}
 				return
 			}
-			models = append(models, &pb.DBAuthCode{
-				Code:       code,
-				Codetype:   pb.Codetype_DEVICECODE,
-				Brandid:    req.Brandid,
-				Channelid:  channel.Id,
-				Productid:  pid,
-				Number:     serial,
-				Createtime: now,
-				Devicemac:  strings.TrimSpace(macaddresses[i]),
-			})
+			device.Devicemac = norm
 		}
+		device.Code = device.Devicemac
+		models = append(models, device)
 	}
 
-	// 经典蓝牙时批次记录 MAC 区间，否则留空
+	// MAC 区间只在【生产模式】下有意义：MAC 由 (PID, 序号) 算出，首尾即真实边界。
+	// 导入模式的 MAC 来自外部列表、彼此不连续，留空——存一对按序号算出来、库里根本不存在的
+	// 假地址，比空着更有害。（与 modules/console 同一口径。）
 	var startmac, endmac string
-	if isClassicBT {
+	if req.Createtype == 1 {
 		startmac = mac.Generate(uint16(pid), uint32(start))
 		endmac = mac.Generate(uint16(pid), uint32(end))
 	}
@@ -146,6 +154,7 @@ func (this *apiComp) CreateAuthCodes(session comm.IUserSession, req *pb.ApiCreat
 		Devicenum:   uint32(total),
 		Batchno:     batchno,
 		Remark:      req.Remark,
+		Factoryid:   req.Factoryid,
 	}
 	if err = this.module.model.addproductionbatch(batch); err != nil {
 		errdata = &pb.ErrorData{Code: pb.ErrorCode_DBError, Message: err.Error()}
diff --git a/apps/services/modules/api/api_resetlicensestatus.go b/apps/services/modules/api/api_resetlicensestatus.go
index e53563e3..9baf95e1 100644
--- a/apps/services/modules/api/api_resetlicensestatus.go
+++ b/apps/services/modules/api/api_resetlicensestatus.go
@@ -7,7 +7,7 @@ import (
 
 // 重置License状态（单条）
 func (this *apiComp) ResetLicenseStatus(session comm.IUserSession, req *pb.ApiResetLicenseStatusReq) (resp *pb.ApiResetLicenseStatusResp, errdata *pb.ErrorData) {
-	if err := this.resetOneLicense(req.License); err != nil {
+	if err := this.resetOneLicense(req.Productid, req.License); err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_DBError,
 			Message: err.Error(),
diff --git a/apps/services/modules/api/api_updateproduct.go b/apps/services/modules/api/api_updateproduct.go
index 6edb983b..a245dfce 100644
--- a/apps/services/modules/api/api_updateproduct.go
+++ b/apps/services/modules/api/api_updateproduct.go
@@ -25,7 +25,7 @@ func (this *apiComp) UpdateProduct(session comm.IUserSession, req *pb.ApiUpdateP
 		}
 		return
 	}
-	// 归属方案商（生产设备码的 CID）：更新是全字段 Save，没传就会被清空，
+	// 归属方案商（即方案ID BID；芯片ID CID 由它的 vendor 推出）：更新是全字段 Save，没传就会被清空，
 	// 所以传 0 视为「不改」，沿用原绑定。绑定与校验统一在 console 后台做。
 	if req.Product.Providerid == 0 && old != nil {
 		req.Product.Providerid = old.Providerid
diff --git a/apps/services/modules/api/model_test.go b/apps/services/modules/api/model_test.go
index 55773908..17c1a258 100644
--- a/apps/services/modules/api/model_test.go
+++ b/apps/services/modules/api/model_test.go
@@ -2,11 +2,6 @@ package api_test
 
 import (
 	"bytes"
-	"yunyan/comm"
-	"yunyan/lego/sys/mysql"
-	"yunyan/pb"
-	"yunyan/utils/license"
-	"yunyan/utils/mac"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
@@ -16,6 +11,10 @@ import (
 	"strings"
 	"testing"
 	"time"
+	"yunyan/comm"
+	"yunyan/lego/sys/mysql"
+	"yunyan/pb"
+	"yunyan/utils/mac"
 )
 
 // 生成自定义 MAC 地址（64 位 / 8 字节）
@@ -346,11 +345,6 @@ func pow10(n int) int {
 	return result
 }
 
-func Test_JIAMI(t *testing.T) {
-	pid, err := license.ProductID("0D82F1CCD83D72B78FA9")
-	fmt.Printf("pid:%X, err:%v\n", pid, err)
-}
-
 func Test_GenerateMac(t *testing.T) {
 	// 测试生成设备 MAC 地址（productid + 产品级序号）
 	productid := uint16(0x0302)
diff --git a/apps/services/modules/console/api_apprelease.go b/apps/services/modules/console/api_apprelease.go
new file mode 100644
index 00000000..3d2ec773
--- /dev/null
+++ b/apps/services/modules/console/api_apprelease.go
@@ -0,0 +1,156 @@
+package console
+
+import (
+	"strings"
+	"time"
+
+	"yunyan/comm"
+	"yunyan/lego/sys/postgres"
+	"yunyan/pb"
+
+	"github.com/gin-gonic/gin"
+)
+
+// ==================== 应用发版与入口控制 (app_release) ====================
+//
+// 后台「服务配置 → 版本控制」与「服务配置 → 游客显隐控制」两个页面的后端。
+// 模型见 comm/apprelease.go：一行 = 一个应用（app_name='' 为全局默认），**不分渠道**。
+//
+// ⚠️ 两个页面共用同一行，各自只写自己那组字段。所以保存一律是
+// 「先读出整行 → 只覆盖本组字段 → 整行写回」，绝不能直接把请求体当整行存 ——
+// 那样在「版本控制」页点一次保存就会把游客登录配置清空（反之亦然）。
+
+// getAppRelease 取某作用域的发版配置。没配过时返回一行空值，前端不必区分「没有」和「空」。
+func (this *serverComp) getAppRelease(c *gin.Context) {
+	var req struct {
+		AppName string `json:"app_name"`
+	}
+	_ = c.ShouldBindJSON(&req)
+	row, err := this.loadAppRelease(req.AppName)
+	if err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	writeOK(c, gin.H{"item": row})
+}
+
+// loadAppRelease 读某作用域的整行；没配过返回只带 AppName 的空行（RowId=0，保存时走插入）。
+//
+// 走主库（FindOnePrimary）而非只读副本：两个页面共用同一行、保存是「读整行→改一组→写回」，
+// 读到副本的延迟旧行就会把另一组字段回滚成旧值 —— 刚在游客页保存完再去版本页保存，
+// 游客配置可能被打回上一版。未注册副本时它等同 FindOne，没有额外代价。
+//
+// ⚠️ 「没查到」和「查不了」必须分开：连不上库时若也当成空行，接下来的保存会走插入分支、
+// 撞上 app_name 唯一索引，用户看到的是一句莫名其妙的约束冲突而不是「数据库连不上」。
+func (this *serverComp) loadAppRelease(appName string) (*comm.AppRelease, error) {
+	row := &comm.AppRelease{}
+	err := postgres.FindOnePrimary(comm.TableAppRelease, row, "app_name=?", appName)
+	if err == nil {
+		return row, nil
+	}
+	if err == postgres.ErrNoDocuments {
+		return &comm.AppRelease{AppName: appName}, nil
+	}
+	return nil, err
+}
+
+// saveAppRelease 整行落库（存在则更新，不存在则插入）。调用方负责先做读改写。
+func (this *serverComp) saveAppRelease(c *gin.Context, m *comm.AppRelease) {
+	now := time.Now().UnixMilli()
+	m.Updatetime = now
+	var err error
+	if m.RowId == 0 {
+		m.Createtime = now
+		err = postgres.Insert(comm.TableAppRelease, m)
+	} else {
+		err = postgres.Save(comm.TableAppRelease, m)
+	}
+	if err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	broadcastConfigChanged(comm.ConfigKindAppRelease, "update", 0)
+	writeOK(c, m)
+}
+
+// saveAppVersion 保存「版本控制」那一组：线上版本 / 最低支持版本 / 强更 / 更新日志 /
+// 默认下载地址 / 送审版本。不触碰游客登录字段。
+func (this *serverComp) saveAppVersion(c *gin.Context) {
+	var req struct {
+		AppName       string `json:"app_name"`
+		Version       string `json:"version"`
+		MinVersion    string `json:"min_version"`
+		ForceUpdate   bool   `json:"force_update"`
+		Changelog     string `json:"changelog"`
+		Address       string `json:"address"`
+		ReviewVersion string `json:"review_version"`
+	}
+	if err := c.ShouldBindJSON(&req); err != nil {
+		writeErr(c, pb.ErrorCode_ReqParameterError, err.Error())
+		return
+	}
+	req.Version = strings.TrimSpace(req.Version)
+	req.MinVersion = strings.TrimSpace(req.MinVersion)
+	req.ReviewVersion = strings.TrimSpace(req.ReviewVersion)
+
+	// 强更必须有最低支持版本，否则「开了强更却挡不住任何人」，是配置期就能发现的错。
+	if req.ForceUpdate && req.MinVersion == "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "开启强制更新时必须填「最低支持版本」")
+		return
+	}
+	// 最低支持版本不该高于线上版本，否则线上用户全被判定为需强更却又没有更高版本可更。
+	if req.MinVersion != "" && req.Version != "" && comm.CompareVersion(req.MinVersion, req.Version) > 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "「最低支持版本」不能高于「当前线上版本」")
+		return
+	}
+
+	m, err := this.loadAppRelease(req.AppName)
+	if err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	m.AppName = req.AppName
+	m.Version = req.Version
+	m.MinVersion = req.MinVersion
+	m.ForceUpdate = req.ForceUpdate
+	m.Changelog = req.Changelog
+	m.Address = strings.TrimSpace(req.Address)
+	m.ReviewVersion = req.ReviewVersion
+	this.saveAppRelease(c, m)
+}
+
+// saveAppTourists 保存「游客显隐控制」那一组：游客登录开关 + 生效版本。不触碰版本字段。
+func (this *serverComp) saveAppTourists(c *gin.Context) {
+	var req struct {
+		AppName         string `json:"app_name"`
+		Tourists        bool   `json:"tourists"`
+		TouristsVersion string `json:"touristsversion"`
+	}
+	if err := c.ShouldBindJSON(&req); err != nil {
+		writeErr(c, pb.ErrorCode_ReqParameterError, err.Error())
+		return
+	}
+	req.TouristsVersion = strings.TrimSpace(req.TouristsVersion)
+
+	// 白名单语义：只有被点名的那一版可见。勾了开关却不填版本 = 谁都看不到，等于没开 ——
+	// 这是配置期就能发现的错，别让运营以为「已经开了」再回头去查客户端。
+	// 要全部隐藏就直接取消勾选，不要靠留空版本号来表达。
+	if req.Tourists && req.TouristsVersion == "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "开启游客登录时必须填「生效版本」——留空等于所有版本都看不到入口；要全部隐藏请直接取消勾选")
+		return
+	}
+	if req.TouristsVersion != "" && !req.Tourists {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "填了「游客登录生效版本」就必须同时勾选「允许游客登录」，否则该版本仍然看不到入口")
+		return
+	}
+
+	m, err := this.loadAppRelease(req.AppName)
+	if err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	m.AppName = req.AppName
+	m.Tourists = req.Tourists
+	m.TouristsVersion = req.TouristsVersion
+	this.saveAppRelease(c, m)
+}
diff --git a/apps/services/modules/console/api_channel.go b/apps/services/modules/console/api_channel.go
index 5fb71537..ce5e23d7 100644
--- a/apps/services/modules/console/api_channel.go
+++ b/apps/services/modules/console/api_channel.go
@@ -28,8 +28,9 @@ const (
 	channelStatusRejected int32 = 3 // 驳回
 )
 
-// channelShareRateMax 渠道商分成比例上限（万分比，10000 = 100%）。
+// channelShareRateMax 渠道分成比例上限（万分比，10000 = 100%）。
 // 语义为「从品牌商那份里再切」，故本身不会超过 100%。
+// 现在校验的是【生产批次】上的比例（production_batch.sharerate），渠道商表里那列已停止维护。
 const channelShareRateMax int32 = 10000
 
 // canAuditChannel 是否有渠道商审批权（超管/管理员）。
@@ -116,30 +117,25 @@ func (this *serverComp) addChannel(c *gin.Context, sys *appConn) {
 		writeErr(c, pb.ErrorCode_ReqParameterError, "渠道商名称必填")
 		return
 	}
+	// 品牌商已不是渠道商的必填项（2026-09-02）：渠道商是全局实体，归属由生产批次决定。
+	// 品牌商账号自助新增时仍默认落到自己名下，这样它自己看得见；其余情况一律 0=全局。
 	if m.Brandid == 0 {
-		// 品牌商账号不必选品牌商：默认就是自己。
 		m.Brandid = scopeOf(c).brandId
 	}
-	if m.Brandid == 0 {
-		writeErr(c, pb.ErrorCode_ReqParameterError, "所属品牌商必选")
-		return
-	}
-	// 品牌商账号只能在自己名下建渠道商；渠道商账号无权新建。
+	// 渠道商账号无权新建。
 	if currentIdentity(c) == pb.Identity_Dealer {
 		writeErr(c, pb.ErrorCode_InsufficientPermissions, "渠道商账号无权新增渠道商")
 		return
 	}
-	if !scopeOf(c).allowBrand(m.Brandid) {
-		writeErr(c, pb.ErrorCode_InsufficientPermissions, "无权在该品牌商下新增渠道商")
-		return
-	}
-	if _, err := dvBrand(sys, m.Brandid); err != nil {
-		writeErr(c, pb.ErrorCode_ReqParameterError, "品牌商不存在")
-		return
-	}
-	if m.Sharerate < 0 || m.Sharerate > channelShareRateMax {
-		writeErr(c, pb.ErrorCode_ReqParameterError, "分成比例需在 0~10000(万分比) 之间")
-		return
+	if m.Brandid != 0 {
+		if !scopeOf(c).allowBrand(m.Brandid) {
+			writeErr(c, pb.ErrorCode_InsufficientPermissions, "无权在该品牌商下新增渠道商")
+			return
+		}
+		if _, err := dvBrand(sys, m.Brandid); err != nil {
+			writeErr(c, pb.ErrorCode_ReqParameterError, "品牌商不存在")
+			return
+		}
 	}
 	// 同时开渠道账号：超管/管理员。用户名/密码留空由服务端生成，显式填了才提前查重。
 	if req.CreateAccount {
@@ -154,6 +150,9 @@ func (this *serverComp) addChannel(c *gin.Context, sys *appConn) {
 			}
 		}
 	}
+	// 分成比例已改为按生产批次设置（production_batch.sharerate），渠道商表单里不再有这一项。
+	// 新建一律 0，别从请求里读——留着会让「渠道商级比例」和「批次级比例」两个口径同时存在。
+	m.Sharerate = 0
 	now := time.Now().Unix()
 	m.Id = genChannelId(sys)
 	m.Official = false // 官方渠道只能由 addOfficialChannel 随品牌商生成，前端传什么都不作数
@@ -209,20 +208,14 @@ func (this *serverComp) updateChannel(c *gin.Context, sys *appConn) {
 		writeErr(c, pb.ErrorCode_InsufficientPermissions, "无权修改该渠道商")
 		return
 	}
-	if req.Channel.Sharerate < 0 || req.Channel.Sharerate > channelShareRateMax {
-		writeErr(c, pb.ErrorCode_ReqParameterError, "分成比例需在 0~10000(万分比) 之间")
-		return
-	}
 	if name := strings.TrimSpace(req.Channel.Name); name != "" {
 		old.Name = name
 	}
 	old.Contact = req.Channel.Contact
 	old.Contactmails = req.Channel.Contactmails
 	old.Remark = req.Channel.Remark
-	// 分成比例只有有审批权的账号能改（品牌商自己改比例等于自定分成）。
-	if canAuditChannel(c) {
-		old.Sharerate = req.Channel.Sharerate
-	}
+	// Sharerate 刻意不写：比例已移到生产批次上，这里既不读也不清零——
+	// 清零会把存量渠道商已有的比例抹掉，而月结算目前还在读它。
 	old.Updatetime = time.Now().Unix()
 	if err = dvSaveChannel(sys, old); err != nil {
 		writeErr(c, pb.ErrorCode_DBError, err.Error())
@@ -307,9 +300,13 @@ func (this *serverComp) auditChannel(c *gin.Context, sys *appConn) {
 	writeOK(c, &pb.ApiAuditChannelResp{Channel: old})
 }
 
-// resolveProductionChannelModel 生产授权码时解析并校验渠道商：必选、须归属该品牌商、须为启用状态。
+// resolveProductionChannelModel 生产 MAC/授权码时解析并校验渠道商：必选、须为启用状态。
+//
+// ⚠️ 不校验「渠道商归属该品牌商」：生产表单已不再选品牌商（2026-09-02），品牌归属反过来
+// 由渠道商推导（见 resolveProductionBrandId）。渠道商现在是全局实体、brandid 常年为 0，
+// 继续按品牌比对只会让所有渠道商都用不了。
 // 返回校验通过的渠道商；校验失败时已写好错误响应，调用方直接 return。
-func resolveProductionChannelModel(c *gin.Context, sys *appConn, channelid string, brandid uint32) (*pb.DBChannel, bool) {
+func resolveProductionChannelModel(c *gin.Context, sys *appConn, channelid string) (*pb.DBChannel, bool) {
 	id := strings.TrimSpace(channelid)
 	if id == "" {
 		writeErr(c, pb.ErrorCode_ReqParameterError, "渠道商必选")
@@ -320,10 +317,6 @@ func resolveProductionChannelModel(c *gin.Context, sys *appConn, channelid strin
 		writeErr(c, pb.ErrorCode_ReqParameterError, "渠道商不存在: "+id)
 		return nil, false
 	}
-	if ch.Brandid != brandid {
-		writeErr(c, pb.ErrorCode_ReqParameterError, "渠道商不属于该品牌商: "+id)
-		return nil, false
-	}
 	if ch.Status != channelStatusEnabled {
 		writeErr(c, pb.ErrorCode_ReqParameterError, "渠道商未启用（待审核/停用/驳回），不能用于生产: "+id)
 		return nil, false
@@ -331,9 +324,30 @@ func resolveProductionChannelModel(c *gin.Context, sys *appConn, channelid strin
 	return ch, true
 }
 
+// resolveProductionBrandId 决定这一批货记在哪个品牌商名下。
+//
+// 生产表单已经不选品牌商了（2026-09-02），所以品牌归属改成推导出来的：
+//  1. 品牌商账号自助生产 → 强制记在自己名下。放在最前面是因为它同时是权限约束，
+//     不能让前端传值或渠道商的归属把它绕开。
+//  2. 选中的是某品牌的「官方渠道」→ 继承该渠道商的 brandid，月结算的品牌维度不至于丢。
+//  3. 其余（全局渠道商）→ 0 = 无品牌归属，结算时那份提成全归平台。
+//
+// ⚠️ 请求里的 brandid 一律忽略。留着它「前端传就用」会造出第四种口径，
+// 而前端已经没有地方能填这个值了。
+func resolveProductionBrandId(c *gin.Context, ch *pb.DBChannel) uint32 {
+	if s := scopeOf(c); s.brandId != 0 {
+		return s.brandId
+	}
+	if ch != nil {
+		return ch.Brandid
+	}
+	return 0
+}
+
 // channelVisible 该渠道商是否在当前账号的可见范围内：
 // 品牌商账号看本品牌商名下全部渠道商，渠道商账号只看自己那一个，超管/管理员不受限。
 func channelVisible(c *gin.Context, ch *pb.DBChannel) bool {
 	s := scopeOf(c)
-	return s.allowBrand(ch.Brandid) && s.allowChannel(ch.Id)
+	// brandid==0 = 全局渠道商，对所有账号可见（渠道商账号仍只看自己那一个）。
+	return (ch.Brandid == 0 || s.allowBrand(ch.Brandid)) && s.allowChannel(ch.Id)
 }
diff --git a/apps/services/modules/console/api_channelapp.go b/apps/services/modules/console/api_channelapp.go
index 1d20a974..fe5f7e6d 100644
--- a/apps/services/modules/console/api_channelapp.go
+++ b/apps/services/modules/console/api_channelapp.go
@@ -14,9 +14,14 @@ import (
 // ============================ 渠道分发 (channelapp) ============================
 //
 // 「SaaS 管理 → 渠道分发」的后端：管理各应用在各分发渠道（华为/小米/OPPO/VIVO/荣耀/官方/苹果/谷歌）
-// 上的版本与开关。模型见 comm/channelapp.go，存 console 主库(postgres.GetSys())，按 app_name 作用域，
+// 上**因渠道而异**的东西——本渠道下载地址、上架状态、支付渠道、是否允许跳过设备绑定。
+// 模型见 comm/channelapp.go，存 console 主库(postgres.GetSys())，按 app_name 作用域，
 // 业务服务(home 的 user 模块)运行时按 (app_name=? OR app_name='') 直读下发。
 //
+// ⚠️ 版本号/最低支持版本/强制更新/更新日志/送审版本/游客登录开关**不在这里**：它们是
+// 「整个应用一套」的，已搬到「服务配置 → 版本控制 / 游客显隐控制」(api_apprelease.go)。
+// 别再往本页加这些字段——按渠道各存一份的直接后果是同一个开关有 8 处能改、客户端只读一处。
+//
 // 旧实现（deep_server modules/api/api_*channelapp.go + 各应用业务库 mysql 的 channelapp 表）已下线：
 // 数据统一收到 console 主库，后台一个库即可总览全部应用的渠道版本。
 //
@@ -24,7 +29,7 @@ import (
 // 「应用中心 → 业务功能配置」的支付分组(app_module_config)里配，不在此重复。
 // getChannelPayStatus 负责把两边对上——告诉前端哪些已开的支付渠道其实还没配凭据。
 
-// getChannelApps 列出某作用域下的渠道配置（app_name=''为全局默认）。
+// getChannelApps 列出某作用域下的渠道配置（app_name=”为全局默认）。
 func (this *serverComp) getChannelApps(c *gin.Context) {
 	var req struct {
 		AppName string `json:"app_name"`
@@ -49,28 +54,7 @@ func (this *serverComp) saveChannelApp(c *gin.Context) {
 		writeErr(c, pb.ErrorCode_ReqParameterError, "渠道 必选")
 		return
 	}
-	// 强更必须有最低支持版本，否则「开了强更却挡不住任何人」，是配置期就能发现的错
-	if m.ForceUpdate && strings.TrimSpace(m.MinVersion) == "" {
-		writeErr(c, pb.ErrorCode_ReqParameterError, "开启强制更新时必须填「最低支持版本」")
-		return
-	}
-	// 最低支持版本不该高于当前线上版本，否则线上用户全被判定为需强更却又没有更高版本可更
-	if strings.TrimSpace(m.MinVersion) != "" && strings.TrimSpace(m.Version) != "" &&
-		comm.CompareVersion(m.MinVersion, m.Version) > 0 {
-		writeErr(c, pb.ErrorCode_ReqParameterError, "「最低支持版本」不能高于「当前线上版本」")
-		return
-	}
-	// 游客登录是白名单语义：只有被点名的那一版可见。勾了开关却不填版本 = 谁都看不到，
-	// 等于没开——这是配置期就能发现的错，别让运营以为"已经开了"再去查客户端。
-	// 要全部隐藏就直接取消勾选，不要靠留空版本号来表达。
-	if m.Tourists && strings.TrimSpace(m.TouristsVersion) == "" {
-		writeErr(c, pb.ErrorCode_ReqParameterError, "开启游客登录时必须填「生效版本」——留空等于所有版本都看不到入口；要全部隐藏请直接取消勾选")
-		return
-	}
-	if strings.TrimSpace(m.TouristsVersion) != "" && !m.Tourists {
-		writeErr(c, pb.ErrorCode_ReqParameterError, "填了「游客登录生效版本」就必须同时勾选「允许游客登录」，否则该版本仍然看不到入口")
-		return
-	}
+	// 版本/强更/游客登录的校验已随字段搬到 api_apprelease.go（按应用配，不分渠道）。
 	now := time.Now().UnixMilli()
 	m.Updatetime = now
 	old := &comm.ChannelApp{}
@@ -116,7 +100,7 @@ func (this *serverComp) delChannelApp(c *gin.Context) {
 // 渠道配置里的 PayChannels 只是「开放哪几种支付入口」，真正的商户凭据在**应用业务库**的
 // app_module_config 里。两者分处不同库，运营很容易开了入口却忘了配凭据，故后台直接把结论算好：
 // 遍历该 app_name 下的部署，连上任意一个业务库，读出已配置的支付模块键。
-// 全局作用域(app_name='')没有对应业务库，返回空表示「无法判定」，前端据此不告警。
+// 全局作用域(app_name=”)没有对应业务库，返回空表示「无法判定」，前端据此不告警。
 func (this *serverComp) getChannelPayStatus(c *gin.Context) {
 	var req struct {
 		AppName string `json:"app_name"`
diff --git a/apps/services/modules/console/api_chipvendor.go b/apps/services/modules/console/api_chipvendor.go
new file mode 100644
index 00000000..63102394
--- /dev/null
+++ b/apps/services/modules/console/api_chipvendor.go
@@ -0,0 +1,163 @@
+package console
+
+import (
+	"fmt"
+	"sort"
+	"strings"
+	"time"
+
+	"yunyan/pb"
+
+	"github.com/gin-gonic/gin"
+)
+
+// ============================ 芯片厂商域 (chip_vendor) ============================
+//
+// 芯片厂商原本是 db.proto 的 SolutionVendor 枚举，加一家要改三处代码再发版；现在是一张表，
+// 后台可增删改。**本表 id 就是 CID**（手工指定的十六进制编码），方案商 vendor 列存的就是它。
+// CID 唯一性由主键保证；改 CID 走 renameChipVendorId，会级联更新方案商的 vendor 引用。
+
+// sortChipVendors 统一排序：sort 小的在前，相同再按 id。列表与下拉共用同一口径。
+func sortChipVendors(list []*ChipVendor) {
+	sort.SliceStable(list, func(i, j int) bool {
+		if list[i].Sort != list[j].Sort {
+			return list[i].Sort < list[j].Sort
+		}
+		return list[i].Id < list[j].Id
+	})
+}
+
+func (this *serverComp) getChipVendors(c *gin.Context, sys *appConn) {
+	models, err := dvChipVendors(sys)
+	if err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	sortChipVendors(models)
+	writeOK(c, gin.H{"vendors": models})
+}
+
+func (this *serverComp) addChipVendor(c *gin.Context, sys *appConn) {
+	var req struct {
+		Vendor *ChipVendor `json:"vendor"`
+	}
+	_ = c.ShouldBindJSON(&req)
+	if req.Vendor == nil || strings.TrimSpace(req.Vendor.Name) == "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "芯片厂商名称必填")
+		return
+	}
+	req.Vendor.Name = strings.TrimSpace(req.Vendor.Name)
+	if msg := checkChipVendorNameUnique(sys, req.Vendor.Name, 0); msg != "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, msg)
+		return
+	}
+	// CID 就是主键，必须手填且不能与已有厂商重复（重复了设备在端侧分不开）。
+	if req.Vendor.Id == 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "CID 必填（手工指定的十六进制编码，如 ABF4）")
+		return
+	}
+	if exist, _ := dvChipVendor(sys, req.Vendor.Id); exist != nil && exist.Id != 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError,
+			fmt.Sprintf("CID 0x%X 已被芯片厂商「%s」占用", req.Vendor.Id, exist.Name))
+		return
+	}
+	now := time.Now().Unix()
+	req.Vendor.Createtime, req.Vendor.Updatetime = now, now
+	if err := dvAddChipVendor(sys, req.Vendor); err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	writeOK(c, gin.H{"vendor": req.Vendor})
+}
+
+func (this *serverComp) updateChipVendor(c *gin.Context, sys *appConn) {
+	// 多带一个 oldid：改 CID 时要同时知道新旧两个号（旧号定位记录，新号是目标）。
+	var req struct {
+		Vendor *ChipVendor `json:"vendor"`
+		Oldid  uint32      `json:"oldid"` // 原 CID；0 或与 vendor.id 相同 = 不改号
+	}
+	_ = c.ShouldBindJSON(&req)
+	if req.Vendor == nil || req.Vendor.Id == 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "CID 必填")
+		return
+	}
+	if strings.TrimSpace(req.Vendor.Name) == "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "芯片厂商名称必填")
+		return
+	}
+	req.Vendor.Name = strings.TrimSpace(req.Vendor.Name)
+	locateId := req.Oldid
+	if locateId == 0 {
+		locateId = req.Vendor.Id
+	}
+	old, err := dvChipVendor(sys, locateId)
+	if err != nil || old == nil || old.Id == 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "芯片厂商不存在")
+		return
+	}
+	if msg := checkChipVendorNameUnique(sys, req.Vendor.Name, locateId); msg != "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, msg)
+		return
+	}
+	// 改 CID：校验新号未被占用后改主键，并级联把方案商的 vendor 引用一起搬过去。
+	if req.Vendor.Id != locateId {
+		if msg := checkChipVendorIdChange(sys, locateId, req.Vendor.Id); msg != "" {
+			writeErr(c, pb.ErrorCode_ReqParameterError, msg)
+			return
+		}
+		if err = renameChipVendorId(locateId, req.Vendor.Id); err != nil {
+			writeErr(c, pb.ErrorCode_DBError, "改 CID 失败: "+err.Error())
+			return
+		}
+	}
+	req.Vendor.Createtime = old.Createtime // 建档时间不可改
+	req.Vendor.Updatetime = time.Now().Unix()
+	if err := dvSaveChipVendor(sys, req.Vendor); err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	writeOK(c, gin.H{"vendor": req.Vendor})
+}
+
+func (this *serverComp) delChipVendor(c *gin.Context, sys *appConn) {
+	var req struct {
+		Id uint32 `json:"id"`
+	}
+	_ = c.ShouldBindJSON(&req)
+	if req.Id == 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "id is required")
+		return
+	}
+	// 有方案商挂在它下面就不许删：vendor 是裸整数列、没有外键，删掉后那些方案商的芯片分组
+	// 会变成查不到名字的孤儿数值（列表显示「厂商#N」），且无法从界面上修回来。
+	n, err := dvCountProvidersByVendor(sys, req.Id)
+	if err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	if n > 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError,
+			fmt.Sprintf("该芯片厂商下还有 %d 个方案商，请先把它们改到别的厂商下再删（也可以改成「停用」，停用后不再出现在新建方案商的下拉里）", n))
+		return
+	}
+	if err := dvDelChipVendor(sys, req.Id); err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	writeOK(c, gin.H{"id": req.Id})
+}
+
+// checkChipVendorNameUnique 同名校验（排除自己）。返回空串表示通过。
+// 芯片厂商名字是运营在下拉里认人的唯一依据，重名会让「杰里」出现两条无法区分。
+func checkChipVendorNameUnique(sys *appConn, name string, selfId uint32) string {
+	list, err := dvChipVendors(sys)
+	if err != nil {
+		return ""
+	}
+	for _, v := range list {
+		if v.Id != selfId && strings.EqualFold(strings.TrimSpace(v.Name), name) {
+			return fmt.Sprintf("芯片厂商「%s」已存在", name)
+		}
+	}
+	return ""
+}
diff --git a/apps/services/modules/console/api_config.go b/apps/services/modules/console/api_config.go
index ff236c64..7741a5e8 100644
--- a/apps/services/modules/console/api_config.go
+++ b/apps/services/modules/console/api_config.go
@@ -72,10 +72,12 @@ func ensureConfigTables() error {
 	if err := pg.CreateTable(comm.TableChannelAppCfg, &comm.ChannelApp{}); err != nil {
 		return err
 	}
-	// touristsversion 是后加字段（游客登录生效版本）：CreateTable 对已存在的表跳过 AutoMigrate，
-	// 故显式补列。历史行为空串 = 不限定版本，游客登录按 tourists 总开关全版本生效，行为不变。
-	if res := postgres.Exec("ALTER TABLE " + comm.TableChannelAppCfg + " ADD COLUMN IF NOT EXISTS touristsversion varchar(32) DEFAULT ''"); res.Error != nil {
-		return res.Error
+	// 应用发版与入口控制：版本/强更/更新日志/送审版本/游客显隐，按 app_name 一应用一行。
+	// 这几项原先长在 channel_app 上（每个渠道一份），已搬到这里，见 comm/apprelease.go。
+	// ⚠️ 旧 channel_app 行里的同名列**不会自动搬过来**（gorm 也不会删列，旧数据静静留在那儿），
+	// 升级后需要在后台「服务配置 → 版本控制 / 游客显隐控制」重新填一次。
+	if err := pg.CreateTable(comm.TableAppRelease, &comm.AppRelease{}); err != nil {
+		return err
 	}
 	// 按应用分离的新表（app_name=''为全局默认，'X'为应用X覆盖）：第三方服务配置 / 区域覆盖 / Agent 配置。
 	// 独立于老的 third_svc_config / third_svc_region_override / agent 表，避免影响现有服务接口。
diff --git a/apps/services/modules/console/api_oemfactory.go b/apps/services/modules/console/api_oemfactory.go
new file mode 100644
index 00000000..2e48f124
--- /dev/null
+++ b/apps/services/modules/console/api_oemfactory.go
@@ -0,0 +1,136 @@
+package console
+
+import (
+	"fmt"
+	"sort"
+	"strings"
+	"time"
+
+	"yunyan/pb"
+
+	"github.com/gin-gonic/gin"
+)
+
+// ============================ 代工厂域 (oem_factory) ============================
+//
+// 代工厂 = 「这批货由哪家厂生产组装」，与品牌商(brand,「挂谁的牌子卖」)是两件事，故独立成表。
+// 生产批次(production_batch.factoryid)引用本表：在「MAC生成管理」发码时选厂，落在批次台账上、
+// 不写进每条授权码——换厂是批次级的事，授权码里再存一份只会在改厂时产生两处不一致。
+
+// sortOemFactories 统一排序：sort 小的在前，相同再按 id。
+func sortOemFactories(list []*OemFactory) {
+	sort.SliceStable(list, func(i, j int) bool {
+		if list[i].Sort != list[j].Sort {
+			return list[i].Sort < list[j].Sort
+		}
+		return list[i].Id < list[j].Id
+	})
+}
+
+func (this *serverComp) getOemFactories(c *gin.Context, sys *appConn) {
+	models, err := dvOemFactories(sys)
+	if err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	sortOemFactories(models)
+	writeOK(c, gin.H{"factories": models})
+}
+
+func (this *serverComp) addOemFactory(c *gin.Context, sys *appConn) {
+	var req struct {
+		Factory *OemFactory `json:"factory"`
+	}
+	_ = c.ShouldBindJSON(&req)
+	if req.Factory == nil || strings.TrimSpace(req.Factory.Name) == "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "工厂名称必填")
+		return
+	}
+	req.Factory.Name = strings.TrimSpace(req.Factory.Name)
+	if msg := checkOemFactoryNameUnique(sys, req.Factory.Name, 0); msg != "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, msg)
+		return
+	}
+	req.Factory.Id = 0 // id 由自增分配
+	now := time.Now().Unix()
+	req.Factory.Createtime, req.Factory.Updatetime = now, now
+	if err := dvAddOemFactory(sys, req.Factory); err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	writeOK(c, gin.H{"factory": req.Factory})
+}
+
+func (this *serverComp) updateOemFactory(c *gin.Context, sys *appConn) {
+	var req struct {
+		Factory *OemFactory `json:"factory"`
+	}
+	_ = c.ShouldBindJSON(&req)
+	if req.Factory == nil || req.Factory.Id == 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "factory id is required")
+		return
+	}
+	if strings.TrimSpace(req.Factory.Name) == "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "工厂名称必填")
+		return
+	}
+	req.Factory.Name = strings.TrimSpace(req.Factory.Name)
+	old, err := dvOemFactory(sys, req.Factory.Id)
+	if err != nil || old == nil || old.Id == 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "工厂不存在")
+		return
+	}
+	if msg := checkOemFactoryNameUnique(sys, req.Factory.Name, req.Factory.Id); msg != "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, msg)
+		return
+	}
+	req.Factory.Createtime = old.Createtime // 建档时间不可改
+	req.Factory.Updatetime = time.Now().Unix()
+	if err := dvSaveOemFactory(sys, req.Factory); err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	writeOK(c, gin.H{"factory": req.Factory})
+}
+
+func (this *serverComp) delOemFactory(c *gin.Context, sys *appConn) {
+	var req struct {
+		Id uint32 `json:"id"`
+	}
+	_ = c.ShouldBindJSON(&req)
+	if req.Id == 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "id is required")
+		return
+	}
+	// 生产批次引用了工厂就不许删：factoryid 是裸整数列、没有外键，删掉后那些批次的工厂
+	// 会变成查不到名字的孤儿数值，而批次台账是生产追溯的依据，不能出现指不到人的记录。
+	n, err := dvCountBatchesByFactory(sys, req.Id)
+	if err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	if n > 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError,
+			fmt.Sprintf("该工厂已关联 %d 个生产批次，不能删除（批次台账要能追溯到厂）。不再合作请改成「停用」，停用后不再出现在发码时的工厂下拉里", n))
+		return
+	}
+	if err := dvDelOemFactory(sys, req.Id); err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	writeOK(c, gin.H{"id": req.Id})
+}
+
+// checkOemFactoryNameUnique 同名校验（排除自己）。返回空串表示通过。
+func checkOemFactoryNameUnique(sys *appConn, name string, selfId uint32) string {
+	list, err := dvOemFactories(sys)
+	if err != nil {
+		return ""
+	}
+	for _, f := range list {
+		if f.Id != selfId && strings.EqualFold(strings.TrimSpace(f.Name), name) {
+			return fmt.Sprintf("工厂「%s」已存在", name)
+		}
+	}
+	return ""
+}
diff --git a/apps/services/modules/console/api_settlement.go b/apps/services/modules/console/api_settlement.go
index cc0194fa..a487bc89 100644
--- a/apps/services/modules/console/api_settlement.go
+++ b/apps/services/modules/console/api_settlement.go
@@ -12,16 +12,21 @@ import (
 
 // ============================ 月结算域 (settlement) ============================
 //
-// 平台 → 品牌商 → 渠道商 的两级分成月结算。
+// 平台 → 渠道商 的分成月结算，**按生产批次出行**（每 结算月×渠道商×批次 一行）。
 //
-//   base            = 该月归属该 (品牌商, 渠道商) 的已支付订单实付金额合计
-//   brand_gross     = base × 品牌商比例
-//   channel_amount  = brand_gross × 渠道商比例   ← 渠道商从品牌商那份里再切
-//   brand_net       = brand_gross - channel_amount
-//   platform_amount = base - brand_gross
+//   base            = 该月归属该 (渠道商, 批次) 的已支付订单实付金额合计
+//   channel_amount  = base × 该批次的分成比例
+//   platform_amount = base - channel_amount
 //
-// 订单散在各应用业务库，生成时逐库聚合再按 (brandid, channelid) 汇总；比例在生成那一刻
-// 快照进结算行，之后调比例不影响已生成的月份。已确认(status>=1)的行重算时跳过，历史账不可变。
+// 为什么按批次：比例是一批一谈的（production_batch.sharerate，在「生成MAC」表单里填），
+// 同一家渠道商不同批次可以不同比例，一个渠道商一行装不下。品牌商维度已移除。
+//
+// 订单怎么落到批次：订单上有下单时冻结的来源设备快照（src_license / src_mac / src_productid），
+// 拿它去 license_<pid> 分表反查 batchno。订单散在各应用业务库、与 console 主库不同库，
+// 所以流程是「逐库按设备聚合 → 回主库把设备映射成批次 → 按批次汇总算钱」。
+//
+// 比例在生成那一刻快照进结算行，之后调批次比例不影响已生成的月份。
+// 已确认(status>=1)的行重算时跳过，历史账不可变。
 
 // getSettlements 结算单列表。品牌商/渠道商账号由后端按归属强制收敛。
 func (this *serverComp) getSettlements(c *gin.Context) {
@@ -33,20 +38,21 @@ func (this *serverComp) getSettlements(c *gin.Context) {
 	if period == 0 {
 		period = latestSettlementPeriod() // 不传月份 → 最近一个有数据的月
 	}
-	brandid := effectiveBrandId(c, req.Brandid)
 	// 渠道商账号锁死到自己那一个渠道商；其余按前端传值（空=不限）。
 	var channelPtr *string
 	if cid := effectiveChannelId(c, req.Channelid); cid != "" {
 		channelPtr = &cid
 	}
-	// 品牌商账号即便不传 brandid 也只能看自己那一个（effectiveBrandId 已强制），
-	// 这里再给一层品牌商白名单，防止将来新增入口漏改。
-	var brandScope []uint32
-	if !s.unlimited && s.brandId != 0 {
-		brandScope = []uint32{s.brandId}
+	// ⚠️ 品牌商账号（绑了品牌商但没绑渠道商）**一律返回空**。
+	// 结算已不按品牌商出行，表里没有任何列能把行收敛到某个品牌商名下；
+	// 若照旧放行，这类外部账号会看到全平台所有渠道商的钱。
+	// 失败方向选「看不到」而不是「看全部」——要恢复可见性，得先定清楚按什么维度限制。
+	if !s.unlimited && s.brandId != 0 && s.channelId == "" {
+		writeOK(c, &pb.ApiGetSettlementsResp{Items: make([]*pb.DBSettlementMonth, 0)})
+		return
 	}
 
-	items, err := listSettlements(period, brandid, channelPtr, req.Status, brandScope)
+	items, err := listSettlements(period, channelPtr, req.Batchno, req.Status)
 	if err != nil {
 		writeErr(c, pb.ErrorCode_DBError, err.Error())
 		return
@@ -54,7 +60,6 @@ func (this *serverComp) getSettlements(c *gin.Context) {
 	resp := &pb.ApiGetSettlementsResp{Items: items}
 	for _, it := range items {
 		resp.TotalBase += it.BaseAmount
-		resp.TotalBrandNet += it.BrandNet
 		resp.TotalChannel += it.ChannelAmount
 		resp.TotalPlatform += it.PlatformAmount
 	}
@@ -81,12 +86,8 @@ func (this *serverComp) genSettlement(c *gin.Context) {
 		return
 	}
 
-	// 1) 逐个应用业务库聚合该月已支付订单，按 (品牌商, 渠道商) 汇总。
-	type key struct {
-		brandid   uint32
-		channelid string
-	}
-	sums := make(map[key]*settleAgg)
+	// 1) 逐个应用业务库聚合该月已支付订单，先按【来源设备】汇总（批次要靠设备反查）。
+	devAggs := make([]*settleAgg, 0, 64)
 	apps, err := this.module.model.listApps()
 	if err != nil {
 		writeErr(c, pb.ErrorCode_DBError, err.Error())
@@ -113,50 +114,78 @@ func (this *serverComp) genSettlement(c *gin.Context) {
 			continue
 		}
 		scanned++
-		for _, r := range rows {
-			k := key{brandid: r.Brandid, channelid: r.Channelid}
-			if cur, ok := sums[k]; ok {
-				cur.OrderCount += r.OrderCount
-				cur.BaseAmount += r.BaseAmount
-			} else {
-				sums[k] = &settleAgg{Brandid: r.Brandid, Channelid: r.Channelid, OrderCount: r.OrderCount, BaseAmount: r.BaseAmount}
-			}
+		devAggs = append(devAggs, rows...)
+	}
+
+	// 2) 把设备映射成批次。按产品分组一次性查 license 分表，避免逐设备查库。
+	byProduct := make(map[uint32][]string)
+	for _, a := range devAggs {
+		if k := a.deviceKey(); k != "" && a.Productid != 0 {
+			byProduct[a.Productid] = append(byProduct[a.Productid], k)
+		}
+	}
+	dev2batch := resolveBatchOfDevices(byProduct)
+
+	// 3) 按 (渠道商, 批次) 汇总。归不到批次的订单落 batchno='' 那一行，比例 0、全归平台——
+	// 常见于「用户从未绑过设备就下单」和「批次已被撤销」，这些钱不该凭空分给某个渠道商。
+	type key struct {
+		channelid string
+		batchno   string
+	}
+	type sumRow struct {
+		orderCount int64
+		baseAmount int64
+		productid  uint32
+	}
+	sums := make(map[key]*sumRow)
+	for _, a := range devAggs {
+		batchno := ""
+		if k := a.deviceKey(); k != "" && a.Productid != 0 {
+			batchno = dev2batch[batchMapKey(a.Productid, k)]
+		}
+		kk := key{channelid: a.Channelid, batchno: batchno}
+		cur, ok := sums[kk]
+		if !ok {
+			cur = &sumRow{productid: a.Productid}
+			sums[kk] = cur
 		}
+		cur.orderCount += a.OrderCount
+		cur.baseAmount += a.BaseAmount
 	}
 
-	// 2) 取品牌商/渠道商当前比例，算钱，落库（已确认的跳过）。
-	sys := consoleDeviceConn()
+	// 4) 取每个批次的比例快照，算钱，落库（已确认的跳过）。
+	batchnos := make([]string, 0, len(sums))
+	for k := range sums {
+		if k.batchno != "" {
+			batchnos = append(batchnos, k.batchno)
+		}
+	}
+	batches := batchRates(batchnos)
+
 	now := time.Now().Unix()
 	out := make([]*pb.DBSettlementMonth, 0, len(sums))
 	var skipped int64
 	for k, agg := range sums {
-		if old, oerr := getSettlement(period, k.brandid, k.channelid); oerr == nil && old != nil && old.Status >= settlementStatusConfirmed {
+		if old, oerr := getSettlement(period, k.channelid, k.batchno); oerr == nil && old != nil && old.Status >= settlementStatusConfirmed {
 			skipped++ // 已确认：锁定，不覆盖
 			continue
 		}
-		var brandRate, channelRate int32
-		if k.brandid != 0 {
-			if b, berr := dvBrand(sys, k.brandid); berr == nil && b != nil {
-				brandRate = b.Sharerate
-			}
-		}
-		if k.channelid != "" {
-			if ch, cerr := dvChannel(sys, k.channelid); cerr == nil && ch != nil {
-				channelRate = ch.Sharerate
-			}
+		var channelRate int32
+		productid := agg.productid
+		if b := batches[k.batchno]; b != nil {
+			channelRate = b.Sharerate
+			productid = b.Productid // 以批次台账为准，比订单快照可靠
 		}
-		brandGross, channelAmount, brandNet, platform := computeSettlement(agg.BaseAmount, brandRate, channelRate)
+		channelAmount, platform := computeSettlement(agg.baseAmount, channelRate)
 		out = append(out, &pb.DBSettlementMonth{
 			Period:         period,
-			Brandid:        k.brandid,
 			Channelid:      k.channelid,
-			OrderCount:     agg.OrderCount,
-			BaseAmount:     agg.BaseAmount,
-			BrandRate:      brandRate,
-			BrandGross:     brandGross,
+			Batchno:        k.batchno,
+			Productid:      productid,
+			OrderCount:     agg.orderCount,
+			BaseAmount:     agg.baseAmount,
 			ChannelRate:    channelRate,
 			ChannelAmount:  channelAmount,
-			BrandNet:       brandNet,
 			PlatformAmount: platform,
 			Status:         settlementStatusDraft,
 			GenTime:        now,
@@ -191,7 +220,7 @@ func (this *serverComp) confirmSettlement(c *gin.Context) {
 		return
 	}
 	channelid := strings.TrimSpace(req.Channelid)
-	model, err := getSettlement(req.Period, req.Brandid, channelid)
+	model, err := getSettlement(req.Period, channelid, strings.TrimSpace(req.Batchno))
 	if err != nil || model.Period == 0 {
 		writeErr(c, pb.ErrorCode_DBError, "结算单不存在")
 		return
diff --git a/apps/services/modules/console/api_svctemplate.go b/apps/services/modules/console/api_svctemplate.go
index a04efd26..10f32f46 100644
--- a/apps/services/modules/console/api_svctemplate.go
+++ b/apps/services/modules/console/api_svctemplate.go
@@ -291,8 +291,12 @@ func builtinSvcTemplates() []ThirdSvcTemplate {
 			sf("api_key", "API Key", true)),
 
 		// 存储 对象存储
+		// domain 可选：填了之后「上传完成后存进库的那个访问地址」走该域名（OSS 绑定的自定义域名 / CDN），
+		// 留空则回退 bucket 的 OSS 源站地址。注意它只影响【下载地址】——浏览器 PUT 用的预签名 URL
+		// 必须仍是 OSS 源站，签名是按源站 host 算的，换域名会被判签名不符。
 		tpl("storage_aliyun_oss", "aliyun_oss", "阿里云 OSS", svcCatStorage, 0,
-			sf("access_key_id", "AccessKey ID", true), sf("access_key_secret", "AccessKey Secret", true), sf("bucket", "存储桶", false), sf("endpoint", "地域节点 Endpoint", false)),
+			sf("access_key_id", "AccessKey ID", true), sf("access_key_secret", "AccessKey Secret", true), sf("bucket", "存储桶", false), sf("endpoint", "地域节点 Endpoint", false),
+			sf("domain", "自定义域名(可选，如 cdn.ymaikj.com；留空用 OSS 源站地址)", false)),
 		tpl("storage_tencent_cos", "tencent_cos", "腾讯云 COS", svcCatStorage, 1,
 			sf("secret_id", "SecretId", true), sf("secret_key", "SecretKey", true), sf("bucket", "存储桶", false), sf("region", "地域，如 ap-guangzhou", false)),
 
diff --git a/apps/services/modules/console/api_sysconfig.go b/apps/services/modules/console/api_sysconfig.go
index 578e3112..259a8c6f 100644
--- a/apps/services/modules/console/api_sysconfig.go
+++ b/apps/services/modules/console/api_sysconfig.go
@@ -206,8 +206,39 @@ func (this *serverComp) testSysEmail(c *gin.Context) {
 	}
 	if err := email.SendMail("【系统配置】邮件服务测试",
 		"这是一封来自后台系统配置的测试邮件，收到即表示邮件服务配置正确。", req.To); err != nil {
-		writeErr(c, pb.ErrorCode_SystemError, "发送失败: "+err.Error())
+		writeErr(c, pb.ErrorCode_SystemError, "发送失败: "+err.Error()+mailErrorHint(this.loadSysEmail(), err))
 		return
 	}
 	writeOK(c, gin.H{"ok": true})
 }
+
+// mailErrorHint 把服务商返回的原始 SMTP 错误翻译成「接下来该去改什么」。
+//
+// 存在的理由：SMTP 的 5xx 文案是服务商写给邮件管理员看的，运营在后台只看到一串
+// `535 Error: authentication failed, system busy`，既不知道连的是哪台服务器，
+// 也不知道该改密码还是去开服务。配置本身能读能解密（读不到会在 applySysEmail 就报
+// 「Password 为空」），所以走到这里的失败一律是服务商侧的凭据/权限问题。
+func mailErrorHint(cfg *PlatformService, err error) string {
+	if cfg == nil || err == nil {
+		return ""
+	}
+	msg := strings.ToLower(err.Error())
+	host := map[int]string{
+		0: "smtp.qq.com:25",
+		1: "smtp.exmail.qq.com:465",
+		2: "smtp.gmail.com:587",
+		3: "Resend HTTP API",
+	}[cfg.SysFieldInt("EmailType", 1)]
+	tip := ""
+	switch {
+	case strings.Contains(msg, "535"), strings.Contains(msg, "authentication failed"), strings.Contains(msg, "auth"):
+		// 这几家都要求用「授权码 / 客户端专用密码」而不是登录密码，且要先在邮箱后台开 SMTP。
+		tip = "（认证被拒：①「SMTP 授权码」要填邮箱后台生成的**客户端专用密码/授权码**，不是登录密码；" +
+			"②该邮箱要先在服务商后台开启 SMTP/IMAP 服务；③确认发件人邮箱与这份授权码属于同一个账号）"
+	case strings.Contains(msg, "timeout"), strings.Contains(msg, "i/o timeout"), strings.Contains(msg, "connection refused"):
+		tip = "（连不上发信服务器：多半是服务器出网被限制，或该端口被封）"
+	case strings.Contains(msg, "550"), strings.Contains(msg, "553"), strings.Contains(msg, "not allowed"):
+		tip = "（服务商拒收：发件人地址与账号不符，或域名未通过 SPF/发信域名验证）"
+	}
+	return fmt.Sprintf("  [发信服务器 %s，发件人 %s]%s", host, cfg.SysFieldPlain("FromEmail", ""), tip)
+}
diff --git a/apps/services/modules/console/api_upload.go b/apps/services/modules/console/api_upload.go
index 731cb1eb..bb6dd439 100644
--- a/apps/services/modules/console/api_upload.go
+++ b/apps/services/modules/console/api_upload.go
@@ -6,8 +6,8 @@ package console
 //  1. OSS 凭证来自【第三方服务配置(svc_config) → 存储 → 阿里云 OSS】(provider=aliyun_oss)，
 //     即 serviceconfig.vue 里落库、并按应用分离(app_name='' 为全局默认)的那份配置。
 //     ——不再走腾讯云 COS / 也不读那份纯演示未落库的「系统配置」页。
-//  2. object key 由服务端强制置于 firmwareRoot("yunyan") 根前缀下，形如
-//     yunyan/product/<产品id>/<文件名>，并做防路径穿越清洗。
+//  2. object key 由服务端强制置于 uploadRoot("EAIMAR") 根前缀下，形如
+//     EAIMAR/product/<产品id>/<文件名>，并做防路径穿越清洗。
 //  3. 预签名 PUT 会把 Content-Type 计入签名，故前端 PUT 必须带同样的 Content-Type（uploadFile 已对齐）。
 
 import (
@@ -28,8 +28,12 @@ import (
 // storage_aliyun_oss 模板 provider 一致）。
 const ossStorageProvider = "aliyun_oss"
 
-// firmwareRoot 所有上传对象强制置于该根前缀下（用户要求 yunyan/... 结构，服务端兜底）。
-const firmwareRoot = "yunyan"
+// uploadRoot 所有上传对象强制置于该根前缀下（服务端兜底，前端传什么 path 都逃不出去）。
+//
+// ⚠️ 改这个值只影响【之后】上传的文件：已经存进 productimage / updatepackageaddress 的
+// 历史地址是死的绝对 URL，不会跟着搬家，OSS 上的旧 yunyan/ 目录也还在。要么保留旧目录，
+// 要么在 OSS 控制台把对象拷过来、再把库里那些 URL 一起改，两件事缺一不可。
+const uploadRoot = "EAIMAR"
 
 // aliyunOSSConf 从 svc_config 解出的一份可用的阿里云 OSS 凭证。
 type aliyunOSSConf struct {
@@ -96,21 +100,21 @@ func (this *serverComp) loadAliyunOSSConf(appName string) (*aliyunOSSConf, error
 	return oc, nil
 }
 
-// buildObjectKey 生成对象存储 key，强制置于 firmwareRoot 根下并做防路径穿越清洗。
+// buildObjectKey 生成对象存储 key，强制置于 uploadRoot 根下并做防路径穿越清洗。
 //
 //	dir  调用方给的逻辑目录（如 "product/12/"），可空。
 //	name 文件名（取 base 去掉任何目录部分）。
 //
-// 例：buildObjectKey("product/12/", "fw_v1.bin") => "yunyan/product/12/fw_v1.bin"
+// 例：buildObjectKey("product/12/", "fw_v1.bin") => "EAIMAR/product/12/fw_v1.bin"
 func buildObjectKey(dir, name string) string {
 	name = path.Base(strings.TrimSpace(name)) // 去掉任何目录部分，防止 name 里夹带 ../
 	if name == "" || name == "." || name == "/" {
 		name = "file"
 	}
-	key := path.Clean(path.Join(firmwareRoot, dir, name)) // Join+Clean 合并 //、解析 ..
+	key := path.Clean(path.Join(uploadRoot, dir, name)) // Join+Clean 合并 //、解析 ..
 	// 兜底：若 Clean 后逃逸出根前缀（dir 里塞了过量 ../），强制退回根下只保留文件名。
-	if key != firmwareRoot && !strings.HasPrefix(key, firmwareRoot+"/") {
-		key = firmwareRoot + "/" + name
+	if key != uploadRoot && !strings.HasPrefix(key, uploadRoot+"/") {
+		key = uploadRoot + "/" + name
 	}
 	return key
 }
@@ -162,7 +166,14 @@ func (this *serverComp) getUploadURL(c *gin.Context) {
 	publicURL := uploadURL
 	if d := strings.TrimSpace(conf.Domain); d != "" {
 		d = strings.TrimPrefix(strings.TrimPrefix(d, "https://"), "http://")
-		publicURL = "https://" + strings.TrimRight(d, "/") + "/" + key
+		d = strings.Trim(d, "/")
+		// 只取第一段做 host：运营常把域名连着路径一起填（cdn.ymaikj.com/），
+		// 那样直接当 Host 用会拼出 https://cdn.ymaikj.com//EAIMAR/... 这种取不到的地址。
+		if i := strings.Index(d, "/"); i >= 0 {
+			d = d[:i]
+		}
+		// 用 url.URL 拼而不是字符串相加：文件名可能带中文或空格，Path 会按段转义（`/` 保留）。
+		publicURL = (&url.URL{Scheme: "https", Host: d, Path: "/" + key}).String()
 	} else if u, e := url.Parse(uploadURL); e == nil {
 		u.RawQuery = ""
 		publicURL = u.String()
diff --git a/apps/services/modules/console/api_user.go b/apps/services/modules/console/api_user.go
new file mode 100644
index 00000000..0c1052fa
--- /dev/null
+++ b/apps/services/modules/console/api_user.go
@@ -0,0 +1,231 @@
+package console
+
+import (
+	"errors"
+	"strings"
+	"time"
+
+	"yunyan/comm"
+	"yunyan/lego/sys/mysql"
+	"yunyan/pb"
+
+	"github.com/gin-gonic/gin"
+)
+
+// ============================ 终端用户域 (user) ============================
+//
+// 与设备域(console 主库)不同：终端用户住在【所选应用的业务库】里，所以这里的每个接口
+// 都要先从 X-App-Id 解出应用、拿到该应用的业务库连接，再查它的 user 表。
+//
+// 原来只有「按 UID 精确查一个人」，运营手上没有 UID 就什么也做不了。
+// 现在补了列表(分页+条件筛选)与参数修改。
+
+// userListPageMax 单页上限。列表带 COUNT(*)，页太大在几十万用户的库上会很慢；
+// 真要导出应该另开导出接口，而不是把 page_size 调到几千。
+const userListPageMax = 200
+
+// buildUserListWhere 把筛选条件拼成 where 子句。
+//
+// keyword 一栏多用：UID 精确、其余字段模糊。做成一栏是因为运营手上拿到的线索形态不定
+// （客服转来的可能是手机号、可能是邮箱、也可能是用户自己报的昵称），
+// 让人先选「按什么查」再输入只是多一步。
+func buildUserListWhere(req *userListReq, now int64) (string, []interface{}) {
+	conds := make([]string, 0, 6)
+	args := make([]interface{}, 0, 8)
+	if kw := strings.TrimSpace(req.Keyword); kw != "" {
+		like := "%" + kw + "%"
+		conds = append(conds, "(uid = ? OR phone LIKE ? OR mail LIKE ? OR name LIKE ? OR account LIKE ? OR phonemac LIKE ?)")
+		args = append(args, kw, like, like, like, like, like)
+	}
+	if req.State >= 0 {
+		conds = append(conds, "`State` = ?")
+		args = append(args, req.State)
+	}
+	// vip: 1=会员中(未过期) 0=非会员。按到期时间判定而不是 viplv——
+	// viplv 是等级，过期后并不会被清零，拿它判会把过期用户也算成会员。
+	switch req.Vip {
+	case 1:
+		conds = append(conds, "vipexptime > ?")
+		args = append(args, now)
+	case 0:
+		conds = append(conds, "(vipexptime IS NULL OR vipexptime <= ?)")
+		args = append(args, now)
+	}
+	if req.Idverified >= 0 {
+		conds = append(conds, "idverified = ?")
+		args = append(args, req.Idverified == 1)
+	}
+	if req.Start > 0 {
+		conds = append(conds, "createtime >= ?")
+		args = append(args, req.Start)
+	}
+	if req.End > 0 {
+		conds = append(conds, "createtime < ?")
+		args = append(args, req.End)
+	}
+	if len(conds) == 0 {
+		return "1=1", args
+	}
+	return strings.Join(conds, " AND "), args
+}
+
+type userListReq struct {
+	Keyword    string `json:"keyword"`
+	State      int32  `json:"state"`      // -1 不限；0 正常 1 禁用 2 已注销
+	Vip        int32  `json:"vip"`        // -1 不限；1 会员中 0 非会员
+	Idverified int32  `json:"idverified"` // -1 不限；1 已实名 0 未实名
+	Start      int64  `json:"start"`      // 注册时间区间 [start, end)
+	End        int64  `json:"end"`
+	Page       int    `json:"page"`      // 从 0 起
+	PageSize   int    `json:"page_size"` // 默认 20，上限 userListPageMax
+}
+
+// getUsers 终端用户列表：分页 + 条件筛选。
+func (this *serverComp) getUsers(c *gin.Context) {
+	appId := parseAppId(c.GetHeader("X-App-Id"))
+	if !this.requireAppScope(c, appId) {
+		return
+	}
+	conn, err := this.module.registry.getServiceDB(appId)
+	if err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	// 三个「不限」标志位默认必须是 -1 而不是 0：0 是合法取值（正常状态 / 非会员 / 未实名），
+	// 拿零值当「不限」会让不传参的默认查询悄悄只返回一部分人。
+	req := &userListReq{State: -1, Vip: -1, Idverified: -1}
+	_ = c.ShouldBindJSON(req)
+	if req.PageSize <= 0 {
+		req.PageSize = 20
+	}
+	if req.PageSize > userListPageMax {
+		req.PageSize = userListPageMax
+	}
+	if req.Page < 0 {
+		req.Page = 0
+	}
+
+	where, args := buildUserListWhere(req, time.Now().Unix())
+	var total int64
+	if err := conn.Table(comm.TableUser).Where(where, args...).Count(&total).Error; err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	users := make([]*pb.DBUser, 0, req.PageSize)
+	if total > 0 {
+		if err := conn.Table(comm.TableUser).
+			Where(where, args...).
+			Order("createtime DESC").
+			Limit(req.PageSize).Offset(req.Page * req.PageSize).
+			Find(&users).Error; err != nil {
+			writeErr(c, pb.ErrorCode_DBError, err.Error())
+			return
+		}
+	}
+	for _, u := range users {
+		u.Password = "" // 列表同样不下发密码
+	}
+	writeOK(c, gin.H{"users": users, "total": total, "page": req.Page, "page_size": req.PageSize})
+}
+
+// updateUser 修改终端用户的可运营参数。
+//
+// ⚠️ 只放给超管/管理员。代理(Agent)不在此列——代理要发资源必须走
+// api_giftuserresource，那条路会从代理自己的余额里扣；开放本接口等于让代理凭空造资源。
+//
+// ⚠️ 只改白名单里的几个字段，用 Updates(map) 局部更新而不是整行 Save：
+// 整行写回会把并发中的登录时间、积分消耗等一起覆盖成后台读到的旧值。
+func (this *serverComp) updateUser(c *gin.Context) {
+	if idt := currentIdentity(c); idt != pb.Identity_Admin && idt != pb.Identity_Manager {
+		writeErr(c, pb.ErrorCode_InsufficientPermissions, "仅超管/管理员可修改用户参数（代理请用「赠送资源点」）")
+		return
+	}
+	appId := parseAppId(c.GetHeader("X-App-Id"))
+	if !this.requireAppScope(c, appId) {
+		return
+	}
+	conn, err := this.module.registry.getServiceDB(appId)
+	if err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	// 指针字段：区分「没传这一项」与「传了 0」。用值类型会让「把积分清零」变成不可表达的操作。
+	var req struct {
+		Uid            string  `json:"uid"`
+		Name           *string `json:"name"`
+		State          *int32  `json:"state"`
+		Viplv          *int32  `json:"viplv"`
+		Vipexptime     *int64  `json:"vipexptime"`
+		Aichatintegral *int64  `json:"aichatintegral"`
+		Tradeintegral  *int64  `json:"tradeintegral"`
+		Meetintegral   *int64  `json:"meetintegral"`
+	}
+	_ = c.ShouldBindJSON(&req)
+	uid := strings.TrimSpace(req.Uid)
+	if uid == "" {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "uid 必填")
+		return
+	}
+	old := &pb.DBUser{}
+	if err := conn.FindOne(comm.TableUser, old, "uid=?", uid); err != nil {
+		if errors.Is(err, mysql.ErrNoDocuments) {
+			writeErr(c, pb.ErrorCode_UserSessionNobeing, "未找到该用户")
+			return
+		}
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+
+	updates := map[string]interface{}{}
+	if req.Name != nil {
+		updates["name"] = strings.TrimSpace(*req.Name)
+	}
+	if req.State != nil {
+		switch *req.State {
+		case int32(pb.UserState_Normal), int32(pb.UserState_Disabled), int32(pb.UserState_Cancelled):
+			updates["State"] = *req.State
+		default:
+			writeErr(c, pb.ErrorCode_ReqParameterError, "状态仅支持 0(正常) / 1(禁用) / 2(已注销)")
+			return
+		}
+	}
+	if req.Viplv != nil {
+		if *req.Viplv < 0 {
+			writeErr(c, pb.ErrorCode_ReqParameterError, "VIP 等级不能为负")
+			return
+		}
+		updates["viplv"] = *req.Viplv
+	}
+	if req.Vipexptime != nil {
+		if *req.Vipexptime < 0 {
+			writeErr(c, pb.ErrorCode_ReqParameterError, "VIP 到期时间不能为负")
+			return
+		}
+		updates["vipexptime"] = *req.Vipexptime
+	}
+	// 三种积分是「当前余额」，直接设成绝对值。总额(total*)不动——那是累计发放量，
+	// 属于流水统计口径，被后台改一次就再也对不上账了。
+	for k, v := range map[string]*int64{
+		"aichatintegral": req.Aichatintegral,
+		"tradeintegral":  req.Tradeintegral,
+		"meetintegral":   req.Meetintegral,
+	} {
+		if v == nil {
+			continue
+		}
+		if *v < 0 {
+			writeErr(c, pb.ErrorCode_ReqParameterError, "积分余额不能为负")
+			return
+		}
+		updates[k] = *v
+	}
+	if len(updates) == 0 {
+		writeErr(c, pb.ErrorCode_ReqParameterError, "没有要修改的字段")
+		return
+	}
+	if err := conn.Table(comm.TableUser).Where("uid=?", uid).Updates(updates).Error; err != nil {
+		writeErr(c, pb.ErrorCode_DBError, err.Error())
+		return
+	}
+	writeOK(c, gin.H{"uid": uid, "updated": len(updates)})
+}
diff --git a/apps/services/modules/console/model_chipvendor.go b/apps/services/modules/console/model_chipvendor.go
new file mode 100644
index 00000000..c63f49ec
--- /dev/null
+++ b/apps/services/modules/console/model_chipvendor.go
@@ -0,0 +1,140 @@
+package console
+
+import (
+	"yunyan/comm"
+	"yunyan/lego/sys/postgres"
+)
+
+// 芯片厂商档案（chip_vendor）——原来是 apps/proto/db.proto 里硬编码的 SolutionVendor 枚举，
+// 加一个厂商要同步改三处代码再重新发版，运营自己加不了，故转成表。
+//
+// **Id 就是 CID**（芯片方案标识，十六进制看，如 恒玄=0xABF4），与方案商的 BID、产品的 PID 同一套路：
+// 手工指定的有含义编码、不自增、后台可改。`solution_provider.vendor` 存的就是它。
+//
+// ⚠️ 尚未确定 CID 的厂商先用历史占位 id（杰里=1 / 蓝汛=2 / 博通=4，即原枚举值），
+// 等真实 CID 定下来在后台改号即可（改号会级联更新方案商的 vendor 引用，见 renameChipVendorId）。
+// 主键不能为空，所以「先空着」只能表现为占位值、不能是 0。
+//
+// 用本地 gorm struct 而不是 pb：这张表只服务后台，客户端协议不涉及，
+// 走 pb 就得重新生成 22 个 .pb.go（见 CLAUDE.md 关于 protoc-gen-go 版本的告警），没必要。
+type ChipVendor struct {
+	// Id 即 CID：手工指定、不自增。改它会级联改方案商的 vendor，必须走 renameChipVendorId。
+	Id         uint32 `gorm:"primaryKey;column:id" json:"id"`
+	Name       string `gorm:"column:name;size:64;index" json:"name"` // 厂商名，如 杰里/蓝汛/恒玄/博通
+	Enabled    bool   `gorm:"column:enabled" json:"enabled"`         // 停用后不在方案商的「芯片」下拉里出现，但存量方案商仍显示其名字
+	Sort       int32  `gorm:"column:sort" json:"sort"`               // 列表排序，小的在前；相同则按 id
+	Createtime int64  `gorm:"column:createtime" json:"createtime"`
+	Updatetime int64  `gorm:"column:updatetime" json:"updatetime"`
+}
+
+func (ChipVendor) TableName() string { return comm.TableChipVendor }
+
+// chipVendorSeeds 原 SolutionVendor 枚举的 4 个取值。
+// 恒玄的 CID 已知（0xABF4）故直接用作 id；其余三家 CID 未定，沿用原枚举值作占位 id，
+// 后台确定后改号即可。不替它们猜值——CID 要烧进固件，猜错比留占位难查得多。
+var chipVendorSeeds = []ChipVendor{
+	{Id: 1, Name: "杰里"},
+	{Id: 2, Name: "蓝汛"},
+	{Id: 0xABF4, Name: "恒玄"},
+	{Id: 4, Name: "博通"},
+}
+
+// migrateChipVendorCidToId 一次性迁移：把独立的 cid 列并进主键 id。
+//
+// 上一版把 CID 做成了独立字段（id 自增、cid 另存），本版改成「id 即 CID」。已部署过上一版的库里
+// 存着 id=3 / cid=44020 的恒玄，必须把它搬到 id=44020 并同步改掉方案商的 vendor 引用，
+// 否则方案商会指向一个不存在的芯片厂商。
+//
+// 幂等：迁移完就把 cid 列删掉，之后本函数直接跳过。
+func migrateChipVendorCidToId() error {
+	// 探测 cid 列是否还在（不在 = 已迁移过，或本来就是新库）
+	var n int64
+	if err := postgres.Raw(
+		"SELECT COUNT(*) FROM information_schema.columns WHERE table_name=? AND column_name='cid'",
+		comm.TableChipVendor).Scan(&n).Error; err != nil {
+		return err
+	}
+	if n == 0 {
+		return nil
+	}
+	type cidRow struct {
+		Id  uint32 `gorm:"column:id"`
+		Cid uint32 `gorm:"column:cid"`
+	}
+	var rows []cidRow
+	if err := postgres.Raw(
+		"SELECT id, cid FROM " + comm.TableChipVendor + " WHERE cid <> 0 AND cid <> id").Scan(&rows).Error; err != nil {
+		return err
+	}
+	for _, r := range rows {
+		// 目标 id 已被别人占用就跳过，留给人工处理——静默合并两条厂商记录比不迁移危险得多。
+		var taken int64
+		if err := postgres.Table(comm.TableChipVendor).Where("id=?", r.Cid).Count(&taken).Error; err != nil {
+			return err
+		}
+		if taken > 0 {
+			continue
+		}
+		if err := renameChipVendorId(r.Id, r.Cid); err != nil {
+			return err
+		}
+	}
+	if res := postgres.Exec("ALTER TABLE " + comm.TableChipVendor + " DROP COLUMN IF EXISTS cid"); res.Error != nil {
+		return res.Error
+	}
+	return nil
+}
+
+// ensureChipVendorSeed 幂等补种 4 条已知厂商。
+//
+// 按【名称】判存在而不是按 id：id 就是 CID、后台可改，按 id 判会在厂商改过号之后
+// 把旧 id 那条重新种回来，变成同名两条。同时也避开 id 被别的厂商占用的情况。
+func ensureChipVendorSeed() error {
+	for _, v := range chipVendorSeeds {
+		if res := postgres.Exec(
+			"INSERT INTO "+comm.TableChipVendor+" (id, name, enabled, sort, createtime, updatetime) "+
+				"SELECT ?, ?, true, 0, 0, 0 "+
+				"WHERE NOT EXISTS (SELECT 1 FROM "+comm.TableChipVendor+" WHERE name=?) "+
+				"  AND NOT EXISTS (SELECT 1 FROM "+comm.TableChipVendor+" WHERE id=?)",
+			v.Id, v.Name, v.Name, v.Id); res.Error != nil {
+			return res.Error
+		}
+	}
+	return nil
+}
+
+// ---- 芯片厂商 CRUD（console 主库，与方案商/品牌商同库）----
+
+func dvChipVendors(sys *appConn) (models []*ChipVendor, err error) {
+	models = make([]*ChipVendor, 0)
+	err = sys.AdminDB().Find(comm.TableChipVendor, &models, "")
+	return
+}
+
+func dvChipVendor(sys *appConn, id uint32) (model *ChipVendor, err error) {
+	model = &ChipVendor{}
+	// 用 FindOne：不存在时返回 ErrRecordNotFound，存在性校验才有效（Find 对空结果不报错）。
+	err = sys.AdminDB().FindOne(comm.TableChipVendor, model, "id=?", id)
+	return
+}
+
+func dvAddChipVendor(sys *appConn, model *ChipVendor) (err error) {
+	err = sys.AdminDB().Insert(comm.TableChipVendor, model)
+	return
+}
+
+func dvSaveChipVendor(sys *appConn, model *ChipVendor) (err error) {
+	err = sys.AdminDB().Save(comm.TableChipVendor, model)
+	return
+}
+
+func dvDelChipVendor(sys *appConn, id uint32) (err error) {
+	err = sys.AdminDB().Delete(comm.TableChipVendor, "id=?", id)
+	return
+}
+
+// dvCountProvidersByVendor 统计挂在某芯片厂商下的方案商数量，删除/改号前用它做引用检查。
+func dvCountProvidersByVendor(sys *appConn, vendorId uint32) (n int64, err error) {
+	err = sys.AdminDB().Table(comm.TableSolutionProvider).Where("vendor=?", vendorId).Count(&n).Error
+	return
+}
diff --git a/apps/services/modules/console/model_oemfactory.go b/apps/services/modules/console/model_oemfactory.go
new file mode 100644
index 00000000..3008e99b
--- /dev/null
+++ b/apps/services/modules/console/model_oemfactory.go
@@ -0,0 +1,65 @@
+package console
+
+import (
+	"yunyan/comm"
+)
+
+// 代工厂/组装厂档案（oem_factory）——与品牌商(brand)并列的独立实体：
+// 品牌商是「这货挂谁的牌子卖」，代工厂是「这货由哪家厂生产组装」，同一品牌可以换厂、
+// 同一厂也给多个品牌代工，所以不能复用 brand。
+//
+// ⚠️ 表名用 oem_factory 而不是 factory：库里已经有一张遗留的 `factory` 表
+// （旧「厂家」概念的残留，2026-09-01 核查时全代码库无任何引用，TableFactory 常量都不存在），
+// 列结构和这里对不上。占用同名会让 gorm 往那张旧表上加列、把两套语义混在一起。
+// 旧 factory 表可以单独 DROP，但不要在这里顺手复用它。
+type OemFactory struct {
+	Id           uint32 `gorm:"primaryKey;autoIncrement;column:id" json:"id"`
+	Name         string `gorm:"column:name;size:64;index" json:"name"`            // 工厂名称
+	Contact      string `gorm:"column:contact;size:64" json:"contact"`            // 联系人
+	Phone        string `gorm:"column:phone;size:32" json:"phone"`                // 联系电话
+	Contactmails string `gorm:"column:contactmails;size:255" json:"contactmails"` // 联系人邮箱，逗号分隔
+	Address      string `gorm:"column:address;size:255" json:"address"`           // 工厂地址
+	Description  string `gorm:"column:description;size:255" json:"description"`   // 说明：产能、擅长品类等
+	Enabled      bool   `gorm:"column:enabled" json:"enabled"`                    // 停用后不在下拉里出现，存量数据仍能显示其名字
+	Sort         int32  `gorm:"column:sort" json:"sort"`                          // 列表排序，小的在前；相同则按 id
+	Createtime   int64  `gorm:"column:createtime" json:"createtime"`
+	Updatetime   int64  `gorm:"column:updatetime" json:"updatetime"`
+}
+
+func (OemFactory) TableName() string { return comm.TableOemFactory }
+
+// ---- 代工厂 CRUD（console 主库，与方案商/品牌商同库）----
+
+func dvOemFactories(sys *appConn) (models []*OemFactory, err error) {
+	models = make([]*OemFactory, 0)
+	err = sys.AdminDB().Find(comm.TableOemFactory, &models, "")
+	return
+}
+
+func dvOemFactory(sys *appConn, id uint32) (model *OemFactory, err error) {
+	model = &OemFactory{}
+	// 用 FindOne：不存在时返回 ErrRecordNotFound，存在性校验才有效（Find 对空结果不报错）。
+	err = sys.AdminDB().FindOne(comm.TableOemFactory, model, "id=?", id)
+	return
+}
+
+func dvAddOemFactory(sys *appConn, model *OemFactory) (err error) {
+	err = sys.AdminDB().Insert(comm.TableOemFactory, model)
+	return
+}
+
+func dvSaveOemFactory(sys *appConn, model *OemFactory) (err error) {
+	err = sys.AdminDB().Save(comm.TableOemFactory, model)
+	return
+}
+
+func dvDelOemFactory(sys *appConn, id uint32) (err error) {
+	err = sys.AdminDB().Delete(comm.TableOemFactory, "id=?", id)
+	return
+}
+
+// dvCountBatchesByFactory 统计关联到某工厂的生产批次数，删除前用它挡住「删了批次就追溯不到厂」。
+func dvCountBatchesByFactory(sys *appConn, factoryId uint32) (n int64, err error) {
+	err = sys.AdminDB().Table(comm.TableProductionBatch).Where("factoryid=?", factoryId).Count(&n).Error
+	return
+}
diff --git a/apps/services/modules/console/model_stat.go b/apps/services/modules/console/model_stat.go
index b98af55a..4d6c2a0a 100644
--- a/apps/services/modules/console/model_stat.go
+++ b/apps/services/modules/console/model_stat.go
@@ -48,7 +48,13 @@ func ensureStatTable() error {
 	}
 	// channel_id 为后加的维度列。这里只补列(NOT NULL DEFAULT '')，【不动主键】——
 	// 把它并进复合主键需要 DROP/ADD CONSTRAINT，在有重复行时会失败，必须走
-	// docs/migrations 下的迁移脚本在维护窗口执行；未迁移主键前 verifyStatTablePK 会告警。
+	// docs/migrations/2026-08-08-channel-dimension.sql 在维护窗口执行。
+	//
+	// ⚠️ 没跑那份迁移的后果比原先注释写的严重得多：不是「OnConflict 退化成插入、产生重复行」，
+	// 而是 Postgres 直接报 42P10 no unique or exclusion constraint matching the ON CONFLICT
+	// specification——**每一次快照落库都失败**，stats_global_day 恒为空、仪表盘全 0，
+	// 且只在 console 日志里刷 WARN，界面上一点提示都没有。
+	// 启动时的 verifyStatTablePK 告警是唯一线索，别当成可以放着不管的提示。
 	if res := postgres.Exec("ALTER TABLE " + comm.TableStatsGlobalDay + " ADD COLUMN IF NOT EXISTS channel_id varchar(16) NOT NULL DEFAULT ''"); res.Error != nil {
 		return res.Error
 	}
diff --git a/apps/services/modules/console/scope.go b/apps/services/modules/console/scope.go
index 0b1c585e..419f783a 100644
--- a/apps/services/modules/console/scope.go
+++ b/apps/services/modules/console/scope.go
@@ -107,14 +107,18 @@ func (s acctScope) allowChannel(id string) bool {
 	return s.unlimited || s.channelId == "" || s.channelId == id
 }
 
-// filterChannels 把渠道商列表收敛到账号可见范围：渠道商账号只剩自己，品牌商账号只剩本品牌商名下。
+// filterChannels 把渠道商列表收敛到账号可见范围：渠道商账号只剩自己，品牌商账号只剩
+// 本品牌商名下的 + 全局渠道商。
+//
+// ⚠️ brandid==0 是「全局渠道商」（后台新增渠道商已不再选品牌商），对所有账号可见。
+// 少了这个判断，品牌商账号会看到一个空列表——allowBrand(0) 在 brandId 非 0 时恒为 false。
 func (s acctScope) filterChannels(in []*pb.DBChannel) []*pb.DBChannel {
 	if s.unlimited || (s.brandId == 0 && s.channelId == "") {
 		return in
 	}
 	out := make([]*pb.DBChannel, 0, len(in))
 	for _, ch := range in {
-		if s.allowBrand(ch.Brandid) && s.allowChannel(ch.Id) {
+		if (ch.Brandid == 0 || s.allowBrand(ch.Brandid)) && s.allowChannel(ch.Id) {
 			out = append(out, ch)
 		}
 	}
diff --git a/apps/services/modules/console/server.go b/apps/services/modules/console/server.go
index 56c766d8..a75eca68 100644
--- a/apps/services/modules/console/server.go
+++ b/apps/services/modules/console/server.go
@@ -433,7 +433,18 @@ func (this *serverComp) handleWeb(c *gin.Context) {
 	case "api_testcalltranslaterule":
 		this.testCallTranslateRule(c)
 		return
-	// 渠道分发(channelapp)：各应用在各分发渠道的版本/强更/下载地址/支付渠道开关，存 console 主库，按 app_name 作用域。
+	// 应用发版与入口控制(app_release)：版本/强更/送审版本/游客显隐，按 app_name 一应用一行、不分渠道。
+	// 两个保存接口各写一组字段，共用同一行——别合成一个「整行保存」，会互相清空。
+	case "api_getapprelease":
+		this.getAppRelease(c)
+		return
+	case "api_saveappversion":
+		this.saveAppVersion(c)
+		return
+	case "api_saveapptourists":
+		this.saveAppTourists(c)
+		return
+	// 渠道分发(channelapp)：各应用在各分发渠道的下载地址/上架状态/支付渠道开关，存 console 主库，按 app_name 作用域。
 	case "api_getchannelapps":
 		this.getChannelApps(c)
 		return
@@ -470,6 +481,14 @@ func (this *serverComp) handleWeb(c *gin.Context) {
 	case "api_getuserinfo":
 		this.getUserInfo(c)
 		return
+	// 用户列表：分页 + 条件筛选，同样按选中应用直连其业务库。
+	case "api_getusers":
+		this.getUsers(c)
+		return
+	// 修改用户可运营参数（状态/VIP/积分余额）。仅超管/管理员——代理发资源必须走赠送那条扣余额的路。
+	case "api_updateuser":
+		this.updateUser(c)
+		return
 	// 赠送资源点：给选中应用业务库的终端用户加 VIP天/翻译分/会议分；代理扣自己余额。
 	case "api_giftuserresource":
 		this.giftUserResource(c)
@@ -493,6 +512,24 @@ func (this *serverComp) handleWeb(c *gin.Context) {
 		sys.service = svc
 	}
 	switch method {
+	// 芯片厂商（方案商的 vendor 指向它；原 SolutionVendor 枚举转表）
+	case "api_getchipvendors":
+		this.getChipVendors(c, sys)
+	case "api_addchipvendor":
+		this.addChipVendor(c, sys)
+	case "api_updatechipvendor":
+		this.updateChipVendor(c, sys)
+	case "api_delchipvendor":
+		this.delChipVendor(c, sys)
+	// 代工厂/组装厂
+	case "api_getoemfactories":
+		this.getOemFactories(c, sys)
+	case "api_addoemfactory":
+		this.addOemFactory(c, sys)
+	case "api_updateoemfactory":
+		this.updateOemFactory(c, sys)
+	case "api_deloemfactory":
+		this.delOemFactory(c, sys)
 	// 方案商
 	case "api_getsolutionproviders":
 		this.getSolutionProviders(c, sys)
@@ -969,7 +1006,7 @@ func (this *serverComp) resetLicenseStatus(c *gin.Context, sys *appConn) {
 	var req pb.ApiResetLicenseStatusReq
 	_ = c.ShouldBindJSON(&req)
 	// 走完整重置（删 userdevice + 清 license + 扣激活统计），与批量复用同一 resetOneLicense。
-	if err := resetOneLicense(sys, req.License); err != nil {
+	if err := resetOneLicense(sys, req.Productid, req.License); err != nil {
 		writeErr(c, pb.ErrorCode_DBError, err.Error())
 		return
 	}
diff --git a/apps/services/modules/console/stat.go b/apps/services/modules/console/stat.go
index 7552a718..0dde8d1e 100644
--- a/apps/services/modules/console/stat.go
+++ b/apps/services/modules/console/stat.go
@@ -68,9 +68,14 @@ func (this *statComp) Init(service core.IService, module core.IModule, comp core
 	if err = ensureStatTable(); err != nil {
 		this.module.Errorln("console.stat: 建 stats_global_day 表失败", err)
 	}
-	// 唯一写入自检：复合主键缺列会让 OnConflict 退化成插入、产生重复行。仅告警，不自动改表。
+	// 唯一写入自检。⚠️ 主键缺 channel_id 不是「可能产生重复行」而是**快照一条都写不进去**：
+	// upsert 的 ON CONFLICT 指定五列，缺一列 Postgres 直接 42P10 报错，
+	// 表现为仪表盘恒为 0、只在日志里刷 WARN。修复见
+	// docs/migrations/2026-08-08-channel-dimension.sql 的 A4 段。
+	// 这里仍只告警不自动改表：有重复行时 ADD PRIMARY KEY 会失败，得先人工清理。
 	if ok, cols := verifyStatTablePK(); !ok {
-		log.Warn("console.stat: stats_global_day 复合主键不完整，唯一写入无法保证，请检查表结构",
+		log.Warn("console.stat: stats_global_day 复合主键缺列，统计快照将全部写入失败(42P10)，"+
+			"请执行 docs/migrations/2026-08-08-channel-dimension.sql 的 A4 段",
 			log.Field{Key: "pk", Value: cols})
 	}
 	return
diff --git a/apps/services/modules/user/api_binddevice_identity_test.go b/apps/services/modules/user/api_binddevice_identity_test.go
new file mode 100644
index 00000000..b6c78517
--- /dev/null
+++ b/apps/services/modules/user/api_binddevice_identity_test.go
@@ -0,0 +1,123 @@
+package user
+
+import (
+	"testing"
+
+	"yunyan/pb"
+)
+
+// 设备身份的判定口径：**设备就是 MAC**。
+//
+// 这两个函数决定了「同一台设备」在绑定/接管/解绑三条路径上是否被认出来，
+// 认错的后果是静默的：去重失效会让 userdevice 表里堆重复行，接管失效会让
+// 原用户的设备列表里一直留着一台已经不属于它的耳机。所以用例守在这里。
+
+func TestAlreadyBound_经典蓝牙耳机_code传空也能去重(t *testing.T) {
+	// 客户端对经典蓝牙耳机 code 传空；服务端存进 license 的是 model.Code(=MAC)。
+	// 旧实现比 `v.License == req.Code` 恒为 false，于是每次重绑都插一条新行。
+	existing := &pb.DBUserDivice{
+		Devicename: "Echo-one",
+		Devicemac:  "11:11:22:33:33:A4",
+		License:    "11:11:22:33:33:A4",
+	}
+	req := &pb.UserBindDeviceReq{
+		Devicename: "Echo-one",
+		Devicemac:  "11:11:22:33:33:A4",
+		Code:       "",
+	}
+	if !alreadyBound(existing, req) {
+		t.Fatal("同一台耳机重新绑定应判定为已绑定，否则会插入重复行")
+	}
+}
+
+func TestAlreadyBound_设备名变了仍是同一台(t *testing.T) {
+	// Android 的 getBondedDevices 给的是系统缓存的配对名；固件也改过名
+	// （DEEPVOICE → Echo-one）。名字参与身份判断会让同一台设备换名就多一行。
+	existing := &pb.DBUserDivice{
+		Devicename: "DEEPVOICE",
+		Devicemac:  "11:11:22:33:33:A4",
+	}
+	req := &pb.UserBindDeviceReq{
+		Devicename: "Echo-one",
+		Devicemac:  "11:11:22:33:33:A4",
+	}
+	if !alreadyBound(existing, req) {
+		t.Fatal("MAC 相同即同一台，设备名不参与身份判断")
+	}
+}
+
+func TestAlreadyBound_MAC大小写不敏感(t *testing.T) {
+	existing := &pb.DBUserDivice{Devicemac: "11:11:22:33:33:a4"}
+	req := &pb.UserBindDeviceReq{Devicemac: "11:11:22:33:33:A4"}
+	if !alreadyBound(existing, req) {
+		t.Fatal("MAC 写法的大小写取决于当初是谁写的，比较必须大小写不敏感")
+	}
+}
+
+func TestAlreadyBound_不同MAC不是同一台(t *testing.T) {
+	existing := &pb.DBUserDivice{Devicename: "Echo-one", Devicemac: "11:11:22:33:33:A4"}
+	req := &pb.UserBindDeviceReq{Devicename: "Echo-one", Devicemac: "AA:BB:CC:DD:EE:FF"}
+	if alreadyBound(existing, req) {
+		t.Fatal("换了一台耳机必须判为不同设备，否则新设备绑不上")
+	}
+}
+
+func TestAlreadyBound_无MAC的设备回退比设备码(t *testing.T) {
+	// 早年按设备码导入、未登记 MAC 的设备走这条
+	existing := &pb.DBUserDivice{License: "ABC123"}
+	req := &pb.UserBindDeviceReq{Code: "ABC123"}
+	if !alreadyBound(existing, req) {
+		t.Fatal("没有 MAC 时应回退按设备码认")
+	}
+
+	req2 := &pb.UserBindDeviceReq{Code: "XYZ789"}
+	if alreadyBound(existing, req2) {
+		t.Fatal("设备码不同即不同设备")
+	}
+}
+
+func TestAlreadyBound_空设备码不匹配空License(t *testing.T) {
+	// 两边都空不能算「同一台」，否则用户名下第一条无 MAC 记录会吞掉所有新绑定
+	existing := &pb.DBUserDivice{License: ""}
+	req := &pb.UserBindDeviceReq{Code: ""}
+	if alreadyBound(existing, req) {
+		t.Fatal("既无 MAC 又无设备码时不能判为同一台")
+	}
+}
+
+func TestSameUserDevice_MAC对得上就是同一台(t *testing.T) {
+	// license 与 MAC 不一致（后台重导入过 license）时，旧实现只比 license
+	// 会判成「不是同一台」，接管时清不掉原用户那条绑定。
+	v := &pb.DBUserDivice{Devicemac: "11:11:22:33:33:A4", License: "旧的授权码"}
+	code := &pb.DBAuthCode{Devicemac: "11:11:22:33:33:A4", Code: "11:11:22:33:33:A4"}
+	if !sameUserDevice(v, code) {
+		t.Fatal("MAC 相同即同一台，license 写成什么都不影响")
+	}
+}
+
+func TestSameUserDevice_无MAC时回退比授权码(t *testing.T) {
+	v := &pb.DBUserDivice{License: "ABC123"}
+	code := &pb.DBAuthCode{Code: "ABC123"}
+	if !sameUserDevice(v, code) {
+		t.Fatal("没有 MAC 时应回退按授权码认")
+	}
+}
+
+func TestSameUserDevice_MAC不同且授权码不同则不是同一台(t *testing.T) {
+	v := &pb.DBUserDivice{Devicemac: "11:11:22:33:33:A4", License: "ABC123"}
+	code := &pb.DBAuthCode{Devicemac: "AA:BB:CC:DD:EE:FF", Code: "XYZ789"}
+	if sameUserDevice(v, code) {
+		t.Fatal("两个维度都对不上必须判为不同设备")
+	}
+}
+
+func TestSameUserDevice_空值不panic(t *testing.T) {
+	if sameUserDevice(nil, nil) || sameUserDevice(&pb.DBUserDivice{}, nil) ||
+		sameUserDevice(nil, &pb.DBAuthCode{}) {
+		t.Fatal("空值应判为不同设备")
+	}
+	if alreadyBound(nil, nil) || alreadyBound(&pb.DBUserDivice{}, nil) ||
+		alreadyBound(nil, &pb.UserBindDeviceReq{}) {
+		t.Fatal("空值应判为不同设备")
+	}
+}
diff --git a/apps/services/modules/user/api_getchannelapp.go b/apps/services/modules/user/api_getchannelapp.go
index 99e8a006..995fcfb7 100644
--- a/apps/services/modules/user/api_getchannelapp.go
+++ b/apps/services/modules/user/api_getchannelapp.go
@@ -27,27 +27,37 @@ func (this *apiComp) GetChannelApp(session comm.IUserSession, req *pb.UserGetCha
 		}
 		return
 	}
-	resp = &pb.UserGetChannelAppResp{App: toPbChannelApp(cfg, req.Version)}
-	resp.Needupdate, resp.Forceupdate, resp.Reviewing = evalChannelUpgrade(cfg, req.Version)
+	rel, err := this.module.model.loadAppRelease()
+	if err != nil {
+		errdata = &pb.ErrorData{
+			Code:    pb.ErrorCode_DBError,
+			Message: err.Error(),
+		}
+		return
+	}
+	resp = &pb.UserGetChannelAppResp{App: toPbChannelApp(req.Channel, cfg, rel, req.Version)}
+	resp.Needupdate, resp.Forceupdate, resp.Reviewing = evalChannelUpgrade(rel, req.Version)
 	return
 }
 
-// evalChannelUpgrade 由渠道配置与客户端版本算出三个升级判定。
-// 渠道未配置或客户端没上报版本时全部为 false —— 客户端照旧走「无更新」分支，
+// evalChannelUpgrade 由应用发版配置与客户端版本算出三个升级判定。
+//
+// 判定只看 [comm.AppRelease]（按应用、不分渠道），与渠道行无关 —— 版本号本来就是整个
+// 应用一套的，早先按渠道各存一份导致同一个开关有 8 处能改、客户端只读一处。
+//
+// 未配置或客户端没上报版本时全部为 false —— 客户端照旧走「无更新」分支，
 // 绝不能因为拿不到版本就判成强更，那会把所有老客户端挡在门外。
-func evalChannelUpgrade(cfg *comm.ChannelApp, clientVer string) (need, force, reviewing bool) {
-	if cfg == nil || strings.TrimSpace(clientVer) == "" {
+func evalChannelUpgrade(rel *comm.AppRelease, clientVer string) (need, force, reviewing bool) {
+	if rel == nil || strings.TrimSpace(clientVer) == "" {
 		return false, false, false
 	}
-	if strings.TrimSpace(cfg.Version) != "" {
-		need = comm.CompareVersion(clientVer, cfg.Version) < 0
-	}
-	force = cfg.NeedForceUpdate(clientVer)
+	need = rel.NeedUpdate(clientVer)
+	force = rel.NeedForceUpdate(clientVer)
 	// 强更必然意味着有更新可用：即便运营忘了把线上版本填得比最低支持版本高，也不该出现
 	// 「必须更新但没有更新」这种客户端无法处理的组合。
 	if force {
 		need = true
 	}
-	reviewing = cfg.IsReviewing(clientVer)
+	reviewing = rel.IsReviewing(clientVer)
 	return
 }
diff --git a/apps/services/modules/user/module_test.go b/apps/services/modules/user/module_test.go
index 3e7ef810..089039de 100644
--- a/apps/services/modules/user/module_test.go
+++ b/apps/services/modules/user/module_test.go
@@ -13,6 +13,7 @@ import (
 	"io"
 	"math/rand"
 	"net/http"
+	"os"
 	"reflect"
 	"strings"
 	"sync"
@@ -330,17 +331,17 @@ func TestVoiceSvcIdOf(t *testing.T) {
 }
 
 // ---------------------------------------------------------------------------
-// ④ user_getchannelapp（渠道包版本判定）
+// ④ user_getchannelapp（应用发版版本判定）
 // ---------------------------------------------------------------------------
 
 // 客户端拿到的就是这三个布尔值，各端据此决定「提示更新 / 阻断使用 / 隐藏未过审功能」，
 // 判定错了直接表现为线上事故，故逐个组合固化。
 func TestEvalChannelUpgrade(t *testing.T) {
-	cfg := &comm.ChannelApp{Version: "1.10.0", MinVersion: "1.5.0", ForceUpdate: true, ReviewVersion: "1.11.0"}
+	cfg := &comm.AppRelease{Version: "1.10.0", MinVersion: "1.5.0", ForceUpdate: true, ReviewVersion: "1.11.0"}
 
 	cases := []struct {
 		name                   string
-		cfg                    *comm.ChannelApp
+		cfg                    *comm.AppRelease
 		client                 string
 		need, force, reviewing bool
 	}{
@@ -350,7 +351,7 @@ func TestEvalChannelUpgrade(t *testing.T) {
 		{"高于线上版本（内测包）：不提示", cfg, "1.11.0", false, false, true},
 		{"送审版本：标记审核期", cfg, "1.11.0", false, false, true},
 		{"客户端未上报版本：一律 false，不能把老客户端全挡住", cfg, "", false, false, false},
-		{"该渠道未配置：一律 false", nil, "1.0.0", false, false, false},
+		{"该应用未配置发版信息：一律 false", nil, "1.0.0", false, false, false},
 		{"字符串比较陷阱：1.9 < 1.10 应判定为需更新", cfg, "1.9.9", true, false, false},
 	}
 	for _, c := range cases {
@@ -366,7 +367,7 @@ func TestEvalChannelUpgrade(t *testing.T) {
 
 // 运营把最低支持版本填得比线上版本还高时，不能出现「必须更新但没有更新可用」这种客户端无解的组合。
 func TestEvalChannelUpgradeForceImpliesNeed(t *testing.T) {
-	cfg := &comm.ChannelApp{Version: "1.0.0", MinVersion: "2.0.0", ForceUpdate: true}
+	cfg := &comm.AppRelease{Version: "1.0.0", MinVersion: "2.0.0", ForceUpdate: true}
 	need, force, _ := evalChannelUpgrade(cfg, "1.5.0")
 	if !force {
 		t.Fatal("低于最低支持版本应强更")
@@ -376,7 +377,7 @@ func TestEvalChannelUpgradeForceImpliesNeed(t *testing.T) {
 	}
 }
 
-// 停用/草稿的渠道由 model 层过滤成 nil，这里确认 nil 不会 panic 也不会误判。
+// 后台还没配发版信息时 model 层给的是 nil，这里确认 nil 不会 panic 也不会误判。
 func TestEvalChannelUpgradeNilSafe(t *testing.T) {
 	if need, force, reviewing := evalChannelUpgrade(nil, "1.0.0"); need || force || reviewing {
 		t.Fatal("nil 配置必须全 false")
@@ -533,6 +534,34 @@ func Test_CBC(t *testing.T) {
 // key 留空 = 不解密（v1 之类不加密的接口）。⚠️ 数据含明文凭据，别外传。
 //
 // probeCall 打一次接口并返回（必要时已解密的）响应体明文。
+// probeEnv 给联调探针取环境参数：默认打阿龙测试环境，可用环境变量临时覆盖。
+//
+//	PROBE_HOST=https://xxx PROBE_TOKEN=<新token> PROBE_KEY=<该环境的key> \
+//	  go test ./modules/user/ -run TestApiProbeAppConfigV3 -v
+//
+// ⚠️ token 必须由调用方给：JWT 会过期，写死在代码里的那个迟早失效，
+// 而这两个探针属于 `go test ./...` 的一部分，一旦失效就变成常态红灯
+// （2026-09-03 之前就是这样：写死的 token 早已过期，每次跑都 code=18 NoLogin）。
+// 没给 token 就 Skip —— 探针是手工联调工具，不该拖累整包测试。
+func probeEnv(t *testing.T) (host, token, key string) {
+	t.Helper()
+	host = os.Getenv("PROBE_HOST")
+	if host == "" {
+		host = "https://ym-dev.ymaikj.com" // 阿龙测试环境，同 apps/client/.env 的 SERVER_URL
+	}
+	key = os.Getenv("PROBE_KEY")
+	if key == "" {
+		// 阿龙测试环境 .env 的 GATEWAY_ENCRYPT_KEY。
+		// ⚠️ 换环境必须同时换 key，否则响应解密不出来（各环境的 key 不同）。
+		key = "83KNTeWWQ4GiQHhINJH1H8RyN88HNUOf"
+	}
+	token = os.Getenv("PROBE_TOKEN")
+	if token == "" {
+		t.Skip("联调探针需要一个有效的登录 token：PROBE_TOKEN=<token> go test ...")
+	}
+	return
+}
+
 func probeCall(t *testing.T, url, token, key string) string {
 	t.Helper()
 	req, _ := http.NewRequest(http.MethodPost, url, bytes.NewBufferString("{}"))
@@ -566,13 +595,8 @@ func TestApiProbeAppConfigV2(t *testing.T) {
 	if testing.Short() {
 		t.Skip("联调探针会打线上接口，-short 下跳过")
 	}
-	// ↓↓↓ 换环境/换账号只改这三行 ↓↓↓
-	const (
-		url   = "https://echomeet.voitrans.net/api/home/user_getappconfig_v2"
-		token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJFYXJwaG9uZSIsInN1YiI6IlNnaW4iLCJuYmYiOjE3ODY3NjEzNTYsImlhdCI6MTc4Njc2MTM1NiwianRpIjoiMjA4ODQ1NDYxNjI2MDgwNDYwOCJ9.tAkiUVNNEJMF4_Gfl1qYseUmh73CWcU5Ls9govEOtEQ"
-		key   = "83KNTeWwQ4GiQHhlNJH1H8RyN88HNUOf" // 该环境 .env 里的 GATEWAY_ENCRYPT_KEY
-	)
-	body := probeCall(t, url, token, key)
+	host, token, key := probeEnv(t)
+	body := probeCall(t, host+"/api/home/user_getappconfig_v2", token, key)
 
 	// ① 强类型对象——断点看它，字段能直接展开
 	var result struct {
@@ -615,13 +639,8 @@ func TestApiProbeAppConfigV3(t *testing.T) {
 	if testing.Short() {
 		t.Skip("联调探针会打线上接口，-short 下跳过")
 	}
-	// ↓↓↓ 换环境/换账号只改这三行 ↓↓↓
-	const (
-		url   = "https://app-dev.voitrans.net/api/home/user_getappconfig_v3"
-		token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJFYXJwaG9uZSIsInN1YiI6IlNnaW4iLCJuYmYiOjE3ODY3NjEzNTYsImlhdCI6MTc4Njc2MTM1NiwianRpIjoiMjA4ODQ1NDYxNjI2MDgwNDYwOCJ9.tAkiUVNNEJMF4_Gfl1qYseUmh73CWcU5Ls9govEOtEQ"
-		key   = "83KNTeWwQ4GiQHhlNJH1H8RyN88HNUOf" // 该环境 .env 里的 GATEWAY_ENCRYPT_KEY
-	)
-	body := probeCall(t, url, token, key)
+	host, token, key := probeEnv(t)
+	body := probeCall(t, host+"/api/home/user_getappconfig_v3", token, key)
 
 	var result struct {
 		Code int                       `json:"code"`
@@ -671,3 +690,72 @@ func TestApiProbeAppConfigV3(t *testing.T) {
 		}
 	}
 }
+
+// ---------------------------------------------------------------------------
+// ⑥ 下发结构由两张表拼装（app_release + channel_app）
+// ---------------------------------------------------------------------------
+
+// ⚠️ 这一条钉的是真实事故：运营在「游客显隐控制」里配好了游客登录，App 却一直不显示入口。
+// 原因是 toPbChannelApp 在渠道行缺失时整个返回 nil —— 应用级的开关被「渠道分发里有没有
+// 这一行」卡死。测试机是荣耀，品牌推导出 CHINA_HONOR，而后台只建过官方渠道的行。
+func TestToPbChannelAppSurvivesMissingChannelRow(t *testing.T) {
+	rel := &comm.AppRelease{
+		Version: "1.0.1", Tourists: true, TouristsVersion: "1.0.1",
+		Address: "https://default/app.apk",
+	}
+
+	got := toPbChannelApp(comm.ChannelChinaHonor, nil, rel, "1.0.1")
+	if got == nil {
+		t.Fatal("渠道行缺失但发版配置存在时必须照常下发，否则应用级开关会被渠道行卡死")
+	}
+	if !got.Tourists {
+		t.Fatal("游客登录是应用级开关，与有没有建这个渠道的行无关")
+	}
+	if got.Channel != comm.ChannelChinaHonor {
+		t.Fatalf("渠道号应回显请求的渠道，实际 %d", got.Channel)
+	}
+	if got.Version != "1.0.1" {
+		t.Fatalf("版本应取自 app_release，实际 %q", got.Version)
+	}
+	if got.Address != "https://default/app.apk" {
+		t.Fatalf("没有渠道地址时应回退应用默认地址，实际 %q", got.Address)
+	}
+}
+
+// 反过来：渠道行在、发版配置没配，也要照常下发渠道那部分（支付渠道等），
+// 只是版本相关字段为空 —— 客户端据此走「无更新」分支。
+func TestToPbChannelAppSurvivesMissingRelease(t *testing.T) {
+	ch := &comm.ChannelApp{
+		Channel: comm.ChannelChinaXiaomi, Address: "https://xiaomi/store",
+		PayChannels: "wxpay", AllowSkipDeviceBinding: true, Status: comm.ChannelStatusOnline,
+	}
+	got := toPbChannelApp(comm.ChannelChinaXiaomi, ch, nil, "1.0.1")
+	if got == nil {
+		t.Fatal("发版配置未配时仍应下发渠道信息")
+	}
+	if got.Paychannels != "wxpay" || !got.Allowskipdevicebinding {
+		t.Fatalf("渠道字段丢失：%+v", got)
+	}
+	if got.Version != "" || got.Tourists {
+		t.Fatalf("发版配置缺失时版本/游客字段必须为零值，实际 %+v", got)
+	}
+	if got.Address != "https://xiaomi/store" {
+		t.Fatalf("渠道地址应优先，实际 %q", got.Address)
+	}
+}
+
+// 渠道地址优先于应用默认地址：各商店链接不同，一套地址会把用户引到别家商店。
+func TestToPbChannelAppAddressPrecedence(t *testing.T) {
+	rel := &comm.AppRelease{Address: "https://default/app.apk"}
+	ch := &comm.ChannelApp{Channel: comm.ChannelChinaHuawei, Address: "https://huawei/store"}
+	if got := toPbChannelApp(comm.ChannelChinaHuawei, ch, rel, "1.0.1"); got.Address != "https://huawei/store" {
+		t.Fatalf("渠道地址应覆盖应用默认地址，实际 %q", got.Address)
+	}
+}
+
+// 两张表都没配才返回 nil。
+func TestToPbChannelAppBothNil(t *testing.T) {
+	if got := toPbChannelApp(comm.ChannelChinaXiaomi, nil, nil, "1.0.1"); got != nil {
+		t.Fatalf("两边都没配时应返回 nil，实际 %+v", got)
+	}
+}
diff --git a/apps/services/pb/api_msg.pb.go b/apps/services/pb/api_msg.pb.go
index 99ff4541..6e5e2fb4 100644
--- a/apps/services/pb/api_msg.pb.go
+++ b/apps/services/pb/api_msg.pb.go
@@ -2368,9 +2368,9 @@ func (x *ApiDelBrandResp) GetId() uint32 {
 type ApiGetSettlementsReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Period        uint32                 `protobuf:"varint,1,opt,name=period,proto3" json:"period"`      //@go_tags(`json:"period"`) 结算月 YYYYMM，0=最近一个有数据的月
-	Brandid       uint32                 `protobuf:"varint,2,opt,name=brandid,proto3" json:"brandid"`    //@go_tags(`json:"brandid"`) 品牌商id 0=不限
 	Channelid     string                 `protobuf:"bytes,3,opt,name=channelid,proto3" json:"channelid"` //@go_tags(`json:"channelid"`) 渠道商id 空=不限
 	Status        int32                  `protobuf:"varint,4,opt,name=status,proto3" json:"status"`      //@go_tags(`json:"status"`) 状态过滤 -1=不限(默认)
+	Batchno       string                 `protobuf:"bytes,5,opt,name=batchno,proto3" json:"batchno"`     //@go_tags(`json:"batchno"`) 生产批次号 空=不限
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -2412,13 +2412,6 @@ func (x *ApiGetSettlementsReq) GetPeriod() uint32 {
 	return 0
 }
 
-func (x *ApiGetSettlementsReq) GetBrandid() uint32 {
-	if x != nil {
-		return x.Brandid
-	}
-	return 0
-}
-
 func (x *ApiGetSettlementsReq) GetChannelid() string {
 	if x != nil {
 		return x.Channelid
@@ -2433,13 +2426,19 @@ func (x *ApiGetSettlementsReq) GetStatus() int32 {
 	return 0
 }
 
+func (x *ApiGetSettlementsReq) GetBatchno() string {
+	if x != nil {
+		return x.Batchno
+	}
+	return ""
+}
+
 type ApiGetSettlementsResp struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	Items         []*DBSettlementMonth   `protobuf:"bytes,1,rep,name=items,proto3" json:"items"`                                         //@go_tags(`json:"items"`) 结算明细
-	TotalBase     int64                  `protobuf:"varint,2,opt,name=total_base,json=totalBase,proto3" json:"total_base"`               //@go_tags(`json:"total_base"`) 合计基数(分)
-	TotalBrandNet int64                  `protobuf:"varint,3,opt,name=total_brand_net,json=totalBrandNet,proto3" json:"total_brand_net"` //@go_tags(`json:"total_brand_net"`) 合计品牌商实得(分)
-	TotalChannel  int64                  `protobuf:"varint,4,opt,name=total_channel,json=totalChannel,proto3" json:"total_channel"`      //@go_tags(`json:"total_channel"`) 合计渠道商分成(分)
-	TotalPlatform int64                  `protobuf:"varint,5,opt,name=total_platform,json=totalPlatform,proto3" json:"total_platform"`   //@go_tags(`json:"total_platform"`) 合计平台留存(分)
+	Items         []*DBSettlementMonth   `protobuf:"bytes,1,rep,name=items,proto3" json:"items"`                                       //@go_tags(`json:"items"`) 结算明细
+	TotalBase     int64                  `protobuf:"varint,2,opt,name=total_base,json=totalBase,proto3" json:"total_base"`             //@go_tags(`json:"total_base"`) 合计基数(分)
+	TotalChannel  int64                  `protobuf:"varint,4,opt,name=total_channel,json=totalChannel,proto3" json:"total_channel"`    //@go_tags(`json:"total_channel"`) 合计渠道商分成(分)
+	TotalPlatform int64                  `protobuf:"varint,5,opt,name=total_platform,json=totalPlatform,proto3" json:"total_platform"` //@go_tags(`json:"total_platform"`) 合计平台留存(分)
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -2488,13 +2487,6 @@ func (x *ApiGetSettlementsResp) GetTotalBase() int64 {
 	return 0
 }
 
-func (x *ApiGetSettlementsResp) GetTotalBrandNet() int64 {
-	if x != nil {
-		return x.TotalBrandNet
-	}
-	return 0
-}
-
 func (x *ApiGetSettlementsResp) GetTotalChannel() int64 {
 	if x != nil {
 		return x.TotalChannel
@@ -2618,10 +2610,10 @@ func (x *ApiGenSettlementResp) GetSkipped() int64 {
 type ApiConfirmSettlementReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Period        uint32                 `protobuf:"varint,1,opt,name=period,proto3" json:"period"`      //@go_tags(`json:"period"`) 结算月
-	Brandid       uint32                 `protobuf:"varint,2,opt,name=brandid,proto3" json:"brandid"`    //@go_tags(`json:"brandid"`) 品牌商id
 	Channelid     string                 `protobuf:"bytes,3,opt,name=channelid,proto3" json:"channelid"` //@go_tags(`json:"channelid"`) 渠道商id(空=无渠道归属那一行)
 	Status        int32                  `protobuf:"varint,4,opt,name=status,proto3" json:"status"`      //@go_tags(`json:"status"`) 目标状态 1:已确认 2:已支付 0:退回草稿
 	Remark        string                 `protobuf:"bytes,5,opt,name=remark,proto3" json:"remark"`       //@go_tags(`json:"remark"`) 备注
+	Batchno       string                 `protobuf:"bytes,6,opt,name=batchno,proto3" json:"batchno"`     //@go_tags(`json:"batchno"`) 生产批次号(结算行主键的一部分,空=无法归到批次那一行)
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -2663,13 +2655,6 @@ func (x *ApiConfirmSettlementReq) GetPeriod() uint32 {
 	return 0
 }
 
-func (x *ApiConfirmSettlementReq) GetBrandid() uint32 {
-	if x != nil {
-		return x.Brandid
-	}
-	return 0
-}
-
 func (x *ApiConfirmSettlementReq) GetChannelid() string {
 	if x != nil {
 		return x.Channelid
@@ -2691,6 +2676,13 @@ func (x *ApiConfirmSettlementReq) GetRemark() string {
 	return ""
 }
 
+func (x *ApiConfirmSettlementReq) GetBatchno() string {
+	if x != nil {
+		return x.Batchno
+	}
+	return ""
+}
+
 type ApiConfirmSettlementResp struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Item          *DBSettlementMonth     `protobuf:"bytes,1,opt,name=item,proto3" json:"item"` //@go_tags(`json:"item"`) 结算单
@@ -4462,18 +4454,26 @@ func (*ApiDelChannelAppResp) Descriptor() ([]byte, []int) {
 
 // 授权码生产管理----------------------------------------------------------------
 type ApiCreateAuthCodesReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Brandid       uint32                 `protobuf:"varint,1,opt,name=brandid,proto3" json:"brandid"`          //@go_tags(`json:"brandid"`) 品牌商id
-	Productid     uint32                 `protobuf:"varint,2,opt,name=productid,proto3" json:"productid"`      //@go_tags(`json:"productid"`) 设备类型
-	Createtype    int32                  `protobuf:"varint,3,opt,name=createtype,proto3" json:"createtype"`    //@go_tags(`json:"createtype"`) 生成类型 1 生产模式 2 导入模式
-	Number        uint32                 `protobuf:"varint,4,opt,name=number,proto3" json:"number"`            //@go_tags(`json:"number"`) 生成的授权码数量
-	Isbindmac     bool                   `protobuf:"varint,5,opt,name=isbindmac,proto3" json:"isbindmac"`      //@go_tags(`json:"isbindmac"`) 是否绑定mac地址
-	Macaddresses  string                 `protobuf:"bytes,6,opt,name=macaddresses,proto3" json:"macaddresses"` //@go_tags(`json:"macaddresses"`) 自定义mac地址
-	Remark        string                 `protobuf:"bytes,7,opt,name=remark,proto3" json:"remark"`             //@go_tags(`json:"remark"`) 批次备注
-	Batchno       string                 `protobuf:"bytes,8,opt,name=batchno,proto3" json:"batchno"`           //@go_tags(`json:"batchno"`) 可选:预分配批次号(预览确认流程回传,空=服务端生成)
-	Channelid     string                 `protobuf:"bytes,9,opt,name=channelid,proto3" json:"channelid"`       //@go_tags(`json:"channelid"`) 渠道商id(短码)，须归属 brandid 且状态为启用
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
+	state      protoimpl.MessageState `protogen:"open.v1"`
+	Brandid    uint32                 `protobuf:"varint,1,opt,name=brandid,proto3" json:"brandid"`       //@go_tags(`json:"brandid"`) 品牌商id
+	Productid  uint32                 `protobuf:"varint,2,opt,name=productid,proto3" json:"productid"`   //@go_tags(`json:"productid"`) 设备类型
+	Createtype int32                  `protobuf:"varint,3,opt,name=createtype,proto3" json:"createtype"` //@go_tags(`json:"createtype"`) 生成类型 1 生产模式 2 导入模式
+	Number     uint32                 `protobuf:"varint,4,opt,name=number,proto3" json:"number"`         //@go_tags(`json:"number"`) 生成的授权码数量
+	// 【已废弃 2026-09-02】服务端从来没读过它，前端也已删掉那个开关。
+	// 是否生成 MAC 只看产品的 devicetype（经典蓝牙耳机）或是不是导入模式——
+	// MAC 本身就是设备凭据，没有「绑不绑」这个选择。字段号保留占位，不要复用。
+	Isbindmac       bool   `protobuf:"varint,5,opt,name=isbindmac,proto3" json:"isbindmac"`              //@go_tags(`json:"isbindmac"`) [已废弃]是否绑定mac地址
+	Macaddresses    string `protobuf:"bytes,6,opt,name=macaddresses,proto3" json:"macaddresses"`         //@go_tags(`json:"macaddresses"`) 自定义mac地址
+	Remark          string `protobuf:"bytes,7,opt,name=remark,proto3" json:"remark"`                     //@go_tags(`json:"remark"`) 批次备注
+	Batchno         string `protobuf:"bytes,8,opt,name=batchno,proto3" json:"batchno"`                   //@go_tags(`json:"batchno"`) 可选:预分配批次号(预览确认流程回传,空=服务端生成)
+	Channelid       string `protobuf:"bytes,9,opt,name=channelid,proto3" json:"channelid"`               //@go_tags(`json:"channelid"`) 渠道商id(短码)，须为启用状态（不再要求归属 brandid）
+	Factoryid       uint32 `protobuf:"varint,10,opt,name=factoryid,proto3" json:"factoryid"`             //@go_tags(`json:"factoryid"`) 代工厂id(oem_factory.id)，0=不指定；非 0 时须存在且未停用
+	Sharerate       int32  `protobuf:"varint,11,opt,name=sharerate,proto3" json:"sharerate"`             //@go_tags(`json:"sharerate"`) 本批次渠道分成比例(万分比 0~10000)，生产时冻结进批次台账
+	Rewardvip       uint32 `protobuf:"varint,12,opt,name=rewardvip,proto3" json:"rewardvip"`             //@go_tags(`json:"rewardvip"`) 本批次绑定赠送VIP天数(0=不送)
+	Rewardtranslate uint32 `protobuf:"varint,13,opt,name=rewardtranslate,proto3" json:"rewardtranslate"` //@go_tags(`json:"rewardtranslate"`) 本批次绑定赠送翻译时长(分钟,0=不送)
+	Rewardmeeting   uint32 `protobuf:"varint,14,opt,name=rewardmeeting,proto3" json:"rewardmeeting"`     //@go_tags(`json:"rewardmeeting"`) 本批次绑定赠送会议时长(分钟,0=不送)
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *ApiCreateAuthCodesReq) Reset() {
@@ -4569,6 +4569,41 @@ func (x *ApiCreateAuthCodesReq) GetChannelid() string {
 	return ""
 }
 
+func (x *ApiCreateAuthCodesReq) GetFactoryid() uint32 {
+	if x != nil {
+		return x.Factoryid
+	}
+	return 0
+}
+
+func (x *ApiCreateAuthCodesReq) GetSharerate() int32 {
+	if x != nil {
+		return x.Sharerate
+	}
+	return 0
+}
+
+func (x *ApiCreateAuthCodesReq) GetRewardvip() uint32 {
+	if x != nil {
+		return x.Rewardvip
+	}
+	return 0
+}
+
+func (x *ApiCreateAuthCodesReq) GetRewardtranslate() uint32 {
+	if x != nil {
+		return x.Rewardtranslate
+	}
+	return 0
+}
+
+func (x *ApiCreateAuthCodesReq) GetRewardmeeting() uint32 {
+	if x != nil {
+		return x.Rewardmeeting
+	}
+	return 0
+}
+
 type ApiCreateAuthCodesResp struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	Brandid       uint32                 `protobuf:"varint,1,opt,name=brandid,proto3" json:"brandid"`         //@go_tags(`json:"brandid"`) 品牌商id
@@ -7726,8 +7761,12 @@ func (x *ApiGetUserUseLogsResp) GetLogs() []*DBUserUseLog {
 
 // 重置License状态
 type ApiResetLicenseStatusReq struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	License       string                 `protobuf:"bytes,1,opt,name=license,proto3" json:"licenses"` //@go_tags(`json:"licenses"`) //license列表
+	state   protoimpl.MessageState `protogen:"open.v1"`
+	License string                 `protobuf:"bytes,1,opt,name=license,proto3" json:"licenses"` //@go_tags(`json:"licenses"`) //license列表
+	// 授权码分表按产品切，重置前必须知道 PID。**传了就用它**，别让服务端去反解设备码——
+	// 2026-09-02 起经典蓝牙耳机的 code 就是 MAC，而导入进来的 MAC 前两字节是外部厂商的 OUI，
+	// 反解出来是别人的 PID，会去改错误的分表。0=不传，服务端退回反解（只对存量 license 码有效）。
+	Productid     uint32 `protobuf:"varint,2,opt,name=productid,proto3" json:"productid"` //@go_tags(`json:"productid"`) //产品ID(PID)，0=让服务端从设备码反解
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -7769,6 +7808,13 @@ func (x *ApiResetLicenseStatusReq) GetLicense() string {
 	return ""
 }
 
+func (x *ApiResetLicenseStatusReq) GetProductid() uint32 {
+	if x != nil {
+		return x.Productid
+	}
+	return 0
+}
+
 type ApiResetLicenseStatusResp struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	unknownFields protoimpl.UnknownFields
@@ -7808,7 +7854,8 @@ func (*ApiResetLicenseStatusResp) Descriptor() ([]byte, []int) {
 // 批量重置License状态
 type ApiBatchResetLicenseStatusReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
-	Licenses      []string               `protobuf:"bytes,1,rep,name=licenses,proto3" json:"licenses"` //@go_tags(`json:"licenses"`) //license列表
+	Licenses      []string               `protobuf:"bytes,1,rep,name=licenses,proto3" json:"licenses"`    //@go_tags(`json:"licenses"`) //license列表
+	Productid     uint32                 `protobuf:"varint,2,opt,name=productid,proto3" json:"productid"` //@go_tags(`json:"productid"`) //产品ID(PID)，0=让服务端从设备码反解（同上）
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -7850,6 +7897,13 @@ func (x *ApiBatchResetLicenseStatusReq) GetLicenses() []string {
 	return nil
 }
 
+func (x *ApiBatchResetLicenseStatusReq) GetProductid() uint32 {
+	if x != nil {
+		return x.Productid
+	}
+	return 0
+}
+
 type ApiBatchResetLicenseStatusResp struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	SuccessCount  int32                  `protobuf:"varint,1,opt,name=success_count,json=successCount,proto3" json:"success_count"` //@go_tags(`json:"success_count"`) //成功数量
@@ -10889,31 +10943,30 @@ const file_api_api_msg_proto_rawDesc = "" +
 	"\x0eApiDelBrandReq\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\rR\x02id\"!\n" +
 	"\x0fApiDelBrandResp\x12\x0e\n" +
-	"\x02id\x18\x01 \x01(\rR\x02id\"~\n" +
+	"\x02id\x18\x01 \x01(\rR\x02id\"\x84\x01\n" +
 	"\x14ApiGetSettlementsReq\x12\x16\n" +
-	"\x06period\x18\x01 \x01(\rR\x06period\x12\x18\n" +
-	"\abrandid\x18\x02 \x01(\rR\abrandid\x12\x1c\n" +
+	"\x06period\x18\x01 \x01(\rR\x06period\x12\x1c\n" +
 	"\tchannelid\x18\x03 \x01(\tR\tchannelid\x12\x16\n" +
-	"\x06status\x18\x04 \x01(\x05R\x06status\"\xd4\x01\n" +
+	"\x06status\x18\x04 \x01(\x05R\x06status\x12\x18\n" +
+	"\abatchno\x18\x05 \x01(\tR\abatchnoJ\x04\b\x02\x10\x03\"\xb2\x01\n" +
 	"\x15ApiGetSettlementsResp\x12(\n" +
 	"\x05items\x18\x01 \x03(\v2\x12.DBSettlementMonthR\x05items\x12\x1d\n" +
 	"\n" +
-	"total_base\x18\x02 \x01(\x03R\ttotalBase\x12&\n" +
-	"\x0ftotal_brand_net\x18\x03 \x01(\x03R\rtotalBrandNet\x12#\n" +
+	"total_base\x18\x02 \x01(\x03R\ttotalBase\x12#\n" +
 	"\rtotal_channel\x18\x04 \x01(\x03R\ftotalChannel\x12%\n" +
-	"\x0etotal_platform\x18\x05 \x01(\x03R\rtotalPlatform\"-\n" +
+	"\x0etotal_platform\x18\x05 \x01(\x03R\rtotalPlatformJ\x04\b\x03\x10\x04\"-\n" +
 	"\x13ApiGenSettlementReq\x12\x16\n" +
 	"\x06period\x18\x01 \x01(\rR\x06period\"\\\n" +
 	"\x14ApiGenSettlementResp\x12\x16\n" +
 	"\x06period\x18\x01 \x01(\rR\x06period\x12\x12\n" +
 	"\x04rows\x18\x02 \x01(\x03R\x04rows\x12\x18\n" +
-	"\askipped\x18\x03 \x01(\x03R\askipped\"\x99\x01\n" +
+	"\askipped\x18\x03 \x01(\x03R\askipped\"\x9f\x01\n" +
 	"\x17ApiConfirmSettlementReq\x12\x16\n" +
-	"\x06period\x18\x01 \x01(\rR\x06period\x12\x18\n" +
-	"\abrandid\x18\x02 \x01(\rR\abrandid\x12\x1c\n" +
+	"\x06period\x18\x01 \x01(\rR\x06period\x12\x1c\n" +
 	"\tchannelid\x18\x03 \x01(\tR\tchannelid\x12\x16\n" +
 	"\x06status\x18\x04 \x01(\x05R\x06status\x12\x16\n" +
-	"\x06remark\x18\x05 \x01(\tR\x06remark\"B\n" +
+	"\x06remark\x18\x05 \x01(\tR\x06remark\x12\x18\n" +
+	"\abatchno\x18\x06 \x01(\tR\abatchnoJ\x04\b\x02\x10\x03\"B\n" +
 	"\x18ApiConfirmSettlementResp\x12&\n" +
 	"\x04item\x18\x01 \x01(\v2\x12.DBSettlementMonthR\x04item\"_\n" +
 	"\x11ApiGetChannelsReq\x12\x18\n" +
@@ -11009,7 +11062,7 @@ const file_api_api_msg_proto_rawDesc = "" +
 	"\x17ApiUploadChannelAppResp\"/\n" +
 	"\x13ApiDelChannelAppReq\x12\x18\n" +
 	"\achannel\x18\x01 \x01(\x05R\achannel\"\x16\n" +
-	"\x14ApiDelChannelAppResp\"\x99\x02\n" +
+	"\x14ApiDelChannelAppResp\"\xc3\x03\n" +
 	"\x15ApiCreateAuthCodesReq\x12\x18\n" +
 	"\abrandid\x18\x01 \x01(\rR\abrandid\x12\x1c\n" +
 	"\tproductid\x18\x02 \x01(\rR\tproductid\x12\x1e\n" +
@@ -11021,7 +11074,13 @@ const file_api_api_msg_proto_rawDesc = "" +
 	"\fmacaddresses\x18\x06 \x01(\tR\fmacaddresses\x12\x16\n" +
 	"\x06remark\x18\a \x01(\tR\x06remark\x12\x18\n" +
 	"\abatchno\x18\b \x01(\tR\abatchno\x12\x1c\n" +
-	"\tchannelid\x18\t \x01(\tR\tchannelid\"\xbb\x02\n" +
+	"\tchannelid\x18\t \x01(\tR\tchannelid\x12\x1c\n" +
+	"\tfactoryid\x18\n" +
+	" \x01(\rR\tfactoryid\x12\x1c\n" +
+	"\tsharerate\x18\v \x01(\x05R\tsharerate\x12\x1c\n" +
+	"\trewardvip\x18\f \x01(\rR\trewardvip\x12(\n" +
+	"\x0frewardtranslate\x18\r \x01(\rR\x0frewardtranslate\x12$\n" +
+	"\rrewardmeeting\x18\x0e \x01(\rR\rrewardmeeting\"\xbb\x02\n" +
 	"\x16ApiCreateAuthCodesResp\x12\x18\n" +
 	"\abrandid\x18\x01 \x01(\rR\abrandid\x12\x1c\n" +
 	"\tproductid\x18\x02 \x01(\rR\tproductid\x12\x18\n" +
@@ -11201,12 +11260,14 @@ const file_api_api_msg_proto_rawDesc = "" +
 	"\x05start\x18\x03 \x01(\x03R\x05start\x12\x10\n" +
 	"\x03end\x18\x04 \x01(\x03R\x03end\":\n" +
 	"\x15ApiGetUserUseLogsResp\x12!\n" +
-	"\x04logs\x18\x01 \x03(\v2\r.DBUserUseLogR\x04logs\"4\n" +
+	"\x04logs\x18\x01 \x03(\v2\r.DBUserUseLogR\x04logs\"R\n" +
 	"\x18ApiResetLicenseStatusReq\x12\x18\n" +
-	"\alicense\x18\x01 \x01(\tR\alicense\"\x1b\n" +
-	"\x19ApiResetLicenseStatusResp\";\n" +
+	"\alicense\x18\x01 \x01(\tR\alicense\x12\x1c\n" +
+	"\tproductid\x18\x02 \x01(\rR\tproductid\"\x1b\n" +
+	"\x19ApiResetLicenseStatusResp\"Y\n" +
 	"\x1dApiBatchResetLicenseStatusReq\x12\x1a\n" +
-	"\blicenses\x18\x01 \x03(\tR\blicenses\"d\n" +
+	"\blicenses\x18\x01 \x03(\tR\blicenses\x12\x1c\n" +
+	"\tproductid\x18\x02 \x01(\rR\tproductid\"d\n" +
 	"\x1eApiBatchResetLicenseStatusResp\x12#\n" +
 	"\rsuccess_count\x18\x01 \x01(\x05R\fsuccessCount\x12\x1d\n" +
 	"\n" +
diff --git a/apps/services/pb/db.pb.go b/apps/services/pb/db.pb.go
index 434b12ec..3382b6a4 100644
--- a/apps/services/pb/db.pb.go
+++ b/apps/services/pb/db.pb.go
@@ -137,7 +137,12 @@ func (Codetype) EnumDescriptor() ([]byte, []int) {
 
 // 厂家数据管理
 // 方案商所属芯片厂商（分组维度）。一个芯片厂商可以有多套方案，每套方案一条 DBSolutionProvider 记录。
-// 新增厂商在这里加值，同时补 modules/console/api_device.go 的 chipVendorNames 与前端 utils/chipvendors.ts。
+//
+// ⚠️【2026-09-01 已停止扩充】芯片厂商已转成 chip_vendor 表（后台「芯片管理」页自助增删改，
+// 见 modules/console/model_chipvendor.go）。DBSolutionProvider.vendor 存的是那张表的 id，
+// 表 id 与下面这几个枚举值一一对应（启动时幂等补种），故存量数据无需迁移。
+// 新增厂商请到后台加，**不要再往这个枚举里加值**——加了也没人读，反而会让人以为还得改代码发版。
+// 本枚举保留是为了字段类型不变（proto3 开放枚举按数值收发，表 id ≥5 也能正常传输）。
 type SolutionVendor int32
 
 const (
@@ -1511,22 +1516,27 @@ func (x *DBBrand) GetCreatetime() int64 {
 // id 用 8 位可读短码而非自增：会印在生产台账/结算单上并对外沟通，短码可读、不暴露规模，
 // 且作为统计与结算的维度键（string）跨库不冲突。新增走审批：status=0 时不可用于生产。
 type DBChannel struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Id            string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id" gorm:"column:id;size:16;primaryKey"`                      //@go_tags(`gorm:"column:id;size:16;primaryKey" json:"id"`) 渠道商id(短码)
-	Brandid       uint32                 `protobuf:"varint,2,opt,name=brandid,proto3" json:"brandid" gorm:"brandid;index"`           //@go_tags(`gorm:"brandid;index" json:"brandid"`) 归属品牌商id
-	Name          string                 `protobuf:"bytes,3,opt,name=name,proto3" json:"name" gorm:"name;index"`                  //@go_tags(`gorm:"name;index" json:"name"`) 渠道商名称
-	Contact       string                 `protobuf:"bytes,4,opt,name=contact,proto3" json:"contact" gorm:"contact"`            //@go_tags(`gorm:"contact" json:"contact"`) 联系人/电话
-	Contactmails  string                 `protobuf:"bytes,5,opt,name=contactmails,proto3" json:"contactmails" gorm:"contactmails"`  //@go_tags(`gorm:"contactmails" json:"contactmails"`) 联系人邮箱 xxx@qq.com,xxx@gmail.com
-	Remark        string                 `protobuf:"bytes,6,opt,name=remark,proto3" json:"remark" gorm:"remark"`              //@go_tags(`gorm:"remark" json:"remark"`) 备注
-	Sharerate     int32                  `protobuf:"varint,7,opt,name=sharerate,proto3" json:"sharerate" gorm:"sharerate"`       //@go_tags(`gorm:"sharerate" json:"sharerate"`) 分成比例(万分比,从品牌商那份里再切)
-	Status        int32                  `protobuf:"varint,8,opt,name=status,proto3" json:"status" gorm:"status;index"`             //@go_tags(`gorm:"status;index" json:"status"`) 状态 0:待审核 1:启用 2:停用 3:驳回
-	Applyaccount  string                 `protobuf:"bytes,9,opt,name=applyaccount,proto3" json:"applyaccount" gorm:"applyaccount"`  //@go_tags(`gorm:"applyaccount" json:"applyaccount"`) 申请人账号(品牌商自助添加时记录)
-	Auditaccount  string                 `protobuf:"bytes,10,opt,name=auditaccount,proto3" json:"auditaccount" gorm:"auditaccount"` //@go_tags(`gorm:"auditaccount" json:"auditaccount"`) 审核人账号
-	Auditremark   string                 `protobuf:"bytes,11,opt,name=auditremark,proto3" json:"auditremark" gorm:"auditremark"`   //@go_tags(`gorm:"auditremark" json:"auditremark"`) 审核意见(驳回原因)
-	Audittime     int64                  `protobuf:"varint,12,opt,name=audittime,proto3" json:"audittime" gorm:"audittime"`      //@go_tags(`gorm:"audittime" json:"audittime"`) 审核时间
-	Createtime    int64                  `protobuf:"varint,13,opt,name=createtime,proto3" json:"createtime" gorm:"createtime"`    //@go_tags(`gorm:"createtime" json:"createtime"`) 创建时间
-	Updatetime    int64                  `protobuf:"varint,14,opt,name=updatetime,proto3" json:"updatetime" gorm:"updatetime"`    //@go_tags(`gorm:"updatetime" json:"updatetime"`) 更新时间
-	Official      bool                   `protobuf:"varint,15,opt,name=official,proto3" json:"official" gorm:"official;index"`        //@go_tags(`gorm:"official;index" json:"official"`) 品牌官方渠道：随品牌商创建自动生成、直接启用，不可删除（品牌自营的那条销售线）
+	state protoimpl.MessageState `protogen:"open.v1"`
+	Id    string                 `protobuf:"bytes,1,opt,name=id,proto3" json:"id" gorm:"column:id;size:16;primaryKey"` //@go_tags(`gorm:"column:id;size:16;primaryKey" json:"id"`) 渠道商id(短码)
+	// 归属品牌商id。**0 = 不归属任何品牌商**（后台新增渠道商时已不再要求选品牌商，
+	// 渠道商是全局实体）。仅 addOfficialChannel 生成的「品牌官方渠道」才带非 0 值。
+	Brandid      uint32 `protobuf:"varint,2,opt,name=brandid,proto3" json:"brandid" gorm:"brandid;index"`          //@go_tags(`gorm:"brandid;index" json:"brandid"`) 归属品牌商id(0=全局渠道商)
+	Name         string `protobuf:"bytes,3,opt,name=name,proto3" json:"name" gorm:"name;index"`                 //@go_tags(`gorm:"name;index" json:"name"`) 渠道商名称
+	Contact      string `protobuf:"bytes,4,opt,name=contact,proto3" json:"contact" gorm:"contact"`           //@go_tags(`gorm:"contact" json:"contact"`) 联系人/电话
+	Contactmails string `protobuf:"bytes,5,opt,name=contactmails,proto3" json:"contactmails" gorm:"contactmails"` //@go_tags(`gorm:"contactmails" json:"contactmails"`) 联系人邮箱 xxx@qq.com,xxx@gmail.com
+	Remark       string `protobuf:"bytes,6,opt,name=remark,proto3" json:"remark" gorm:"remark"`             //@go_tags(`gorm:"remark" json:"remark"`) 备注
+	// 【已停止在后台维护，2026-09-02】分成比例改为按【生产批次】设置（production_batch.sharerate），
+	// 因为同一渠道商不同批次的比例可能不同。本列保留存量值，月结算暂时仍读它（见 api_settlement.go），
+	// 新建渠道商一律为 0。别再在渠道商表单里加回这个字段。
+	Sharerate     int32  `protobuf:"varint,7,opt,name=sharerate,proto3" json:"sharerate" gorm:"sharerate"`       //@go_tags(`gorm:"sharerate" json:"sharerate"`) [遗留]渠道商级分成比例(万分比)
+	Status        int32  `protobuf:"varint,8,opt,name=status,proto3" json:"status" gorm:"status;index"`             //@go_tags(`gorm:"status;index" json:"status"`) 状态 0:待审核 1:启用 2:停用 3:驳回
+	Applyaccount  string `protobuf:"bytes,9,opt,name=applyaccount,proto3" json:"applyaccount" gorm:"applyaccount"`  //@go_tags(`gorm:"applyaccount" json:"applyaccount"`) 申请人账号(品牌商自助添加时记录)
+	Auditaccount  string `protobuf:"bytes,10,opt,name=auditaccount,proto3" json:"auditaccount" gorm:"auditaccount"` //@go_tags(`gorm:"auditaccount" json:"auditaccount"`) 审核人账号
+	Auditremark   string `protobuf:"bytes,11,opt,name=auditremark,proto3" json:"auditremark" gorm:"auditremark"`   //@go_tags(`gorm:"auditremark" json:"auditremark"`) 审核意见(驳回原因)
+	Audittime     int64  `protobuf:"varint,12,opt,name=audittime,proto3" json:"audittime" gorm:"audittime"`      //@go_tags(`gorm:"audittime" json:"audittime"`) 审核时间
+	Createtime    int64  `protobuf:"varint,13,opt,name=createtime,proto3" json:"createtime" gorm:"createtime"`    //@go_tags(`gorm:"createtime" json:"createtime"`) 创建时间
+	Updatetime    int64  `protobuf:"varint,14,opt,name=updatetime,proto3" json:"updatetime" gorm:"updatetime"`    //@go_tags(`gorm:"updatetime" json:"updatetime"`) 更新时间
+	Official      bool   `protobuf:"varint,15,opt,name=official,proto3" json:"official" gorm:"official;index"`        //@go_tags(`gorm:"official;index" json:"official"`) 品牌官方渠道：随品牌商创建自动生成、直接启用，不可删除（品牌自营的那条销售线）
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -1666,31 +1676,39 @@ func (x *DBChannel) GetOfficial() bool {
 	return false
 }
 
-// 月结算单（每 结算月×品牌商×渠道商 一行）
+// 月结算单（每 结算月×渠道商×生产批次 一行）
+//
+// 分成算法（2026-09-02 起）：
+//
+//	base            = 该月归属该 (渠道商, 批次) 的订单实付金额之和（分）
+//	channel_amount  = base * channel_rate    渠道商分成
+//	platform_amount = base - channel_amount  平台留存
 //
-// 分成算法（渠道商从品牌商那份里再切）：
+// ⚠️ 为什么按【批次】而不是按渠道商出行：分成比例是一批一谈的，存在
 //
-//	base            = 该月归属该渠道商的订单实付金额之和（分）
-//	brand_gross     = base * brand_rate      品牌商总提成
-//	channel_amount  = brand_gross * channel_rate  渠道商从品牌商那份里再切
-//	brand_net       = brand_gross - channel_amount 品牌商实得
-//	platform_amount = base - brand_gross     平台留存
+//	production_batch.sharerate 上（见「MAC生成管理 → 生成MAC」的表单）。同一家渠道商
+//	不同批次比例可以不同，一个渠道商一行只能装一个比例，装不下。
 //
-// 比例按【结算时快照】存进本行，事后调比例不影响已确认的月份。
-// 无渠道归属的订单落 channelid=” 的行（品牌那份全归品牌）；无品牌归属的落 brandid=0（全归平台）。
+// 订单如何落到批次：payorder 下单时冻结了来源设备快照（src_license / src_mac / src_productid），
+// 拿它去 license_<pid> 分表反查到 batchno。查不到（用户没绑过设备、批次被撤销）的订单
+// 落 batchno=” 的行，比例 0、全归平台。
+//
+// 比例按【结算时快照】存进本行，事后改批次比例不影响已确认的月份。
+//
+// ⚠️ 品牌商维度已移除：生产链路不再涉及品牌商（生成MAC 表单已去掉该字段），
+//
+//	留着只会产出一堆 brandid=0 的行。字段号 2/6/7/10 保留不复用。
 type DBSettlementMonth struct {
 	state          protoimpl.MessageState `protogen:"open.v1"`
 	Period         uint32                 `protobuf:"varint,1,opt,name=period,proto3" json:"period" gorm:"period;primaryKey;index"`                                        //@go_tags(`gorm:"period;primaryKey;index" json:"period"`) 结算月 YYYYMM
-	Brandid        uint32                 `protobuf:"varint,2,opt,name=brandid,proto3" json:"brandid" gorm:"brandid;primaryKey;index"`                                      //@go_tags(`gorm:"brandid;primaryKey;index" json:"brandid"`) 品牌商id(0=无品牌归属)
 	Channelid      string                 `protobuf:"bytes,3,opt,name=channelid,proto3" json:"channelid" gorm:"channelid;size:16;primaryKey;index"`                                   //@go_tags(`gorm:"channelid;size:16;primaryKey;index" json:"channelid"`) 渠道商id(空=无渠道归属)
+	Batchno        string                 `protobuf:"bytes,17,opt,name=batchno,proto3" json:"batchno" gorm:"batchno;size:16;primaryKey;index"`                                      //@go_tags(`gorm:"batchno;size:16;primaryKey;index" json:"batchno"`) 生产批次号(空=无法归到批次)
+	Productid      uint32                 `protobuf:"varint,18,opt,name=productid,proto3" json:"productid" gorm:"productid;index"`                                 //@go_tags(`gorm:"productid;index" json:"productid"`) 该批次的产品id(展示用,0=未知)
 	OrderCount     int64                  `protobuf:"varint,4,opt,name=order_count,json=orderCount,proto3" json:"order_count" gorm:"order_count"`              //@go_tags(`gorm:"order_count" json:"order_count"`) 已支付订单数
 	BaseAmount     int64                  `protobuf:"varint,5,opt,name=base_amount,json=baseAmount,proto3" json:"base_amount" gorm:"base_amount"`              //@go_tags(`gorm:"base_amount" json:"base_amount"`) 结算基数=订单实付金额合计(分)
-	BrandRate      int32                  `protobuf:"varint,6,opt,name=brand_rate,json=brandRate,proto3" json:"brand_rate" gorm:"brand_rate"`                 //@go_tags(`gorm:"brand_rate" json:"brand_rate"`) 品牌商分成比例快照(万分比)
-	BrandGross     int64                  `protobuf:"varint,7,opt,name=brand_gross,json=brandGross,proto3" json:"brand_gross" gorm:"brand_gross"`              //@go_tags(`gorm:"brand_gross" json:"brand_gross"`) 品牌商总提成(分)
-	ChannelRate    int32                  `protobuf:"varint,8,opt,name=channel_rate,json=channelRate,proto3" json:"channel_rate" gorm:"channel_rate"`           //@go_tags(`gorm:"channel_rate" json:"channel_rate"`) 渠道商分成比例快照(万分比,从品牌那份里切)
+	ChannelRate    int32                  `protobuf:"varint,8,opt,name=channel_rate,json=channelRate,proto3" json:"channel_rate" gorm:"channel_rate"`           //@go_tags(`gorm:"channel_rate" json:"channel_rate"`) 渠道分成比例快照(万分比,取自该批次)
 	ChannelAmount  int64                  `protobuf:"varint,9,opt,name=channel_amount,json=channelAmount,proto3" json:"channel_amount" gorm:"channel_amount"`     //@go_tags(`gorm:"channel_amount" json:"channel_amount"`) 渠道商分成金额(分)
-	BrandNet       int64                  `protobuf:"varint,10,opt,name=brand_net,json=brandNet,proto3" json:"brand_net" gorm:"brand_net"`                   //@go_tags(`gorm:"brand_net" json:"brand_net"`) 品牌商实得(分)=总提成-渠道商分成
-	PlatformAmount int64                  `protobuf:"varint,11,opt,name=platform_amount,json=platformAmount,proto3" json:"platform_amount" gorm:"platform_amount"` //@go_tags(`gorm:"platform_amount" json:"platform_amount"`) 平台留存(分)=基数-品牌商总提成
+	PlatformAmount int64                  `protobuf:"varint,11,opt,name=platform_amount,json=platformAmount,proto3" json:"platform_amount" gorm:"platform_amount"` //@go_tags(`gorm:"platform_amount" json:"platform_amount"`) 平台留存(分)=基数-渠道分成
 	Status         int32                  `protobuf:"varint,12,opt,name=status,proto3" json:"status" gorm:"status;index"`                                       //@go_tags(`gorm:"status;index" json:"status"`) 状态 0:草稿(可重算) 1:已确认(锁定) 2:已支付
 	GenTime        int64                  `protobuf:"varint,13,opt,name=gen_time,json=genTime,proto3" json:"gen_time" gorm:"gen_time"`                      //@go_tags(`gorm:"gen_time" json:"gen_time"`) 生成/重算时间
 	ConfirmAccount string                 `protobuf:"bytes,14,opt,name=confirm_account,json=confirmAccount,proto3" json:"confirm_account" gorm:"confirm_account"`  //@go_tags(`gorm:"confirm_account" json:"confirm_account"`) 确认人账号
@@ -1737,13 +1755,6 @@ func (x *DBSettlementMonth) GetPeriod() uint32 {
 	return 0
 }
 
-func (x *DBSettlementMonth) GetBrandid() uint32 {
-	if x != nil {
-		return x.Brandid
-	}
-	return 0
-}
-
 func (x *DBSettlementMonth) GetChannelid() string {
 	if x != nil {
 		return x.Channelid
@@ -1751,30 +1762,30 @@ func (x *DBSettlementMonth) GetChannelid() string {
 	return ""
 }
 
-func (x *DBSettlementMonth) GetOrderCount() int64 {
+func (x *DBSettlementMonth) GetBatchno() string {
 	if x != nil {
-		return x.OrderCount
+		return x.Batchno
 	}
-	return 0
+	return ""
 }
 
-func (x *DBSettlementMonth) GetBaseAmount() int64 {
+func (x *DBSettlementMonth) GetProductid() uint32 {
 	if x != nil {
-		return x.BaseAmount
+		return x.Productid
 	}
 	return 0
 }
 
-func (x *DBSettlementMonth) GetBrandRate() int32 {
+func (x *DBSettlementMonth) GetOrderCount() int64 {
 	if x != nil {
-		return x.BrandRate
+		return x.OrderCount
 	}
 	return 0
 }
 
-func (x *DBSettlementMonth) GetBrandGross() int64 {
+func (x *DBSettlementMonth) GetBaseAmount() int64 {
 	if x != nil {
-		return x.BrandGross
+		return x.BaseAmount
 	}
 	return 0
 }
@@ -1793,13 +1804,6 @@ func (x *DBSettlementMonth) GetChannelAmount() int64 {
 	return 0
 }
 
-func (x *DBSettlementMonth) GetBrandNet() int64 {
-	if x != nil {
-		return x.BrandNet
-	}
-	return 0
-}
-
 func (x *DBSettlementMonth) GetPlatformAmount() int64 {
 	if x != nil {
 		return x.PlatformAmount
@@ -1844,21 +1848,34 @@ func (x *DBSettlementMonth) GetRemark() string {
 
 // 生产批次（每次生产一条，记录产品/时间/数量/序号区间/MAC区间；替代原出货单）
 type DBProductionBatch struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Id            uint32                 `protobuf:"varint,1,opt,name=id,proto3" json:"id" gorm:"id;primaryKey;autoIncrement"`                   //@go_tags(`gorm:"id;primaryKey;autoIncrement" json:"id"`) 批次id
-	Ts            int64                  `protobuf:"varint,2,opt,name=ts,proto3" json:"ts" gorm:"ts;index"`                   //@go_tags(`gorm:"ts;index" json:"ts"`) 生产时间戳
-	Brandid       uint32                 `protobuf:"varint,3,opt,name=brandid,proto3" json:"brandid" gorm:"brandid;index"`         //@go_tags(`gorm:"brandid;index" json:"brandid"`) 品牌商id
-	Productid     uint32                 `protobuf:"varint,4,opt,name=productid,proto3" json:"productid" gorm:"productid;index"`     //@go_tags(`gorm:"productid;index" json:"productid"`) 产品id
-	Serialstart   int64                  `protobuf:"varint,5,opt,name=serialstart,proto3" json:"serialstart" gorm:"serialstart"` //@go_tags(`gorm:"serialstart" json:"serialstart"`) 序号区间起
-	Serialend     int64                  `protobuf:"varint,6,opt,name=serialend,proto3" json:"serialend" gorm:"serialend"`     //@go_tags(`gorm:"serialend" json:"serialend"`) 序号区间止
-	Startmac      string                 `protobuf:"bytes,7,opt,name=startmac,proto3" json:"startmac" gorm:"startmac:50"`        //@go_tags(`gorm:"startmac:50" json:"startmac"`) 开始设备地址
-	Endmac        string                 `protobuf:"bytes,8,opt,name=endmac,proto3" json:"endmac" gorm:"endmac:50"`            //@go_tags(`gorm:"endmac:50" json:"endmac"`) 结束设备地址
-	Devicenum     uint32                 `protobuf:"varint,9,opt,name=devicenum,proto3" json:"devicenum" gorm:"devicenum"`     //@go_tags(`gorm:"devicenum" json:"devicenum"`) 设备数量
-	Batchno       string                 `protobuf:"bytes,10,opt,name=batchno,proto3" json:"batchno" gorm:"batchno;size:16;uniqueIndex"`         //@go_tags(`gorm:"batchno;size:16;uniqueIndex" json:"batchno"`) 可读批次号(短码,全局唯一)
-	Remark        string                 `protobuf:"bytes,11,opt,name=remark,proto3" json:"remark" gorm:"remark"`           //@go_tags(`gorm:"remark" json:"remark"`) 备注
-	Channelid     string                 `protobuf:"bytes,12,opt,name=channelid,proto3" json:"channelid" gorm:"channelid;size:16;index"`     //@go_tags(`gorm:"channelid;size:16;index" json:"channelid"`) 渠道商id(短码,空=未分配渠道)
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
+	state       protoimpl.MessageState `protogen:"open.v1"`
+	Id          uint32                 `protobuf:"varint,1,opt,name=id,proto3" json:"id" gorm:"id;primaryKey;autoIncrement"`                   //@go_tags(`gorm:"id;primaryKey;autoIncrement" json:"id"`) 批次id
+	Ts          int64                  `protobuf:"varint,2,opt,name=ts,proto3" json:"ts" gorm:"ts;index"`                   //@go_tags(`gorm:"ts;index" json:"ts"`) 生产时间戳
+	Brandid     uint32                 `protobuf:"varint,3,opt,name=brandid,proto3" json:"brandid" gorm:"brandid;index"`         //@go_tags(`gorm:"brandid;index" json:"brandid"`) 品牌商id
+	Productid   uint32                 `protobuf:"varint,4,opt,name=productid,proto3" json:"productid" gorm:"productid;index"`     //@go_tags(`gorm:"productid;index" json:"productid"`) 产品id
+	Serialstart int64                  `protobuf:"varint,5,opt,name=serialstart,proto3" json:"serialstart" gorm:"serialstart"` //@go_tags(`gorm:"serialstart" json:"serialstart"`) 序号区间起
+	Serialend   int64                  `protobuf:"varint,6,opt,name=serialend,proto3" json:"serialend" gorm:"serialend"`     //@go_tags(`gorm:"serialend" json:"serialend"`) 序号区间止
+	Startmac    string                 `protobuf:"bytes,7,opt,name=startmac,proto3" json:"startmac" gorm:"startmac:50"`        //@go_tags(`gorm:"startmac:50" json:"startmac"`) 开始设备地址
+	Endmac      string                 `protobuf:"bytes,8,opt,name=endmac,proto3" json:"endmac" gorm:"endmac:50"`            //@go_tags(`gorm:"endmac:50" json:"endmac"`) 结束设备地址
+	Devicenum   uint32                 `protobuf:"varint,9,opt,name=devicenum,proto3" json:"devicenum" gorm:"devicenum"`     //@go_tags(`gorm:"devicenum" json:"devicenum"`) 设备数量
+	Batchno     string                 `protobuf:"bytes,10,opt,name=batchno,proto3" json:"batchno" gorm:"batchno;size:16;uniqueIndex"`         //@go_tags(`gorm:"batchno;size:16;uniqueIndex" json:"batchno"`) 可读批次号(短码,全局唯一)
+	Remark      string                 `protobuf:"bytes,11,opt,name=remark,proto3" json:"remark" gorm:"remark"`           //@go_tags(`gorm:"remark" json:"remark"`) 备注
+	Channelid   string                 `protobuf:"bytes,12,opt,name=channelid,proto3" json:"channelid" gorm:"channelid;size:16;index"`     //@go_tags(`gorm:"channelid;size:16;index" json:"channelid"`) 渠道商id(短码,空=未分配渠道)
+	// 这批货由哪家代工厂生产（oem_factory.id，0=未指定）。与 brandid「挂谁的牌子卖」是两回事：
+	// 同一品牌可以换厂、同一家厂也给多个品牌代工，故独立成维度。存量批次为 0（当时还没有工厂档案）。
+	Factoryid uint32 `protobuf:"varint,13,opt,name=factoryid,proto3" json:"factoryid" gorm:"factoryid;index"` //@go_tags(`gorm:"factoryid;index" json:"factoryid"`) 代工厂id(0=未指定)
+	// 这一批货给渠道商的分成比例（万分比，0~10000）。放在批次而不是渠道商上：
+	// 同一家渠道商不同批次谈的比例可能不同，挂在渠道商上只能存一个值。
+	// ⚠️ 生产时冻结，事后改批次比例不影响已算完的结算单。
+	Sharerate int32 `protobuf:"varint,14,opt,name=sharerate,proto3" json:"sharerate" gorm:"sharerate"` //@go_tags(`gorm:"sharerate" json:"sharerate"`) 本批次渠道分成比例(万分比)
+	// 这一批设备的「绑定赠送」。放在批次而不是产品上：同一款产品不同批次（不同渠道/不同活动）
+	// 送的东西经常不一样，挂在产品上只能存一套，改一次会连带改掉已发出去的货的权益。
+	// 绑定时按设备所属批次发放，批次三项全为 0 才回退到产品上的旧字段（见 api_binddevice.go）。
+	Rewardvip       uint32 `protobuf:"varint,15,opt,name=rewardvip,proto3" json:"rewardvip" gorm:"rewardvip"`             //@go_tags(`gorm:"rewardvip" json:"rewardvip"`) 绑定赠送VIP天数(0=不送)
+	Rewardtranslate uint32 `protobuf:"varint,16,opt,name=rewardtranslate,proto3" json:"rewardtranslate" gorm:"rewardtranslate"` //@go_tags(`gorm:"rewardtranslate" json:"rewardtranslate"`) 绑定赠送翻译时长(分钟,0=不送)
+	Rewardmeeting   uint32 `protobuf:"varint,17,opt,name=rewardmeeting,proto3" json:"rewardmeeting" gorm:"rewardmeeting"`     //@go_tags(`gorm:"rewardmeeting" json:"rewardmeeting"`) 绑定赠送会议时长(分钟,0=不送)
+	unknownFields   protoimpl.UnknownFields
+	sizeCache       protoimpl.SizeCache
 }
 
 func (x *DBProductionBatch) Reset() {
@@ -1975,6 +1992,41 @@ func (x *DBProductionBatch) GetChannelid() string {
 	return ""
 }
 
+func (x *DBProductionBatch) GetFactoryid() uint32 {
+	if x != nil {
+		return x.Factoryid
+	}
+	return 0
+}
+
+func (x *DBProductionBatch) GetSharerate() int32 {
+	if x != nil {
+		return x.Sharerate
+	}
+	return 0
+}
+
+func (x *DBProductionBatch) GetRewardvip() uint32 {
+	if x != nil {
+		return x.Rewardvip
+	}
+	return 0
+}
+
+func (x *DBProductionBatch) GetRewardtranslate() uint32 {
+	if x != nil {
+		return x.Rewardtranslate
+	}
+	return 0
+}
+
+func (x *DBProductionBatch) GetRewardmeeting() uint32 {
+	if x != nil {
+		return x.Rewardmeeting
+	}
+	return 0
+}
+
 // 工厂产品
 type DBProduct struct {
 	state                  protoimpl.MessageState `protogen:"open.v1"`
@@ -2018,14 +2070,29 @@ type DBProduct struct {
 	// 产品归属的应用（应用中心 app_product.name，如 Voitrans,Lumi），CSV 可多选、空=未绑定。
 	// 品牌商/渠道商账号的「应用」下拉即由本字段推导：只列出自己品牌名下产品绑定过的应用。
 	Appnames string `protobuf:"bytes,35,opt,name=appnames,proto3" json:"appnames" gorm:"appnames;size:255"` //@go_tags(`gorm:"appnames;size:255" json:"appnames"`) 绑定应用名CSV(空=未绑定)
-	// 产品用的是哪套芯片方案（DBSolutionProvider.id）。生产设备码时的服务ID(CID)直接取这里——
+	// 产品用的是哪套芯片方案（DBSolutionProvider.id），也就是**方案ID(BID)**。
+	// 三个烧进固件的标识口径固定：CID=芯片公司(chip_vendor.id) / BID=方案公司(本字段) / PID=产品(本表 id)；
+	// CID 由本字段 → solution_provider.vendor 推出，不在产品上另存（另存会在方案商换芯片时变成对不上的旧值）。
 	// 以前从品牌商推导，但同一品牌的不同产品可能用不同方案商的方案，推导会串号，故改为产品级绑定，新建产品必填。
 	Providerid uint32 `protobuf:"varint,36,opt,name=providerid,proto3" json:"providerid" gorm:"providerid;index"` //@go_tags(`gorm:"providerid;index" json:"providerid"`) 归属方案商id(CID)
 	Createtime int64  `protobuf:"varint,37,opt,name=createtime,proto3" json:"createtime" gorm:"createtime"` //@go_tags(`gorm:"createtime" json:"createtime"`) 创建时间(秒);历史产品为0
 	// 产品说明：这款产品是什么、有什么特性，给后台运营与客户看的，与版本更新说明(updatedescription)无关。
-	Description   string `protobuf:"bytes,38,opt,name=description,proto3" json:"description" gorm:"description"` //@go_tags(`gorm:"description" json:"description"`) 产品说明(特性描述)
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
+	Description string `protobuf:"bytes,38,opt,name=description,proto3" json:"description" gorm:"description"` //@go_tags(`gorm:"description" json:"description"`) 产品说明(特性描述)
+	// 这款产品由哪家代工厂生产（oem_factory.id，0=未指定）。产品级是「默认由谁生产」，
+	// 生产批次上还有一个 factoryid，那个是「这一批实际由谁生产」——换厂时批次能覆盖，产品不用改。
+	// ⚠️ 字段名不能叫 factoryid：上面 34 号已被【老客户端兼容字段】占着，那个 factoryid 是
+	// 「厂家→品牌商」改名前老 App 解析用的，值恒等于 brandid、由 user 模块读取层填充，
+	// 复用它会让代工厂 id 被 brandid 覆盖掉。
+	// 注意芯片没有产品级字段：芯片由 providerid → solution_provider.vendor 推导，
+	// 存一份到产品上会在方案商换芯片时变成对不上的旧值，而 CID 是要烧进固件的。
+	Oemfactoryid uint32 `protobuf:"varint,39,opt,name=oemfactoryid,proto3" json:"oemfactoryid" gorm:"oemfactoryid;index"` //@go_tags(`gorm:"oemfactoryid;index" json:"oemfactoryid"`) 代工厂id(0=未指定)
+	// 固件升级判定放宽：开着时「设备版本 != 服务端版本」就允许升级，而不是只允许升到更高版本。
+	// 给开发/测试环境用——测试机的固件常常比后台挂的还新，按「更高才升级」会永远点不动升级按钮，
+	// 也没法把耳机刷回旧固件反复验证 OTA 流程。
+	// ⚠️ 正式产品别开：一次配置失误（比如后台挂了个旧版固件）就会把全量用户降级。
+	Updateonmismatch bool `protobuf:"varint,40,opt,name=updateonmismatch,proto3" json:"updateonmismatch" gorm:"updateonmismatch"` //@go_tags(`gorm:"updateonmismatch" json:"updateonmismatch"`) 版本不一致即可升级(开发用,默认关)
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *DBProduct) Reset() {
@@ -2317,6 +2384,20 @@ func (x *DBProduct) GetDescription() string {
 	return ""
 }
 
+func (x *DBProduct) GetOemfactoryid() uint32 {
+	if x != nil {
+		return x.Oemfactoryid
+	}
+	return 0
+}
+
+func (x *DBProduct) GetUpdateonmismatch() bool {
+	if x != nil {
+		return x.Updateonmismatch
+	}
+	return false
+}
+
 type DBProductVersion struct {
 	state                protoimpl.MessageState `protogen:"open.v1"`
 	Id                   uint32                 `protobuf:"varint,1,opt,name=id,proto3" json:"id" gorm:"id;primaryKey;autoIncrement"`                                    //@go_tags(`gorm:"id;primaryKey;autoIncrement" json:"id"`) 版本id
@@ -3814,29 +3895,25 @@ const file_db_proto_rawDesc = "" +
 	"\n" +
 	"updatetime\x18\x0e \x01(\x03R\n" +
 	"updatetime\x12\x1a\n" +
-	"\bofficial\x18\x0f \x01(\bR\bofficial\"\x8c\x04\n" +
+	"\bofficial\x18\x0f \x01(\bR\bofficial\"\xe5\x03\n" +
 	"\x11DBSettlementMonth\x12\x16\n" +
-	"\x06period\x18\x01 \x01(\rR\x06period\x12\x18\n" +
-	"\abrandid\x18\x02 \x01(\rR\abrandid\x12\x1c\n" +
-	"\tchannelid\x18\x03 \x01(\tR\tchannelid\x12\x1f\n" +
+	"\x06period\x18\x01 \x01(\rR\x06period\x12\x1c\n" +
+	"\tchannelid\x18\x03 \x01(\tR\tchannelid\x12\x18\n" +
+	"\abatchno\x18\x11 \x01(\tR\abatchno\x12\x1c\n" +
+	"\tproductid\x18\x12 \x01(\rR\tproductid\x12\x1f\n" +
 	"\vorder_count\x18\x04 \x01(\x03R\n" +
 	"orderCount\x12\x1f\n" +
 	"\vbase_amount\x18\x05 \x01(\x03R\n" +
-	"baseAmount\x12\x1d\n" +
-	"\n" +
-	"brand_rate\x18\x06 \x01(\x05R\tbrandRate\x12\x1f\n" +
-	"\vbrand_gross\x18\a \x01(\x03R\n" +
-	"brandGross\x12!\n" +
+	"baseAmount\x12!\n" +
 	"\fchannel_rate\x18\b \x01(\x05R\vchannelRate\x12%\n" +
-	"\x0echannel_amount\x18\t \x01(\x03R\rchannelAmount\x12\x1b\n" +
-	"\tbrand_net\x18\n" +
-	" \x01(\x03R\bbrandNet\x12'\n" +
+	"\x0echannel_amount\x18\t \x01(\x03R\rchannelAmount\x12'\n" +
 	"\x0fplatform_amount\x18\v \x01(\x03R\x0eplatformAmount\x12\x16\n" +
 	"\x06status\x18\f \x01(\x05R\x06status\x12\x19\n" +
 	"\bgen_time\x18\r \x01(\x03R\agenTime\x12'\n" +
 	"\x0fconfirm_account\x18\x0e \x01(\tR\x0econfirmAccount\x12!\n" +
 	"\fconfirm_time\x18\x0f \x01(\x03R\vconfirmTime\x12\x16\n" +
-	"\x06remark\x18\x10 \x01(\tR\x06remark\"\xcd\x02\n" +
+	"\x06remark\x18\x10 \x01(\tR\x06remarkJ\x04\b\x02\x10\x03J\x04\b\x06\x10\aJ\x04\b\a\x10\bJ\x04\b\n" +
+	"\x10\v\"\xf7\x03\n" +
 	"\x11DBProductionBatch\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\rR\x02id\x12\x0e\n" +
 	"\x02ts\x18\x02 \x01(\x03R\x02ts\x12\x18\n" +
@@ -3850,8 +3927,12 @@ const file_db_proto_rawDesc = "" +
 	"\abatchno\x18\n" +
 	" \x01(\tR\abatchno\x12\x16\n" +
 	"\x06remark\x18\v \x01(\tR\x06remark\x12\x1c\n" +
-	"\tchannelid\x18\f \x01(\tR\tchannelid\"\xe6\n" +
-	"\n" +
+	"\tchannelid\x18\f \x01(\tR\tchannelid\x12\x1c\n" +
+	"\tfactoryid\x18\r \x01(\rR\tfactoryid\x12\x1c\n" +
+	"\tsharerate\x18\x0e \x01(\x05R\tsharerate\x12\x1c\n" +
+	"\trewardvip\x18\x0f \x01(\rR\trewardvip\x12(\n" +
+	"\x0frewardtranslate\x18\x10 \x01(\rR\x0frewardtranslate\x12$\n" +
+	"\rrewardmeeting\x18\x11 \x01(\rR\rrewardmeeting\"\xb6\v\n" +
 	"\tDBProduct\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\rR\x02id\x12\x18\n" +
 	"\abrandid\x18\x02 \x01(\rR\abrandid\x12+\n" +
@@ -3900,7 +3981,9 @@ const file_db_proto_rawDesc = "" +
 	"\n" +
 	"createtime\x18% \x01(\x03R\n" +
 	"createtime\x12 \n" +
-	"\vdescription\x18& \x01(\tR\vdescription\"\xb0\x01\n" +
+	"\vdescription\x18& \x01(\tR\vdescription\x12\"\n" +
+	"\foemfactoryid\x18' \x01(\rR\foemfactoryid\x12*\n" +
+	"\x10updateonmismatch\x18( \x01(\bR\x10updateonmismatch\"\xb0\x01\n" +
 	"\x10DBProductVersion\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\rR\x02id\x12\x1c\n" +
 	"\tproductid\x18\x02 \x01(\rR\tproductid\x12\x18\n" +
diff --git a/apps/services/services/console/conf/console.yaml b/apps/services/services/console/conf/console.yaml
index b85da083..743eb4ef 100644
--- a/apps/services/services/console/conf/console.yaml
+++ b/apps/services/services/console/conf/console.yaml
@@ -10,7 +10,7 @@ sys:
     IsDebug: true
 
   postgres:
-    Dsn: "postgresql://postgres.zqwfawlmlxjpgqlyigii:li13451234&&wei@aws-1-us-west-2.pooler.supabase.com:6543/postgres?sslmode=require"
+    Dsn: "postgresql://admin:li13451234@8.133.166.29:5432/starpivot_console?sslmode=disable"  # 阿龙测试机 console 主库（原云雁 Supabase 已移除，勿改回）
 
   redis:
     Addr: ["127.0.0.1:6379"]
diff --git a/apps/services/utils/devcode/devcode.go b/apps/services/utils/devcode/devcode.go
new file mode 100644
index 00000000..39de01bf
--- /dev/null
+++ b/apps/services/utils/devcode/devcode.go
@@ -0,0 +1,35 @@
+// Package devcode 设备码解析：从一条「设备码」反推出它属于哪个产品(PID)。
+//
+// **设备码就是 MAC**（2026-09-02 起）。此前还有一种 20 字符的 license 串形态，
+// 与 MAC 并存指向同一台设备；那套已整体移除（utils/license 包已删除），
+// 库里的存量 license 码也已就地改写成对应的 MAC。
+//
+// MAC 的前 2 字节就是 PID（见 utils/mac），所以「这台设备属于哪个产品」不需要查库。
+//
+// ⚠️ 存在的理由是「别再写 `解析失败就回退写死 pid` 那种代码」：回退到一个固定 PID
+// 会静默去查错误的 license_<pid> 分表，解绑/重置看起来成功、实际什么都没改。
+// 解不出就返回错误，让调用方报出来。
+package devcode
+
+import (
+	"strings"
+
+	"yunyan/utils/mac"
+)
+
+// ProductID 从设备码(MAC)解析出 PID。
+func ProductID(code string) (uint16, error) {
+	pid, _, err := mac.Parse(strings.TrimSpace(code))
+	return pid, err
+}
+
+// NormalizeMac 把用户输入的 MAC 规范成落库形态：大写、冒号分隔。
+// 解析不了则返回 ok=false —— MAC 现在是授权码分表的主键，也是绑定时精确匹配的键，
+// 格式不一致会让同一台设备存成两行、也会让按 MAC 反查绑定的路径查不到。
+func NormalizeMac(s string) (string, bool) {
+	pid, serial, err := mac.Parse(strings.TrimSpace(s))
+	if err != nil {
+		return "", false
+	}
+	return mac.Generate(pid, serial), true
+}
diff --git a/apps/services/utils/devcode/devcode_test.go b/apps/services/utils/devcode/devcode_test.go
new file mode 100644
index 00000000..d7423fd6
--- /dev/null
+++ b/apps/services/utils/devcode/devcode_test.go
@@ -0,0 +1,42 @@
+package devcode
+
+import "testing"
+
+func TestProductID(t *testing.T) {
+	// MAC 形态：PID 编在前两字节，带不带冒号都要认
+	if pid, err := ProductID("B0:23:00:00:00:01"); err != nil || pid != 0xB023 {
+		t.Fatalf("带冒号 MAC: pid=%X err=%v", pid, err)
+	}
+	if pid, err := ProductID("B023000000AB"); err != nil || pid != 0xB023 {
+		t.Fatalf("不带冒号 MAC: pid=%X err=%v", pid, err)
+	}
+	// 已废弃的 license 串形态：必须报错而不是解出个 PID 来。
+	// 这两种串长度都是 20，若哪天有人把 license 逻辑加回来，这条会先炸。
+	if _, err := ProductID("71E5E5C3A797C043B5A7"); err == nil {
+		t.Fatal("license 串应当解析失败（授权码已移除）")
+	}
+	if _, err := ProductID("nonsense"); err == nil {
+		t.Fatal("垃圾输入应该报错")
+	}
+}
+
+// 客户端送上来的各种写法都要能规范化成落库形态（大写+冒号），
+// 这是「后台看到的 MAC == 客户端校验用的 MAC」的前提。
+func TestNormalizeMatchesStoredForm(t *testing.T) {
+	const stored = "B0:23:00:00:00:AB"
+	for _, in := range []string{
+		"B0:23:00:00:00:AB", // Android BluetoothDevice.getAddress() 的原样
+		"b0:23:00:00:00:ab", // 小写
+		"B023000000AB",      // 无冒号
+		"b023000000ab",
+		" B0:23:00:00:00:AB ",
+	} {
+		got, ok := NormalizeMac(in)
+		if !ok || got != stored {
+			t.Fatalf("NormalizeMac(%q) = %q,%v；期望 %q", in, got, ok, stored)
+		}
+	}
+	if _, ok := NormalizeMac("ZZ:ZZ"); ok {
+		t.Fatal("非法 MAC 应该 ok=false")
+	}
+}
diff --git a/apps/services/utils/license/README.md b/apps/services/utils/license/README.md
deleted file mode 100644
index 8f7bab10..00000000
--- a/apps/services/utils/license/README.md
+++ /dev/null
@@ -1,208 +0,0 @@
-# 授权码 v2 改造方案（序号按产品累加 + 独立批次表）
-
-状态：**已设计、编解码已落地、业务改造未动工**。等待择期开工。
-
-## 一、问题
-
-现有授权码把序号切成 `批次(8位) + 批内序号(20位)`：
-
-- 批次 `probatch` 是 `factory` 级计数器，每次生产 `++`，**上限 255**，用尽即废。
-- 序号按批次重置，导致"序号"没有产品级全局意义。
-- 批次作为授权码的一个**编码字段**存在，而它本该是一条独立的生产记录。
-
-目标：序号按产品累加、占满 `uint32`；批次独立成表，主键用可读短码，无数量上限。
-
-## 二、关键发现（决定了迁移代价）
-
-### 1. `batch` 和 `serial` 在比特层面本来就是同一个连续整数
-
-`comm/core.go` 的 v1 编码：
-
-```go
-data2 := (int(batchNumber) << 8) | (int(serialNumber>>12) & 0xFF)   // 段2
-data3 := (int(serialNumber>>0) & 0xFFF)                             // 段3
-```
-
-令 `gs = batch<<20 | serial`（28 位），则 `gs>>12 & 0xFFFF ≡ data2`、`gs & 0xFFF ≡ data3`。
-**逐位恒等**（1400 组穷举验证零差异）。所以 v1 的"批次+批内序号"就是一个 28 位序号的高 8 位 / 低 20 位拆分。
-
-### 2. `batch` / `serial` 从未被业务消费
-
-`ValidateLicense` 的全部 4 个调用点都是 `pid, _, _, err`：
-
-| 调用点 | 用途 |
-|---|---|
-| `modules/user/api_binddevice.go:79` | 取 pid 定位 `license_<pid_hex>` 分表 |
-| `modules/user/api_unbinddevice.go:40` | 同上 |
-| `modules/api/api_batchresetlicensestatus.go:23` | 同上 |
-| `modules/console/api_device.go:386` | 同上 |
-
-真正的校验是拿 `code` 主键查表。**重定义 batch/serial 的语义，后端零业务影响。**
-
-### 3. `productid` 在 v1/v2 中位置相同
-
-`productid` 独占段1（第 5-8 个 hex 字符），不参与版本判别。因此新旧码混存期间，
-`license.ProductID()` 恒可用，`binddevice` 等路径零风险。
-
-## 三、v2 设计
-
-码长不变：**10 字节 = 20 个 hex 字符 = 5 段 × 4 字符**。段0 是随机种子，段1-4 是被种子派生的
-混淆序列异或过的数据。
-
-逻辑布局（**异或前**。密文经混淆后不可肉眼分辨版本）：
-
-```
-hex位  1-4    5-8         9              10-12          13-16        17         18-20
-v1     seed   productid   probatch高4位   probatch低4位   随机4位       随机       随机
-                                         +序号高8位      +序号低12位
-v2     seed   productid   0xF(标记)       序号[31:20]     序号[19:4]   序号[3:0]  随机
-```
-
-- 第 9 个 hex 字符是**版本判别位**：v1 存 `probatch>>4`，v2 恒为 `0xF`。
-- 序号占 `3+4+1 = 8` 个 hex 字符 = **完整 uint32**（0 ~ 4,294,967,295）。
-- 随机填充从 5 个 hex 字符缩到 3 个，**不损失安全性**：那些位本就由 seed 派生
-  （`rng.Intn(65536)`），不是独立熵。码的唯一性照旧，`code ↔ (seed, pid, serial)` 仍是双射。
-
-### 硬前提：历史 `probatch` 必须全部 < 240（`0xF0`）
-
-判别位是 `probatch >> 4`。若历史上存在 `probatch ∈ [240, 255]` 的批次，那些 v1 码会被
-**误判为 v2**，序号解出垃圾。
-
-- 用户已口头确认"肯定 < 240"（`probatch` 是每次生产 +1 的计数器，实际值很小）。
-- **未经生产库验证**。迁移脚本第一道闸必须是 `MAX(probatch) >= 240 则中止`，fail-closed。
-- `utils/license` 的 `TestParse_V1OverLimitIsMisdetected` 已把这条约束钉进代码：它断言
-  `batch >= 240` 的 v1 码**确实会**被误判。判别位若挪位置，该测试立刻失败。
-
-### 为什么不选 24 位方案
-
-曾考虑 `gs = 0xF<<24 | serial(24位)`，空间 1677 万/产品，解码路径不分叉（新老共用一个公式）。
-最终选 32 位，因为代价近乎为零（只多一个 `if` 分支），且彻底消除天花板焦虑。
-
-`0xF` 标记的另一层价值：它让**将来扩容成为安全操作**。授权码里仍有 3 个 hex 字符的随机填充，
-真不够时可以约定"带标记的码才读那些位"，老码不受影响。
-
-## 四、新序号空间与老码物理隔离
-
-v2 序号从 **1 开始**，不需要扫描老数据算起点——因为版本由标记位区分，不靠数值区间区分。
-
-由此，两条历史风险被自动消解：
-
-1. **老码撞号**（`(probatch, number)` 可能因 `api_updatefactory` 旧版把 `probatch` 重置为 0 而重复，
-   见 `modules/api/model_test.go` 的 `Test_RebuildFactoryProbatch` 注释）——不再要紧，老码不回填 `serialno`。
-2. **pid 解析不依赖判别位**——混存期零风险。
-
-## 五、已完成
-
-`apps/services/utils/license/`（自包含，只依赖标准库）：
-
-| 符号 | 说明 |
-|---|---|
-| `GenerateV2(productid uint16, serial uint32)` | 生成 v2 码 |
-| `Parse(code) (*Info, error)` | 自动识别 v1/v2 |
-| `ProductID(code) (uint16, error)` | 不判版本、不校验批次，混存期恒可用 |
-| `V1ProbatchLimit = 0xF0` | 迁移闸门常量 |
-
-6 个测试全绿，含：真实老码样本 `0D82F1CCD83D72B78FA9` → `pid=45069 batch=1 serial=260`；
-v2 往返覆盖 `0xFFFFFFFF`；`batch ∈ [1,239] × 6 种 serial` 共 1434 组 v1 码零误判；
-2 万个连续序号零碰撞。
-
-**尚未接入任何业务代码**，`comm.GenerateLicense/ValidateLicense` 原样保留，线上零影响。
-
-## 六、待做
-
-### 第一步（线上安全，老数据一行不动）
-
-1. **proto + pb 重生成**
-   - 新增 `DBFactoryBatch`（见下方 DDL）
-   - `DBFactoryDevics` 加 `codever` / `serialno` / `batchcode`
-   - `DBProduct` 加 `serialcursor`
-   - ⚠ 本仓库无 pb 生成脚本。需 `protoc --go_out=pb --go_opt=paths=import -I ../proto ../proto/db.proto`，
-     再复刻源项目 `deep_server_up/pb.py` 的 `@go_tags` 注入——protoc 会把 json tag 重置成
-     `,omitempty` 并丢掉 gorm tag，不注入回去 DB 层会全线失效
-
-2. **批次短码**：6 位，复用 `comm.GeneratePublicCode` 的字符集（去除易混的 `0/O/I/1`，32 字符集
-   → 10.7 亿空间）。唯一索引 + 冲突重试。
-
-3. **生成逻辑改造**（两处：`modules/api/api_createfactorydevics.go`、`modules/console/api_device.go`）
-   - 原子分配序号区间，顺手修掉现在 `modelFactory.Probatch++` 的读-改-写竞态：
-     ```sql
-     UPDATE product SET serialcursor = serialcursor + $1 WHERE id = $2 RETURNING serialcursor;
-     -- 区间 = [ret - N + 1, ret]
-     ```
-   - 建批次行，license 行写 `codever=2, serialno, batchcode`
-   - ⚠ MAC 侧本期不动，`GenerateCustomMAC` 仍吃 `probatch`，故 `factory.probatch` **仍需继续自增**
-
-4. **调用点切换**：4 处 `comm.ValidateLicense` → `license.ProductID`；之后删除
-   `comm.GenerateLicense` / `comm.ValidateLicense`（`comm` 是共享配置与对象，不放算法实现）
-
-### 第二步（历史归档，可延后，失败不影响线上）
-
-5. **迁移 SQL**。第一道闸：
-   ```sql
-   -- 对每张 license_<pid_hex> 分表执行，任一命中即中止整个迁移
-   SELECT count(*) FROM license_b00d WHERE probatch >= 240;   -- 必须为 0
-   ```
-   加列（Postgres 无 uint32，序号列必须 `BIGINT`，`INT` 放不下 `0xFFFFFFFF`）：
-   ```sql
-   ALTER TABLE license_<pid_hex> ADD COLUMN IF NOT EXISTS codever   SMALLINT   NOT NULL DEFAULT 0;
-   ALTER TABLE license_<pid_hex> ADD COLUMN IF NOT EXISTS serialno  BIGINT     NOT NULL DEFAULT 0;
-   ALTER TABLE license_<pid_hex> ADD COLUMN IF NOT EXISTS batchcode VARCHAR(8) NOT NULL DEFAULT '';
-   CREATE INDEX IF NOT EXISTS idx_<pid>_batchcode ON license_<pid_hex>(batchcode);
-   -- 只对 v2 行要求序号唯一（老码 serialno 恒为 0）
-   CREATE UNIQUE INDEX IF NOT EXISTS uq_<pid>_serialno ON license_<pid_hex>(serialno) WHERE codever = 2;
-
-   ALTER TABLE product ADD COLUMN IF NOT EXISTS serialcursor BIGINT NOT NULL DEFAULT 0;
-   ```
-   批次表：
-   ```sql
-   CREATE TABLE factory_batch (
-     batchcode      VARCHAR(8) PRIMARY KEY,          -- 6 位可读短码
-     factoryid      INT      NOT NULL,
-     productid      INT      NOT NULL,
-     serialstart    BIGINT   NOT NULL,
-     serialend      BIGINT   NOT NULL,
-     devicenum      INT      NOT NULL,
-     codever        SMALLINT NOT NULL DEFAULT 2,     -- 1=从 deliverynote 迁入的历史批次
-     legacyprobatch INT      NOT NULL DEFAULT 0,     -- v1 批次号，v2 为 0
-     ts             BIGINT   NOT NULL,
-     remark         TEXT
-   );
-   CREATE INDEX idx_factory_batch_fp ON factory_batch(factoryid, productid);
-   ```
-
-6. **历史批次导入**（需 Go 工具，短码要程序生成）：
-   `factory_deliverynote` 每行 = 一次生产 = 一个批次。序号区间按 v1 语义还原为
-   `[probatch<<20 | 1, probatch<<20 | devicetnum]`，`codever=1`、`legacyprobatch=probatch`。
-
-7. **老 license 行回填 `batchcode`**：
-   ```sql
-   UPDATE license_<pid_hex> l SET batchcode = b.batchcode
-   FROM factory_batch b
-   WHERE b.codever = 1 AND b.legacyprobatch = l.probatch
-     AND b.factoryid = l.factoryid AND b.productid = <pid>;
-   ```
-   ⚠ 依赖 `(factoryid, probatch)` 唯一。若 `probatch` 重置 bug 留过疤，同一厂家会有两次生产复用
-   同一 `probatch`，此处会归错批次，需改用 `createtime` vs `deliverynote.ts` 的时间窗辅助拆分。
-   **迁移前应先跑体检**：
-   ```sql
-   SELECT factoryid, probatch, count(*) FROM factory_deliverynote GROUP BY 1,2 HAVING count(*) > 1;
-   ```
-   老码 `serialno` 保持 0、`codever` 保持 0，不做回填——v1 序号没有产品级全局意义。
-
-8. **前端**：`apps/admin/app/pages/factory.vue` / `device.vue` 的批次展示改为序号区间 + 批次短码。
-
-## 七、本期不做
-
-- **`GenerateCustomMAC` / CMEI**（用户明确"先别急着动"）。MAC 侧同样是 `batch(8) + serial(24)`，
-  255 上限仍在。合并成 32 位全局序号时老 MAC 逐位不变，但
-  `modules/user/api_binddevice.go:133` 的 CMEI 取 `mac[2]` 当批次段、`mac[4..5]` 当序号段，
-  中间的 `mac[3]` 不参与——序号连续累加后 CMEI 会在 65536 个之后碰撞。需先定 CMEI 新规则。
-- 32 位之外的扩容（吃掉剩余 3 个 hex 字符的随机填充）。`0xF` 标记已把这条路留好。
-
-## 八、未验证事项
-
-| 事项 | 状态 |
-|---|---|
-| 生产库 `MAX(probatch) < 240` | 用户口头确认，**未查库**。迁移脚本以 fail-closed 闸门兜底 |
-| `(factoryid, probatch)` 是否唯一 | **未查库**。只影响第二步历史归档，不影响新码 |
-| 固件/产测工具是否解析 batch/serial | 未确认。即便解析也安全：v2 序号单调递增，老规则解出的 `(batch, serial)` 组合同样单调、不重复 |
diff --git a/apps/services/utils/license/license.go b/apps/services/utils/license/license.go
deleted file mode 100644
index 267280cc..00000000
--- a/apps/services/utils/license/license.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Package license 授权码编解码。
-//
-// 授权码固定 10 字节（20 个 hex 字符），分 5 段：段0 是随机种子，段1-4 是被种子
-// 派生的混淆序列异或过的数据。码长与混淆结构在 v1/v2 之间保持不变。
-//
-// v1 把序号切成 批次(8位) + 批内序号(20位)，批次每次生产 +1、上限 255，用尽即废。
-// v2 取消批次字段，序号按产品累加、占满 32 位；批次改由独立的批次表承载。
-//
-// 逻辑布局（异或前。密文经混淆后不可肉眼分辨版本）：
-//
-//	hex位  1-4    5-8         9              10-12          13-16        17         18-20
-//	v1     seed   productid   probatch高4位   probatch低4位   随机4位       随机       随机
-//	                                         +序号高8位      +序号低12位
-//	v2     seed   productid   0xF(标记)       序号[31:20]     序号[19:4]   序号[3:0]  随机
-//
-// 第 9 个 hex 字符是版本判别位：v1 存 probatch>>4，历史 probatch 恒小于
-// V1ProbatchLimit，故不可能等于 v2 标记。productid 位于第 5-8 位，两版一致，
-// 因此提取 productid 无需先判版本（见 ProductID）。
-package license
-
-import (
-	cryptorand "crypto/rand"
-	"errors"
-	"fmt"
-	"math/rand"
-	"strconv"
-)
-
-const (
-	totalSegments = 5 // 5段，每段4字符 = 20字符 = 10字节
-	segmentLength = 4
-
-	// v2Tag v2 格式标记，占第 9 个 hex 字符
-	v2Tag = 0xF
-
-	// V1ProbatchLimit v1 批次号上界（不含）。历史 probatch 必须全部小于该值，
-	// 否则越界的 v1 码会在判别位上撞上 v2 标记而被误判为 v2。
-	// 迁移脚本必须先校验 MAX(probatch) < V1ProbatchLimit 再继续。
-	V1ProbatchLimit = 0xF0
-)
-
-// Version 授权码格式版本
-type Version uint8
-
-const (
-	V1 Version = 1 // 批次(8位) + 批内序号(20位)
-	V2 Version = 2 // 产品级全局序号(32位)
-)
-
-// Info 授权码解析结果
-type Info struct {
-	ProductID uint16  // 产品ID
-	Version   Version // 格式版本
-	Serial    uint32  // v2:产品级全局序号(32位)  v1:批内序号(20位)
-	Batch     byte    // 批次号，仅 v1 有效
-}
-
-// decode 拆出 5 个数据段，并用种子重建混淆序列。v1/v2 共用，不涉及版本判别。
-func decode(code string) (segments, confusion []int, err error) {
-	expectedLength := totalSegments * segmentLength
-	if len(code) != expectedLength {
-		return nil, nil, fmt.Errorf("授权码长度错误，期望%d字符，实际%d字符", expectedLength, len(code))
-	}
-	segments = make([]int, totalSegments)
-	for i := 0; i < totalSegments; i++ {
-		value, perr := strconv.ParseUint(code[i*segmentLength:(i+1)*segmentLength], 16, 32)
-		if perr != nil {
-			return nil, nil, fmt.Errorf("第%d段包含无效字符", i+1)
-		}
-		segments[i] = int(value)
-	}
-	rng := rand.New(rand.NewSource(int64(segments[0])))
-	confusion = make([]int, totalSegments-1)
-	for i := range confusion {
-		confusion[i] = rng.Intn(65536)
-	}
-	return segments, confusion, nil
-}
-
-// GenerateV2 生成 v2 授权码。
-// serial 为产品级全局序号，占满 uint32，按产品累加，不随批次重置。
-func GenerateV2(productid uint16, serial uint32) (string, error) {
-	seedBytes := make([]byte, 2)
-	if _, err := cryptorand.Read(seedBytes); err != nil {
-		return "", fmt.Errorf("生成随机种子失败: %v", err)
-	}
-	seed := int(seedBytes[0])<<8 | int(seedBytes[1])
-	rng := rand.New(rand.NewSource(int64(seed)))
-
-	confusion := make([]int, totalSegments-1)
-	for i := range confusion {
-		confusion[i] = rng.Intn(65536)
-	}
-
-	confusion[0] ^= int(productid)
-	confusion[1] ^= v2Tag<<12 | int(serial>>20)           // 标记 + 序号[31:20]
-	confusion[2] ^= int(serial>>4) & 0xFFFF               // 序号[19:4]
-	confusion[3] ^= int(serial&0xF)<<12 | rng.Intn(1<<12) // 序号[3:0] + 12位随机填充
-
-	code := fmt.Sprintf("%04X", seed)
-	for _, c := range confusion {
-		code += fmt.Sprintf("%04X", c)
-	}
-	return code, nil
-}
-
-// Parse 解析授权码，自动识别 v1/v2 格式
-func Parse(code string) (*Info, error) {
-	segments, confusion, err := decode(code)
-	if err != nil {
-		return nil, err
-	}
-
-	info := &Info{ProductID: uint16((segments[1] ^ confusion[0]) & 0xFFFF)}
-	data2 := segments[2] ^ confusion[1]
-	data3 := segments[3] ^ confusion[2]
-
-	if (data2>>12)&0xF == v2Tag {
-		data4 := segments[4] ^ confusion[3]
-		info.Version = V2
-		info.Serial = uint32(data2&0xFFF)<<20 | uint32(data3&0xFFFF)<<4 | uint32((data4>>12)&0xF)
-		return info, nil
-	}
-
-	info.Version = V1
-	info.Batch = byte((data2 >> 8) & 0xFF)
-	info.Serial = uint32(data2&0xFF)<<12 | uint32(data3&0xFFF)
-	if info.Batch < 1 {
-		return nil, errors.New("批次数据异常")
-	}
-	return info, nil
-}
-
-// ProductID 提取授权码中的产品ID。
-// productid 在 v1/v2 中位置相同，故不做版本判别、也不校验批次，
-// 新旧码混存期间恒可用（调用方通常只需要它来定位 license 分表）。
-func ProductID(code string) (uint16, error) {
-	segments, confusion, err := decode(code)
-	if err != nil {
-		return 0, err
-	}
-	return uint16((segments[1] ^ confusion[0]) & 0xFFFF), nil
-}
diff --git a/apps/services/utils/license/license_test.go b/apps/services/utils/license/license_test.go
deleted file mode 100644
index a836e491..00000000
--- a/apps/services/utils/license/license_test.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package license
-
-import (
-	cryptorand "crypto/rand"
-	"fmt"
-	"math/rand"
-	"testing"
-)
-
-// 生产库里的真实 v1 授权码样本
-const legacySampleCode = "0D82F1CCD83D72B78FA9"
-
-// generateV1 复刻 comm.GenerateLicense 的 v1 编码，仅供测试构造老码。
-// 生产代码不再生成 v1，只解析。
-func generateV1(productid uint16, batch byte, serial uint32) (string, error) {
-	if batch < 1 {
-		return "", fmt.Errorf("批次必须 >= 1")
-	}
-	if serial > 0xFFFFF {
-		return "", fmt.Errorf("v1 序号上限 0xFFFFF")
-	}
-	seedBytes := make([]byte, 2)
-	if _, err := cryptorand.Read(seedBytes); err != nil {
-		return "", err
-	}
-	seed := int(seedBytes[0])<<8 | int(seedBytes[1])
-	rng := rand.New(rand.NewSource(int64(seed)))
-
-	confusion := make([]int, 4)
-	for i := range confusion {
-		confusion[i] = rng.Intn(65536)
-	}
-	confusion[0] ^= int(productid)
-	confusion[1] ^= (int(batch) << 8) | (int(serial>>12) & 0xFF)
-	confusion[2] ^= int(serial) & 0xFFF
-	confusion[3] ^= rng.Intn(65536)
-
-	code := fmt.Sprintf("%04X", seed)
-	for _, c := range confusion {
-		code += fmt.Sprintf("%04X", c)
-	}
-	return code, nil
-}
-
-func TestParse_LegacySample(t *testing.T) {
-	info, err := Parse(legacySampleCode)
-	if err != nil {
-		t.Fatalf("解析真实老码失败: %v", err)
-	}
-	if info.Version != V1 {
-		t.Errorf("版本应为 v1, 实际 v%d", info.Version)
-	}
-	if info.ProductID != 45069 || info.Batch != 1 || info.Serial != 260 {
-		t.Errorf("解析结果不符: pid=%d batch=%d serial=%d, 期望 45069/1/260",
-			info.ProductID, info.Batch, info.Serial)
-	}
-}
-
-// v2 往返：序号必须能占满 uint32
-func TestGenerateV2_RoundTrip(t *testing.T) {
-	pids := []uint16{0, 1, 45058, 45069, 0xFFFF}
-	serials := []uint32{
-		0, 1, 15, 16, 0xFFF, 0x1000, 0xFFFFF, 0x100000,
-		0xFFFFFFF, 0x10000000, 0x12345678, 0xFFFFFFFE, 0xFFFFFFFF,
-	}
-	for _, pid := range pids {
-		for _, serial := range serials {
-			code, err := GenerateV2(pid, serial)
-			if err != nil {
-				t.Fatalf("生成失败 pid=%d serial=%d: %v", pid, serial, err)
-			}
-			if len(code) != totalSegments*segmentLength {
-				t.Fatalf("码长变了: %d, 期望 %d", len(code), totalSegments*segmentLength)
-			}
-			info, err := Parse(code)
-			if err != nil {
-				t.Fatalf("解析失败 %s: %v", code, err)
-			}
-			if info.Version != V2 {
-				t.Errorf("%s 应识别为 v2, 实际 v%d", code, info.Version)
-			}
-			if info.ProductID != pid || info.Serial != serial {
-				t.Errorf("往返不一致: 写入 pid=%d serial=%d, 读出 pid=%d serial=%d",
-					pid, serial, info.ProductID, info.Serial)
-			}
-		}
-	}
-}
-
-// probatch < 240 的 v1 码不能被误判成 v2，且 batch/serial 必须原样解出
-func TestParse_V1NotMisdetected(t *testing.T) {
-	const pid = 45069
-	serials := []uint32{0, 1, 4095, 4096, 65535, 0xFFFFF}
-	for batch := 1; batch < V1ProbatchLimit; batch++ {
-		for _, serial := range serials {
-			code, err := generateV1(pid, byte(batch), serial)
-			if err != nil {
-				t.Fatalf("v1 生成失败 batch=%d serial=%d: %v", batch, serial, err)
-			}
-			info, err := Parse(code)
-			if err != nil {
-				t.Fatalf("v1 解析失败 batch=%d serial=%d: %v", batch, serial, err)
-			}
-			if info.Version != V1 {
-				t.Fatalf("batch=%d serial=%d 的 v1 码被误判为 v%d", batch, serial, info.Version)
-			}
-			if info.ProductID != pid || info.Batch != byte(batch) || info.Serial != serial {
-				t.Fatalf("v1 解析不一致 batch=%d serial=%d -> pid=%d batch=%d serial=%d",
-					batch, serial, info.ProductID, info.Batch, info.Serial)
-			}
-		}
-	}
-}
-
-// 文档化约束：batch >= 240 的 v1 码必然被误判为 v2（判别位 = batch>>4 == 0xF）。
-// 迁移脚本必须先验证 MAX(probatch) < V1ProbatchLimit，否则老码序号会解出垃圾。
-// 本测试若开始失败，说明判别位挪了位置，前提校验需要跟着改。
-func TestParse_V1OverLimitIsMisdetected(t *testing.T) {
-	const pid = 45069
-	for batch := V1ProbatchLimit; batch <= 0xFF; batch++ {
-		code, err := generateV1(pid, byte(batch), 1)
-		if err != nil {
-			t.Fatalf("v1 生成失败 batch=%d: %v", batch, err)
-		}
-		info, err := Parse(code)
-		if err != nil {
-			t.Fatalf("解析失败 batch=%d: %v", batch, err)
-		}
-		if info.Version != V2 {
-			t.Errorf("batch=%d 的 v1 码应当被误判为 v2（证明前提校验必要），实际 v%d", batch, info.Version)
-		}
-	}
-}
-
-// productid 的提取与版本无关，也不受 v1 批次异常影响
-func TestProductID_VersionAgnostic(t *testing.T) {
-	const pid = 45069
-
-	v1, err := generateV1(pid, 3, 1234)
-	if err != nil {
-		t.Fatalf("v1 生成失败: %v", err)
-	}
-	v2, err := GenerateV2(pid, 0xDEADBEEF)
-	if err != nil {
-		t.Fatalf("v2 生成失败: %v", err)
-	}
-	for _, code := range []string{v1, v2, legacySampleCode} {
-		got, err := ProductID(code)
-		if err != nil {
-			t.Fatalf("%s 提取 pid 失败: %v", code, err)
-		}
-		if got != pid {
-			t.Errorf("%s 提取 pid=%d, 期望 %d", code, got, pid)
-		}
-	}
-}
-
-// 同产品下连续序号生成的码互不相同（code <-> (seed, pid, serial) 双射）
-func TestGenerateV2_Uniqueness(t *testing.T) {
-	const pid = 45069
-	seen := make(map[string]uint32, 20000)
-	for serial := uint32(1); serial <= 20000; serial++ {
-		code, err := GenerateV2(pid, serial)
-		if err != nil {
-			t.Fatalf("生成失败 serial=%d: %v", serial, err)
-		}
-		if prev, dup := seen[code]; dup {
-			t.Fatalf("授权码碰撞: serial=%d 与 serial=%d 都生成 %s", serial, prev, code)
-		}
-		seen[code] = serial
-	}
-}
diff --git a/apps/services/utils/mac/mac.go b/apps/services/utils/mac/mac.go
index 063df458..f03fcba0 100644
--- a/apps/services/utils/mac/mac.go
+++ b/apps/services/utils/mac/mac.go
@@ -1,7 +1,13 @@
 // Package mac 设备码 MAC 编解码。
 //
 // 布局：mac[0..1] = productid(16 位)，mac[2..5] = 产品级全局序号(32 位)。
-// 与授权码(utils/license)共用同一套「productid + 产品级序号」语义，不再编入生产批次。
+//
+// **MAC 就是设备码**：2026-09-02 起 license_<pid> 分表的主键 code 直接存 MAC，
+// 原先那套 20 字符的授权码字符串（utils/license）已整体移除。产品、生产批次、
+// 渠道商全都能从 MAC 查回来——PID 直接编在前 2 字节里，批次与渠道存在这一行上。
+//
+// ⚠️ productid 占 16 位，取值必须 ≤ 0xFFFF：调用方传的是 uint16，
+// 更大的 PID 会被静默截断，两款产品能算出一模一样的 MAC。
 package mac
 
 import (
diff --git a/deploy/app/confs/gateway.yaml.example b/deploy/app/confs/gateway.yaml.example
index c73368e5..3b96d819 100644
--- a/deploy/app/confs/gateway.yaml.example
+++ b/deploy/app/confs/gateway.yaml.example
@@ -26,6 +26,10 @@ modules:
       - user_getappconfig
       - user_getappconfig_v2 #加密版应用配置（apiV2Comp.GetAppConfig，路由=user_<方法名小写>_v2）；改方法名要同步这里，否则未登录取配置会被拒
       - user_getchannelapp
+      # ⚠️ 复数那个也必须放行：客户端读的是它（Api.getChannelApps → /api/home/user_getchannelapps），
+      # 而游客登录入口的显隐结论就在这个响应里 —— 入口恰恰只在**未登录**时才需要显示，
+      # 少了这一行会 code:18 NoLogin，客户端静默按「隐藏」处理，表现为「后台开了但 App 里没有」。
+      - user_getchannelapps
       - user_verification
       - public_info
       - pay_wechatnotify
diff --git a/deploy/app/env/env.example b/deploy/app/env/env.example
index 1aa170e9..4f244d2d 100644
--- a/deploy/app/env/env.example
+++ b/deploy/app/env/env.example
@@ -44,7 +44,13 @@ FIELD_ENCRYPT_KEY=
 # ⚠️ 一旦启用就不要再改：换了盐，之前存的指纹全部对不上，同证件查重从此断档。
 ID_HASH_SALT=
 
-# ── 部署身份（同时也是统计上报的维度；须与 console 注册表 app_registry 的 app_name 一致）──
+# ── 部署身份（同时也是统计上报的维度）──
+# ⚠️ 必须与 console 注册表 app_registry 的 **name 与 app_name 两列同时**一致（大小写敏感），
+#    注册应用时就把这两列填成同一个值。两列不同值时，无论填哪个都只能满足一半：
+#      · 填 app_name → 按应用作用域的配置能读到，但统计快照会被 console 拒收（见下）
+#      · 填 name     → 统计能落库，但按应用作用域的配置全部退化成「全局默认」
+#    被拒收时只在 console 日志留一行 `console.stat: 快照应用未在 console 注册，未落库`，
+#    数据滞留在本地 Redis，后台看板恒为 0 且不报任何错——排查「看板没数据」先看这行日志。
 # 这一组就是本部署的唯一身份声明，所有按应用/区域作用域解析的功能都用它（comm.AppName/AppRegion）：
 #   · 统计上报 → stats_global_day.app_id / region
 #   · api 的应用服务配置托管（app_service_config）
diff --git a/docs/migrations/2026-08-08-channel-dimension.sql b/docs/migrations/2026-08-08-channel-dimension.sql
index 08d26584..e74b966a 100644
--- a/docs/migrations/2026-08-08-channel-dimension.sql
+++ b/docs/migrations/2026-08-08-channel-dimension.sql
@@ -99,6 +99,9 @@ CREATE INDEX IF NOT EXISTS idx_stats_channel_day ON stats_global_day (channel_id
 ALTER TABLE brand ADD COLUMN IF NOT EXISTS sharerate integer NOT NULL DEFAULT 0;
 
 -- A6. 月结算单表（与 pb.DBSettlementMonth 一致；console 启动时也会自动建）
+-- ⚠️【2026-09-02 已过时】结算维度改成 (period, channelid, batchno)，品牌商列已移除。
+--    下面这段建的是旧形态，只对「回放这份历史迁移」有意义；新库不要照它建，
+--    直接让 console 启动时的 ensureSettlementTable 建（它也会把旧形态就地迁移过去）。
 CREATE TABLE IF NOT EXISTS settlement_month (
   period          bigint      NOT NULL,
   brandid         bigint      NOT NULL DEFAULT 0,
diff --git a/docs/migrations/2026-09-02-drop-license-string.sql b/docs/migrations/2026-09-02-drop-license-string.sql
new file mode 100644
index 00000000..00c3d5f2
--- /dev/null
+++ b/docs/migrations/2026-09-02-drop-license-string.sql
@@ -0,0 +1,90 @@
+-- ============================================================================
+-- 授权码字符串整体移除：设备码 = MAC
+--
+-- 背景：一台设备原先有两个标识——20 字符的 license 串（分表主键 code）与 MAC
+-- （devicemac 列），指向同一台设备。而绑定、禁用、重置、结算反查批次**全都只用 MAC**，
+-- license 从头到尾没有任何一处校验。MAC 的前 2 字节就是 PID，产品/批次/渠道都能从它
+-- 查回来，所以第二套标识没有存在价值，反而让「设备的唯一标识到底是哪个」长期说不清。
+--
+-- 代码侧已做的事（见 apps/services）：
+--   * 删除 utils/license 包；生成侧一律 code = devicemac、codetype = DEVICECODE(1)
+--   * utils/devcode 只解析 MAC，解不出直接报错（不再回退到写死的 PID）
+--   * 不再创建裸的 license 表；删产品时连带删掉它的 license_<pid> 分表
+--
+-- ⚠️ **正常情况下不需要手工执行这份 SQL**：console 启动时的
+--    migrateLicenseCodeToMac（modules/console/registry.go）会幂等地做完全部三步。
+--    这里留一份等价 SQL 供离线核对 / 应急使用。
+--
+-- 幂等：可重复执行。
+-- ============================================================================
+\set ON_ERROR_STOP on
+BEGIN;
+
+-- ① 存量 code 改写成该行的 MAC。
+--    跑过一遍之后是 0 行更新。devicemac 为空的行不动（没有 MAC 就没得改，
+--    这类行只可能来自更早的、连 MAC 都没生成的产品，需要人工确认后再处理）。
+DO $do$
+DECLARE t text; n bigint;
+BEGIN
+  FOR t IN
+    SELECT tablename FROM pg_tables
+     WHERE schemaname = current_schema() AND tablename LIKE 'license\_%'
+  LOOP
+    EXECUTE format('UPDATE %I SET code = devicemac WHERE devicemac <> '''' AND code <> devicemac', t);
+    GET DIAGNOSTICS n = ROW_COUNT;
+    IF n > 0 THEN
+      RAISE NOTICE '% : % 条 code 已改写成 MAC', t, n;
+    END IF;
+  END LOOP;
+END
+$do$;
+
+-- ② 删掉「没有对应产品且为空」的 license_* 孤儿分表，以及裸的 license 表。
+--    建表按产品列表做、删产品却只删产品行，于是删一个产品留一张空表
+--    （2026-09-02 的 along 环境上已攒了 44 张）。
+--
+-- ⚠️ 只删空表：有数据说明判断依据错了（产品被误删、或表名规则变过），
+--    这种时候宁可留着一张查得到的表，也不要把已经发出去的设备记录抹掉。
+DO $do$
+DECLARE t text; n bigint;
+BEGIN
+  FOR t IN
+    SELECT tablename FROM pg_tables
+     WHERE schemaname = current_schema()
+       AND (tablename = 'license' OR tablename LIKE 'license\_%')
+  LOOP
+    -- 裸 license 表没有对应产品，恒进入清理判定
+    IF t <> 'license' AND EXISTS (
+         SELECT 1 FROM product p WHERE lower(to_hex(p.id)) = substring(t from 9)
+       ) THEN
+      CONTINUE;
+    END IF;
+    EXECUTE format('SELECT count(*) FROM %I', t) INTO n;
+    IF n > 0 THEN
+      RAISE WARNING '% 没有对应产品但有 % 行数据，已跳过', t, n;
+      CONTINUE;
+    END IF;
+    EXECUTE format('DROP TABLE IF EXISTS %I', t);
+    RAISE NOTICE '已清理空的孤儿表 %', t;
+  END LOOP;
+END
+$do$;
+
+COMMIT;
+
+-- ============================================================================
+-- 体检 SQL（迁移后手工执行）
+--
+-- 1) 应当没有任何 code 与 devicemac 不一致的行：
+--    DO $$ DECLARE t text; n bigint; BEGIN
+--      FOR t IN SELECT tablename FROM pg_tables WHERE tablename LIKE 'license\_%' LOOP
+--        EXECUTE format('SELECT count(*) FROM %I WHERE code <> devicemac', t) INTO n;
+--        IF n > 0 THEN RAISE WARNING '% 还有 % 行不一致', t, n; END IF;
+--      END LOOP;
+--    END $$;
+--
+-- 2) 剩下的 license_* 应当与 product 一一对应：
+--    SELECT t.tablename,
+--           EXISTS(SELECT 1 FROM product p WHERE lower(to_hex(p.id)) = substring(t.tablename from 9)) AS 有产品
+--      FROM pg_tables t WHERE t.tablename LIKE 'license\_%';
+-- ============================================================================