diff --git a/entry/src/main/ets/.DS_Store b/entry/src/main/ets/.DS_Store new file mode 100644 index 00000000..3ce9dd10 Binary files /dev/null and b/entry/src/main/ets/.DS_Store differ diff --git a/entry/src/main/ets/common/utils/request.ts b/entry/src/main/ets/common/utils/request.ts index 88f96c5a..e1c17b94 100644 --- a/entry/src/main/ets/common/utils/request.ts +++ b/entry/src/main/ets/common/utils/request.ts @@ -40,9 +40,8 @@ export default async function request(req: any) { try { let baseUrl=host?host:globalThis.host // let baseUrl=host?config.csptHost:config.host' - + console.log('optionsoptions',JSON.stringify(data).length) console.log('响应头地址' + baseUrl,url) - const {result,responseCode} = await httpRequest.request(`${baseUrl}${url}${paramsStr}`, options); // fileUtil.editFile(`${folderPath}/request.txt`, JSON.stringify(arrList)) // writeLog({ diff --git a/entry/src/main/ets/pages/ExaminerLogin.ets b/entry/src/main/ets/pages/ExaminerLogin.ets index b1f70de9..7c208e9c 100644 --- a/entry/src/main/ets/pages/ExaminerLogin.ets +++ b/entry/src/main/ets/pages/ExaminerLogin.ets @@ -5,6 +5,7 @@ import Md5 from '../common/utils/md5'; import promptAction from '@ohos.promptAction'; import errorMsgDialog from './compontents/errorMsgDialog' import { voiceService } from '../common/service/voiceService'; +import imageBtn from './compontents/imageBtn' @Entry @Component @@ -72,7 +73,8 @@ export default struct Index { alignContent: FlexAlign.SpaceAround }) { ForEach(this.imgArr1, (item: Resource, index: number) => { if (index === this.imgArr1.length - 1) { - Image(item).width('38%').height('24%').onClick(() => { + imageBtn({btnWidth:'38%',btnHeight:'24%',imgSrc:item}) + .onClick(() => { if (this.inputTextArr[0].trim() == '' || this.inputTextArr[1].trim() == '') { promptAction.showToast({ message: '请输入用户名和密码', diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index e8f146d0..03183e61 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -21,6 +21,7 @@ import GetDistance from '../common/utils/GetDistance' import UdpEvent from '../common/utils/UdpEvent' 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'; @@ -106,9 +107,7 @@ struct Index { Column() { Row() { if (!this.isSingle) { - Image($r('app.media.index_lw')) - .width('28%') - .height('71%') + imageBtn({btnWidth:'28%',btnHeight:'71%',imgSrc:$r('app.media.index_lw')}) .margin({ left: 80 * globalThis.ratio }) .onClick(async () => { // this.vocObj.playAudio({ @@ -153,9 +152,7 @@ struct Index { }) } if (this.isSingle) { - Image($r('app.media.index_dj')) - .width('28%') - .height('71%') + imageBtn({btnWidth:'28%',btnHeight:'71%',imgSrc:$r('app.media.index_dj')}) .margin({ left: 80 * globalThis.ratio }) .onClick(() => { if (this.loading) { @@ -184,9 +181,7 @@ struct Index { }); }) } - Image($r('app.media.index_zj')) - .width('28%') - .height('71%') + imageBtn({btnWidth:'28%',btnHeight:'71%',imgSrc:$r('app.media.index_zj')}) .margin({ right: 80 * globalThis.ratio }) .onClick(() => { if (this.loading) { diff --git a/entry/src/main/ets/pages/Judge.ets b/entry/src/main/ets/pages/Judge.ets index 2cb3bcbf..836a5eb2 100644 --- a/entry/src/main/ets/pages/Judge.ets +++ b/entry/src/main/ets/pages/Judge.ets @@ -763,10 +763,10 @@ struct Index { .height(118 * 0.95) .margin({ bottom: 8 }) .onClick(() => { - this.vocObj.playAudio({ - type: 1, - name: 'button_media.wav' - }) + // this.vocObj.playAudio({ + // type: 1, + // name: 'button_media.wav' + // }) this.setManualProjectFn(index) }) }) @@ -799,10 +799,10 @@ struct Index { .alignItems(VerticalAlign.Center) .border({ width: 5, color: '#4D4136', radius: 30 }) .onClick(() => { - this.vocObj.playAudio({ - type: 1, - name: 'button_media.wav' - }) + // this.vocObj.playAudio({ + // type: 1, + // name: 'button_media.wav' + // }) this.signDisplayComVisible = true }) @@ -838,10 +838,10 @@ struct Index { .backgroundImageSize({ width: '100%', height: '100%' }) .margin({ bottom: 10 }) .onClick(() => { - this.vocObj.playAudio({ - type: 1, - name: 'button_media.wav' - }) + // this.vocObj.playAudio({ + // type: 1, + // name: 'button_media.wav' + // }) this.isDeductedPopShow = true }) } @@ -871,10 +871,10 @@ struct Index { .backgroundImage($rawfile('judge/anniu_nor.png'), ImageRepeat.NoRepeat) .backgroundImageSize({ width: '100%', height: '100%' }) .onClick(() => { - this.vocObj.playAudio({ - type: 1, - name: 'button_media.wav' - }) + // this.vocObj.playAudio({ + // type: 1, + // name: 'button_media.wav' + // }) if (this.judgeConfigObj['353'] == '0') { this.endPopupVisible = true } else { @@ -938,10 +938,10 @@ struct Index { .backgroundImage($rawfile('judge/close.png'), ImageRepeat.NoRepeat) .backgroundImageSize({ width: '33.33%', height: '33.33%' }) .onClick(() => { - this.vocObj.playAudio({ - type: 1, - name: 'button_media.wav' - }) + // this.vocObj.playAudio({ + // type: 1, + // name: 'button_media.wav' + // }) this.signDisplayComVisible = false }) }.width('100%').height('100%').position({ y: 0 }).backgroundColor('rgba(0,0,0,0.6)') diff --git a/entry/src/main/ets/pages/compontents/TopLogo.ets b/entry/src/main/ets/pages/compontents/TopLogo.ets index e13b6370..3c437358 100644 --- a/entry/src/main/ets/pages/compontents/TopLogo.ets +++ b/entry/src/main/ets/pages/compontents/TopLogo.ets @@ -1,7 +1,7 @@ import router from '@ohos.router'; import { getCurrentTime } from '../../common/service/timeService'; import { voiceService } from '../../common/service/voiceService'; - +import imageBtn from '../compontents/imageBtn' @Component export default struct TopLogo { @State ratio: number = 850 / 960 @@ -33,15 +33,14 @@ export default struct TopLogo { .fontColor('#CCB48F') .margin({ top: -15 * this.ratio, left: 14 * this.ratio }) //fontsize40 } - - Image($r('app.media.topB_back')).width('16.7%').height('12.2%') + imageBtn({btnWidth:'16.7%',btnHeight:'12.2%',imgSrc:$r('app.media.topB_back')}) .onClick(() => { this.vocObj.playAudio({ type: 1, name: 'button_media.wav' }) - router.back() this.outFlag = true + router.back() }) } .position({ x: 0, y: 0 }) @@ -71,3 +70,4 @@ export default struct TopLogo { console.log('jiangsong: topLogo aboutToDisappear222222222') } } +