1.关闭多余打印(包含player_impl文件的一个打印)

2.解决手表重启立马同步音乐成功后，点击播放按钮不播放需要在切Slice才能播放bug
3.解决在手表只有一首歌曲时候且在播放，手机app删除本地音乐，手表不会会停止当前播放的歌曲bug

diff --git a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
index 5fc0d55..5f66a12 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
@@ -337,7 +337,7 @@ bool AlarmClockModel::JudgeClockModel(uint16_t num)
 uint8_t AlarmClockModel::GetAlarmId(void)
 {
     for (int num = 0; num < CLOCK_MAX; num++) {
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::GetAlarmId alarmId[%d] = %d", num, alarmId[num]);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "AlarmClockModel::GetAlarmId alarmId[%d] = %d", num, alarmId[num]);
     }
     for (int num = 0; num < CLOCK_MAX; num++) {
         if (alarmId[num] == 0) { //如果某个元素的值为 0，表示这个 ID 尚未被使用

diff --git a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp
index bc1379a..b5e9236 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothHeadsetEvent.cpp
@@ -30,7 +30,7 @@ BtAvrcpTgInf g_avrcp_srv_inf;
 \r
 void BtAvrcpVolumeChangedSyncMedia(uint8_t a2dp_volume)\r
 {\r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "[BtAvrcpVolumeChangedSyncMedia]::a2dp_volume = 0x%x\r\n", a2dp_volume);\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[BtAvrcpVolumeChangedSyncMedia]::a2dp_volume = 0x%x\r\n", a2dp_volume);\r
     int32_t audio_volume = a2dp_volume * BT_A2DP_MEDIA_VOL_LEVEL / AVRCP_ABSOLUTE_VOLUME_PERCENTAGE_100;\r
     AudioManager::GetInstance().SetVolume(AUDIO_STREAM_A2DP_MUSIC, audio_volume); /* 设置增益音量 */\r
     g_avrcp_tg_local_media_vol = a2dp_volume;\r
@@ -97,7 +97,7 @@ void PressButtonStatusCallback(td_u32 keyOperation, td_u32 keyValue)
 void BtAvrcpTgNotifyVolumeChangedProc(uint8_t a2dp_volume)\r
 {\r
     int32_t audio_volume = a2dp_volume * BT_A2DP_MEDIA_VOL_LEVEL / AVRCP_ABSOLUTE_VOLUME_PERCENTAGE_100;\r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "NotifyVolume = %d", audio_volume);\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "NotifyVolume = %d", audio_volume);\r
     AudioManager::GetInstance().SetVolume(AUDIO_STREAM_MUSIC, audio_volume); // 耳机连接手表场景调节手表音量\r
     /* ---------------------------- 若当前音乐播放器为手机音乐则同步更新音乐播放器的声音进度条 --------------------------- */\r
     if(PlayersModel::GetInstance()->GetMusicSource())\r
@@ -161,11 +161,11 @@ uint8_t BtAvrcpTgGetLocMediaVolume(void)
     if (g_avrcp_tg_local_media_vol == AVRCP_ABSOLUTE_VOLUME_INVALID) {\r
         int32_t audio_volume = AudioManager::GetInstance().GetVolume(AUDIO_STREAM_A2DP_MUSIC);\r
         uint8_t a2dp_volume = (uint8_t)(audio_volume * AVRCP_ABSOLUTE_VOLUME_PERCENTAGE_100 / BT_A2DP_MEDIA_VOL_LEVEL);\r
-        WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "audio_volume 0x%x, a2dp_volume 0x%x\n", audio_volume, a2dp_volume);\r
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "audio_volume 0x%x, a2dp_volume 0x%x\n", audio_volume, a2dp_volume);\r
         g_avrcp_tg_local_media_vol = a2dp_volume;\r
     }\r
 \r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "get local media volume, a2dp_volume = 0x%x", g_avrcp_tg_local_media_vol);\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "get local media volume, a2dp_volume = 0x%x", g_avrcp_tg_local_media_vol);\r
     return g_avrcp_tg_local_media_vol;\r
 }\r
 \r
@@ -234,7 +234,7 @@ static bd_addr_t *BtAvrcpSrvGetActiveAddr(void)
 \r
 void ConnectTgStateChangedCallback(const bd_addr_t *bdAddr, profile_connect_state_t state)\r
 {\r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "avrcp tg update conn stat:%u", state);\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "avrcp tg update conn stat:%u", state);\r
     if (bdAddr == nullptr) {\r
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "bdaddr nullptr");\r
         return;\r
@@ -344,7 +344,7 @@ static void BtAvrcpPressReleaseButtonLog(uint32_t key_operation)
 static void BtAvrcpCtReleaseButtonRspCallback(const bd_addr_t *bd_addr, int32_t key_operation)\r
 {\r
     UNUSED(bd_addr);\r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "avrcp ct release button cbk key:%x\n", key_operation);\r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "avrcp ct release button cbk key:%x\n", key_operation);\r
     if (g_avrcp_srv_inf.avrcp_button_flag == AVRCP_SRV_PRESS_VALUE) {\r
         WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "avrcp ct released button button_flag change:%u->%u\n",\r
             g_avrcp_srv_inf.avrcp_button_flag, AVRCP_SRV_RELEASED_VALUE);\r
@@ -453,7 +453,7 @@ static void BtAvrcpCtGetPlayStatusCallback(const bd_addr_t *bd_addr, avrcp_ct_pl
 \r
 static void BtAvrcpCtHdlNotifyVolumeRspCbk(avrcp_ct_notification_value_cb_t *notification)\r
 {\r
-    WEARABLE_LOGI(WEARABLE_LOG_MODULE_APP, "[BtAvrcpCtHdlNotifyVolumeRspCbk] volume: 0x%x\n", \r
+    WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "[BtAvrcpCtHdlNotifyVolumeRspCbk] volume: 0x%x\n", \r
     notification->volume); /* 注册事件后通知的音量 */\r
     BtAvrcpTgNotifyVolumeChangedProc((uint8_t)notification->volume);\r
 }\r

diff --git a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
index 255ad68..4d76846 100644 (file)
--- a/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/player/src/PlayersModel.cpp
@@ -255,6 +255,8 @@ int PlayersModel::PlayerInit(void)
     sliceId = PlayersListGroup::GetInstance()->GetCase(currentIndex);
     if (sliceId == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "GetCase %d sliceId err !!!", currentIndex);
+        PlayersModel::GetInstance()->PlayerStop(); /*停止音乐*/
+        PlayersModel::GetInstance()->ClearActivateAudioInterrupt();
         char strFile[BUFFER_SIZE] = "No music files";
         sliceId = strFile;
     }
@@ -759,13 +761,13 @@ void  PlayersModel::GetDuration(int64_t &duration)
 bool PlayersModel::CreateMusicPlayDirectory(const char* path)
 {
     if (access(path, F_OK) == -1) {  // 如果路径不存在
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Directory %s not exist, creating directory\n", path);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Directory %s not exist, creating directory\n", path);
         if (mkdir(path, 0777)!= 0) {  // 尝试创建目录，如果创建失败
-            WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Create directory %s failed\n", path);
+            WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Create directory %s failed\n", path);
             return false;
         }
     } else {  // 如果路径存在
-        WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "Directory %s already exists\n", path);
+        WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "Directory %s already exists\n", path);
     }
     return true;
 }
@@ -791,6 +793,7 @@ void PlayersModel::UpdateMusicPlayerList(void)
 {
     WEARABLE_LOGD(WEARABLE_LOG_MODULE_APP, "PlayersModel::UpdateMusicPlayerList");
     PlayersListGroup::GetInstance()->SetUpListCase();
+    PlayersModel::GetInstance()->PlayerInit();
     PlayersView *playersView = PlayersView::GetInstance();
     if (playersView == nullptr) {
         WEARABLE_LOGE(WEARABLE_LOG_MODULE_APP, "OptionsButtonOnClick playersView nullptr err");

diff --git a/code/sdk/middleware/services/media/foundation/player/frameworks/player_impl.cpp b/code/sdk/middleware/services/media/foundation/player/frameworks/player_impl.cpp
index 42dc934..2f250a1 100755 (executable)
--- a/code/sdk/middleware/services/media/foundation/player/frameworks/player_impl.cpp
+++ b/code/sdk/middleware/services/media/foundation/player/frameworks/player_impl.cpp
@@ -665,7 +665,7 @@ bool Player::PlayerImpl::IsSingleLooping()
 
 int32_t Player::PlayerImpl::GetPlayerState(int32_t &state)
 {
-    MEDIA_INFO_LOG("process in");
+    // MEDIA_INFO_LOG("process in");//关闭这个打印
     MediaMutexLock(lock_);
     CHECK_FAILED_RETURN_WITH_UNLOCK(released_, false, -1, "have released or not create", lock_);
     state = currentState_;
@@ -1481,10 +1481,10 @@ void Player::PlayerImpl::PrintAudioAndVideoDumpInfo(const PlayerAudioDebugInfo *
 
 void Player::PlayerImpl::PrintPlayerDumpInfo(const PlayerDebugInfo *playerInfo)
 {
-    if (formatFileInfo_.s64Duration != -1) {\r
-        printf("-----------Player file info-----------\n");\r
-        PrintFileDumpInfo(&playerInfo->fileDebugInfo);\r
-        printf("\n");\r
+    if (formatFileInfo_.s64Duration != -1) {
+        printf("-----------Player file info-----------\n");
+        PrintFileDumpInfo(&playerInfo->fileDebugInfo);
+        printf("\n");
     }
     if (player_ != nullptr) {
         printf("-----------Player stream info-----------\n");
@@ -1503,40 +1503,40 @@ void Player::PlayerImpl::PlayerThreadCondSignal(void)
 
 int32_t Player::PlayerImpl::DumpInfo(PlayerDebugInfo *playerInfo)
 {
-    if (playerInfo == nullptr) {\r
-        MEDIA_ERR_LOG("playerInfo is NULL!");\r
-        return -1;\r
+    if (playerInfo == nullptr) {
+        MEDIA_ERR_LOG("playerInfo is NULL!");
+        return -1;
     }
     playerInfo->fileDebugInfo.streamType = audioStreamType_;
-    if (formatFileInfo_.s64Duration != -1) {\r
-        playerInfo->fileDebugInfo.s64StartTime = formatFileInfo_.s64StartTime;\r
-        playerInfo->fileDebugInfo.s64Duration = formatFileInfo_.s64Duration;\r
-        playerInfo->fileDebugInfo.s64FileSize = formatFileInfo_.s64FileSize;\r
-        playerInfo->fileDebugInfo.s32UsedAudioStreamIndex = formatFileInfo_.s32UsedAudioStreamIndex;\r
-        playerInfo->fileDebugInfo.s32UsedVideoStreamIndex = formatFileInfo_.s32UsedVideoStreamIndex;\r
-        if (formatFileInfo_.s32UsedVideoStreamIndex >= 0) {\r
-            playerInfo->videoDebugInfo.s32UsedVideoStreamIndex = formatFileInfo_.s32UsedVideoStreamIndex;\r
-        }\r
-        if (formatFileInfo_.s32UsedAudioStreamIndex >= 0) {\r
-            playerInfo->audioDebugInfo.s32UsedAudioStreamIndex = formatFileInfo_.s32UsedAudioStreamIndex;\r
-            playerInfo->audioDebugInfo.sampleFmt = formatFileInfo_.sampleFmt;\r
-            playerInfo->audioDebugInfo.u32SampleRate = formatFileInfo_.u32SampleRate;\r
-            playerInfo->audioDebugInfo.u32AudioChannelCnt = formatFileInfo_.u32AudioChannelCnt;\r
-        }\r
-    }
-    if (player_ != nullptr) {\r
-        player_->GetPlayerControlDumpInfo(playerInfo->playControlInfo);\r
-        playerInfo->playControlInfo.speed = speed_;\r
-        playerInfo->playControlInfo.rewindPosition = rewindPosition_;\r
-        playerInfo->playControlInfo.playerControlState = playerControlState_;\r
-        playerInfo->playControlInfo.isSingleLoop = isSingleLoop_;\r
-        player_->GetPlayerFileDumpInfo(playerInfo->fileDebugInfo);\r
-        if (formatFileInfo_.s32UsedVideoStreamIndex >= 0) {\r
-            player_->GetPlayerVideoDumpInfo(playerInfo->videoDebugInfo);\r
-        }\r
-        if (formatFileInfo_.s32UsedAudioStreamIndex >= 0) {\r
-            player_->GetPlayerAudioDumpInfo(playerInfo->audioDebugInfo);\r
-        }\r
+    if (formatFileInfo_.s64Duration != -1) {
+        playerInfo->fileDebugInfo.s64StartTime = formatFileInfo_.s64StartTime;
+        playerInfo->fileDebugInfo.s64Duration = formatFileInfo_.s64Duration;
+        playerInfo->fileDebugInfo.s64FileSize = formatFileInfo_.s64FileSize;
+        playerInfo->fileDebugInfo.s32UsedAudioStreamIndex = formatFileInfo_.s32UsedAudioStreamIndex;
+        playerInfo->fileDebugInfo.s32UsedVideoStreamIndex = formatFileInfo_.s32UsedVideoStreamIndex;
+        if (formatFileInfo_.s32UsedVideoStreamIndex >= 0) {
+            playerInfo->videoDebugInfo.s32UsedVideoStreamIndex = formatFileInfo_.s32UsedVideoStreamIndex;
+        }
+        if (formatFileInfo_.s32UsedAudioStreamIndex >= 0) {
+            playerInfo->audioDebugInfo.s32UsedAudioStreamIndex = formatFileInfo_.s32UsedAudioStreamIndex;
+            playerInfo->audioDebugInfo.sampleFmt = formatFileInfo_.sampleFmt;
+            playerInfo->audioDebugInfo.u32SampleRate = formatFileInfo_.u32SampleRate;
+            playerInfo->audioDebugInfo.u32AudioChannelCnt = formatFileInfo_.u32AudioChannelCnt;
+        }
+    }
+    if (player_ != nullptr) {
+        player_->GetPlayerControlDumpInfo(playerInfo->playControlInfo);
+        playerInfo->playControlInfo.speed = speed_;
+        playerInfo->playControlInfo.rewindPosition = rewindPosition_;
+        playerInfo->playControlInfo.playerControlState = playerControlState_;
+        playerInfo->playControlInfo.isSingleLoop = isSingleLoop_;
+        player_->GetPlayerFileDumpInfo(playerInfo->fileDebugInfo);
+        if (formatFileInfo_.s32UsedVideoStreamIndex >= 0) {
+            player_->GetPlayerVideoDumpInfo(playerInfo->videoDebugInfo);
+        }
+        if (formatFileInfo_.s32UsedAudioStreamIndex >= 0) {
+            player_->GetPlayerAudioDumpInfo(playerInfo->audioDebugInfo);
+        }
     }
     PrintPlayerDumpInfo(playerInfo);
     return 0;