change include mode

src/appointment.js

@@ -8,18 +8,18 @@ const {Sender} = require("./queue/Sender");
 const {devices} = require("./android/adb");
 const mongoManager = new MongoManager();
 const SEVEN_DAYS_IN_S = 3600 * 24 * 7;
-// const NINETY_DAYS_IN_S = 3600 * 24 * 30 * 3;
 const NINETY_DAYS_IN_S = 30 * 3;
 let excelUtil = new ExcelUtil();
 let collectionName = formatDate(new Date())
-let excludeMode = DeviceExcludeMode.ZERO
+let includeMode = DeviceExcludeMode.ZERO
+// let includeMode = DeviceExcludeMode.APPOINTMENT
 
-let three_to_excludes = []
-let four_to_excludes = ["bec11752", "4e8ca027", "hi7ljr5xduyt9pfi", "EPHUT20825001518"]
+let three_to_include = []
+let four_to_include = ["bec11752", "4e8ca027", "hi7ljr5xduyt9pfi", "EPHUT20825001518"]
 let seven_to_excludes = ["4e8ca027", "hi7ljr5xduyt9pfi", "EPHUT20825001518", "bec11752", "fuljaueqguugf6pn", "EPHUT20825001518"]
-let six_to_excludes = ["4e8ca027", "hi7ljr5xduyt9pfi", "EPHUT20825001518", "bec11752", "07fbd156", "NFD669QK8XNFSCNN", "6X494TTWQGFALB79", "71a0371d", "YP6HVKLFE67T598L"]
-let nine_to_excludes = ["bec11752", "4e8ca027", "hi7ljr5xduyt9pfi", "47e7e36b", "p7d6nbw8cu7duous", "njzxojhim7gedyvw", "fmiz5pa6rsx4u4ts", "fuljaueqguugf6pn", "EPHUT20825001518"]
-let for_scrpay = ["07fbd156", "47e7e36b", "4f55c3d4", "5ac879a2", "69db59f0", "71a0371d", "774687ff", "7b71fb20", "8f76f9e7", "99cyfiaebqcy6poj", "EPHUT20825001518", "J4AXB761H2322WJ", "W8GMFELRHIKZS84T", "ai9xv8hy599hvkee", "b41c1b72", "bec11752", "becb6e99", "c3ba032e", "d54e946", "fmiz5pa6rsx4u4ts", "fuljaueqguugf6pn", "fy65eqs4wkvcpf9h", "hi7ljr5xduyt9pfi", "njzxojhim7gedyvw", "p7d6nbw8cu7duous"]
+// let appointment_to_include = ["ai9xv8hy599hvkee", "07fbd156", "71a0371d", "J4AXB761H2322WJ", "W8GMFELRHIKZS84T", "fy65eqs4wkvcpf9h", "p7d6nbw8cu7duous", "fuljaueqguugf6pn", "fmiz5pa6rsx4u4ts"]
+let appointment_to_include = ["ai9xv8hy599hvkee", "07fbd156", "71a0371d", "J4AXB761H2322WJ", "W8GMFELRHIKZS84T", "fy65eqs4wkvcpf9h", "p7d6nbw8cu7duous", "fmiz5pa6rsx4u4ts"]
+let nine_to_include = ["bec11752", "4e8ca027", "hi7ljr5xduyt9pfi", "47e7e36b", "p7d6nbw8cu7duous", "njzxojhim7gedyvw", "fmiz5pa6rsx4u4ts", "fuljaueqguugf6pn", "EPHUT20825001518"]
 attributedPorts = []
 const device_port_info = new Map();
 startPort = 9000
@@ -118,9 +118,17 @@ function shuffle(array) {
     return array;
 }
 
+function getContactListForDevice(device, allContactList) {
+    let contactList = [];
+    allContactList.forEach((contact) => {
+        if (contact.serial === device.serial) {
+            contactList.push(contact)
+        }
+    })
+    return contactList;
+}
+
 async function startBookWithNumbers(startNumber, endNumber, selectedStore, pathToExcelFile = '/Users/lpan/Desktop/contact_all.xlsx', audioAnalyse = true, alertBeep = false) {
-    console.log("startBookWithNumbers() called, with alertBeep:" + alertBeep)
-    console.log("startBookWithNumbers() called, with audioAnalyse:" + audioAnalyse)
     let allContactList = excelUtil.readContacts(pathToExcelFile);
     let contactList;
     if (endNumber <= allContactList.length) {
@@ -170,28 +178,37 @@ async function startBookWithNumbers(startNumber, endNumber, selectedStore, pathT
                         alert("未找到连接的设备");
                         return
                     }
-                    let device_to_excludes = three_to_excludes;
-                    if (excludeMode === DeviceExcludeMode.FOUR) {
-                        device_to_excludes = four_to_excludes;
-                    } else if (excludeMode === DeviceExcludeMode.THREE) {
-                        device_to_excludes = three_to_excludes;
-                    } else if (excludeMode === DeviceExcludeMode.NINE) {
-                        device_to_excludes = nine_to_excludes;
-                    } else if (excludeMode === DeviceExcludeMode.SEVEN) {
+                    let device_to_excludes = three_to_include;
+                    if (includeMode === DeviceExcludeMode.FOUR) {
+                        device_to_excludes = four_to_include;
+                    } else if (includeMode === DeviceExcludeMode.THREE) {
+                        device_to_excludes = three_to_include;
+                    } else if (includeMode === DeviceExcludeMode.NINE) {
+                        device_to_excludes = nine_to_include;
+                    } else if (includeMode === DeviceExcludeMode.SEVEN) {
                         device_to_excludes = seven_to_excludes
-                    } else if (excludeMode === DeviceExcludeMode.SIX) {
-                        device_to_excludes = six_to_excludes
-                    } else if (excludeMode === DeviceExcludeMode.ZERO) {
+                    } else if (includeMode === DeviceExcludeMode.APPOINTMENT) {
+                        device_to_excludes = appointment_to_include
+                    } else if (includeMode === DeviceExcludeMode.ZERO) {
                         device_to_excludes = []
                     }
-                    filteredDeviceList = devices.filter(device => !device_to_excludes.includes(device.serial))
+                    let filteredDeviceList;
+                    if (includeMode === DeviceExcludeMode.ZERO) {
+                        filteredDeviceList = devices
+                    } else {
+                        filteredDeviceList = devices.filter(device => device_to_excludes.includes(device.serial))
+                    }
                     let segmentNumber = listWithoutBlackContact.length / filteredDeviceList.length;
                     console.log("connected device number:" + filteredDeviceList.length)
                     console.log("segmentNumber:" + segmentNumber)
+                    listWithoutBlackContact = shuffle(listWithoutBlackContact)
                     for (let i = 0; i < filteredDeviceList.length; i++) {
                         let device = filteredDeviceList[i];
                         let port = startForwordingForDevice(device)
-                        startWithList(listWithoutBlackContact.slice(i * segmentNumber, segmentNumber * (i + 1)), device, sender, selectedStore, audioAnalyse, alertBeep, port);
+                        let _contactList = listWithoutBlackContact.slice(i * segmentNumber, segmentNumber * (i + 1))
+                        // let _contactList = getContactListForDevice(device, listWithoutBlackContact)
+                        console.log("contactList: for device:" + device.serial + " has " + _contactList.length)
+                        startWithList(_contactList, device, sender, selectedStore, audioAnalyse, alertBeep, port);
                     }
                 })
 

src/excel/ExcelUtil.js

@@ -19,11 +19,12 @@ class ExcelUtil {
                     if (store === undefined || store.length === 0) {
                         store = "random"
                     }
-                    let ipCountry = info[5];
+                    let serial = info[5];
+                    let ipCountry = info[6];
                     if (ipCountry === undefined || ipCountry.length === 0) {
                         ipCountry = "FR"
                     }
-                    let newContact = new ContactPojo(phoneNumber, passportNumber, lastName, firstName, mail, store, ipCountry);
+                    let newContact = new ContactPojo(phoneNumber, passportNumber, lastName, firstName, mail, store, ipCountry, serial);
                     contactList.push(newContact);
                 }
             }

src/models/ContactPojo.js

@@ -1,6 +1,6 @@
 class ContactPojo {
 
-    constructor(phoneNumber, passportNumber, lastName, firstName, mail, store, ipCountry) {
+    constructor(phoneNumber, passportNumber, lastName, firstName, mail, store, ipCountry, serial) {
         this.phoneNumber = phoneNumber;
         this.passportNumber = passportNumber;
         this.lastName = lastName;
@@ -8,6 +8,7 @@ class ContactPojo {
         this.mail = mail;
         this.store = store;
         this.ipCountry = ipCountry;
+        this.serial = serial;
     }
 }
 

src/models/DeviceExcludeMode.js

@@ -1,9 +1,10 @@
-const DeviceExcludeMode = {
+const DeviceIncludeMode = {
     ZERO: Symbol("ZERO"),
     NINE: Symbol("NINE"),
     THREE: Symbol("THREE"),
     SIX: Symbol("SIX"),
     SEVEN: Symbol("SEVEN"),
+    APPOINTMENT: Symbol("APPOINTMENT"),
     FOUR: Symbol("FOUR")
 }
-module.exports = DeviceExcludeMode
+module.exports = DeviceIncludeMode

src/workers/CommandorPage.js

@@ -886,7 +886,7 @@ class CommandorPage {
                 this.isTerminated = true;
                 break;
             case OCRResult.SLIDING_CAPTCHA_REFRESH:
-                await this.connect_to_browser(checkResult)
+                this.isTerminated = true;
                 break;
             case OCRResult.SLIDING_CAPTCHA:
                 logWithDevice("will call this.slidingCaptcha()", this.device)
@@ -1354,8 +1354,8 @@ class CommandorPage {
             this.device.shell("input tap " + 925 + " " + 1325)
         } else if (this.device.model === "22041219PG") {
             this.device.shell("input tap " + 925 + " " + 1430)
-        } else if (this.device.model === "moto g51 5G") {
-            await this.tapForDevice(this.device, 950, 1434)
+        } else if (this.device.model === "moto_g51_5G") {
+            this.device.shell("input tap " + 950 + " " + 1434)
         } else
             this.device.shell("input tap " + 933 + " " + 1538)
         await delay(2000);
@@ -1417,7 +1417,7 @@ class CommandorPage {
             this.device.shell("input tap " + 818 + " " + 2140)
             await delay(1000);
         } else if (model === "moto_g51_5G") {
-            await this.tapForDevice(this.device, 800, 2215)
+            this.device.shell("input tap " + 806 + " " + 2230)
             await delay(2000);
             this.device.shell("input tap " + 800 + " " + 2215)
             await delay(1000);
@@ -1465,6 +1465,8 @@ class CommandorPage {
             this.device.shell("input tap " + 510 + " " + 1975)
         } else if (model === "MI_5s") {
             this.device.shell("input tap " + 510 + " " + 1615)
+        } else if (model === "Mi_Note_10") {
+            await this.tapForDevice(this.device, 498, 1910)
         } else
             this.device.shell("input tap " + 385 + " " + 2050)
         await delay(1000);

src/workers/OCRChecker.js

@@ -148,9 +148,6 @@ class OCRChecker {
                 } else {
                     await this.deleteFile(fileName)
                 }
-                // await this.deleteFile(screenShot)
-                // if (result.includes("rac"))
-                //     return OCRResult.SLIDING_CAPTCHA_REFRESH
                 return OCRResult.SLIDING_CAPTCHA
             } else if (result.includes(SLIDING_CAPTCHA_RETRY_FR)
             ) {