常规小优化

pages/common/addBLE/LinkBle.vue

@@ -24,7 +24,7 @@
 				{{Statu.boundRemark}}
 			</view>
 		</view>
-		<view class="btnLink" @click="Link()">
+		<view class="btnLink" @click="Bind()">
 			绑定
 		</view>
 
@@ -71,7 +71,10 @@
 					"communicationMode": "",
 					"imei": ""
 				},
-				serverDevice: null
+				serverDevice: null,
+				groupid:null,
+				typeList:[],
+				uploadStatu:null
 			}
 		},
 		computed: {
@@ -86,7 +89,6 @@
 				}
 			},
 			deviceStatu: function() {
-				debugger;
 				if (!this.device.name && !this.device.macAddress) {
 					return "";
 				}
@@ -127,7 +129,8 @@
 			console.log("返回取消订阅");
 			clearInterval(inteval);
 			ble.removeAllCallback(pagePath);
-			
+			clearTimeout(this.Statu.timeInteval);
+			this.uploadStatu=null;
 			if(!this.Statu.isBind && these.device.deviceId){
 				ble.disconnectDevice(these.device.deviceId).catch(ex=>{
 					console.error("无法断开蓝牙连接");
@@ -137,6 +140,8 @@
 	
 		onLoad(option) {
 			these = this;
+			this.groupid=new Date().getTime()+"";
+			
 			ble = bleTool.getBleTool();
 
 			ble.addStateBreakCallback(res => {
@@ -258,6 +263,108 @@
 			
 		},
 		methods: {
+			getDevList() {
+				return new Promise((resolve,reject)=>{
+					let arr = [
+			
+				];
+				request({
+					url: '/app/xinghan/device/typeAll',
+					method: 'get'
+				}).then(res => {
+					if (res && res.code == 200) {
+						console.log("获取到类型", res.data);
+						arr = res.data;
+						this.typeList = arr;
+						resolve(arr);
+						return;
+					}
+					reject();
+					
+				}).catch(ex => {
+					console.error("获取设备类型列表失败",ex);
+					reject();
+				})
+				});
+				
+			},
+			uploadItem() {
+				if(this.uploadStatu!==null){
+					console.error("执行过上传,不再执行");
+					return;
+				}
+				
+				this.uploadStatu="start";		
+				console.log("开始上传设备");
+				
+				let type=this.device.name.toLowerCase();
+				if(type.indexOf("bjq6155-")>-1){//6155特别处理
+					type="xh6155"
+				}
+				if(type.indexOf("bjq6155-")>-1){//6155特别处理
+					type="xh6155"
+				}
+				if(type.indexOf("bjq6075-")>-1){//6075j特别处理
+					bype='bjq6075j';
+				}
+				type=type.replace(/-/g,'');
+				let upload=()=>{
+					let f=this.typeList.find((v,i)=>{
+						if(type.indexOf(v.typeName.replace(/-/g,'').toLowerCase())>-1){
+							return true;
+						}
+					});
+					
+					if(!f){
+						this.uploadStatu="type is valid";
+						console.error("找不到此类型名称",type);
+						console.error("tpelist=",this.typeList);
+						return;
+					}
+					let json = {						
+						"deviceType": f.id,						
+						"deviceName": this.device.name, 
+						"deviceMac": this.device.macAddress,
+						"bluetoothName": this.device.name,
+						"deviceImei":this.device.imei?this.device.imei:'',						
+						"remark": "com.chxhyc.cn auto upload"
+					}
+					request({
+						url: '/app/xinghan/device/add',
+						method: 'post',
+						data: json
+					}).then(res => {
+						if (res && res.code == 200) {
+							this.uploadStatu="success";
+							console.log("上传成功",res);
+						} else {
+							this.uploadStatu="upload error";			
+							console.error("上传失败,",res);
+						}
+					}).catch(ex => {
+						this.uploadStatu="upload error";
+						console.error("上传失败,",ex);
+					});
+				}
+								
+				let exec = () => {
+					
+					if(this.typeList.length==0){
+						this.getDevList().then(results=>{
+							upload();
+						}).catch(ex=>{
+							this.uploadStatu="get types error";
+							console.error("获取类型失败,",ex);
+						});
+					}else{
+						upload();
+					}
+					
+					
+				}
+			
+				setTimeout(exec, 10)
+			},
 			reLinkdevice() {
 				ble.LinkBlue(these.device.deviceId).then(res => {
 					updateLoading(these, {
@@ -320,6 +427,7 @@
 								clearInterval(inteval);
 							} else {
 								deviceInvalid();
+								this.uploadItem();
 							}
 						} else {
 							this.serverDevice =null;
@@ -337,7 +445,7 @@
 				}, 500);
 
 			},
-			Link() {
+			Bind() {
 				// 调用绑定设备接口
 				
 				// let f = ble.data.LinkedList.find((v) => {

pages/common/addBLE/addEquip.vue

@@ -727,7 +727,7 @@
 				});
 
 				let index = 1;
-				let total = 5;
+				let total = 1;
 
 				let linkCallback = (res) => {
 					console.log("连接成功", these.device);