feat(scanner): more work on the scanner and can now scan to prod no lst right now
All checks were successful
Build and Push LST Docker Image / docker (push) Successful in 2m41s
All checks were successful
Build and Push LST Docker Image / docker (push) Successful in 2m41s
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
"expo": {
|
"expo": {
|
||||||
"name": "LST mobile",
|
"name": "LST mobile",
|
||||||
"slug": "lst-mobile",
|
"slug": "lst-mobile",
|
||||||
"version": "0.0.1-alpha",
|
"version": "0.11.1-alpha",
|
||||||
"orientation": "portrait",
|
"orientation": "portrait",
|
||||||
"icon": "./assets/images/icon.png",
|
"icon": "./assets/images/icon.png",
|
||||||
"scheme": "lstmobile",
|
"scheme": "lstmobile",
|
||||||
@@ -16,9 +16,10 @@
|
|||||||
"foregroundImage": "./assets/images/android-icon-foreground.png",
|
"foregroundImage": "./assets/images/android-icon-foreground.png",
|
||||||
"backgroundImage": "./assets/images/android-icon-background.png",
|
"backgroundImage": "./assets/images/android-icon-background.png",
|
||||||
"monochromeImage": "./assets/images/android-icon-monochrome.png",
|
"monochromeImage": "./assets/images/android-icon-monochrome.png",
|
||||||
"package": "net.alpla.lst.mobile",
|
"package": "net.alpla.lst.mobile"
|
||||||
"versionCode": 1
|
|
||||||
},
|
},
|
||||||
|
"versionCode": 5,
|
||||||
"predictiveBackGestureEnabled": false,
|
"predictiveBackGestureEnabled": false,
|
||||||
"package": "com.anonymous.lstMobile"
|
"package": "com.anonymous.lstMobile"
|
||||||
},
|
},
|
||||||
@@ -27,6 +28,7 @@
|
|||||||
"favicon": "./assets/images/favicon.png"
|
"favicon": "./assets/images/favicon.png"
|
||||||
},
|
},
|
||||||
"plugins": [
|
"plugins": [
|
||||||
|
"./plugins/withZebraScanner",
|
||||||
"expo-router",
|
"expo-router",
|
||||||
[
|
[
|
||||||
"expo-splash-screen",
|
"expo-splash-screen",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "lstmobile",
|
"name": "lstmobile",
|
||||||
"main": "expo-router/entry",
|
"main": "expo-router/entry",
|
||||||
"version": "0.0.1-alpha",
|
"version": "0.0.2-alpha",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "expo start",
|
"start": "expo start",
|
||||||
"reset-project": "node ./scripts/reset-project.js",
|
"reset-project": "node ./scripts/reset-project.js",
|
||||||
@@ -9,7 +9,8 @@
|
|||||||
"ios": "expo run:ios",
|
"ios": "expo run:ios",
|
||||||
"web": "expo start --web",
|
"web": "expo start --web",
|
||||||
"lint": "expo lint",
|
"lint": "expo lint",
|
||||||
"build:apk": "expo prebuild --clean && cd android && gradlew.bat assembleRelease ",
|
"build:apk:clean": "expo prebuild --clean && cd android && gradlew.bat assembleRelease ",
|
||||||
|
"build:apk": "expo prebuild && cd android && gradlew.bat assembleRelease ",
|
||||||
"update": "adb install android/app/build/outputs/apk/release/app-release.apk"
|
"update": "adb install android/app/build/outputs/apk/release/app-release.apk"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
293
lstMobile/plugins/withZebraScanner.js
Normal file
293
lstMobile/plugins/withZebraScanner.js
Normal file
@@ -0,0 +1,293 @@
|
|||||||
|
const { withDangerousMod } = require("@expo/config-plugins");
|
||||||
|
const fs = require("fs");
|
||||||
|
const path = require("path");
|
||||||
|
|
||||||
|
const packageName = "com.anonymous.lstMobile";
|
||||||
|
const packagePath = "com/anonymous/lstMobile";
|
||||||
|
|
||||||
|
const moduleCode = `package ${packageName}.scanner
|
||||||
|
|
||||||
|
import android.content.BroadcastReceiver
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.IntentFilter
|
||||||
|
import android.os.Bundle
|
||||||
|
import com.facebook.react.bridge.*
|
||||||
|
import com.facebook.react.modules.core.DeviceEventManagerModule
|
||||||
|
|
||||||
|
class ZebraScannerModule(
|
||||||
|
private val reactContext: ReactApplicationContext
|
||||||
|
) : ReactContextBaseJavaModule(reactContext) {
|
||||||
|
|
||||||
|
override fun getName(): String = "ZebraScanner"
|
||||||
|
|
||||||
|
private val scanAction = "com.lst.mobile.SCAN"
|
||||||
|
private var receiverRegistered = false
|
||||||
|
|
||||||
|
private val scanReceiver = object : BroadcastReceiver() {
|
||||||
|
override fun onReceive(context: Context?, intent: Intent?) {
|
||||||
|
println("LST SCANNER: received intent -> \${intent?.action}")
|
||||||
|
|
||||||
|
if (intent?.action != scanAction) {
|
||||||
|
println("LST SCANNER: wrong action")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val barcodeData: String? =
|
||||||
|
intent.getStringExtra("com.symbol.datawedge.data_string")
|
||||||
|
|
||||||
|
val labelType: String? =
|
||||||
|
intent.getStringExtra("com.symbol.datawedge.label_type")
|
||||||
|
|
||||||
|
val source: String? =
|
||||||
|
intent.getStringExtra("com.symbol.datawedge.source")
|
||||||
|
|
||||||
|
println("LST SCANNER: data=\$barcodeData label=\$labelType source=\$source")
|
||||||
|
|
||||||
|
if (barcodeData.isNullOrBlank()) {
|
||||||
|
println("LST SCANNER: empty barcode")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val payload = Arguments.createMap().apply {
|
||||||
|
putString("data", barcodeData)
|
||||||
|
putString("labelType", labelType)
|
||||||
|
putString("source", source)
|
||||||
|
putDouble("timestamp", System.currentTimeMillis().toDouble())
|
||||||
|
}
|
||||||
|
|
||||||
|
sendEvent("barcodeScanned", payload)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@ReactMethod
|
||||||
|
fun startListening() {
|
||||||
|
if (receiverRegistered) return
|
||||||
|
|
||||||
|
reactContext.registerReceiver(
|
||||||
|
scanReceiver,
|
||||||
|
IntentFilter(scanAction),
|
||||||
|
Context.RECEIVER_EXPORTED
|
||||||
|
)
|
||||||
|
|
||||||
|
receiverRegistered = true
|
||||||
|
}
|
||||||
|
|
||||||
|
@ReactMethod
|
||||||
|
fun stopListening() {
|
||||||
|
if (!receiverRegistered) return
|
||||||
|
|
||||||
|
try {
|
||||||
|
reactContext.unregisterReceiver(scanReceiver)
|
||||||
|
} catch (_: Exception) {}
|
||||||
|
|
||||||
|
receiverRegistered = false
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Required for React Native NativeEventEmitter
|
||||||
|
*/
|
||||||
|
@ReactMethod
|
||||||
|
fun addListener(eventName: String) {
|
||||||
|
// No-op
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Required for React Native NativeEventEmitter
|
||||||
|
*/
|
||||||
|
@ReactMethod
|
||||||
|
fun removeListeners(count: Int) {
|
||||||
|
// No-op
|
||||||
|
}
|
||||||
|
|
||||||
|
@ReactMethod
|
||||||
|
fun triggerScan() {
|
||||||
|
val intent = Intent().apply {
|
||||||
|
action = "com.symbol.datawedge.api.ACTION"
|
||||||
|
putExtra("com.symbol.datawedge.api.SOFT_SCAN_TRIGGER", "TOGGLE_SCANNING")
|
||||||
|
}
|
||||||
|
|
||||||
|
reactContext.sendBroadcast(intent)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun sendCommand(command: String, value: Any) {
|
||||||
|
val intent = Intent().apply {
|
||||||
|
action = "com.symbol.datawedge.api.ACTION"
|
||||||
|
|
||||||
|
when (value) {
|
||||||
|
is String -> putExtra(command, value)
|
||||||
|
is Bundle -> putExtra(command, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
reactContext.sendBroadcast(intent)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun sendEvent(eventName: String, payload: WritableMap) {
|
||||||
|
reactContext
|
||||||
|
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
|
||||||
|
.emit(eventName, payload)
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
@ReactMethod
|
||||||
|
fun ensureProfile() {
|
||||||
|
val profileName = "LST_MOBILE"
|
||||||
|
|
||||||
|
// Create profile (safe to call even if it exists)
|
||||||
|
sendCommand(
|
||||||
|
"com.symbol.datawedge.api.CREATE_PROFILE",
|
||||||
|
profileName
|
||||||
|
)
|
||||||
|
|
||||||
|
Thread.sleep(500)
|
||||||
|
// Configure profile
|
||||||
|
val profileConfig = Bundle().apply {
|
||||||
|
putString("PROFILE_NAME", profileName)
|
||||||
|
putString("PROFILE_ENABLED", "true")
|
||||||
|
putString("CONFIG_MODE", "CREATE_IF_NOT_EXIST")
|
||||||
|
|
||||||
|
val barcodeConfig = Bundle().apply {
|
||||||
|
putString("PLUGIN_NAME", "BARCODE")
|
||||||
|
putString("RESET_CONFIG", "true")
|
||||||
|
|
||||||
|
val props = Bundle().apply {
|
||||||
|
putString("scanner_input_enabled", "true")
|
||||||
|
}
|
||||||
|
|
||||||
|
putBundle("PARAM_LIST", props)
|
||||||
|
}
|
||||||
|
|
||||||
|
val intentConfig = Bundle().apply {
|
||||||
|
putString("PLUGIN_NAME", "INTENT")
|
||||||
|
putString("RESET_CONFIG", "true")
|
||||||
|
|
||||||
|
val props = Bundle().apply {
|
||||||
|
putString("intent_output_enabled", "true")
|
||||||
|
putString("intent_action", scanAction)
|
||||||
|
putString("intent_delivery", "2") // broadcast
|
||||||
|
putString("intent_use_content_provider", "false") // optional but helps
|
||||||
|
}
|
||||||
|
|
||||||
|
putBundle("PARAM_LIST", props)
|
||||||
|
}
|
||||||
|
|
||||||
|
val keystrokeConfig = Bundle().apply {
|
||||||
|
putString("PLUGIN_NAME", "KEYSTROKE")
|
||||||
|
putString("RESET_CONFIG", "true")
|
||||||
|
|
||||||
|
val props = Bundle().apply {
|
||||||
|
putString("keystroke_output_enabled", "false")
|
||||||
|
}
|
||||||
|
|
||||||
|
putBundle("PARAM_LIST", props)
|
||||||
|
}
|
||||||
|
|
||||||
|
putParcelableArrayList(
|
||||||
|
"PLUGIN_CONFIG",
|
||||||
|
arrayListOf(barcodeConfig, intentConfig, keystrokeConfig)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
sendCommand("com.symbol.datawedge.api.SET_CONFIG", profileConfig)
|
||||||
|
|
||||||
|
// Associate with your app
|
||||||
|
val appConfig = Bundle().apply {
|
||||||
|
putString("PACKAGE_NAME", reactContext.packageName)
|
||||||
|
putStringArray("ACTIVITY_LIST", arrayOf("*"))
|
||||||
|
}
|
||||||
|
|
||||||
|
val associateConfig = Bundle().apply {
|
||||||
|
putString("PROFILE_NAME", profileName)
|
||||||
|
putString("CONFIG_MODE", "UPDATE")
|
||||||
|
putParcelableArray("APP_LIST", arrayOf(appConfig))
|
||||||
|
}
|
||||||
|
|
||||||
|
sendCommand("com.symbol.datawedge.api.SET_CONFIG", associateConfig)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const packageCode = `package ${packageName}.scanner
|
||||||
|
|
||||||
|
import com.facebook.react.ReactPackage
|
||||||
|
import com.facebook.react.bridge.NativeModule
|
||||||
|
import com.facebook.react.bridge.ReactApplicationContext
|
||||||
|
import com.facebook.react.uimanager.ViewManager
|
||||||
|
|
||||||
|
class ZebraScannerPackage : ReactPackage {
|
||||||
|
|
||||||
|
override fun createNativeModules(
|
||||||
|
reactContext: ReactApplicationContext
|
||||||
|
): List<NativeModule> {
|
||||||
|
return listOf(ZebraScannerModule(reactContext))
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun createViewManagers(
|
||||||
|
reactContext: ReactApplicationContext
|
||||||
|
): List<ViewManager<*, *>> {
|
||||||
|
return emptyList()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
function patchMainApplication(mainApplicationPath) {
|
||||||
|
let contents = fs.readFileSync(mainApplicationPath, "utf8");
|
||||||
|
|
||||||
|
const importLine = `import ${packageName}.scanner.ZebraScannerPackage`;
|
||||||
|
|
||||||
|
if (!contents.includes(importLine)) {
|
||||||
|
contents = contents.replace(
|
||||||
|
/import com\.facebook\.react\.PackageList/,
|
||||||
|
`import com.facebook.react.PackageList\n${importLine}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!contents.includes("add(ZebraScannerPackage())")) {
|
||||||
|
contents = contents.replace(
|
||||||
|
/PackageList\(this\)\.packages\.apply\s*\{/,
|
||||||
|
`PackageList(this).packages.apply {\n add(ZebraScannerPackage())`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
fs.writeFileSync(mainApplicationPath, contents);
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = function withZebraScanner(config) {
|
||||||
|
return withDangerousMod(config, [
|
||||||
|
"android",
|
||||||
|
async (config) => {
|
||||||
|
const androidRoot = config.modRequest.platformProjectRoot;
|
||||||
|
|
||||||
|
const scannerDir = path.join(
|
||||||
|
androidRoot,
|
||||||
|
"app/src/main/java",
|
||||||
|
packagePath,
|
||||||
|
"scanner",
|
||||||
|
);
|
||||||
|
|
||||||
|
fs.mkdirSync(scannerDir, { recursive: true });
|
||||||
|
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(scannerDir, "ZebraScannerModule.kt"),
|
||||||
|
moduleCode,
|
||||||
|
);
|
||||||
|
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(scannerDir, "ZebraScannerPackage.kt"),
|
||||||
|
packageCode,
|
||||||
|
);
|
||||||
|
|
||||||
|
const mainApplicationPath = path.join(
|
||||||
|
androidRoot,
|
||||||
|
"app/src/main/java",
|
||||||
|
packagePath,
|
||||||
|
"MainApplication.kt",
|
||||||
|
);
|
||||||
|
|
||||||
|
patchMainApplication(mainApplicationPath);
|
||||||
|
|
||||||
|
return config;
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
};
|
||||||
19
lstMobile/src/app/(tabs)/_layout.tsx
Normal file
19
lstMobile/src/app/(tabs)/_layout.tsx
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import { Tabs } from "expo-router";
|
||||||
|
import { useAppStore } from "../../hooks/useAppStore";
|
||||||
|
|
||||||
|
export default function TabsLayout() {
|
||||||
|
const serverPort = useAppStore((s) => s.serverPort);
|
||||||
|
return (
|
||||||
|
<Tabs
|
||||||
|
screenOptions={{
|
||||||
|
headerShown: false, // Hides the header for all screens in this navigator
|
||||||
|
}}>
|
||||||
|
<Tabs.Screen name="scanner" options={{ title: "Scan" }} />
|
||||||
|
<Tabs.Screen name="config" options={{ title: "settings" }} />
|
||||||
|
<Tabs.Screen name="logs" options={{ title: "Logs",
|
||||||
|
href: parseInt(serverPort || "0", 10) >= 50000 ? null : "/(tabs)/logs",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Tabs>
|
||||||
|
);
|
||||||
|
}
|
||||||
7
lstMobile/src/app/(tabs)/config.tsx
Normal file
7
lstMobile/src/app/(tabs)/config.tsx
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
import { Link } from "expo-router";
|
||||||
|
import { Text, View } from "react-native";
|
||||||
|
import Setup from "../setup";
|
||||||
|
|
||||||
|
export default function SettingsTab() {
|
||||||
|
return <Setup />
|
||||||
|
}
|
||||||
13
lstMobile/src/app/(tabs)/logs.tsx
Normal file
13
lstMobile/src/app/(tabs)/logs.tsx
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import { Text, View } from 'react-native'
|
||||||
|
|
||||||
|
export default function Logs() {
|
||||||
|
return (
|
||||||
|
<View style={{
|
||||||
|
flex: 1,
|
||||||
|
//justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
marginTop: 50,
|
||||||
|
}}><Text>Logs</Text></View>
|
||||||
|
)
|
||||||
|
}
|
||||||
22
lstMobile/src/app/(tabs)/scanner.tsx
Normal file
22
lstMobile/src/app/(tabs)/scanner.tsx
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { View } from "react-native";
|
||||||
|
|
||||||
|
import { useAppStore } from "../../hooks/useAppStore";
|
||||||
|
import ProdScanner from "../../components/ProdScanner";
|
||||||
|
import LSTScanner from "../../components/LSTScanner";
|
||||||
|
|
||||||
|
export default function scanner() {
|
||||||
|
const serverPort = useAppStore((s) => s.serverPort);
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
flex: 1,
|
||||||
|
//justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
marginTop: 50,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{parseInt(serverPort || "0", 10) >= 50000 ? <ProdScanner /> : <LSTScanner />}
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { useRouter } from "expo-router";
|
import { Redirect, useRouter } from "expo-router";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { ActivityIndicator, Text, View } from "react-native";
|
import { ActivityIndicator, Text, View } from "react-native";
|
||||||
import { useAppStore } from "../hooks/useAppStore";
|
import { useAppStore } from "../hooks/useAppStore";
|
||||||
@@ -7,6 +7,7 @@ import { devDelay } from "../lib/devMode";
|
|||||||
export default function Index() {
|
export default function Index() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const [message, setMessage] = useState(<Text>Starting app...</Text>);
|
const [message, setMessage] = useState(<Text>Starting app...</Text>);
|
||||||
|
const [ready, setReady] = useState(false);
|
||||||
|
|
||||||
const hasHydrated = useAppStore((s) => s.hasHydrated);
|
const hasHydrated = useAppStore((s) => s.hasHydrated);
|
||||||
const serverPort = useAppStore((s) => s.serverPort);
|
const serverPort = useAppStore((s) => s.serverPort);
|
||||||
@@ -40,13 +41,18 @@ export default function Index() {
|
|||||||
</Text>,
|
</Text>,
|
||||||
);
|
);
|
||||||
await devDelay(1500);
|
await devDelay(1500);
|
||||||
router.replace("/scanner");
|
//router.replace("/scanner");
|
||||||
|
setReady(true)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setMessage(<Text>Checking for updates</Text>)
|
||||||
|
await devDelay(1500)
|
||||||
|
// TODO if theres an update go to update screen message :D
|
||||||
setMessage(<Text>Opening LST scan app</Text>);
|
setMessage(<Text>Opening LST scan app</Text>);
|
||||||
await devDelay(3250);
|
await devDelay(3250);
|
||||||
router.replace("/scanner");
|
//router.replace("/scanner");
|
||||||
|
setReady(true)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.log("Startup error", error);
|
console.log("Startup error", error);
|
||||||
setMessage(<Text>Something went wrong during startup.</Text>);
|
setMessage(<Text>Something went wrong during startup.</Text>);
|
||||||
@@ -56,6 +62,9 @@ export default function Index() {
|
|||||||
startup();
|
startup();
|
||||||
}, [hasHydrated, hasValidSetup, serverPort, router]);
|
}, [hasHydrated, hasValidSetup, serverPort, router]);
|
||||||
|
|
||||||
|
if (ready) {
|
||||||
|
return <Redirect href="/(tabs)/scanner" />;
|
||||||
|
}
|
||||||
return (
|
return (
|
||||||
<View
|
<View
|
||||||
style={{
|
style={{
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { Text, View } from "react-native";
|
|
||||||
|
|
||||||
export default function scanner() {
|
|
||||||
return (
|
|
||||||
<View
|
|
||||||
style={{
|
|
||||||
flex: 1,
|
|
||||||
//justifyContent: "center",
|
|
||||||
alignItems: "center",
|
|
||||||
marginTop: 50,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<View style={{ alignItems: "center", margin: 10 }}>
|
|
||||||
<Text style={{ fontSize: 20, fontWeight: "600" }}>LST Scanner</Text>
|
|
||||||
</View>
|
|
||||||
<View
|
|
||||||
style={{
|
|
||||||
marginTop: 50,
|
|
||||||
alignItems: "center",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Text>Relocate</Text>
|
|
||||||
<Text>0 / 4</Text>
|
|
||||||
</View>
|
|
||||||
|
|
||||||
{/* <View>
|
|
||||||
<Text>List of recent scanned pallets TBA</Text>
|
|
||||||
</View> */}
|
|
||||||
</View>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,7 @@ import { useState } from "react";
|
|||||||
import { Alert, Button, Text, TextInput, View } from "react-native";
|
import { Alert, Button, Text, TextInput, View } from "react-native";
|
||||||
import { useAppStore } from "../hooks/useAppStore";
|
import { useAppStore } from "../hooks/useAppStore";
|
||||||
|
|
||||||
export default function setup() {
|
export default function Setup() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const [auth, setAuth] = useState(false);
|
const [auth, setAuth] = useState(false);
|
||||||
const [pin, setPin] = useState("");
|
const [pin, setPin] = useState("");
|
||||||
@@ -40,6 +40,7 @@ export default function setup() {
|
|||||||
updateAppState({
|
updateAppState({
|
||||||
serverIp: serverIp.trim(),
|
serverIp: serverIp.trim(),
|
||||||
serverPort: serverPort.trim(),
|
serverPort: serverPort.trim(),
|
||||||
|
scannerId: scannerId?.trim(),
|
||||||
setupCompleted: true,
|
setupCompleted: true,
|
||||||
isRegistered: true,
|
isRegistered: true,
|
||||||
});
|
});
|
||||||
@@ -80,7 +81,7 @@ export default function setup() {
|
|||||||
borderRadius: 8,
|
borderRadius: 8,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Button title="Save Config" onPress={authCheck} />
|
<Button title="Submit" onPress={authCheck} />
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
) : (
|
) : (
|
||||||
@@ -136,7 +137,7 @@ export default function setup() {
|
|||||||
<Button
|
<Button
|
||||||
title="Home"
|
title="Home"
|
||||||
onPress={() => {
|
onPress={() => {
|
||||||
router.push("/");
|
router.push("/(tabs)/scanner");
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
24
lstMobile/src/components/LSTScanner.tsx
Normal file
24
lstMobile/src/components/LSTScanner.tsx
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import { View, Text } from 'react-native'
|
||||||
|
|
||||||
|
export default function LSTScanner() {
|
||||||
|
return (
|
||||||
|
<View><View style={{ alignItems: "center", margin: 10 }}>
|
||||||
|
<Text style={{ fontSize: 20, fontWeight: "600" }}>LST Scanner</Text>
|
||||||
|
</View>
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
marginTop: 50,
|
||||||
|
alignItems: "center",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Text>Relocate</Text>
|
||||||
|
<Text>0 / 4</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
{/* <View>
|
||||||
|
<Text>List of recent scanned pallets TBA</Text>
|
||||||
|
</View> */}
|
||||||
|
</View>
|
||||||
|
)
|
||||||
|
}
|
||||||
31
lstMobile/src/components/ProdScanner.tsx
Normal file
31
lstMobile/src/components/ProdScanner.tsx
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
import React from 'react'
|
||||||
|
import { View, Text } from 'react-native'
|
||||||
|
import { ScannerTestScreen } from './ScannExample'
|
||||||
|
import { useAppStore } from '../hooks/useAppStore';
|
||||||
|
|
||||||
|
export default function ProdScanner() {
|
||||||
|
const scannerIdFromStore = useAppStore((s) => s.scannerId);
|
||||||
|
return (
|
||||||
|
<View>
|
||||||
|
<View style={{ alignItems: "center", margin: 10 }}>
|
||||||
|
<Text style={{ fontSize: 20, fontWeight: "600" }}>SScanner ID: {scannerIdFromStore}</Text>
|
||||||
|
</View>
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
marginTop: 50,
|
||||||
|
alignItems: "center",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Text>Relocate</Text>
|
||||||
|
<Text>0 / 4</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
{/* <View>
|
||||||
|
<Text>List of recent scanned pallets TBA</Text>
|
||||||
|
</View> */}
|
||||||
|
<ScannerTestScreen />
|
||||||
|
</View>
|
||||||
|
|
||||||
|
|
||||||
|
)
|
||||||
|
}
|
||||||
58
lstMobile/src/components/ScannExample.tsx
Normal file
58
lstMobile/src/components/ScannExample.tsx
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { Button, Text, View } from "react-native";
|
||||||
|
import { type ZebraScanResult, zebraScanner } from "../lib/ZebraScanner";
|
||||||
|
|
||||||
|
const STX = "\x02";
|
||||||
|
const ETX = "\x03";
|
||||||
|
|
||||||
|
export function ScannerTestScreen() {
|
||||||
|
const [lastResponse, setLastResponse] = useState("");
|
||||||
|
|
||||||
|
const handleScan = async (scan: ZebraScanResult) => {
|
||||||
|
console.log("Raw Zebra scan:", scan);
|
||||||
|
|
||||||
|
const scanned = scan.data;
|
||||||
|
|
||||||
|
// Hard-coded command example:
|
||||||
|
// <stx>98@{scanned}<etx>
|
||||||
|
const tcpMessage = `${STX}98@${scanned}${ETX}`;
|
||||||
|
|
||||||
|
console.log("TCP message to send:", tcpMessage);
|
||||||
|
console.log("TCP message visible:", `<stx>98@${scanned}<etx>`);
|
||||||
|
|
||||||
|
// Later this is where your TCP send goes.
|
||||||
|
// const response = await sendTcpMessage(tcpMessage);
|
||||||
|
|
||||||
|
const fakeResponse = `Would send TCP: <stx>98@${scanned}<etx>`;
|
||||||
|
|
||||||
|
console.log("TCP response:", fakeResponse);
|
||||||
|
setLastResponse(fakeResponse);
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
zebraScanner.ensureProfile();
|
||||||
|
zebraScanner.startListening();
|
||||||
|
|
||||||
|
const sub = zebraScanner.addScanListener((scan) => {
|
||||||
|
console.log("SCAN:", scan);
|
||||||
|
handleScan(scan);
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
sub.remove();
|
||||||
|
zebraScanner.stopListening();
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View style={{ padding: 20, gap: 12 }}>
|
||||||
|
<Button
|
||||||
|
title="Soft Trigger Scan"
|
||||||
|
onPress={() => zebraScanner.triggerScan()}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Text>Waiting for scan...</Text>
|
||||||
|
<Text>{lastResponse}</Text>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
40
lstMobile/src/lib/ZebraScanner.ts
Normal file
40
lstMobile/src/lib/ZebraScanner.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import {
|
||||||
|
type EmitterSubscription,
|
||||||
|
NativeEventEmitter,
|
||||||
|
NativeModules,
|
||||||
|
} from "react-native";
|
||||||
|
|
||||||
|
const { ZebraScanner } = NativeModules;
|
||||||
|
|
||||||
|
const scannerEmitter = new NativeEventEmitter(ZebraScanner);
|
||||||
|
|
||||||
|
export type ZebraScanResult = {
|
||||||
|
data: string;
|
||||||
|
labelType?: string;
|
||||||
|
source?: string;
|
||||||
|
timestamp: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const zebraScanner = {
|
||||||
|
startListening() {
|
||||||
|
ZebraScanner.startListening();
|
||||||
|
},
|
||||||
|
|
||||||
|
stopListening() {
|
||||||
|
ZebraScanner.stopListening();
|
||||||
|
},
|
||||||
|
|
||||||
|
triggerScan() {
|
||||||
|
ZebraScanner.triggerScan();
|
||||||
|
},
|
||||||
|
|
||||||
|
ensureProfile() {
|
||||||
|
ZebraScanner.ensureProfile();
|
||||||
|
},
|
||||||
|
|
||||||
|
addScanListener(
|
||||||
|
callback: (scan: ZebraScanResult) => void,
|
||||||
|
): EmitterSubscription {
|
||||||
|
return scannerEmitter.addListener("barcodeScanned", callback);
|
||||||
|
},
|
||||||
|
};
|
||||||
72
lstMobile/src/lib/tcpScan.ts
Normal file
72
lstMobile/src/lib/tcpScan.ts
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
import TcpSocket from "react-native-tcp-socket";
|
||||||
|
|
||||||
|
const STX = "\x02";
|
||||||
|
const ETX = "\x03";
|
||||||
|
|
||||||
|
type TcpResponse = {
|
||||||
|
success: boolean;
|
||||||
|
message: string;
|
||||||
|
data: string[];
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sends a Zebra-style TCP message:
|
||||||
|
* <STX>98@{scanned}<ETX>
|
||||||
|
*/
|
||||||
|
export async function sendTcpMessage(
|
||||||
|
scanned: string,
|
||||||
|
host: string,
|
||||||
|
port: number,
|
||||||
|
timeoutMs = 5000,
|
||||||
|
): Promise<TcpResponse> {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
const responses: string[] = [];
|
||||||
|
|
||||||
|
const client = TcpSocket.createConnection({ host, port }, () => {
|
||||||
|
const payload = `${STX}98@${scanned}${ETX}`;
|
||||||
|
|
||||||
|
console.log("Sending TCP (raw):", payload);
|
||||||
|
console.log("Sending TCP (visible):", `<stx>98@${scanned}<etx>`);
|
||||||
|
|
||||||
|
client.write(payload);
|
||||||
|
});
|
||||||
|
|
||||||
|
const timeout = setTimeout(() => {
|
||||||
|
client.destroy();
|
||||||
|
|
||||||
|
resolve({
|
||||||
|
success: false,
|
||||||
|
message: "TCP timeout",
|
||||||
|
data: responses,
|
||||||
|
});
|
||||||
|
}, timeoutMs);
|
||||||
|
|
||||||
|
client.on("data", (data) => {
|
||||||
|
const text = data.toString();
|
||||||
|
console.log("TCP received:", text);
|
||||||
|
|
||||||
|
responses.push(text);
|
||||||
|
});
|
||||||
|
|
||||||
|
client.on("error", (err) => {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
client.destroy();
|
||||||
|
|
||||||
|
resolve({
|
||||||
|
success: false,
|
||||||
|
message: err.message,
|
||||||
|
data: responses,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
client.on("close", () => {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
|
||||||
|
resolve({
|
||||||
|
success: true,
|
||||||
|
message: "TCP complete",
|
||||||
|
data: responses,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
12
scripts/LabelLayoutCopy.ps1
Normal file
12
scripts/LabelLayoutCopy.ps1
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
$source = "C:\Sources\AlplaPROD\MasterLayouts"
|
||||||
|
$servers = @("USMCD1VMS036", "USSTP1VMS006", "USLIM1VMS006")
|
||||||
|
$log = "C:\Sources\AlplaPROD\MasterLayouts\sync.log"
|
||||||
|
|
||||||
|
foreach ($server in $servers) {
|
||||||
|
Add-Content $log "======================================"
|
||||||
|
Add-Content $log "Syncing to $server at $(Get-Date)"
|
||||||
|
|
||||||
|
robocopy $source "\\$server\C$\Sources\AlplaPROD\MasterLayouts" /E /Z /R:2 /W:5 /FFT /XO /TEE /LOG+:$log
|
||||||
|
|
||||||
|
Add-Content $log "Finished $server with exit code $LASTEXITCODE"
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user