react-native-bluetooth-escpos-printer-fork 0.0.18 → 0.0.20

package/ios/ImageUtils.m

@@ -190,12 +190,24 @@ int p6[] = { 0, 0x02 };
  **/
 + (NSData *)eachLinePixToCmd:(unsigned char *)src nWidth:(NSInteger) nWidth nHeight:(NSInteger) nHeight nMode:(NSInteger) nMode
 {
-    NSLog(@"SIZE OF SRC: %lu",sizeof(&src));
     NSInteger nBytesPerLine = (int)nWidth/8;
     unsigned char * data = malloc(nHeight*(8+nBytesPerLine));
-   // const char* srcData = (const char*)[src bytes];
     NSInteger k = 0;
-   // NSMutableString *toLog = [[NSMutableString alloc] init];
+    
+    // Log first few lines to see actual pixel distribution
+    int totalBlackPixelsInFirstLines = 0;
+    for(int line = 0; line < MIN(10, nHeight); line++) {
+        int blackInLine = 0;
+        for(int x = 0; x < nWidth; x++) {
+            if(src[line * nWidth + x] == 1) blackInLine++;
+        }
+        if(blackInLine > 0) {
+            NSLog(@"Line %d: %d/%d pixels are black", line, blackInLine, (int)nWidth);
+        }
+        totalBlackPixelsInFirstLines += blackInLine;
+    }
+    NSLog(@"First 10 lines: %d total black pixels", totalBlackPixelsInFirstLines);
+    
     for(int i=0;i<nHeight;i++){
         NSInteger var10 = i*(8+nBytesPerLine);
          //GS v 0 m xL xH yL yH d1....dk 打印光栅位图
@@ -207,19 +219,31 @@ int p6[] = { 0, 0x02 };
                 data[var10 + 5] =  (unsigned char)(nBytesPerLine / 256);//xH
                 data[var10 + 6] = 1;//yL
                 data[var10 + 7] = 0;//yH
-//        for(int l=0;l<8;l++){
-//            NSInteger d =data[var10 + l];
-//            [toLog appendFormat:@"%ld,",(long)d];
-//        }
         
         for (int j = 0; j < nBytesPerLine; ++j) {
             data[var10 + 8 + j] = (int) (p0[src[k]] + p1[src[k + 1]] + p2[src[k + 2]] + p3[src[k + 3]] + p4[src[k + 4]] + p5[src[k + 5]] + p6[src[k + 6]] + src[k + 7]);
             k =k+8;
-             //  [toLog appendFormat:@"%ld,",(long)data[var10+8+j]];
         }
-       // [toLog appendString:@"\n\r"];
     }
-   // NSLog(@"line datas: %@",toLog);
+    
+    // Find and log first line with actual black pixels
+    for(int i = 0; i < nHeight; i++) {
+        NSInteger var10 = i*(8+nBytesPerLine);
+        BOOL hasBlack = NO;
+        for(int j = 0; j < MIN(20, nBytesPerLine); j++) {
+            if(data[var10 + 8 + j] != 0) {
+                hasBlack = YES;
+                break;
+            }
+        }
+        if(hasBlack) {
+            NSLog(@"First line with black pixels is line %d, first 10 bytes: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+                  i, data[var10+8], data[var10+9], data[var10+10], data[var10+11], data[var10+12], 
+                  data[var10+13], data[var10+14], data[var10+15], data[var10+16], data[var10+17]);
+            break;
+        }
+    }
+    
     return [NSData dataWithBytes:data length:nHeight*(8+nBytesPerLine)];
 }
 
@@ -242,24 +266,25 @@ int p6[] = { 0, 0x02 };
     }
     
     int grayave = graytotal / ysize / xsize;
+    NSLog(@"Threshold: average gray = %d (pixels lighter than this become white)", grayave);
+    
     k = 0;
-   // NSMutableString *logStr = [[NSMutableString alloc]init];
-   // int oneCount = 0;
+    int oneCount = 0;
     for(i = 0; i < ysize; ++i) {
         for(j = 0; j < xsize; ++j) {
             gray = orgpixels[k] & 255;
             if(gray > grayave) {
-                despixels[k] = 0;
+                despixels[k] = 0; // White (don't print)
             } else {
-                despixels[k] = 1;
-               // oneCount++;
+                despixels[k] = 1; // Black (print)
+               oneCount++;
             }
             
             ++k;
-           // [logStr appendFormat:@"%d,",despixels[k]];
         }
     }
-   // NSLog(@"despixels [with 1 count:%d]: %@",oneCount,logStr);
+    NSLog(@"Thresholding complete: %d/%d pixels are black (%.1f%%)", 
+          oneCount, (int)(xsize*ysize), (oneCount * 100.0 / (xsize*ysize)));
     return despixels;
 }
 +(NSData *)pixToTscCmd:(uint8_t *)src width:(NSInteger) width

package/ios/PrintImageBleWriteDelegate.m

@@ -42,11 +42,20 @@
 -(void) print
 {
     @synchronized (self) {
-     NSInteger sizePerLine = (int)(_width/8);
+        // Each line contains: 8 bytes (ESC/POS raster command header) + (width/8) bytes (pixel data)
+        NSInteger sizePerLine = 8 + (int)(_width/8);
         NSData *subData = [_toPrint subdataWithRange:NSMakeRange(_now, sizePerLine)];
+        
+        // Log first line to debug
+        if(_now == 0) {
+            NSUInteger logLen = MIN(20, [subData length]);
+            NSData *logData = [subData subdataWithRange:NSMakeRange(0, logLen)];
+            NSLog(@"First image line (%lu bytes): %@", (unsigned long)[subData length], logData);
+        }
+        
         [RNBluetoothManager writeValue:subData withDelegate:self];
         _now = _now+sizePerLine;
-        [NSThread sleepForTimeInterval:0.01f];
+        [NSThread sleepForTimeInterval:0.05f]; // 50ms delay between lines to avoid overwhelming printer buffer
     }
 }
 @end

package/ios/RNBluetoothEscposPrinter.m

@@ -488,7 +488,8 @@ RCT_EXPORT_METHOD(printPic:(NSString *) base64encodeStr withOptions:(NSDictionar
             //mBitmap.getHeight() * width / mBitmap.getWidth();
             NSInteger imgHeight = jpgImage.size.height;
             NSInteger imagWidth = jpgImage.size.width;
-            NSInteger width = nWidth;//((int)(((nWidth*0.86)+7)/8))*8-7;
+            // Round width to multiple of 8 (required for raster image format)
+            NSInteger width = ((nWidth + 7) / 8) * 8;
             CGSize size = CGSizeMake(width, imgHeight*width/imagWidth);
             UIImage *scaled = [ImageUtils imageWithImage:jpgImage scaledToFillSize:size];
             if(paddingLeft>0){
@@ -497,8 +498,16 @@ RCT_EXPORT_METHOD(printPic:(NSString *) base64encodeStr withOptions:(NSDictionar
             }
 
             unsigned char * graImage = [ImageUtils imageToGreyImage:scaled];
+            NSLog(@"Grayscale conversion complete");
+            
             unsigned char * formatedData = [ImageUtils format_K_threshold:graImage width:size.width height:size.height];
+            NSLog(@"Thresholding complete, generating ESC/POS commands");
+            
             NSData *dataToPrint = [ImageUtils eachLinePixToCmd:formatedData nWidth:size.width nHeight:size.height nMode:0];
+            NSLog(@"Image print: %lux%lu pixels, %lu bytes total, %lu bytes per line", 
+                  (unsigned long)size.width, (unsigned long)size.height, 
+                  (unsigned long)[dataToPrint length], (unsigned long)(8 + size.width/8));
+            
             PrintImageBleWriteDelegate *delegate = [[PrintImageBleWriteDelegate alloc] init];
             delegate.pendingResolve = resolve;
             delegate.pendingReject = reject;
@@ -543,6 +552,9 @@ RCT_EXPORT_METHOD(printQRCode:(NSString *)content
         uint8_t * graImage = [ImageUtils imageToGreyImage:[UIImage imageWithCGImage:image]];
         unsigned char * formatedData = [ImageUtils format_K_threshold:graImage width:size height:size];
         NSData *dataToPrint = [ImageUtils eachLinePixToCmd:formatedData nWidth:size nHeight:size nMode:0];
+        NSLog(@"QR code print: %lux%lu pixels, %lu bytes total, %lu bytes per line", 
+              (unsigned long)size, (unsigned long)size, 
+              (unsigned long)[dataToPrint length], (unsigned long)(8 + size/8));
         PrintImageBleWriteDelegate *delegate = [[PrintImageBleWriteDelegate alloc] init];
         delegate.pendingResolve=resolve;
         delegate.pendingReject = reject;

package/ios/RNBluetoothManager.m

@@ -78,7 +78,7 @@ static NSTimer *timer;
                 
                 // Small delay between chunks to avoid overwhelming the device
                 if(writeType == CBCharacteristicWriteWithoutResponse) {
-                    [NSThread sleepForTimeInterval:0.01]; // 10ms delay
+                    [NSThread sleepForTimeInterval:0.02]; // 20ms delay
                 }
             }
             @catch(NSException *e) {
@@ -280,7 +280,7 @@ RCT_EXPORT_METHOD(scanDevices:(RCTPromiseResolveBlock)resolve
             [timer invalidate];
             timer = nil;
         }
-        timer = [NSTimer scheduledTimerWithTimeInterval:30 target:self selector:@selector(callStop) userInfo:nil repeats:NO];
+        timer = [NSTimer scheduledTimerWithTimeInterval:12 target:self selector:@selector(callStop) userInfo:nil repeats:NO];
     
     }
     @catch(NSException *exception){
@@ -421,53 +421,40 @@ RCT_EXPORT_METHOD(unpaire:(NSString *)address
 -(void)callStop{
     if(self.centralManager.isScanning){
         [self.centralManager stopScan];
-        NSMutableArray *devices = [[NSMutableArray alloc] init];
-        for(NSString *key in self.foundDevices){
-            NSLog(@"insert found devices:%@ =>%@",key,[self.foundDevices objectForKey:key]);
-            
-            // Get stored metadata if available, otherwise create basic info
-            NSDictionary *deviceInfo = [self.foundDevicesMetadata objectForKey:key];
-            if (deviceInfo) {
-                [devices addObject:deviceInfo];
-            } else {
-                // Fallback if metadata wasn't stored (shouldn't happen with new code)
-                NSString *name = [self.foundDevices objectForKey:key].name;
-                if(!name){
-                    name = @"";
-                }
-                [devices addObject:@{
-                    @"address":key,
-                    @"name":name,
-                    @"deviceClass":@(7936),      // Unknown device class
-                    @"majorDeviceClass":@(7936)  // Unknown major device class
-                }];
-            }
-        }
-        
-        // Create result object matching Android format: {"paired": [...], "found": [...]}
-        // Empty paired devices array (iOS doesn't have "paired" concept like Android)
-        NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
-        [result setObject:@[] forKey:@"paired"];
-        [result setObject:devices forKey:@"found"];
-        
-        // Convert the entire result to a JSON string (matching Android's behavior)
-        NSError *error = nil;
-        NSData* resultJsonData = [NSJSONSerialization dataWithJSONObject:result options:0 error:&error];
-        NSString *resultJsonStr = [[NSString alloc] initWithData:resultJsonData encoding:NSUTF8StringEncoding];
-        
-        if(hasListeners){
-            // For events, send separate paired and found strings
-            NSData* foundJsonData = [NSJSONSerialization dataWithJSONObject:devices options:0 error:&error];
-            NSString *foundJsonStr = [[NSString alloc] initWithData:foundJsonData encoding:NSUTF8StringEncoding];
-            [self sendEventWithName:EVENT_DEVICE_DISCOVER_DONE body:@{@"found":foundJsonStr,@"paired":@"[]"}];
-        }
-        if(self.scanResolveBlock){
-            RCTPromiseResolveBlock rsBlock = self.scanResolveBlock;
-            // Return single JSON string: "{\"paired\":[],\"found\":[...]}"
-            rsBlock(resultJsonStr);
-            self.scanResolveBlock = nil;
+    }
+
+    NSMutableArray *devices = [[NSMutableArray alloc] init];
+    for(NSString *key in self.foundDevices){
+        NSLog(@"insert found devices:%@ =>%@",key,[self.foundDevices objectForKey:key]);
+        NSDictionary *deviceInfo = [self.foundDevicesMetadata objectForKey:key];
+        if (deviceInfo) {
+            [devices addObject:deviceInfo];
+        } else {
+            NSString *name = [self.foundDevices objectForKey:key].name;
+            if(!name) name = @"";
+            [devices addObject:@{@"address":key, @"name":name}];
         }
     }
+
+    NSMutableDictionary *result = [[NSMutableDictionary alloc] init];
+    [result setObject:@[] forKey:@"paired"];
+    [result setObject:devices forKey:@"found"];
+
+    NSError *error = nil;
+    NSData *resultJsonData = [NSJSONSerialization dataWithJSONObject:result options:0 error:&error];
+    NSString *resultJsonStr = [[NSString alloc] initWithData:resultJsonData encoding:NSUTF8StringEncoding];
+
+    if(hasListeners){
+        NSData *foundJsonData = [NSJSONSerialization dataWithJSONObject:devices options:0 error:&error];
+        NSString *foundJsonStr = [[NSString alloc] initWithData:foundJsonData encoding:NSUTF8StringEncoding];
+        [self sendEventWithName:EVENT_DEVICE_DISCOVER_DONE body:@{@"found":foundJsonStr, @"paired":@"[]"}];
+    }
+    if(self.scanResolveBlock){
+        RCTPromiseResolveBlock rsBlock = self.scanResolveBlock;
+        rsBlock(resultJsonStr);
+        self.scanResolveBlock = nil;
+    }
+
     if(timer && timer.isValid){
         [timer invalidate];
         timer = nil;
@@ -553,52 +540,44 @@ RCT_EXPORT_METHOD(unpaire:(NSString *)address
     
     // Try to infer device class from advertising data
     // iOS BLE doesn't expose Classic Bluetooth device class, but we can make educated guesses
-    NSInteger deviceClass = 0;
-    NSInteger majorDeviceClass = 0;
-    
-    // Check if device advertises printer-related services
+    // Build advertisementData dictionary for JS layer
+    NSMutableDictionary *advData = [[NSMutableDictionary alloc] init];
+
+    // Service UUIDs
     NSArray *serviceUUIDs = advertisementData[CBAdvertisementDataServiceUUIDsKey];
-    BOOL isPrinter = NO;
-    
     if (serviceUUIDs && serviceUUIDs.count > 0) {
+        NSMutableArray *uuidStrings = [[NSMutableArray alloc] init];
         for (CBUUID *uuid in serviceUUIDs) {
-            NSString *uuidString = uuid.UUIDString.uppercaseString;
-            // Serial Port Profile (SPP) UUID - common for printers
-            // Also check for other printer-related service UUIDs
-            if ([uuidString isEqualToString:@"00001101-0000-1000-8000-00805F9B34FB"] ||
-                [uuidString isEqualToString:@"49535343-FE7D-4AE5-8FA9-9FAFD205E455"] ||
-                [uuidString containsString:@"18F0"]) {
-                isPrinter = YES;
-                break;
-            }
+            [uuidStrings addObject:uuid.UUIDString];
         }
+        [advData setObject:uuidStrings forKey:@"serviceUUIDs"];
     }
-    
-    // Check device name for printer keywords
-    NSString *name = peripheral.name ? peripheral.name.uppercaseString : @"";
-    if ([name containsString:@"PRINT"] || 
-        [name containsString:@"POS"] ||
-        [name containsString:@"ESCPOS"] ||
-        [name containsString:@"THERMAL"] ||
-        [name containsString:@"RECEIPT"]) {
-        isPrinter = YES;
+
+    // Local name (may differ from peripheral.name)
+    NSString *localName = advertisementData[CBAdvertisementDataLocalNameKey];
+    if (localName) {
+        [advData setObject:localName forKey:@"localName"];
     }
-    
-    if (isPrinter) {
-        // Android Bluetooth Class values for printers:
-        // Major Device Class: 0x0600 (Imaging - printers, scanners, cameras, etc.)
-        // Device Class: 0x000680 (Imaging/Printer)
-        majorDeviceClass = 1536;  // 0x0600 in decimal
-        deviceClass = 1664;       // 0x0680 in decimal
-    } else {
-        // Unknown/Unclassified device
-        // Major Device Class: 0x1F00 (Uncategorized)
-        majorDeviceClass = 7936;  // 0x1F00 in decimal
-        deviceClass = 7936;
+
+    // Manufacturer data as base64
+    NSData *manufacturerData = advertisementData[CBAdvertisementDataManufacturerDataKey];
+    if (manufacturerData) {
+        [advData setObject:[manufacturerData base64EncodedStringWithOptions:0] forKey:@"manufacturerData"];
     }
-    
-    [deviceInfo setObject:@(deviceClass) forKey:@"deviceClass"];
-    [deviceInfo setObject:@(majorDeviceClass) forKey:@"majorDeviceClass"];
+
+    // TX power level
+    NSNumber *txPowerLevel = advertisementData[CBAdvertisementDataTxPowerLevelKey];
+    if (txPowerLevel) {
+        [advData setObject:txPowerLevel forKey:@"txPowerLevel"];
+    }
+
+    // Connectable flag
+    NSNumber *isConnectable = advertisementData[CBAdvertisementDataIsConnectable];
+    if (isConnectable) {
+        [advData setObject:isConnectable forKey:@"isConnectable"];
+    }
+
+    [deviceInfo setObject:advData forKey:@"advertisementData"];
     
     // Store the peripheral object for connection
     NSDictionary *peripheralStored = @{peripheral.identifier.UUIDString:peripheral};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-bluetooth-escpos-printer-fork",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "React-Native plugin for the bluetooth ESC/POS printers.",
   "main": "index.js",
   "scripts": {