Compare commits

...

4 Commits

6 changed files with 202 additions and 81 deletions

View File

@ -5,7 +5,7 @@ import { dateFormat } from '../utils/tools'
import FileUtil from '../../common/utils/File' import FileUtil from '../../common/utils/File'
import AccountTable from '../../common/database/tables/AccountTable' import AccountTable from '../../common/database/tables/AccountTable'
import MA_SYSSET from '../../common/constants/MA_SYSSET' import MA_SYSSET from '../../common/constants/MA_SYSSET'
import { takePhoto } from '../../common/service/videoService' import { takePhoto,deleteAllFileByPiC } from '../../common/service/videoService'
import { import {
delSyncTable, delSyncTable,
@ -46,6 +46,7 @@ export async function deleteAllFIleLog(path){
"recursion": false, "recursion": false,
"listNum": 0, "listNum": 0,
}; };
let filenames = fs.listFileSync(path, options); let filenames = fs.listFileSync(path, options);
console.info("listFile succeed",JSON.stringify(filenames)); console.info("listFile succeed",JSON.stringify(filenames));
for (let i = 0; i < filenames.length; i++) { for (let i = 0; i < filenames.length; i++) {
@ -64,14 +65,35 @@ export async function deleteAllFIleLog(path){
} }
} }
export async function delHilog(){
console.log('kkkkmmm1')
const fileUtil = new FileUtil(globalThis.context)
const data = await fileUtil.readFile(GlobalConfig.comoonfileWriteAddress + '/config/hilogTime.txt');
const folderPath = await fileUtil.initFolder(`/config`);
console.log('kkkkmmm2',data)
if(data === '' || data === undefined){
const date=dateFormat(new Date()).split(' ')[0]
console.log('mm'.date)
fileUtil.addFile(`${folderPath}/hilogTime.txt`, date)
}else{
console.log('kkkkmmm2',data)
console.log('datadata',data,isSevenDaysAgo(data))
if(isSevenDaysAgo(data)){
const date=dateFormat(new Date()).split(' ')[0]
fileUtil.addFile(`${folderPath}/hilogTime.txt`, date)
deleteAllFileByPiC('pz',1)
// fileUtil.addFile(`${folderPath}/hilogTime.txt`, JSON.stringify(num))
}
}
}
function isSevenDaysAgo(date) { function isSevenDaysAgo(date) {
const today = new Date(); // 当前日期 const today = new Date(); // 当前日期
const target = new Date(date); // 需要判断的日期 const target = new Date(date); // 需要判断的日期
console.info("listFile succeed1",JSON.stringify(target)); console.info("listFile succeed1",JSON.stringify(target));
const diff = today.getTime() - target.getTime(); // 计算两个日期之间的毫秒数差异 const diff = today.getTime() - target.getTime(); // 计算两个日期之间的毫秒数差异
const diffDays = diff / (1000 * 60 * 60 * 24); // 将毫秒转换为天数 const diffDays = diff / (1000 * 60 * 60 * 24); // 将毫秒转换为天数
console.info("listFile succeed2",JSON.stringify(diffDays)); console.info("listFile succeed2",(diffDays));
// 如果差异天数正好是7则原日期是当前日期的前七天 // 如果差异天数正好是7则原日期是当前日期的前七天
return diffDays > 7; return diffDays > 7;
} }

View File

@ -5,10 +5,12 @@ import fs from '@ohos.file.fs'
// @ts-ignore // @ts-ignore
import photoAccessHelper from '@ohos.file.photoAccessHelper' import photoAccessHelper from '@ohos.file.photoAccessHelper'
import dataSharePredicates from '@ohos.data.dataSharePredicates' import dataSharePredicates from '@ohos.data.dataSharePredicates'
import { getCurrentTime } from '../utils/tools' import { dateFormat, getCurrentTime, isSevenDaysAgo } from '../utils/tools'
// import rtsp_server from '@ohos.rtsprecord'; // import rtsp_server from '@ohos.rtsprecord';
import record from '@ohos.rtsprecord'; import record from '@ohos.rtsprecord';
import { FileHelper } from './FileHelper'; import { FileHelper } from './FileHelper';
import FileUtil from '../utils/File';
import { GlobalConfig } from '../../config';
const rtsp_server = record.createServer(); const rtsp_server = record.createServer();
//开始录屏 //开始录屏
@ -28,22 +30,30 @@ photoAccessHelper.PhotoKeys.TITLE,
photoAccessHelper.PhotoKeys.POSITION, photoAccessHelper.PhotoKeys.POSITION,
photoAccessHelper.PhotoKeys.DATE_TRASHED, photoAccessHelper.PhotoKeys.DATE_TRASHED,
photoAccessHelper.PhotoKeys.HIDDEN]; photoAccessHelper.PhotoKeys.HIDDEN];
// const rtsp_server = record.createServer(); // const rtsp_server = record.createServer();
export async function startRecordVideo(param, td, context, dir) { export async function startRecordVideo(param, td, context, dir, path?) {
return new Promise((reslove, reject) => { return new Promise(async (reslove, reject) => {
// const fileUtil = new FileUtil(globalThis.context)
// const date=dateFormat(new Date).split(' ')[0]
// const folderPath = await fileUtil.initFolder(`/PLC/${date}/${dir}`);
var video_uri = `rtsp://${param.userName}:${param.pwd}@${param.ip}:${param.port}/h264/ch${td}/main/av_stream`; var video_uri = `rtsp://${param.userName}:${param.pwd}@${param.ip}:${param.port}/h264/ch${td}/main/av_stream`;
if (rtsp_server != null) { if (rtsp_server != null) {
console.log(`Rtsprecord startRecordVideo begin,video_uri`, video_uri); console.log(`Rtsprecord startRecordVideo begin,video_uri`, video_uri);
const num = Math.floor(Math.random() * 10000) const num = Math.floor(Math.random() * 10000)
const fileName = `movie_record${num}.mp4` let fileName
if (!path) {
fileName = `movie_record${num}.mp4`
} else {
fileName = `${path}.mp4`
}
// @ts-ignore // @ts-ignore
var recordResult = rtsp_server.startRecordVideo(context, video_uri, fileName, dir); var recordResult = rtsp_server.startRecordVideo(context, video_uri, fileName, dir);
const handleId = recordResult.dataInt; const handleId = recordResult.dataInt;
console.log(`Rtsprecord startRecordVideo begin,handleId`, handleId);
reslove(handleId) reslove(handleId)
console.log(`Rtsprecord startRecordVideo record_handle` + recordResult.dataInt);
} }
else { else {
console.log(`Rtsprecord startRecordVideo rtsp_server isnull`); console.log(`Rtsprecord startRecordVideo rtsp_server isnull`);
@ -55,21 +65,93 @@ export async function startRecordVideo(param, td, context, dir) {
} }
//结束录屏 //结束录屏
export async function endRecordVideo(record_handle) { export async function endRecordVideo(record_handleObj) {
if (rtsp_server != null && record_handle > 0) { for (let key in record_handleObj) {
if (rtsp_server != null && record_handleObj[key] > 0) {
console.log(`Rtsprecord endRecordVideo begin`); console.log(`Rtsprecord endRecordVideo begin`);
// @ts-ignore // @ts-ignore
var recordResult = rtsp_server.endRecordVideo(record_handle); var recordResult = rtsp_server.endRecordVideo(record_handleObj[key]);
console.log(`Rtsprecord startRecordVideo record_handle` + recordResult.dataInt + ` filename:` + recordResult.fileName); console.log(`Rtsprecord endRecordVideo record_handle` + record_handleObj[key].dataInt + ` filename:` + record_handleObj[key].fileName);
} }
else { else {
console.log(`Rtsprecord endRecordVideo handleId isnull`); console.log(`Rtsprecord endRecordVideo handleId isnull`);
} }
// var result = onvifclient.endRecordVideo(record_handle); }
// fs.closeSync(record_handle);
// file_asset.close(record_handle);
} }
export async function saveStartRecordVideo(path) {
return new Promise(async (reslove, reject) => {
const fileUtil = new FileUtil(globalThis.context)
const fileHelper = new FileHelper();
const date = dateFormat(new Date).split(' ')[0]
fileHelper.createAlbum(date);
// const folderPath = await fileUtil.initFolder(`/${path}/${date}`);
const data = await fileUtil.readFile(GlobalConfig.comoonfileWriteAddress + '/config/config3.txt');
const param = JSON.parse(data)
const record_handle = {
1: 0,
2: 1,
3: 2,
4: 3
}
for (let i = 1; i <= 4; i++) {
if (param['videoRecord'+i]) {
console.log('pathpath0',path)
record_handle[i] = await getfilehandleCode(i, param, date, path)
}
}
reslove(record_handle)
})
}
async function getfilehandleCode(td, param, dir, path) {
return new Promise(async (reslove, reject) => {
console.log('pathpath1',path)
const record_handle = await startRecordVideo(param, td, globalThis.context, dir, path)
// this.rocordHandleObj['rocord_handle'+td] = record_handle
reslove(record_handle)
})
}
export async function getUserAlbumItemByDisplayName(displayName: string): Promise<photoAccessHelper.Album> {
let fetchResult = null
let album: photoAccessHelper.Album = null
try {
console.log('getUserAlbumItemByDisplayName');
let predicates = new dataSharePredicates.DataSharePredicates();
predicates.equalTo(photoAccessHelper.AlbumKeys.ALBUM_NAME, displayName)
let fetchOptions = {
fetchColumns: [],
predicates: predicates
};
const userFileMgr = photoAccessHelper.getPhotoAccessHelper(globalThis.context);
fetchResult = await userFileMgr.getAlbums(photoAccessHelper.AlbumType.USER, photoAccessHelper.AlbumSubtype.USER_GENERIC, fetchOptions);
console.log('get getUserAlbumItemByDisplayName, count: ' + JSON.stringify(fetchResult));
if (fetchResult.getCount() > 0) {
const albums = await fetchResult.getLastObject();
if(isSevenDaysAgo(albums.albumName)){
deleteAllFileByPiC(albums.albumName,2)
}
console.log('get getUserAlbumItemByDisplayName album',)
}
} catch (err) {
console.log('get Album getUserAlbumItemByDisplayName fetchResult failed with err: ' + err);
} finally {
if (fetchResult != null) {
fetchResult.close();
}
}
return album;
}
/** /**
* *
* @param param * @param param
@ -82,6 +164,7 @@ interface takePhotoParam {
fileSize?: number, fileSize?: number,
errorCode?: number errorCode?: number
} }
/** /**
* *
* @param param * @param param
@ -92,6 +175,7 @@ interface takePhotoParam {
* @returns * @returns
*/ */
const fileHelper = new FileHelper(); const fileHelper = new FileHelper();
export async function takePhoto(param, context, dir, flag = 1, callback?) { export async function takePhoto(param, context, dir, flag = 1, callback?) {
var video_uri = `rtsp://${param.userName}:${param.pwd}@${param.ip}:${param.port}/h264/ch${param.pztd}/main/av_stream`; var video_uri = `rtsp://${param.userName}:${param.pwd}@${param.ip}:${param.port}/h264/ch${param.pztd}/main/av_stream`;
@ -117,7 +201,12 @@ console.log('baoyihubaoyihu',video_uri,flag)
rtsp_server.getVideoSnapshot(context, video_uri, fileName, dir, true, (err, snapResult) => { rtsp_server.getVideoSnapshot(context, video_uri, fileName, dir, true, (err, snapResult) => {
console.log('baoyihubaoyihu', video_uri, flag, JSON.stringify(snapResult)) console.log('baoyihubaoyihu', video_uri, flag, JSON.stringify(snapResult))
console.log('getPhtot', JSON.stringify(snapResult)) console.log('getPhtot', JSON.stringify(snapResult))
resolve({base64: snapResult.dataString,name:snapResult.fileName,fileSize:snapResult.fileSize,errorCode:snapResult.errorCode }) resolve({
base64: snapResult.dataString,
name: snapResult.fileName,
fileSize: snapResult.fileSize,
errorCode: snapResult.errorCode
})
}); });
}) })
console.log('getmyLog02') console.log('getmyLog02')
@ -127,6 +216,7 @@ console.log('baoyihubaoyihu',video_uri,flag)
} }
//type:1 是图片 2是视频 //type:1 是图片 2是视频
export async function deleteAllFileByPiC(dirName, type = 1) { export async function deleteAllFileByPiC(dirName, type = 1) {
// const fileHelper = new FileHelper(); // const fileHelper = new FileHelper();

View File

@ -93,12 +93,13 @@ export class voiceService {
// 以下为使用资源管理接口获取打包在HAP内的媒体资源文件并通过fdSrc属性进行播放示例 // 以下为使用资源管理接口获取打包在HAP内的媒体资源文件并通过fdSrc属性进行播放示例
avPlayerFdSrc(name) { avPlayerFdSrc(name) {
globalThis.context.resourceManager.getRawFd(name, (error, value) => { globalThis.context.resourceManager.getRawFd(name,async (error, value) => {
if (error != null) { if (error != null) {
console.log(`jiangsong callback getRawFd failed error code: ${error.code}, message: ${error.message}.`); console.log(`jiangsong callback getRawFd failed error code: ${error.code}, message: ${error.message}.`);
} else { } else {
console.log('jiangsongjiangsong',this.avPlayer) console.log('jiangsongjiangsong',this.avPlayer)
if (this.avPlayer) { if (this.avPlayer) {
await this.avPlayer.reset()
this.avPlayer.fdSrc = value; this.avPlayer.fdSrc = value;
} }

View File

@ -2,7 +2,18 @@
import systemTime from '@ohos.systemDateTime'; import systemTime from '@ohos.systemDateTime';
import { expect } from '@ohos/hypium'; import { expect } from '@ohos/hypium';
import FileUtil from './File'; import FileUtil from './File';
export function isSevenDaysAgo(date) {
const today = new Date(); // 当前日期
const target = new Date(date); // 需要判断的日期
console.info("listFile succeed1",JSON.stringify(target));
const diff = today.getTime() - target.getTime(); // 计算两个日期之间的毫秒数差异
const diffDays = diff / (1000 * 60 * 60 * 24); // 将毫秒转换为天数
console.info("listFile succeed2",JSON.stringify(diffDays));
// 如果差异天数正好是7则原日期是当前日期的前七天
console.log('diffDays',diffDays)
return diffDays > 7;
}
export async function writeLog(path,param){ export async function writeLog(path,param){
return return
const fileUtil = new FileUtil(globalThis.context) const fileUtil = new FileUtil(globalThis.context)

View File

@ -11,7 +11,7 @@ import { getUDP, getUDP2 } from '../common/utils/GlobalUdp';
import { initJudgeUdp } from '../common/utils/UdpJudge'; import { initJudgeUdp } from '../common/utils/UdpJudge';
import { judgeConfig } from './judgeSDK/utils/judgeConfig'; import { judgeConfig } from './judgeSDK/utils/judgeConfig';
import { getTCP } from '../common/utils/GlobalTcp'; import { getTCP } from '../common/utils/GlobalTcp';
import { getliushuiNum, setliushuiNum, takePhotoFn, deleteAllFIleLog } from '../common/service/indexService'; import { getliushuiNum, setliushuiNum, takePhotoFn, delHilog } from '../common/service/indexService';
import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl'; import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
import worker, { MessageEvents } from '@ohos.worker'; import worker, { MessageEvents } from '@ohos.worker';
import promptAction from '@ohos.promptAction' import promptAction from '@ohos.promptAction'
@ -19,6 +19,7 @@ import { voiceService } from '../common/service/voiceService';
import errorMsgDialog from './compontents/errorMsgDialog' import errorMsgDialog from './compontents/errorMsgDialog'
import { getSyncData } from '../common/service/initable'; import { getSyncData } from '../common/service/initable';
import GetDistance from '../common/utils/GetDistance' import GetDistance from '../common/utils/GetDistance'
import UIAbility from '@ohos.app.ability.UIAbility';
// import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements'; // import VoiceAnnounce from './judgeSDK/utils/voiceAnnouncements';
@ -369,19 +370,23 @@ struct Index {
async onPageShow() { async onPageShow() {
console.log('ttttt', 1111) console.log('ttttt', 1111)
this.userAuth(); this.userAuth();
let resourceManager = this.context.resourceManager;
this.vocObj = new voiceService(async (status, val, next) => { this.vocObj = new voiceService(async (status, val, next) => {
}); });
console.log('globalThis.singlePlay', globalThis.singlePlay) console.log('globalThis.singlePlay', globalThis.singlePlay)
if (globalThis.singlePlay == undefined || globalThis.singlePlay == null) { if (globalThis.singlePlay == undefined || globalThis.singlePlay == null) {
console.log('tttttttt') this.context.resourceManager.getRawFileContent("welcome.wav").then(value => {
setTimeout(()=>{
this.vocObj.playAudio({ this.vocObj.playAudio({
type: 1, type: 1,
name: 'welcome.wav' name: 'welcome.wav'
}) })
},500) // let rawFile = value;
}).catch(error => {
console.log("getRawFileContent promise error is " + error);
});
globalThis.singlePlay = false globalThis.singlePlay = false
} }
this.isSingle = globalThis.singlePlay this.isSingle = globalThis.singlePlay
@ -425,6 +430,8 @@ struct Index {
} }
async initParams() { async initParams() {
console.log('kkkkmmm')
delHilog()
// deleteAllFIleLog(GlobalConfig.comoonfileWriteAddress + '/PLC/') // deleteAllFIleLog(GlobalConfig.comoonfileWriteAddress + '/PLC/')
//设置plc udp 同步requesthost //设置plc udp 同步requesthost
await getUDP(this.context, false) await getUDP(this.context, false)
@ -451,16 +458,6 @@ struct Index {
if (this.num >= 3) { if (this.num >= 3) {
this.heartMsg() this.heartMsg()
} }
// const data=AppStorage.Get('errorMsg');
// console.log('1123',data,globalThis.type,globalThis.dialogOpen)
// if(data==1){
// if(globalThis.type=='3'&&!globalThis.dialogOpen){
// globalThis.dialogOpen=true
// this.errorDialog.open()
// }else if(globalThis.type=='1'){
// this.errorDialog.open()
// }
// }
}, 1000) }, 1000)
//下载模型 //下载模型
// await this.getModel() // await this.getModel()

View File

@ -1444,7 +1444,7 @@ export default class Judge {
const msgStr = strArr[num]; const msgStr = strArr[num];
if(msgStr == ''){ if(msgStr == ''){
console.info(judgeTag, '模拟数据考试结束') console.info(judgeTag, '模拟数据考试结束')
globalThis.windowClass.setWindowSystemBarEnable(['navigation']) // globalThis.windowClass.setWindowSystemBarEnable(['navigation'])
clearInterval(judgeTimer) clearInterval(judgeTimer)
this.checkExamIsEnd(true) this.checkExamIsEnd(true)
return return