From 8f585da67768bcde2f377ea9f835b67a934a1b59 Mon Sep 17 00:00:00 2001 From: admin Date: Mon, 13 Jan 2025 05:17:37 +0300 Subject: [PATCH] crpt --- android/app/build.gradle | 1 - .../com/anonymous/Assemblr/AwesomeModule.java | 41 ---------------- .../com/anonymous/Assemblr/MainActivity.java | 47 ------------------- .../com/anonymous/Assemblr/MyAppPackage.java | 30 ------------ src/api/apiClient.ts | 4 +- src/screens/AssemblyScreen/ScanCrptModal.tsx | 2 +- src/screens/MoneyScreen/MoneyScreen.tsx | 6 --- 7 files changed, 3 insertions(+), 128 deletions(-) delete mode 100644 android/app/src/main/java/com/anonymous/Assemblr/AwesomeModule.java delete mode 100644 android/app/src/main/java/com/anonymous/Assemblr/MyAppPackage.java diff --git a/android/app/build.gradle b/android/app/build.gradle index c17a6fb..0986ee6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -168,7 +168,6 @@ dependencies { exclude group:'com.squareup.okhttp3', module:'okhttp' } debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") - implementation(files("libs/printer-lib-2.2.4.aar")) if (hermesEnabled.toBoolean()) { implementation("com.facebook.react:hermes-android") diff --git a/android/app/src/main/java/com/anonymous/Assemblr/AwesomeModule.java b/android/app/src/main/java/com/anonymous/Assemblr/AwesomeModule.java deleted file mode 100644 index 3d9ab86..0000000 --- a/android/app/src/main/java/com/anonymous/Assemblr/AwesomeModule.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.anonymous.Assemblr; - -import android.util.Log; - -import androidx.annotation.NonNull; - -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.bridge.ReactContextBaseJavaModule; -import com.facebook.react.bridge.ReactMethod; - -import net.posprinter.IDeviceConnection; -import net.posprinter.POSConnect; -import net.posprinter.TSCPrinter; - -import java.util.HashMap; -import java.util.Map; - -public class AwesomeModule extends ReactContextBaseJavaModule { - private final ReactApplicationContext context; - private final Map printersMap = new HashMap<>(); - AwesomeModule(ReactApplicationContext context) { - super(context); - this.context = context; - POSConnect.init(this.context); - } - - public void initPrinters(){ - - } - - @NonNull - @Override - public String getName() { - return "AwesomeModule"; - } - - @ReactMethod - public void test() { - Log.d("AwesomeModule", "AwesomeModule test"); - } -} diff --git a/android/app/src/main/java/com/anonymous/Assemblr/MainActivity.java b/android/app/src/main/java/com/anonymous/Assemblr/MainActivity.java index 6e5cee7..c1d3a42 100644 --- a/android/app/src/main/java/com/anonymous/Assemblr/MainActivity.java +++ b/android/app/src/main/java/com/anonymous/Assemblr/MainActivity.java @@ -1,8 +1,4 @@ package com.anonymous.Assemblr; -// @generated begin react-native-keyevent-import - expo prebuild (DO NOT MODIFY) sync-6d2345dd84c398e4e99d7d44eb792294628c7e34 -import android.view.KeyEvent; -import com.github.kevinejohn.keyevent.KeyEventModule; -// @generated end react-native-keyevent-import import android.os.Build; import android.os.Bundle; @@ -15,49 +11,6 @@ import com.facebook.react.defaults.DefaultReactActivityDelegate; import expo.modules.ReactActivityDelegateWrapper; public class MainActivity extends ReactActivity { -// @generated begin react-native-keyevent-body - expo prebuild (DO NOT MODIFY) sync-4ba28f58cc0b4a775aa231e380b7f40e8f34382a -@Override -public boolean onKeyDown(int keyCode, KeyEvent event) { - - // // Uncomment this is key events should only trigger once when key is held down - // if (event.getRepeatCount() == 0) { - // KeyEventModule.getInstance().onKeyDownEvent(keyCode, event); - // } - - // // This will trigger the key repeat if the key is held down - // // Comment this out if uncommenting the above - KeyEventModule.getInstance().onKeyDownEvent(keyCode, event); - - // // Uncomment this if you want the default keyboard behavior - // return super.onKeyDown(keyCode, event); - - // // The default keyboard behaviour wll be overridden - // // This is similar to what e.preventDefault() does in a browser - // // comment this if uncommenting the above - super.onKeyDown(keyCode, event); - return true; -} - -@Override -public boolean onKeyUp(int keyCode, KeyEvent event) { - KeyEventModule.getInstance().onKeyUpEvent(keyCode, event); - - // // Uncomment this if you want the default keyboard behavior - // return super.onKeyUp(keyCode, event); - - // // The default keyboard behaviour wll be overridden - // // This is similar to what e.preventDefault() does in a browser - // // comment this if uncommenting the above - super.onKeyUp(keyCode, event); - return true; -} - -@Override -public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event) { - KeyEventModule.getInstance().onKeyMultipleEvent(keyCode, repeatCount, event); - return super.onKeyMultiple(keyCode, repeatCount, event); -} -// @generated end react-native-keyevent-body @Override protected void onCreate(Bundle savedInstanceState) { // Set the theme to AppTheme BEFORE onCreate to support diff --git a/android/app/src/main/java/com/anonymous/Assemblr/MyAppPackage.java b/android/app/src/main/java/com/anonymous/Assemblr/MyAppPackage.java deleted file mode 100644 index 6627015..0000000 --- a/android/app/src/main/java/com/anonymous/Assemblr/MyAppPackage.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.anonymous.Assemblr; - -import androidx.annotation.NonNull; - -import com.facebook.react.ReactPackage; -import com.facebook.react.bridge.NativeModule; -import com.facebook.react.bridge.ReactApplicationContext; -import com.facebook.react.uimanager.ViewManager; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class MyAppPackage implements ReactPackage { - @NonNull - @Override - public List createViewManagers(ReactApplicationContext reactContext) { - return Collections.emptyList(); - } - - @Override - public List createNativeModules( - ReactApplicationContext reactContext) { - List modules = new ArrayList<>(); - - modules.add(new AwesomeModule(reactContext)); - - return modules; - } -} diff --git a/src/api/apiClient.ts b/src/api/apiClient.ts index a9f8f03..cba44b6 100644 --- a/src/api/apiClient.ts +++ b/src/api/apiClient.ts @@ -1,7 +1,7 @@ import axios from 'axios'; -// export const baseUrl = 'https://assemblr.denco.store'; -export const baseUrl = 'http://192.168.1.101:5000'; +export const baseUrl = 'https://assemblr.denco.store'; +// export const baseUrl = 'http://192.168.1.101:5000'; const apiClient = axios.create({ baseURL: baseUrl }); diff --git a/src/screens/AssemblyScreen/ScanCrptModal.tsx b/src/screens/AssemblyScreen/ScanCrptModal.tsx index af87870..c68c984 100644 --- a/src/screens/AssemblyScreen/ScanCrptModal.tsx +++ b/src/screens/AssemblyScreen/ScanCrptModal.tsx @@ -1,3 +1,3 @@ const ScanCrptModal = () => { - return () } \ No newline at end of file diff --git a/src/screens/MoneyScreen/MoneyScreen.tsx b/src/screens/MoneyScreen/MoneyScreen.tsx index 9f58409..13ab7b8 100644 --- a/src/screens/MoneyScreen/MoneyScreen.tsx +++ b/src/screens/MoneyScreen/MoneyScreen.tsx @@ -12,13 +12,7 @@ function MoneyScreen() { return ( Money - { - console.log("Button pressed"); - }} - label={"Press me"} - /> ) }