android 2.3.0 21022503 预上线版本

App.vue

@@ -19,11 +19,6 @@
 					this.$store.state.system = res.system
 					this.$store.state.platform = res.platform
 					
-					if(res.platform == "ios"){
-						uni.setStorageSync("platform",1);
-					}else if(res.platform == "android"){
-						uni.setStorageSync("platform",0);
-					}
 				},
 				fail: (err) => {},
 				complete: () => {}

common/config.js

@@ -5,9 +5,9 @@ const endTime = "2021-02-24"
 
 
 //线上地址，腾讯云服务器
-// const host="https://www.9527fun.cn/api_prd"
+const host="https://www.9527fun.cn/api_prd"
 //测试地址，阿里云服务器
-const host="https://www.9527fun.cn/api_dev"
+// const host="https://www.9527fun.cn/api_dev"
 //本地测试地址
 // const host = "http://192.168.0.112:9090/api_dev"
 // const host = "http://47.104.216.192:9090/api_dev"

manifest.json

@@ -2,8 +2,8 @@
     "name" : "哔蹦",
     "appid" : "__UNI__2635DF5",
     "description" : "",
-    "versionName" : "2.2.7",
-    "versionCode" : 21022402,
+    "versionName" : "2.3.0",
+    "versionCode" : 21022503,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

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

@@ -411,12 +411,12 @@
 							_self.saveObj = Object.assign({}, setDevice, {
 								id: _self.currentItem.id
 							});
-							// uni.showToast({
-							// 	title: '设备连接中...',
-							// 	icon: 'loading',
-							// 	duration: 12000,
-							// 	mask: true
-							// })
+							uni.showToast({
+								title: '设备连接中...',
+								icon: 'loading',
+								duration: 10000,
+								mask: true
+							})
 							console.log("GetBondedDevices:::===",setDevice,_self.currentItem, obj);
 							// 先直连，然后判断版本
 							_self._onConnectDevice(obj);

pages/personal-page/personal/personal.vue

@@ -288,6 +288,8 @@
 						<!-- <button class="margin" @click="closeAcc">关闭手机加速计和方向传感器</button> -->
 						<!-- <button class="margin" @click="openGyro">开启手机加速计和方向传感器</button> -->
 						<!-- <button class="margin" @click="stopGyro">关闭手机加速计和方向传感器</button> -->
+						<!-- <button class="margin" @click="getBLEDeviceServices">getBLEDeviceServices</button> -->
+						
 						<!-- <keyboard-listener @keydown="onKeyDown"></keyboard-listener> -->
 						<!-- 视频推荐 -->
 						<view class="card-view" v-if="versionCodeState&&versionCodeState.showVideo && videoList.length !== 0">
@@ -482,7 +484,8 @@
 			'bListenAdapterStateChange', 'bConnection', 'bVerifiedConnection', 'currentInstruction', 'instructionState',
 			'LocationGameUrl',
 			'bPhoneMatched',
-			'versionCodeState'
+			'versionCodeState',
+			'platform'
 		]),
 		components: {
 			uniNavBar,
@@ -2463,6 +2466,21 @@
 				uni.navigateTo({
 					url: '../../info-page/app-info/app-info'
 				})
+			},
+			
+			getBLEDeviceServices(){
+				console.log("getBLEDeviceServices");
+				
+				// uni.getBLEDeviceServices({
+				// 	deviceId: "C5:5C:19:04:00:30",
+				// 	success: res => {
+				// 		console.log("getBLEDeviceServices==", JSON.stringify(res));
+				// 	},
+				// 	fail: failRes => {
+				// 		console.log('device services:', failRes)
+						
+				// 	}
+				// });
 			}
 
 

util/util-js/requstUtil.js

@@ -9,7 +9,7 @@ function requestData(url, params, method) {
 				//application/x-www-form-urlencoded text/html;charset=UTF-8;application/json; accessToken backend_api_context Bearer 
 				"Content-Type": "application/x-www-form-urlencoded",
 				"token": uni.getStorageSync('token') ? `${uni.getStorageSync('token')}` : '',
-				"platform": uni.getStorageSync('platform') || uni.getStorageSync('platform') == 0 ? `${uni.getStorageSync('platform')}` : 2
+				"platform": uni.getStorageSync('platform') || uni.getStorageSync('platform') === 0 ? `${uni.getStorageSync('platform')}` : 2
 			},
 			success: function(res) {
 				console.log("GET URL:", url, ". Params:", params);
@@ -37,7 +37,7 @@ function reqUpload(url, params,filePath) {
 				//application/x-www-form-urlencoded text/html;charset=UTF-8;application/json; accessToken backend_api_context Bearer 
 				// "Content-Type": "multipart/form-data",
 				"token": uni.getStorageSync('token') ? `${uni.getStorageSync('token')}` : '',
-				"platform": uni.getStorageSync('platform') || uni.getStorageSync('platform') == 0 ? `${uni.getStorageSync('platform')}` : 2
+				"platform": uni.getStorageSync('platform') || uni.getStorageSync('platform') === 0 ? `${uni.getStorageSync('platform')}` : 2
 			},
 			filePath: filePath,
 			name: 'file',

util/util-js/store.js

@@ -1058,7 +1058,13 @@ const store = new Vuex.Store({
 			// 		cityCode: 12345
 			// 	}
 			// });
-
+			
+			//进入此页面先设置平台参数
+			if(state.platform == "ios"){
+				uni.setStorageSync("platform",1);
+			}else if(state.platform == "android"){
+				uni.setStorageSync("platform",0);
+			}
 			//获取版本信息
 			this.commit('getVersionCode');