btn works

2022-09-14 22:59:38 +02:00
parent 49df6d97e5
commit abc8de7933
5 changed files with 77 additions and 49 deletions
@@ -6,7 +6,6 @@ const {MongoManager, formatDate} = require("./src/workers/mongo_manager");
 const mongoManager = new MongoManager();

 let excelUtil = new ExcelUtil();
-let contactList = excelUtil.readContacts()
 let collectionName = formatDate(new Date())

 async function filterAlreadyBookedContacts(contactList) {
@@ -20,18 +19,6 @@ async function filterAlreadyBookedContacts(contactList) {
    return contactsToBook;
 }

-mongoManager.connect().then(r => {
-        filterAlreadyBookedContacts(contactList).then(listToBook => {
-            console.log(listToBook.length)
-            android.devices().then((devices) => {
-                let segmentNumber = listToBook.length / devices.length;
-                for (let i = 0; i < devices.length; i++) {
-                    startWithList(listToBook.slice(i * segmentNumber, segmentNumber * (i + 1)), devices[i]);
-                }
-            })
-        })
-    }
-)

 // Connect to the device.

@@ -59,7 +46,6 @@ async function startBook(contactPojo, device) {
    }
 }

-
 async function startWithList(contacts, device) {
    await contacts.reduce(async (promise, contactPojo) => {
        // This line will wait for the last async function to finish.
@@ -70,3 +56,21 @@ async function startWithList(contacts, device) {
        console.log(contents);
    }, Promise.resolve());
 }
+
+async function startBookWithNumbers(startNumber, endNumber) {
+    let contactList = excelUtil.readContacts();
+    mongoManager.connect().then(r => {
+            filterAlreadyBookedContacts(contactList).then(listToBook => {
+                console.log(listToBook.length)
+                android.devices().then((devices) => {
+                    let segmentNumber = listToBook.length / devices.length;
+                    for (let i = 0; i < devices.length; i++) {
+                        startWithList(listToBook.slice(i * segmentNumber, segmentNumber * (i + 1)), devices[i]);
+                    }
+                })
+            })
+        }
+    )
+}
+
+module.exports = startBookWithNumbers
@@ -5,20 +5,31 @@
    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
    <title>爱马仕约会</title>
-    <script src="./renderer.js"></script>

 </head>
 <body>
-<input type="number" id="start_number">开始联系人位置</input>
-<input type="number" id="end_number">结束联系人位置</input>
-<label name="store">目标商店</label>
-<select name="store_list" id="store_selector">
-    <option value="faubourg">Hermès Faubourg Saint-Honoré</option>
-    <option value="georgev">Hermès George V</option>
-    <option value="sevres">Hermès Sèvres</option>
-</select>
+<div class="form-group">
+    <h3 class="col-md-4 control-label">选择联系人</h3>
+    <div class="col-md-4">
+        <label for="start_number">开始联系人位置</label>
+        <input type="number" id="start_number" value="0"/>
+        <br>
+        <label for="start_number">结束联系人位置</label>
+        <input type="number" id="end_number" value="0"/>
+    </div>
+</div>
+<br/>
+<div class="col-md-4">
+    <label name="store" for="store_selector">目标商店</label>
+    <select name="store_list" id="store_selector">
+        <option value="faubourg">Hermès Faubourg Saint-Honoré</option>
+        <option value="georgev">Hermès George V</option>
+        <option value="sevres">Hermès Sèvres</option>
+    </select>
+</div>
 <br/>
 <button id="start_book_btn">开始约会
 </button>
+<script src="./renderer.js"></script>
 </body>
 </html>
@@ -1,4 +1,4 @@
-const {app, BrowserWindow} = require('electron')
+const {app, BrowserWindow, ipcMain} = require('electron')
 const path = require("path");

 const createWindow = () => {
@@ -13,6 +13,10 @@ const createWindow = () => {
    win.loadFile('index.html').then((r) => {

    })
+    ipcMain.on('start-book', (event, startNumber, endNumber, selectedStore) => {
+        startBook(startNumber, endNumber, selectedStore)
+    })
+    win.webContents.openDevTools();
 }

 app.whenReady().then(() => {
@@ -25,8 +29,11 @@ app.whenReady().then(() => {
 app.on('window-all-closed', () => {
    if (process.platform !== 'darwin') app.quit()
 })
-const startBook = () => {
-    console.log("called")
+
+function startBook(startNumber, endNumber, selectedStore) {
+    console.log("startNumber: " + startNumber)
+    console.log("endNumber: " + endNumber)
+    console.log("selectedStore: " + selectedStore)
 }


@@ -1,25 +1,13 @@
-const startBookWithNumbers = require('appointment')
-let startNumber = 0;
-let endNumber = 0;
-let selectedStore = 'faubourg';

-window.addEventListener('load', () => {
-    document.getElementById("start_book_btn").addEventListener('click', () => {
-        startBook()
-    })
-    document.getElementById("store_selector").addEventListener('change', (event) => {
-        selectedStore = event.target.value
-    })
-    document.getElementById("start_number").addEventListener('change', (event) => {
-        startNumber = event.target.value
-    })
-    document.getElementById("end_number").addEventListener('change', (event) => {
-        endNumber = event.target.value
-    })
+const {contextBridge, ipcRenderer} = require('electron')
+
+contextBridge.exposeInMainWorld('appointment', {
+    startBook: (startNumber, endNumber, selectedStore) => ipcRenderer.send('start-book', startNumber, endNumber, selectedStore)
 })

-const startBook = () => {
-    alert("开始约会 " + "store:" + selectedStore + ",startNumber:" + startNumber + ",endNumber:" + endNumber)
-    console.log("开始约会 " + "store:" + selectedStore)
-    // startBookWithNumbers()
-}
+//
+// const startBook = () => {
+//     console.log("开始约会 " + "store:" + selectedStore)
+//     window.appointment.startBook(startNumber, endNumber, selectedStore)
+//     // startBookWithNumbers()
+// }
@@ -0,0 +1,18 @@
+let startNumber = 0;
+let endNumber = 0;
+let selectedStore = 'faubourg';
+
+window.addEventListener('load', () => {
+    document.getElementById("start_book_btn").addEventListener('click', () => {
+        window.appointment.startBook(startNumber, endNumber, selectedStore)
+    })
+    document.getElementById("store_selector").addEventListener('change', (event) => {
+        selectedStore = event.target.value
+    })
+    document.getElementById("start_number").addEventListener('change', (event) => {
+        startNumber = event.target.value
+    })
+    document.getElementById("end_number").addEventListener('change', (event) => {
+        endNumber = event.target.value
+    })
+})