Merge branch 'main' of github.com:iminsoftware/imin_printer

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+# 0.6.3
+ - fixed  printSingleBitmap To Url bug
+
+# 0.6.2
+ - Fixed  bug and Optimize the money box function
+ - Fixed Package name collisions  bug
+
+# 0.6.1
+ - Fixed bug
+
+## 0.6.0
+- Added 1.0 and 2.0 printing apis
+- Compatible with iMin devices that use the 1.0 print api and the 2.0 print api
+- Fixed the money box opening bugqq
+
 ## 0.5.6
 - added openCashBox method
 

android/build.gradle

@@ -40,6 +40,7 @@ android {
 
     defaultConfig {
         minSdkVersion 16
+        multiDexEnabled true
     }
     dependencies {
         testImplementation 'junit:junit:4.13.2'
@@ -56,12 +57,13 @@ android {
     }
 }
 dependencies {
+
+    implementation files('libs\\iminPrinterSDK-12_V1.2.0_2404031803.jar')
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.0.0'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
-    implementation files('libs/IminLibs1.0.15.jar')
+//    implementation files('libs/IminLibs1.0.15.jar')
     implementation files('libs/IminStraElectronicSDK_V1.2.jar')
-    implementation files('libs/iminPrinterSDK-10_V1.0.9_2306201823.jar')
     implementation "androidx.multidex:multidex:2.0.1"
     implementation 'com.github.iminsoftware:IminPrinterLibrary:V1.0.0.11'
     implementation 'com.github.bumptech.glide:glide:4.16.0'

android/gradle.properties

@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=GBK
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
@@ -15,6 +15,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+
+android.enableJetifier=true
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library

android/src/main/AndroidManifest.xml

@@ -1,15 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
-  package="com.imin.printer.imin_printer">
-     <uses-sdk tools:overrideLibrary="com.imin.printer"/>
-    <application
-        android:name="com.imin.printer.imin_printer.BaseApplication"
-        tools:replace="android:name"
-        >
-
-            <provider
-                android:authorities="com.imin.printer.imin_printer"
-                android:name="com.imin.printer.imin_printer.MyProvider"
-                tools:ignore="WrongManifestParent" />
-    </application>
+package="com.imin.printer.imin_printer">
 </manifest>