diff --git a/entry/src/main/ets/common/constants/USER.ts b/entry/src/main/ets/common/constants/USER.ts index f5d82a25..93a97f0d 100644 --- a/entry/src/main/ets/common/constants/USER.ts +++ b/entry/src/main/ets/common/constants/USER.ts @@ -25,7 +25,7 @@ CommonConstants { */ static readonly ACCOUNT_TABLE = { tableName: 'USER', - sqlCreate: 'CREATE TABLE IF NOT EXISTS USER(id INTEGER PRIMARY KEY AUTOINCREMENT,sfzmhm TEXT,xm CHAR(20), lsh TEXT, kszp TEXT,ksdd TEXT,kssycs TEXT,kslx TEXT,kscx TEXT,ksxl TEXT,ksy1 TEXT)', + sqlCreate: 'CREATE TABLE IF NOT EXISTS USER(id TEXT,sfzmhm TEXT,xm CHAR(20), lsh TEXT, kszp TEXT,ksdd TEXT,kssycs TEXT,kslx TEXT,kscx TEXT,ksxl TEXT,ksy1 TEXT)', columns: ['id','sfzmhm','xm','lsh','kszp','ksdd','kssycs','kslx','kscx','ksxl','ksy1'] }; diff --git a/entry/src/main/ets/common/service/indexService.ts b/entry/src/main/ets/common/service/indexService.ts index 75d5517f..7cf62104 100644 --- a/entry/src/main/ets/common/service/indexService.ts +++ b/entry/src/main/ets/common/service/indexService.ts @@ -261,9 +261,11 @@ export async function takePhotoFn(context) { if (param[key1]) { param.pztd = param[`td${Number(i) + 1}`] takePhoto(param, context, 'jt/', 0, (data) => { + if(data.errorCode!=0){ + console.log('拍照失败') + return + } if (Number(data.fileSize) <= (Number(param.zdyz) * 1000)) { - console.log('getPhtot0000') - map[key1] = true promptAction.showToast({ message: `视频遮挡`, diff --git a/entry/src/main/ets/common/service/videoService.ts b/entry/src/main/ets/common/service/videoService.ts index 3b5c1322..4d59d4c1 100644 --- a/entry/src/main/ets/common/service/videoService.ts +++ b/entry/src/main/ets/common/service/videoService.ts @@ -106,7 +106,8 @@ console.log('baoyihubaoyihu',video_uri,flag) // var snapResult = rtsp_server.getVideoSnapshot(context, video_uri, '', dir); if(flag==0){ rtsp_server.detectVideoSnapshotSize(video_uri,fileName,(err,snapResult)=>{ - console.log("baohaowen_detectLoop round end size1:"+snapResult.fileSize); + console.log("baohaowen_detectLoop round end size1:"+JSON.stringify(snapResult)); + //errorCode=0为正常 callback({fileSize:snapResult.fileSize,errorCode:snapResult.errorCode }) }); @@ -116,6 +117,7 @@ console.log('baoyihubaoyihu',video_uri,flag) return new Promise((resolve,reject)=>{ rtsp_server.getVideoSnapshot(context, video_uri, fileName,dir,true,(err,snapResult)=>{ console.log('baoyihubaoyihu',video_uri,flag,JSON.stringify(snapResult)) + //errorCode=-2拍照失败 console.log('getPhtot',JSON.stringify(snapResult)) resolve({base64: snapResult.dataString,name:snapResult.fileName,fileSize:snapResult.fileSize,errorCode:snapResult.errorCode }) });