From: 罗正yun <1732036298@qq.com> Date: Mon, 4 Dec 2023 01:26:07 +0000 (+0800) Subject: 合并修改,并成功运行 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=fff7cf7b1b2c0dcb2a85e56dd2c00b5394b5f344;p=mirrors%2FFD230.git 合并修改,并成功运行 --- diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h index fbf9faf57..d0e655136 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h @@ -106,7 +106,9 @@ typedef enum : uint16_t VIEW_CONNECT_BLUETOOTH, // 蓝牙 VIEW_SOUND_VIBRATION, // 声音与震动 VIEW_SYSTEM_VOLUME, // 系统音量 - VIEW_QUICK_ACCESS, // 快速访问 + VIEW_CALL_VOLUME, // 通话音量 + VIEW_MEDIA_VOLUME, // 媒体音量 + VIEW_SECONDARY_FUNCTION, //辅助功能 VIEW_SYSTEM, // 系统 // 系统 VIEW_SYSTEM_ABOUT_WATCH, // 系统:关于手表 @@ -118,7 +120,7 @@ typedef enum : uint16_t VIEW_BRIGHTNESS_CONTROL, // 亮度调节 VIEW_SCREEN_DURATION, // 亮屏时长 //按键按下进入的视图 - VIEW_SECONDARY_FUNCTION, //辅助功能 + VIEW_QUICK_ACCESS, // 快速访问 VIEW_FAST_TRAINING, //快速训练 VIEW_FAST_TRAINING_ATTENTION,//快速训练项目选择超出提示 VIEW_MAX_INTER_APP, // 在此之前添加native应用ID diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h index 3735e6bbf..d8dc064ca 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h @@ -69,7 +69,9 @@ public: void InitBrightnessControlSlice(void); void InitScreenDurationSlice(void); void InitSoundAndVibrationSlice(void); - void InitSystemVolumeSlice(void); + void InitSystemVolumeSlice(void); + void InitCallVolumeSlice(void); + void InitMediaVolumeSlice(void); void InitQuickAccessSlice(void); void InitSystemSlice(void); void InitSystemAboutWatchSlice(void); diff --git a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp index 854d18e2b..56fbf1471 100644 --- a/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp +++ b/code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp @@ -117,8 +117,12 @@ #include "soundandvibration/include/SoundAndVibrationView.h" #include "soundandvibration/include/SystemVolumePresenter.h" #include "soundandvibration/include/SystemVolumeView.h" -#include "quickaccess/include/QuickAccessPresenter.h" -#include "quickaccess/include/QuickAccessView.h" +#include "soundandvibration/include/CallVolumePresenter.h" +#include "soundandvibration/include/CallVolumeView.h" +#include "soundandvibration/include/MediaVolumePresenter.h" +#include "soundandvibration/include/MediaVolumeView.h" +#include "secondaryfunction/include/QuickAccessPresenter.h" +#include "secondaryfunction/include/QuickAccessView.h" #include "system/include/SystemPresenter.h" #include "system/include/SystemView.h" #include "system/include/SystemAboutPresenter.h"