Merge branch 'liubiao-new-20250827'

# Conflicts:
#	pages.json

pages.json

@@ -121,13 +121,13 @@
 		{
 			"path": "pages/common/addBLE/addEquip",
 			"style": {
-				"navigationBarTitleText": "添加设备"
+				"navigationBarTitleText": "扫描设备"
 			}
 		},
 		{
 			"path": "pages/common/addBLE/LinkBle",
 			"style": {
-				"navigationBarTitleText": "扫描到的设备"
+				"navigationBarTitleText": "绑定设备"
 			}
 		},
 		{
@@ -205,6 +205,12 @@
 				"navigationBarTitleText": "呼叫"
 			}
 		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/index",
+			"style": {
+				"navigationBarTitleText": "设备类型"
+			}
+		},
 		{
 			"path": "pages/BlueTooth/ModeSetting/VideoSend",
 			"style": {
@@ -270,11 +276,6 @@
 			"style": {
 				"navigationBarTitleText": "HBY670"
 			}
-		}, {
-			"path": "pages/BlueTooth/ModeSetting/index",
-			"style": {
-				"navigationBarTitleText": "设备类型"
-			}
 		},
 		{
 			"path": "pages/670/HBY670",
@@ -294,6 +295,19 @@
 			"style": {
 				"navigationBarTitleText": "历史记录"
 			}
+		},
+		{
+			"path": "pages/BlueTooth/ModeSetting/4877",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
+		{
+			"path" : "pages/7305/BJQ7305",
+			"style" :
+			{
+				"navigationBarTitleText" : "BJQ7305"
+			}
 		}