diff --git a/manifest.json b/manifest.json index ec88a60..70d7335 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "星汉物联", "appid" : "__UNI__A21EF43", "description" : "设备管控", - "versionName" : "1.0.30", + "versionName" : "1.0.0", "versionCode" : "100", "transformPx" : false, /* 5+App特有相关 */ @@ -18,8 +18,8 @@ }, /* 模块配置 */ "modules" : { - "Bluetooth" : {}, "Barcode" : {}, + "Bluetooth" : {}, "Camera" : {}, "Geolocation" : {}, "Maps" : {} @@ -53,20 +53,19 @@ "", "" ], - "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], - "minSdkVersion" : 21 + "minSdkVersion" : 21, + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] }, /* ios打包配置 */ "ios" : { - "appid" : "uni.app.UNIA21EF43", + "dSYMs" : false, "privacyDescription" : { - "NSBluetoothPeripheralUsageDescription" : "需要蓝牙访问权限,用于设备通信", - "NSBluetoothAlwaysUsageDescription" : "需要蓝牙访问权限,用于设备通信", "NSLocationWhenInUseUsageDescription" : "App需要您的同意,才能在使用期间访问位置", "NSLocationAlwaysUsageDescription" : "App需要您的同意,才能始终访问位置", - "NSLocationAlwaysAndWhenInUseUsageDescription" : "App需要您的同意,才能始终访问位置" + "NSLocationAlwaysAndWhenInUseUsageDescription" : "App需要您的同意,才能始终访问位置", + "NSBluetoothPeripheralUsageDescription" : "需要蓝牙访问权限,用于设备通信", + "NSBluetoothAlwaysUsageDescription" : "需要蓝牙访问权限,用于设备通信" }, - "dSYMs" : false, "idfa" : false }, /* SDK配置 */ @@ -80,26 +79,11 @@ } }, "maps" : { - "customStyle" : true, "amap" : { "name" : "amapHG8nIFW5", "appkey_ios" : "065c43f02c7b627a74ad7dd23b16bb4f", "appkey_android" : "d7d852dbda2b95f6f796fb9a711a9fee" } - }, - "oauth" : {}, - "push" : {}, - "speech" : {}, - "ad" : {} - }, - "splashscreen" : { - "useOriginalMsgbox" : true, - "androidStyle" : "common", - "iosStyle" : "common", - "android" : { - "hdpi" : "static/images/biao.png", - "xhdpi" : "static/images/biao.png", - "xxhdpi" : "static/images/biao.png" } }, "icons" : { @@ -133,6 +117,9 @@ "spotlight@3x" : "unpackage/res/icons/120x120.png" } } + }, + "splashscreen" : { + "useOriginalMsgbox" : true } } }, @@ -162,3 +149,5 @@ "locale" : "zh-Hans", "fallbackLocale" : "zh-Hans" } +/* 5+App特有相关 */ + diff --git a/pages/650/HBY650.vue b/pages/650/HBY650.vue index a511dd7..e203ce1 100644 --- a/pages/650/HBY650.vue +++ b/pages/650/HBY650.vue @@ -983,8 +983,8 @@ } uni.uploadFile({ - url: 'http://114.55.111.217/video/upload', - // url: baseURL+"app/video/upload", + // url: 'http://114.55.111.217/video/upload', + url: baseURL+"app/video/upload", filePath: videoPath, name: 'file', header: { diff --git a/pages/670/HBY670.vue b/pages/670/HBY670.vue index a8e98ff..b539446 100644 --- a/pages/670/HBY670.vue +++ b/pages/670/HBY670.vue @@ -1847,8 +1847,8 @@ } console.log("baseURL=", baseURL); uni.uploadFile({ - url: 'http://114.55.111.217/video/upload', - // url: baseURL + "/app/video/upload", + // url: 'http://114.55.111.217/video/upload', + url: baseURL + "/app/video/upload", filePath: videoPath, name: 'file', header: { diff --git a/pages/common/addBLE/LinkBle.vue b/pages/common/addBLE/LinkBle.vue index 8c9d12a..f9855c3 100644 --- a/pages/common/addBLE/LinkBle.vue +++ b/pages/common/addBLE/LinkBle.vue @@ -111,7 +111,7 @@ onUnload() { console.log("返回时断开蓝牙连接,取消订阅"); - ble.disconnectDevice(these.device.deviceId); + ble.removeReceiveCallback(pagePath); }, onLoad(option) { @@ -165,6 +165,7 @@ if(!these.device.macAddress){ return; } + clearTimeout(this.Statu.timeInteval); this.Statu.timeInteval = setTimeout(() => { @@ -181,7 +182,7 @@ } }).then(res => { - console.log("获取设备信息", res); + // console.log("获取设备信息", res); if (res && res.code == 200) { let data = res.data; this.serverDevice=data; @@ -207,15 +208,15 @@ } }); - console.log("device=", these.device); - console.log("LinkedList=", ble.data.LinkedList); + // console.log("device=", these.device); + // console.log("LinkedList=", ble.data.LinkedList); } } }).catch((ex) => { - console.log("获取设备出现异常:", ex); + console.error("获取设备出现异常:", ex); }).finally(() => { this.Statu.timeInteval=null; this.Statu.isSearch=false; @@ -283,7 +284,8 @@ }); ble.removeReceiveCallback(pagePath); - + clearTimeout(this.Statu.timeInteval); + this.Statu.timeInteval=null; uni.$emit("refreshDeviceList"); setTimeout(() => { uni.switchTab({