Skip to content

Commit

Permalink
chore
Browse files Browse the repository at this point in the history
  • Loading branch information
shuguang-lv committed Apr 7, 2021
1 parent 3226e3b commit c36485a
Show file tree
Hide file tree
Showing 29 changed files with 52 additions and 53 deletions.
Binary file modified simulation/PythonLauncher.class
Binary file not shown.
Binary file modified simulation/SimulationLauncher.class
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2021/04/03-14:43:11.987 3b68 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\AutofillStrikeDatabase/MANIFEST-000001
2021/04/03-14:43:11.987 3b68 Recovering log #3
2021/04/03-14:43:11.988 3b68 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\AutofillStrikeDatabase/000003.log
2021/04/07-16:45:52.509 d24 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\AutofillStrikeDatabase/MANIFEST-000001
2021/04/07-16:45:52.510 d24 Recovering log #3
2021/04/07-16:45:52.511 d24 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\AutofillStrikeDatabase/000003.log
6 changes: 3 additions & 3 deletions simulation/chromium/userData/Default/BudgetDatabase/LOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2021/04/03-14:43:11.983 3978 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\BudgetDatabase/MANIFEST-000001
2021/04/03-14:43:11.984 3978 Recovering log #3
2021/04/03-14:43:11.984 3978 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\BudgetDatabase/000003.log
2021/04/07-16:45:52.508 1228 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\BudgetDatabase/MANIFEST-000001
2021/04/07-16:45:52.509 1228 Recovering log #3
2021/04/07-16:45:52.510 1228 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\BudgetDatabase/000003.log
Binary file modified simulation/chromium/userData/Default/Cache/data_0
Binary file not shown.
Binary file modified simulation/chromium/userData/Default/Cache/data_1
Binary file not shown.
Binary file modified simulation/chromium/userData/Default/Cache/data_2
Binary file not shown.
Binary file modified simulation/chromium/userData/Default/Cache/data_3
Binary file not shown.
Binary file not shown.
6 changes: 3 additions & 3 deletions simulation/chromium/userData/Default/Extension State/LOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2021/04/03-14:43:15.078 7f4 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\Extension State/MANIFEST-000001
2021/04/03-14:43:15.079 7f4 Recovering log #3
2021/04/03-14:43:15.079 7f4 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\Extension State/000003.log
2021/04/07-16:45:54.620 4f44 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\Extension State/MANIFEST-000001
2021/04/07-16:45:54.620 4f44 Recovering log #3
2021/04/07-16:45:54.621 4f44 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\Extension State/000003.log
Binary file modified simulation/chromium/userData/Default/Favicons
Binary file not shown.
Binary file modified simulation/chromium/userData/Default/Favicons-journal
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2021/04/03-14:43:11.956 3b68 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\Feature Engagement Tracker\AvailabilityDB/MANIFEST-000001
2021/04/03-14:43:11.957 3b68 Recovering log #3
2021/04/03-14:43:11.957 3b68 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\Feature Engagement Tracker\AvailabilityDB/000003.log
2021/04/07-16:45:52.486 adc Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\Feature Engagement Tracker\AvailabilityDB/MANIFEST-000001
2021/04/07-16:45:52.487 adc Recovering log #3
2021/04/07-16:45:52.488 adc Reusing old log E:\GRP\project\simulation\chromium\userData\Default\Feature Engagement Tracker\AvailabilityDB/000003.log
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2021/04/03-14:43:11.945 3b68 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\Feature Engagement Tracker\EventDB/MANIFEST-000001
2021/04/03-14:43:11.946 3b68 Recovering log #3
2021/04/03-14:43:11.947 3b68 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\Feature Engagement Tracker\EventDB/000003.log
2021/04/07-16:45:52.472 adc Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\Feature Engagement Tracker\EventDB/MANIFEST-000001
2021/04/07-16:45:52.473 adc Recovering log #3
2021/04/07-16:45:52.474 adc Reusing old log E:\GRP\project\simulation\chromium\userData\Default\Feature Engagement Tracker\EventDB/000003.log
Binary file modified simulation/chromium/userData/Default/History
Binary file not shown.
Binary file modified simulation/chromium/userData/Default/History-journal
Binary file not shown.
Binary file modified simulation/chromium/userData/Default/Login Data
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2021/04/03-14:43:11.916 5088 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\Site Characteristics Database/MANIFEST-000001
2021/04/03-14:43:11.917 5088 Recovering log #3
2021/04/03-14:43:11.918 5088 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\Site Characteristics Database/000003.log
2021/04/07-16:45:52.421 11e4 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\Site Characteristics Database/MANIFEST-000001
2021/04/07-16:45:52.422 11e4 Recovering log #3
2021/04/07-16:45:52.422 11e4 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\Site Characteristics Database/000003.log
6 changes: 3 additions & 3 deletions simulation/chromium/userData/Default/Sync Data/LevelDB/LOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2021/04/03-14:43:11.936 4e0c Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\Sync Data\LevelDB/MANIFEST-000001
2021/04/03-14:43:11.936 4e0c Recovering log #3
2021/04/03-14:43:11.937 4e0c Reusing old log E:\GRP\project\simulation\chromium\userData\Default\Sync Data\LevelDB/000003.log
2021/04/07-16:45:52.445 386c Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\Sync Data\LevelDB/MANIFEST-000001
2021/04/07-16:45:52.446 386c Recovering log #3
2021/04/07-16:45:52.447 386c Reusing old log E:\GRP\project\simulation\chromium\userData\Default\Sync Data\LevelDB/000003.log
Binary file modified simulation/chromium/userData/Default/Visited Links
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
MANIFEST-000014
MANIFEST-000064
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2021/04/03-14:43:11.930 3978 Recovering log #13
2021/04/03-14:43:11.951 3978 Delete type=0 #13
2021/04/03-14:43:11.951 3978 Delete type=3 #12
2021/04/07-16:45:52.471 14e8 Recovering log #63
2021/04/07-16:45:52.503 14e8 Delete type=0 #63
2021/04/07-16:45:52.504 14e8 Delete type=3 #62
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
2021/04/03-14:43:12.105 3978 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\shared_proto_db\metadata/MANIFEST-000001
2021/04/03-14:43:12.106 3978 Recovering log #3
2021/04/03-14:43:12.107 3978 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\shared_proto_db\metadata/000003.log
2021/04/07-16:45:52.587 1228 Reusing MANIFEST E:\GRP\project\simulation\chromium\userData\Default\shared_proto_db\metadata/MANIFEST-000001
2021/04/07-16:45:52.612 1228 Recovering log #3
2021/04/07-16:45:52.613 1228 Reusing old log E:\GRP\project\simulation\chromium\userData\Default\shared_proto_db\metadata/000003.log
Binary file modified simulation/chromium/userData/GrShaderCache/GPUCache/data_1
Binary file not shown.
Binary file modified simulation/chromium/userData/ShaderCache/GPUCache/data_1
Binary file not shown.
6 changes: 3 additions & 3 deletions src/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ execSync('javac PythonLauncher.java', { cwd: url }, (err, stdout, stderr) => {
// ipcMain.on('run', (event) => {
// sendToPython()
// event.reply('success')
// })
// })

// event listener: play simulation
ipcMain.on('play', (event, source) => {
Expand Down Expand Up @@ -435,7 +435,7 @@ function copyMapFile(event, file) {
} else {
filePath = path.join('./resources/simulation/', file + '.csv')
}

if (!fs.existsSync(filePath)) {
console.log('csv文件不存在')
event.reply('error', 'Map file cannot be found')
Expand All @@ -447,7 +447,7 @@ function copyMapFile(event, file) {
let data = fs.readFileSync(filePath)
// encode data into base64 for uploading
data = new Buffer(data).toString('base64')
event.reply('mapCopied' + file, data)
event.returnValue = data
}

function sendToPython() {
Expand Down
43 changes: 21 additions & 22 deletions src/components/FloatButton.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<template>
<div class="d-flex">
<!-- upload button -->
<v-badge color="warning" :value="upload" dot overlap class="mr-3">
<!-- <v-badge color="warning" :value="upload" dot overlap class="mr-3">
<v-btn small icon @click="checkUser(0)"
><v-icon>mdi-cloud-upload</v-icon></v-btn
>
<!-- <v-icon @click="dialog = true">mdi-cloud-upload</v-icon> -->
</v-badge>
</v-badge> -->
<!-- download button -->
<v-badge color="warning" :value="download" dot overlap>
<v-btn small icon @click="checkUser(1)"
Expand Down Expand Up @@ -148,25 +147,25 @@ export default {
this.eventBus.$emit('showSnackbar', 'Upload records successfully!')
},
uploadFile(fileName) {
// listen to ipcMain event
this.$electron.ipcRenderer.on('mapCopied' + fileName, (event, arg) => {
try {
const data = { base64: arg }
const file = new this.leanCloud.File(fileName + '.txt', data)
file.save().then(
(file) => {
console.log(`文件保存完成。objectId:${file.id}`)
},
(error) => {
this.eventBus.$emit('showSnackbarError', 'File uploading failed')
}
)
} catch (error) {
this.eventBus.$emit('showSnackbarError', 'File uploading failed')
}
})
this.$electron.ipcRenderer.send('copyMap', fileName)
async uploadFile(fileName) {
try {
const arg = this.$electron.ipcRenderer.sendSync('copyMap', fileName)
const data = { base64: arg }
const file = new this.leanCloud.File(fileName + '.txt', data)
await file.save()
} catch (error) {
this.eventBus.$emit('showSnackbarError', 'File uploading failed')
}
this.sleep(5000)
},
sleep(numberMillis) {
var now = new Date()
var exitTime = now.getTime() + numberMillis
while (true) {
now = new Date()
if (now.getTime() > exitTime) return
}
},
async downloadRecords() {
Expand Down

0 comments on commit c36485a

Please sign in to comment.