Merge branch 'lw_test' into gyq_test

common/bluetooth.js

@@ -436,131 +436,131 @@ function alterConnect(device, deviceId, callback = () => {}, fail = () => {}) {
 	console.log(deviceId)
 	// var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
 	//蓝牙不使用登录指令
-	var data = bluetoothDeviceConfig(device).getNearUnlockSet(device, deviceId);
-	setTimeout(()=>{
-		writeData(device, deviceId, data, callback, fail);
-	},3000)
-    // 获取蓝牙设备的服务列表
+	// var data = bluetoothDeviceConfig(device).nearUnlock(device, deviceId);
 	// setTimeout(()=>{
- //    uni.getBLEDeviceServices({
- //        deviceId: deviceId,
- //        success(res) {
- //            console.log(res,'res1111');
-	// 		console.log(bluetoothDeviceConfig(device).writeServiceID)
-	// 		// 获取蓝牙设备的写特征值
-	// 		setTimeout(()=>{
- //            uni.getBLEDeviceCharacteristics({
- //                deviceId: deviceId,
- //                serviceId: bluetoothDeviceConfig(device).writeServiceID,
- //                success(res) {
- //                    console.log(res,'res22222');
- //                    // 获取蓝牙设备的读特征值
- //                    uni.getBLEDeviceCharacteristics({
- //                        deviceId: deviceId,
- //                        serviceId: bluetoothDeviceConfig(device).readServiceID,
- //                        success(res) {
- //                            console.log(res,'res3333');
- //                            // 监听蓝牙设备的读特征值变化
- //                            uni.notifyBLECharacteristicValueChange({
- //                                state: true,
- //                                deviceId: deviceId,
- //                                serviceId: bluetoothDeviceConfig(device).readServiceID,
- //                                characteristicId: bluetoothDeviceConfig(device).readID,
- //                                success(res) {
- //                                    console.log(res);
- //                                    // 判断设备是否支持  ，并且当前平台是否为安卓
- //                                    if (bluetoothDeviceConfig(device).MTU && SystemInfoUtil.platform == SystemInfoUtil.ANDROID) {
- //                                        // 设置蓝牙设备的MTU
- //                                        uni.setBLEMTU({
- //                                            deviceId: deviceId,
- //                                            mtu: bluetoothDeviceConfig(device).MTU,
- //                                            success: (res) => {
- //                                                console.log('setBLEMTU success>>', res);
- //                                                // 判断设备是否有alterConnect方法
- //                                                if (bluetoothDeviceConfig(device).alterConnect) {
- //                                                    var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
-	// 												console.log(data[0],'data111111');
- //                                                    // 判断alterConnect方法是否返回数据
- //                                                    if (data) {
- //                                                        // 写入数据
-	// 													setTimeout(()=>{
-	// 														writeData(device, deviceId, data, callback, fail);
-	// 													},3000)
+	// 	writeData(device, deviceId, data, callback, fail);
+	// },1000)
+    // 获取蓝牙设备的服务列表
+	setTimeout(()=>{
+    uni.getBLEDeviceServices({
+        deviceId: deviceId,
+        success(res) {
+            console.log(res,'res1111');
+			console.log(bluetoothDeviceConfig(device).writeServiceID)
+			// 获取蓝牙设备的写特征值
+			setTimeout(()=>{
+            uni.getBLEDeviceCharacteristics({
+                deviceId: deviceId,
+                serviceId: bluetoothDeviceConfig(device).writeServiceID,
+                success(res) {
+                    console.log(res,'res22222');
+                    // 获取蓝牙设备的读特征值
+                    uni.getBLEDeviceCharacteristics({
+                        deviceId: deviceId,
+                        serviceId: bluetoothDeviceConfig(device).readServiceID,
+                        success(res) {
+                            console.log(res,'res3333');
+                            // 监听蓝牙设备的读特征值变化
+                            uni.notifyBLECharacteristicValueChange({
+                                state: true,
+                                deviceId: deviceId,
+                                serviceId: bluetoothDeviceConfig(device).readServiceID,
+                                characteristicId: bluetoothDeviceConfig(device).readID,
+                                success(res) {
+                                    console.log(res);
+                                    // 判断设备是否支持  ，并且当前平台是否为安卓
+                                    if (bluetoothDeviceConfig(device).MTU && SystemInfoUtil.platform == SystemInfoUtil.ANDROID) {
+                                        // 设置蓝牙设备的MTU
+                                        uni.setBLEMTU({
+                                            deviceId: deviceId,
+                                            mtu: bluetoothDeviceConfig(device).MTU,
+                                            success: (res) => {
+                                                console.log('setBLEMTU success>>', res);
+                                                // 判断设备是否有alterConnect方法
+                                                if (bluetoothDeviceConfig(device).getNearUnlockSet) {
+                                                    var data = bluetoothDeviceConfig(device).getNearUnlockSet(device, deviceId);
+													console.log(data[0],'data111111');
+                                                    // 判断alterConnect方法是否返回数据
+                                                    if (data) {
+                                                        // 写入数据
+														setTimeout(()=>{
+															writeData(device, deviceId, data, callback, fail);
+														},3000)
                                                         
- //                                                    } else {
- //                                                        // 调用回调函数
- //                                                        callback(res);
- //                                                    }
- //                                                } else {
- //                                                    // 调用回调函数
- //                                                    callback(res);
- //                                                }
- //                                            },
- //                                            fail: (res) => {
- //                                                console.log('setBLEMTU fail>>', res);
- //                                                // 判断设备是否有alterConnect方法
- //                                                if (bluetoothDeviceConfig(device).alterConnect) {
- //                                                    var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
- //                                                    // 判断alterConnect方法是否返回数据
- //                                                    if (data) {
- //                                                        // 写入数据
- //                                                        writeData(device, deviceId, data, callback, fail);
- //                                                    } else {
- //                                                        // 调用回调函数
- //                                                        callback(res);
- //                                                    }
- //                                                } else {
- //                                                    // 调用回调函数
- //                                                    callback(res);
- //                                                }
- //                                            }
- //                                        });
- //                                    } else {
- //                                        // 判断设备是否有alterConnect方法
- //                                        if (bluetoothDeviceConfig(device).alterConnect) {
- //                                            var data = bluetoothDeviceConfig(device).alterConnect(device, deviceId);
- //                                            // 判断alterConnect方法是否返回数据
- //                                            if (data) {
- //                                                // 写入数据
- //                                                writeData(device, deviceId, data, callback, fail);
- //                                            } else {
- //                                                // 调用回调函数
- //                                                callback(res);
- //                                            }
- //                                        } else {
- //                                            // 调用回调函数
- //                                            callback(res);
- //                                        }
- //                                    }
- //                                },
- //                                fail(res) {
- //                                    // 调用失败回调函数
- //                                    fail(res);
- //                                }
- //                            });
- //                        },
- //                        fail(res) {
- //                            // 调用失败回调函数
- //                            fail(res);
- //                        }
- //                    });
-	// 			},
- //                fail(res) {
-	// 				console.log('getBLEDeviceServices fail',res);
- //                    // 调用失败回调函数
- //                    fail(res);
- //                }
- //            });	
-	// 		},500)
+                                                    } else {
+                                                        // 调用回调函数
+                                                        callback(res);
+                                                    }
+                                                } else {
+                                                    // 调用回调函数
+                                                    callback(res);
+                                                }
+                                            },
+                                            fail: (res) => {
+                                                console.log('setBLEMTU fail>>', res);
+                                                // 判断设备是否有alterConnect方法
+                                                if (bluetoothDeviceConfig(device).getNearUnlockSet) {
+                                                    var data = bluetoothDeviceConfig(device).getNearUnlockSet(device, deviceId);
+                                                    // 判断alterConnect方法是否返回数据
+                                                    if (data) {
+                                                        // 写入数据
+                                                        writeData(device, deviceId, data, callback, fail);
+                                                    } else {
+                                                        // 调用回调函数
+                                                        callback(res);
+                                                    }
+                                                } else {
+                                                    // 调用回调函数
+                                                    callback(res);
+                                                }
+                                            }
+                                        });
+                                    } else {
+                                        // 判断设备是否有alterConnect方法
+                                        if (bluetoothDeviceConfig(device).getNearUnlockSet) {
+                                            var data = bluetoothDeviceConfig(device).getNearUnlockSet(device, deviceId);
+                                            // 判断alterConnect方法是否返回数据
+                                            if (data) {
+                                                // 写入数据
+                                                writeData(device, deviceId, data, callback, fail);
+                                            } else {
+                                                // 调用回调函数
+                                                callback(res);
+                                            }
+                                        } else {
+                                            // 调用回调函数
+                                            callback(res);
+                                        }
+                                    }
+                                },
+                                fail(res) {
+                                    // 调用失败回调函数
+                                    fail(res);
+                                }
+                            });
+                        },
+                        fail(res) {
+                            // 调用失败回调函数
+                            fail(res);
+                        }
+                    });
+				},
+                fail(res) {
+					console.log('getBLEDeviceServices fail',res);
+                    // 调用失败回调函数
+                    fail(res);
+                }
+            });	
+			},500)
             
- //        },
- //        fail(res) {
+        },
+        fail(res) {
 			
- //            // 调用失败回调函数
- //            fail(res);
- //        }
- //    });
-	// },500)
+            // 调用失败回调函数
+            fail(res);
+        }
+    });
+	},500)
 }
 // 关闭设备连接
 function closeDevice(macid, callback = () => {}, fail = () => {}) {
@@ -1096,7 +1096,7 @@ function executeDeviceCommand(macid, commandName, callback = () => {}, fail = ()
     if (data) {
 		setTimeout(()=>{
 			writeData(device, deviceId, data, callback, fail);
-		},100)
+		},200)
         return true;
     }
     fail();

common/bluetooth/ZXCar.js

@@ -137,9 +137,10 @@ function readData(device, value, data) {
 	const normalArray=Array.from(test);
 	// console.log(bmsData,'bmsData-------------');
 	// const normalArray =packBmsData(bmsData) 
-	
+	console.log('normalArray---------------',normalArray);
+	if(normalArray[2]!=0x7E) return
 	if(normalArray){
-		console.log(normalArray[2],'normalArray---------------');
+		
 		switch(normalArray[2]){
 			case 0x60:
 			//登陆指令
@@ -223,20 +224,20 @@ function readData(device, value, data) {
 function loginCmd(mac_id,data){
 	const len=data.length-4
 	if(data[len-1]==0x00 && data[len]==0x01){
-		uni.showModal({
-			title: '提示',
-			confirmText: '开始升级',
-			content: '登陆成功，当前处于升级模式是否开始升级',
-			success: function(res) {
-				if (res.confirm) {
-					currentCommandIndex=0
-					otaUpgrade().then(()=>{
-						//登陆成功  且当前为升级模式可以发送升级文件
-						sendNextCommand(device.mac_id)
-					})
-				} else {}
-			}
-		});
+		// uni.showModal({
+		// 	title: '提示',
+		// 	confirmText: '开始升级',
+		// 	content: '登陆成功，当前处于升级模式是否开始升级',
+		// 	success: function(res) {
+		// 		if (res.confirm) {
+		// 			currentCommandIndex=0
+		// 			otaUpgrade().then(()=>{
+		// 				//登陆成功  且当前为升级模式可以发送升级文件
+		// 				sendNextCommand(device.mac_id)
+		// 			})
+		// 		} else {}
+		// 	}
+		// });
 	}else if(data[4]==0x00 && data[4]==0x00){
 		// uni.hideLoading();
 		//正常模式

mixin/index.js

@@ -15,7 +15,15 @@ export default {
 	  popText:'',
 	  cmdType:'',
 	  myLocation:{},
-	  popupControlShow:false
+	  popupControlShow:false,
+	  comboDialoginfo: {
+	  	showConfirm: false,
+	  	title: '温馨提示',
+	  	opType: 'combo',
+	  	text: '您还未购买换电套餐，是否前往进行换电套餐？',
+	  	confirmBtnText: '前往购买',
+	  	showCancelButton: false
+	  },
     };
   },
   onLoad(){
@@ -88,34 +96,34 @@ export default {
 				// 判断车辆是否在线状态 true 在线调用接口 不在线提示连接蓝牙
 				if (this.carOnline) {
 					if (this.cmdType == 'turnOnOrOff') {
-						// const switchType = this.contrilList.find(item => item.isTurnOn).isTurnOn
-						// const pData = {
-						// 	car_sn: car_info.car_sn,
-						// 	switch: switchType
-						// }
-						// const me=this
-						// common.loading();
-						// http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
-						// 	uni.hideLoading();
-						// 	if (resp.data.code === 200) {
-						// 		common.simpleToast(me.popText + '成功');
-						// 		const activeTag = me.contrilList.map(item => {
-						// 			if('isLock' in item){
-						// 				item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
-						// 				item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
-						// 			}
-						// 			return item
-						// 		})
-						// 		const tag = getFunctionTag().tag
-						// 		setFunctionTag({
-						// 			activeTag,
-						// 			tag
-						// 		})
-						// 		me.$emit('loadCarDetail',pData,car_sn)
-						// 	} else {
-						// 		common.simpleToast(resp.data.msg);
-						// 	}
-						// });
+						const switchType = this.contrilList.find(item => item.isTurnOn).isTurnOn
+						const pData = {
+							car_sn: car_info.car_sn,
+							switch: switchType
+						}
+						const me=this
+						common.loading();
+						http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
+							uni.hideLoading();
+							if (resp.data.code === 200) {
+								common.simpleToast(me.popText + '成功');
+								const activeTag = me.contrilList.map(item => {
+									if('isLock' in item){
+										item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
+										item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
+									}
+									return item
+								})
+								const tag = getFunctionTag().tag
+								setFunctionTag({
+									activeTag,
+									tag
+								})
+								me.$emit('loadCarDetail',pData,car_sn)
+							} else {
+								common.simpleToast(resp.data.msg);
+							}
+						});
 					}else{
 						const testArr=[
 							{type:'findCar',opt_type:1},
@@ -192,36 +200,94 @@ export default {
 				})
 			}
 		},
-		trunOn(){
-			const switchType = this.contrilList.find(item => item.isTurnOn).isTurnOn
-			const pData = {
-				car_sn: car_info.car_sn,
-				switch: switchType
-			}
-			const me=this
-			common.loading();
-			http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
-				uni.hideLoading();
-				if (resp.data.code === 200) {
-					common.simpleToast(me.popText + '成功');
-					const activeTag = me.contrilList.map(item => {
-						if('isLock' in item){
-							item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
-							item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
-						}
-						return item
-					})
-					const tag = getFunctionTag().tag
-					setFunctionTag({
-						activeTag,
-						tag
-					})
-					me.$emit('loadCarDetail',pData,car_sn)
-				} else {
-					common.simpleToast(resp.data.msg);
+		trunOn(type){
+			
+			if (this.carOnline) {
+				//开机1 关机0
+				const car_sn= uni.getStorageSync('car_info').car_sn;
+				const pData = {
+					car_sn,
+					switch: switchType
+				}
+				const me=this
+				common.loading();
+				http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
+					uni.hideLoading();
+					if (resp.data.code === 200) {
+						common.simpleToast(me.popText + '成功');
+						const activeTag = me.contrilList.map(item => {
+							if('isLock' in item){
+								item.isTurnOn = (item.isTurnOn == 1) ? 0 : 1
+								item.name = i18n.t((item.isTurnOn == 1) ? '关机' : '开机')
+							}
+							return item
+						})
+						const tag = getFunctionTag().tag
+						setFunctionTag({
+							activeTag,
+							tag
+						})
+						me.$emit('loadCarDetail',pData,car_sn)
+					} else {
+						common.simpleToast(resp.data.msg);
+					}
+				});
+			}else{
+				//车辆离线
+				const car_sn= uni.getStorageSync('car_info').car_sn;
+				common.loading();
+				if (type==1) {
+					bluetooth.turnOnCar(car_sn, () => {
+						uni.hideLoading();
+					});
+				}else{
+					bluetooth.turnOffCar(car_sn, () => {
+						uni.hideLoading();
+					});
 				}
-			});
-		}
+			}
+		},
+		async navToInputPages() {
+			const me = this
+			const exchange_need_package=uni.getStorageSync('car_info').exchange_need_package;
+			if(exchange_need_package==0){
+				uni.scanCode({
+					scanType:['qrCode'],
+					success(res) {
+						me.loadGeneralQRData(res.result)
+					},
+					fail() {
+						me.$msg('扫码失败，请重新扫码')
+					}
+				})
+			}else if(exchange_need_package==1){
+				this.comboDialoginfo.showConfirm = true
+			}else if(exchange_need_package==-1){
+				this.$msg('当前车辆暂未绑定电池')
+			}
+			
+		},
+		loadGeneralQRData(options) {
+			console.log(options)
+			let objOpt = this.$paramsObj(options)
+			
+			if (objOpt.d) {
+				console.log('扫码的是机柜')
+				uni.navigateTo({
+					url: `/pages/cabinetDetail/cabinetDetail?dev_id=${objOpt.d}`,
+				})
+				return
+			} else {
+				console.log('扫码的是车辆')
+				this.$msg('请扫描机柜二维码')
+				return
+			}
+		},
+		dialogConfirm(type) {
+			uni.navigateTo({
+				url: `/pages/batteryPackage/batteryPackage`
+			})
+		},
 	},
 
  

pages/index/components/control/control.css

@@ -201,3 +201,4 @@
 	display: flex;
 	flex-grow: 1;
 }
+

pages/index/components/control/control.vue

@@ -15,7 +15,7 @@
 				<view :style="sliderStyle" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd" class="power-on-btn"><image style="width: 52rpx;height: 52rpx;" src="https://qiniu.bms16.com/Fkovrpq1bexe-Unal_VJREbLUhdu" mode=""></image></view>
 				<view class="power-on-text" >滑动启动</view>
 			</view>
-			<view class="car-change-battery flex-row">
+			<view @tap="navToInputPages" class="car-change-battery flex-row">
 				<view class="car-change-btn"><image style="width: 80rpx;height: 80rpx;" src="https://qiniu.bms16.com/FgvnT-msLbL5RHjl6fvNlM0kab5N" mode=""></image></view>
 				<view class="car-change-text">车辆换电</view>
 			</view>
@@ -67,7 +67,7 @@
 			</view>
 		</view>
    -->
-   
+   <Confirm v-model="comboDialoginfo.showConfirm" :dialog-info="comboDialoginfo" @confirm="dialogConfirm" />
 	</view>
 </template>
 
@@ -76,6 +76,7 @@
 	var config = require('@/common/config.js');
 	var common = require('@/common/common.js');
 	var http = require('@/common/http.js');
+	import Confirm from '@/component/comPopup/Confirm'
 	import controlMixin from '@/mixin/index';
 	import i18n from '@/locale/index.js'
 	import {
@@ -94,7 +95,9 @@ export default {
 			default: false
 		},
 	},
-	
+	components: {
+		Confirm,
+	},
     data() {
         return {
 			// popText:'',
@@ -104,7 +107,7 @@ export default {
 			car_line:false,
 			startX: 0, // 滑块开始滑动的初始位置
 			moveX: 0, // 滑块滑动的距离
-			unlocked: false // 是否解锁成功的标志
+			unlocked: false, // 是否解锁成功的标志
 		};
     },
 	computed: {

pages/index/index.vue

@@ -43,7 +43,7 @@
 						</view>
 						<view @click="routerLink('/pages/order/order')" class="renew-btn">去续费</view>
 					</view>
-					<view class="car-img-view" @tap="toMoreInfoPage">
+					<view class="car-img-view" >
 						<view class="flex-row flex-between" style="align-items: center;">
 							<text class="quantity flex-row">{{car_info.soc}} <text
 									style="font-size: 28rpx;font-weight: 500;">%</text></text>
@@ -63,7 +63,7 @@
 						<!-- <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="custom-swiper-view">
+							<view @tap="toMoreInfoPage" class="custom-swiper-view">
 								<u-swiper v-if="car_image.length!=0" :list="car_image"  :autoplay="false" mode="none"
 									 :height="480" bgColor="transparent" class="custom-swiper">
 								</u-swiper>
@@ -494,6 +494,7 @@
 				})
 			},
 			formatDistance(distanceMeters) {
+				console.log(distanceMeters,'distanceMeters');
 				// 判断距离是否超过1000米  
 				// let distanceMeters=Number(_distanceMeters)
 				if (distanceMeters >= 1000) {
@@ -502,7 +503,7 @@
 				} else {
 					// 否则直接返回米  
 					try {
-						return distanceMeters.toFixed(0);
+						return distanceMeters;
 					} catch (error) {
 						return 0;
 					}