BLE发送数据添加安卓苹果不同的逻辑

utils/BleHelper.js

@@ -389,8 +389,7 @@ class BleHelper {
 								});
 								uni.setStorageSync(this.StorageKey, this.data
 									.LinkedList);
-							}
-							else{
+							} else {
 								console.log("蓝牙连接已恢复，", res);
 							}
 						});
@@ -1057,21 +1056,24 @@ class BleHelper {
 	}
 
 	//将点阵数据转换成RGB565
-	convertToRGB565(pixels) {	
+	convertToRGB565(pixels, type) {
 		const result = new Uint16Array(pixels.length / 4);
 		let index = 0;		
-		console.log("pixels.length=" + pixels.length);
 		for (let i = 0; i < pixels.length; i += 4) {
-			const r = pixels[i];
-			const g = pixels[i + 1];
-			const b = pixels[i + 2];
-	
-			// 转换为RGB565 (R:5bit, G:6bit, B:5bit)
-			const rgb565 = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+			let r = pixels[i];
+			let g = pixels[i + 1];
+			let b = pixels[i + 2];
 		
+			let rgb565 = ((r & 0xF8) << 8) | ((g & 0xFC) << 3) | (b >> 3);
+			let bgr565 = (b >> 3) | ((g & 0xFC) << 3) | ((r & 0xF8) << 8);
+			if(type=='bgr'){
+				result[index++] = bgr565;
+			}else{
 				result[index++] = rgb565;
 			}
 			
+		}
+
 		return result;
 	}
 }