From: SnickerSun Date: Wed, 4 Sep 2024 09:48:10 +0000 (+0800) Subject: 解决 user 离线日志版本编译问题 X-Git-Tag: release_V1.2.70_20241020_135402~529^2~12^2~3 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=3708bf6c91008b75d6b30a3313f7aae979f6eb9a;p=mirrors%2FFD230.git 解决 user 离线日志版本编译问题 --- diff --git a/code/sdk/application/wearable/ohos_deps/wearable_log.h b/code/sdk/application/wearable/ohos_deps/wearable_log.h index cda4bc90e..ba483c16a 100755 --- a/code/sdk/application/wearable/ohos_deps/wearable_log.h +++ b/code/sdk/application/wearable/ohos_deps/wearable_log.h @@ -50,17 +50,18 @@ typedef enum { #if !defined(SW_UART_DEBUG) && !defined(SW_RTT_DEBUG) -#ifdef WEARABLE_LOG_DEBUG #define WEARABLE_LOGE(mod, fmt, arg...) uapi_diag_error_log(0, fmt, ##arg) #define WEARABLE_LOGW(mod, fmt, arg...) uapi_diag_warning_log(0, fmt, ##arg) #define WEARABLE_LOGI(mod, fmt, arg...) uapi_diag_info_log(0, fmt, ##arg) +#ifdef WEARABLE_LOG_DEBUG #define WEARABLE_LOGD(mod, fmt, arg...) uapi_diag_debug_log(0, fmt, ##arg) #else +// #define WEARABLE_LOGE(mod, fmt, arg...) +// #define WEARABLE_LOGW(mod, fmt, arg...) +// #define WEARABLE_LOGI(mod, fmt, arg...) #define WEARABLE_LOGD(mod, fmt, arg...) -#define WEARABLE_LOGE(mod, fmt, arg...) -#define WEARABLE_LOGW(mod, fmt, arg...) -#define WEARABLE_LOGI(mod, fmt, arg...) #endif + #else #define WEARABLE_LOGE(mod, fmt, arg...) PRINT("[WEARABLE E/] %s: " fmt "\n", __FUNCTION__, ##arg) #define WEARABLE_LOGW(mod, fmt, arg...) PRINT("[WEARABLE W/] %s: " fmt "\n", __FUNCTION__, ##arg) diff --git a/code/sdk/middleware/chips/brandy/dfx/include/log_def_app.h b/code/sdk/middleware/chips/brandy/dfx/include/log_def_app.h index ac157e7f9..4c32a341d 100755 --- a/code/sdk/middleware/chips/brandy/dfx/include/log_def_app.h +++ b/code/sdk/middleware/chips/brandy/dfx/include/log_def_app.h @@ -225,6 +225,252 @@ typedef enum { TOUCH_ACTION_C, ALIPAY_FEATURE_C, ALIPAY_BLUETOOTH_C, + BATTERY_SERVICE_CPP, + UICOMPONENTS_CPP, + PAIRING_NOTIFICATION_CPP, + CHARGE_NOTIFICATION_CPP, + FINDWATCH_NOTIFICATION_CPP, + DRINKREMINDER_NOTIFICATION_CPP, + SEDENTARYREMINDER_NOTIFICATION_CPP, + CONNECTEDSTATUSVIEW_CPP, + BLESERVICE_C, + BLEEVENT_C, + BLETEST_CPP, + TRANSMITTING_CPP, + DIALMODELHEARTRATE_CPP, + MESSAGE_NOTIFICATION_CPP, + DIALMODELPOWER_CPP, + DIALMODELPOWERSTANDBY_CPP, + DIALMODELSPO2_CPP, + PPG_SERVICE_CPP, + UART_SLIP_C, + CAT1_SERVER_HAL_CPP, + CAT1_SERVER_CPP, + BLOODCHECKVIEW_CPP, + BLOODRESULTVIEW_CPP, + BLOODOXYGENMODEL_CPP, + BLOODCARDVIEW_CPP, + CONFIGMODEL_CPP, + REBOOTMODEL_CPP, + SHUTDOWNANIMATORVIEW_CPP, + HEARTBANDOFFVIEW_CPP, + HEARTCHECKVIEW_CPP, + HEARTRESULTVIEW_CPP, + HEARTVIEW_CPP, + HEARTPRESENTER_CPP, + HEALTH_SERVICE_CPP, + SETMAINVIEW_CPP, + MAINCOUNTDOWNPRESENTER_CPP, + COUNTDOWNMODEL_CPP, + MAINCOUNTDOWNVIEW_CPP, + COUNTDOWNTIMENOTNULLVIEW_CPP, + COUNTDOWNTIMECONFIGVIEW_CPP, + STARTCOUNTDOWNVIEW_CPP, + LANGUAGESWITCHVIEW_CPP, + LANGUAGESWITCHPRESENTER_CPP, + MAINSTOPWATCHPRESENTER_CPP, + MAINSTOPWATCHVIEW_CPP, + STOPWATCHMODEL_CPP, + DNOTDISTURBPRESENTER_CPP, + DNOTDISTURBVIEW_CPP, + FLASHLIGHTVIEW_CPP, + NETWORKANDCALLPRESENTER_CPP, + NETWORKANDCALLVIEW_CPP, + MOBILEDATAOPTIONSVIEW_CPP, + FINDPHONEVIEW_CPP, + FINDPHONEMODEL_CPP, + MOTIONRECOGNITIONPRESENTER_CPP, + MOTIONRECOGNITIONVIEW_CPP, + LANGUAGEINIT_CPP, + BRIGHTNESSLEVELVIEW_CPP, + MAINWEATHERPRESENTER_CPP, + FUTUREWEATHERVIEW_CPP, + MAINWEATHERVIEW_CPP, + GETWEATHERDATAERRORVIEW_CPP, + WEATHERREPORTVIEW_CPP, + WEATHERMODEL_CPP, + WEATHERCONTROLVIEW_CPP, + WEATHERVIEW_CPP, + SYSTEMVIEW_CPP, + SYSTEMPRESENTER_CPP, + SYSTEMSUPERVISEVIEW_CPP, + SYSTEMABOUTTHEWATCHVIEW_CPP, + SYSTEMFACTORYRESETVIEW_CPP, + SYSTEMUPGRADE_CPP, + SYSTEMUPDATEMODEL_CPP, + SYSTEMUPDATEPRESENTER_CPP, + SYSTEMUPDATEVIEW_CPP, + WATCHQRCODEPRESENTER_CPP, + WATCHQRCODEVIEW_CPP, + RESPIRATORYTRAININGVIEW_CPP, + RESPIRATORYTRAININGCOMPLETEDVIEW_CPP, + THEMESTYLEMODEL_CPP, + RESPIRATORYTRAININGMODEL_CPP, + AIVOICEVIEW_CPP, + AIVOICEPRESENTER_CPP, + THEMESTYLEVIEW_CPP, + SOUNDANDVIBRATIONPRESENTER_CPP, + SOUNDANDVIBRATIONVIEW_CPP, + SOUNDANDVIBRATIONVOLUMESETTINGVIEW_CPP, + SYSTEMVOLUMEVIEW_CPP, + SOUNDANDVIBRATIONMODEL_CPP, + SOUNDANDVIBRATIONVOLUMESETTINGPRESENTER_CPP, + CALLVOLUMEVIEW_CPP, + VIBRATIONMODEVIEW_CPP, + DISPLAYBRIGHTNESSMODEL_CPP, + DISPLAYBRIGHTNESSVIEW_CPP, + SCREENDURATIONVIEW_CPP, + BRIGHTNESSCONTROLVIEW_CPP, + SECONDARYFUNCTIONPRESENTER_CPP, + SECONDARYFUNCTIONVIEW_CPP, + SECONDARYFUNCTIONMODEL_CPP, + DISPLAYBRIGHTNESSPRESENT_CPP, + QUICKACCESSVIEW_CPP, + CLASSICBLUETOOTHVIEW_CPP, + CLASSICBLUETOOTHPRESENTER_CPP, + BLUETOOTHSERVICEOPTIONSVIEW_CPP, + BLUETOOTHSERVICEOPTIONSPRESENTER_CPP, + RECORDDELETEVIEW_CPP, + RECORDGOINGVIEW_CPP, + RECORDINGPLAYERVIEW_CPP, + RECORDLISTVIEW_CPP, + ROTATEVIEW_CPP, + RECORDINGPRESENTER_CPP, + RECORDINGVIEW_CPP, + RECORDINGVOLUMESETTINGVIEW_CPP, + RECORDINGMODEL_CPP, + MESSAGEPRESENTER_CPP, + MESSAGEVIEW_CPP, + MESSAGEMODEL_CPP, + MESSAGESHOWVIEW_CPP, + MESSAGECARDVIEW_CPP, + MESSAGECONTROLVIEW_CPP, + MESSAGECONTROLPRESENTER_CPP, + TAKEPHOTOSVIEW_CPP, + TAKEPHOTOSMODEL_CPP, + TRAINGVIEW_CPP, + TRAINGSETVIEW_CPP, + TRAINGNOMALPRESENTER_CPP, + TRAINGMODEL_CPP, + TRAINGSETPRESENTER_CPP, + TRAININGSETCALULIVIEW_CPP, + TRAININGSETTIMEVIEW_CPP, + TRAININGSETMILEVIEW_CPP, + TRAININGSETSTEPVIEW_CPP, + TRAINING_CARDPRESENTER_CPP, + TRAINING_CARDVIEW_CPP, + TRAINGCARDPRESENTER_CPP, + TRAINGCARDVIEW_CPP, + TRAININGDETAILVIEW_CPP, + TRAINGRECORDVIEW_CPP, + TRAINGRECORDPRESENTER_CPP, + TRAINGRECORDMODEL_CPP, + PHONEDIRVIEW_CPP, + PHONECALLPRESENTER_CPP, + PHONEDIRPRESENTER_CPP, + PHONEADDRESSMODEL_CPP, + MAINPHONEPRESENTER_CPP, + MAINPHONEVIEW_CPP, + TELEPHONYINITINTERFACE_CPP, + DIALINGMETHODPRESENTER_CPP, + DIALINGMETHODVIEW_CPP, + TESTPRESENTER_CPP, + TESTVIEW_CPP, + TESTABOUT_CPP, + TESTLCD_CPP, + TESTTP_CPP, + TESTCHANGING_CPP, + TESTMAGNETIC_CPP, + TESTLUMINANCE_CPP, + TESTMOTOR_CPP, + TESTSPEAK_CPP, + TESTBUTTON_CPP, + TESTMICROPHONE_CPP, + TESTCAT1_CPP, + TESTGSENSON_CPP, + TESTHRSENSON_CPP, + TESTOLD_CPP, + TESTBT_CPP, + TESTSECHIPTEST_CPP, + MAINGOALPRESENTER_CPP, + MAINGOALVIEW_CPP, + GOALVIEW_CPP, + GOALOTHER_CPP, + GOALHINT_CPP, + GOALCONTROLVIEW_CPP, + MOTION_RECOGNITION_NOTIFICATION_CPP, + SLEEP_NOTIFICATION_CPP, + DROPDOWNCARDPAGE2_CPP, + DROPDOWNCARDPAGE1_CPP, + CUSTOM_UTILSCPP_CPP, + CAT1_CTL_CPP, + CAT1_TCPSERVER_CPP, + DIALMODELWEEKSTR_CPP, + DIALMODELDATESTR_CPP, + DIALMODELHOURMIN_CPP, + CHECKABNORMALPRESENTER_CPP, + CHECKABNORMALVIEW_CPP, + CHECKINVALIDVIEW_CPP, + CHECKINVALIDPRESENTER_CPP, + HEARTDETECTIONVIEW_CPP, + HEARTDETECTIONPRESENTER_CPP, + HEARTRESULTPRESENTER_CPP, + HEARTCHARTVIEW_CPP, + BLOODRESULTPRESENTER_CPP, + BLOODDETECTIONVIEW_CPP, + BLOODDETECTIONPRESENTER_CPP, + MUSICPLAYERBLUETOOTHDISCONVIEW_CPP, + MUSICPLAYERBTCONNECTFAILEDVIEW_CPP, + MUSICPLAYERSOURCEVIEW_CPP, + PLAYERLISTDELSONGVIEW_CPP, + STOPWATCHRECORDCYCLETOLIMITVIEW_CPP, + STOPWATCHRECORDTIMETOLIMITVIEW_CPP, + SYSTEMRESTART_CPP, + SYSTEMSHUTDOWN_CPP, + AIVOICEMODEL_CPP, + AIVOICEBLUETOOTHFAILEDSTARTVIEW_CPP, + AIVOICEMOBILEDATAFAILEDSTARTVIEW_CPP, + AIVOICECONNECTTIMEOUTVIEW_CPP, + AIVOICELISTENINGVIEW_CPP, + AIVOICETHINKINGVIEW_CPP, + AIVOICECHATCONTENTLISTADAPTER_CPP, + APIKEYSDELETEVIEW_CPP, + AIVOICERETURNRESULTTEXTVIEW_CPP, + AIVOICECONNECTINGVIEW_CPP, + APIKEYSPRESENTER_CPP, + NOTSETAPIKEYSVIEW_CPP, + SETAPIKEYSVIEW_CPP, + AIMODELSVIEW_CPP, + AIMODELSMODEL_CPP, + MUSICPLAYERVIEW_CPP, + REBOOTANDSHUTDOWNVIEW_CPP, + REBOOTANDSHUTDOWNMODEL_CPP, + SHUTDOWNIMAGEANIMATORVIEW_CPP, + RECORDINGNUMLIMITVIEW_CPP, + OBUMESSAGEVIEW_CPP, + FACTORYRESETVIEW_CPP, + OBUMESSAGEMODEL_CPP, + SAVEELEVIEW_CPP, + SAVEBATVIEW_CPP, + SLEEPCONTROLVIEW_CPP, + SAVEBATPRESENTER_CPP, + SLEEPVIEW_CPP, + SLEEPTIMEVIEW_CPP, + SLEEPCARDVIEW_CPP, + SLEEPCONTROLPRESENTER_CPP, + SLEEPMODEL_CPP, + SLEEPMODEVIEW_CPP, + CODEDLOCKMODEL_CPP, + CODEDLOCKVIEW_CPP, + CODEDLOCKPRESENTER_CPP, + GOALMODEL_CPP, + SCHEDULEVIEW_CPP, + SCHEDULEPRESENTER_CPP, + SCHEDULELISTITEM_CPP, + SCHEDULELISTADAPTER_CPP, + SCHEDULEMODEL_CPP, + CALCULATORVIEW_CPP, + CALCULATORPRESENTER_CPP, APP_FILE_ID_MAX = 1024, } log_file_list_enum_app_t;