修改搜索到的蓝牙设备显示名称-集贤

SundoggyNew · SundoggyNew · commit 338bb8f5fbac · 2021-12-21T16:09:54.000+08:00
Change-Id: Ie3b9bec72dbd4f710bfcbacfedeffc9f2a2694f8
diff --git a/sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/link/service/BleConfigService.kt b/sdk/explorer-link-android/src/main/java/com/tencent/iot/explorer/link/core/link/service/BleConfigService.kt
@@ -172,7 +172,7 @@ class BleConfigService private constructor() {
                             }
                             dev?.devName = result?.scanRecord?.deviceName.toString()
                             dev?.showedName = result?.scanRecord?.deviceName.toString()
-                            if (!dev?.showedName?.contains("-")!!) {
+                            if (!dev?.showedName?.contains("-")!! && !dev?.showedName?.contains("_")!!) {
                                 dev?.showedName = "${dev?.showedName}_${dev?.mac?.substring(0, 4)?.toUpperCase()}"
 
                             }
@@ -231,7 +231,7 @@ class BleConfigService private constructor() {
                                     dev?.mac = it
                                 }
                                 dev?.showedName = result?.scanRecord?.deviceName.toString()
-                                if (!dev.showedName.contains("-")) {
+                                if (!dev.showedName.contains("-") && !dev.showedName.contains("_")) {
                                     dev.showedName = "${dev.showedName}_${dev.mac.substring(0, 4).toUpperCase()}"
                                 }
                             }

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ class BleConfigService private constructor() {`
`172`	`172`	`}`
`173`	`173`	`dev?.devName = result?.scanRecord?.deviceName.toString()`
`174`	`174`	`dev?.showedName = result?.scanRecord?.deviceName.toString()`
`175`		`- if (!dev?.showedName?.contains("-")!!) {`
	`175`	`+ if (!dev?.showedName?.contains("-")!! && !dev?.showedName?.contains("_")!!) {`
`176`	`176`	`dev?.showedName = "${dev?.showedName}_${dev?.mac?.substring(0, 4)?.toUpperCase()}"`
`177`	`177`
`178`	`178`	`}`
`@@ -231,7 +231,7 @@ class BleConfigService private constructor() {`
`231`	`231`	`dev?.mac = it`
`232`	`232`	`}`
`233`	`233`	`dev?.showedName = result?.scanRecord?.deviceName.toString()`
`234`		`- if (!dev.showedName.contains("-")) {`
	`234`	`+ if (!dev.showedName.contains("-") && !dev.showedName.contains("_")) {`
`235`	`235`	`dev.showedName = "${dev.showedName}_${dev.mac.substring(0, 4).toUpperCase()}"`
`236`	`236`	`}`
`237`	`237`	`}`