diff --git a/StarIO.zip b/StarIO.zip index 755ad30..f30f977 100644 Binary files a/StarIO.zip and b/StarIO.zip differ diff --git a/android/libs/StarIOPort3.1.jar b/android/libs/StarIOPort3.1.jar old mode 100755 new mode 100644 index a33b501..905aa00 Binary files a/android/libs/StarIOPort3.1.jar and b/android/libs/StarIOPort3.1.jar differ diff --git a/android/libs/starioextension.jar b/android/libs/starioextension.jar old mode 100755 new mode 100644 index 071ee0f..617c72a Binary files a/android/libs/starioextension.jar and b/android/libs/starioextension.jar differ diff --git a/android/src/main/java/net/infoxication/reactstarprnt/RNStarPrntModule.java b/android/src/main/java/net/infoxication/reactstarprnt/RNStarPrntModule.java index ab99b86..8e8f752 100644 --- a/android/src/main/java/net/infoxication/reactstarprnt/RNStarPrntModule.java +++ b/android/src/main/java/net/infoxication/reactstarprnt/RNStarPrntModule.java @@ -164,7 +164,17 @@ public void connect(final String portName, final String emulation, final Boolean String portSettings = getPortSettingsOption(emulation); if (starIoExtManager != null && starIoExtManager.getPort() != null) { - starIoExtManager.disconnect(null); + starIoExtManager.disconnect(new IConnectionCallback() { + @Override + public void onConnected(ConnectResult connectResult) { + // Do nothing + } + + @Override + public void onDisconnected() { + //Do nothing + } + }); } starIoExtManager = new StarIoExtManager(hasBarcodeReader ? StarIoExtManager.Type.WithBarcodeReader : StarIoExtManager.Type.Standard, portName, portSettings, 10000, context); starIoExtManager.setListener(starIoExtManagerListener); diff --git a/ios/Frameworks/StarIO.framework/Headers b/ios/Frameworks/StarIO.framework/Headers new file mode 120000 index 0000000..a177d2a --- /dev/null +++ b/ios/Frameworks/StarIO.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/ios/Frameworks/StarIO.framework/Resources b/ios/Frameworks/StarIO.framework/Resources new file mode 120000 index 0000000..953ee36 --- /dev/null +++ b/ios/Frameworks/StarIO.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/ios/Frameworks/StarIO.framework/StarIO b/ios/Frameworks/StarIO.framework/StarIO deleted file mode 100644 index 16429a7..0000000 Binary files a/ios/Frameworks/StarIO.framework/StarIO and /dev/null differ diff --git a/ios/Frameworks/StarIO.framework/StarIO b/ios/Frameworks/StarIO.framework/StarIO new file mode 120000 index 0000000..584b097 --- /dev/null +++ b/ios/Frameworks/StarIO.framework/StarIO @@ -0,0 +1 @@ +Versions/Current/StarIO \ No newline at end of file diff --git a/ios/Frameworks/StarIO.framework/Headers/BluetoothPort.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/BluetoothPort.h similarity index 100% rename from ios/Frameworks/StarIO.framework/Headers/BluetoothPort.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/BluetoothPort.h diff --git a/ios/Frameworks/StarIO.framework/Headers/ExternalAccessoryPort.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/ExternalAccessoryPort.h similarity index 87% rename from ios/Frameworks/StarIO.framework/Headers/ExternalAccessoryPort.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/ExternalAccessoryPort.h index 6563710..a30750d 100644 --- a/ios/Frameworks/StarIO.framework/Headers/ExternalAccessoryPort.h +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/ExternalAccessoryPort.h @@ -44,10 +44,18 @@ @property(retain) NSThread *thread71; @property(retain) NSNumber *result71; -@property(assign, readonly) float secShortInterval; -@property(assign, readonly) float secInterval; +@property(assign, readonly) float secInterval1; +@property(assign, readonly) float secInterval2; -- (id)initWithPortName:(NSString *)portName portSettings:(NSString *)portSettings timeout:(u_int32_t)timeout emulation:(SMEmulation)emulation; +@property(retain, nonatomic) NSString *name; +@property(retain, nonatomic) NSString *serialNumber; + +@property(nonatomic) NSUInteger connectionID; + +- (id)initWithPortName:(NSString *)portName + portSettings:(NSString *)portSettings + timeout:(u_int32_t)timeout + emulation:(SMEmulation)emulation; - (BOOL)open; - (int)write:(NSData *)data; - (NSData *)read:(NSUInteger)bytesToRead; diff --git a/ios/Frameworks/StarIO.framework/Headers/Lock.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/Lock.h similarity index 100% rename from ios/Frameworks/StarIO.framework/Headers/Lock.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/Lock.h diff --git a/ios/Frameworks/StarIO.framework/Headers/SMBluetoothManager.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMBluetoothManager.h similarity index 100% rename from ios/Frameworks/StarIO.framework/Headers/SMBluetoothManager.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/SMBluetoothManager.h diff --git a/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMFileLogger.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMFileLogger.h new file mode 100644 index 0000000..1187bda --- /dev/null +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMFileLogger.h @@ -0,0 +1,18 @@ +// +// SMFileLogger.h +// StarIOPort +// +// Created by u3415 on 2018/09/14. +// + +#import "SMLogger.h" + +@interface SMFileLogger : SMLogger + +@property(class, nonatomic, readonly, nonnull) SMFileLogger *sharedInstance NS_SWIFT_NAME(shared); + +@property(nonatomic) NSUInteger maxLogSize; + +@property(nonatomic, readonly, nonnull) NSString *logDirectoryPath; + +@end diff --git a/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMLogger.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMLogger.h new file mode 100644 index 0000000..22337a2 --- /dev/null +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMLogger.h @@ -0,0 +1,26 @@ +// +// SMLogger.h +// StarIOPort +// +// Created by u3415 on 2018/09/14. +// + +#import + +typedef NS_ENUM(NSInteger, SMLogLevel) { + SMLogLevelDefault +}; + +@interface SMLogger : NSObject + +@property (nonatomic) SMLogLevel logLevel; + +@property(nonatomic, readonly) BOOL isLogging; + +- (void)logString:(nonnull NSString *)string NS_SWIFT_NAME(log(_:)); + +- (void)start; + +- (void)stop; + +@end diff --git a/ios/Frameworks/StarIO.framework/Headers/SMPort.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMPort.h similarity index 50% rename from ios/Frameworks/StarIO.framework/Headers/SMPort.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/SMPort.h index 1dffd69..daf4e1d 100644 --- a/ios/Frameworks/StarIO.framework/Headers/SMPort.h +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMPort.h @@ -21,16 +21,17 @@ #import "WBluetoothPort.h" #import "ExternalAccessoryPort.h" #import "Lock.h" +#import "SMFileLogger.h" +#import "SMStarIOResultCode.h" -@interface PortException : NSException -{ -} +#import "exceptions/PortException.h" -@end @interface PortInfo : NSObject -- (id)initWithPortName:(NSString *)portName_ macAddress:(NSString *)macAddress_ modelName:(NSString *)modelName_; +- (id)initWithPortName:(NSString *)portName_ + macAddress:(NSString *)macAddress_ + modelName:(NSString *)modelName_; @property(retain, readonly) NSString *portName; @property(retain, readonly) NSString *macAddress; @@ -49,18 +50,22 @@ BOOL checkedBlockSupport; } +@property(assign, nonatomic) NSString *name; +@property(assign, nonatomic) NSString *identifier; + +@property(nonatomic) NSUInteger connectionID; + @property(assign, readwrite, nonatomic) u_int32_t endCheckedBlockTimeoutMillis; + (NSString *)StarIOVersion; -- (id)init:(NSString *)portName :(NSString *)portSettings :(u_int32_t)ioTimeoutMillis; - /*! * Search printer on LAN or paired bluetooth device. * * @return List of printers that were found. */ -+ (NSArray *)searchPrinter; ++ (NSArray *)searchPrinter +__attribute__((deprecated("Please replace this method with 'searchPrinter(target:) throws' for Swift or 'searchPrinter:(NSString *)target :(NSError **)error' for Objective-C, and pass 'ALL:' as the target argument."))); /*! * Search printer on LAN or paired bluetooth device. @@ -69,7 +74,8 @@ * * @return List of printers that were found. */ -+ (NSArray *)searchPrinter:(NSString *)target; ++ (NSArray *)searchPrinter:(NSString *)target +__attribute__((deprecated("Please replace this method with 'searchPrinter(target:) throws' for Swift or 'searchPrinter:(NSString *)target :(NSError **)error' for Objective-C."))); /*! * This function opens a connection to the port specified. @@ -85,7 +91,8 @@ * * @return SMPort class for StarIO port. */ -+ (SMPort *)getPort:(NSString *)portName :(NSString *)portSettings :(u_int32_t)ioTimeoutMillis; ++ (SMPort *)getPort:(NSString *)portName :(NSString *)portSettings :(u_int32_t)ioTimeoutMillis +__attribute__((deprecated("Please replace this method with 'getPort(portName:portSettings:ioTimeoutMillis:) throws' for Swift or 'getPort:(NSString *)portName :(NSString *)portSettings :(u_int32_t)ioTimeoutMillis :(NSError **)error;' for Objective-C."))); /*! * This function closes a connection to the port specified. @@ -105,7 +112,10 @@ * * @note Throws PortException on failure. */ -- (u_int32_t)writePort:(u_int8_t const *)writeBuffer :(u_int32_t)offSet :(u_int32_t)size; +- (u_int32_t)writePort:(u_int8_t const *)writeBuffer :(u_int32_t)offSet :(u_int32_t)size +NS_SWIFT_UNAVAILABLE("This method throws an Objective-C exception. " + "Please replace this method with 'write(writeBuffer:offset:size:numberOfBytesWritten:) throws'.") +__attribute__((deprecated("Please replace this method with 'write(writeBuffer:offset:size:numberOfBytesWritten:) throws' for Swift or 'writePort:(u_int8_t const *)writeBuffer :(u_int32_t)offSet :(u_int32_t)size :(NSError **)error;' for Objective-C."))); /*! * This function reads data from the device. @@ -118,7 +128,12 @@ * * @note Throws PortException on failure. */ -- (u_int32_t)readPort:(u_int8_t *)readBuffer :(u_int32_t)offSet :(u_int32_t)size; +- (u_int32_t)readPort:(u_int8_t *)readBuffer + :(u_int32_t)offSet + :(u_int32_t)size +NS_SWIFT_UNAVAILABLE("This method throws an Objective-C exception. " + "Please replace this method with 'read(readBuffer:offset:size:numberOfBytesRead:) throws'.") +__attribute__((deprecated("Please replace this method with 'read(readBuffer:offset:size:numberOfBytesRead:) throws' for Swift or 'readPort:(u_int8_t *)readBuffer :(u_int32_t)offSet :(u_int32_t)size :(NSError **)error' for Objective-C."))); /*! * This function retreives the device's detailed status. @@ -129,21 +144,31 @@ * * @note Throws PortException on failure. */ -- (void)getParsedStatus:(void *)starPrinterStatus :(u_int32_t)level; +- (void)getParsedStatus:(void *)starPrinterStatus + :(u_int32_t)level +NS_SWIFT_UNAVAILABLE("This method throws an Objective-C exception." + "Please replace this method with 'getParsedStatus(starPrinterStatus:level:) throws'.") +__attribute__((deprecated("Please replace this method with 'getParsedStatus(starPrinterStatus:level:) throws' for Swift or 'getParsedStatus:(void *)starPrinterStatus :(u_int32_t)level :(NSError **)error' for Objective-C."))); /*! * This function retrieves the device's firmware information. * * @return NSDictionary class that contains firmware information. */ -- (NSDictionary *)getFirmwareInformation; +- (NSDictionary *)getFirmwareInformation +NS_SWIFT_UNAVAILABLE("This method throws an Objective-C exception." + "Please replace this method with 'getFirmwareInformation() throws'.") +__attribute__((deprecated("Please replace this method with 'getFirmwareInformation() throws' for Swift or 'getFirmwareInformation:(NSError **)error' for Objective-C."))); /*! * This function retrieves the device's Dip Switch information. * * @return NSDictionary class that contains Dip Switch information. */ -- (NSDictionary *)getDipSwitchInformation; +- (NSDictionary *)getDipSwitchInformation +NS_SWIFT_UNAVAILABLE("This method throws an Objective-C exception." + "Please replace this method with 'getDipSwitchInformation(error:)'.") +__attribute__((deprecated("Please replace this method with 'getDipSwitchInformation(error:)'."))); /*! * This function retreives the device's online status. @@ -153,7 +178,10 @@ * * @note Throws PortException on failure. */ -- (bool)getOnlineStatus; +- (bool)getOnlineStatus +NS_SWIFT_UNAVAILABLE("This method throws an Objective-C exception." + "Please replace this method with 'getOnlineStatusWithError(error:)'.") +__attribute__((deprecated("Please replace this method with 'getOnlineStatusWithError(error:)'."))); /*! * This function initiates a checked block printing operation and returns the devices detailed status. @@ -164,7 +192,10 @@ * * @note Throws PortException on failure. */ -- (void)beginCheckedBlock:(void *)starPrinterStatus :(u_int32_t)level; +- (void)beginCheckedBlock:(void *)starPrinterStatus :(u_int32_t)level +NS_SWIFT_UNAVAILABLE("This method throws an Objective-C exception." + "Please replace this method with 'beginCheckedBlock(starPrinterStatus:level:) throws'.") +__attribute__((deprecated("Please replace this method with 'beginCheckedBlock(starPrinterStatus:level:) throws' for Swift or 'beginCheckedBlock:(void *)starPrinterStatus :(u_int32_t)level :(NSError **)error' for Objective-C."))); /*! * This function ends a checked block printing operation and returns the devices detailed status. @@ -177,7 +208,10 @@ * * @note Throws PortException on failure */ -- (void)endCheckedBlock:(void *)starPrinterStatus :(u_int32_t)level; +- (void)endCheckedBlock:(void *)starPrinterStatus :(u_int32_t)level +NS_SWIFT_UNAVAILABLE("This method throws an Objective-C exception." + "Please replace this method with 'endCheckedBlock(starPrinterStatus:level:) throws'.") +__attribute__((deprecated("Please replace this method with 'endCheckedBlock(starPrinterStatus:level:) throws' for Swift or 'endCheckedBlock:(void *)starPrinterStatus :(u_int32_t)level :(NSError **)error' for Objective-C."))); /*! * Disconnect Bluetooth port for Desktop Printer and DK-AirCash. @@ -186,36 +220,67 @@ */ - (BOOL)disconnect; - -+ (NSMutableData *)compressRasterData:(int32_t)width :(int32_t)height :(u_int8_t *)imageData :(NSString *)portSettings; -+ (NSMutableData *)generateBitImageCommand:(int32_t)width :(int32_t)height :(u_int8_t *)imageData :(NSString *)portSettings __attribute__((deprecated)); - -- (NSString *)portName; -- (NSString *)portSettings; -- (u_int32_t)timeoutMillis; -- (BOOL)connected; - -+ (void)setMACAddressSourceBlock:(NSString *(^)(EAAccessory *accessory))macAddressSourceBlock; - // // NSError was added to the argument of API. // -- (u_int32_t)writePort:(u_int8_t const *)writeBuffer :(u_int32_t)offSet :(u_int32_t)size :(NSError **)error; ++ (NSArray *)searchPrinter:(NSString *)target + :(NSError **)error NS_SWIFT_NOTHROW; + ++ (SMPort *)getPort:(NSString *)portName + :(NSString *)portSettings + :(u_int32_t)ioTimeoutMillis + :(NSError **)error NS_SWIFT_NOTHROW; + +- (u_int32_t)writePort:(u_int8_t const *)writeBuffer + :(u_int32_t)offSet + :(u_int32_t)size + :(NSError **)error; -- (u_int32_t)readPort:(u_int8_t *)readBuffer :(u_int32_t)offSet :(u_int32_t)size :(NSError **)error; +- (u_int32_t)readPort:(u_int8_t *)readBuffer + :(u_int32_t)offSet + :(u_int32_t)size + :(NSError **)error; -- (SM_BOOLEAN)getParsedStatus:(void *)starPrinterStatus :(u_int32_t)level :(NSError **)error; +- (SM_BOOLEAN)getParsedStatus:(void *)starPrinterStatus + :(u_int32_t)level + :(NSError **)error; -- (NSDictionary *)getFirmwareInformation:(NSError **)error; +- (NSDictionary *)getFirmwareInformation:(NSError **)error NS_SWIFT_NOTHROW; -- (NSDictionary *)getDipSwitchInformation:(NSError **)error; +- (NSDictionary *)getDipSwitchInformation:(NSError **)error NS_SWIFT_NOTHROW; + +- (bool)getOnlineStatus:(NSError **)error +__attribute__((unavailable("Not available. Please replace this method with 'getOnlineStatusWithError(error:)'."))); -- (bool)getOnlineStatus:(NSError **)error __attribute__((unavailable("Not available. Please change to getOnlineStatusWithError:."))); - (SM_BOOLEAN)getOnlineStatusWithError:(NSError **)error; - (SM_BOOLEAN)beginCheckedBlock:(void *)starPrinterStatus :(u_int32_t)level :(NSError **)error; - (SM_BOOLEAN)endCheckedBlock:(void *)starPrinterStatus :(u_int32_t)level :(NSError **)error; +- (BOOL)disconnect:(NSError **)error NS_SWIFT_NOTHROW; + + + ++ (NSMutableData *)compressRasterData:(int32_t)width + :(int32_t)height + :(u_int8_t *)imageData + :(NSString *)portSettings; + ++ (NSMutableData *)generateBitImageCommand:(int32_t)width + :(int32_t)height + :(u_int8_t *)imageData + :(NSString *)portSettings __attribute__((deprecated)); + +- (NSString *)portName; + +- (NSString *)portSettings; + +- (u_int32_t)timeoutMillis; + +- (BOOL)connected; + ++ (void)setMACAddressSourceBlock:(NSString *(^)(EAAccessory *accessory))macAddressSourceBlock; + @end diff --git a/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMPortSwift.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMPortSwift.h new file mode 100644 index 0000000..da01bc4 --- /dev/null +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMPortSwift.h @@ -0,0 +1,62 @@ +// +// SMPortSwift.h +// StarIOPort +// +// Caution: The methods in this file MUST NOT be called from Objective-C. +// + +#pragma once + +#import "SMPort.h" + +@interface SMPort (ThrowError) + +// +// API for Swift +// + ++ (NSArray *)searchPrinterThrowsError:(NSString *)target + :(NSError **)error +NS_SWIFT_NAME(searchPrinter(target:)); + ++ (SMPort *)getPortThrowsError:(NSString *)portName + :(NSString *)portSettings + :(u_int32_t)ioTimeoutMillis + :(NSError **)error +NS_SWIFT_NAME(getPort(portName:portSettings:ioTimeoutMillis:)); + +- (BOOL)beginCheckedBlockThrowsError:(void *)starPrinterStatus + :(u_int32_t)level + :(NSError **)error +NS_SWIFT_NAME(beginCheckedBlock(starPrinterStatus:level:)); + +- (BOOL)endCheckedBlockThrowsError:(void *)starPrinterStatus + :(u_int32_t)level + :(NSError **)error +NS_SWIFT_NAME(endCheckedBlock(starPrinterStatus:level:)); + +- (BOOL)writePort:(u_int8_t const *)writeBuffer + :(u_int32_t)offset + :(u_int32_t)size + :(u_int32_t *)numberOfBytesWritten + :(NSError **)error +NS_SWIFT_NAME(write(writeBuffer:offset:size:numberOfBytesWritten:)); + +- (BOOL)readPort:(u_int8_t *)readBuffer + :(u_int32_t)offset + :(u_int32_t)size + :(u_int32_t *)numberOfBytesRead + :(NSError **)error +NS_SWIFT_NAME(read(readBuffer:offset:size:numberOfBytesRead:)); + +- (BOOL)getParsedStatusThrowsError:(void *)starPrinterStatus + :(u_int32_t)level + :(NSError **)error +NS_SWIFT_NAME(getParsedStatus(starPrinterStatus:level:)); + +- (NSDictionary *)getFirmwareInformationThrowsError:(NSError **)error +NS_SWIFT_NAME(getFirmwareInformation()); + +- (BOOL)disconnectAccessory:(NSError **)error; + +@end diff --git a/ios/Frameworks/StarIO.framework/Headers/SMProxiPRNTManager.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMProxiPRNTManager.h similarity index 100% rename from ios/Frameworks/StarIO.framework/Headers/SMProxiPRNTManager.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/SMProxiPRNTManager.h diff --git a/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMStarIOResultCode.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMStarIOResultCode.h new file mode 100644 index 0000000..9bf68f4 --- /dev/null +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/SMStarIOResultCode.h @@ -0,0 +1,17 @@ +// +// SMStarIOResultCode.h +// StarIOPort +// +// Created by *** on 2019/06/10. +// + +#pragma once + +static const NSErrorDomain SMStarIOResultCodeErrorDomain = @"jp.star-m.stario"; + +NS_ERROR_ENUM(SMStarIOResultCodeErrorDomain) { + SMStarIOResultCodeSuccess = 0, + SMStarIOResultCodeFailedError = -1, + SMStarIOResultCodeInProcessError = -2, + SMStarIOResultCodeInUseError = -100, +}; diff --git a/ios/Frameworks/StarIO.framework/Headers/USBPort.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/USBPort.h similarity index 100% rename from ios/Frameworks/StarIO.framework/Headers/USBPort.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/USBPort.h diff --git a/ios/Frameworks/StarIO.framework/Headers/WBluetoothPort.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/WBluetoothPort.h similarity index 95% rename from ios/Frameworks/StarIO.framework/Headers/WBluetoothPort.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/WBluetoothPort.h index e52c37f..6303a2e 100644 --- a/ios/Frameworks/StarIO.framework/Headers/WBluetoothPort.h +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/WBluetoothPort.h @@ -34,6 +34,9 @@ @property (retain, readonly) NSString *firmwareInformation; +@property(retain, nonatomic) NSString *name; +@property(retain, nonatomic) NSString *serialNumber; + - (id)initWithPortName:(NSString *)portName portSettings:(NSString *)portSettings timeout:(u_int32_t)timeout; - (BOOL)open; - (int32_t)write:(NSData *)data; diff --git a/ios/Frameworks/StarIO.framework/Headers/enum.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/enum.h similarity index 61% rename from ios/Frameworks/StarIO.framework/Headers/enum.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/enum.h index 093e36d..1621a6e 100644 --- a/ios/Frameworks/StarIO.framework/Headers/enum.h +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/enum.h @@ -15,4 +15,10 @@ typedef enum _SMEmulation { SMEmulationESCPOS } SMEmulation; +typedef enum { + SMConnectionResultSuccess = 0, + SMConnectionResultFailure = -1, + SMConnectionResultRejected = -2 +} SMConnectionResult; + #endif diff --git a/ios/Frameworks/StarIO.framework/Versions/A/Headers/exceptions/PortException.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/exceptions/PortException.h new file mode 100644 index 0000000..5b9e60f --- /dev/null +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/exceptions/PortException.h @@ -0,0 +1,15 @@ +// +// PortException.h +// StarIOPort +// + +#ifndef PortException_h +#define PortException_h + +#import + +@interface PortException : NSException + +@end + +#endif /* PortException_h */ diff --git a/ios/Frameworks/StarIO.framework/Headers/starmicronics/Platform.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/starmicronics/Platform.h similarity index 100% rename from ios/Frameworks/StarIO.framework/Headers/starmicronics/Platform.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/starmicronics/Platform.h diff --git a/ios/Frameworks/StarIO.framework/Versions/A/Headers/starmicronics/PreventingNameConflicts.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/starmicronics/PreventingNameConflicts.h new file mode 100644 index 0000000..7f947b8 --- /dev/null +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/starmicronics/PreventingNameConflicts.h @@ -0,0 +1,24 @@ +// +// PreventingNameConflicts.h +// StarIOPort +// +// Created by u3237 on 2018/03/12. +// + +#pragma once + +#pragma mark - StarIOPort.h/c + +#define OpenPort JpStarmStarioOpenPort +#define ClosePort JpStarmStarioClosePort +#define ReadPort JpStarmStarioReadPort +#define WritePort JpStarmStarioWritePort +#define RetrieveFirmwareInformation JpStarmStarioRetrieveFirmwareInformation +#define RetrieveDipSwitchInformation JpStarmStarioRetrieveDipSwitchInformation +#define GetOnlineStatus JpStarmStarioGetOnlineStatus +#define GetParsedStatus JpStarmStarioGetParsedStatus +#define GetParsedStatusEx JpStarmStarioGetParsedStatusEx +#define BeginCheckedBlock JpStarmStarioBeginCheckedBlock +#define BeginCheckedBlockEx JpStarmStarioBeginCheckedBlockEx +#define EndCheckedBlock JpStarmStarioEndCheckedBlock +#define EndCheckedBlockEx JpStarmStarioEndCheckedBlockEx diff --git a/ios/Frameworks/StarIO.framework/Headers/starmicronics/StarIOPort.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/starmicronics/StarIOPort.h similarity index 95% rename from ios/Frameworks/StarIO.framework/Headers/starmicronics/StarIOPort.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/starmicronics/StarIOPort.h index 057ad7e..82629d3 100644 --- a/ios/Frameworks/StarIO.framework/Headers/starmicronics/StarIOPort.h +++ b/ios/Frameworks/StarIO.framework/Versions/A/Headers/starmicronics/StarIOPort.h @@ -27,8 +27,9 @@ #define STARIOPORT_API DLL_EXPORT #else #define STARIOPORT_API DLL_IMPORT -#endif - +#endif + +#include "PreventingNameConflicts.h" typedef struct StarPrinterStatus_ { @@ -161,7 +162,10 @@ typedef struct StarPrinterStatus_2_ UCHAR etbCounter; // printer status 7 - UCHAR presenterState; + UCHAR presenterState; + + // printer status 10 + UCHAR connectedInterface; // raw UINT32 rawLength; @@ -244,7 +248,7 @@ extern "C" #else - STARIOPORT_API void * CALL_CONVENT OpenPort(char const * portName, char const * portSettings, UINT32 ioRequestTimeoutMillis, SMEmulation emulation); + STARIOPORT_API void * CALL_CONVENT OpenPort(char const * portName, char const * portSettings, UINT32 ioRequestTimeoutMillis, SMEmulation emulation, SMConnectionResult *connectionResult); #endif @@ -473,12 +477,12 @@ void SetEndCheckedBlockTimeoutMillis(void * port, UINT32 timeoutMillis); #pragma mark Private - STARIOPORT_API SM_BOOLEAN CALL_CONVENT IsUSBSharing(void * port); +STARIOPORT_API SM_BOOLEAN CALL_CONVENT IsUSBSharing(void * port); - STARIOPORT_API SM_BOOLEAN CALL_CONVENT IsDKAirCash(void * port); - - +STARIOPORT_API SM_BOOLEAN CALL_CONVENT IsDKAirCash(void * port); + + #ifdef __cplusplus } #endif diff --git a/ios/Frameworks/StarIO.framework/Headers/starmicronics/platform/Mac.h b/ios/Frameworks/StarIO.framework/Versions/A/Headers/starmicronics/platform/Mac.h similarity index 100% rename from ios/Frameworks/StarIO.framework/Headers/starmicronics/platform/Mac.h rename to ios/Frameworks/StarIO.framework/Versions/A/Headers/starmicronics/platform/Mac.h diff --git a/ios/Frameworks/StarIO.framework/Resources/StarIOPort.Framework-Info.plist b/ios/Frameworks/StarIO.framework/Versions/A/Resources/StarIOPort.Framework-Info.plist similarity index 92% rename from ios/Frameworks/StarIO.framework/Resources/StarIOPort.Framework-Info.plist rename to ios/Frameworks/StarIO.framework/Versions/A/Resources/StarIOPort.Framework-Info.plist index fc960e2..c2643d4 100644 --- a/ios/Frameworks/StarIO.framework/Resources/StarIOPort.Framework-Info.plist +++ b/ios/Frameworks/StarIO.framework/Versions/A/Resources/StarIOPort.Framework-Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.3.3 + 2.6.0 CFBundleSignature ???? CFBundleVersion - 2.3.3 + 1 CFPlugInDynamicRegisterFunction CFPlugInDynamicRegistration @@ -41,6 +41,6 @@ CFPlugInUnloadFunction NSHumanReadableCopyright - Copyright © 2012 - 2018 starmicronics. All rights reserved. + Copyright © 2012 - 2019 starmicronics. All rights reserved. diff --git a/ios/Frameworks/StarIO.framework/Resources/en.lproj/InfoPlist.strings b/ios/Frameworks/StarIO.framework/Versions/A/Resources/en.lproj/InfoPlist.strings similarity index 100% rename from ios/Frameworks/StarIO.framework/Resources/en.lproj/InfoPlist.strings rename to ios/Frameworks/StarIO.framework/Versions/A/Resources/en.lproj/InfoPlist.strings diff --git a/ios/Frameworks/StarIO.framework/Versions/A/StarIO b/ios/Frameworks/StarIO.framework/Versions/A/StarIO new file mode 100644 index 0000000..60b3685 Binary files /dev/null and b/ios/Frameworks/StarIO.framework/Versions/A/StarIO differ diff --git a/ios/Frameworks/StarIO.framework/Versions/Current b/ios/Frameworks/StarIO.framework/Versions/Current new file mode 120000 index 0000000..8c7e5a6 --- /dev/null +++ b/ios/Frameworks/StarIO.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/ios/Frameworks/StarIO_Extension.framework/Headers b/ios/Frameworks/StarIO_Extension.framework/Headers new file mode 120000 index 0000000..a177d2a --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers \ No newline at end of file diff --git a/ios/Frameworks/StarIO_Extension.framework/Headers/ISSCBBuilder.h b/ios/Frameworks/StarIO_Extension.framework/Headers/ISSCBBuilder.h deleted file mode 100644 index 5c1022e..0000000 --- a/ios/Frameworks/StarIO_Extension.framework/Headers/ISSCBBuilder.h +++ /dev/null @@ -1,26 +0,0 @@ -// -// ISSCBBuilder.h -// StarIO_Extension -// -// Created by Yuji on 2017/**/**. -// Copyright © 2017年 Star Micronics. All rights reserved. -// - -#import - -@interface ISSCBBuilder : NSObject - -@property (nonatomic, readonly) NSMutableData *commands; -@property (nonatomic, readonly) NSMutableData *passThroughCommands; - -- (void)appendByte:(unsigned char)data; - -- (void)appendData:(NSData *)otherData; - -- (void)appendBytes:(const void *)bytes length:(NSUInteger)length; - -- (void)appendZeroClear; - -- (void)appendUnitChange; - -@end diff --git a/ios/Frameworks/StarIO_Extension.framework/Headers/ISSCPWeightParser.h b/ios/Frameworks/StarIO_Extension.framework/Headers/ISSCPWeightParser.h deleted file mode 100644 index 860807b..0000000 --- a/ios/Frameworks/StarIO_Extension.framework/Headers/ISSCPWeightParser.h +++ /dev/null @@ -1,28 +0,0 @@ -// -// ISSCPWeightParser.h -// StarIO_Extension -// -// Created by Yuji on 2017/**/**. -// Copyright © 2017年 Star Micronics. All rights reserved. -// - -#import "ISCPParser.h" - -typedef NS_ENUM(NSInteger, StarIoExtDisplayedWeightStatus) { - StarIoExtDisplayedWeightStatusInvalid = 0, - StarIoExtDisplayedWeightStatusZero, - StarIoExtDisplayedWeightStatusNotInMotion, - StarIoExtDisplayedWeightStatusMotion -}; - -@interface ISSCPWeightParser : ISCPParser - -- (StarIoExtDisplayedWeightStatus)status; - -- (NSString *)weight; - -- (NSData *)createSendCommands; - -- (NSData *)createReceiveCommands; - -@end diff --git a/ios/Frameworks/StarIO_Extension.framework/Headers/StarIoExtManager.h b/ios/Frameworks/StarIO_Extension.framework/Headers/StarIoExtManager.h deleted file mode 100755 index 254f9ca..0000000 --- a/ios/Frameworks/StarIO_Extension.framework/Headers/StarIoExtManager.h +++ /dev/null @@ -1,152 +0,0 @@ -// -// StarIoExtManager.h -// StarIO_Extension -// -// Created by Yuji on 2015/**/**. -// Copyright (c) 2015年 Star Micronics. All rights reserved. -// - -#import - -#import - -typedef NS_ENUM(NSInteger, StarIoExtManagerType) { - StarIoExtManagerTypeStandard = 0, - StarIoExtManagerTypeWithBarcodeReader, - StarIoExtManagerTypeOnlyBarcodeReader, -}; - -typedef NS_ENUM(NSInteger, StarIoExtManagerStatus) { - StarIoExtManagerStatusInvalid __attribute__((unavailable("Not available. Please change to StarIoExtManager...StatusInvalid."))) = 0, - StarIoExtManagerStatusImpossible __attribute__((unavailable("Not available. Please change to StarIoExtManager...StatusImpossible."))), - StarIoExtManagerStatusPrinterOnline __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterStatusOnline."))), - StarIoExtManagerStatusPrinterOffline __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterStatusOffline."))), - StarIoExtManagerStatusPrinterPaperReady __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterPaperStatusReady."))), - StarIoExtManagerStatusPrinterPaperNearEmpty __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterPaperStatusNearEmpty."))), - StarIoExtManagerStatusPrinterPaperEmpty __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterPaperStatusEmpty."))), - StarIoExtManagerStatusPrinterCoverOpen __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterCoverStatusOpen."))), - StarIoExtManagerStatusPrinterCoverClose __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterCoverStatusClose."))), - StarIoExtManagerStatusCashDrawerOpen __attribute__((unavailable("Not available. Please change to StarIoExtManagerCashDrawerStatusOpen."))), - StarIoExtManagerStatusCashDrawerClose __attribute__((unavailable("Not available. Please change to StarIoExtManagerCashDrawerStatusClose."))), - StarIoExtManagerStatusBarcodeReaderConnect __attribute__((unavailable("Not available. Please change to StarIoExtManagerBarcodeReaderStatusConnect."))), - StarIoExtManagerStatusBarcodeReaderDisconnect __attribute__((unavailable("Not available. Please change to StarIoExtManagerBarcodeReaderStatusDisconnect."))) -}; - -typedef NS_ENUM(NSInteger, StarIoExtManagerPrinterStatus) { - StarIoExtManagerPrinterStatusInvalid = 0, - StarIoExtManagerPrinterStatusImpossible, - StarIoExtManagerPrinterStatusOnline, - StarIoExtManagerPrinterStatusOffline -}; - -typedef NS_ENUM(NSInteger, StarIoExtManagerPrinterPaperStatus) { - StarIoExtManagerPrinterPaperStatusInvalid = 0, - StarIoExtManagerPrinterPaperStatusImpossible, - StarIoExtManagerPrinterPaperStatusReady, - StarIoExtManagerPrinterPaperStatusNearEmpty, - StarIoExtManagerPrinterPaperStatusEmpty -}; - -typedef NS_ENUM(NSInteger, StarIoExtManagerPrinterCoverStatus) { - StarIoExtManagerPrinterCoverStatusInvalid = 0, - StarIoExtManagerPrinterCoverStatusImpossible, - StarIoExtManagerPrinterCoverStatusOpen, - StarIoExtManagerPrinterCoverStatusClose -}; - -typedef NS_ENUM(NSInteger, StarIoExtManagerCashDrawerStatus) { - StarIoExtManagerCashDrawerStatusInvalid = 0, - StarIoExtManagerCashDrawerStatusImpossible, - StarIoExtManagerCashDrawerStatusOpen, - StarIoExtManagerCashDrawerStatusClose -}; - -typedef NS_ENUM(NSInteger, StarIoExtManagerBarcodeReaderStatus) { - StarIoExtManagerBarcodeReaderStatusInvalid = 0, - StarIoExtManagerBarcodeReaderStatusImpossible, - StarIoExtManagerBarcodeReaderStatusConnect, - StarIoExtManagerBarcodeReaderStatusDisconnect -}; - -@class StarIoExtManager; - -@protocol StarIoExtManagerDelegate - -@optional - -- (void)didPrinterImpossible; -- (void)didPrinterImpossible:(StarIoExtManager *)manager; - -- (void)didPrinterOnline; -- (void)didPrinterOnline:(StarIoExtManager *)manager; -- (void)didPrinterOffline; -- (void)didPrinterOffline:(StarIoExtManager *)manager; - -- (void)didPrinterPaperReady; -- (void)didPrinterPaperReady:(StarIoExtManager *)manager; -- (void)didPrinterPaperNearEmpty; -- (void)didPrinterPaperNearEmpty:(StarIoExtManager *)manager; -- (void)didPrinterPaperEmpty; -- (void)didPrinterPaperEmpty:(StarIoExtManager *)manager; - -- (void)didPrinterCoverOpen; -- (void)didPrinterCoverOpen:(StarIoExtManager *)manager; -- (void)didPrinterCoverClose; -- (void)didPrinterCoverClose:(StarIoExtManager *)manager; - -- (void)didCashDrawerOpen; -- (void)didCashDrawerOpen:(StarIoExtManager *)manager; -- (void)didCashDrawerClose; -- (void)didCashDrawerClose:(StarIoExtManager *)manager; - -- (void)didBarcodeReaderImpossible; -- (void)didBarcodeReaderImpossible:(StarIoExtManager *)manager; - -- (void)didBarcodeReaderConnect; -- (void)didBarcodeReaderConnect:(StarIoExtManager *)manager; -- (void)didBarcodeReaderDisconnect; -- (void)didBarcodeReaderDisconnect:(StarIoExtManager *)manager; - -- (void)didBarcodeDataReceive:(NSData *)data; -- (void)didBarcodeDataReceive:(StarIoExtManager *)manager data:(NSData *)data; - -- (void)didAccessoryConnectSuccess; -- (void)didAccessoryConnectSuccess:(StarIoExtManager *)manager; -- (void)didAccessoryConnectFailure; -- (void)didAccessoryConnectFailure:(StarIoExtManager *)manager; -- (void)didAccessoryDisconnect; -- (void)didAccessoryDisconnect:(StarIoExtManager *)manager; - -- (void)didStatusUpdate:(NSString *)status; -- (void)didStatusUpdate:(StarIoExtManager *)manager status:(NSString *)status; - -@end - -@interface StarIoExtManager : NSObject - -@property (readonly, nonatomic) SMPort *port; - -@property (readonly, nonatomic) StarIoExtManagerStatus printerOnlineStatus __attribute__((unavailable("Not available. Please change to printerStatus."))); -@property (readonly, nonatomic) StarIoExtManagerPrinterStatus printerStatus; -@property (readonly, nonatomic) StarIoExtManagerStatus printerPaperReadyStatus __attribute__((unavailable("Not available. Please change to printerPaperStatus"))); -@property (readonly, nonatomic) StarIoExtManagerPrinterPaperStatus printerPaperStatus; -@property (readonly, nonatomic) StarIoExtManagerStatus printerCoverOpenStatus __attribute__((unavailable("Not available. Please change to printerCoverStatus."))); -@property (readonly, nonatomic) StarIoExtManagerPrinterCoverStatus printerCoverStatus; -@property (readonly, nonatomic) StarIoExtManagerStatus cashDrawerOpenStatus __attribute__((unavailable("Not available. Please change to cashDrawerStatus."))); -@property (readonly, nonatomic) StarIoExtManagerCashDrawerStatus cashDrawerStatus; -@property (readonly, nonatomic) StarIoExtManagerStatus barcodeReaderConnectStatus __attribute__((unavailable("Not available. Please change to barcodeReaderStatus."))); -@property (readonly, nonatomic) StarIoExtManagerBarcodeReaderStatus barcodeReaderStatus; - -@property (nonatomic) BOOL cashDrawerOpenActiveHigh; - -@property (weak, nonatomic) id delegate; - -@property (readonly, nonatomic) NSRecursiveLock *lock; - -- (id)initWithType:(StarIoExtManagerType)type portName:(NSString *)portName portSettings:(NSString *)portSettings ioTimeoutMillis:(NSUInteger)ioTimeoutMillis; - -- (BOOL)connect; - -- (BOOL)disconnect; - -@end diff --git a/ios/Frameworks/StarIO_Extension.framework/Resources b/ios/Frameworks/StarIO_Extension.framework/Resources new file mode 120000 index 0000000..953ee36 --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/ios/Frameworks/StarIO_Extension.framework/StarIO_Extension b/ios/Frameworks/StarIO_Extension.framework/StarIO_Extension deleted file mode 100644 index 15c1708..0000000 Binary files a/ios/Frameworks/StarIO_Extension.framework/StarIO_Extension and /dev/null differ diff --git a/ios/Frameworks/StarIO_Extension.framework/StarIO_Extension b/ios/Frameworks/StarIO_Extension.framework/StarIO_Extension new file mode 120000 index 0000000..8f2be22 --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/StarIO_Extension @@ -0,0 +1 @@ +Versions/Current/StarIO_Extension \ No newline at end of file diff --git a/ios/Frameworks/StarIO_Extension.framework/Headers/ISCBBuilder.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISCBBuilder.h similarity index 93% rename from ios/Frameworks/StarIO_Extension.framework/Headers/ISCBBuilder.h rename to ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISCBBuilder.h index f2da307..ea4f45e 100755 --- a/ios/Frameworks/StarIO_Extension.framework/Headers/ISCBBuilder.h +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISCBBuilder.h @@ -1,4 +1,4 @@ -// +// // ISCBBuilder.h // StarIO_Extension // @@ -164,7 +164,16 @@ typedef NS_ENUM(NSUInteger, SCBBarcodeWidth) { SCBBarcodeWidthMode6, SCBBarcodeWidthMode7, SCBBarcodeWidthMode8, - SCBBarcodeWidthMode9 + SCBBarcodeWidthMode9, + SCBBarcodeWidthExtMode1, + SCBBarcodeWidthExtMode2, + SCBBarcodeWidthExtMode3, + SCBBarcodeWidthExtMode4, + SCBBarcodeWidthExtMode5, + SCBBarcodeWidthExtMode6, + SCBBarcodeWidthExtMode7, + SCBBarcodeWidthExtMode8, + SCBBarcodeWidthExtMode9 }; #pragma mark - Pdf417 @@ -212,6 +221,25 @@ typedef NS_ENUM(NSInteger, SCBBlackMarkType) { SCBBlackMarkTypeValidWithDetection }; +#pragma mark - Printable Area + +typedef NS_ENUM(NSInteger, SCBPrintableAreaType) { + SCBPrintableAreaTypeStandard, + SCBPrintableAreaTypeType1, + SCBPrintableAreaTypeType2, + SCBPrintableAreaTypeType3, + SCBPrintableAreaTypeType4 +}; + +#pragma mark - CJK Unified Ideograph Font + +typedef NS_ENUM(NSInteger, SCBCjkUnifiedIdeographFont) { + SCBCjkUnifiedIdeographFontJapanese = 1, + SCBCjkUnifiedIdeographFontSimplifiedChinese = 2, + SCBCjkUnifiedIdeographFontTraditionalChinese = 3, + SCBCjkUnifiedIdeographFontHangul = 4 +}; + @interface ISCBBuilder : NSObject @property (nonatomic, readonly) NSMutableData *commands; @@ -397,6 +425,12 @@ typedef NS_ENUM(NSInteger, SCBBlackMarkType) { - (void)appendSound:(SCBSoundChannel)channel repeat:(NSInteger)repeat; +- (void)appendSound:(SCBSoundChannel)channel + repeat:(NSInteger)repeat + driveTime:(NSInteger)driveTime + delayTime:(NSInteger)delayTime; + + #pragma mark - Barcode - (void)appendBarcodeData:(NSData *)otherData @@ -600,6 +634,18 @@ typedef NS_ENUM(NSInteger, SCBBlackMarkType) { - (void)appendBlackMark:(SCBBlackMarkType)type; +#pragma mark - Top Margin + +- (void)appendTopMargin:(NSInteger)topMargin; + +#pragma mark - Printable Area + +- (void)appendPrintableArea:(SCBPrintableAreaType)type; + +#pragma mark - CJK Unified Ideograph Font + +- (void)appendCjkUnifiedIdeographFont:(NSArray *)fonts; + #pragma mark - PageMode - (void)beginPageMode:(CGRect)rect diff --git a/ios/Frameworks/StarIO_Extension.framework/Headers/ISCPConnectParser.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISCPConnectParser.h similarity index 100% rename from ios/Frameworks/StarIO_Extension.framework/Headers/ISCPConnectParser.h rename to ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISCPConnectParser.h diff --git a/ios/Frameworks/StarIO_Extension.framework/Headers/ISCPParser.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISCPParser.h similarity index 94% rename from ios/Frameworks/StarIO_Extension.framework/Headers/ISCPParser.h rename to ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISCPParser.h index 2f56b31..bc97a6e 100644 --- a/ios/Frameworks/StarIO_Extension.framework/Headers/ISCPParser.h +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISCPParser.h @@ -22,6 +22,4 @@ typedef StarIoExtParserCompletionResult (^StarIoExtParserCompletionHandler)(uint - (NSData *)createSendCommands; -- (NSData *)createReceiveCommands; - @end diff --git a/ios/Frameworks/StarIO_Extension.framework/Headers/ISDCBBuilder.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISDCBBuilder.h similarity index 100% rename from ios/Frameworks/StarIO_Extension.framework/Headers/ISDCBBuilder.h rename to ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISDCBBuilder.h diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISMCBBuilder.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISMCBBuilder.h new file mode 100644 index 0000000..6664f43 --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/ISMCBBuilder.h @@ -0,0 +1,31 @@ +// +// ISMCBBuilder.h +// StarIO_Extension +// +// Copyright (c) 2018 Star Micronics. All rights reserved. +// + +#import +@class SMSoundSetting; + +#pragma mark - SoundStorageArea + +typedef NS_ENUM(NSInteger, SMCBSoundStorageArea) { + SMCBSoundStorageArea1 = 0x00, + SMCBSoundStorageArea2 = 0x01 +}; + +#pragma mark - Member + +@interface ISMCBBuilder: NSObject + +@property NSMutableData * _Nonnull commands; + +- (void)appendSoundWithSetting:(nullable SMSoundSetting *)setting + error:(NSError * _Nullable * _Nullable)error; + +- (void)appendSoundWithSound:(nonnull NSData *)data + setting:(nullable SMSoundSetting *)setting + error:(NSError * _Nullable * _Nullable)error; +@end + diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManager+Asynchronous.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManager+Asynchronous.h new file mode 100644 index 0000000..03b38a1 --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManager+Asynchronous.h @@ -0,0 +1,19 @@ +// +// StarIoExtManager+Asynchronous.h +// StarIO_Extension +// +// Copyright (c) 2018 Star Micronics. All rights reserved. +// + +#pragma once + +#import "StarIoExtManager.h" + + +@interface StarIoExtManager(Asynchronous) + +- (void)connectAsync; + +@end + + diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManager+Unavailable.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManager+Unavailable.h new file mode 100644 index 0000000..47c3012 --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManager+Unavailable.h @@ -0,0 +1,39 @@ +// +// StarIoExtManager+Unavailable.h +// StarIO_Extension +// +// Copyright (c) 2018 Star Micronics. All rights reserved. +// + +#pragma once + +#import "StarIoExtManager.h" + +typedef NS_ENUM(NSInteger, StarIoExtManagerStatus) { + StarIoExtManagerStatusInvalid __attribute__((unavailable("Not available. Please change to StarIoExtManager...StatusInvalid."))) = 0, + StarIoExtManagerStatusImpossible __attribute__((unavailable("Not available. Please change to StarIoExtManager...StatusImpossible."))), + StarIoExtManagerStatusPrinterOnline __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterStatusOnline."))), + StarIoExtManagerStatusPrinterOffline __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterStatusOffline."))), + StarIoExtManagerStatusPrinterPaperReady __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterPaperStatusReady."))), + StarIoExtManagerStatusPrinterPaperNearEmpty __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterPaperStatusNearEmpty."))), + StarIoExtManagerStatusPrinterPaperEmpty __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterPaperStatusEmpty."))), + StarIoExtManagerStatusPrinterCoverOpen __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterCoverStatusOpen."))), + StarIoExtManagerStatusPrinterCoverClose __attribute__((unavailable("Not available. Please change to StarIoExtManagerPrinterCoverStatusClose."))), + StarIoExtManagerStatusCashDrawerOpen __attribute__((unavailable("Not available. Please change to StarIoExtManagerCashDrawerStatusOpen."))), + StarIoExtManagerStatusCashDrawerClose __attribute__((unavailable("Not available. Please change to StarIoExtManagerCashDrawerStatusClose."))), + StarIoExtManagerStatusBarcodeReaderConnect __attribute__((unavailable("Not available. Please change to StarIoExtManagerBarcodeReaderStatusConnect."))), + StarIoExtManagerStatusBarcodeReaderDisconnect __attribute__((unavailable("Not available. Please change to StarIoExtManagerBarcodeReaderStatusDisconnect."))) +}; + +@interface StarIoExtManager(Unavailable) + +@property (readonly, nonatomic) StarIoExtManagerStatus printerPaperReadyStatus __attribute__((unavailable("Not available. Please change to printerPaperStatus"))); + +@property (readonly, nonatomic) StarIoExtManagerStatus printerOnlineStatus __attribute__((unavailable("Not available. Please change to printerStatus."))); + +@property (readonly, nonatomic) StarIoExtManagerStatus printerCoverOpenStatus __attribute__((unavailable("Not available. Please change to printerCoverStatus."))); + +@property (readonly, nonatomic) StarIoExtManagerStatus cashDrawerOpenStatus __attribute__((unavailable("Not available. Please change to cashDrawerStatus."))); + +@property (readonly, nonatomic) StarIoExtManagerStatus barcodeReaderConnectStatus __attribute__((unavailable("Not available. Please change to barcodeReaderStatus."))); +@end diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManager.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManager.h new file mode 100755 index 0000000..fad3b31 --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManager.h @@ -0,0 +1,96 @@ +// +// StarIoExtManager.h +// StarIO_Extension +// +// Created by Yuji on 2015/**/**. +// Copyright (c) 2015年 Star Micronics. All rights reserved. +// + +#import + +#import +#import + +#import "StarIoExtManagerDelegate.h" + +typedef NS_ENUM(NSInteger, StarIoExtManagerType) { + StarIoExtManagerTypeStandard = 0, + StarIoExtManagerTypeWithBarcodeReader, + StarIoExtManagerTypeOnlyBarcodeReader, +}; + +typedef NS_ENUM(NSInteger, StarIoExtManagerPrinterStatus) { + StarIoExtManagerPrinterStatusInvalid = 0, + StarIoExtManagerPrinterStatusImpossible, + StarIoExtManagerPrinterStatusOnline, + StarIoExtManagerPrinterStatusOffline +}; + +typedef NS_ENUM(NSInteger, StarIoExtManagerPrinterPaperStatus) { + StarIoExtManagerPrinterPaperStatusInvalid = 0, + StarIoExtManagerPrinterPaperStatusImpossible, + StarIoExtManagerPrinterPaperStatusReady, + StarIoExtManagerPrinterPaperStatusNearEmpty, + StarIoExtManagerPrinterPaperStatusEmpty +}; + +typedef NS_ENUM(NSInteger, StarIoExtManagerPrinterCoverStatus) { + StarIoExtManagerPrinterCoverStatusInvalid = 0, + StarIoExtManagerPrinterCoverStatusImpossible, + StarIoExtManagerPrinterCoverStatusOpen, + StarIoExtManagerPrinterCoverStatusClose +}; + +typedef NS_ENUM(NSInteger, StarIoExtManagerCashDrawerStatus) { + StarIoExtManagerCashDrawerStatusInvalid = 0, + StarIoExtManagerCashDrawerStatusImpossible, + StarIoExtManagerCashDrawerStatusOpen, + StarIoExtManagerCashDrawerStatusClose +}; + +typedef NS_ENUM(NSInteger, StarIoExtManagerBarcodeReaderStatus) { + StarIoExtManagerBarcodeReaderStatusInvalid = 0, + StarIoExtManagerBarcodeReaderStatusImpossible, + StarIoExtManagerBarcodeReaderStatusConnect, + StarIoExtManagerBarcodeReaderStatusDisconnect +}; + +//static const NSErrorDomain SMResultCodeErrorDomain = @"jp.star-m.stario_extension"; + +//NS_ERROR_ENUM(SMResultCodeErrorDomain) { +// SMResultCodeFailedError = -1, +// SMResultCodeInProcessError = -2, +// SMResultCodeInUseError = -100, +//}; + + +@interface StarIoExtManager : NSObject + +@property (readonly, nonatomic) SMPort *port; + +@property (readonly, nonatomic) StarIoExtManagerPrinterStatus printerStatus; + +@property (readonly, nonatomic) StarIoExtManagerPrinterPaperStatus printerPaperStatus; + +@property (readonly, nonatomic) StarIoExtManagerPrinterCoverStatus printerCoverStatus; + +@property (readonly, nonatomic) StarIoExtManagerCashDrawerStatus cashDrawerStatus; + +@property (readonly, nonatomic) StarIoExtManagerBarcodeReaderStatus barcodeReaderStatus; + +@property (nonatomic) BOOL cashDrawerOpenActiveHigh; + +@property (weak, nonatomic) id delegate; + +@property (readonly, nonatomic) NSRecursiveLock *lock; + +- (id)initWithType:(StarIoExtManagerType)type + portName:(NSString *)portName + portSettings:(NSString *)portSettings + ioTimeoutMillis:(NSUInteger)ioTimeoutMillis; + +- (BOOL)connect; + +- (BOOL)disconnect; + +@end diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManagerBaseDelegate.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManagerBaseDelegate.h new file mode 100644 index 0000000..aa7839d --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManagerBaseDelegate.h @@ -0,0 +1,61 @@ +// +// StarIoExtManagerBaseDelegate.h +// StarIO_Extension +// +// Copyright (c) 2018 Star Micronics. All rights reserved. +// + +@class StarIoExtManager; + + +@protocol StarIoExtManagerBaseDelegate + +@optional + +- (void)didPrinterImpossible; +- (void)didPrinterImpossible:(StarIoExtManager *)manager; + +- (void)didPrinterOnline; +- (void)didPrinterOnline:(StarIoExtManager *)manager; +- (void)didPrinterOffline; +- (void)didPrinterOffline:(StarIoExtManager *)manager; + +- (void)didPrinterPaperReady; +- (void)didPrinterPaperReady:(StarIoExtManager *)manager; +- (void)didPrinterPaperNearEmpty; +- (void)didPrinterPaperNearEmpty:(StarIoExtManager *)manager; +- (void)didPrinterPaperEmpty; +- (void)didPrinterPaperEmpty:(StarIoExtManager *)manager; + +- (void)didPrinterCoverOpen; +- (void)didPrinterCoverOpen:(StarIoExtManager *)manager; +- (void)didPrinterCoverClose; +- (void)didPrinterCoverClose:(StarIoExtManager *)manager; + +- (void)didCashDrawerOpen; +- (void)didCashDrawerOpen:(StarIoExtManager *)manager; +- (void)didCashDrawerClose; +- (void)didCashDrawerClose:(StarIoExtManager *)manager; + +- (void)didBarcodeReaderImpossible; +- (void)didBarcodeReaderImpossible:(StarIoExtManager *)manager; + +- (void)didBarcodeReaderConnect; +- (void)didBarcodeReaderConnect:(StarIoExtManager *)manager; +- (void)didBarcodeReaderDisconnect; +- (void)didBarcodeReaderDisconnect:(StarIoExtManager *)manager; + +- (void)didBarcodeDataReceive:(NSData *)data; +- (void)didBarcodeDataReceive:(StarIoExtManager *)manager data:(NSData *)data; + +- (void)didAccessoryConnectSuccess; +- (void)didAccessoryConnectSuccess:(StarIoExtManager *)manager; +- (void)didAccessoryConnectFailure; +- (void)didAccessoryConnectFailure:(StarIoExtManager *)manager; +- (void)didAccessoryDisconnect; +- (void)didAccessoryDisconnect:(StarIoExtManager *)manager; + +- (void)didStatusUpdate:(NSString *)status; +- (void)didStatusUpdate:(StarIoExtManager *)manager status:(NSString *)status; + +@end diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManagerDelegate.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManagerDelegate.h new file mode 100644 index 0000000..68084cb --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtManagerDelegate.h @@ -0,0 +1,22 @@ +// +// StarIoExtManagerDelegate.h +// StarIO_Extension +// +// Copyright (c) 2018 Star Micronics. All rights reserved. +// + +#import "StarIoExtManagerBaseDelegate.h" + + +@protocol StarIoExtManagerDelegate + +@optional + +- (void) manager:(nonnull StarIoExtManager *)manager + didConnectPort:(nonnull NSString *)portName; + +- (void) manager:(nonnull StarIoExtManager *)manager +didFailToConnectPort:(nonnull NSString *)portName + error:(nullable NSError *)error; + +@end diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtResultCode.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtResultCode.h new file mode 100644 index 0000000..b8e4731 --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/Internal/StarIoExtResultCode.h @@ -0,0 +1,20 @@ +// +// StarIoExtResultCode.h +// StarIO_Extension +// +// Copyright © 2018年 Star Micronics. All rights reserved. +// + +#pragma once + +static const NSErrorDomain SMResultCodeErrorDomain = @"jp.star-m.stario_extension"; + +NS_ERROR_ENUM(SMResultCodeErrorDomain) { + SMResultCodeFailedError = -1, + SMResultCodeInProcessError = -2, + SMResultCodeFormatError = -3, + SMResultCodeArgumentOutOfRange = -4, + SMResultCodeInvalidArgument = -5, + SMResultCodeInvalidOperation = -6, + SMResultCodeInUseError = -100, +}; diff --git a/ios/Frameworks/StarIO_Extension.framework/Headers/SMBluetoothManagerFactory.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/SMBluetoothManagerFactory.h similarity index 100% rename from ios/Frameworks/StarIO_Extension.framework/Headers/SMBluetoothManagerFactory.h rename to ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/SMBluetoothManagerFactory.h diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/SMSoundSetting.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/SMSoundSetting.h new file mode 100644 index 0000000..5a0c29b --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/SMSoundSetting.h @@ -0,0 +1,35 @@ +// +// SoundSetting.h +// StarIO_Extension +// +// Copyright (c) 2018 Star Micronics. All rights reserved. +// + +#import +#import "ISMCBBuilder.h" + +#pragma mark - SMSoundSettingVolume + +typedef NS_ENUM(NSInteger, SMSoundSettingVolume) { + SMSoundSettingVolumeOff = -2, + SMSoundSettingVolumeMin = -3, + SMSoundSettingVolumeMax = -4 +}; + +#pragma mark - Member + +@interface SMSoundSetting : NSObject + +@property (nonatomic) SMCBSoundStorageArea soundStorageArea; + +@property (nonatomic) NSInteger soundNumber; + +@property (nonatomic) NSInteger volume; + +@property (nonatomic) NSInteger count; + +@property (nonatomic) NSInteger delay; + +@property (nonatomic) NSInteger interval; + +@end diff --git a/ios/Frameworks/StarIO_Extension.framework/Headers/StarIoExt.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/StarIoExt.h similarity index 73% rename from ios/Frameworks/StarIO_Extension.framework/Headers/StarIoExt.h rename to ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/StarIoExt.h index 8f84020..f751468 100755 --- a/ios/Frameworks/StarIO_Extension.framework/Headers/StarIoExt.h +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/StarIoExt.h @@ -8,14 +8,14 @@ #import +#import "Internal/StarIoExtResultCode.h" + #import "ISCBBuilder.h" #import "ISDCBBuilder.h" -#import "ISSCBBuilder.h" +#import "ISMCBBuilder.h" #import "ISCPConnectParser.h" -#import "ISSCPWeightParser.h" - typedef NS_ENUM(NSInteger, StarIoExtEmulation) { // Don't insert! StarIoExtEmulationNone = 0, StarIoExtEmulationStarPRNT, @@ -37,7 +37,8 @@ typedef NS_ENUM(NSInteger, StarIoExtCharacterCode) { // Don't insert! typedef NS_ENUM(NSInteger, StarIoExtBcrModel) { // Don't insert! StarIoExtBcrModelNone = 0, - StarIoExtBcrModelPOP1 + StarIoExtBcrModelPOP1, + StarIoExtBcrModelDS9208 }; typedef NS_ENUM(NSInteger, StarIoExtDisplayModel) { // Don't insert! @@ -45,11 +46,10 @@ typedef NS_ENUM(NSInteger, StarIoExtDisplayModel) { // Don't insert! StarIoExtDisplayModelSCD222 }; -typedef NS_ENUM(NSInteger, StarIoExtScaleModel) { // Don't insert! - StarIoExtScaleModelNone = 0, - StarIoExtScaleModelAPS10, - StarIoExtScaleModelAPS12, - StarIoExtScaleModelAPS20 +typedef NS_ENUM(NSUInteger, StarIoExtMelodySpeakerModel) { // Don't insert! + StarIoExtMelodySpeakerModelNone = 0, + StarIoExtMelodySpeakerModelMCS10, + StarIoExtMelodySpeakerModelFVP10 }; @interface StarIoExt : NSObject @@ -64,7 +64,7 @@ typedef NS_ENUM(NSInteger, StarIoExtScaleModel) { // Don't insert! + (ISDCBBuilder *)createDisplayCommandBuilder:(StarIoExtDisplayModel)model; -+ (ISSCBBuilder *)createScaleCommandBuilder:(StarIoExtScaleModel)model; ++ (ISMCBBuilder *)createMelodySpeakerCommandBuilder:(StarIoExtMelodySpeakerModel)model; #pragma mark - Parser @@ -72,8 +72,7 @@ typedef NS_ENUM(NSInteger, StarIoExtScaleModel) { // Don't insert! + (ISCPConnectParser *)createDisplayConnectParser:(StarIoExtDisplayModel)model; -+ (ISCPConnectParser *)createScaleConnectParser:(StarIoExtScaleModel)model; - -+ (ISSCPWeightParser *)createScaleWeightParser:(StarIoExtScaleModel)model; ++ (ISCPConnectParser *)createMelodySpeakerConnectParser:(StarIoExtMelodySpeakerModel)model + error:(NSError **)error; @end diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/StarIoExtManager.h b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/StarIoExtManager.h new file mode 100644 index 0000000..2f58f6e --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Headers/StarIoExtManager.h @@ -0,0 +1,17 @@ +// +// StarIoExtManager.h +// StarIO_Extension +// +// Copyright (c) 2018 Star Micronics. All rights reserved. +// + +#pragma once + +#import "Internal/StarIoExtManager.h" +#import "Internal/StarIoExtManager+Unavailable.h" +#import "Internal/StarIoExtManager+Asynchronous.h" + +#import "Internal/StarIoExtManagerBaseDelegate.h" +#import "Internal/StarIoExtManagerDelegate.h" + +#import "Internal/StarIoExtResultCode.h" diff --git a/ios/Frameworks/StarIO_Extension.framework/Resources/Info.plist b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Resources/Info.plist similarity index 97% rename from ios/Frameworks/StarIO_Extension.framework/Resources/Info.plist rename to ios/Frameworks/StarIO_Extension.framework/Versions/A/Resources/Info.plist index 41cb95b..41f4c91 100755 --- a/ios/Frameworks/StarIO_Extension.framework/Resources/Info.plist +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/A/Resources/Info.plist @@ -27,6 +27,6 @@ NSHumanReadableCopyright Copyright © All rights reserved. CFBundleShortVersionString - 1.8.0 + 1.14.0 diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/A/StarIO_Extension b/ios/Frameworks/StarIO_Extension.framework/Versions/A/StarIO_Extension new file mode 100644 index 0000000..a413d23 Binary files /dev/null and b/ios/Frameworks/StarIO_Extension.framework/Versions/A/StarIO_Extension differ diff --git a/ios/Frameworks/StarIO_Extension.framework/Versions/Current b/ios/Frameworks/StarIO_Extension.framework/Versions/Current new file mode 120000 index 0000000..8c7e5a6 --- /dev/null +++ b/ios/Frameworks/StarIO_Extension.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file