diff --git a/entry/src/main/ets/pages/Settings.ets b/entry/src/main/ets/pages/Settings.ets index bbbbc6b..22da083 100644 --- a/entry/src/main/ets/pages/Settings.ets +++ b/entry/src/main/ets/pages/Settings.ets @@ -1,6 +1,7 @@ import router from '@ohos.router' import { BaseInfoType, CarInfoType } from '../model/Common' -import TopLogo from './compontents/TopLogo' +import HeaderComponent from './compontents/Header' +import BottomMessageComponent from './Index/BottomMessage' @Entry @Component @@ -9,38 +10,33 @@ struct SettingPage { @State url: string = '' @State baseInfo: BaseInfoType = {} @State carInfo: CarInfoType = {} - @State @Watch('outClick') outFlag: boolean = false; + + aboutToAppear() { + this.carInfo = AppStorage.get('carInfo')! + this.baseInfo = AppStorage.get('baseInfo')! + } build() { Column() { - TopLogo({ outFlag: $outFlag }) + HeaderComponent({ + shortLogo: true, + shouBackArea: true + }) Column() { Row() { Image($r('app.media.setting_clzc')).width('30.5%').height('74%').onClick(() => { - // this.vocObj.playAudio({ - // type: 1, - // name: 'button_media.wav' - // }) this.url = 'pages/Register' router.pushUrl({ url: this.url, }, router.RouterMode.Single); }) Image($r('app.media.setting_spjk')).width('30.5%').height('74%').onClick(() => { - // this.vocObj.playAudio({ - // type: 1, - // name: 'button_media.wav' - // }) this.url = 'pages/VideoConfig' router.pushUrl({ url: this.url, }, router.RouterMode.Single); }) Image($r('app.media.setting_xtts')).width('30.5%').height('74%').onClick(() => { - // this.vocObj.playAudio({ - // type: 1, - // name: 'button_media.wav' - // }) this.url = 'pages/TerminalInfo' router.pushUrl({ url: this.url, @@ -52,28 +48,12 @@ struct SettingPage { } Column() { - Row() { - Column() { - Text('V ' + this.baseInfo.version) - .fontColor('#CCAE7A') - .fontSize(22 * this.ratio) - .width('30%') - .margin({ bottom: 10 * this.ratio }) - Text('授权信息:' + (this.baseInfo.hasAuth ? '已授权' : '未授权')) - .fontColor('#CCAE7A') - .fontSize(22 * this.ratio) - .width('30%') - } - .margin({ left: 24 * this.ratio }) - - Text('考车号:' + this.carInfo.carNo) - .fontColor('#CCAE7A') - .fontSize(22 * this.ratio) - .margin({ right: 24 * this.ratio }) - } - .width('100%') - .justifyContent(FlexAlign.SpaceBetween) - .margin({ bottom: 10 * this.ratio }) + BottomMessageComponent({ + version: this.baseInfo.version, + judgeVersion: this.baseInfo.judgeVersion, + hasAuth: this.baseInfo.hasAuth, + examCarNumber: this.carInfo.carNo, + }) } } .width('100%') @@ -83,14 +63,4 @@ struct SettingPage { .backgroundImage($r('app.media.index_bg')) .backgroundImageSize({ width: '100%', height: '100%' }) } - - aboutToAppear() { - // this.vocObj = new voiceService(async (status, val, next) => { - // }); - this.carInfo = AppStorage.get('carInfo')! - this.baseInfo = AppStorage.get('baseInfo')! - } - - outClick() { - } } \ No newline at end of file