From e2dbef9288783339558caaeaeec981654614e2ff Mon Sep 17 00:00:00 2001 From: 15535735306 <15535735306@163.com> Date: Tue, 14 Oct 2025 19:34:18 +0800 Subject: [PATCH] Fix the bug --- .../main/ets/database/tables/DayInfoApi.ets | 13 ++-- .../ets/database/tables/DayTaskInfoApi.ets | 19 ++++-- .../main/ets/database/tables/FormInfoApi.ets | 13 ++-- .../main/ets/database/tables/TaskInfoApi.ets | 30 +++++---- .../common/src/main/ets/utils/FormUtils.ets | 4 +- .../src/main/ets/utils/agent/AgentUtils.ets | 64 +++++++++++-------- .../src/main/ets/pages/HealthyLifePage.ets | 14 ++-- .../src/main/ets/viewmodel/HomeStore.ets | 3 +- 8 files changed, 97 insertions(+), 63 deletions(-) diff --git a/commons/common/src/main/ets/database/tables/DayInfoApi.ets b/commons/common/src/main/ets/database/tables/DayInfoApi.ets index 9b2342a..d6e3f90 100644 --- a/commons/common/src/main/ets/database/tables/DayInfoApi.ets +++ b/commons/common/src/main/ets/database/tables/DayInfoApi.ets @@ -188,10 +188,15 @@ class DayInfoApi implements TableApi { } convertResultSet2Entity(resultSet: relationalStore.ResultSet): DayInfo { - const date = resultSet.getValue(resultSet.getColumnIndex('date')) as string; - const targetTaskNum = resultSet.getValue(resultSet.getColumnIndex('targetTaskNum')) as number; - const finTaskNum = resultSet.getValue(resultSet.getColumnIndex('finTaskNum')) as number; - return new DayInfo(date, targetTaskNum, finTaskNum); + try { + const date = resultSet.getValue(resultSet.getColumnIndex('date')) as string; + const targetTaskNum = resultSet.getValue(resultSet.getColumnIndex('targetTaskNum')) as number; + const finTaskNum = resultSet.getValue(resultSet.getColumnIndex('finTaskNum')) as number; + return new DayInfo(date, targetTaskNum, finTaskNum); + } catch (error) { + hilog.error(0x0000, TAG, `an error occurred: ${error}`); + return new DayInfo('', -1, -1); + } } /* diff --git a/commons/common/src/main/ets/database/tables/DayTaskInfoApi.ets b/commons/common/src/main/ets/database/tables/DayTaskInfoApi.ets index 43c85c4..764be84 100644 --- a/commons/common/src/main/ets/database/tables/DayTaskInfoApi.ets +++ b/commons/common/src/main/ets/database/tables/DayTaskInfoApi.ets @@ -171,13 +171,18 @@ class DayTaskInfoApi implements TableApi { } convertResultSet2Entity(resultSet: relationalStore.ResultSet): DayTaskInfo { - const id = resultSet.getValue(resultSet.getColumnIndex('id')) as number; - const date = resultSet.getValue(resultSet.getColumnIndex('date')) as string; - const taskId = resultSet.getValue(resultSet.getColumnIndex('taskId')) as number; - const targetValue = resultSet.getValue(resultSet.getColumnIndex('targetValue')) as string; - const finValue = resultSet.getValue(resultSet.getColumnIndex('finValue')) as string; - const isDone = resultSet.getValue(resultSet.getColumnIndex('isDone')) ? true : false; - return new DayTaskInfo(id, date, taskId, targetValue, finValue, isDone); + try { + const id = resultSet.getValue(resultSet.getColumnIndex('id')) as number; + const date = resultSet.getValue(resultSet.getColumnIndex('date')) as string; + const taskId = resultSet.getValue(resultSet.getColumnIndex('taskId')) as number; + const targetValue = resultSet.getValue(resultSet.getColumnIndex('targetValue')) as string; + const finValue = resultSet.getValue(resultSet.getColumnIndex('finValue')) as string; + const isDone = resultSet.getValue(resultSet.getColumnIndex('isDone')) ? true : false; + return new DayTaskInfo(id, date, taskId, targetValue, finValue, isDone); + } catch (error) { + hilog.error(0x0000, TAG, `an error occurred: ${error}`); + return new DayTaskInfo(0, '', 0, '', '', false); + } } /* diff --git a/commons/common/src/main/ets/database/tables/FormInfoApi.ets b/commons/common/src/main/ets/database/tables/FormInfoApi.ets index e995f20..6f0672b 100644 --- a/commons/common/src/main/ets/database/tables/FormInfoApi.ets +++ b/commons/common/src/main/ets/database/tables/FormInfoApi.ets @@ -180,10 +180,15 @@ class FormInfoApi implements TableApi { } convertResultSet2Entity(resultSet: relationalStore.ResultSet): FormInfo { - const formId = resultSet.getValue(resultSet.getColumnIndex('formId')) as string; - const formName = resultSet.getValue(resultSet.getColumnIndex('formName')) as string; - const formDimension = resultSet.getValue(resultSet.getColumnIndex('formDimension')) as number; - return new FormInfo(formId, formName, formDimension); + try { + const formId = resultSet.getValue(resultSet.getColumnIndex('formId')) as string; + const formName = resultSet.getValue(resultSet.getColumnIndex('formName')) as string; + const formDimension = resultSet.getValue(resultSet.getColumnIndex('formDimension')) as number; + return new FormInfo(formId, formName, formDimension); + } catch (error) { + hilog.error(0x0000, TAG, `an error occurred: ${error}`); + return new FormInfo('', '', -1); + } } /* diff --git a/commons/common/src/main/ets/database/tables/TaskInfoApi.ets b/commons/common/src/main/ets/database/tables/TaskInfoApi.ets index fa0cbb8..9efedd8 100644 --- a/commons/common/src/main/ets/database/tables/TaskInfoApi.ets +++ b/commons/common/src/main/ets/database/tables/TaskInfoApi.ets @@ -186,18 +186,24 @@ class TaskInfoApi implements TableApi { } convertResultSet2Entity(resultSet: relationalStore.ResultSet): TaskInfo { - const taskId = resultSet.getValue(resultSet.getColumnIndex('taskId')) as number; - const isOpen = resultSet.getValue(resultSet.getColumnIndex('isOpen')) ? true : false; - const targetValue = resultSet.getValue(resultSet.getColumnIndex('targetValue')) as string; - const finValue = resultSet.getValue(resultSet.getColumnIndex('finValue')) as string; - const isDone = resultSet.getValue(resultSet.getColumnIndex('isDone')) ? true : false; - const isAlert = resultSet.getValue(resultSet.getColumnIndex('isAlert')) ? true : false; - const alertStartTime = resultSet.getValue(resultSet.getColumnIndex('alertStartTime')) as string; - const alertEndTime = resultSet.getValue(resultSet.getColumnIndex('alertEndTime')) as string; - const alertFrequency = resultSet.getValue(resultSet.getColumnIndex('alertFrequency')) as string; - const reminderId = resultSet.getValue(resultSet.getColumnIndex('reminderId')) as number; - return new TaskInfo(taskId, isOpen, targetValue, finValue, isDone, isAlert, alertStartTime, alertEndTime, - alertFrequency, reminderId); + try { + const taskId = resultSet.getValue(resultSet.getColumnIndex('taskId')) as number; + const isOpen = resultSet.getValue(resultSet.getColumnIndex('isOpen')) ? true : false; + const targetValue = resultSet.getValue(resultSet.getColumnIndex('targetValue')) as string; + const finValue = resultSet.getValue(resultSet.getColumnIndex('finValue')) as string; + const isDone = resultSet.getValue(resultSet.getColumnIndex('isDone')) ? true : false; + const isAlert = resultSet.getValue(resultSet.getColumnIndex('isAlert')) ? true : false; + const alertStartTime = resultSet.getValue(resultSet.getColumnIndex('alertStartTime')) as string; + const alertEndTime = resultSet.getValue(resultSet.getColumnIndex('alertEndTime')) as string; + const alertFrequency = resultSet.getValue(resultSet.getColumnIndex('alertFrequency')) as string; + const reminderId = resultSet.getValue(resultSet.getColumnIndex('reminderId')) as number; + return new TaskInfo(taskId, isOpen, targetValue, finValue, isDone, isAlert, alertStartTime, alertEndTime, + alertFrequency, reminderId); + } catch (error) { + hilog.error(0x0000, TAG, `an error occurred: ${error}`); + return new TaskInfo(-1, false, '', '', false, false, '', '', '', -1); + } + } /* diff --git a/commons/common/src/main/ets/utils/FormUtils.ets b/commons/common/src/main/ets/utils/FormUtils.ets index 1fc07fa..3f74f15 100644 --- a/commons/common/src/main/ets/utils/FormUtils.ets +++ b/commons/common/src/main/ets/utils/FormUtils.ets @@ -33,7 +33,6 @@ import { CommonConstants as Const } from '../constants/CommonConstants'; const TAG: string = 'FormUtils'; export class FormUtils { - private static date = new Date(); /* * Added service card information. * @param { Context } context context. @@ -71,7 +70,8 @@ export class FormUtils { * @returns { void } */ public static updateByFormName(formInfo: FormInfo): void { - const date = convertDate2Str(FormUtils.date); + // eslint-disable-next-line @performance/reuse-date-instances-check + const date = convertDate2Str(new Date()); let updateDate: FormStorageModel = {}; if (formInfo.formName === Const.FORM_NAME_AGENCY && Number(formInfo.formDimension) === Const.DEFAULT_DIMENSION_2X4) { diff --git a/commons/common/src/main/ets/utils/agent/AgentUtils.ets b/commons/common/src/main/ets/utils/agent/AgentUtils.ets index 6a583cf..2adf327 100644 --- a/commons/common/src/main/ets/utils/agent/AgentUtils.ets +++ b/commons/common/src/main/ets/utils/agent/AgentUtils.ets @@ -27,6 +27,9 @@ const TAG: string = '[AgentUtils]'; export class AgentUtils { static async creatAgent(taskInfo: TaskInfo, taskBaseInfo: TaskBaseInfo, uIContext: UIContext): Promise { let targetReminderAgent = AgentUtils.agentConfigSet(taskInfo, taskBaseInfo, uIContext); + if (!targetReminderAgent) { + return -1; + } try { let reminderId: number = await reminderAgentManager.publishReminder(targetReminderAgent); // 发布的提醒ID hilog.info(0x0000, TAG, `Succeeded in publishing reminder. `); @@ -60,35 +63,40 @@ export class AgentUtils { let GeneratedDestructArray_1 = taskInfo.targetValue.split(':'); let hourStr = GeneratedDestructArray_1[0]; let minuteStr = GeneratedDestructArray_1[1]; - let displayText = uIContext.getHostContext()?.resourceManager.getStringSync(taskBaseInfo.name.id); - let targetReminderAgent: reminderAgentManager.ReminderRequestAlarm = { - reminderType: reminderAgentManager.ReminderType.REMINDER_TYPE_ALARM, - hour: parseInt(hourStr), - minute: parseInt(minuteStr), - daysOfWeek: [1, 2, 3, 4, 5, 6, 7], - actionButton: [ - { - title: 'close', - type: reminderAgentManager.ActionButtonType.ACTION_BUTTON_TYPE_CLOSE - }, - { - title: 'snooze', - type: reminderAgentManager.ActionButtonType.ACTION_BUTTON_TYPE_SNOOZE + try { + let displayText = uIContext.getHostContext()?.resourceManager.getStringSync(taskBaseInfo.name.id); + let targetReminderAgent: reminderAgentManager.ReminderRequestAlarm = { + reminderType: reminderAgentManager.ReminderType.REMINDER_TYPE_ALARM, + hour: parseInt(hourStr), + minute: parseInt(minuteStr), + daysOfWeek: [1, 2, 3, 4, 5, 6, 7], + actionButton: [ + { + title: 'close', + type: reminderAgentManager.ActionButtonType.ACTION_BUTTON_TYPE_CLOSE + }, + { + title: 'snooze', + type: reminderAgentManager.ActionButtonType.ACTION_BUTTON_TYPE_SNOOZE + }, + ], + wantAgent: { + pkgName: 'com.huawei.healthylife', + abilityName: 'EntryAbility' }, - ], - wantAgent: { - pkgName: 'com.huawei.healthylife', - abilityName: 'EntryAbility' - }, - ringDuration: 10, - snoozeTimes: 2, - timeInterval: 5 * 60, - title: displayText, - content: displayText, - expiredContent: 'this reminder has expired', - snoozeContent: 'remind later', - slotType: notificationManager.SlotType.SOCIAL_COMMUNICATION + ringDuration: 10, + snoozeTimes: 2, + timeInterval: 5 * 60, + title: displayText, + content: displayText, + expiredContent: 'this reminder has expired', + snoozeContent: 'remind later', + slotType: notificationManager.SlotType.SOCIAL_COMMUNICATION + } + return targetReminderAgent; + } catch (error) { + hilog.error(0x0000, TAG, `an error occurred: ${error}`); + return undefined } - return targetReminderAgent; } } \ No newline at end of file diff --git a/features/healthylife/src/main/ets/pages/HealthyLifePage.ets b/features/healthylife/src/main/ets/pages/HealthyLifePage.ets index e3764f0..cf97c92 100644 --- a/features/healthylife/src/main/ets/pages/HealthyLifePage.ets +++ b/features/healthylife/src/main/ets/pages/HealthyLifePage.ets @@ -35,11 +35,15 @@ export struct HealthyLifePage { private windowClass = this.context.windowStage.getMainWindowSync(); async aboutToAppear(): Promise { - await this.windowClass.setWindowLayoutFullScreen(true); - await this.windowClass.setWindowSystemBarProperties({ - statusBarColor: '#00000000', - statusBarContentColor: '#FF000000' - }) + try { + await this.windowClass.setWindowLayoutFullScreen(true); + await this.windowClass.setWindowSystemBarProperties({ + statusBarColor: '#00000000', + statusBarContentColor: '#FF000000' + }) + } catch (error) { + console.error(`an error occurred: ${error}`); + } await DayInfoApi.initDayInfo(convertDate2Str(new Date())); this.achievementStore = await initAchievementStore(); } diff --git a/features/healthylife/src/main/ets/viewmodel/HomeStore.ets b/features/healthylife/src/main/ets/viewmodel/HomeStore.ets index 84a05cf..a7cabb0 100644 --- a/features/healthylife/src/main/ets/viewmodel/HomeStore.ets +++ b/features/healthylife/src/main/ets/viewmodel/HomeStore.ets @@ -113,8 +113,9 @@ function getWeekDates(inputDate: Date, adjustDays: number): Date[] { monday.setDate(inputDate.getDate() - adjustDays - Const.WEEK_DAY_NUM); const dates: Date[] = []; - const currentDate = new Date(monday); for (let i = 0; i < Const.WEEK_DAY_NUM * 3; i++) { + // eslint-disable-next-line @performance/reuse-date-instances-check + const currentDate = new Date(monday); currentDate.setDate(monday.getDate() + i); dates.push(currentDate); } -- Gitee