pull err

src/manifest.json

@@ -1,27 +1,24 @@
 {
-    "name" : "",
-    "appid" : "",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    "app-plus" : {
-        /* 5+App特有相关 */
-        "usingComponents" : true,
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
+	"name": "",
+	"appid": "",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	"app-plus": { /* 5+App特有相关 */
+		"usingComponents": true,
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
 		},
-        "modules" : {},
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "android" : {
-                /* android打包配置 */
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+		"modules": { /* 模块配置 */
+
+		},
+		"distribute": { /* 应用发布信息 */
+			"android": { /* android打包配置 */
+				"permissions": ["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
 					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
 					"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
 					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -45,21 +42,23 @@
 					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
 				]
 			},
-            "ios" : {},
-            /* ios打包配置 */
-            "sdkConfigs" : {}
+			"ios": { /* ios打包配置 */
+
+			},
+			"sdkConfigs": { /* SDK配置 */
+
+			}
 		}
 	},
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        /* 微信小程序特有相关 */
-        "appid" : "wxf1294b279ad1b845",
-        "setting" : {
-            "urlCheck" : false
+	"quickapp": { /* 快应用特有相关 */
+
 	},
-        "usingComponents" : true
+	"mp-weixin": { /* 微信小程序特有相关 */
+		"appid": "wxf1294b279ad1b845",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true
 	},
 	"mp-alipay" : {
         "usingComponents" : true

src/subpackage/device/pages/audio_manage/audio_manage.vue

@@ -707,7 +707,8 @@
 				let _obj = {
 					'acmelec': 'acmelec',
 					'zhongnan': 'zhongnan',
-					'jianda': 'ray-air-rs'
+					'jianda': 'ray-air-rs',
+					"XiaoHuiXiong":"xhx-lora-air-tcp"
 				};
 				return _obj[this.changeLowerCase(hardware_model)] || '';
 			},