From: 罗正yun <1732036298@qq.com> Date: Sat, 25 Nov 2023 09:36:25 +0000 (+0800) Subject: Merge branch 'master' of https://codeup.aliyun.com/650cfc90ecfe5e6200b6d194/FD230 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=b67138bdd83962e167eb050c28cd01a6bd3e8a78;p=mirrors%2FFD230.git Merge branch 'master' of https://codeup.aliyun.com/650cfc90ecfe5e6200b6d194/FD230 # Conflicts: # code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp # code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_api.a # code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_core.a # code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_drv.a # code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_sample.a # code/sdk/interim_binary/brandy/libs/audio/evb4_standard/liteos/libaudio_vendor.a # code/sdk/interim_binary/brandy/libs/bt/evb_standard/liteos/br/libbt_host_brandy_sample.a # code/sdk/interim_binary/brandy/libs/gpu/evb_standard/libgpu.a # code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_audio_captuer.a # code/sdk/interim_binary/brandy/libs/media/evb_standard/libjs_player.a # code/sdk/tools/pkg/fwpkg/brandy/tempFiles/application.bin --- b67138bdd83962e167eb050c28cd01a6bd3e8a78 diff --cc code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp index f77f9393f,5dec0b82b..b5aff218e --- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp @@@ -94,8 -94,10 +94,9 @@@ #include "blood/include/BloodCheckView.h" #include "blood/include/BloodShowPresenter.h" #include "blood/include/BloodShowView.h" - //#include "blood/include/BloodErrorView.h" - //#include "blood/include/BloodErrorPresenter.h" -#include "blood/include/BloodErrorView.h" + #include "blood/include/BloodErrorPresenter.h" + #include "blood/include/BloodNoteView.h" + #include "blood/include/BloodNotePresenter.h" #include "dial/include/DialPresenter.h" #include "dial/include/DialView.h" #include "displaybrightness/include/DisplayBrightnessPresenter.h"