Browse Source

2.3.3 21022602 版本,修改code-elf-guide 提示。

slambb 5 years ago
parent
commit
31b1a446dc

+ 15 - 1
components/code-elf-guide/code-elf-guide.vue

@@ -112,7 +112,9 @@
 							<view style="position: relative;" >
 								<image style="position: relative; width: 400rpx;height: 170rpx;" src="/static/guide/boxingHitMid.png"></image>
 								<!-- 打击拳击柱越快或力量越大力量条会越快增长哦! -->
-								<view style="position: absolute;top: 70rpx; left: 45rpx;right:35rpx; color: #000;">跑的越快速度条会增长越快哦!</view>
+								<view v-if="thisCurrentMode == 'calorieMode'" style="position: absolute;top: 70rpx; left: 45rpx;right:35rpx; color: #000;">跑的越快速度条会增长越快哦!</view>
+								<view v-else style="position: absolute;top: 70rpx; left: 45rpx;right:35rpx; color: #000;">打击拳击柱越快或力量越大力量条会越快增长哦!</view>
+							
 							</view>
 						</view>
 						<view class="guide-vertical-bar">
@@ -189,6 +191,11 @@
 				type: Number,
 				default: 0
 			},
+			
+			currentMode:{
+				type: String,
+				default:"calorieMode"
+			}
 
 		},
 		data() {
@@ -210,17 +217,24 @@
 				DeviceObj: null,
 				
 				modalObj:null,
+				
+				thisCurrentMode:'',
 
 			}
 		},
 		created() {
 			this.thisCurrent = this.current;
+			this.thisCurrentMode = this.currentMode;
 		},
 		watch: {
 
 			current(val) {
 				// console.log("====",val);
 				this.thisCurrent = val;
+			},
+			currentMode(val) {
+				// console.log("====",val);
+				this.thisCurrentMode = val;
 			}
 		},
 		methods: {

+ 21 - 1
pages/personal-page/personal/personal.vue

@@ -390,7 +390,7 @@
 		</view>
 
 		<!-- 引导蒙层 bGuidePages guideCurrent-->
-		<code-elf-guide ref="codeElfGuide" v-if="bGuidePages" @hide="guideHide" @change="onGuideChange" :current="guideCurrent"></code-elf-guide>
+		<code-elf-guide ref="codeElfGuide" v-if="bGuidePages" @hide="guideHide" @change="onGuideChange" :current="guideCurrent" :currentMode="currentMode"></code-elf-guide>
 
 		<!-- <view v-if="bStartBoxingPost" class="CountDownMask">
 			{{BoxingPostCountDownText}}
@@ -2276,6 +2276,26 @@
 					}, 200);
 				} else if (e.current == 5 && !e.onlyHide) {
 					console.log("==:", e);
+					//初始化filter快速打击对象
+					if (this.BLEConnectDevice.usageMode == "hotman") {
+						this.gCreateFilterObj();
+					}
+					//打开加速计
+					this.onWriteBLEConnectionValue({
+						value: "3"
+					});
+					
+					setTimeout(() => {
+						//设置加速计20ms
+						this.onWriteBLEConnectionValue({
+							value: "b"
+						});
+					
+					}, 1000)
+					
+					
+					//监听蓝牙回调
+					uni.$on('updateBLEDeviceData', this.callbackUpdateBLEData);
 					this.onBoxingGuideFinish();
 				}
 			},