harmony_car/subject-two
harmony_car/subject-two
4
0
Fork 3
Code Issues Pull Requests Packages Projects 1 Releases 45 Wiki Activity

冲突修改

Browse Source
This commit is contained in:
lvyuankang 2024-09-05 08:59:37 +08:00
commit e6f5e564cf
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
entry/src/main/ets/entryability/EntryAbility.ts
View File

@ -32,6 +32,10 @@ export default class EntryAbility extends UIAbility {
globalThis.judgeVersion = '2024.01.05.1' globalThis.judgeVersion = '2024.01.05.1'
// globalThis.judgeVersion = '2022.12.05.1' // globalThis.judgeVersion = '2022.12.05.1'
// globalThis.version = '2022.08.13.01' // globalThis.version = '2022.08.13.01'
// globalThis.version = '2022.08.13.01'//洛阳
// globalThis.judgeVersion = '2022.12.05.1'
// globalThis.judgeVersion = '2022.12.05.1'
// globalThis.version = '2022.08.13.01'
// globalThis.version = '2024.11.22.14'//济南 // globalThis.version = '2024.11.22.14'//济南
// globalThis.judgeVersion = '2024.11.22.14' // globalThis.judgeVersion = '2024.11.22.14'
globalThis.videoVersion= '1.0' globalThis.videoVersion= '1.0'
@ -59,7 +63,7 @@ export default class EntryAbility extends UIAbility {
const windowClass = await windowStage.getMainWindow(); const windowClass = await windowStage.getMainWindow();
globalThis.windowClass = windowClass globalThis.windowClass = windowClass
await windowClass.setWindowLayoutFullScreen(true) // await windowClass.setWindowLayoutFullScreen(true)
// await windowClass.setWindowSystemBarEnable([]) //全屏 // await windowClass.setWindowSystemBarEnable([]) //全屏
// await windowClass.setWindowSystemBarEnable(['navigation']) // await windowClass.setWindowSystemBarEnable(['navigation'])

6
entry/src/main/ets/pages/Index.ets
View File

@ -299,9 +299,9 @@ struct Index {
this.loading = false this.loading = false
globalThis.lsh = '1111111111111' globalThis.lsh = '1111111111111'
globalThis.errorDialog = this.errorDialog globalThis.errorDialog = this.errorDialog
// const distanceClass = new GetDistance(globalThis.context) const distanceClass = new GetDistance(globalThis.context)
// await distanceClass.initFolder() await distanceClass.initFolder()
// globalThis.distanceClass = distanceClass globalThis.distanceClass = distanceClass
} }
async testXMLToJSONInWorker() { async testXMLToJSONInWorker() {