Merge branch 'lw_test' into gyq_test

common/bluetooth.js

@@ -214,58 +214,62 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
     // 打印查找到为蓝牙设备
     console.log('查找到为蓝牙设备');
     // 开始搜索蓝牙设备
+        setTimeout(()=> {       
     uni.startBluetoothDevicesDiscovery({
         // 搜索成功
         success(res) {
-            console.log(res);
-            // 获取搜索到的蓝牙设备
-            uni.getBluetoothDevices({
-                success: (res) => {
-                    console.log(res);
-                    // 遍历搜索到的蓝牙设备
-                    res.devices.forEach((data) => {
-                        // console.log(data,'data***************');
-                        // 判断设备是否为指定设备
-                        if (bluetoothDeviceConfig(device).isDevice(device, data)) {
-                            // uni.offBluetoothDeviceFound();
-                            uni.stopBluetoothDevicesDiscovery(); //查找到蓝牙设备停止搜索
-                            deviceId = data.deviceId;
-                            if (app.globalData.connectionState[deviceId]) {
-                                app.globalData.connectionState[deviceId].device = device;
-                            } else {
-                                app.globalData.connectionState[deviceId] = {
-                                    device: device,
-									deviceName:data.name,
-                                    deviceId: deviceId,
-                                    connected: false,
-                                    data: {}
-                                };
-                            }
-                            callback(deviceId);
-                        }
-                    });
-                    
-					setTimeout(function () {
-                        if (!deviceId) {
-                            // uni.offBluetoothDeviceFound();
-                            uni.stopBluetoothDevicesDiscovery();
-                            var res = {
-                                errCode: 9000001,
-                                errMsg: 'openBluetoothAdapter:find not device',
-                                errno: 9000002
-                            };
-                            fail(res);
-                        }
-                    }, 5000);
-                },
-                fail(res) {
-                    uni.stopBluetoothDevicesDiscovery();
-                    console.log(res);
-                    fail(res);
-                }
-            });
-            // 监听蓝牙设备发现事件
+            console.log(res,'startBluetoothDevicesDiscovery');
+			
+				// 获取搜索到的蓝牙设备
+				uni.getBluetoothDevices({
+					success: (res) => {
+						console.log(res,'getBluetoothDevices');
+						// 遍历搜索到的蓝牙设备
+						res.devices.forEach((data) => {
+							// console.log(data,'data***************');
+							// 判断设备是否为指定设备
+							if (bluetoothDeviceConfig(device).isDevice(device, data)) {
+								// uni.offBluetoothDeviceFound();
+								uni.stopBluetoothDevicesDiscovery(); //查找到蓝牙设备停止搜索
+								deviceId = data.deviceId;
+								if (app.globalData.connectionState[deviceId]) {
+									app.globalData.connectionState[deviceId].device = device;
+								} else {
+									app.globalData.connectionState[deviceId] = {
+										device: device,
+										deviceName:data.name,
+										deviceId: deviceId,
+										connected: false,
+										data: {}
+									};
+								}
+								callback(deviceId);
+							}
+						});
+						
+						setTimeout(function () {
+							if (!deviceId) {
+								// uni.offBluetoothDeviceFound();
+								uni.stopBluetoothDevicesDiscovery();
+								var res = {
+									errCode: 9000001,
+									errMsg: 'openBluetoothAdapter:find not device',
+									errno: 9000002
+								};
+								fail(res);
+							}
+						}, 5000);
+					},
+					fail(res) {
+						uni.stopBluetoothDevicesDiscovery();
+						console.log(res);
+						fail(res);
+					}
+				});
+				// 监听蓝牙设备发现事件
+			 
             uni.onBluetoothDeviceFound((res) => {
+				console.log(res,"foundDevice")
                 // console.log(res);
                 // 遍历搜索到的蓝牙设备列表
                 res.devices.forEach((data) => {
@@ -301,6 +305,8 @@ function findDevice(device, callback = () => {}, fail = () => {}) {
             fail(res);
         }
     });
+	   }, 500);
+	 
 }
 // 连接设备函数
 function connectDevice(device, callback = () => {}, fail = () => {}) {
@@ -389,9 +395,12 @@ function connectDevice(device, callback = () => {}, fail = () => {}) {
 // 函数alterConnect用于连接蓝牙设备
 function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
     // 判断设备是否支持蓝牙连接
+	console.log("xxxx1")
     if (!bluetoothDeviceConfig(device) || !bluetoothDeviceConfig(device).acceptDevice(device)) {
         return;
     }
+	console.log("xxxx2")
+	console.log(deviceId)
     // 获取蓝牙设备的服务列表
     uni.getBLEDeviceServices({
         deviceId: deviceId,
@@ -573,7 +582,7 @@ function bmsSet(macid, name, vars, callback = () => {}, fail = () => {}) {
 // 定义一个函数，用于向蓝牙设备写入数据
 function writeData(device, deviceId, data, callback = () => {}, fail = () => {}) {
     // 如果数据长度为0，则直接返回
-    console.log(data,'data');
+    console.log(data,'data写入---------------------');
 	if (data.length == 0) {
         return;
     }
@@ -582,13 +591,17 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
     buffer = common.toArrayBuffer(data.shift());
 	// console.log(buffer,'buffer111');
     // 调用uni.writeBLECharacteristicValue方法，向蓝牙设备写入数据
+	setTimeout(() => {
     uni.writeBLECharacteristicValue({
         deviceId: deviceId,
         serviceId: bluetoothDeviceConfig(device).writeServiceID,
         characteristicId: bluetoothDeviceConfig(device).writeID,
+        // writeType:'write',// 写入方式
         value: buffer,
         // 成功回调函数
         success(res) {
+			uni.hideLoading();
+			console.log('写入成功');
             // 如果数据长度为0，则调用回调函数
             if (data.length == 0) {
                 callback(res);
@@ -606,6 +619,7 @@ function writeData(device, deviceId, data, callback = () => {}, fail = () => {})
             fail(res);
         }
     });
+	}, 500);
 }
 function stateUpdate(macid, callback = () => {}, fail = () => {}) {
     const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);

common/bluetooth/ZXCar.js

@@ -66,6 +66,7 @@ function alterConnect(device, deviceId) {
 	//OTA 升级指令 [[0x22,0x22,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,n,0xCB,0xAA,0xAA]]
 
 	// const data = [0x1F, 0x0F, ,0x5A,0x58, 0x35, 0x32, 0x30, 0x32, 0x32, 0x32, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+	console.log("校检---》")
 	let data=[ 0x1F, 0x0F]
 	const device_name=app.globalData.connectionState[deviceId].deviceName
 	const device_sn=stringToHexArray(device_name)
@@ -73,7 +74,8 @@ function alterConnect(device, deviceId) {
 	data.push(0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x67, 0xAC, 0x53, 0xE7, 0x08, 0x00)
 	// const data=[ 0x1F, 0x0F,0x38, 0x36, 0x35, 0x34, 0x31, 0x36, 0x30, 0x33, 0x38, 0x30, 0x30, 0x32, 0x32, 0x30, 0x31,0x08, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x67, 0xAC, 0x53, 0xE7, 0x08, 0x00]
 	// console.log(data,'datatest');
-	const crc_data = '0x'+crc8IEEE8023(data).toString(16).toUpperCase()
+	console.log(crc8IEEE8023(data).toString(16).toUpperCase(),'crc---------');
+	const crc_data = parseInt(crc8IEEE8023(data).toString(16).toUpperCase(),16) 
 	data.push(crc_data,0xAA,0xAA)
 	data.unshift(0x22,0x22,0x01)
 	
@@ -113,7 +115,7 @@ function stringToHexArray(str) {
 
 //收到硬件方向软件方发送的数据
 function readData(device, value, data) {
-	// console.log(value, 'test1111');
+	console.log('***********************test');
 	var test = new Uint8Array(value);
 	const bmsData=Array.from(test);
 	const normalArray =packBmsData(bmsData) 

locale/zh.json

@@ -85,6 +85,7 @@
 	"电池优化":"电池优化",
 	"位置权限":"位置权限",
 	"修改成功":"修改成功",
-	"请先链接蓝牙":"请先链接蓝牙",
-	"注册邮件发送成功":"注册邮件发送成功"
+	"请先连接蓝牙":"请先连接蓝牙",
+	"注册邮件发送成功":"注册邮件发送成功",
+	"蓝牙配对成功":"蓝牙配对成功"
 }

mixin/index.js

@@ -143,8 +143,9 @@ export default {
 				};
 				common.loading();
 				const command = bluetoothCommands[this.cmdType];
+				const car_sn = uni.getStorageSync('car_info').car_sn
 				if (command) {
-					command('900000997', () => {
+					command(car_sn, () => {
 						uni.hideLoading();
 						if(this.cmdType=='openSeatBag'||this.cmdType=='openTailBox'){
 							common.simpleToast('操作成功');

pages/bluetoothUnlock/bluetoothPair.vue

@@ -2,7 +2,7 @@
 	<view class="bluetoothPair-page">
 		<navBar name="开启感应解锁"></navBar>
 		<view class="car-wrap">
-			<view class="name">智能电动摩托车智驾 M7</view>
+			<view class="name">{{model_name}}</view>
 			<image :src="QINIU_URL + 'Fi6CPKj4-raA86oizhL3PiXD4DkH'" class="car-img" />
 			<view>
 				<viwe class="pair-title">是否配对改设备</viwe>
@@ -20,12 +20,13 @@
 			<view class="text">使用感应解锁功能时，请务必保证手机蓝牙功能开启，在蓝牙列表中忽略此设备会导致感应解锁失败</view>
 		</view>
 
-		<view class="pair-btn" style="bottom: 340rpx;" @tap="nearCloseUnlockBtn">关闭靠近解锁</view>
+		<!-- 测试指令！！！别删除 -->
+		<!-- <view class="pair-btn" style="bottom: 340rpx;" @tap="nearCloseUnlockBtn">关闭靠近解锁</view>
 		<view class="pair-btn" style="bottom: 240rpx;" @tap="nearUnlockBtn">靠近解锁</view>
-		<view class="pair-btn" style="bottom: 140rpx;" @tap="otaUpgrade">OTA升级</view>
+		<view class="pair-btn" style="bottom: 140rpx;" @tap="otaUpgrade">OTA升级</view> -->
 		<view class="pair-btn" @tap="initiateBluetoothPairing">开始配对</view>
 		<CenterDialog confirmText="配对" ref="centerDialog" />
-		<Notice v-model="showNotice" title="感应解锁已开启" btnText="关闭" type="bluetoothPail" text='注意：请勿在手机蓝牙中忽略“电动车蓝牙02"设备，否则感应解锁功能将无法使用' />
+		<!-- <Notice v-model="showNotice" title="感应解锁已开启" btnText="关闭" type="bluetoothPail" text='注意：请勿在手机蓝牙中忽略“电动车蓝牙02"设备，否则感应解锁功能将无法使用' /> -->
 	</view>
 </template>
 
@@ -50,15 +51,20 @@
 		data() {
 			return {
 				QINIU_URL,
-				showNotice: false
+				showNotice: false,
+				model_name:'',
+				car_sn:'',
 			}
 		},
-		created(){
+		onLoad(){
+			const { car_sn , model_name } = uni.getStorageSync('car_info')
+			this.setData({
+				model_name,
+				car_sn
+			})
 			bluetooth.initBluetooth()
 			//初始化 连接蓝牙  -下发配对指令 -会断开连接-直接再次连接 记得不要提示可以蓝牙断开连接
 			//点击配对-连接蓝牙-调用配对-确认配对  取消 断开蓝牙 不走逻辑
-			//
-			// this.loadBluetooth()
 			this.bluetoothClose()
 		},
 		methods: {
@@ -66,11 +72,11 @@
 				const me=this
 				common.loading()
 				console.log('开始升级');
-				bluetooth.sendOTACommand('900000997', (res) => {
+				bluetooth.sendOTACommand(this.car_sn, (res) => {
 						// uni.hideLoading();
 						// console.log('结束？？？？？');
 						
-						bluetooth.onConnectionStateChange('900000997', 'index', (res) => {
+						bluetooth.onConnectionStateChange(this.car_sn, 'index', (res) => {
 							uni.hideLoading();
 							if (!res.connected) {
 								// 蓝牙未连接
@@ -117,7 +123,7 @@
 			console.log(11112222);
 				bluetooth.closeBluetoothAdapter();
 				bluetooth.closeDevice(
-					"900000997",
+					this.car_sn,
 					() => {
 						// this.setData({
 						// 	bt_loading: false
@@ -125,13 +131,13 @@
 					},
 					() => {}
 				);
-				bluetooth.offCharacteristicStateChange("900000997", 'home');
-				bluetooth.offConnectionStateChange("900000997", 'home');	 
+				bluetooth.offCharacteristicStateChange(this.car_sn, 'home');
+				bluetooth.offConnectionStateChange(this.car_sn, 'home');	 
 			},
 			switchNormal(){
 				const me=this
 				app.globalData.connectionState={}
-				bluetooth.sendSwitchNormalCommand('900000997', (res) => {
+				bluetooth.sendSwitchNormalCommand(this.car_sn, (res) => {
 						// uni.hideLoading();
 						console.log(res,'sendSwitchNormalCommand 切换正常工厂模式');
 						//切换工厂模式以后蓝牙断开 重新连接蓝牙
@@ -147,12 +153,12 @@
 					});
 			},
 			nearUnlockBtn(){
-				bluetooth.nearUnlock('900000997', (res) => {
+				bluetooth.nearUnlock(this.car_sn, (res) => {
 						console.log('接近解锁下发成功');
 					});
 			},
 			nearCloseUnlockBtn(){
-				bluetooth.nearCloseUnlock('900000997', (res) => {
+				bluetooth.nearCloseUnlock(this.car_sn, (res) => {
 						console.log('接近解锁下发成功');
 					});
 			},
@@ -168,9 +174,9 @@
 			loadBluetooth() {
 				const me = this;
 				var device = {
-					mac_id: "900000997",
-					btid: "900000997",
-					btkey: "900000997",
+					mac_id: this.car_sn,
+					btid: this.car_sn,
+					btkey: this.car_sn,
 					bt_type: "ZXCAR",
 					device_type: "ZXCAR"
 				};

pages/index/components/AndroidUnlockAuth.vue

@@ -39,7 +39,11 @@ export default {
     value: {
       type: Boolean,
       default: false
-    }
+    },
+    authStepList: {
+      type: Array,
+      default: []
+    },
   },
 	created(){
 		// bluetooth.initBluetooth()
@@ -50,7 +54,6 @@ export default {
     return {
       showDialog: this.value,
       permisionCheckObj: {},
-	  authStepList:[],
 	  isOpenAllPermission:false,//是否打开所有需要权限
     }
   },
@@ -68,15 +71,15 @@ export default {
   watch: {
     value(newValue) {
       this.showDialog = newValue
-      if (newValue) {
-        this._initCheckdPermission()
-      }
+      // if (newValue) {
+      //   this._initCheckdPermission()
+      // }
     }
   },
   methods: {
-    async _initCheckdPermission() {
-		this.authStepList=app.globalData.permissionArr
-    },
+  //   async _initCheckdPermission() {
+		// this.authStepList=app.globalData.permissionArr
+  //   },
     // vue的method里编写如下代码
     async requestAndroidPermission(permisionID) {
       const AUTHORIZ = 1 // 已授权

pages/index/index.css

@@ -24,6 +24,10 @@
 	font-weight: 600;
 	font-size: 40rpx;
 	color: #060809;
+	width: 500rpx;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 	display: flex;
 	align-items: center;
 	justify-content: center;
@@ -46,6 +50,9 @@
 	font-size: 44rpx;
 	color: #060809;
 	text-align:center;
+	display: flex;
+	align-items: baseline;
+	margin-top: 20rpx;
 }
 .update-time-view{
 	justify-content: center;

pages/index/index.vue

@@ -43,20 +43,19 @@
 								style="font-size: 28rpx;font-weight: 500;">%</text></text>
 						<u-line-progress style="width: 100rpx;" active-color="#2ADA62" height="10" :show-percent="false"
 							:percent="car_info.soc"></u-line-progress>
-						<text class="quantity-text flex-row">
-							<text style="font-weight:400;font-size: 22rpx;">{{$t("续航")}}</text>
-							<text style="font-size: 36rpx;">{{car_info.endurance}}</text><text
-								style="font-size: 30rpx;">km</text>
-						</text>
+						<view class="quantity-text flex-row">
+							<view style="font-weight:400;font-size: 22rpx;width: 44rpx;">{{$t("续航")}}</view>
+							<view style="font-size: 36rpx;">{{formatDistance(car_info.endurance) }}<text style="font-size: 30rpx;">{{car_info.endurance>1000?'km':'m'}}</text></view> 
+						</view>
 					</view>
 					<!-- <img :src="car_info.model_images||'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'" style="width: 100%;height: 526rpx;" alt=""> -->
 					<img :src="'https://qiniu.bms16.com/Fg8_p7083jpsy8BXG4bR6yMs7jQX'"
 						style="width: 100%;height: 526rpx;" alt="">
 					<view class="flex-row align-center update-time-view">
 						<text style="margin-right: 10rpx;">{{$t("车辆已关机")}} </text>
-						<text style="margin-right: 10rpx;">{{$t("更新于")}} {{car_info.heart_time|| ''}}11-25 23:05 </text>
-						<img src="https://qiniu.bms16.com/FsL6XWGoIhfsVB7jRg6EGFVsuaTZ"
-							style="width: 24rpx;height: 32rpx;" alt="">
+						<text v-if="car_info.heart_time != 0" style="margin-right: 10rpx;">{{$t("更新于")}} {{car_info.heart_time|| ''}}</text>
+						<img :src="'https://qiniu.bms16.com/'+(isBluethConnect?'Fk3f9H_o-1Wq2xXx7I_xo7bxK1xJ':'FsL6XWGoIhfsVB7jRg6EGFVsuaTZ')"
+							:style="{width: (isBluethConnect?32:24)+'rpx',height: '32rpx'}" alt="">
 					</view>
 				</view>
 				<Control :contrilList="contrilList" />
@@ -104,7 +103,7 @@
 								src="https://qiniu.bms16.com/Ftzyvs5whxDdMFksYChHaWKVb0Uk" alt=""></view>
 						<view class="flex-row config-text-view" @tap="inductiveUnlockHandle">
 							<view class="flex-row font_w_600">{{$t("感应解锁")}}</view>
-							<view class="flex-row tip-text-config">{{$t("请先连接蓝牙")}}</view>
+							<view class="flex-row tip-text-config">{{isBluethConnect?$t("蓝牙配对成功"):$t("请先连接蓝牙")}}</view>
 						</view>
 						<img class="icon_style_28" src="https://qiniu.bms16.com/FqnbZ2iKHmzCGJA8XD30sf5g_CAm" alt="">
 					</view>
@@ -137,8 +136,8 @@
 		</block>
 		<BluetoothUnlockAuth ref="bluetoothUnlockAuth" />
 		<CustomTabbar @changCar='changCar' curt-tab="home"/>
-		<AndroidUnlockAuth :value="isShowPermission" @closePermission="closePermission" v-if="isShowPermission && (platform === 'android')" />
-		<IosUnlockAuth :value="isShowPermission" @closePermission="closePermission" v-else-if="isShowPermission && (platform === 'ios')" />
+		<AndroidUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission" v-if="isShowPermission && (platform === 'android')" />
+		<IosUnlockAuth :authStepList="authStepList" :value="isShowPermission" @closePermission="closePermission" v-else-if="isShowPermission && (platform === 'ios')" />
 	</view>
 </template>
 <script module="tools" lang="wxs" src="@/pages/common/wxs/tools.wxs"></script>
@@ -186,6 +185,7 @@
 				platform:'android',//手机型号
 				isShowPermission:false,//是否打开权限弹窗
 				statusBarHeight:0,
+				isBluethConnect:false, //当前是否蓝牙连接或者配对
 			};
 		},
 		computed: {},
@@ -244,6 +244,8 @@
 
 				return
 			}
+			console.log(app.globalData.connectionState[this.car_sn],'app.globalData.connectionState[this.car_sn]');
+			this.isBluethConnect=app.globalData.connectionState[this.car_sn] && app.globalData.connectionState[this.car_sn].connected
 			this.newsNumFn()
 			this.isLogin = true
 			if (!this.car_info.car_sn) {
@@ -308,15 +310,6 @@
 					complete: function(res) {},
 				})
 			},
-			connectBluetooth() {
-				var device = {
-					mac_id: "900000997",
-					btid: "900000997",
-					btkey: "900000997",
-					bt_type: "ZXCar",
-					device_type: "ZXCar"
-				};
-			},
 			toMoreInfoPage() {
 				uni.navigateTo({
 					url: '/pages/moreInfo/moreInfo',
@@ -332,25 +325,29 @@
 				});
 			},
 			inductiveUnlockHandle() {
-				const permissionArr=permision.requestAndroidPermissions(this.platform)
-				app.globalData.permissionArr=permissionArr
-				// let isOpenAllPermission=false
-				// app.globalData.permissionArr.map(item=>{
-				// 	if(!item.state) isOpenAllPermission=true
-				// })
-				// this.isShowPermission=true
-				this.setData({
-					isShowPermission:true
-				})
-				// this.$refs.bluetoothUnlockAuth.open();	
-				// console.log(this.isOpenAllPermission,'this.isOpenAllPermission');
-				// if(!isOpenAllPermission){
-				// 	common.simpleToast('所需权限开启成功,前往开启蓝牙配对...');
-				// 	uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
-				// }else{
-				// 	this.$refs.bluetoothUnlockAuth.open();	
-				// }
 				
+				if(this.isBluethConnect){
+					uni.navigateTo({ url: '/pages/bluetoothUnlock/unlockSet' })
+				}else{
+					const permissionArr=permision.requestAndroidPermissions(this.platform)
+					console.log(permissionArr,'permissionArr');
+					this.setData({
+						authStepList:permissionArr
+					})
+					let isOpenAllPermission=false
+					permissionArr.map(item=>{
+						if(!item.state) isOpenAllPermission=true
+					})
+					if(!isOpenAllPermission){
+						common.simpleToast('所需权限开启成功,前往开启蓝牙配对...');
+						uni.navigateTo({ url: '/pages/bluetoothUnlock/bluetoothPair' })
+					}else{
+						this.setData({
+							isShowPermission:true,
+						})	
+					}
+				}
+
 			},
 			closePermission(){
 				this.setData({
@@ -365,7 +362,6 @@
 				http.postApi(config.API_RECOMMEND_CAR_MODEL_LIST, {}, (resp) => {
 					if (resp.data.code === 200) {
 						const list = resp.data.data
-						console.log(resp.data.data)
 						const img_list = resp.data.data.map(item => item.image)
 						me.setData({
 							model_list: list,