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

feat: 完善错误处理打印

Browse Source
This commit is contained in:
wangzhongjie 2025-03-28 14:06:56 +08:00
parent b04ab92f9b
commit 63bc3f42d6
6 changed files with 141 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
entry/src/main/ets/config/LogEnum.ets
View File

@ -1,5 +1,6 @@
export const DbTag = '[DBTag]'; export const DbTag = '[DBTag]';
// 串口 tag
export const SerialPortTag = '[SerialPortTag]'; export const SerialPortTag = '[SerialPortTag]';
// usb tag // usb tag
@ -18,4 +19,7 @@ export const FileTag = '[FileTag]';
export const TCPTag = '[TcpClient]'; export const TCPTag = '[TcpClient]';
//udp tag //udp tag
export const UDPTag = '[UdpClient]'; export const UDPTag = '[UdpClient]';
//fileHelp tag
export const FileHelpTag = '[FileHelp]';

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

@ -3,7 +3,6 @@ import hilog from '@ohos.hilog';
import window from '@ohos.window'; import window from '@ohos.window';
import { GlobalConfig } from '../config/global'; import { GlobalConfig } from '../config/global';
import { initTable } from '../common/service/initable'; import { initTable } from '../common/service/initable';
import { centerUDPClient, lightUDPClient, objUDPClient } from '../utils/UdpUtils';
import Want from '@ohos.app.ability.Want'; import Want from '@ohos.app.ability.Want';
import AbilityConstant from '@ohos.app.ability.AbilityConstant'; import AbilityConstant from '@ohos.app.ability.AbilityConstant';
import { BaseInfoType, CarInfoType, ExaminerInfoType } from '../model'; import { BaseInfoType, CarInfoType, ExaminerInfoType } from '../model';
@ -33,10 +32,6 @@ export default class EntryAbility extends UIAbility {
} }
async onWindowStageCreate(windowStage: window.WindowStage) { async onWindowStageCreate(windowStage: window.WindowStage) {
// 初始化示例，只需要调用一次
await objUDPClient.init(this.context)
await lightUDPClient.init(this.context)
await centerUDPClient.init(this.context)
// this.context // this.context
// Main window is created, set main page for this ability // Main window is created, set main page for this ability
hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate'); hilog.info(0x0000, 'testTag', '%{public}s', 'Ability onWindowStageCreate');

11
entry/src/main/ets/utils/Common.ets
View File

@ -1,4 +1,4 @@
import dayTs from "./Date"; import dayTs from './Date';
enum timeType { enum timeType {
fulltime = 1 fulltime = 1
@ -44,15 +44,6 @@ export function StringToBytes(str: string): Uint8Array {
} }
return bytes; return bytes;
} }
// import {
// Array2Byte,
// convertGpsCoord2,
// deepClone,
// fillZero,
// getCurrentTime,
// string2Bytes,
// stringToASC
// } from '../../common/utils/tools';
/** /**
* 字符串转ASCII码 * 字符串转ASCII码

30
entry/src/main/ets/utils/DbSql.ets
View File

@ -1,7 +1,7 @@
import relationalStore from '@ohos.data.relationalStore' import relationalStore from '@ohos.data.relationalStore'
import common from '@ohos.app.ability.common' import common from '@ohos.app.ability.common'
import { BusinessError } from '@ohos.base' import { BusinessError } from '@ohos.base'
import { DbTag } from "../config" import { DbTag } from '../config'
export interface ColumnInfo { export interface ColumnInfo {
name: string, name: string,
@ -27,11 +27,11 @@ class DbUtils {
relationalStore.getRdbStore(context, config) relationalStore.getRdbStore(context, config)
.then(rdbStore => { .then(rdbStore => {
this.rdbStore = rdbStore this.rdbStore = rdbStore
console.info("db rdbStore init success") console.log(DbTag, "db rdbStore init success")
resolve() resolve()
}) })
.catch((err: BusinessError) => { .catch((err: BusinessError) => {
console.error(`db rdbStore init fail reason:${err}`); console.error(DbTag, `db rdbStore init fail reason:${err}`);
reject(err) reject(err)
}) })
@ -44,11 +44,11 @@ class DbUtils {
if (this.rdbStore) { if (this.rdbStore) {
this.rdbStore?.executeSql(createSql) this.rdbStore?.executeSql(createSql)
.then(() => { .then(() => {
console.info("sql createTable success") console.log(DbTag, "sql createTable success")
resolve() resolve()
}) })
.catch((err: BusinessError) => { .catch((err: BusinessError) => {
console.error(`sql createTable fail err:${JSON.stringify(err)}`); console.error(DbTag, `sql createTable fail err:${JSON.stringify(err)}`);
reject(err) reject(err)
}) })
} else { } else {
@ -92,10 +92,10 @@ class DbUtils {
if (this.rdbStore) { if (this.rdbStore) {
this.rdbStore?.insert(tableName, obj, (err, res) => { this.rdbStore?.insert(tableName, obj, (err, res) => {
if (err) { if (err) {
console.error(`sql insertData fail err:${JSON.stringify(err)}`); console.error(DbTag, `sql insertData fail err:${JSON.stringify(err)}`);
reject(err) reject(err)
} else { } else {
console.info(`sql insertData success res:${res}`); console.log(DbTag, `sql insertData success res:${res}`);
resolve(res) resolve(res)
} }
}) })
@ -113,7 +113,7 @@ class DbUtils {
console.log(DbTag, "删除表成功!表名:", tableName) console.log(DbTag, "删除表成功!表名:", tableName)
resolve(true) resolve(true)
}).catch((err: BusinessError) => { }).catch((err: BusinessError) => {
console.log(DbTag, "删除表失败!表名:", tableName, "错误信息:", JSON.stringify(err)) console.error(DbTag, "删除表失败!表名:", tableName, "错误信息:", JSON.stringify(err))
reject(false) reject(false)
}) })
}) })
@ -132,7 +132,7 @@ class DbUtils {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (this.rdbStore) { if (this.rdbStore) {
this.rdbStore.querySql(sql, []).then((res: relationalStore.ResultSet) => { this.rdbStore.querySql(sql, []).then((res: relationalStore.ResultSet) => {
console.log("sql query", JSON.stringify(res)) console.log(DbTag, "sql query", JSON.stringify(res))
if (res.rowCount <= 0) { if (res.rowCount <= 0) {
resolve(null) resolve(null)
} else { } else {
@ -140,7 +140,7 @@ class DbUtils {
resolve(res.getLong(0) as T) resolve(res.getLong(0) as T)
} }
}).catch((err: BusinessError) => { }).catch((err: BusinessError) => {
console.error(`sql queryCount fail err:${JSON.stringify(err)}`); console.error(DbTag, `sql queryCount fail err:${JSON.stringify(err)}`);
reject(err) reject(err)
}) })
} else { } else {
@ -155,10 +155,10 @@ class DbUtils {
if (this.rdbStore) { if (this.rdbStore) {
this.rdbStore?.query(predicates, columns.map(info => info.columnName), (err, result) => { this.rdbStore?.query(predicates, columns.map(info => info.columnName), (err, result) => {
if (err) { if (err) {
console.error(`sql queryForList fail err:${JSON.stringify(err)}`); console.error(DbTag, `sql queryForList fail err:${JSON.stringify(err)}`);
reject(err) reject(err)
} else { } else {
console.info(`sql queryForList success rows: ${result.rowCount.toString()}`) console.log(DbTag, `sql queryForList success rows: ${result.rowCount.toString()}`)
resolve(this.parseResultSet(result, columns)) resolve(this.parseResultSet(result, columns))
} }
}) })
@ -174,7 +174,7 @@ class DbUtils {
if (this.rdbStore) { if (this.rdbStore) {
this.rdbStore?.querySql(sql, [], (err, result) => { this.rdbStore?.querySql(sql, [], (err, result) => {
if (err) { if (err) {
console.error(`sql queryForListBySql fail err:${JSON.stringify(err)}`); console.error(DbTag, `sql queryForListBySql fail err:${JSON.stringify(err)}`);
reject(err) reject(err)
} else { } else {
resolve(this.parseResultSet(result, columns)) resolve(this.parseResultSet(result, columns))
@ -224,11 +224,11 @@ class DbUtils {
if (this.rdbStore) { if (this.rdbStore) {
this.rdbStore?.delete(predicates) this.rdbStore?.delete(predicates)
.then(rows => { .then(rows => {
console.info(`DbUtil delete success rows: ${rows.toString()}`) console.log(DbTag, `DbUtil delete success rows: ${rows.toString()}`)
resolve(rows) resolve(rows)
}) })
.catch((err: BusinessError) => { .catch((err: BusinessError) => {
console.error(`DbUtil delete fail err:${JSON.stringify(err)}`); console.error(DbTag, `DbUtil delete fail err:${JSON.stringify(err)}`);
reject(err) reject(err)
}) })
} else { } else {

99
entry/src/main/ets/utils/FileHelp.ets
View File

@ -2,6 +2,7 @@ import photoAccessHelper from '@ohos.file.photoAccessHelper';
import dataSharePredicates from '@ohos.data.dataSharePredicates'; import dataSharePredicates from '@ohos.data.dataSharePredicates';
import common from '@ohos.app.ability.common'; import common from '@ohos.app.ability.common';
import { BusinessError } from '@ohos.base'; import { BusinessError } from '@ohos.base';
import { FileHelpTag } from '../config';
export class FileHelper { export class FileHelper {
FILE_ASSET_FETCH_COLUMNS = [ FILE_ASSET_FETCH_COLUMNS = [
@ -30,7 +31,7 @@ export class FileHelper {
} }
public async queryPhotoByDisplayName(displayName: string) { public async queryPhotoByDisplayName(displayName: string) {
console.log('baoyihu queryPhotoByDisplayName begin DISPLAY_NAME:' + displayName); console.log(FileHelpTag, ' queryPhotoByDisplayName begin DISPLAY_NAME:' + displayName);
try { try {
let predicates = new dataSharePredicates.DataSharePredicates(); let predicates = new dataSharePredicates.DataSharePredicates();
predicates.equalTo(photoAccessHelper.PhotoKeys.DISPLAY_NAME, displayName) predicates.equalTo(photoAccessHelper.PhotoKeys.DISPLAY_NAME, displayName)
@ -41,15 +42,15 @@ export class FileHelper {
let assetsResult = await this.userFileMgr.getAssets(fetchOptions); let assetsResult = await this.userFileMgr.getAssets(fetchOptions);
let retCount = assetsResult.getCount(); let retCount = assetsResult.getCount();
console.log('baoyihu queryPhotoByDisplayName count: ' + retCount); console.log(FileHelpTag, ' queryPhotoByDisplayName count: ' + retCount);
if (retCount > 0) { if (retCount > 0) {
let asset = await assetsResult.getFirstObject(); let asset = await assetsResult.getFirstObject();
console.log('baoyihu queryPhotoByDisplayName one asset uri : ' + asset.uri + ', photoType : ' + console.log(FileHelpTag, ' queryPhotoByDisplayName one asset uri : ' + asset.uri + ', photoType : ' +
asset.photoType + ', displayName : ' + asset.displayName); asset.photoType + ', displayName : ' + asset.displayName);
console.log('baoyihu queryPhotoByDisplayName success '); console.log(FileHelpTag, ' queryPhotoByDisplayName success ');
} }
} catch (err) { } catch (err) {
console.log('baoyihu queryPhotoByDisplayName failed with err: ' + err); console.error(FileHelpTag, ' queryPhotoByDisplayName failed with err: ' + err);
} finally { } finally {
} }
} }
@ -58,7 +59,7 @@ export class FileHelper {
let fetchResult: photoAccessHelper.FetchResult<photoAccessHelper.Album> = null let fetchResult: photoAccessHelper.FetchResult<photoAccessHelper.Album> = null
let album: photoAccessHelper.Album = null let album: photoAccessHelper.Album = null
try { try {
console.log('getUserAlbumItemByDisplayName'); console.log(FileHelpTag, 'getUserAlbumItemByDisplayName');
let predicates = new dataSharePredicates.DataSharePredicates(); let predicates = new dataSharePredicates.DataSharePredicates();
predicates.equalTo(photoAccessHelper.AlbumKeys.ALBUM_NAME, displayName) predicates.equalTo(photoAccessHelper.AlbumKeys.ALBUM_NAME, displayName)
let fetchOptions: photoAccessHelper.FetchOptions = { let fetchOptions: photoAccessHelper.FetchOptions = {
@ -68,12 +69,12 @@ export class FileHelper {
fetchResult = fetchResult =
await this.userFileMgr.getAlbums(photoAccessHelper.AlbumType.USER, photoAccessHelper.AlbumSubtype.USER_GENERIC, await this.userFileMgr.getAlbums(photoAccessHelper.AlbumType.USER, photoAccessHelper.AlbumSubtype.USER_GENERIC,
fetchOptions); fetchOptions);
console.log('get getUserAlbumItemByDisplayName, count: ' + fetchResult.getCount()); console.log(FileHelpTag, 'get getUserAlbumItemByDisplayName, count: ' + fetchResult.getCount());
if (fetchResult.getCount() > 0) { if (fetchResult.getCount() > 0) {
album = await fetchResult.getFirstObject(); album = await fetchResult.getFirstObject();
} }
} catch (err) { } catch (err) {
console.log('get Album fetchResult failed with err: ' + err); console.error(FileHelpTag, 'get Album fetchResult failed with err: ' + err);
} finally { } finally {
if (fetchResult != null) { if (fetchResult != null) {
fetchResult.close(); fetchResult.close();
@ -83,7 +84,7 @@ export class FileHelper {
} }
public async addAssetToAlbum(albumName: string, file_uri: string) { public async addAssetToAlbum(albumName: string, file_uri: string) {
console.log('baoyihu addAssetToAlbum begin albumName ' + albumName + ', file_uri:' + file_uri); console.log(FileHelpTag, ' addAssetToAlbum begin albumName ' + albumName + ', file_uri:' + file_uri);
try { try {
let album = await this.getUserAlbumItemByDisplayName(albumName); let album = await this.getUserAlbumItemByDisplayName(albumName);
let predicates = new dataSharePredicates.DataSharePredicates(); let predicates = new dataSharePredicates.DataSharePredicates();
@ -96,19 +97,19 @@ export class FileHelper {
if (assetsResult.getCount() > 0) { if (assetsResult.getCount() > 0) {
let asset = await assetsResult.getFirstObject(); let asset = await assetsResult.getFirstObject();
console.log('baoyihu addAssetToAlbum one asset uri : ' + asset.uri + ', photoType : ' + asset.photoType + console.log(FileHelpTag, ' addAssetToAlbum one asset uri : ' + asset.uri + ', photoType : ' + asset.photoType +
', displayName : ' + asset.displayName); ', displayName : ' + asset.displayName);
await album.addAssets([asset]); await album.addAssets([asset]);
console.log('baoyihu addAssetToAlbum success '); console.log(FileHelpTag, ' addAssetToAlbum success ');
} }
} catch (err) { } catch (err) {
console.log('baoyihu addAssetToAlbum failed with err: ' + err); console.error(FileHelpTag, ' addAssetToAlbum failed with err: ' + err);
} finally { } finally {
} }
} }
public async deleteFileOfAlbum(album_Name: string, file_type: number | string | boolean): Promise<void> { public async deleteFileOfAlbum(album_Name: string, file_type: number | string | boolean): Promise<void> {
console.log('baoyihu deletePictureOfAlbum album_Name：' + album_Name); console.log(FileHelpTag, ' deletePictureOfAlbum album_Name：' + album_Name);
let photoFetchResult: photoAccessHelper.FetchResult<photoAccessHelper.PhotoAsset> = null; let photoFetchResult: photoAccessHelper.FetchResult<photoAccessHelper.PhotoAsset> = null;
try { try {
let album = await this.getUserAlbumItemByName(album_Name); let album = await this.getUserAlbumItemByName(album_Name);
@ -122,10 +123,10 @@ export class FileHelper {
let all_fileAsset = await photoFetchResult.getAllObjects(); let all_fileAsset = await photoFetchResult.getAllObjects();
let uri_array: string[] = [] let uri_array: string[] = []
console.log('baoyihu deletePictureOfAlbum iterator begin', album_Name); console.log(FileHelpTag, ' deletePictureOfAlbum iterator begin', album_Name);
for (let onfile of all_fileAsset) { for (let onfile of all_fileAsset) {
console.log(album_Name, console.log(FileHelpTag, album_Name,
'baoyihu deletePictureOfAlbum uri : ' + onfile.uri + ', photoType : ' + onfile.photoType + ' deletePictureOfAlbum uri : ' + onfile.uri + ', photoType : ' + onfile.photoType +
', displayName : ' + onfile.displayName); ', displayName : ' + onfile.displayName);
uri_array.push(onfile.uri); uri_array.push(onfile.uri);
} }
@ -138,21 +139,21 @@ export class FileHelper {
let trashAlbum = await albumFetchResult.getFirstObject(); let trashAlbum = await albumFetchResult.getFirstObject();
trashAlbum.deleteAssets(all_fileAsset).then(() => { trashAlbum.deleteAssets(all_fileAsset).then(() => {
console.log('baoyihu deletePictureOfAlbum trash ok : ', album_Name); console.log(FileHelpTag, ' deletePictureOfAlbum trash ok : ', album_Name);
}).catch((err: BusinessError) => { }).catch((err: BusinessError) => {
console.log('baoyihu deletePictureOfAlbum trash faild : ', album_Name); console.error(FileHelpTag, ' deletePictureOfAlbum trash faild : ', album_Name, JSON.stringify(err));
}); });
} catch (err) { } catch (err) {
console.log('baoyihu deletePictureOfAlbum error: ' + err, album_Name); console.error(FileHelpTag, ' deletePictureOfAlbum error: ' + err, album_Name);
} finally { } finally {
if (albumFetchResult != null) { if (albumFetchResult != null) {
albumFetchResult.close(); albumFetchResult.close();
} }
} }
console.log('baoyihu deletePictureOfAlbum delete end', album_Name); console.log(FileHelpTag, ' deletePictureOfAlbum delete end', album_Name);
} catch (err) { } catch (err) {
console.log('baoyihu deletePictureOfAlbum failed with err: ' + err, album_Name); console.error(FileHelpTag, ' deletePictureOfAlbum failed with err: ' + err, album_Name);
} finally { } finally {
if (photoFetchResult != null) { if (photoFetchResult != null) {
photoFetchResult.close(); photoFetchResult.close();
@ -161,7 +162,7 @@ export class FileHelper {
} }
public async deleteAllPictures(): Promise<void> { public async deleteAllPictures(): Promise<void> {
console.log('baoyihu deleteAllPictures'); console.log(FileHelpTag, ' deleteAllPictures');
let photoFetchResult: photoAccessHelper.FetchResult<photoAccessHelper.PhotoAsset> = null; let photoFetchResult: photoAccessHelper.FetchResult<photoAccessHelper.PhotoAsset> = null;
try { try {
let predicates = new dataSharePredicates.DataSharePredicates(); let predicates = new dataSharePredicates.DataSharePredicates();
@ -173,15 +174,15 @@ export class FileHelper {
let all_fileAsset = await photoFetchResult.getAllObjects(); let all_fileAsset = await photoFetchResult.getAllObjects();
let uri_array: string[] = [] let uri_array: string[] = []
console.log('baoyihu batch delete begin'); console.log(FileHelpTag, ' batch delete begin');
for (let onfile of all_fileAsset) { for (let onfile of all_fileAsset) {
uri_array.push(onfile.uri); uri_array.push(onfile.uri);
} }
// await album.removeAssets(all_fileAsset); // await album.removeAssets(all_fileAsset);
await this.userFileMgr.deleteAssets(uri_array); await this.userFileMgr.deleteAssets(uri_array);
console.log('baoyihu batch delete end'); console.log(FileHelpTag, ' batch delete end');
} catch (err) { } catch (err) {
console.log('baoyihu get Album getPhotoAssets failed with err: ' + err); console.error(FileHelpTag, ' get Album getPhotoAssets failed with err: ' + err);
} finally { } finally {
if (photoFetchResult != null) { if (photoFetchResult != null) {
photoFetchResult.close(); photoFetchResult.close();
@ -220,7 +221,7 @@ export class FileHelper {
let fetchResult: photoAccessHelper.FetchResult<photoAccessHelper.Album> = null let fetchResult: photoAccessHelper.FetchResult<photoAccessHelper.Album> = null
let album: photoAccessHelper.Album = null let album: photoAccessHelper.Album = null
try { try {
console.log('getUserAlbumItemByName'); console.log(FileHelpTag, 'getUserAlbumItemByName');
let predicates = new dataSharePredicates.DataSharePredicates(); let predicates = new dataSharePredicates.DataSharePredicates();
predicates.equalTo(photoAccessHelper.AlbumKeys.ALBUM_NAME, albumName) predicates.equalTo(photoAccessHelper.AlbumKeys.ALBUM_NAME, albumName)
let fetchOptions: photoAccessHelper.FetchOptions = { let fetchOptions: photoAccessHelper.FetchOptions = {
@ -230,13 +231,13 @@ export class FileHelper {
fetchResult = fetchResult =
await this.userFileMgr.getAlbums(photoAccessHelper.AlbumType.USER, photoAccessHelper.AlbumSubtype.USER_GENERIC, await this.userFileMgr.getAlbums(photoAccessHelper.AlbumType.USER, photoAccessHelper.AlbumSubtype.USER_GENERIC,
fetchOptions); fetchOptions);
console.log('get getUserAlbumItemByName, count: ' + fetchResult.getCount()); console.log(FileHelpTag, 'get getUserAlbumItemByName, count: ' + fetchResult.getCount());
if (fetchResult.getCount() > 0) { if (fetchResult.getCount() > 0) {
album = await fetchResult.getFirstObject(); album = await fetchResult.getFirstObject();
console.log('getUserAlbumItemByName uri: ' + album.albumUri + ',albumName: ' + album.albumName); console.log(FileHelpTag, 'getUserAlbumItemByName uri: ' + album.albumUri + ',albumName: ' + album.albumName);
} }
} catch (err) { } catch (err) {
console.log('getUserAlbumItemByName failed with err: ' + err); console.error(FileHelpTag, 'getUserAlbumItemByName failed with err: ' + err);
} finally { } finally {
if (fetchResult != null) { if (fetchResult != null) {
fetchResult.close(); fetchResult.close();
@ -248,15 +249,15 @@ export class FileHelper {
public async createAlbum(albumName: string): Promise<string> { public async createAlbum(albumName: string): Promise<string> {
try { try {
console.log("baoyihu createAlbum beging"); console.log(FileHelpTag, " createAlbum beging");
let albumAsset = await this.userFileMgr.createAlbum(albumName); let albumAsset = await this.userFileMgr.createAlbum(albumName);
console.log('baoyihu createAlbum success, albumType: ' + albumAsset.albumType + ', albumSubtype: ' + console.log(FileHelpTag, ' createAlbum success, albumType: ' + albumAsset.albumType + ', albumSubtype: ' +
albumAsset.albumSubtype albumAsset.albumSubtype
+ ', albumName: ' + albumAsset.albumName + ', albumUri: ' + albumAsset.albumUri + ', coverUri: ' + + ', albumName: ' + albumAsset.albumName + ', albumUri: ' + albumAsset.albumUri + ', coverUri: ' +
albumAsset.coverUri); albumAsset.coverUri);
return albumAsset.albumUri; return albumAsset.albumUri;
} catch (err) { } catch (err) {
console.log('baoyihu createAlbum failed with err: ' + err); console.error(FileHelpTag, ' createAlbum failed with err: ' + err);
} finally { } finally {
} }
} }
@ -264,7 +265,7 @@ export class FileHelper {
public async createPhotoAsset(type: photoAccessHelper.AlbumType, public async createPhotoAsset(type: photoAccessHelper.AlbumType,
subType: photoAccessHelper.AlbumSubtype): Promise<void> { subType: photoAccessHelper.AlbumSubtype): Promise<void> {
console.log('baoyihu createPhotoAsset enter '); console.log(FileHelpTag, ' createPhotoAsset enter ');
try { try {
let createOptions: photoAccessHelper.PhotoCreateOptions = { subtype: photoAccessHelper.PhotoSubtype.SCREENSHOT }; let createOptions: photoAccessHelper.PhotoCreateOptions = { subtype: photoAccessHelper.PhotoSubtype.SCREENSHOT };
await this.userFileMgr.createAsset("picture2.jpg", createOptions, (err, photoResult) => { await this.userFileMgr.createAsset("picture2.jpg", createOptions, (err, photoResult) => {
@ -272,7 +273,7 @@ export class FileHelper {
+ ', displayName: ' + photoResult.displayName); + ', displayName: ' + photoResult.displayName);
}); });
} catch (err) { } catch (err) {
console.log('baoyihu createPhotoAsset failed with err: ' + err); console.error(FileHelpTag, ' createPhotoAsset failed with err: ' + err);
} finally { } finally {
} }
} }
@ -283,11 +284,13 @@ export class FileHelper {
let fetchResult: photoAccessHelper.FetchResult<photoAccessHelper.Album> = null; let fetchResult: photoAccessHelper.FetchResult<photoAccessHelper.Album> = null;
try { try {
fetchResult = await this.userFileMgr.getAlbums(type, subType); fetchResult = await this.userFileMgr.getAlbums(type, subType);
console.log('baoyihu queryAlbum success count: ' + fetchResult.getCount()); console.log(FileHelpTag, ' queryAlbum success count: ' + fetchResult.getCount());
for (let i = 0; i < fetchResult.getCount(); i++) { for (let i = 0; i < fetchResult.getCount(); i++) {
let albumAsset: photoAccessHelper.Album = await fetchResult.getObjectByPosition(i); let albumAsset: photoAccessHelper.Album = await fetchResult.getObjectByPosition(i);
console.log('queryAlbum albumType: ' + albumAsset.albumType + ', Subtype: ' + albumAsset.albumSubtype console.log(FileHelpTag,
+ ', Name: ' + albumAsset.albumName + ', Uri: ' + albumAsset.albumUri + ', coverUri: ' + albumAsset.coverUri); 'queryAlbum albumType: ' + albumAsset.albumType + ', Subtype: ' + albumAsset.albumSubtype
+ ', Name: ' + albumAsset.albumName + ', Uri: ' + albumAsset.albumUri + ', coverUri: ' +
albumAsset.coverUri);
let predicates = new dataSharePredicates.DataSharePredicates(); let predicates = new dataSharePredicates.DataSharePredicates();
let fetchOptions: photoAccessHelper.FetchOptions = { let fetchOptions: photoAccessHelper.FetchOptions = {
@ -296,28 +299,28 @@ export class FileHelper {
}; };
let photoFetchResult = await albumAsset.getAssets(fetchOptions); let photoFetchResult = await albumAsset.getAssets(fetchOptions);
let count = photoFetchResult.getCount(); let count = photoFetchResult.getCount();
console.log('baoyihu queryAlbum photoFetchResult count: ' + count); console.log(FileHelpTag, ' queryAlbum photoFetchResult count: ' + count);
let all_fileAsset = await photoFetchResult.getAllObjects(); let all_fileAsset = await photoFetchResult.getAllObjects();
// var uri_array=[] // var uri_array=[]
for (let onfile of all_fileAsset) { for (let onfile of all_fileAsset) {
console.log('baoyihu queryAlbum one uri : ' + onfile.uri); console.log(FileHelpTag, ' queryAlbum one uri : ' + onfile.uri);
firstUri = onfile.uri; firstUri = onfile.uri;
// uri_array.push(onfile.uri); // uri_array.push(onfile.uri);
} }
} }
console.log('baoyihu queryAlbum return asser:' + firstUri); console.log(FileHelpTag, ' queryAlbum return asser:' + firstUri);
} catch (err) { } catch (err) {
console.log('baoyihu queryAlbum failed with err: ' + err); console.error(FileHelpTag, ' queryAlbum failed with err: ' + err);
} finally { } finally {
if (fetchResult != null) { if (fetchResult != null) {
fetchResult.close(); fetchResult.close();
} }
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
console.log('baoyihu queryAlbum before resolve:' + firstUri); console.log(FileHelpTag, ' queryAlbum before resolve:' + firstUri);
resolve(firstUri) resolve(firstUri)
}) })
@ -328,12 +331,12 @@ export class FileHelper {
let fetchResult: photoAccessHelper.FetchResult<photoAccessHelper.Album> = null; let fetchResult: photoAccessHelper.FetchResult<photoAccessHelper.Album> = null;
try { try {
fetchResult = await this.userFileMgr.getAlbums(type, subType); fetchResult = await this.userFileMgr.getAlbums(type, subType);
console.log('baoyihu_ get Album fetchResult, count: ' + fetchResult.getCount()); console.log(FileHelpTag, ' get Album fetchResult, count: ' + fetchResult.getCount());
for (let i = 0; i < fetchResult.getCount(); i++) { for (let i = 0; i < fetchResult.getCount(); i++) {
let albumAsset: photoAccessHelper.Album = await fetchResult.getObjectByPosition(i); let albumAsset: photoAccessHelper.Album = await fetchResult.getObjectByPosition(i);
let photoFetchResult: photoAccessHelper.FetchResult<photoAccessHelper.PhotoAsset> = null; let photoFetchResult: photoAccessHelper.FetchResult<photoAccessHelper.PhotoAsset> = null;
let count = 0; let count = 0;
console.log('baoyihu_ get one Album name : ' + albumAsset.albumName); console.log(FileHelpTag, ' get one Album name : ' + albumAsset.albumName);
try { try {
let predicates = new dataSharePredicates.DataSharePredicates(); let predicates = new dataSharePredicates.DataSharePredicates();
let fetchOptions: photoAccessHelper.FetchOptions = { let fetchOptions: photoAccessHelper.FetchOptions = {
@ -343,7 +346,7 @@ export class FileHelper {
photoFetchResult = await albumAsset.getAssets(fetchOptions); photoFetchResult = await albumAsset.getAssets(fetchOptions);
count = photoFetchResult.getCount(); count = photoFetchResult.getCount();
console.log('baoyihu_ photoFetchResult count: ' + count); console.log(FileHelpTag, ' photoFetchResult count: ' + count);
let all_fileAsset = await photoFetchResult.getAllObjects(); let all_fileAsset = await photoFetchResult.getAllObjects();
/* /*
var uri_array=[] var uri_array=[]
@ -357,9 +360,9 @@ export class FileHelper {
await albumAsset.removeAssets(all_fileAsset); await albumAsset.removeAssets(all_fileAsset);
//await this.userFileMgr.deleteAssets(uri_array); //await this.userFileMgr.deleteAssets(uri_array);
console.log('baoyihu_ batch delete end'); console.log(FileHelpTag, ' batch delete end');
} catch (err) { } catch (err) {
console.log('baoyihu_ get Album getPhotoAssets failed with err: ' + err); console.error(FileHelpTag, ' get Album getPhotoAssets failed with err: ' + err);
} finally { } finally {
if (photoFetchResult != null) { if (photoFetchResult != null) {
photoFetchResult.close(); photoFetchResult.close();
@ -367,7 +370,7 @@ export class FileHelper {
} }
} }
} catch (err) { } catch (err) {
console.log('baoyihu_ get Album fetchResult failed with err: ' + err); console.error(FileHelpTag, ' get Album fetchResult failed with err: ' + err);
} finally { } finally {
if (fetchResult != null) { if (fetchResult != null) {
fetchResult.close(); fetchResult.close();

170
entry/src/main/ets/utils/FileUtils.ets
View File

@ -1,12 +1,9 @@
import common from "@ohos.app.ability.common" import common from '@ohos.app.ability.common'
import Want from "@ohos.app.ability.Want"
import fileAccess from "@ohos.file.fileAccess"
import fs from '@ohos.file.fs' import fs from '@ohos.file.fs'
import abilityAccessCtrl, { Permissions } from "@ohos.abilityAccessCtrl" import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl'
import promptAction from "@ohos.promptAction" import promptAction from '@ohos.promptAction'
import { FileTag } from "../config" import { FileTag } from '../config'
import { BusinessError } from '@ohos.base'
const LOG_TAG = '[file utils]'
export default class FileUtils { export default class FileUtils {
@ -17,134 +14,101 @@ export default class FileUtils {
constructor(context: common.UIAbilityContext) { constructor(context: common.UIAbilityContext) {
this.context = context this.context = context
this.requestPermission(); this.requestPermission()
fs.mkdir(this.absolutePath) fs.mkdir(this.absolutePath)
} }
async initFolder(folderPath: string): Promise<string> { async initFolder(folderPath: string): Promise<string> {
const folderList = folderPath.split('/').filter(folderName => folderName !== ''); const folderList = folderPath.split('/').filter(folderName => folderName !== '')
let path = this.absolutePath let path = this.absolutePath
folderList.forEach(folderName => { for (const folderName of folderList) {
path += `/${folderName}`; path += `/${folderName}`
try { try {
const isExit = fs.accessSync(path); if (!fs.accessSync(path)) {
if (!isExit) {
fs.mkdirSync(path) fs.mkdirSync(path)
} }
} catch (e) { } catch (e) {
console.info('初始化文件夹失败', path) this.handleError('初始化文件夹失败', e, folderPath)
promptAction.showToast({
message: `初始化文件夹失败` + folderPath + JSON.stringify(e),
duration: 4000,
})
} }
}) }
return path return path
} }
async addFile(filePath: string, content: string) { async addFile(filePath: string, content: string): Promise<boolean> {
try { try {
//文件存在先删除
if (fs.accessSync(filePath)) { if (fs.accessSync(filePath)) {
fs.unlinkSync(filePath); fs.unlinkSync(filePath)
} }
let file = fs.openSync(filePath, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE); const file = fs.openSync(filePath, fs.OpenMode.READ_WRITE | fs.OpenMode.CREATE)
//追加写入文件
fs.writeSync(file.fd, content) fs.writeSync(file.fd, content)
fs.closeSync(file) fs.closeSync(file)
console.error(LOG_TAG, '写入文件成功') console.log(FileTag, '写入文件成功')
return true return true
} catch (e) { } catch (e) {
promptAction.showToast({ this.handleError('写入失败', e, filePath)
message: `addFile文件失败` + filePath + JSON.stringify(e), return false
duration: 4000,
})
console.error(LOG_TAG, '写入失败', JSON.stringify(e))
} }
} }
async editFile(filePath: string, content: string, fd?: number) { async editFile(filePath: string, content: string): Promise<number | undefined> {
const thisFile: fs.File = this.filePathFdObj[filePath];
try { try {
if (thisFile) { const file = this.filePathFdObj[filePath] ||
fs.writeSync(thisFile.fd, content + '\n') fs.openSync(filePath, fs.OpenMode.READ_WRITE | fs.OpenMode.APPEND | fs.OpenMode.CREATE)
return fd; fs.writeSync(file.fd, content + '\n')
} else { this.filePathFdObj[filePath] = file
let file = fs.openSync(filePath, fs.OpenMode.READ_WRITE | fs.OpenMode.APPEND | fs.OpenMode.CREATE); return file.fd
fs.writeSync(file.fd, content + '\n')
this.filePathFdObj[filePath] = file
return file.fd
}
} catch (e) { } catch (e) {
promptAction.showToast({ this.handleError('editFile文件失败', e, filePath)
message: `editFile文件失败` + filePath + JSON.stringify(e),
duration: 4000,
})
console.error(LOG_TAG, JSON.stringify(e))
} }
} }
async readFile(filePath: string): Promise<string> { async readFile(filePath: string): Promise<string> {
try { try {
const str = await fs.readText(filePath); return await fs.readText(filePath)
return str
} catch (e) { } catch (e) {
promptAction.showToast({ this.handleError('readFile文件失败', e, filePath)
message: `读取文件失败` + filePath + JSON.stringify(e),
duration: 4000,
})
console.log('readFile文件失败' + filePath + JSON.stringify(e))
return '' return ''
} }
} }
async closeFile(filePath: string) { async closeFile(filePath: string): Promise<void> {
const thisFile = this.filePathFdObj[filePath]; const file = this.filePathFdObj[filePath]
if (thisFile) { if (file) {
fs.closeSync(thisFile); fs.closeSync(file)
console.info(FileTag, filePath + '文件关闭成功') console.log(FileTag, `${filePath}文件关闭成功`)
} }
} }
async getDeviceList(folderPath?: string) { async getDeviceList(folderPath?: string): Promise<string[]> {
return this.getFilePathList(`${this.absolutePath}/${folderPath}`, false) return this.getFilePathList(`${this.absolutePath}/${folderPath}`, false)
} }
async getFilePathList(filePath: string, isSdCard: boolean): Promise<string[]> { async getFilePathList(filePath: string, isSdCard: boolean): Promise<string[]> {
let fileName: string[] = [];
let sdCardFileName: string[] = [];
try { try {
const filenames = await fs.listFile(filePath); const filenames = await fs.listFile(filePath)
for (let i = 0; i < filenames.length; i++) { console.log(FileTag, `目录：${filePath}的子文件：${filenames.join(', ')}`)
console.error(FileTag, `目录：${filePath}的子文件：${filenames[i]}`); return filenames
if (isSdCard) {
sdCardFileName.push(filenames[i])
} else {
fileName.push(filenames[i])
}
}
return isSdCard ? sdCardFileName : fileName
} catch (e) { } catch (e) {
console.error(FileTag, JSON.stringify(e)); this.handleError('获取文件列表失败', e, filePath)
return []
} }
} }
async deleteF(path: string, type: 1 | 2 | 3) { async deleteF(path: string, type: 1 | 2 | 3): Promise<boolean> {
if (type === 1) { try {
const fileList = await this.getFilePathList(`${this.absolutePath}/${path}`, false); if (type === 1) {
fileList.forEach((fileName) => { const fileList = await this.getFilePathList(`${this.absolutePath}/${path}`, false)
fs.unlinkSync(`${this.absolutePath}/${path}/${fileName}`) fileList.forEach(fileName => fs.unlinkSync(`${this.absolutePath}/${path}/${fileName}`))
}) fs.rmdirSync(`${this.absolutePath}/${path}`)
fs.rmdirSync(`${this.absolutePath}/${path}`); } else if (type === 2) {
return true fs.unlinkSync(`${this.absolutePath}/${path}`)
} else if (type === 2) { } else {
fs.unlinkSync(`${this.absolutePath}/${path}`); fs.unlinkSync(path)
return true }
} else {
fs.unlinkSync(`${path}`);
return true return true
} catch (e) {
this.handleError('删除文件失败', e, path)
return false
} }
} }
@ -152,28 +116,32 @@ export default class FileUtils {
return this.absolutePath return this.absolutePath
} }
getFileContent(filePath: string) { getFileContent(filePath: string): string {
const path = `${this.absolutePath}/${filePath}` const path = `${this.absolutePath}/${filePath}`
const str = fs.readTextSync(path); return fs.readTextSync(path)
return str
} }
private async requestPermission(): Promise<void> {
private async requestPermission() { const permissions: Array<Permissions> = [
let permissions: Array<Permissions> = [
'ohos.permission.READ_MEDIA', 'ohos.permission.READ_MEDIA',
'ohos.permission.WRITE_MEDIA' 'ohos.permission.WRITE_MEDIA'
]; ]
let atManager: abilityAccessCtrl.AtManager = abilityAccessCtrl.createAtManager() const atManager = abilityAccessCtrl.createAtManager()
atManager.requestPermissionsFromUser(this.context, permissions, async (code, result) => { atManager.requestPermissionsFromUser(this.context, permissions, (code, result) => {
const permissionRequest = result.authResults[0] if (result.authResults[0] === -1) {
if (permissionRequest == -1) {
promptAction.showToast({ promptAction.showToast({
message: "请先授权", message: '请先授权',
duration: 3000, duration: 3000,
}) })
return
} }
}) })
} }
private handleError(message: string, error: BusinessError, filePath: string): void {
console.error(FileTag, `${message} ${filePath} ${JSON.stringify(error)}`)
promptAction.showToast({
message: `${message} ${filePath} ${JSON.stringify(error)}`,
duration: 4000,
})
}
} }