diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index f717c7899844c1d76f2e4de2b012d9a80d934e7b..14d413ca6f03a1c08a8fe2a9033c0b8d4ea3177f 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -92,9 +92,10 @@ export default class EntryAbility extends UIAbility {
       let windowClass: window.Window = windowStage.getMainWindowSync();
       let isLayoutFullScreen = true;
       windowClass.setWindowLayoutFullScreen(isLayoutFullScreen).then(() => {
-        console.info('Succeeded in setting the window layout to full-screen mode.');
+        hilog.info(0x0000, 'testTag', '%{public}s', 'Succeeded in setting the window layout to full-screen mode.');
       }).catch((err: BusinessError) => {
-        console.error('Failed to set the window layout to full-screen mode. Cause:' + JSON.stringify(err));
+        hilog.error(0x0000, 'testTag', '%{public}s',
+          `Failed to set the window layout to full-screen mode. Cause:${err}`);
       });
     });
   }
diff --git a/entry/src/main/ets/pages/CustomCalendar.ets b/entry/src/main/ets/pages/CustomCalendar.ets
index 7e66090a0442c5123920ff63cedc451ae39f7486..6fdad8437783f74c8d2eaea8f560d0ce371bf5b0 100644
--- a/entry/src/main/ets/pages/CustomCalendar.ets
+++ b/entry/src/main/ets/pages/CustomCalendar.ets
@@ -16,7 +16,7 @@
 import { CustomCalendarPickerDialog } from '../view/CustomCalendarPickerDialog';
 import { CommonConstants } from '../common/constants/CommonConstants';
 import { getRealTimeDate } from '../viewmodel/GetDate';
-import { dateModel } from '../viewmodel/DateModel';
+import { DateModel } from '../viewmodel/DateModel';
 
 @Entry
 @Component
@@ -31,7 +31,7 @@ export struct CalendarView {
   @State currentMonth: number = 1;
   @State currentDay: number = 1;
   @State currentYear: number = 1;
-  @StorageLink('selectedDate') dateModel: dateModel = new dateModel(0, 0, 0, 0);
+  @StorageLink('selectedDate') dateModel: DateModel = new DateModel(0, 0, 0, 0);
 
   aboutToAppear(): void {
     this.dateModel = getRealTimeDate();
diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets
index d391142a92817266c9af449079b4d063b70b7eec..3e5b342c6cab8394b7a20e6e88fbd6559726ed3c 100644
--- a/entry/src/main/ets/pages/Index.ets
+++ b/entry/src/main/ets/pages/Index.ets
@@ -15,7 +15,7 @@
 
 import { router } from '@kit.ArkUI';
 import { CommonConstants } from '../common/constants/CommonConstants';
-import { titleModel } from '../viewmodel/DateModel';
+import { TitleModel } from '../viewmodel/DateModel';
 
 @Entry
 @Component
@@ -24,15 +24,15 @@ struct Index {
   @StorageLink('bottomRectHeight') bottomRectHeight: number = 0;
   @StorageLink('currentBreakpoint') curBp: string = CommonConstants.BREAK_POINT_SM;
   scroller: Scroller = new Scroller();
-  titleList: Array<titleModel> = [
-    new titleModel($r('app.string.scroll_option'), 'pages/ScrollOption'),
-    new titleModel($r('app.string.dialog_name'), 'pages/BindContentCoverDemo'),
-    new titleModel($r('app.string.bind_sheet_dialog'), 'pages/BindSheet'),
-    new titleModel($r('app.string.toast_dialog'), 'pages/Toast'),
-    new titleModel($r('app.string.toast_private_dialog'), 'pages/Privacy'),
-    new titleModel($r('app.string.full_screen'), 'pages/FullScreen'),
-    new titleModel($r('app.string.calendar_dialog'), 'pages/CustomCalendar'),
-    new titleModel($r('app.string.two_level_dialog'), 'pages/TwoLevelPageSheet')
+  titleList: Array<TitleModel> = [
+    new TitleModel($r('app.string.scroll_option'), 'pages/ScrollOption'),
+    new TitleModel($r('app.string.dialog_name'), 'pages/BindContentCoverDemo'),
+    new TitleModel($r('app.string.bind_sheet_dialog'), 'pages/BindSheet'),
+    new TitleModel($r('app.string.toast_dialog'), 'pages/Toast'),
+    new TitleModel($r('app.string.toast_private_dialog'), 'pages/Privacy'),
+    new TitleModel($r('app.string.full_screen'), 'pages/FullScreen'),
+    new TitleModel($r('app.string.calendar_dialog'), 'pages/CustomCalendar'),
+    new TitleModel($r('app.string.two_level_dialog'), 'pages/TwoLevelPageSheet')
   ];
 
   @Builder
@@ -85,11 +85,11 @@ struct Index {
     Navigation() {
       Column() {
         Grid() {
-          ForEach(this.titleList, (item: titleModel, index: number) => {
+          ForEach(this.titleList, (item: TitleModel, index: number) => {
             GridItem() {
               this.Options(item.title, item.url, index, this.titleList.length)
             }
-          }, (item: titleModel) => item.title.id.toString())
+          }, (item: TitleModel) => item.title.id.toString())
         }
         .padding($r('sys.float.padding_level8'))
         .height(CommonConstants.FULL_PERCENT)
diff --git a/entry/src/main/ets/pages/Privacy.ets b/entry/src/main/ets/pages/Privacy.ets
index de0f726d1d39db7873b1b9015a028cb768a0f5c4..199481a7be3d8f6c5b9138bad2c13814331061d3 100644
--- a/entry/src/main/ets/pages/Privacy.ets
+++ b/entry/src/main/ets/pages/Privacy.ets
@@ -15,6 +15,7 @@
 
 import { router } from '@kit.ArkUI';
 import { CommonConstants } from '../common/constants/CommonConstants';
+import { hilog } from '@kit.PerformanceAnalysisKit';
 
 @Entry
 @Component
@@ -35,8 +36,6 @@ struct Privacy {
     }),
     alignment: DialogAlignment.Center,
     onWillDismiss: (dismissDialogAction: DismissDialogAction) => {
-      console.info('reason=' + JSON.stringify(dismissDialogAction.reason));
-      console.info('dialog onWillDismiss');
       if (dismissDialogAction.reason === DismissReason.PRESS_BACK) {
         dismissDialogAction.dismiss();
       }
@@ -48,11 +47,11 @@ struct Privacy {
   controller?: CustomDialogController;
 
   onCancel() {
-    console.info('Callback when the first button is clicked');
+    hilog.info(0x0000, 'Privacy', '%{public}s', 'Callback when the first button is clicked');
   }
 
   onAccept() {
-    console.info('Callback when the second button is clicked');
+    hilog.info(0x0000, 'Privacy', '%{public}s', 'Callback when the second button is clicked');
   }
 
   build() {
diff --git a/entry/src/main/ets/view/AddPassengers.ets b/entry/src/main/ets/view/AddPassengers.ets
index 7422b6d4765f60f88de7a48388068ba472390616..977d2d992b12f00a0c978b58862552af55338fb2 100644
--- a/entry/src/main/ets/view/AddPassengers.ets
+++ b/entry/src/main/ets/view/AddPassengers.ets
@@ -34,7 +34,7 @@ export struct AddPassengers {
     try {
       resourceString = getContext(this).resourceManager.getStringSync(resource.id);
     } catch (error) {
-      hilog.error(0x0000, '[getResourceString]', `getResourceString err: ${JSON.stringify(error)}`);
+      hilog.error(0x0000, '[getResourceString]', `getResourceString err: ${error}`);
     }
     return resourceString;
   }
diff --git a/entry/src/main/ets/view/CustomCalendarPickerDialog.ets b/entry/src/main/ets/view/CustomCalendarPickerDialog.ets
index caf43774ae021c53606a049ff46a8dc3a90a3bb6..419f8a7266dffe62074d97dcbea8ebaec3219937 100644
--- a/entry/src/main/ets/view/CustomCalendarPickerDialog.ets
+++ b/entry/src/main/ets/view/CustomCalendarPickerDialog.ets
@@ -18,7 +18,7 @@ import { MonthDataSource, Month } from '../viewmodel/MonthDataSource';
 import { CommonConstants } from '../common/constants/CommonConstants';
 import { DataManager } from '../viewmodel/DataManager';
 import { getMonthDate } from '../viewmodel/GetDate';
-import { dateModel } from '../viewmodel/DateModel';
+import { DateModel } from '../viewmodel/DateModel';
 
 @CustomDialog
 export struct CustomCalendarPickerDialog {
@@ -36,7 +36,7 @@ export struct CustomCalendarPickerDialog {
   @Link currentMonth: number;
   @Link currentDay: number;
   @Link currentYear: number;
-  @StorageLink('selectedDate') dateModel: dateModel = new dateModel(0, 0, 0, 0);
+  @StorageLink('selectedDate') dateModel: DateModel = new DateModel(0, 0, 0, 0);
   controller: CustomDialogController;
   cancel: () => void = () => {
   };
diff --git a/entry/src/main/ets/view/DefaultList.ets b/entry/src/main/ets/view/DefaultList.ets
index 5224d3d61e62639d15a83ea9ccb48abfda432518..913253369c2b9fbd8b0f954c55f7d67ff739536d 100644
--- a/entry/src/main/ets/view/DefaultList.ets
+++ b/entry/src/main/ets/view/DefaultList.ets
@@ -33,7 +33,7 @@ export struct DefaultList {
     try {
       resourceString = getContext(this).resourceManager.getStringSync(resource.id);
     } catch (error) {
-      hilog.error(0x0000, '[getResourceString]', `getResourceString err: ${JSON.stringify(error)}`);
+      hilog.error(0x0000, '[getResourceString]', `getResourceString err: ${error}`);
     }
     return resourceString;
   }
diff --git a/entry/src/main/ets/viewmodel/DataManager.ets b/entry/src/main/ets/viewmodel/DataManager.ets
index e582719f90405efa69e2e8dbfe6b870d28a7aefe..53bd6186a441f2a7017d81ef2984156b4ceb646a 100644
--- a/entry/src/main/ets/viewmodel/DataManager.ets
+++ b/entry/src/main/ets/viewmodel/DataManager.ets
@@ -12,13 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import dataPreferences from '@ohos.data.preferences';
-import { dateModel } from './DateModel';
+import { DateModel } from './DateModel';
 import { getRealTimeDate } from './GetDate';
 
 export class DataManager {
-  static getDate(context: Context, callback: (dateModel: dateModel) => void) {
-    let dateModel: dateModel = getRealTimeDate();
+  static getDate(context: Context, callback: (dateModel: DateModel) => void) {
+    let dateModel: DateModel = getRealTimeDate();
     try {
       let promise = dataPreferences.getPreferences(context, 'date');
       promise.then((object: dataPreferences.Preferences) => {
@@ -27,7 +28,7 @@ export class DataManager {
           getPromise.then((data: dataPreferences.ValueType) => {
             let dateSting = data as string;
             if (dateSting.length > 0) {
-              dateModel = JSON.parse(dateSting) as dateModel;
+              dateModel = JSON.parse(dateSting) as DateModel;
               callback(dateModel);
             } else {
               callback(dateModel);
@@ -46,7 +47,7 @@ export class DataManager {
     }
   }
 
-  static setDate(context: Context, dateModel: dateModel, callback: () => void) {
+  static setDate(context: Context, dateModel: DateModel, callback: () => void) {
     try {
       let promise = dataPreferences.getPreferences(context, 'date');
       promise.then((object: dataPreferences.Preferences) => {
@@ -55,7 +56,7 @@ export class DataManager {
           setPromise.then(() => {
             let flushPromise = object.flush();
             flushPromise.then(() => {
-              AppStorage.setOrCreate<dateModel>('selectedDate', dateModel);
+              AppStorage.setOrCreate<DateModel>('selectedDate', dateModel);
               callback();
             }).catch(() => {
               callback();
@@ -83,7 +84,7 @@ export class DataManager {
           deletePromise.then(() => {
             let flushPromise = object.flush();
             flushPromise.then(() => {
-              AppStorage.setOrCreate<dateModel>('selectedDate', undefined);
+              AppStorage.setOrCreate<DateModel>('selectedDate', undefined);
               callback();
             }).catch(() => {
             })
diff --git a/entry/src/main/ets/viewmodel/DateModel.ets b/entry/src/main/ets/viewmodel/DateModel.ets
index 5fa1b7c975146f4fa6c94f880481bcef5f20e99d..f3df5ce60955609241c0987bc68085215476f79f 100644
--- a/entry/src/main/ets/viewmodel/DateModel.ets
+++ b/entry/src/main/ets/viewmodel/DateModel.ets
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-export class dateModel {
+export class DateModel {
   public day: number;
   public week: number;
   public month: number;
@@ -27,7 +27,7 @@ export class dateModel {
   }
 }
 
-export class titleModel {
+export class TitleModel {
   public title: Resource;
   public url: string;
 
diff --git a/entry/src/main/ets/viewmodel/GetDate.ets b/entry/src/main/ets/viewmodel/GetDate.ets
index 613e28d9effe75bc9f1d031fa5b68a0f4b00a084..dbd1c43a84e409da02105532efc4a079aaa8afb5 100644
--- a/entry/src/main/ets/viewmodel/GetDate.ets
+++ b/entry/src/main/ets/viewmodel/GetDate.ets
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { dateModel } from './DateModel';
+import { DateModel } from './DateModel';
 
 export function getMonthDate(specifiedMonth: number, specifiedYear: number): number[] {
   let currentFirstWeekDay: number = 0;
@@ -34,13 +34,13 @@ export function getMonthDate(specifiedMonth: number, specifiedYear: number): num
   return currentAllDay;
 }
 
-export function getRealTimeDate(): dateModel {
+export function getRealTimeDate(): DateModel {
   const nowDate = new Date();
   let currentMonth = nowDate.getMonth() + 1;
   let currentDay = nowDate.getDate();
   let currentYear = nowDate.getFullYear();
   let currentWeekDay = new Date(currentYear, currentMonth - 1, currentDay).getDay();
-  let nowDateModel = new dateModel(0, 0, 0, 0);
+  let nowDateModel = new DateModel(0, 0, 0, 0);
   nowDateModel.day = currentDay;
   nowDateModel.week = currentWeekDay;
   nowDateModel.month = currentMonth;
diff --git a/entry/src/main/ets/viewmodel/MonthDataSource.ets b/entry/src/main/ets/viewmodel/MonthDataSource.ets
index 70eae89d1ddafc347acfcff7cbc71f4e7e8cd7b6..ff3c4d1ec1ae93057652a6d961b55342e85b598d 100644
--- a/entry/src/main/ets/viewmodel/MonthDataSource.ets
+++ b/entry/src/main/ets/viewmodel/MonthDataSource.ets
@@ -33,7 +33,6 @@ export class MonthDataSource implements IDataSource {
 
   registerDataChangeListener(listener: DataChangeListener): void {
     if (this.listeners.indexOf(listener) < 0) {
-      console.info('add listener');
       this.listeners.push(listener);
     }
   }
@@ -41,7 +40,6 @@ export class MonthDataSource implements IDataSource {
   unregisterDataChangeListener(listener: DataChangeListener): void {
     const pos = this.listeners.indexOf(listener);
     if (pos >= 0) {
-      console.info('remove listener');
       this.listeners.splice(pos, 1);
     }
   }