修改players的编译问题

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h
index 80289c1..920bc87 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/include/BluetoothPresenter.h
@@ -17,6 +17,7 @@
 #include "components/ui_label_button.h"\r
 #include "components/ui_view_group.h"\r
 #include "VolumeSettingView.h"\r
+#include "BluetoothModel.h"\r
 \r
 #include "UiViewId.h"\r
 #include "cmsis_os.h"\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
index 55b24f9..54e9fb1 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/bluetooth/src/BluetoothModel.cpp
@@ -7,7 +7,6 @@
 #include <cstdint>\r
 #include "BluetoothModel.h"\r
 #include "BluetoothModelC.h"\r
-\r
 #include "BluetoothWrapper.h"\r
 #include "BluetoothPresenter.h"\r
 #include "ConnectPhonePresenter.h"\r
@@ -27,6 +26,8 @@
 #include "bts_pbap.h"\r
 #include "ConfigModelC.h"\r
 #include "custom_utils.h"\r
+#include "custom_runtime.h"\r
+\r
 #ifdef SUPPORT_ALIPAY_SEC\r
 #include "alipay_feature.h"\r
 #endif\r
@@ -36,9 +37,13 @@
 #include "audio_manager_c_wrapper.h"\r
 #include "bts_avrcp_target.h"\r
 #include "msg_center_msg.h"\r
+#include "client/msg_center_client.h"\r
+#include "msg_center_protocol.h"\r
 #include "dfx_channel.h"\r
 #include "tcxo.h"\r
-#include "custom_runtime.h"\r
+#include "ui_service.h"\r
+#include "font/ui_font_header.h"\r
+\r
 \r
 #ifdef SUPPORT_BLE_SERVICE\r
 #include <bleEvent.h>\r
@@ -437,10 +442,13 @@ void BluetoothModel::SetUpConnedDevicesList()
     }\r
     SetConnedDevicesListClear();\r
     unsigned int connedDevicesNum = 0;\r
+\r
+    #ifdef SUPPORT_BLE_SERVICE\r
     int btpower = uapi_dev_runtime_get_bt_powerstat();\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BT Power %s , Setup GetPariedDevicesNum ret = %d, num = %d", btpower==1?"On":"Off",ret, connedDevicesNum);\r
+    #endif\r
 \r
     bool ret = gap_get_paired_devices_num(&connedDevicesNum);\r
-    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "BT Power %s , Setup GetPariedDevicesNum ret = %d, num = %d", btpower==1?"On":"Off",ret, connedDevicesNum);\r
 \r
     gap_paired_device_info_t *devInfo = (gap_paired_device_info_t*)malloc(sizeof(gap_paired_device_info_t) *connedDevicesNum);\r
     if (devInfo ==  nullptr) {\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainPresenterSample.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainPresenterSample.h
index 39e323e..d544024 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainPresenterSample.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/MainPresenterSample.h
@@ -15,7 +15,8 @@
 #include "MainModel.h"
 #include "MainViewSample.h"
 #include "ModelListenerSample.h"
-#include "PlayersView.h"
+#include "player/include/PlayersView.h"
+
 #include "Presenter.h"
 #include "components/root_view.h"
 #include "components/ui_swipe_view.h"

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingPresenter.h
index a303b90..d3e1bfd 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingPresenter.h
@@ -12,7 +12,7 @@
 #include "components/ui_view_group.h"
 #include "components/ui_slider.h"
 #include "VolumeSettingView.h"
-#include "PlayersView.h"
+// #include "player/include/PlayersView.h"
 
 namespace OHOS {
 #define INCREASE_BUTTON "increaseButton"

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingView.h
index ac3db83..ade8d22 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingView.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/include/VolumeSettingView.h
@@ -11,7 +11,7 @@
 #include "components/ui_button.h"\r
 #include "components/ui_view_group.h"\r
 #include "components/ui_slider.h"\r
-#include "PlayersView.h"\r
+\r
 #include "wearable_log.h"\r
 #include "VolumeSettingPresenter.h"\r
 \r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp
index 7981beb..d7ed2f7 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/main/src/VolumeSettingPresenter.cpp
@@ -18,6 +18,7 @@
 #include "notification_manager.h"\r
 #include "BluetoothHeadsetEvent.h"\r
 #include "bts_avrcp_controller.h"\r
+#include "PlayersView.h"\r
 \r
 namespace OHOS {\r
 \r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersModel.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersModel.h
index fc2a792..0ad29d7 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersModel.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersModel.h
@@ -19,6 +19,7 @@
 #include "player/include/PlayersPresenter.h"
 #include "bts_avrcp_controller.h"
 #include "PlayersCaseListAdapter.h"
+#include <unordered_map>
 namespace OHOS {
 using OHOS::Media::Player;
 using OHOS::Media::Source;

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersPresenter.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersPresenter.h
index 2e2267e..72f7a41 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersPresenter.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersPresenter.h
@@ -6,8 +6,8 @@
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersPresenter.h\r
  */\r
 \r
-#ifndef MUSIC_PLAYERS_PRESENTER_H\r
-#define MUSIC_PLAYERS_PRESENTER_H\r
+#ifndef PLAYERS_PRESENTER_H\r
+#define PLAYERS_PRESENTER_H\r
 #include "gfx_utils/list.h"\r
 #include "ohos_types.h"\r
 #include "components/ui_view.h"\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersView.h b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersView.h
index 2176157..53bf930 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersView.h
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/include/PlayersView.h
@@ -6,8 +6,10 @@
  * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/player/include/PlayersView.h\r
  */\r
 \r
-#ifndef MUSIC_PLAYERS_VIEW_H\r
-#define MUSIC_PLAYERS_VIEW_H\r
+#ifndef PLAYERS_VIEW_H\r
+#define PLAYERS_VIEW_H\r
+\r
+#include "player/include/PlayersPresenter.h"\r
 \r
 #include <string>\r
 #include "components/ui_image_view.h"\r

diff --git a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/MusicPlayerTipView.cpp b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/MusicPlayerTipView.cpp
index a615883..e8ee300 100644 (file)
--- a/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/MusicPlayerTipView.cpp
+++ b/code/sdk/application/wearable/fd230/nativeapp/nativeui/player/src/MusicPlayerTipView.cpp
@@ -7,6 +7,7 @@
  */
 #include "player/include/MusicPlayerTipView.h"
 #include "player/include/PlayersPresenter.h"
+#include "player/include/PlayersView.h"
 #include "player/include/PlayersModel.h"
 #include "wearable_log.h"
 #include "UiConfig.h"

diff --git a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp
index 29c369a..118bb32 100644 (file)
--- a/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp
+++ b/code/sdk/application/wearable/fd230/service/msg_center/src/notify/makephone_notification.cpp
@@ -17,8 +17,13 @@
 #include "VolumeSettingView.h"\r
 #include "VolumeSettingPresenter.h"\r
 #include "ui_resource_image.h"\r
+#include "audio_manager.h"\r
 \r
 namespace OHOS {\r
+\r
+using namespace Audio;\r
+using Audio::AudioManager;\r
+\r
 constexpr int32_t NOTIFY_THREE_SECONDS = 3000;\r
 constexpr int32_t NOTIFY_ONE_SECOND = 1000;\r
 constexpr int32_t NOTIFY_THIRTY_SECONDS = 30000;\r