1.3.2.16华为上线版本

App.vue

@@ -13,6 +13,15 @@
 		},
 		onLaunch: function() {
 			console.log('App Launch');
+			//这里先隐藏游戏和视频栏目
+			uni.setTabBarItem({
+				index:2,
+				visible:false
+			})
+			uni.setTabBarItem({
+				index:3,
+				visible:false
+			})
 			// 先判断 系统版本
 			const _systemInfo = uni.getSystemInfoSync();
 			// uni.getSystemInfo({
@@ -84,6 +93,7 @@
 				// console.log("未安装微信");
 				this.$store.state.bInstallWechat = false;
 			}
+			
 		},
 		onShow: function() {
 			console.log('App Show');

common/config.js

@@ -11,7 +11,7 @@ const host="https://www.9527fun.cn/api_prd"
 //测试地址，阿里云服务器
 // const host = "https://www.9527fun.cn/api_dev"
 //本地测试地址
-// const host = "http://192.168.1.11:9090/api_dev"
+// const host = "http://192.168.0.106:9090/api_dev"
 // const host = "http://192.168.0.112:9090/api_dev"
 // const host = "http://47.104.216.192:9090/api_dev"
 // const host = "http://121.4.103.151:9090/api_prd"

components/modal/action-jump/action-jump.vue

@@ -155,7 +155,7 @@
 	} from 'vuex';
 
 	export default {
-		computed: mapState(['systemInfo']),
+		computed: mapState(['systemInfo','bOldDeviceType']),
 		components: {
 
 		},
@@ -1443,8 +1443,8 @@
 						oGyroY: gy,
 						oGyroZ: gz
 					},
-					//输入当前轴
-					bYAxis: true,
+					//输入当前轴,旧设备使用Y轴，即为true
+					bYAxis: this.bOldDeviceType?true:false,
 				};
 				this.actionJumpObj.updateJump(_temp);
 				this.BLEAccIndex++;

components/side-bar/side-bar.vue

@@ -1,8 +1,7 @@
 <template>
 	<!-- @touchmove.stop.prevent="moveHandle"  @touchmove="side.touchmove" @touchstart="side.touchstart" @touchend="side.touchend"-->
 	<view class="content">
-		<view class="side-left" :data-position="pos" :prop="pos" :change:prop="side.sizeReady"
-			 @change="change">
+		<view class="side-left" :data-position="pos" :prop="pos" :change:prop="side.sizeReady" @change="change">
 			<!-- 侧边栏 bshow-->
 			<view class="side-mask" v-if="bshow" @tap="closeSide"></view>
 			<view class="side-handle">
@@ -36,25 +35,25 @@
 									</view>
 									<view class="flex justify-center align-center "
 										style="height: 52rpx; width: 412rpx; margin-top: 48rpx; ">
-										<view class=" flex align-center justify-center text-black" >
+										<view class=" flex align-center justify-center text-black">
 											<view class="flex  align-center">
 												<image class="png-more" style="margin-right: 18rpx;"
 													src="/static/common/sideBar/sDiamond.png"></image>
-												<view class="text-bold" >1000</view>
+												<view class="text-bold">1000</view>
 											</view>
 											<view class="flex  align-center" style="margin-left: 60rpx;">
 												<image class="png-more" style="margin-right: 18rpx;"
 													src="/static/common/sideBar/sGold.png"></image>
-												<view  class="text-bold" >1000</view>
+												<view class="text-bold">1000</view>
 											</view>
 										</view>
 									</view>
 								</view>
-								
 
-							</view>
 
+							</view>
 							<view class="cu-item myarrow margin-view" v-for="(item,index) in sideList" :key="index"
+								v-if="((1==item.id||2==item.id)&&(versionCodeState.showGame||versionCodeState.showVideo)) || (1!=item.id&&2!=item.id)" 
 								@tap="onNavListItem(item.page_type)">
 								<view class="content flex align-center margin-top margin-bottom">
 									<image :src="item.url"
@@ -62,9 +61,7 @@
 										mode="aspectFit"></image>
 									<text class="text-black text-16px text-bold">{{item.name}}</text>
 								</view>
-
 							</view>
-
 							<view class="flex justify-center align-center " style="margin: 60px 0px;">
 								<button class="cu-btn round text-16px line-mGrey" style="width: 250rpx; height: 80rpx;"
 									@tap="onExit"> <span style="color:#000000;">退出登录</span> </button>
@@ -92,7 +89,7 @@
 		mixins: [mp],
 
 		computed: mapState(['bCanvasShow', 'token', 'userName', 'avatarUrl', 'days', 'signature', 'weight',
-			'height'
+			'height', 'versionCodeState'
 		]),
 
 
@@ -207,9 +204,9 @@
 				// console.log("showModal:",this.show);
 				this.bshow = true;
 				this.show = true;
-				
+
 				uni.hideTabBar({
-					
+
 				})
 			},
 			hideModal() {
@@ -218,9 +215,9 @@
 				this.show = false;
 				this.$store.state.bCanvasShow = true;
 				this.$emit("hideSideBar");
-				
+
 				uni.showTabBar({
-					
+
 				})
 			},
 			change(e) {

components/side-bar/sideBar.js

@@ -4,7 +4,7 @@
 export default {
 	//侧边栏对应列表
 	getSideBarList: [{
-			id: 8,
+			id: 9,
 			type: 'image',
 			url: '/static/signBoard@2x.png',
 			name: '每日签到',
@@ -18,19 +18,19 @@ export default {
 		// 	page_type: "my",
 		// }, 
 		//上线华为隐藏两个侧滑栏
-		// {
-		// 	id: 1,
-		// 	type: 'image',
-		// 	url: '/static/recently-playing.png',
-		// 	name: "最近在玩",
-		// 	page_type: "recently",
-		// }, {
-		// 	id: 2,
-		// 	type: 'image',
-		// 	url: '/static/watch-game.png',
-		// 	name: '关注',
-		// 	page_type: "watchGame",
-		// },
+		{
+			id: 1,
+			type: 'image',
+			url: '/static/recently-playing.png',
+			name: "最近在玩",
+			page_type: "recently",
+		}, {
+			id: 2,
+			type: 'image',
+			url: '/static/watch-game.png',
+			name: '关注',
+			page_type: "watchGame",
+		},
 		// {
 		// 	id: 3,
 		// 	type: 'image',
@@ -68,7 +68,7 @@ export default {
 		// 	page_type: "feedback",
 		// },
 		{
-			id: 7,
+			id: 8,
 			type: 'image',
 			url: '/static/settings@2x.png',
 			name: '设置',

manifest.json

@@ -2,8 +2,8 @@
     "name" : "哔蹦",
     "appid" : "__UNI__2635DF5",
     "description" : "",
-    "versionName" : "2.5.16",
-    "versionCode" : 21120701,
+    "versionName" : "2.5.19",
+    "versionCode" : 21121602,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages.json

@@ -410,18 +410,18 @@
 				"iconPath": "static/common/navigationBar/nPlan.png",
 				"selectedIconPath": "static/common/navigationBar/nPlanB.png"
 			},
-			// {
-			// 	"pagePath": "pages/game-page/game-list/game-list",
-			// 	"text": "游戏",
-			// 	"iconPath": "static/common/navigationBar/nGame.png",
-			// 	"selectedIconPath": "static/common/navigationBar/nGameB.png"
-			// },
-			// {
-			// 	"pagePath": "pages/game-page/game-video/game-video",
-			// 	"text": "视频",
-			// 	"iconPath": "static/common/navigationBar/nVideo.png",
-			// 	"selectedIconPath": "static/common/navigationBar/nVideoB.png"
-			// },
+			{
+				"pagePath": "pages/game-page/game-list/game-list",
+				"text": "游戏",
+				"iconPath": "static/common/navigationBar/nGame.png",
+				"selectedIconPath": "static/common/navigationBar/nGameB.png"
+			},
+			{
+				"pagePath": "pages/game-page/game-video/game-video",
+				"text": "视频",
+				"iconPath": "static/common/navigationBar/nVideo.png",
+				"selectedIconPath": "static/common/navigationBar/nVideoB.png"
+			},
 			{
 				"pagePath": "pages/my-page/homepage/homepage",
 				"text": "我的",

pages/Loading-page/Loading/Loading.vue

@@ -62,7 +62,7 @@
 			}
 			
 			//预加载
-			uni.preloadPage({url: "/pages/personal-page/personal/personal"});
+			// uni.preloadPage({url: "../../platform/app-plus/subNVue/guide"});
 		},
 		methods: {
 			...mapMutations(['accountLogin']),

pages/game-page/game-list/game-list.vue

@@ -21,9 +21,9 @@
 			</view> -->
 		</uni-nav-bar>
 
-
+		<!-- v-if="(cIndex != -1 && gameShow)||ConnectBindingDevice" -->
 		<scroll-view scroll-y="true" :style="{ height: scrollviewHight + 'px' }" @scrolltolower="lower">
-			<view v-if="(cIndex != -1 && gameShow)||ConnectBindingDevice" class="game-item card-view"
+			<view  class="game-item card-view"
 				v-for="(item, index) in gameList" :key="index" :data-id="index">
 				<view @tap="onNavToWebviewGame(item)">
 					<view class="game-image-container">
@@ -64,7 +64,8 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="(cIndex == -1 && !gameShow) || gameList.length == 0 || ConnectBindingDevice == null"
+			<!-- (cIndex == -1 && !gameShow) ||gameList.length == 0 || ConnectBindingDevice == null-->
+			<view v-if="gameList.length == 0"
 				class="text-16px text-gray text-center margin">没有更多数据</view>
 			<view style="height: 17px;"></view>
 		</scroll-view>

pages/game-page/game-play-sub/subGame/subGame.nvue

@@ -44,7 +44,8 @@
 			'currentInstruction',
 			'cIndex', 'globalAcc', 'globalOri', 'LocationGameUrl',
 			'ConnectBindingDevice',
-			'currentModeIndex'
+			'currentModeIndex',
+			'bOldDeviceType'
 		]),
 		data() {
 			return {
@@ -1092,8 +1093,8 @@
 						oGyroY: gy,
 						oGyroZ: gz
 					},
-					//输入当前轴
-					bYAxis: true,
+					//输入当前轴,旧设备使用Y轴，即为true
+					bYAxis: this.bOldDeviceType?true:false,
 				};
 				this.actionJumpObj.updateJump(_temp);
 				this.BLEAccIndex++;

pages/game-page/game-video/game-video.vue

@@ -20,9 +20,9 @@
 				</view>
 			</view> -->
 		</uni-nav-bar>
-
+		<!-- v-if="(cIndex != -1 && gameShow)||ConnectBindingDevice" -->
 		<scroll-view scroll-y="true" :style="{ height: scrollviewHight + 'px' }" @scrolltolower="lower">
-			<view v-if="(cIndex != -1 && gameShow)||ConnectBindingDevice" class="game-item card-view" v-for="(item, index) in gameList" :key="index" :data-id="index">
+			<view  class="game-item card-view" v-for="(item, index) in gameList" :key="index" :data-id="index">
 				<view @tap="onNavToWebviewGame(item)">
 					<view class="game-image-container">
 						<image mode="aspectFill" class="game-item-image" :src="item.gamePicture"></image>
@@ -59,7 +59,8 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="(cIndex == -1 && !gameShow) || gameList.length == 0 || ConnectBindingDevice == null" class="text-16px text-gray text-center margin">没有更多数据</view>
+			<!-- (cIndex == -1 && !gameShow) || gameList.length == 0 || ConnectBindingDevice == null -->
+			<view v-if="gameList.length == 0" class="text-16px text-gray text-center margin">没有更多数据</view>
 			<view style="height: 17px;"></view>
 		</scroll-view>
 

pages/my-page/homepage/homepage.vue

@@ -83,7 +83,7 @@
 			
 			</view>
 			<!-- 上线华为 隐藏 -->
-			<view v-if="false" class="card-view article ">
+			<view v-if="versionCodeState.showGame" class="card-view article ">
 				<view class="title">
 					最近在玩
 				</view>
@@ -101,33 +101,36 @@
 				</view>
 			</view>
 			<!-- 上线华为 隐藏 -->
-			<!-- <view v-if="favoriteGames.length==0" class="card-view flex align-center">
-				<view class="content flex flex-direction align-start margin-top">
-					<view class="title">关注</view>
-					<view class="text-grey" style="margin: 0rpx 40rpx 40rpx;">有好多好玩的视频等着你关注哦</view>
-				</view>
-				<view class=" margin-sm button-fav " @tap="onGoToFollow">
-					<image style="width: 21px;height: 21px; margin-right: 12rpx;" src="../../../static/add_w.png"></image>
-					去关注
-				</view>
-			</view>
-			<view v-else class="card-view article">
-				<view class="title">
-					已关注的
+			<block v-if="versionCodeState.showVideo">
+				<view v-if="favoriteGames.length==0" class="card-view flex align-center">
+					<view class="content flex flex-direction align-start margin-top">
+						<view class="title">关注</view>
+						<view class="text-grey" style="margin: 0rpx 40rpx 40rpx;">有好多好玩的视频等着你关注哦</view>
+					</view>
+					<view class=" margin-sm button-fav " @tap="onGoToFollow">
+						<image style="width: 21px;height: 21px; margin-right: 12rpx;" src="../../../static/add_w.png"></image>
+						去关注
+					</view>
 				</view>
-				<view class="cu-item shadow">
-					<view class="cu-form-group margin-top">
-						<view v-if="favoriteGames.length!=0" class="grid col-3 homepage-grid-square flex-sub ">
-							<view  class="text-center "  v-for="(item,index) in favoriteGames" :key="index" v-if="index<6" @tap="onViewImage(item)">
-								<image class="item-img" :src="item.gameIcon" mode="aspectFill"></image>
-								<view class="border text-cut">{{item.gameName}}</view>
+				<view v-else class="card-view article">
+					<view class="title">
+						已关注的
+					</view>
+					<view class="cu-item shadow">
+						<view class="cu-form-group margin-top">
+							<view v-if="favoriteGames.length!=0" class="grid col-3 homepage-grid-square flex-sub ">
+								<view  class="text-center "  v-for="(item,index) in favoriteGames" :key="index" v-if="index<6" @tap="onViewImage(item)">
+									<image class="item-img" :src="item.gameIcon" mode="aspectFill"></image>
+									<view class="border text-cut">{{item.gameName}}</view>
+								</view>
 							</view>
+							<view v-else class="text-center text-gray" :style="{width:'100%'}">去关注更多的游戏吧~</view>
+							<view v-if="favoriteGames.length!=0" class="homepage-arrow" @tap="onNavList('watchGame')"></view>
 						</view>
-						<view v-else class="text-center text-gray" :style="{width:'100%'}">去关注更多的游戏吧~</view>
-						<view v-if="favoriteGames.length!=0" class="homepage-arrow" @tap="onNavList('watchGame')"></view>
 					</view>
 				</view>
-			</view> -->
+				
+			</block>
 			
 			<view class="homepage-action-row">
 				<view class=" ">哔蹦</view>
@@ -153,7 +156,7 @@
 	export default {
 		computed: mapState(['forcedLogin', 'hasLogin', 'userName', 'avatarUrl', 'playGames', 'favoriteGames', 'days',
 			'signature','platform','gamePlatform','cGold','cDiamond',
-			'systemInfo','navHeight','tabbarHeight',
+			'systemInfo','navHeight','tabbarHeight','versionCodeState'
 		]),
 		data() {
 			return {

pages/personal-page/devices-hardware/devices-hardware.vue

@@ -309,7 +309,7 @@
 			},
 			//监听回调
 			onListenerBLE(res) {
-				// console.log('onListenerBLE:', res);
+				console.log('onListenerBLE:', res,this.saveObj);
 				if (res.type !== 'mac') return;
 				//如果mac 回调了不用提示
 				if (this.searchMac) {
@@ -424,6 +424,13 @@
 						 * 已验证的连接设置true
 						 */
 						this.$store.state.bVerifiedConnection = true;
+						/**
+						 * 根据名字兼容旧设备
+						 */
+						if(this.saveObj.name === "BGBox_202012"){
+							this.$store.state.bOldDeviceType = true;
+							console.log("旧设备:",this.$store.state.bOldDeviceType);
+						}
 						
 						uni.hideToast();
 					}

pages/personal-page/personal/personal.vue

@@ -482,26 +482,29 @@
 </template>
 
 <!-- 这里vConsole 是为了解决再页面内显示vconsole -->
-// <script module="vconsole" lang="renderjs">
-// 	import VConsole from '../../../util/util-js/vconsole.min.js'
-// 	new VConsole();
-// 	export default {
-// 		mounted() {
-// 			// ...
-// 		},
-// 		data: {
-// 			return () {}
-// 		},
-// 		methods: {
-// 			updateData(newValue, oldValue, ownerInstance, instance) {
-// 				// newValue: 新数据
-// 				// oldValue: 老数据
-// 				var log = console.log.bind(console);
-// 				log(newValue)
-// 			}
-// 		}
-// 	}
-// </script>
+<!-- 
+ // <script module="vconsole" lang="renderjs">
+ // 	import VConsole from '../../../util/util-js/vconsole.min.js'
+ // 	new VConsole();
+ // 	export default {
+ // 		mounted() {
+ // 			// ...
+ // 		},
+ // 		data: {
+ // 			return () {}
+ // 		},
+ // 		methods: {
+ // 			updateData(newValue, oldValue, ownerInstance, instance) {
+ // 				// newValue: 新数据
+ // 				// oldValue: 老数据
+ // 				var log = console.log.bind(console);
+ // 				log(newValue)
+ // 			}
+ // 		}
+ // 	}
+ // </script>
+ 
+ -->
 
 <script>
 	// import uniNavBar from '@/components/uni-nav-bar/uni-nav-bar.vue';
@@ -771,7 +774,9 @@
 				/**
 				 * 任务关卡相关
 				 */
-				tempSelectedLevel: null
+				tempSelectedLevel: null,
+				
+				bShowComplete:false,
 
 			};
 		},
@@ -962,6 +967,11 @@
 			// #endif
 		},
 		onReady() {
+			//限制开始点击播放
+			setTimeout(()=>{
+				_self.bShowComplete = true;
+				console.log("=============>",_self.bShowComplete);
+			},500)
 			// 计算屏幕剩余高度  填补剩余高度
 			// 计算组件的高度
 			_self.scrollviewHight = this.systemInfo.windowHeight - this.navHeight - this.tabbarHeight - 10 - this
@@ -1978,10 +1988,17 @@
 			},
 			//检测是否符合要求，没有的话进行新手提示
 			onPersonalCheck(data) {
+				if(!this.bShowComplete){
+					// console.log('不要点击这么快！！');
+					return;
+				}else{
+					console.error('点击！！');
+				}
+				this.bShowComplete = false;
 				// #ifdef APP-PLUS
 				if (1 === this.currentModeIndex) {
 					if (this.currentJumpTask == null) {
-						console.log("**************11");
+						// console.log("**************11");
 						this.onTipLevel({
 							hiddenType: 'normal'
 						});
@@ -2047,7 +2064,8 @@
 				}
 				// #endif
 
-
+				//如果上面没有guide弹出
+				this.bShowComplete = true;
 				this.onStartCheck(data);
 			},
 			//
@@ -3194,6 +3212,10 @@
 
 				uni.$on('guide-popup-page', (data) => {
 					console.log('guide-popup-page', JSON.stringify(data));
+					setTimeout(()=>{
+						this.bShowComplete = true;
+						console.log('this.bShowComplete', this.bShowComplete);
+					},250);
 					switch (data.type) {
 						case 'button':
 							if (data.messageType == 'plan') {

platform/app-plus/subNVue/drawer.nvue

@@ -28,13 +28,15 @@
 			</view>
 			<list class="list-wrapper">
 				<cell v-for="item in lists" :key="item.id">
-					<div class="text-wrapper" @click="clickitem(item.id,item.page_type)">
-						<view class="flex flex-direction-row align-center">
-							<image style="width: 34rpx;height:34rpx; margin-right: 36rpx;" :src="item.url"></image>
-							<text class="text-15px text-medium">{{item.name}}</text>
-						</view>
-						<text class="icon">&#xe583;</text>
-					</div>
+					<block v-if="((1==item.id||2==item.id)&&(versionCodeState.showGame||versionCodeState.showVideo)) || (1!=item.id&&2!=item.id)">
+						<div class="text-wrapper" @click="clickitem(item.id,item.page_type)">
+							<view class="flex flex-direction-row align-center">
+								<image style="width: 34rpx;height:34rpx; margin-right: 36rpx;" :src="item.url"></image>
+								<text class="text-15px text-medium">{{item.name}}</text>
+							</view>
+							<text class="icon">&#xe583;</text>
+						</div>
+					</block>
 				</cell>
 			</list>
 			<div class="flex justify-center align-center" style="margin-top: 140rpx; margin-bottom: 140rpx">
@@ -54,7 +56,7 @@
 	} from 'vuex';
 	export default {
 		computed: mapState(['bCanvasShow', 'token', 'userName', 'avatarUrl', 'days', 'signature', 'weight',
-			'height', 'systemInfo'
+			'height', 'systemInfo' , 'versionCodeState'
 		]),
 		data() {
 			return {

platform/app-plus/subNVue/guide.nvue

@@ -1,7 +1,7 @@
 <template>
 	<view class="guide-wrapper">
 		<view v-if="currentType == 'level-button-tip'" class="guide-container position-relative"
-			@click="buttonMessage('confirm')">
+		@click="buttonMessage('confirm',$event)">
 			<!-- top: 55px; 相当于 上间隔 -->
 			<view class="mask-bg-07" :style="{height:guideHeight+'px'}"></view>
 			<!-- 中心位置 225 -->
@@ -54,7 +54,7 @@
 		</view>
 		<view v-if="currentType == 'device-tip'"
 			class="guide-container justify-center align-center position-relative mask-bg-07"
-			@click="buttonMessage('confirm')">
+			@click="buttonMessage('confirm',$event)">
 			<view class="mid">
 				<image class="bind-tip-image" src="../../../static/modal/tip/bind-tip-bg.png"></image>
 				<text class="text-16px text-center text-white"
@@ -69,7 +69,7 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="currentType == 'plan'" class="guide-container position-relative" @click="buttonMessage('confirm')">
+		<view v-if="currentType == 'plan'" class="guide-container position-relative" @click="buttonMessage('confirm',$event)">
 
 			<!-- top: 55px; 相当于 上间隔 -->
 			<view class="mask-bg-07" :style="{height:guideHeight+'px'}"></view>
@@ -82,13 +82,15 @@
 						</image>
 					</view>
 					<view class="position-absolute-center">
+						<!-- left:40rpx; -->
 						<text class="text-white text-14px text-lines2"
-							style="top: 20rpx;left:40rpx; width: 300rpx;">请先定制属于您的专属计划</text>
+							style="top: 20rpx; left:40rpx;  width: 300rpx;">请先定制属于您的专属计划</text>
 					</view>
 				</view>
 				<view style="width: 750rpx;height: 100px;" class="flex flex-direction-row">
 					<!-- 32+ 60/2  原本长度62px，去除游戏和视频长度 + 72 左右，设置 134 px-->
-					<view style="width: 134px;" class="mask-bg-07"></view>
+					
+					<view :style="{width: guideRectLeft+'px'}" class="mask-bg-07"></view>
 					<image style="width: 90px;height: 100px; opacity: 0.7;"
 						src="../../../static/common/subNVue/guide/guide-rect-mask.png"></image>
 					<view class="mask-bg-07 flex-sub"></view>
@@ -100,7 +102,7 @@
 		</view>
 
 		<view v-if="currentType == 'actionJumpPlay'" class="guide-container position-relative"
-			@click="buttonMessage('confirm')">
+			@click="buttonMessage('confirm',$event)">
 			<!-- top: 55px; 相当于 上间隔 -->
 			<view class="mask-bg-07" :style="{height:guideHeight+'px'}"></view>
 			<!-- 中心位置 275 -->
@@ -126,7 +128,7 @@
 			<view class="mask-bg-07 flex-sub"></view>
 		</view>
 		<view v-if="currentType == 'bluetoothConnect'" class="guide-container position-relative"
-			@click="buttonMessage('confirm')">
+			@click="buttonMessage('confirm',$event)">
 			<!-- top: 55px; 相当于 上间隔 -->
 			<view class="mask-bg-07" :style="{height:guideHeight+'px'}"></view>
 			<!-- 中心位置 225 -->
@@ -162,7 +164,7 @@
 
 		<view v-if="currentType == 'level-game-tip'"
 			class="guide-container justify-center align-center position-relative mask-bg-07"
-			@click="buttonMessage('confirm')">
+			@click="buttonMessage('confirm',$event)">
 			<view class="game-mid">
 				<view style="height: 278rpx;width: 750rpx;" class="position-relative">
 					<view class="position-absolute-center" style="top: 0;left:0rpx;">
@@ -211,9 +213,11 @@
 		mapMutations
 	} from 'vuex';
 	export default {
-		computed: mapState(['systemInfo', 'navHeight', 'tabbarHeight']),
+		computed: mapState(['systemInfo', 'navHeight', 'tabbarHeight','versionCodeState']),
 		data() {
 			return {
+				//防止点击
+				bShowComplete:false,
 				title: '',
 				content: '',
 				lists: [],
@@ -286,21 +290,37 @@
 					secondWidth: 68,
 					secondHeight: 68,
 					secondHidden: false
-				}
+				},
+				
+				guideRectLeft:62
 			}
 		},
 		created() {
-			console.log('*********一个guide created')
+			console.error('*********一个guide created')
 			const vm = this;
 			uni.$on('guide-popup', (data) => {
+				vm.bShowComplete = true;
+				console.log("vm.bShowComplete 1=:",vm.bShowComplete);
+				setTimeout(()=>{
+					vm.bShowComplete = false;
+					console.log("vm.bShowComplete 2=:",vm.bShowComplete);
+				},300)
 				vm.title = data.title;
 				vm.content = data.content;
 				vm.currentType = data.type || 'none';
 				vm.operationItem = data.operationItem;
 				let _viewData = data.item;
+				if(vm.versionCodeState.showGame&&vm.versionCodeState.showVideo){
+					vm.guideRectLeft = 62;
+				}else if(vm.versionCodeState.showGame||vm.versionCodeState.showVideo){
+					vm.guideRectLeft = 89;
+				}else {
+					vm.guideRectLeft = 134;
+				}
+				
 				//获取类型
 				vm.hiddenType = (_viewData && _viewData.hiddenType) || 'none';
-				console.log("vm.hiddenType:", vm.hiddenType);
+				console.log("初始化时候hidden类型:", vm.hiddenType);
 				if (vm.currentType == "actionJumpPlay") {
 					// _viewData.height/4 = 27.5
 					vm.guideHeight = _viewData.top + _viewData.height - _viewData.height / 4 - vm.systemInfo
@@ -371,9 +391,12 @@
 				// 	})
 				// }
 			},
-
-			buttonMessage(buttonEvent) {
-
+				
+			buttonMessage(buttonEvent,e) {
+				e.stopPropagation();
+				if(this.bShowComplete)return;
+				this.bShowComplete = true;
+				console.log('关闭2')
 				setTimeout(() => {
 					const subNVue = uni.getCurrentSubNVue()
 					uni.$emit('guide-popup-page', {

util/util-js/action/jump-0.2.js

@@ -111,7 +111,8 @@ ActionJump.prototype.updateJump = function() {
 	let {
 		bYAxis
 	} = data;
-	let _tempAxisData = bYAxis ? oGyroY : oGyroX;
+	//oGyroX 在用的过程中方向相反，所以添加负号
+	let _tempAxisData = bYAxis ? oGyroY : -oGyroX;
 	this.detectorNewStep(data.resultant, lAccX, lAccY, lAccZ, oAccX, oAccY, oAccZ, data.runIndex, _tempAxisData);
 };
 

util/util-js/store.js

@@ -193,6 +193,10 @@ const store = new Vuex.Store({
 		 * 通过验证的连接，比如通过mac验证，或者说是首页直连，都设置这个参数，确保已经连上
 		 */
 		bVerifiedConnection: false,
+		/**
+		 * 默认不是旧设备，旧设备使用的轴向不一样，名字为 BGBox_202012 ，新设备为 BGBox_202112
+		 */
+		bOldDeviceType:false,
 
 		/**
 		 * Android 出现不匹配的情况下，判断
@@ -246,7 +250,7 @@ const store = new Vuex.Store({
 		platform: '', // 平台
 		appName: '',
 		version: '1.6.3', //软件版本
-		versionCode: '21030101',
+		versionCode: '21120701', //app.vue 自动获取.目前是h5 设置给了一个默认值
 		showEndTime: config.endTime, //游戏显示时间字段，后台返回对应此时间之前的数据
 
 		//现在游戏显示在对应的平台
@@ -364,7 +368,7 @@ const store = new Vuex.Store({
 		BluetoothAdapter: null,
 
 		//版本状态，用于区分部分特定的环境
-		versionCodeState: null,
+		versionCodeState: {showGame:false,showVideo:false,versionCode:0,title:'none'},
 
 		//显示蓝牙是否断开连接Modal
 		bShowBLEConnectModal: false,
@@ -1345,7 +1349,7 @@ const store = new Vuex.Store({
 			// 	}
 			// });
 
-			//进入此页面先设置平台参数
+			//登录之后，进入此页面先设置平台参数
 			if (state.platform == "ios") {
 				uni.setStorageSync("platform", 1);
 			} else if (state.platform == "android") {
@@ -3250,12 +3254,27 @@ const store = new Vuex.Store({
 		//获取versionCode状态，用于处理特定的信息显示
 		getVersionCode(state) {
 			let self = this;
+			console.log("state.versionCode:"+state.versionCode);
 			reqUtil.requestData(config.URL.GETVERSIONCODE, {
 				code: state.versionCode
 			}).then(res => {
-					console.log('获取GETVERSIONCODE =====', res);
+					console.log('获取版本控制信息 ====='+ JSON.stringify(res));
 					if (res.code == 0) {
-						state.versionCodeState = res.data;
+						state.versionCodeState = Object.assign({},state.versionCodeState,res.data);
+						/**
+						 * 初始化配置表方案
+						 * 搞一个区分平台上线显示等，根据版本版本号，是否显示，平台限制等区别
+						 */
+						//显示,隐藏游戏栏目
+						uni.setTabBarItem({
+							index:2,
+							visible:state.versionCodeState.showGame
+						})
+						//显示,隐藏视频栏目
+						uni.setTabBarItem({
+							index:3,
+							visible:state.versionCodeState.showVideo
+						})
 					}
 				},
 				e => {