revert: "adds support for text printing on Cielo Lio devices"

This reverts commit 5eb9e0abf05e91aa5cf0a516427658bdab8519e8.
TotalCross · Mar 9, 2021 · f61f89e · f61f89e
1 parent 582ee01
commit f61f89e
Show file tree

Hide file tree

Showing 18 changed files with 4 additions and 280 deletions.
diff --git a/TotalCrossSDK/src/main/java/totalcross/cielo/printer/client/PrinterAttributes.java b/TotalCrossSDK/src/main/java/totalcross/cielo/printer/client/PrinterAttributes.java
diff --git a/TotalCrossSDK/src/main/java/totalcross/cielo/sdk/order/PrinterListener.java b/TotalCrossSDK/src/main/java/totalcross/cielo/sdk/order/PrinterListener.java
diff --git a/TotalCrossSDK/src/main/java/totalcross/cielo/sdk/printer/PrinterManager.java b/TotalCrossSDK/src/main/java/totalcross/cielo/sdk/printer/PrinterManager.java
diff --git a/TotalCrossVM/CMakeLists.txt b/TotalCrossVM/CMakeLists.txt
@@ -259,8 +259,6 @@ set(SOURCES
 
     ${TC_SRCDIR}/scanner/ios/ios_barcode.c
 
-    ${TC_SRCDIR}/nm/cielo/printer/PrinterManager.c
-
     ${TC_SRCDIR}/nm/qrcode/qrcode_generation.c
 
     ${TC_SRCDIR}/nm/io/device/gpiod/Gpiod.c

diff --git a/TotalCrossVM/android/app/build.gradle b/TotalCrossVM/android/app/build.gradle
@@ -159,12 +159,6 @@ dependencies {
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 
     implementation 'com.android.support:customtabs:25.1.0'
-
-    // https://mvnrepository.com/artifact/cielo.printer.client/printer-manager
-	//compile group: 'cielo.printer.client', name: 'printer-manager', version: '2.3.1'
-
-	// https://mvnrepository.com/artifact/com.cielo.lio/order-manager
-    compile group: 'com.cielo.lio', name: 'order-manager', version: '0.19.8'
 
     //Youtube API
     implementation files('libs/YouTubeAndroidPlayerApi.jar')

diff --git a/TotalCrossVM/android/app/src/includeSms/AndroidManifest.xml b/TotalCrossVM/android/app/src/includeSms/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	package="totalcross.android"
 	>
 
-	<application android:label="Stub" tools:replace="android:label">
+	<application android:label="Stub" tools:replace="label">
 		<activity android:name=".Loader">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />

diff --git a/TotalCrossVM/android/app/src/main/AndroidManifest.xml b/TotalCrossVM/android/app/src/main/AndroidManifest.xml
@@ -4,19 +4,15 @@
       android:versionCode="305419896"
       android:versionName="!1.0!"
       android:sharedUserId="totalcross.app.sharedid"
-      xmlns:tools="http://schemas.android.com/tools"
     >
 
-   	<uses-sdk tools:overrideLibrary="com.cielo.lio, cielo.sdk.ordermanager, cielo.printer.client"/>
-
     <application android:icon="@drawable/icon" 
     	android:label="TotalCross Virtual Machine"
          android:theme="@style/TCThemeNS" android:name="android.support.multidex.MultiDexApplication"
          android:resizeableActivity="true"
          android:allowBackup="true"
          android:backupInForeground="false"
          android:requestLegacyExternalStorage="true"
-         tools:replace="android:label, android:icon, android:theme"
          >
         <meta-data android:name="isFullScreen" android:value="fullscreen:0" />
         <meta-data android:name="android.max_aspect" android:value="2.33" />

diff --git a/TotalCrossVM/android/app/src/main/java/totalcross/android/cielo/PrinterManager4A.java b/TotalCrossVM/android/app/src/main/java/totalcross/android/cielo/PrinterManager4A.java
diff --git a/TotalCrossVM/android/app/src/singleApk/AndroidManifest.xml b/TotalCrossVM/android/app/src/singleApk/AndroidManifest.xml
@@ -4,7 +4,7 @@
 	package="totalcross.android"
 	>
 
-	<application android:label="Stub" tools:replace="android:label">
+	<application android:label="Stub" tools:replace="label">
 		<activity android:name=".Loader">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />

diff --git a/TotalCrossVM/src/init/android/startup_c.h b/TotalCrossVM/src/init/android/startup_c.h
@@ -104,7 +104,6 @@ void JNICALL Java_totalcross_Launcher4A_initializeVM(JNIEnv *env, jobject appObj
    jNotificationManager4A	= androidFindClass(env, "totalcross/android/NotificationManager4A");
    jFirebaseInstanceId  = androidFindClass(env, "com/google/firebase/iid/FirebaseInstanceId");
    jTcFirebaseUtils     = androidFindClass(env, "totalcross/android/firebase/FirebaseUtils");
-   jCieloPrinterManager4A   = androidFindClass(env, "totalcross/android/cielo/PrinterManager4A");
    jzxing            = (*env)->GetStaticMethodID(env, applicationClass, "zxing", "(Ljava/lang/String;)Ljava/lang/String;");
    jsoundToText      = (*env)->GetStaticMethodID(env, applicationClass, "soundToText", "(Ljava/lang/String;)Ljava/lang/String;");
    jsoundFromText    = (*env)->GetStaticMethodID(env, applicationClass, "soundFromText", "(Ljava/lang/String;)V");

diff --git a/TotalCrossVM/src/init/globals.c b/TotalCrossVM/src/init/globals.c
@@ -53,7 +53,7 @@ bool isMainWindow = false;   // extends MainWindow ?
 #if defined(ANDROID)
 JavaVM* androidJVM;
 jobject applicationObj, applicationContext;
-jclass applicationClass,jRadioDevice4A,jBluetooth4A,jConnectionManager4A,jSmsManager4A,jNotificationManager4A,jFirebaseInstanceId,jTcFirebaseUtils,jCieloPrinterManager4A;
+jclass applicationClass,jRadioDevice4A,jBluetooth4A,jConnectionManager4A,jSmsManager4A,jNotificationManager4A,jFirebaseInstanceId,jTcFirebaseUtils;
 jfieldID jshowingAlert,jhardwareKeyboardIsVisible;
 jfieldID jsipVisible,jappTitleH;
 jmethodID jgetHeight;

diff --git a/TotalCrossVM/src/init/globals.h b/TotalCrossVM/src/init/globals.h
@@ -51,7 +51,7 @@ extern bool isMainWindow;   // extends MainWindow ?
 #if defined(ANDROID)
 JavaVM* androidJVM;
 extern jobject applicationObj, applicationContext;
-extern jclass applicationClass,jRadioDevice4A,jBluetooth4A,jConnectionManager4A,jSmsManager4A,jNotificationManager4A,jFirebaseInstanceId,jTcFirebaseUtils,jCieloPrinterManager4A;
+extern jclass applicationClass,jRadioDevice4A,jBluetooth4A,jConnectionManager4A,jSmsManager4A,jNotificationManager4A,jFirebaseInstanceId,jTcFirebaseUtils;
 extern jfieldID jshowingAlert,jhardwareKeyboardIsVisible;
 extern jfieldID jsipVisible,jappTitleH;
 extern jmethodID jgetHeight;

diff --git a/TotalCrossVM/src/init/nativeProcAddressesTC.c b/TotalCrossVM/src/init/nativeProcAddressesTC.c
@@ -550,7 +550,6 @@ void fillNativeProcAddressesTC()
    htPutPtr(&htNativeProcAddresses, hashCode("ttSM_registerSmsReceiver_si"), &ttSM_registerSmsReceiver_si);
    htPutPtr(&htNativeProcAddresses, hashCode("tfiFII_getToken"), &tfiFII_getToken);
    htPutPtr(&htNativeProcAddresses, hashCode("tnNM_notify_n"), &tnNM_notify_n);
-   htPutPtr(&htNativeProcAddresses, hashCode("tcspPM_internalPrintText_ssp"), &tcspPM_internalPrintText_ssp);
    htPutPtr(&htNativeProcAddresses, hashCode("tqQRC_nativeGetBytes_sii"), &tqQRC_nativeGetBytes_sii);
    htPutPtr(&htNativeProcAddresses, hashCode("tidsS_scannerActivate"), &tidsS_scannerActivate);
    htPutPtr(&htNativeProcAddresses, hashCode("tidsS_setBarcodeParam_ib"), &tidsS_setBarcodeParam_ib);

diff --git a/TotalCrossVM/src/nm/NativeMethods.h b/TotalCrossVM/src/nm/NativeMethods.h
@@ -569,7 +569,6 @@ TC_API void ttSM_registerSmsReceiver_si(NMParams p);
 TC_API void tfiFII_getToken(NMParams p);
 TC_API void tnNM_notify_n(NMParams p);
 TC_API void tcpPBKDF2WHSHA1F_generateSecretI(NMParams p);
-TC_API void tcspPM_internalPrintText_ssp(NMParams p);
 TC_API void tqQRC_nativeGetBytes_sii(NMParams p);
 TC_API void tidgGC_open_i(NMParams p);
 TC_API void tidgGL_open_gi(NMParams p);

diff --git a/TotalCrossVM/src/nm/NativeMethods.txt b/TotalCrossVM/src/nm/NativeMethods.txt
@@ -544,5 +544,4 @@ totalcross/telephony/SmsManager|public native void sendDataMessage(String destin
 totalcross/telephony/SmsManager|public native void registerSmsReceiver(totalcross.telephony.SmsReceiver receiver, int port);
 totalcross/firebase/iid/FirebaseInstanceId|public native String getToken();
 totalcross/notification/NotificationManager|public void notify(totalross.notification.Notification notification);
-totalcross/cielo/sdk/printer/PrinterManager|private native void internalPrintText(String textToPrint, String printerAttributes, totalcross.cielo.printer.PrinterManager.PrinterListenerInternal printerListener);
 totalcross/qrcode/QRCode|private native byte[][] nativeGetBytes(String text, int errorCorrection, int version);
diff --git a/TotalCrossVM/src/nm/NativeMethodsPrototypes.txt b/TotalCrossVM/src/nm/NativeMethodsPrototypes.txt
@@ -544,7 +544,6 @@ TC_API void ttSM_sendDataMessage_ssiB(NMParams p);
 TC_API void ttSM_registerSmsReceiver_si(NMParams p);
 TC_API void tfiFII_getToken(NMParams p);
 TC_API void tnNM_notify_n(NMParams p);
-TC_API void tcspPM_internalPrintText_ssp(NMParams p);
 TC_API void tqQRC_nativeGetBytes_sii(NMParams p);
 
 //////////////////////////////////////////////////////////////////////////
@@ -2728,10 +2727,6 @@ TC_API void tnNM_notify_n(NMParams p) // totalcross/notification/NotificationMan
 {
 }
 //////////////////////////////////////////////////////////////////////////
-TC_API void tcspPM_internalPrintText_ssp(NMParams p) // totalcross/cielo/sdk/printer/PrinterManager private native void internalPrintText(String textToPrint, String printerAttributes, totalcross.cielo.printer.PrinterManager.PrinterListenerInternal printerListener);
-{
-}
-//////////////////////////////////////////////////////////////////////////
 TC_API void tqQRC_nativeGetBytes_sii(NMParams p) // totalcross/qrcode/QRCode private native byte[][] nativeGetBytes(String text, int errorCorrection, int version);
 {
 }
diff --git a/TotalCrossVM/src/nm/cielo/printer/PrinterManager.c b/TotalCrossVM/src/nm/cielo/printer/PrinterManager.c
diff --git a/TotalCrossVM/src/nm/cielo/printer/android/PrinterManager_c.h b/TotalCrossVM/src/nm/cielo/printer/android/PrinterManager_c.h