diff --git a/BLEPages/child/F01B.vue b/BLEPages/child/F01B.vue
index 702dc19..17a244b 100644
--- a/BLEPages/child/F01B.vue
+++ b/BLEPages/child/F01B.vue
@@ -125,9 +125,6 @@
uni.startBluetoothDevicesDiscovery({
allowDuplicatesKey: false,
interval: 500, //上报设备的间隔
- services: [
- "FFE0",
- ],
success: res => {
that.isConnection = 0
that.onBluetoothDeviceFound();
diff --git a/BLEPages/child/J02.vue b/BLEPages/child/J02.vue
index 8eb0962..882b9b8 100644
--- a/BLEPages/child/J02.vue
+++ b/BLEPages/child/J02.vue
@@ -176,10 +176,12 @@
that.isConnection = 1
uni.onBluetoothDeviceFound(res => {
res.devices.forEach(device => {
+ device.advertisData = device.advertisData ? device.advertisData : ''
+ device.advertisServiceUUIDs = device.advertisServiceUUIDs ? device.advertisServiceUUIDs : ""
if (!device.name && !device.localName) {
return
}
- if (device.name.indexOf("ELK") !== -1) {
+ if (device.name.indexOf("ELK") !== -1 && device.advertisServiceUUIDs != '') {
clearTimeout(myTime);
let buffer = device.advertisData.slice(0, 8)
device.mac = new Uint8Array(buffer)
@@ -192,7 +194,7 @@
let analyzeData = plugin.analyzeBroadcastScaleData(parseDataRes)
let analyzeDataText = analyzeData.text
let data = analyzeData.data
- console.log("device",device, analyzeData, analyzeDataText, data)
+ console.log("device", device, analyzeData, analyzeDataText, data)
if (parseDataRes.status == 1) {
let dw1 = "kg"
let dw2 = "kg"
diff --git a/BLEPages/child/J02B.vue b/BLEPages/child/J02B.vue
new file mode 100644
index 0000000..0a32a59
--- /dev/null
+++ b/BLEPages/child/J02B.vue
@@ -0,0 +1,327 @@
+
+
+
+ 连接中,请稍后
+ 连接成功,请开始测量
+ 连接失败,点击重新连接
+ {{text}}
+
+
+
+
+ 提示:
+ 1.请确定设备是开机状态
+ 2.请确定手机蓝牙、位置信息已打开
+ 3.ios系统需打开设置—>应用—>微信里的蓝牙权限
+
+
+
+
+
+
+
+
diff --git a/BLEPages/child/PCL01.vue b/BLEPages/child/PCL01.vue
index 995b70b..745d04e 100644
--- a/BLEPages/child/PCL01.vue
+++ b/BLEPages/child/PCL01.vue
@@ -176,10 +176,12 @@
that.isConnection = 1
uni.onBluetoothDeviceFound(res => {
res.devices.forEach(device => {
+ device.advertisData = device.advertisData ? device.advertisData : ''
+ device.advertisServiceUUIDs = device.advertisServiceUUIDs ? device.advertisServiceUUIDs : ""
if (!device.name && !device.localName) {
return
}
- if (device.name.indexOf("ELK") !== -1) {
+ if (device.name.indexOf("ELK") !== -1 && device.advertisServiceUUIDs != '') {
clearTimeout(myTime);
let buffer = device.advertisData.slice(0, 8)
device.mac = new Uint8Array(buffer)
@@ -192,7 +194,7 @@
let analyzeData = plugin.analyzeBroadcastScaleData(parseDataRes)
let analyzeDataText = analyzeData.text
let data = analyzeData.data
- console.log("analyzeData", parseDataRes, analyzeData)
+ // console.log("analyzeData", parseDataRes, analyzeData)
if (parseDataRes.status == 1) {
let dw1 = "kg"
let dw2 = "kg"
diff --git a/BLEPages/child/PCL10.vue b/BLEPages/child/PCL10.vue
new file mode 100644
index 0000000..68acb11
--- /dev/null
+++ b/BLEPages/child/PCL10.vue
@@ -0,0 +1,291 @@
+
+
+
+ 连接中,请稍后
+ 连接成功,开始测量
+ 连接失败,点击重新连接
+ {{text}}
+
+
+
+
+ 提示:
+ 1.请确定设备是开机状态
+ 2.请确定手机蓝牙、位置信息已打开
+ 3.ios系统需打开设置—>应用—>微信里的蓝牙权限
+
+
+
+
+
+
+
+
diff --git a/BLEPages/child/PCL11.vue b/BLEPages/child/PCL11.vue
new file mode 100644
index 0000000..337b21f
--- /dev/null
+++ b/BLEPages/child/PCL11.vue
@@ -0,0 +1,328 @@
+
+
+
+ 连接中,请稍后
+ 连接成功,开始测量
+ 连接失败,点击重新连接
+ {{text}}
+
+
+
+
+ 提示:
+ 1.请确定设备是开机状态
+ 2.请确定手机蓝牙、位置信息已打开
+ 3.ios系统需打开设置—>应用—>微信里的蓝牙权限
+
+
+
+
+
+
+
+
diff --git a/BLEPages/static/J02B.gif b/BLEPages/static/J02B.gif
new file mode 100644
index 0000000..38edd3d
Binary files /dev/null and b/BLEPages/static/J02B.gif differ
diff --git a/BLEPages/static/PCL10.gif b/BLEPages/static/PCL10.gif
new file mode 100644
index 0000000..cc2ccd0
Binary files /dev/null and b/BLEPages/static/PCL10.gif differ
diff --git a/BLEPages/static/PCL11.gif b/BLEPages/static/PCL11.gif
new file mode 100644
index 0000000..b2aa97a
Binary files /dev/null and b/BLEPages/static/PCL11.gif differ
diff --git a/assets/common.scss b/assets/common.scss
index 2727566..46455c5 100644
--- a/assets/common.scss
+++ b/assets/common.scss
@@ -291,7 +291,7 @@
view {
float: left;
margin-right: 10px;
- font-size: 24rpx;
+ font-size: 12px;
color: #999;
}
}
@@ -1472,6 +1472,7 @@
.peobox {
position: absolute;
+ right: 0;
top: -1px;
.xx {
diff --git a/manifest.json b/manifest.json
index e281d4b..ddd8e2d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -57,7 +57,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wx33d5fc9ecf8bcf12",
+ "appid" : "wx3e83b37ba682faf5",
"setting" : {
"urlCheck" : true,
"minified" : true,
diff --git a/pageTwo/login/login.vue b/pageTwo/login/login.vue
index a5cdeb7..55353e6 100644
--- a/pageTwo/login/login.vue
+++ b/pageTwo/login/login.vue
@@ -16,7 +16,7 @@
-
@@ -25,7 +25,11 @@
-