控制和灵敏度调节

.hbuilderx/launch.json

@@ -21,6 +21,10 @@
         {
             "playground" : "standard",
             "type" : "uni-app:app-android"
+        },
+        {
+            "playground" : "standard",
+            "type" : "uni-app:app-ios"
         }
     ]
 }

common/bluetooth.js

@@ -1038,8 +1038,24 @@ function getSensitivity(macid, callback = () => {}, fail = () => {}) {
     return executeDeviceCommand(macid, 'getSensitivity', callback, fail);
 }
 //设置灵敏度
-function setSensitivity(macid, callback = () => {}, fail = () => {}) {
-    return executeDeviceCommand(macid, 'setSensitivity', callback, fail);
+function setSensitivity(macid,type, callback = () => {}, fail = () => {}) {
+	const deviceId = Object.keys(app.globalData.connectionState).find((i) => app.globalData.connectionState[i].device.mac_id == macid);
+	if (deviceId == undefined) {
+	    fail();
+	    return false;
+	}
+	const device = app.globalData.connectionState[deviceId].device;
+	if (!bluetoothDeviceConfig(device)[setSensitivity]) {
+	    fail();
+	    return false;
+	}
+	var data = bluetoothDeviceConfig(device)[setSensitivity](device, deviceId,type);
+	if (data) {
+	    writeData(device, deviceId, data, callback, fail);
+	    return true;
+	}
+	fail();
+	return false;
 }
 //
 function setNearUnlock(macid, callback = () => {}, fail = () => {}) {

common/bluetooth/ZXCar.js

@@ -125,8 +125,8 @@ function readData(device, value, data) {
 			loginCmd(device.mac_id,normalArray)
 			break;
 			
-			case 0x61||0x62||0x65:
-			//开机指令
+			case 0x61||0x62||0x65||0x7F:
+			//开机指令 关机  寻车 //设置灵敏度回复
 			trunCarCommand(device.mac_id,normalArray)
 			break;
 			
@@ -139,10 +139,12 @@ function readData(device, value, data) {
 			//接近解锁指令
 			nearCarCmd(device.mac_id,normalArray)
 			break;
+			
 			case 0x7E:
-			//升级指令
+			//获取车辆接近解锁 是否配对 灵敏度信息
 			getNearCarCmdInfo(device.mac_id,normalArray)
 			break;
+			
 		}
 	}
 		

components/basic-drag/index.vue

@@ -11,7 +11,7 @@
 					<image v-if="item.isLock" :src="icons.lock" class="right-icon" />
 					<image v-if="!item.isLock && isActiveEdit" @click="deleteTab(item)" :src="icons.edit"
 						class="right-icon" />
-					<image :src="item.iconUrl" class="icon" />
+					<image @click="clickTap(item)" :src="item.iconUrl" class="icon" />
 					<view>{{ item.name }}</view>
 				</view>
 			</view>
@@ -130,6 +130,10 @@
 			}
 		},
 		methods: {
+			
+			clickTap(item){
+				this.$emit('changClick',item)
+			},
 			getMovableItem(tab) {
 				return this.isActiveEdit && !tab.isLock && !tab.isPlaceholder
 			},

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "弗兰克",
-    "appid" : "__UNI__111A022",
+    "appid" : "__UNI__E67DD80",
     "description" : "",
     "versionName" : "1.3.0",
     "versionCode" : 130,
@@ -21,10 +21,8 @@
             "ignoreVersion" : true
         },
         "modules" : {
-            "Payment" : {},
             "Bluetooth" : {},
             "Geolocation" : {},
-            "Share" : {},
             "Maps" : {}
         },
         "distribute" : {

mixin/index.js

@@ -1,22 +1,181 @@
 // mixins/countdownMixin.js
 var bluetooth = require('@/common/bluetooth.js');
+import {getFunctionTag,setFunctionTag} from '@/common/storage.js';
+var app = getApp();
+var config = require('@/common/config.js');
+var common = require('@/common/common.js');
+var http = require('@/common/http.js');
+import i18n from '@/locale/index.js'
 export default {
   data() {
     return {
-      testCountdown: 10, // 倒计时初始值
+      carOnline: false, // 倒计时初始值
+	  popText:'',
+	  cmdType:'',
+	  popupControlShow:false
     };
   },
   methods: {
-    startCountdown(t) {
-      this.testCountdown=20
-	  console.log('test-----',t,this.testCountdown);
-    },
-  },
+		tapOpenControl(e){
+			console.log(111);
+			const _carOnline=uni.getStorageSync('car_info').online!=0 //在线
+			console.log(this.popupControlShow);
+			const {name,type}=e
+			this.setData({
+				carOnline:_carOnline,
+				popText:name,
+				cmdType:type,
+				popupControlShow:true
+			})
+			console.log(this.popupControlShow);
+		},
+		changClick(tab){
+			const typeArr=['tirePressure','batteryInfo','navigation']
+			const isOther=typeArr.findIndex(t => t === tab.type)!==-1
+			console.log('isOther',isOther);
+			if(isOther){
+				const {name,type}=tab
+				this.setData({
+					popText:name,
+					cmdType:type,
+				})
+				this.tapBlueToothCmd()
+			}else{
+				this.tapOpenControl(tab)
+			}
+		},
+		closePopup(){
+			this.popupControlShow=false
+		},
+		tapBlueToothCmd(isCarLocation=false){
+			const car_info= uni.getStorageSync('car_info');
+			if(this.cmdType=='batteryInfo'){
+				uni.navigateTo({
+					url:`/pages/batteryDetail/batteryDetail`
+				})
+			}else if(this.cmdType=='navigation'){
+				const {
+					address,
+					latitude,
+					longitude,
+					car_name
+				} =car_info
+				uni.openLocation({
+					latitude: latitude - 0,
+					longitude: longitude - 0,
+					scale: 15,
+					name: car_name,
+					address: address,
+					success: function (res) {},
+				})
+				//获取胎压
+			}else if(this.cmdType=='tirePressure'){
+				this.bluetoothCmd()
+			}else{
+				// 判断车辆是否在线状态 true 在线调用接口 不在线提示连接蓝牙
+				if (this.carOnline) {
+					if(this.cmdType=='turnOnOrOff'){
+						const switchType=this.contrilList.find(item => item.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=>{
+									item.isTurnOn=(item.isTurnOn==1)?0:1
+									item.name=i18n.t((item.isTurnOn==1)?'关机':'开机')
+									return item
+								})
+								const tag=getFunctionTag().tag
+								setFunctionTag({activeTag,tag})
+								
+							} else {
+								common.simpleToast(resp.data.msg);
+							}
+						});
+					}else{
+						const testArr=[
+							{type:'findCar',opt_type:1},
+							{type:'openSeatBag',opt_type:0},
+							{type:'openTailBox',opt_type:2},
+							]
+						const pData = testArr.find(i=>i.type===this.cmdType)
+						const me=this
+						common.loading();
+						http.postApi(config.API_FLK_CAR_REMOTE_CONTROL, pData, (resp) => {
+							uni.hideLoading();
+							if (resp.data.code === 200) {
+								common.simpleToast(me.popText + '成功');
+							} else {
+								common.simpleToast(resp.data.msg);
+							}
+						});
+					}
+				} else {
+					this.bluetoothCmd(isCarLocation)
+				}
+			}
+			this.popupControlShow=false
+		},
+		bluetoothCmd(isCarLocation){
+			const me=this
+			const car_info= uni.getStorageSync('car_info');
+			//蓝牙是否已经连接 未连接提示去连接 已连接下发对应指令
+			const isBluetoothConnect = app.globalData.connectionStateChangeFunc[car_info.car_sn]
+			if(isBluetoothConnect){
+				const isTurnOn=this.contrilList.find(item => item.isTurnOn).isTurnOn==1
+				console.log(isTurnOn,this.cmdType,this.contrilList);
+				const bluetoothCommands = {
+					'turnOnOrOff': isTurnOn?bluetooth.turnOnCar:bluetooth.turnOffCar,
+					'findCar': bluetooth.findCarCmd,
+					'openSeatBag': bluetooth.openCarSeat,
+					'openTailBox': bluetooth.openCarTrunk,
+					'tirePressure': bluetooth.getCarPressure
+				};
+				common.loading();
+				const command = bluetoothCommands[this.cmdType];
+				if (command) {
+					command('900000997', () => {
+						uni.hideLoading();
+						if(this.cmdType=='openSeatBag'||this.cmdType=='openTailBox'){
+							common.simpleToast('操作成功');
+						}
+						console.log(`发送${this.popText}指令结束`);
+					});
+				}
+			}else{
+				uni.showModal({
+					title: '提示',
+					content: '当前车辆处于离线，是否前往开启蓝牙配对操作车辆？',
+					showCancel: true,
+					cancelText: '取消',
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							if(isCarLocation){
+								uni.switchTab({
+									url:'/pages/index/index'
+								})
+							}else{
+								me.$emit('toBluetooth')
+							}
+							
+						}
+					},
+					fail: function(res) {},
+					complete: function(res) {},
+				})
+			}
+		}
+	},
   created(){
-	  this.startCountdown(1)
   },
   mounted() {
-	  this.startCountdown(2)
   },
   beforeDestroy() {
   },

pages/bluetoothUnlock/unlockSet.vue

@@ -20,8 +20,14 @@
             <view class="popup-content">
                 <view class="title">灵敏度设置</view>
                 <view class="text">距离建议适中，设置过近会降低成功率，设置过远可能会有风险</view>
-				<u-slider v-model="sensitivityValue" :step="1" :min="0" :max="4" @end="changeValue"></u-slider>
-				<slider v-model="sensitivityValue" @change="changeValue"  height="16rpx" :step="1" :min="0" :max="4" activeColor="#060809" backgroundColor="#F1F3F4" block-color="#8A6DE9" block-size="20"></slider>
+				<!-- <slider v-model="sensitivityValue" @change="changeValue"   height="16" :step="1" :min="0" :max="4" activeColor="#060809" backgroundColor="#F1F3F4" block-color="#060809" block-size="20"></slider> -->
+				<u-slider v-model="sensitivityValue"  height="16"  :step="1" :min="0" :max="4" @end="changeValue" activeColor="#060809" backgroundColor="#F1F3F4" block-color="#060809"></u-slider>
+				<view class="flex-row step-text">
+					<text>最近</text>
+					<text>适中</text>
+					<text>最远</text>
+				</view>
+				<!-- <slider v-model="sensitivityValue" @change="changeValue"   height="16rpx" :step="1" :min="0" :max="4" activeColor="#060809" backgroundColor="#F1F3F4" block-color="#8A6DE9" block-size="20"></slider> -->
                 <!-- <u-slider v-model="sensitivityValue" height="16rpx" inactive-color="#F1F3F4" active-color="#060809" :step="1" :min="0" :max="4"></u-slider> -->
             </view>
         </u-popup>
@@ -30,17 +36,16 @@
 
 <script>
 	var bluetooth = require('@/common/bluetooth.js');
+	var app = getApp();
 export default {
     data () {
         return {
             showSensitivityDialog: true,
-            sensitivityValue: 2
+            sensitivityValue: 50
         }
     },
 	onLoad(){
-		bluetooth.getSensitivity('',()=>{
-			
-		})	
+			this.sensitivityValue=app.globalData.nearLockInfo.level-0
 	},
     methods: {
         close () {
@@ -50,9 +55,12 @@ export default {
 			this.showSensitivityDialog = true
 			
 		},
-		changeValue(e){
-			const type=e.detail.value
-			bluetooth.setSensitivity('',type,()=>{
+		changeValue(value){
+			console.log(value,this.sensitivityValue);
+			//value 0 1 2 3 4
+			const car_sn = uni.getStorageSync('car_info').car_sn
+			common.loading();
+			bluetooth.setSensitivity(car_sn,value,()=>{
 				console.log('设置灵敏度指令成功');
 			})
 			
@@ -167,5 +175,13 @@ export default {
             margin: 32rpx 0 40rpx;
         }
     }
+	.step-text{
+		margin-top: 32rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 400;
+		font-size: 28rpx;
+		color: #060809;
+		justify-content: space-between;
+	}
 }
 </style>

pages/carFunctionSet/more.vue

@@ -14,7 +14,7 @@
           <view :class="['name', getMovableItem(tab) && 'shake']">{{ tab.name }}</view>
         </view>
       </draggable> -->
-			<basic-drag @end='endFn' @toggleEdit='toggleEdit' v-model="activeTabs" :width="700" :column="4"
+			<basic-drag @changClick='changClick' @end='endFn'   @toggleEdit='toggleEdit' v-model="activeTabs" :width="700" :column="4"
 				itemKey="name"></basic-drag>
 
 		</view>
@@ -31,6 +31,16 @@
 		</view>
 		<view class="tips">{{ $t('长按拖动可调整顺序，可增减固定导航栏内容') }}</view>
 		<view class="un-bind-btn" @tap="toUnbind">{{ $t('解除绑定') }}</view>
+		<view v-if="popupControlShow" class="show-modal">
+			<view class="modal-info">
+				<view class="popup-title">{{$t(popText)}}</view>
+				<view class="popup-content">{{$t("您确认")+$t(popText)}}</view>
+				<view class="flex-row modal-footer">
+					<view class="show-btn cencel-btn-pop" @tap="closePopup">{{$t("取消")}}</view>
+					<view class="show-btn ok-btn-pop" @tap="tapBlueToothCmd">{{$t("确定")}}</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -44,6 +54,7 @@
 		setFunctionTag,
 		getFunctionTag,
 	} from '@/common/storage.js';
+	import controlMixin from '@/mixin/index';
 	const ICONS = {
 		lock: `${QINIU_URL}FgMCTZCySvEgLYgkzU65BUR4f4Ls`,
 		edit: `${QINIU_URL}Fq3V1Zi5tKH7ibTwG1nO7N96CU8m`,
@@ -52,6 +63,7 @@
 	}
 
 	export default {
+		mixins: [controlMixin],
 		components: {
 			// draggable
 			BasicDrag
@@ -64,7 +76,7 @@
 				icons: ICONS,
 				isActiveEdit: false,
 				activeTabs: [],
-				toBeSelectTabs: []
+				toBeSelectTabs: [],
 			}
 		},
 		computed: {
@@ -80,6 +92,7 @@
 		},
 		methods: {
 			endFn(list, removedTab) {
+				console.log(list, removedTab,'list, removedTab');
 				if (removedTab) {
 					this.toBeSelectTabs.push(removedTab)
 					this.activeTabs = list
@@ -98,9 +111,24 @@
 				this.toBeSelectTabs = getFunctionTag().tag
 			},
 			toggleEdit(e) {
-				// this.isActiveEdit = e
+				console.log(e,'eeeeeee');
+				this.isActiveEdit = e
 			},
 			addItemTab(tab) {
+				// const typeArr=['tirePressure','batteryInfo','navigation']
+				// const isOther=typeArr.findIndex(t => t === tab.type)!==-1
+				// if(isOther){
+				// 	const {name,type}=tab
+				// 	this.setData({
+				// 		popText:name,
+				// 		cmdType:type,
+				// 	})
+				// 	this.tapBlueToothCmd()
+				// }else{
+				// 	this.tapOpenControl(tab)
+				// }
+				this.changClick(tab)
+				if(!this.isActiveEdit) return
 				const index = this.toBeSelectTabs.findIndex(t => t.name === tab.name)
 				if (index !== -1) {
 					const removedTab = this.toBeSelectTabs.splice(index, 1)[0]
@@ -122,12 +150,12 @@
 				setFunctionTag(obj)
 			},
 
-
 			toUnbind() {
 				uni.navigateTo({
 					url: '/pages/carFunctionSet/unbind'
 				})
-			}
+			},
+			
 		}
 	}
 </script>
@@ -226,5 +254,62 @@
 				opacity: .7;
 			}
 		}
+		.show-modal{
+			position: fixed;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			background-color: rgba(0, 0, 0, 0.5);
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			z-index: 9999;
+		}
+		.modal-info{
+			background-color: #fff;
+			padding: 20px;
+			border-radius: 20px;
+			width: 80%;
+			max-width: 300px;
+		}
+		.modal-footer{
+			width: 100%;
+			align-items: center;
+		}
+		.show-btn{
+			border-radius: 40rpx;
+			width: 50%;
+			/* width: 230rpx; */
+			text-align: center;
+			font-weight: 600;
+			font-size: 32rpx;
+			border-radius: 40rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+		}
+		.cencel-btn-pop{
+			color: #060809;
+			background: #EBECEC;
+			margin-right: 12rpx;
+		}
+		.ok-btn-pop{
+			color: #FFFFFF;
+			background: #060809;
+		}
+		.popup-title{
+			font-weight: 600;
+			font-size: 36rpx;
+			color: #060809;
+			text-align: center;
+			margin-bottom:32rpx;
+		}
+		.popup-content{
+			text-align: center;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #828384;
+			margin-bottom: 48rpx;
+		}
 	}
 </style>

pages/carLocation/carLocation.vue

@@ -20,7 +20,7 @@
 				<img style="width: 112rpx;height: 64rpx;" src="https://qiniu.bms16.com/Fts38M35doVjK09GfOza5qD-wwkK" alt="">
 			</view>
 			<view v-if="car_info.heart_time" class="updata-time">更新于 {{car_info.heart_time}} </view>
-			<view class="car-config-btn">闪灯鸣笛</view>
+			<view @tap="findCar"  class="car-config-btn">闪灯鸣笛</view>
 		</view>
 	</view>
 </template>
@@ -29,10 +29,11 @@
 	import dayjs from "dayjs";
 import googleMap from "@/component/googleMap/googleMap";
 	const http = require('../../common/request.js');
-
 	const config = require('../../common/config.js');
 	const common = require('../../common/common.js');
+	import controlMixin from '@/mixin/index';
 	export default {
+		mixins: [controlMixin],
 		components:{
 			googleMap
 		},
@@ -182,6 +183,28 @@ import googleMap from "@/component/googleMap/googleMap";
 			
 			showNav() {
 				this.is_show_nav = true
+			},
+			
+			findCar(){
+				const me=this
+				uni.showModal({
+					title: '提示',
+					content: '您确认开启闪灯鸣笛吗',
+					showCancel: true,
+					cancelText: '取消',
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							me.setData({
+								popText:'闪灯鸣笛',
+								cmdType:'findCar',
+							})
+							me.tapBlueToothCmd(true)
+						}
+					},
+					fail: function(res) {},
+					complete: function(res) {},
+				})
 			}
 		}
 	};

pages/index/components/control/control.vue

@@ -10,7 +10,7 @@
 				<text>{{$t("更多功能")}}</text>
 			</view>
 		</scroll-view>
-		<view v-if="popupShow" class="show-modal">
+		<view v-if="popupControlShow" class="show-modal">
 			<view class="modal-info">
 				<view class="popup-title">{{$t(popText)}}</view>
 				<view class="popup-content">{{$t("您确认")+$t(popText)}}</view>
@@ -20,7 +20,7 @@
 				</view>
 			</view>
 		</view>
-		<!-- <u-popup v-model="popupShow" mode="center" border-radius="30" height="30%" length="60%">
+		<!-- <u-popup v-model="popupControlShow" mode="center" border-radius="30" height="30%" length="60%">
 			<view class="popup-title">开启车辆</view>
 			<view class="popup-content">确定打开</view>
 			<view class="flex-row">
@@ -67,28 +67,30 @@
 	var config = require('@/common/config.js');
 	var common = require('@/common/common.js');
 	var http = require('@/common/http.js');
+	import controlMixin from '@/mixin/index';
 	import i18n from '@/locale/index.js'
 	import {
 			getFunctionTag,
 			setFunctionTag
 		} from '@/common/storage.js';
 export default {
+	mixins: [controlMixin],
 	props:{
 		contrilList: {
 			type: Array,
 			default: () => []
 		},
-		accState: {
-			type: Number,
-			default: 0
+		online: {
+			type: Boolean,
+			default: false
 		},
 	},
 	
     data() {
         return {
-			popText:'',
-			popupShow:false,
-			controlType:null,//选择的车辆控制
+			// popText:'',
+			// popupControlShow:false,
+			// controlType:null,//选择的车辆控制
 			isShowMore:false,
 			car_line:false
 		};
@@ -102,126 +104,154 @@ export default {
      */
     methods: {
 		tapOpen(e){
-			console.log( getFunctionTag().activeTag, getFunctionTag());
-			const {name,type} = e.currentTarget.dataset.item;
-			this.setData({
-				popText:name,
-				cmdType:type,
-				popupShow:true
-			})
-		},
-		tapBlueToothCmd(){
-			const car_info= uni.getStorageSync('car_info');
-
-			// 判断车辆是否在线状态
-			if (this.car_line) {
-				if(this.cmdType=='batteryInfo'){
-					uni.navigateTo({
-						url:`/pages/batteryDetail/batteryDetail`
-					})
-				}else if(this.cmdType=='navigation'){
-					const {
-						address,
-						latitude,
-						longitude,
-						car_name
-					} =car_info
-					uni.openLocation({
-						latitude: latitude - 0,
-						longitude: longitude - 0,
-						scale: 15,
-						name: car_name,
-						address: address,
-						success: function (res) {},
-					})
-				}else if(this.cmdType=='turnOnOrOff'){
-					const switchType=this.contrilList.find(item => item.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=>{
-								item.isTurnOn=(item.isTurnOn==1)?0:1
-								item.name=i18n.t((item.isTurnOn==1)?'关机':'开机')
-								return item
-							})
-							const tag=getFunctionTag().tag
-							setFunctionTag({activeTag,tag})
-							
-						} else {
-							common.simpleToast(resp.data.msg);
-						}
-					});
-				}else{
-					const testArr=[
-						{type:'findCar',opt_type:1},
-						{type:'openSeatBag',opt_type:0},
-						{type:'openTailBox',opt_type:2},
-						]
-					const pData = testArr.find(i=>i.type===this.cmdType)
-					const me=this
-					common.loading();
-					http.postApi(config.API_FLK_CAR_REMOTE_CONTROL, pData, (resp) => {
-						uni.hideLoading();
-						if (resp.data.code === 200) {
-							common.simpleToast(me.popText + '成功');
-						} else {
-							common.simpleToast(resp.data.msg);
-						}
-					});
-				}
-			} else {
-				const isTurnOn=this.contrilList.find(item => item.isTurnOn).isTurnOn==1
-				console.log(isTurnOn,this.cmdType,this.contrilList);
-				const bluetoothCommands = {
-					'turnOnOrOff': isTurnOn?bluetooth.turnOnCar:bluetooth.turnOffCar,
-					'findCar': bluetooth.findCarCmd,
-					'openSeatBag': bluetooth.openCarSeat,
-					'openTailBox': bluetooth.openCarTrunk,
-					'tirePressure': bluetooth.getCarPressure
-				};
-				
-				common.loading();
-				const command = bluetoothCommands[this.cmdType];
-				if (command) {
-					command('900000997', () => {
-						uni.hideLoading();
-						console.log(`发送${this.popText}指令结束`);
-					});
-				}
-			}
-			this.popupShow=false
-
-		},
-		closePopup(){
-			this.popupShow=false
-		},
-		tapOpenMore(){
-			// this.isShowMore=true
-		},
-		closeMore(){
-			this.isShowMore=false
-		},
-		navUrl(url){
-			// ifconsole.log(url,'sj');
-		},
-		navCarLocation(){
-			//前往配置更多功能
-			uni.navigateTo({
-				url:'/pages/carLocation/carLocation'
-			})
+				const item = e.currentTarget.dataset.item;
+				this.changClick(item)
 		},
 		toMoreFunctionSet() {
 			uni.navigateTo({
-				url: '/pages/carFunctionSet/more'
+				url: '/pages/carFunctionSet/more?online='+this.online
 			})
 		}
+		// tapOpen(e){
+		// 	this.carOnline=this.online
+		// 	console.log( getFunctionTag().activeTag, getFunctionTag());
+		// 	const {name,type} = e.currentTarget.dataset.item;
+		// 	this.setData({
+		// 		popText:name,
+		// 		cmdType:type,
+		// 		popupControlShow:true
+		// 	})
+		// },
+		// tapBlueToothCmd(){
+		// 	const car_info= uni.getStorageSync('car_info');
+		// 	const me=this
+		// 	// 判断车辆是否在线状态 true 在线调用接口 不在线提示连接蓝牙
+		// 	if (this.online) {
+		// 		if(this.cmdType=='batteryInfo'){
+		// 			uni.navigateTo({
+		// 				url:`/pages/batteryDetail/batteryDetail`
+		// 			})
+		// 		}else if(this.cmdType=='navigation'){
+		// 			const {
+		// 				address,
+		// 				latitude,
+		// 				longitude,
+		// 				car_name
+		// 			} =car_info
+		// 			uni.openLocation({
+		// 				latitude: latitude - 0,
+		// 				longitude: longitude - 0,
+		// 				scale: 15,
+		// 				name: car_name,
+		// 				address: address,
+		// 				success: function (res) {},
+		// 			})
+		// 		}else if(this.cmdType=='turnOnOrOff'){
+		// 			const switchType=this.contrilList.find(item => item.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=>{
+		// 						item.isTurnOn=(item.isTurnOn==1)?0:1
+		// 						item.name=i18n.t((item.isTurnOn==1)?'关机':'开机')
+		// 						return item
+		// 					})
+		// 					const tag=getFunctionTag().tag
+		// 					setFunctionTag({activeTag,tag})
+							
+		// 				} else {
+		// 					common.simpleToast(resp.data.msg);
+		// 				}
+		// 			});
+		// 		}else{
+		// 			const testArr=[
+		// 				{type:'findCar',opt_type:1},
+		// 				{type:'openSeatBag',opt_type:0},
+		// 				{type:'openTailBox',opt_type:2},
+		// 				]
+		// 			const pData = testArr.find(i=>i.type===this.cmdType)
+		// 			const me=this
+		// 			common.loading();
+		// 			http.postApi(config.API_FLK_CAR_REMOTE_CONTROL, pData, (resp) => {
+		// 				uni.hideLoading();
+		// 				if (resp.data.code === 200) {
+		// 					common.simpleToast(me.popText + '成功');
+		// 				} else {
+		// 					common.simpleToast(resp.data.msg);
+		// 				}
+		// 			});
+		// 		}
+		// 	} else {
+		// 		//蓝牙是否已经连接 未连接提示去连接 已连接下发对应指令
+		// 		const isBluetoothConnect = app.globalData.connectionStateChangeFunc[car_info.car_sn]
+		// 		if(isBluetoothConnect){
+		// 			const isTurnOn=this.contrilList.find(item => item.isTurnOn).isTurnOn==1
+		// 			console.log(isTurnOn,this.cmdType,this.contrilList);
+		// 			const bluetoothCommands = {
+		// 				'turnOnOrOff': isTurnOn?bluetooth.turnOnCar:bluetooth.turnOffCar,
+		// 				'findCar': bluetooth.findCarCmd,
+		// 				'openSeatBag': bluetooth.openCarSeat,
+		// 				'openTailBox': bluetooth.openCarTrunk,
+		// 				'tirePressure': bluetooth.getCarPressure
+		// 			};
+		// 			common.loading();
+		// 			const command = bluetoothCommands[this.cmdType];
+		// 			if (command) {
+		// 				command('900000997', () => {
+		// 					uni.hideLoading();
+		// 					if(this.cmdType=='openSeatBag'||this.cmdType=='openTailBox'){
+		// 						common.simpleToast('操作成功');
+		// 					}
+		// 					console.log(`发送${this.popText}指令结束`);
+		// 				});
+		// 			}
+		// 		}else{
+		// 			uni.showModal({
+		// 				title: '提示',
+		// 				content: '当前车辆处于离线，是否前往开启蓝牙配对操作车辆？',
+		// 				showCancel: true,
+		// 				cancelText: '取消',
+		// 				confirmText: '确定',
+		// 				success: function(res) {
+		// 					if (res.confirm) {
+		// 						me.$emit('toBluetooth')
+		// 					}
+		// 				},
+		// 				fail: function(res) {},
+		// 				complete: function(res) {},
+		// 			})
+		// 		}
+				
+		// 	}
+		// 	this.popupControlShow=false
+
+		// },
+		// // closePopup(){
+		// 	this.popupControlShow=false
+		// },
+		// tapOpenMore(){
+		// 	// this.isShowMore=true
+		// },
+		// closeMore(){
+		// 	this.isShowMore=false
+		// },
+		// navUrl(url){
+		// 	// ifconsole.log(url,'sj');
+		// },
+		// navCarLocation(){
+		// 	//前往配置更多功能
+		// 	uni.navigateTo({
+		// 		url:'/pages/carLocation/carLocation'
+		// 	})
+		// },
+		
 	}
 };
 </script>

pages/index/index.vue

@@ -20,22 +20,20 @@
 				<view class="quantity-view flex-row">
 					<text class="quantity flex-row">{{car_info.soc}} <text 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>
+					<text style="margin-right: 10rpx;" v-if="car_info.heart_time!=0">{{$t("更新于")}} {{car_info.heart_time}}</text>
 					<img src="https://qiniu.bms16.com/FsL6XWGoIhfsVB7jRg6EGFVsuaTZ" style="width: 24rpx;height: 32rpx;" alt="">
 				</view>
 			</view>
-			<Control :accState="car_info.acc_state-0" :contrilList="contrilList" />
-			
-			
+			<Control :online="(car_info.online!=0)" :contrilList="contrilList" @toBluetooth="inductiveUnlockHandle" />
 			<view v-if="car_info.exchange_package_info && car_info.exchange_package_info.activity_time" class="flex-row flex-between map-card-view" >
 				<MapCard latitude="23.099994" longitude="113.324004" :carAddress="carAddress" :carLocation="carLocation"/>
 				
@@ -151,7 +149,7 @@
 						activity_time:0
 					}
 				},
-				platform:'ios',//手机型号
+				platform:'android',//手机型号
 				isShowPermission:false,//是否打开权限弹窗
 			};
 		},
@@ -206,8 +204,6 @@
 			//     });
 			// }
 			// app.globalData.permissionArr=permissionArr
-			this.getBluetooth()
-			console.log(33333333)
 			console.log(getFunctionTag().activeTag)
 			this.contrilList = getFunctionTag().activeTag
 			const user_token = storage.getUserToken()
@@ -436,6 +432,17 @@
 				uni.navigateTo({
 					url:  `/pages/carList/carList?list=${encodeURIComponent(JSON.stringify(me.car_list))}&car_sn=${me.car_sn}`,
 				})
+			},
+			formatDistance(distanceMeters) {
+				// 判断距离是否超过1000米  
+				// let distanceMeters=Number(_distanceMeters)
+				if (distanceMeters >= 1000) {
+					// 如果超过1000米，则转换为千米并返回  
+					return (distanceMeters / 1000).toFixed(1);
+				} else {
+					// 否则直接返回米  
+					return distanceMeters.toFixed(0);
+				}
 			}
 
 		}