TobiasH/smart-monopoly
1
0
Fork 0
Code Issues 14 Pull Requests Packages Projects 1 Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Tobias Hopp 2024-04-09 04:02:09 +02:00
parent 55c8b628ca
commit 97caf4b30e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NFCHandler.ts
View File

@ -67,9 +67,9 @@ export default class NFCHandler {
let contents = fs.readFileSync(path.resolve(process.cwd(), "nfc.test")).toString("utf-8"); let contents = fs.readFileSync(path.resolve(process.cwd(), "nfc.test")).toString("utf-8");
let parsed = this.formClass("xyz", contents); let parsed = this.formClass("xyz", contents);
if (parsed) if (parsed)
IPCSend(IPCListenChannels.NFC_CARD, {status: true, data: parsed}); IPCSend(IPCListenChannels.NFC_CARD, {status: true, data: parsed.card});
IPCSend(IPCListenChannels.NFC_RAW, {status: !!parsed, data: parsed}); IPCSend(IPCListenChannels.NFC_RAW, {status: parsed.isComplete, data: parsed.card});
console.log("Got NFC", parsed); console.log("Got NFC", parsed);
}) })

11
src/web/Setup.tsx
View File

@ -289,12 +289,13 @@ export default class Setup extends Component<{}, InitialSetupState> {
})); }));
} }
private nfcCard: NFCCard|null;
onNFCRawEvent = (card: NFCCard|null) => { onNFCRawEvent = (card: NFCCard|null, isComplete: boolean) => {
this.nfcCard = card;
this.setState(prevState => ({ this.setState(prevState => ({
...prevState, ...prevState,
openNFCModal: true, openNFCModal: true,
nfcCard: card,
validCard: isComplete
})); }));
} }
@ -303,7 +304,7 @@ export default class Setup extends Component<{}, InitialSetupState> {
componentDidMount() { componentDidMount() {
this.getSettings().then(); this.getSettings().then();
this.rawNFCListener = IPCListener.attach(IPCListenChannels.NFC_RAW, (message) => { this.rawNFCListener = IPCListener.attach(IPCListenChannels.NFC_RAW, (message) => {
this.onNFCRawEvent(message.data); this.onNFCRawEvent(message.data, message.status);
}) })
} }
@ -338,7 +339,7 @@ export default class Setup extends Component<{}, InitialSetupState> {
{this.state.openNFCModal && {this.state.openNFCModal &&
<CardSetup card={this.state.nfcCard} validCard={this.state.validNfcCard} closeCallback={() => this.setState(prevState => ({ <CardSetup card={this.state.nfcCard} validCard={this.state.validCard} closeCallback={() => this.setState(prevState => ({
...prevState, ...prevState,
openNFCModal: false openNFCModal: false
}))}/>} }))}/>}