Skip to content

Add namespace and some cleanup #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rekire wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add namespace and some cleanup #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4a9698
Update most dependencies and fix resulting logging issues
rekire Jun 21, 2024
cc8e245
Update lib
rekire Jun 21, 2024
e1f4165
Fix some lint warnings and a typo
rekire Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ buildscript {
repositories {
google()
mavenCentral()
maven{
allowInsecureProtocol = true
url 'https://www.jitpack.io'
}
maven { url 'https://www.jitpack.io' }
}

dependencies {
Expand All @@ -20,18 +17,16 @@ rootProject.allprojects {
repositories {
google()
mavenCentral()
maven{
allowInsecureProtocol = true
url 'https://www.jitpack.io'
}
maven { url 'https://www.jitpack.io' }
}
}

apply plugin: 'com.android.library'

apply from: "./resolve_dependencies.gradle"//解决编译导入Flutter相关的包报错问题
android {
compileSdkVersion 33
namespace 'com.imin.printer.imin_printer'
compileSdk 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -49,9 +44,9 @@ android {
testOptions {
unitTests.all {
testLogging {
events "passed", "skipped", "failed", "standardOut", "standardError"
outputs.upToDateWhen {false}
showStandardStreams = true
events "passed", "skipped", "failed", "standardOut", "standardError"
outputs.upToDateWhen { false }
showStandardStreams = true
}
}
}
Expand All @@ -65,7 +60,7 @@ dependencies {
// implementation files('libs/IminLibs1.0.15.jar')
implementation files('libs/IminStraElectronicSDK_V1.2.jar')
implementation "androidx.multidex:multidex:2.0.1"
implementation 'com.github.iminsoftware:IminPrinterLibrary:V1.0.0.11'
implementation 'com.github.iminsoftware:IminPrinterLibrary:V1.0.0.13'
implementation 'com.github.bumptech.glide:glide:4.16.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
}
Expand Down
4 changes: 1 addition & 3 deletions android/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.imin.printer.imin_printer">
</manifest>
<manifest/>
120 changes: 58 additions & 62 deletions android/src/main/java/com/imin/printer/imin_printer/IminPrinterPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class IminPrinterPlugin implements FlutterPlugin, MethodCallHandler, Stre
private Context _context;
private IminPrintUtils.PrintConnectType connectType = IminPrintUtils.PrintConnectType.USB;
private EventSink eventSink;
private String[] modelArry = {"W27_Pro", "I23M01", "I23M02", "I23D01", "D4-503 Pro", "D4-504 Pro", "D4-505 Pro", "MS2-11", "MS2-12", "MS1-15"};
final private String[] modelArray = {"W27_Pro", "I23M01", "I23M02", "I23D01", "D4-503 Pro", "D4-504 Pro", "D4-505 Pro", "MS2-11", "MS2-12", "MS1-15"};
private String sdkVersion = "1.0.0";
private static final String ACTION_PRITER_STATUS_CHANGE = "com.imin.printerservice.PRITER_STATUS_CHANGE";
private static final String ACTION_POGOPIN_STATUS_CHANGE = "com.imin.printerservice.PRITER_CONNECT_STATUS_CHANGE";
Expand All @@ -72,7 +72,7 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
channel = new MethodChannel(flutterPluginBinding.getBinaryMessenger(), "imin_printer");
_context = flutterPluginBinding.getApplicationContext();
eventChannel = new EventChannel(flutterPluginBinding.getBinaryMessenger(), "imin_printer_event");
List<String> modelList = Arrays.asList(modelArry);
List<String> modelList = Arrays.asList(modelArray);
if (modelList.contains(Build.MODEL)) {
//初始化 2.0 的 SDK。
PrinterHelper.getInstance().initPrinterService(_context);
Expand All @@ -91,7 +91,6 @@ public void onAttachedToEngine(@NonNull FlutterPluginBinding flutterPluginBindin
}
eventChannel.setStreamHandler(this);
channel.setMethodCallHandler(this);

}

@SuppressLint("NewApi")
Expand Down Expand Up @@ -304,79 +303,76 @@ public void callback(int status) {
}
break;
case "printBitmapToUrl":
new Thread(new Runnable() {
@Override
public void run() {
try {
if (call.argument("height") != null && call.argument("width") != null) {
int imageWidth = call.argument("width");
int imageHeight = call.argument("height");
if (call.argument("alignment") != null) {
int align = call.argument("alignment");
if (call.argument("multiBitmap") != null) {
ArrayList<String> multiBytes = call.argument("bitmaps");
ArrayList<Bitmap> bitmaps = new ArrayList<Bitmap>();
for (int i = 0; i < multiBytes.size(); i++) {
String url = multiBytes.get(i);
Bitmap image = Glide.with(_context).asBitmap().load(url).diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true).submit(imageWidth, imageHeight).get();
bitmaps.add(image);
}
if (iminPrintUtils != null) {
iminPrintUtils.printMultiBitmap(bitmaps, align);
} else {
PrinterHelper.getInstance().printMultiBitmapWithAlign(bitmaps, align, null);
}
new Thread(() -> {
try {
if (call.argument("height") != null && call.argument("width") != null) {
int imageWidth = call.argument("width");
int imageHeight = call.argument("height");
if (call.argument("alignment") != null) {
int align = call.argument("alignment");
if (call.argument("multiBitmap") != null) {
ArrayList<String> multiBytes = call.argument("bitmaps");
ArrayList<Bitmap> bitmaps = new ArrayList<Bitmap>();
for (int i = 0; i < multiBytes.size(); i++) {
String url = multiBytes.get(i);
Bitmap image = Glide.with(_context).asBitmap().load(url).diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true).submit(imageWidth, imageHeight).get();
bitmaps.add(image);
}
if (iminPrintUtils != null) {
iminPrintUtils.printMultiBitmap(bitmaps, align);
} else {
PrinterHelper.getInstance().printMultiBitmapWithAlign(bitmaps, align, null);
}
} else {
String img = call.argument("bitmap");
Bitmap image = Glide.with(_context).asBitmap().load(img).diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true).submit(imageWidth, imageHeight).get();
if (iminPrintUtils != null) {
iminPrintUtils.printSingleBitmap(image, align);
} else {
String img = call.argument("bitmap");
Bitmap image = Glide.with(_context).asBitmap().load(img).diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true).submit(imageWidth, imageHeight).get();
if (iminPrintUtils != null) {
iminPrintUtils.printSingleBitmap(image, align);
if (call.argument("SingleBitmapColorChart") != null) {
PrinterHelper.getInstance().printBitmapColorChartWithAlign(image, align, null);
} else {
if (call.argument("SingleBitmapColorChart") != null) {
PrinterHelper.getInstance().printBitmapColorChartWithAlign(image, align, null);
} else {
PrinterHelper.getInstance().printBitmapWithAlign(image, align, null);
}
PrinterHelper.getInstance().printBitmapWithAlign(image, align, null);
}
}
}
} else {
if (call.argument("multiBitmap") != null) {
ArrayList<String> multiBytes = call.argument("bitmaps");
ArrayList<Bitmap> bitmaps = new ArrayList<Bitmap>();
for (int i = 0; i < multiBytes.size(); i++) {
String url = multiBytes.get(i);
Bitmap image = Glide.with(_context).asBitmap().load(url).diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true).submit(imageWidth, imageHeight).get();
bitmaps.add(image);
}
if (iminPrintUtils != null) {
iminPrintUtils.printMultiBitmap(bitmaps, 0);
} else {
PrinterHelper.getInstance().printMultiBitmap(bitmaps, null);
}
} else {
if (call.argument("multiBitmap") != null) {
ArrayList<String> multiBytes = call.argument("bitmaps");
ArrayList<Bitmap> bitmaps = new ArrayList<Bitmap>();
for (int i = 0; i < multiBytes.size(); i++) {
String url = multiBytes.get(i);
Bitmap image = Glide.with(_context).asBitmap().load(url).diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true).submit(imageWidth, imageHeight).get();
bitmaps.add(image);
}
if (iminPrintUtils != null) {
iminPrintUtils.printMultiBitmap(bitmaps, 0);
String img = call.argument("bitmap");
Bitmap bitmap = Glide.with(_context).asBitmap().load(img).diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true).submit(imageWidth, imageHeight).get();
if (iminPrintUtils != null) {
if (call.argument("blackWhite") != null) {
iminPrintUtils.printSingleBitmapBlackWhite(bitmap);
} else {
PrinterHelper.getInstance().printMultiBitmap(bitmaps, null);
iminPrintUtils.printSingleBitmap(bitmap);

}
} else {
String img = call.argument("bitmap");
Bitmap bitmap = Glide.with(_context).asBitmap().load(img).diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true).submit(imageWidth, imageHeight).get();
if (iminPrintUtils != null) {
if (call.argument("blackWhite") != null) {
iminPrintUtils.printSingleBitmapBlackWhite(bitmap);
} else {
iminPrintUtils.printSingleBitmap(bitmap);

}
if (call.argument("SingleBitmapColorChart") != null) {
PrinterHelper.getInstance().printBitmapColorChart(bitmap, null);
} else {
if (call.argument("SingleBitmapColorChart") != null) {
PrinterHelper.getInstance().printBitmapColorChart(bitmap, null);
} else {
PrinterHelper.getInstance().printBitmap(bitmap, null);
}
PrinterHelper.getInstance().printBitmap(bitmap, null);
}
}
}
}
result.success(true);
} catch (Exception err) {
Log.e("IminPrinter", "printBitmapToUrl:" + err.getMessage());
}
result.success(true);
} catch (Exception err) {
Log.e("IminPrinter", "printBitmapToUrl:" + err.getMessage());
}
}).start();
break;
Expand Down
21 changes: 12 additions & 9 deletions example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')

Expand All @@ -11,7 +10,11 @@ if (localPropertiesFile.exists()) {

def keystorePropertiesFile = rootProject.file("key.properties")
def keystoreProperties = new Properties()
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
} else {
println("${keystorePropertiesFile.name} not found, the build might fail")
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
Expand All @@ -34,20 +37,20 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "com.imin.printer.imin_printer_example"
compileSdkVersion flutter.compileSdkVersion
compileSdk flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
Expand Down
2 changes: 1 addition & 1 deletion example/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath 'com.android.tools.build:gradle:8.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
3 changes: 3 additions & 0 deletions example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
11 changes: 3 additions & 8 deletions lib/imin_printer_method_channel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class MethodChannelIminPrinter extends IminPrinterPlatform {

@override
Future<void> setTextStyle(IminFontStyle style) async {
logger.d('setTextStyle', style.index);
logger.d('setTextStyle: ${style.index}');
Map<String, dynamic> arguments = <String, dynamic>{
"style": style.index,
};
Expand Down Expand Up @@ -377,13 +377,8 @@ class MethodChannelIminPrinter extends IminPrinterPlatform {
}
}
arguments.putIfAbsent("bitmaps", () => imgs);
if (imgs is List<Uint8List>) {
await methodChannel.invokeMethod<void>('printMultiBitmap', arguments);
} else {
arguments.putIfAbsent("multiBitmap", () => 1);
await methodChannel.invokeMethod<void>('printBitmapToUrl', arguments);
await methodChannel.invokeMethod<void>('printMultiBitmap', arguments);
}
}

@override
Future<void> printSingleBitmapBlackWhite(dynamic img,
Expand Down Expand Up @@ -713,7 +708,7 @@ class MethodChannelIminPrinter extends IminPrinterPlatform {
}

if (style.lineHeight != null) {
logger.d('lineHeight', style.lineHeight);
logger.d('lineHeight: ${style.lineHeight}');
await setTextBitmapLineSpacing(style.lineHeight!);
}

Expand Down
Loading