合并修改,并成功运行
author罗正yun <1732036298@qq.com>
Mon, 4 Dec 2023 01:26:07 +0000 (09:26 +0800)
committer罗正yun <1732036298@qq.com>
Mon, 4 Dec 2023 01:26:07 +0000 (09:26 +0800)
code/sdk/application/wearable/nativeapp/nativelauncher/include/AppViewIDs.h
code/sdk/application/wearable/nativeapp/nativelauncher/include/NativeLauncher.h
code/sdk/application/wearable/nativeapp/nativelauncher/src/NativeLauncher.cpp

index fbf9faf..d0e6551 100644 (file)
@@ -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
index 3735e6b..d8dc064 100644 (file)
@@ -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);       
index 854d18e..56fbf14 100644 (file)
 #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"