harmony_car/subject-two
harmony_car/subject-two
4
0
Fork 3
Code Issues Pull Requests Packages Projects 1 Releases 45 Wiki Activity

fix: 优化多个组件中的代码逻辑和类型声明，提升代码一致性

Browse Source
This commit is contained in:
wangzhongjie 2025-04-09 09:59:39 +08:00
parent 232926e9c7
commit 63f4248e9f
8 changed files with 1549 additions and 1531 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
entry/src/main/ets/api/index.ets
View File

@ -87,7 +87,8 @@ export async function initCarInfoCache(params: initCarInfoCacheParams) {
//参数下发读表接口
export async function initCenterCache(params: object, url: string) {
const timeInfo: TimeSynchronizationRspBody = AppStorage.get<TimeSynchronizationRspBody>('timeInfo')
const timeInfo: TimeSynchronizationRspBody =
AppStorage.get<TimeSynchronizationRspBody>('timeInfo') ?? { /* default values */ };
return await request<object>({
url: '/para/initCenterCache.ws',
data: params,
@ -112,7 +113,8 @@ export async function initCenterCacheByKSPT(params: object, url: string) {
//从参数平台获取模型
// TODO 类型需要补全
export async function initEsModel(params: InitModelParams) {
const timeInfo: TimeSynchronizationRspBody = AppStorage.get<TimeSynchronizationRspBody>('timeInfo')
const timeInfo: TimeSynchronizationRspBody =
AppStorage.get<TimeSynchronizationRspBody>('timeInfo') ?? { /* default values */ };
return await request<InitModelResponse>({
url: '/para/initEsModel.ws',
data: params,

4
entry/src/main/ets/entryability/EntryAbility.ets
View File

@ -50,8 +50,8 @@ export default class EntryAbility extends UIAbility {
AppStorage.setOrCreate<string>('deviceNo', "") //设备号
AppStorage.setOrCreate<BaseInfoType>('baseInfo', {
hasAuth: false,
version: GlobalConfig.version.jn.km3[0],
judgeVersion: GlobalConfig.version.jn.km3[1],
version: GlobalConfig.version.jn.km3[0] || "",
judgeVersion: GlobalConfig.version.jn.km3[1] || "",
tcpSendNum: 0,
videoVersion: '1.0',
ratio: 1700 / 960, //适配比例

13
entry/src/main/ets/model/Common.ets
View File

@ -90,10 +90,11 @@ export interface BaseInfoType {
deviceNo?: string
}
interface kfdmObj{
xmdm:number
kfdm:string
interface kfdmObj {
xmdm: number
kfdm: string
}
// 路由参数
export interface RouteParamsType {
sczb?: string;
@ -150,7 +151,7 @@ export interface GlobalConfigType {
picSavePath?: string
videoSavePath?: string
host?: string
version?: VersionType
version: VersionType
// 几代机
modelNo?: string
}
@ -172,6 +173,6 @@ interface VersionInfo {
export interface centerCallBackMsgType {
id: number;
length: number;
body:number[];
sendId:number;
body: number[];
sendId: number;
}

2932
entry/src/main/ets/pages/Judge.ets
View File

File diff suppressed because it is too large Load Diff

22
entry/src/main/ets/pages/compontents/imageBtn.ets
View File

@ -2,11 +2,13 @@
export default struct imageBtn {
//状态变量unPressed，用于控制按钮的状态
@State unPressed: boolean = true
btnWidth: string | number
btnHeight: string | number
imgSrc:Resource
opacityNum:number=1
@Styles customStyle(){
btnWidth?: string | number
btnHeight?: string | number
imgSrc?: Resource
opacityNum: number = 1
@Styles
customStyle(){
.width('100%')
.height('100%')
}
@ -20,8 +22,7 @@ export default struct imageBtn {
// 判断当前组件为放开状态
if (this.unPressed) {
// 插入Row组件，配置过渡效果
Image(this.imgSrc)
// 水波纹扩散动画：Row组件backgroundColor属性变更（#fff -> #ccc），系统插入动画过渡效果，从组建的中心点开始放大，scale{0,0}变更scale{1,1}
Image(this.imgSrc)// 水波纹扩散动画：Row组件backgroundColor属性变更（#fff -> #ccc），系统插入动画过渡效果，从组建的中心点开始放大，scale{0,0}变更scale{1,1}
.transition({
type: TransitionType.Insert,
opacity: 0,
@ -38,10 +39,11 @@ export default struct imageBtn {
duration: 500,
// 聚拢动画播放完成后，需要衔接扩散动画，此时Row组件backgroundColor属性变更（#fff -> #ccc），插入动画过渡效果，scale{0,0}变化为scale{1,1}
onFinish: () => {
this.opacityNum=1
} },
this.opacityNum = 1
}
},
() => {
this.opacityNum=0.2
this.opacityNum = 0.2
})
})
}

32
entry/src/main/ets/utils/Voice.ets
View File

@ -6,14 +6,14 @@ import { VoiceTag } from '../config';
type AVPlayerCallback = (status: string, val?: string) => void;
export class voiceService {
private avPlayer: media.AVPlayer = null;
private avPlayer: media.AVPlayer | null = null;
private fileSize: number = -1;
private fd: number = 0;
private playerName: string = '';
private type: number = 1;
private endFlag: Boolean = false;
private mediaArray: Array<string> = [];
private callBack: AVPlayerCallback = null;
private callBack: AVPlayerCallback | null = null;
constructor(callBack: AVPlayerCallback) {
// 创建avPlayer实例对象
@ -30,14 +30,14 @@ export class voiceService {
console.log(VoiceTag, ' avPlayerFdSrc setAVPlayerCallback begin')
// error回调监听函数,当avPlayer在操作过程中出现错误时调用reset接口触发重置流程
this.avPlayer.on('error', (err: BusinessError) => {
this.avPlayer!.on('error', (err: BusinessError) => {
console.error(VoiceTag, `Invoke avPlayer failed, code is ${err.code}, message is ${err.message}`);
this.avPlayer.reset(); // 调用reset重置资源，触发idle状态
this.avPlayer!.reset(); // 调用reset重置资源，触发idle状态
})
// 状态机变化回调函数
this.avPlayer.on('stateChange', async (state, reason) => {
this.avPlayer!.on('stateChange', async (state, reason) => {
switch (state) {
case 'idle': // 成功调用reset接口后触发该状态机上报
// callBack('idle');
@ -55,7 +55,7 @@ export class voiceService {
break;
case 'initialized': // avplayer 设置播放源后触发该状态上报
console.info(VoiceTag, ' AVPlayerstate initialized called.');
this.avPlayer.prepare().then(() => {
this.avPlayer!.prepare().then(() => {
console.info(VoiceTag, ' AVPlayer prepare succeeded.');
}, (err: BusinessError) => {
console.error(VoiceTag, ` Invoke prepare failed, code is ${err.code}, message is ${err.message}`);
@ -63,7 +63,7 @@ export class voiceService {
callBack('initialized');
break;
case 'prepared': // prepare调用成功后上报该状态机
this.avPlayer.play();
this.avPlayer!.play();
callBack('prepared');
break;
case 'playing': // play成功调用后触发该状态机上报
@ -74,12 +74,12 @@ export class voiceService {
break;
case 'completed': // 播放结束后触发该状态机上报
console.info(VoiceTag, ' AVPlayer state completed called.');
this.avPlayer.stop(); //调用播放结束接口
this.avPlayer!.stop(); //调用播放结束接口
break;
case 'stopped': // stop接口成功调用后触发该状态机上报
console.info(VoiceTag, ' AVPlayer state stopped called.');
this.avPlayer.reset(); // 调用reset接口初始化avplayer状态
this.avPlayer!.reset(); // 调用reset接口初始化avplayer状态
// callBack('stopped');
break;
case 'released':
@ -97,14 +97,18 @@ export class voiceService {
// 以下为使用资源管理接口获取打包在HAP内的媒体资源文件并通过fdSrc属性进行播放示例
avPlayerFdSrc(name: string) {
const context: common.UIAbilityContext = AppStorage.get('context')
if (!context) {
console.log(VoiceTag, ' context is null');
return
}
context.resourceManager.getRawFd(name, async (error, value) => {
if (error != null) {
console.log(VoiceTag, ` callback getRawFd failed error code: ${error.code}, message: ${error.message}.`);
} else {
console.log(VoiceTag, this.avPlayer)
if (this.avPlayer) {
await this.avPlayer.reset()
this.avPlayer.fdSrc = value;
await this.avPlayer!.reset()
this.avPlayer!.fdSrc = value;
}
// 为fdSrc赋值触发initialized状态机上报
@ -116,15 +120,15 @@ export class voiceService {
// 以下为通过url设置网络地址来实现播放直播码流的
avPlayerLive(url: string) {
this.avPlayer.url = url
this.avPlayer!.url = url
}
releasePlayer() {
this.avPlayer && this.avPlayer.release();
this.avPlayer && this.avPlayer!.release();
}
avPlayerStop() {
this.avPlayer && this.avPlayer.stop((err: BusinessError) => {
this.avPlayer && this.avPlayer!.stop((err: BusinessError) => {
if (err == null) {
this.endFlag = true
console.info(VoiceTag, 'stop success');

6
entry/src/main/ets/utils/business/DrivingDataStorage.ets
View File

@ -33,10 +33,10 @@ class drivingDataStorage {
const content = await this.fileUtil!.readFile(`${this.folderPath}/${this.date}.txt`) || '';
const contentArr = content.split('\n').filter(item => item)
this.totalDistance = (this.totalDistance || 0) + (str * 1 > 200 ? 200 : str * 1);
this.totalTime += 1;
this.totalTime = (this.totalTime || 0) + 1;
contentArr[contentArr.length - 1] =
`程序启动时间：${this.time} 累计行驶距离:${(this.totalDistance ||
0).toFixed(2)}m 累计运行时常:${Math.ceil(this.totalTime /
0).toFixed(2)}m 累计运行时常:${Math.ceil((this.totalTime || 0) /
60)}min` + '\n'
}
@ -47,7 +47,7 @@ class drivingDataStorage {
// 关闭文件读写
public close() {
this.fileUtil.closeFile(`${this.folderPath}/${this.date}.txt`)
this.fileUtil!.closeFile(`${this.folderPath}/${this.date}.txt`)
}
}

65
entry/src/main/ets/utils/table/Operation.ets
View File

@ -11,7 +11,10 @@ import FileUtils from '../FileUtils';
// 建表操作
export async function InitTable() {
Object.keys(ParameterPlatform).forEach(async (item) => {
await DB.executeSql(ParameterPlatform.get(item).sqlCreate);
const platformItem = ParameterPlatform.get(item);
if (platformItem) {
await DB.executeSql(platformItem.sqlCreate);
}
});
}
@ -56,12 +59,16 @@ export function UpdateTableByArray(tableName: string, arr: Array<User>): Promise
//依据表名同步获取数据
export async function GetSyncData<T>(tableName: string): Promise<T[]> {
return new Promise((resolve, reject) => {
const columns: ColumnInfo[] = ParameterPlatform.get(tableName).columns.map((res: string) => {
const platform = ParameterPlatform.get(tableName);
if (!platform || !platform.columns) {
throw new Error(`Invalid tableName or columns not found for table: ${tableName}`);
}
const columns: ColumnInfo[] = platform.columns.map((res: string) => {
return {
name: res,
columnName: res,
type: ColumnType.STRING
} as ColumnInfo
} as ColumnInfo;
});
DB.queryListBySql<T>(`select * from ${tableName}`, columns).then((res: T[]) => {
resolve(res);
@ -87,7 +94,7 @@ export async function DeleteSyncTable(tableName: string): Promise<boolean> {
// 初始化中心表
export async function InitializeTheCentralTable(params: InitializeTheCentralTableType): Promise<boolean> {
return new Promise(async (resolve, reject) => {
const fileUtil = new FileUtils(params.context)
const fileUtil = new FileUtils(params.context!);
let flag = false
// 单机模式
if (params.singlePlay) {
@ -119,32 +126,34 @@ export async function InitializeTheCentralTable(params: InitializeTheCentralTabl
host: params.host
}
const res: ResponseDataType = await initialization(str)
if (!res || res.initializationRsp.head.resultCode == "1") {
resolve(false)
if (!res || !res.initializationRsp || res.initializationRsp.head.resultCode === "1") {
resolve(false);
}
for (const key of Object.keys(res.initializationRsp.body)) {
if (CenterMap[key]) {
continue
}
// TODO 后续替换类型
let arrList: ESObject[] = []
if (res.initializationRsp.body[key] instanceof Array) {
arrList = res.initializationRsp.body[key]
} else {
arrList.push(res.initializationRsp.body[key])
}
const folderPath = await fileUtil.initFolder(`/config/tableList`);
fileUtil.addFile(`${folderPath}/${RemappingTableName.get(key)}.txt`, JSON.stringify(arrList))
try {
const result = await SqlInsertTable(RemappingTableName.get(key), arrList)
if (!result) {
Prompt.showToast({
message: '初始化数据库失败'
})
if (res.initializationRsp && res.initializationRsp.body) {
for (const key of Object.keys(res.initializationRsp.body)) {
if (CenterMap[key]) {
continue
}
// TODO 后续替换类型
let arrList: ESObject[] = []
if (res.initializationRsp.body[key] instanceof Array) {
arrList = res.initializationRsp.body[key]
} else {
arrList.push(res.initializationRsp.body[key])
}
const folderPath = await fileUtil.initFolder(`/config/tableList`);
fileUtil.addFile(`${folderPath}/${RemappingTableName.get(key)}.txt`, JSON.stringify(arrList))
try {
const result = await SqlInsertTable(RemappingTableName.get(key)!, arrList);
if (!result) {
Prompt.showToast({
message: '初始化数据库失败'
})
}
resolve(result)
} catch (e) {
reject(e)
}
resolve(result)
} catch (e) {
reject(e)
}
}
})