react-native-bluetooth-escpos-printer-fork 0.0.21 → 0.0.24

package/android/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     repositories {
-        jcenter { url "https://jcenter.bintray.com/" }
         maven {url "https://repo.spring.io/plugins-release/"}
+        google()
         mavenCentral()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm

package/ios/ImageUtils.m

@@ -190,24 +190,12 @@ 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;
-    
-    // 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);
-    
+   // NSMutableString *toLog = [[NSMutableString alloc] init];
     for(int i=0;i<nHeight;i++){
         NSInteger var10 = i*(8+nBytesPerLine);
          //GS v 0 m xL xH yL yH d1....dk 打印光栅位图
@@ -219,31 +207,19 @@ 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"];
     }
-    
-    // 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;
-        }
-    }
-    
+   // NSLog(@"line datas: %@",toLog);
     return [NSData dataWithBytes:data length:nHeight*(8+nBytesPerLine)];
 }
 
@@ -266,25 +242,24 @@ int p6[] = { 0, 0x02 };
     }
     
     int grayave = graytotal / ysize / xsize;
-    NSLog(@"Threshold: average gray = %d (pixels lighter than this become white)", grayave);
-    
     k = 0;
-    int oneCount = 0;
+   // NSMutableString *logStr = [[NSMutableString alloc]init];
+   // 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; // White (don't print)
+                despixels[k] = 0;
             } else {
-                despixels[k] = 1; // Black (print)
-               oneCount++;
+                despixels[k] = 1;
+               // oneCount++;
             }
             
             ++k;
+           // [logStr appendFormat:@"%d,",despixels[k]];
         }
     }
-    NSLog(@"Thresholding complete: %d/%d pixels are black (%.1f%%)", 
-          oneCount, (int)(xsize*ysize), (oneCount * 100.0 / (xsize*ysize)));
+   // NSLog(@"despixels [with 1 count:%d]: %@",oneCount,logStr);
     return despixels;
 }
 +(NSData *)pixToTscCmd:(uint8_t *)src width:(NSInteger) width

package/ios/PrintImageBleWriteDelegate.m

@@ -42,20 +42,11 @@
 -(void) print
 {
     @synchronized (self) {
-        // Each line contains: 8 bytes (ESC/POS raster command header) + (width/8) bytes (pixel data)
-        NSInteger sizePerLine = 8 + (int)(_width/8);
+     NSInteger sizePerLine = (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.05f]; // 50ms delay between lines to avoid overwhelming printer buffer
+        [NSThread sleepForTimeInterval:0.01f];
     }
 }
 @end

package/ios/RNBluetoothEscposPrinter.m

@@ -488,8 +488,7 @@ RCT_EXPORT_METHOD(printPic:(NSString *) base64encodeStr withOptions:(NSDictionar
             //mBitmap.getHeight() * width / mBitmap.getWidth();
             NSInteger imgHeight = jpgImage.size.height;
             NSInteger imagWidth = jpgImage.size.width;
-            // Round width to multiple of 8 (required for raster image format)
-            NSInteger width = ((nWidth + 7) / 8) * 8;
+            NSInteger width = nWidth;//((int)(((nWidth*0.86)+7)/8))*8-7;
             CGSize size = CGSizeMake(width, imgHeight*width/imagWidth);
             UIImage *scaled = [ImageUtils imageWithImage:jpgImage scaledToFillSize:size];
             if(paddingLeft>0){
@@ -498,16 +497,8 @@ 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;
@@ -552,9 +543,6 @@ 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;
@@ -572,7 +560,7 @@ RCT_EXPORT_METHOD(printEscPosCommands:(NSString *)base64encodeStr
     if(RNBluetoothManager.isConnected){
         @try{
             NSData *decoded = [[NSData alloc] initWithBase64EncodedString:base64encodeStr options:0];
-            
+
             pendingResolve = resolve;
             pendingReject = reject;
             [RNBluetoothManager writeValue:decoded withDelegate:self];
@@ -646,14 +634,22 @@ RCT_EXPORT_METHOD(printBarCode:(NSString *) str withType:(NSInteger)
 }
 
 - (void) didWriteDataToBle: (BOOL)success{
-    if(success){
-        pendingResolve(nil);
-    }else{NSLog(@"REJECT<REJECT<REJECT<REJECT<REJECT<");
-        pendingReject(@"COMMAND_NOT_SEND",@"COMMAND_NOT_SEND",nil);
+    if(!pendingResolve && !pendingReject) return;
+    @try {
+        if(success){
+            if(pendingResolve) pendingResolve(nil);
+        }else{
+            if(pendingReject) pendingReject(@"COMMAND_NOT_SEND",@"COMMAND_NOT_SEND",nil);
+        }
+    }
+    @catch(NSException *e){
+        NSLog(@"didWriteDataToBle exception: %@", e);
+    }
+    @finally {
+        pendingReject = nil;
+        pendingResolve = nil;
     }
-    pendingReject = nil;
-    pendingResolve = nil;
-    [NSThread sleepForTimeInterval:0.05f];//slow down
+    [NSThread sleepForTimeInterval:0.05f];
 }
 
 @end

package/package.json

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