fix: 抽离评判单独独立出来
This commit is contained in:
		
							parent
							
								
									cf0f2de7ab
								
							
						
					
					
						commit
						6edece72d9
					
				
							
								
								
									
										7
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								Makefile
									
									
									
									
									
								
							| @ -1,2 +1,7 @@ | ||||
| gitLog: | ||||
| 	  git log --since="2025-07-16 10:00" --until="2025-07-22 10:00"  --pretty=format:"<details>%n    <summary>%s</summary>%n     <span style=\"color: #888;\">[提交人]:</span><span style=\"color: #333;\">%an</span><br>%n     <span style=\"color: #888;\">[提交时间]:</span><span style=\"color: #333;\">%ad</span><br>%n    <span style=\"color: #888;\">[提交版本]:</span><span style=\"color: #333;\">%h</span>%n</details>%n" --date=format:"%Y-%m-%d %H:%M" > release_note.md | ||||
| 	  git log --since="2025-07-16 10:00" --until="2025-07-22 10:00"  --pretty=format:"<details>%n    <summary>%s</summary>%n     <span style=\"color: #888;\">[提交人]:</span><span style=\"color: #333;\">%an</span><br>%n     <span style=\"color: #888;\">[提交时间]:</span><span style=\"color: #333;\">%ad</span><br>%n    <span style=\"color: #888;\">[提交版本]:</span><span style=\"color: #333;\">%h</span>%n</details>%n" --date=format:"%Y-%m-%d %H:%M" > release_note.md | ||||
| re: | ||||
|     hdc shell mount -o remount,rw / | ||||
| pushJudge: | ||||
|     hdc file send  /Users/wangzhongjie/Desktop/duolun/openHarmony/car_next/ohos/so/libjudgesdk.z.so /system/lib/module/ | ||||
| 
 | ||||
|  | ||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -4,9 +4,6 @@ | ||||
|   "description": "Please describe the basic information.", | ||||
|   "main": "", | ||||
|   "author": "", | ||||
|   "license": "", | ||||
|   "dependencies": { | ||||
|     "libjudgesdk.so": "file:./src/cpp/libJudgeSdk" | ||||
|   } | ||||
|   "license": "" | ||||
| } | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										38
									
								
								entry/src/cpp/libJudgeSdk/Index.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										38
									
								
								entry/src/cpp/libJudgeSdk/Index.d.ts
									
									
									
									
										vendored
									
									
								
							| @ -1,38 +0,0 @@ | ||||
| export const examJudgeVersion: () => string; | ||||
| 
 | ||||
| export const examJudgeInit: (data: string, len: number) => number | ||||
| 
 | ||||
| export const examJudgeSetLogCallback: (level: number, handle: Function) => number | ||||
| 
 | ||||
| export const examJudgeRealExam: (plc: string, len: number) => number | ||||
| 
 | ||||
| export const examJudgeSetRealExamCallback: (callback: Function) => number | ||||
| 
 | ||||
| export const examJudgeMapImageSetCallback: (callback: Function) => number | ||||
| 
 | ||||
| export const examJudgeArtificialMark: (no: number, serial: string, type: number) => number | ||||
| 
 | ||||
| export const examJudgeArtificialItem: (no: number, type: number) => number | ||||
| 
 | ||||
| export const examJudgeMapSetDrawing: (flag: boolean) => number | ||||
| 
 | ||||
| export const examJudgeBeginExam: (data: string, len: number) => number | ||||
| 
 | ||||
| export const examJudgeEndExam: () => number | ||||
| 
 | ||||
| export const examJudgeDestroy: () => number | ||||
| 
 | ||||
| export const examJudgeMapSetParam: (width: number, height: number) => number | ||||
| 
 | ||||
| export const examJudgeMapSetScaling: (scale: number) => number | ||||
| 
 | ||||
| export const examJudgeSetPerformCallback: (callback: Function) => number | ||||
| 
 | ||||
| export const examJudgeSoundEnd: (no: number, code: string, type: number) => number | ||||
| 
 | ||||
| export const examCalcGpsDistance: (lng1: number, lat1: number, lng2: number, lat2: number, height: number) => number | ||||
| 
 | ||||
| export const examJudgeErrorInfo: (level: number) => number | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| @ -1,6 +0,0 @@ | ||||
| { | ||||
|   "name": "libjudgesdk.so", | ||||
|   "types": "./Index.d.ts", | ||||
|   "version": "1.0.0", | ||||
|   "description": "Please describe the basic information." | ||||
| } | ||||
| @ -1,4 +1,4 @@ | ||||
| import libJudgeSdk from 'libjudgesdk.so'; | ||||
| import libJudgeSdk from '@ohos.judgesdk'; | ||||
| import { JudgeBeginObj, JudgeInitObj, PLCType } from '../../model'; | ||||
| import { dConsole } from '../../utils/LogWorker'; | ||||
| 
 | ||||
| @ -35,7 +35,6 @@ export async function examJudgeSetLogCallback(level: number, handleLog: Function | ||||
|  * @desc评判初始化 | ||||
|  */ | ||||
| export async function examJudgeInit(data: JudgeInitObj) { | ||||
| 
 | ||||
|   const str = JSON.stringify(data); | ||||
|   const temp: number = libJudgeSdk.examJudgeInit(str, str.length); | ||||
|   return await handle(temp, 'examJudgeInit') | ||||
|  | ||||
| @ -1,12 +1,13 @@ | ||||
| import SignalDisplayComponent from './compontents/SignalDisplay'; | ||||
| import router from '@ohos.router'; | ||||
| import TabComponent from './compontents/Tab'; | ||||
| import { InitialPerLane } from '../mock'; | ||||
| import { PerLane } from '../model'; | ||||
| 
 | ||||
| @Entry | ||||
| @Component | ||||
| struct SignDisplayPage { | ||||
|   @State active: number = 0 | ||||
|   @Link laneSignal: PerLane | ||||
| 
 | ||||
|   build() { | ||||
|     Flex({ | ||||
| @ -43,7 +44,7 @@ struct SignDisplayPage { | ||||
| 
 | ||||
|       SignalDisplayComponent({ | ||||
|         active: this.active, | ||||
|         laneSignal: InitialPerLane | ||||
|         laneSignal: this.laneSignal | ||||
|       }) | ||||
|     } | ||||
|     .width('100%') | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| import { GPSData, InitialPerLane, SignalData } from '../../mock' | ||||
| import { GPSData, SignalData } from '../../mock'; | ||||
| import { | ||||
|   EnvironmentConfigurationType, | ||||
|   PerLane, | ||||
| @ -6,13 +6,14 @@ import { | ||||
|   SignalDataType, | ||||
|   WorkerBackMessage, | ||||
|   WorkerBackMessageType | ||||
| } from '../../model' | ||||
| import apiJudgeSdk from 'libJudgeSdk.so' | ||||
| } from '../../model'; | ||||
| // import apiJudgeSdk from 'libJudgeSdk.so' | ||||
| import apiJudgeSdk from '@ohos.judgesdk'; | ||||
| 
 | ||||
| import { DifferentialAndSignal } from '../../utils/business/DifferentialAndSignalWorker' | ||||
| import { examJudgeMapSetScaling } from '../Judge/JudgeUtils' | ||||
| import { dConsole } from '../../utils/LogWorker' | ||||
| import { SignDisplayTag } from '../../config' | ||||
| import { DifferentialAndSignal } from '../../utils/business/DifferentialAndSignalWorker'; | ||||
| import { examJudgeMapSetScaling } from '../Judge/JudgeUtils'; | ||||
| import { dConsole } from '../../utils/LogWorker'; | ||||
| import { SignDisplayTag } from '../../config'; | ||||
| 
 | ||||
| 
 | ||||
| @Component | ||||
| @ -226,8 +227,6 @@ struct trajectoryComponent { | ||||
| @Component | ||||
| struct LaneComponent { | ||||
|   @Link laneSignal: PerLane | ||||
| 
 | ||||
| 
 | ||||
|   private RoadData: Array<RoadDataType> = [ | ||||
|     { name: '路段组号', key: 'MapRoad_Code_No' }, | ||||
|     { name: '路段编码', key: 'MapRoad_Name' }, | ||||
|  | ||||
							
								
								
									
										48
									
								
								ohos/so/@ohos.judgesdk.d.ts
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										48
									
								
								ohos/so/@ohos.judgesdk.d.ts
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,48 @@ | ||||
| /** | ||||
|  * Provides interfaces to generate system logs. | ||||
|  * | ||||
|  * @namespace JudgeSDk | ||||
|  * @syscap SystemCapability.HiviewDFX.HiLog | ||||
|  * @crossplatform | ||||
|  * @HONGZOS 2.0 | ||||
|  */ | ||||
| 
 | ||||
| declare namespace Judge { | ||||
|   function examJudgeVersion(): string; | ||||
| 
 | ||||
|   function examJudgeInit(data: string, len: number): number; | ||||
| 
 | ||||
|   function examJudgeSetLogCallback(level: number, handle: Function): number; | ||||
| 
 | ||||
|   function examJudgeRealExam(plc: string, len: number): number; | ||||
| 
 | ||||
|   function examJudgeSetRealExamCallback(callback: Function): number; | ||||
| 
 | ||||
|   function examJudgeMapImageSetCallback(callback: Function): number; | ||||
| 
 | ||||
|   function examJudgeArtificialMark(no: number, serial: string, type: number): number; | ||||
| 
 | ||||
|   function examJudgeArtificialItem(no: number, type: number): number; | ||||
| 
 | ||||
|   function examJudgeMapSetDrawing(flag: boolean): number; | ||||
| 
 | ||||
|   function examJudgeBeginExam(data: string, len: number): number; | ||||
| 
 | ||||
|   function examJudgeEndExam(): number; | ||||
| 
 | ||||
|   function examJudgeDestroy(): number; | ||||
| 
 | ||||
|   function examJudgeMapSetParam(width: number, height: number): number; | ||||
| 
 | ||||
|   function examJudgeMapSetScaling(scale: number): number; | ||||
| 
 | ||||
|   function examJudgeSetPerformCallback(callback: Function): number; | ||||
| 
 | ||||
|   function examJudgeSoundEnd(no: number, code: string, type: number): number; | ||||
| 
 | ||||
|   function examCalcGpsDistance(lng1: number, lat1: number, lng2: number, lat2: number, height: number): number; | ||||
| 
 | ||||
|   function examJudgeErrorInfo(level: number): string; | ||||
| } | ||||
| 
 | ||||
| export default Judge; | ||||
							
								
								
									
										
											BIN
										
									
								
								ohos/so/libjudgesdk.z.so
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								ohos/so/libjudgesdk.z.so
									
									
									
									
									
										Executable file
									
								
							
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user