refactor: 使用Map替代WarnFlagTipData对象,优化数据结构和可读性
This commit is contained in:
		
							parent
							
								
									5a8b3d314f
								
							
						
					
					
						commit
						dee00b45cf
					
				@ -94,38 +94,70 @@ export const StackValueData = {
 | 
				
			|||||||
  29: "",
 | 
					  29: "",
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export const WarnFlagTipData = {
 | 
					// export const WarnFlagTipData = {
 | 
				
			||||||
  0: [],
 | 
					//   0: [],
 | 
				
			||||||
  1: [],
 | 
					//   1: [],
 | 
				
			||||||
  2: [],
 | 
					//   2: [],
 | 
				
			||||||
  3: ['check1.wav', 'check2.wav'],
 | 
					//   3: ['check1.wav', 'check2.wav'],
 | 
				
			||||||
  4: ['check3.wav', 'check4.wav'],
 | 
					//   4: ['check3.wav', 'check4.wav'],
 | 
				
			||||||
  5: ['check5.wav', 'check6.wav'],
 | 
					//   5: ['check5.wav', 'check6.wav'],
 | 
				
			||||||
  6: ['check7.wav', 'check8.wav'],
 | 
					//   6: ['check7.wav', 'check8.wav'],
 | 
				
			||||||
  7: ['check9.wav', 'check10.wav'],
 | 
					//   7: ['check9.wav', 'check10.wav'],
 | 
				
			||||||
  8: ['check26.wav', 'check27.wav'],
 | 
					//   8: ['check26.wav', 'check27.wav'],
 | 
				
			||||||
  9: ['dianhuoVideo.wav', 'xihuoVideo.wav'],
 | 
					//   9: ['dianhuoVideo.wav', 'xihuoVideo.wav'],
 | 
				
			||||||
  10: ['check31.wav'],
 | 
					//   10: ['check31.wav'],
 | 
				
			||||||
  11: ['check30.wav'],
 | 
					//   11: ['check30.wav'],
 | 
				
			||||||
  12: ['check28.wav'],
 | 
					//   12: ['check28.wav'],
 | 
				
			||||||
  13: ['check29.wav'],
 | 
					//   13: ['check29.wav'],
 | 
				
			||||||
  14: ['check11.wav'],
 | 
					//   14: ['check11.wav'],
 | 
				
			||||||
  15: ['check12.wav'],
 | 
					//   15: ['check12.wav'],
 | 
				
			||||||
  16: ['check13.wav'],
 | 
					//   16: ['check13.wav'],
 | 
				
			||||||
  17: ['check14.wav'],
 | 
					//   17: ['check14.wav'],
 | 
				
			||||||
  18: ['check15.wav'],
 | 
					//   18: ['check15.wav'],
 | 
				
			||||||
  19: ['check16.wav'],
 | 
					//   19: ['check16.wav'],
 | 
				
			||||||
  20: ['check17.wav'],
 | 
					//   20: ['check17.wav'],
 | 
				
			||||||
  21: ['check18.wav'],
 | 
					//   21: ['check18.wav'],
 | 
				
			||||||
  22: ['check19.wav'],
 | 
					//   22: ['check19.wav'],
 | 
				
			||||||
  23: ['check22.wav'],
 | 
					//   23: ['check22.wav'],
 | 
				
			||||||
  24: ['check23.wav'],
 | 
					//   24: ['check23.wav'],
 | 
				
			||||||
  25: ['check20.wav', 'check21.wav'],
 | 
					//   25: ['check20.wav', 'check21.wav'],
 | 
				
			||||||
  26: ['check24.wav'],
 | 
					//   26: ['check24.wav'],
 | 
				
			||||||
  // 27:[],
 | 
					//   // 27:[],
 | 
				
			||||||
  // 28:[],
 | 
					//   // 28:[],
 | 
				
			||||||
  // 29:[],
 | 
					//   // 29:[],
 | 
				
			||||||
}
 | 
					// }
 | 
				
			||||||
 | 
					export const WarnFlagTipData = new Map<number, string[]>([
 | 
				
			||||||
 | 
					  [0, []],
 | 
				
			||||||
 | 
					  [1, []],
 | 
				
			||||||
 | 
					  [2, []],
 | 
				
			||||||
 | 
					  [3, ['check1.wav', 'check2.wav']],
 | 
				
			||||||
 | 
					  [4, ['check3.wav', 'check4.wav']],
 | 
				
			||||||
 | 
					  [5, ['check5.wav', 'check6.wav']],
 | 
				
			||||||
 | 
					  [6, ['check7.wav', 'check8.wav']],
 | 
				
			||||||
 | 
					  [7, ['check9.wav', 'check10.wav']],
 | 
				
			||||||
 | 
					  [8, ['check26.wav', 'check27.wav']],
 | 
				
			||||||
 | 
					  [9, ['dianhuoVideo.wav', 'xihuoVideo.wav']],
 | 
				
			||||||
 | 
					  [10, ['check31.wav']],
 | 
				
			||||||
 | 
					  [11, ['check30.wav']],
 | 
				
			||||||
 | 
					  [12, ['check28.wav']],
 | 
				
			||||||
 | 
					  [13, ['check29.wav']],
 | 
				
			||||||
 | 
					  [14, ['check11.wav']],
 | 
				
			||||||
 | 
					  [15, ['check12.wav']],
 | 
				
			||||||
 | 
					  [16, ['check13.wav']],
 | 
				
			||||||
 | 
					  [17, ['check14.wav']],
 | 
				
			||||||
 | 
					  [18, ['check15.wav']],
 | 
				
			||||||
 | 
					  [19, ['check16.wav']],
 | 
				
			||||||
 | 
					  [20, ['check17.wav']],
 | 
				
			||||||
 | 
					  [21, ['check18.wav']],
 | 
				
			||||||
 | 
					  [22, ['check19.wav']],
 | 
				
			||||||
 | 
					  [23, ['check22.wav']],
 | 
				
			||||||
 | 
					  [24, ['check23.wav']],
 | 
				
			||||||
 | 
					  [25, ['check20.wav', 'check21.wav']],
 | 
				
			||||||
 | 
					  [26, ['check24.wav']],
 | 
				
			||||||
 | 
					// 27:[],
 | 
				
			||||||
 | 
					// 28:[],
 | 
				
			||||||
 | 
					// 29:[],
 | 
				
			||||||
 | 
					]);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export const RealNumData = {
 | 
					export const RealNumData = {
 | 
				
			||||||
  3: 19,
 | 
					  3: 19,
 | 
				
			||||||
@ -154,7 +186,7 @@ export const RealNumData = {
 | 
				
			|||||||
  26: ''
 | 
					  26: ''
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export const DwMapData={
 | 
					export const DwMapData = {
 | 
				
			||||||
  14: '1',
 | 
					  14: '1',
 | 
				
			||||||
  15: '2',
 | 
					  15: '2',
 | 
				
			||||||
  16: '3',
 | 
					  16: '3',
 | 
				
			||||||
 | 
				
			|||||||
@ -98,6 +98,7 @@ export interface RouteParamsType {
 | 
				
			|||||||
  wayno?: string;
 | 
					  wayno?: string;
 | 
				
			||||||
  kString?: string;
 | 
					  kString?: string;
 | 
				
			||||||
  examItems?: string;
 | 
					  examItems?: string;
 | 
				
			||||||
 | 
					  fromIndex?: boolean;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// 车辆信息
 | 
					// 车辆信息
 | 
				
			||||||
 | 
				
			|||||||
@ -1,14 +1,14 @@
 | 
				
			|||||||
import { voiceService } from '../service/voiceService';
 | 
					 | 
				
			||||||
import router from '@ohos.router';
 | 
					import router from '@ohos.router';
 | 
				
			||||||
import { carConfigurationInfo, uploadExamCarCheckResult } from '../api/checkCar';
 | 
					import { carConfigurationInfo, uploadExamCarCheckResult } from '../api/checkCar';
 | 
				
			||||||
import TopLogo from './compontents/TopLogo';
 | 
					import TopLogo from './compontents/TopLogo';
 | 
				
			||||||
import testNapi from '@ohos.hiserialsdk';
 | 
					import testNapi from '@ohos.hiserialsdk';
 | 
				
			||||||
import { dateFormat } from '../common/utils/tools';
 | 
					import { dateFormat } from '../common/utils/tools';
 | 
				
			||||||
import { DwMapData, PassData, RealNumData, StackValueData, WarnFlagData, WarnFlagTipData } from '../mock';
 | 
					import { DwMapData, PassData, RealNumData, StackValueData, WarnFlagData, WarnFlagTipData } from '../mock';
 | 
				
			||||||
import { BaseInfoType } from '../model/Common';
 | 
					import { BaseInfoType, RouteParamsType } from '../model/Common';
 | 
				
			||||||
import { CarCheckDataType, CarConfigurationParams, CarInfoType } from '../model';
 | 
					import { CarCheckDataType, CarConfigurationParams, CarInfoType } from '../model';
 | 
				
			||||||
import { BusinessError } from '@ohos.base';
 | 
					import { BusinessError } from '@ohos.base';
 | 
				
			||||||
import { SpzdType } from '../model';
 | 
					import { SpzdType } from '../model';
 | 
				
			||||||
 | 
					import { voiceService } from '../utils/Voice';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@Entry
 | 
					@Entry
 | 
				
			||||||
@Component
 | 
					@Component
 | 
				
			||||||
@ -33,7 +33,7 @@ struct Index {
 | 
				
			|||||||
  @State @Watch('outClick') outFlag: boolean = false;
 | 
					  @State @Watch('outClick') outFlag: boolean = false;
 | 
				
			||||||
  @State passArray: object = PassData
 | 
					  @State passArray: object = PassData
 | 
				
			||||||
  @State stachValue: object = StackValueData
 | 
					  @State stachValue: object = StackValueData
 | 
				
			||||||
  @State warnFlagTip: object = WarnFlagTipData
 | 
					  @State warnFlagTip: Map<number, string[]> = WarnFlagTipData
 | 
				
			||||||
  @State realNum: object = RealNumData
 | 
					  @State realNum: object = RealNumData
 | 
				
			||||||
  @State dwMap: object = DwMapData
 | 
					  @State dwMap: object = DwMapData
 | 
				
			||||||
  @State fd: number = -1;
 | 
					  @State fd: number = -1;
 | 
				
			||||||
@ -41,7 +41,7 @@ struct Index {
 | 
				
			|||||||
  @State stopFlag: boolean = false
 | 
					  @State stopFlag: boolean = false
 | 
				
			||||||
  @State fromIndex: boolean = false
 | 
					  @State fromIndex: boolean = false
 | 
				
			||||||
  @State carInfo: CarInfoType = {}
 | 
					  @State carInfo: CarInfoType = {}
 | 
				
			||||||
  private vocObj: ESObject;
 | 
					  private vocObj: voiceService;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  // private AccountTable = new AccountTable(()=>{},CommonConstants);
 | 
					  // private AccountTable = new AccountTable(()=>{},CommonConstants);
 | 
				
			||||||
  aboutToAppear() {
 | 
					  aboutToAppear() {
 | 
				
			||||||
@ -62,7 +62,7 @@ struct Index {
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    });
 | 
					    });
 | 
				
			||||||
    let routParam: ESObject = router.getParams();
 | 
					    let routParam: RouteParamsType = router.getParams() as RouteParamsType;
 | 
				
			||||||
    this.fromIndex = routParam?.fromIndex || false
 | 
					    this.fromIndex = routParam?.fromIndex || false
 | 
				
			||||||
    this.carConfigurationInfoFn()
 | 
					    this.carConfigurationInfoFn()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -345,21 +345,23 @@ struct Index {
 | 
				
			|||||||
    this.passArray[this.index] = true
 | 
					    this.passArray[this.index] = true
 | 
				
			||||||
    this.passArray = JSON.parse(JSON.stringify(this.passArray))
 | 
					    this.passArray = JSON.parse(JSON.stringify(this.passArray))
 | 
				
			||||||
    this.subFlag = true
 | 
					    this.subFlag = true
 | 
				
			||||||
 | 
					    let name: string = this.warnFlagTip[this.index][0]
 | 
				
			||||||
    if (this.warnFlagTip[this.index].length == 1) {
 | 
					    if (this.warnFlagTip[this.index].length == 1) {
 | 
				
			||||||
      this.vocObj.playAudio({
 | 
					      this.vocObj.playAudio({
 | 
				
			||||||
        type: 1,
 | 
					        type: 1,
 | 
				
			||||||
        name: this.warnFlagTip[this.index][0],
 | 
					        name,
 | 
				
			||||||
      })
 | 
					      })
 | 
				
			||||||
    } else if (this.warnFlagTip[this.index].length == 2) {
 | 
					    } else if (this.warnFlagTip[this.index].length == 2) {
 | 
				
			||||||
      if (this.signArr[this.realNum[this.index]] && this.signArr[this.realNum[this.index]] != '0') {
 | 
					      if (this.signArr[this.realNum[this.index]] && this.signArr[this.realNum[this.index]] != '0') {
 | 
				
			||||||
 | 
					        name = this.warnFlagTip[this.index][1]
 | 
				
			||||||
        this.vocObj.playAudio({
 | 
					        this.vocObj.playAudio({
 | 
				
			||||||
          type: 1,
 | 
					          type: 1,
 | 
				
			||||||
          name: this.warnFlagTip[this.index][1],
 | 
					          name,
 | 
				
			||||||
        })
 | 
					        })
 | 
				
			||||||
      } else {
 | 
					      } else {
 | 
				
			||||||
        this.vocObj.playAudio({
 | 
					        this.vocObj.playAudio({
 | 
				
			||||||
          type: 1,
 | 
					          type: 1,
 | 
				
			||||||
          name: this.warnFlagTip[this.index][0],
 | 
					          name,
 | 
				
			||||||
        })
 | 
					        })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
 | 
				
			|||||||
@ -157,7 +157,7 @@ export class voiceService {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
interface playParams {
 | 
					interface playParams {
 | 
				
			||||||
  type: number,
 | 
					  type?: number,
 | 
				
			||||||
  name?: string,
 | 
					  name?: string,
 | 
				
			||||||
  url?: string,
 | 
					  url?: string,
 | 
				
			||||||
  value?: string[]
 | 
					  value?: string[]
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user