From: Caisking Date: Tue, 27 Jan 2026 07:14:26 +0000 (+0800) Subject: 关闭运动准备界面的拖拽打印 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b2d567e3aaab1465273b502f9d8e577065aa5f24;p=mirrors%2FFD230.git 关闭运动准备界面的拖拽打印 --- diff --git a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp index e229ca6a2..e2791250d 100644 --- a/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp +++ b/code/sdk/application/wearable/fd272/nativeapp/nativeui/traing/src/TraingNomalPresenter.cpp @@ -101,7 +101,7 @@ namespace OHOS { UNUSED(view); // 在拖拽过程中不处理退出,只允许事件继续传播 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingNomalPresenter::OnDrag"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingNomalPresenter::OnDrag"); return true; } @@ -109,7 +109,7 @@ namespace OHOS { UNUSED(view); // 在拖拽结束时判断是否满足退出条件 - WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "TraingNomalPresenter::OnDragEnd"); + WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "TraingNomalPresenter::OnDragEnd"); if (event.GetDragDirection() == DragEvent::DIRECTION_LEFT_TO_RIGHT) { NavigateBack(); @@ -129,7 +129,7 @@ namespace OHOS return targetViewId; } - #if defined(SUPPORT_GNSS) + #if defined(SUPPORT_GNSS) // 需要GPS,先检查星历是否有效 bool ephemeris_valid = EphemerisDownloadModel::GetInstance().GetValidityPeriod(); if (!ephemeris_valid) @@ -150,7 +150,7 @@ namespace OHOS // 星历有效且GPS已连接,可以进入运动卡片 WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GPS条件满足,进入运动卡片"); - #endif + #endif return targetViewId; } diff --git a/code/sdk/zhihui/utils/custom_utils.c b/code/sdk/zhihui/utils/custom_utils.c index a5c459c65..eba39bc77 100644 --- a/code/sdk/zhihui/utils/custom_utils.c +++ b/code/sdk/zhihui/utils/custom_utils.c @@ -400,14 +400,12 @@ void shutdown_reboot_prejobs_task(void) PRINT("shutdown_reboot_prejobs_task: C_ScheduleDataWriteToFile() completed\r\n"); #endif #endif - // mmi_sleep_mode_switch_write();//不需要保存 PRINT("shutdown_reboot_prejobs_task: Calling uapi_save_time_of_day()\r\n"); uapi_save_time_of_day(); PRINT("shutdown_reboot_prejobs_task: uapi_save_time_of_day() completed\r\n"); //保存步数 - // do_cywee_service_check_msg(CYWEE_SERVICE_CMD_SAVE_DATA,NULL); #ifdef SUPPORT_CYWEE_SERVICE PRINT("shutdown_reboot_prejobs_task: Calling cywee_save_data()\r\n"); cywee_save_data(); @@ -415,18 +413,14 @@ void shutdown_reboot_prejobs_task(void) #endif // addressbookTowrite();//同步数据存储 - //ble_sos_data_save();//同步数据存储 //保存信息文件 - #ifdef CUSTOM_ZHIHUI +#ifdef CUSTOM_ZHIHUI PRINT("shutdown_reboot_prejobs_task: Calling saveancsdata()\r\n"); saveancsdata(); //接收到信息进行保存 暂时不修改 PRINT("shutdown_reboot_prejobs_task: saveancsdata() completed\r\n"); - #endif - //保存当天心率数据 - // save_heart_data();//测量完成保存 - // save_heart_maxmin();//存储最大最小状态值 +#endif //表盘配置 // dial_file_save(); @@ -458,26 +452,23 @@ void shutdown_reboot_prejobs_task(void) osDelay(50); PRINT("shutdown_reboot_prejobs_task: Calling reset_deal_with_fs()\r\n"); //同步nand文件系统,重启mount速度快 - // 注意:reset_deal_with_fs() 可能阻塞,如果文件系统有问题可能导致死机 + //注意:reset_deal_with_fs() 可能阻塞,如果文件系统有问题可能导致死机 reset_deal_with_fs(); PRINT("shutdown_reboot_prejobs_task: reset_deal_with_fs() completed\r\n"); osDelay(50); PRINT("shutdown_reboot_prejobs_task: Calling upg_reboot()\r\n"); upg_reboot(); - // upg_reboot() 不会返回 } else if(doing_shutdown_type==SHUTDOWN_TYPE) { PRINT("shutdown_reboot_prejobs_task: SHUTDOWN_TYPE branch\r\n"); uapi_poweroff_device(); - // uapi_poweroff_device() 不会返回 } else if(doing_shutdown_type==REBOOT_TYPE) { PRINT("shutdown_reboot_prejobs_task: REBOOT_TYPE branch\r\n"); uapi_reboot_device(); - // uapi_reboot_device() 不会返回 } else {