diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index b4e1db4f..4490b153 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/entry/src/main/ets/common/service/indexService.ts @@ -339,8 +339,6 @@ export async function takePhotoFn(context) { } const zdyz = globalThis.param854Str ? Number(globalThis.param854Str) : Number(param.zdyz) console.log('takePhototakePhoto', JSON.stringify(data)) - const zdyz = globalThis.param854Str ? Number(globalThis.param854Str) : Number(param.zdyz) - console.log('takePhototakePhoto', JSON.stringify(zdyz),) if (Number(data.fileSize) <= (zdyz * 1000)) { map[key1] = true diff --git a/entry/src/main/ets/config/global.ts b/entry/src/main/ets/config/global.ts index ebe19200..db9785a9 100644 --- a/entry/src/main/ets/config/global.ts +++ b/entry/src/main/ets/config/global.ts @@ -11,7 +11,7 @@ export const GlobalConfig={ picSavePath:'/storage/cloud/100/files/Photo/', videoSavePath:'/storage/cloud/100/files/Videos/', host:'http://172.37.55.1912:8082', - appVersion:'2025.01.01', + appVersion:'2025.01.06', version:{ //杭州 hz:{ diff --git a/entry/src/main/ets/entryability/EntryAbility.ts b/entry/src/main/ets/entryability/EntryAbility.ts index 61797483..cc9a6672 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ts +++ b/entry/src/main/ets/entryability/EntryAbility.ts @@ -32,8 +32,8 @@ export default class EntryAbility extends UIAbility { // globalThis.judgeVersion ='2024.08.24.1' // globalThis.version ='2023.12.13.01'; - globalThis.version = GlobalConfig.version.jn.km3[0]; - globalThis.judgeVersion = GlobalConfig.version.jn.km3[1]; + // globalThis.version = GlobalConfig.version.jn.km3[0]; + // globalThis.judgeVersion = GlobalConfig.version.jn.km3[1]; globalThis.videoVersion= '1.0' diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index ecfdbb4e..72b54b21 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -31,7 +31,7 @@ import UIAbility from '@ohos.app.ability.UIAbility'; import { endRecordVideo, getUserAlbumItemByDisplayName, saveStartRecordVideo } from '../common/service/videoService'; import imageBtn from './compontents/imageBtn' import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements'; - +import EndPopup from './compontents//judge/EndPopup' // import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements'; @Entry @@ -52,6 +52,8 @@ struct Index { @State fd: number = -1; @State num: number = 0; @State mxwjDownloadFlag: boolean = false; + @State isUpdatePopShow: boolean = false; + fileHelper = null; private fileUtil: FileUtil private interval = null; @@ -313,6 +315,8 @@ struct Index { .backgroundColor('#E6E3DF') .borderRadius(19 * globalThis.ratio) } + + } .width('100%') .height('100%')