update: 修复 iBeacon 不兼容微信问题，放开支付宝小程序 TabBar API

hdx-w · hdx-w · commit 75bf75abd382 · 2019-05-31T15:30:55.000+08:00
diff --git a/pages/API/ibeacon/ibeacon.vue b/pages/API/ibeacon/ibeacon.vue
@@ -9,7 +9,7 @@
 				<button type="primary" :disabled="!isStarted" @click="stopBeaconDiscovery">停止搜索附近的iBeacon设备</button>
 			</view>
 		</view>
-		<scroll-view class="uni-scroll_box" scroll-y @touchmove.stop.prevent="moveHandle" @click.stop="moveHandle">
+		<scroll-view class="uni-scroll_box">
 			<view class="uni-title" v-if="isStarted || deviceList.length > 0">已经发现 {{ deviceList.length }} 台设备:</view>
 			<view class="uni-list-box" v-for="(item, index) in deviceList" :key="item.uuid">
 				<view>
@@ -25,8 +25,7 @@
 	</view>
 </template>
 <script>
-	// 必须符合 UUID 格式
-	const DEVICE_UUID = 'A1B85ED2-D76F-4AE4-8F5D-6CCF53E4E228';
+	const DEVICE_UUID_WEICHAT = 'FDA50693-A4E2-4FB1-AFCF-C6EB07647825';
 	export default {
 		data() {
 			return {
@@ -73,14 +72,14 @@
 				});
 			},
 			onBeaconUpdate() {
-				plus.ibeacon.onBeaconUpdate(res => {
+				uni.onBeaconUpdate(res => {
 					if (!this.isPageOpened || !this.isOpen || !this.isStarted) {
 						return;
 					}
-					if (res.code !== 0) {
-						console.log(res);
-						return;
-					}
+					console.log(res);
+					// if (res.code !== 0) {
+					// 	return;
+					// }
 					if (res.beacons && res.beacons.length > 0) {
 						this.getBeacons();
 					} else if (!res.connected) {
@@ -89,8 +88,8 @@
 				});
 			},
 			startBeaconDiscovery() {
-				plus.ibeacon.startBeaconDiscovery({
-					uuids: [],
+				uni.startBeaconDiscovery({
+					uuids: this.getUUIDList(),
 					success: (res) => {
 						this.isStarted = true;
 						console.log(res);
@@ -125,6 +124,23 @@
 						}
 					}
 				});
+			},
+			getUUIDList() {
+				// #ifdef APP-PLUS
+				const sysInfo = uni.getSystemInfoSync();
+				if (!sysInfo) {
+					return [];
+				}
+				let isIOS = sysInfo.platform ? (sysInfo.platform.toLowerCase() === "ios") : false;
+				if (isIOS) {
+					return [DEVICE_UUID_WEICHAT];
+				}
+				return [];
+				// #endif
+
+				// #ifndef APP-PLUS
+				return [DEVICE_UUID_WEICHAT];
+				// #endif
 			}
 		},
 		onUnload() {
diff --git a/pages/API/video/video.vue b/pages/API/video/video.vue
@@ -17,7 +17,7 @@
 		</view>
 		<!-- #ifdef APP-PLUS || MP-WEIXIN -->
 		<view class="uni-title uni-common-mt uni-common-pl">摄像头位置</view>
-		<view class="uni-hello-text">注意：部分 Android 手机下由于系统 ROM 不支持无法生效，打开拍摄界面后可操作切换</view>
+		<view class="uni-hello-text camera-tips">注意：部分 Android 手机下由于系统 ROM 不支持无法生效，打开拍摄界面后可操作切换</view>
 		<view class="uni-list">
 			<radio-group @change="radioChange">
 				<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in cameraList" :key="item.value">
@@ -94,4 +94,8 @@
 	.video {
 		width: 100%;
 	}
+
+	.camera-tips {
+		padding: 10upx 30upx;
+	}
 </style>
diff --git a/pages/tabBar/API/API.vue b/pages/tabBar/API/API.vue
@@ -103,7 +103,7 @@ export default {
 						name: '页面跳转',
 						url: 'navigator'
 					},
-					//#ifndef MP-ALIPAY || MP-TOUTIAO
+					//#ifndef MP-TOUTIAO
 					{
 						name: '设置TabBar',
 						url: 'set-tabbar'

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ export default {`
`103`	`103`	`name: '页面跳转',`
`104`	`104`	`url: 'navigator'`
`105`	`105`	`},`
`106`		`- //#ifndef MP-ALIPAY \|\| MP-TOUTIAO`
	`106`	`+ //#ifndef MP-TOUTIAO`
`107`	`107`	`{`
`108`	`108`	`name: '设置TabBar',`
`109`	`109`	`url: 'set-tabbar'`