From 114c1af2f7b71cfe289611c7f25abd0932d1abcd Mon Sep 17 00:00:00 2001
From: m0_54007497 <liyangyang87@h-partners.com>
Date: Wed, 27 Aug 2025 19:14:51 +0800
Subject: [PATCH] change log

Signed-off-by: m0_54007497 <liyangyang87@h-partners.com>
---
 .../src/media_key_session_service.cpp         | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/clearplay/hdi_service/src/media_key_session_service.cpp b/clearplay/hdi_service/src/media_key_session_service.cpp
index a81d03cd55..f61a571b3b 100644
--- a/clearplay/hdi_service/src/media_key_session_service.cpp
+++ b/clearplay/hdi_service/src/media_key_session_service.cpp
@@ -373,29 +373,62 @@ int32_t MediaKeySessionService::GetErrorDecryptNumber()
 
 int32_t MediaKeySessionService::GetOfflineKeyFromFile()
 {
+<<<<<<< HEAD
     HDF_LOGI("%{public}s: start", __func__);
     FILE *offlineKeyFile = fopen(offlineKeyFileName, "r+");
     if (offlineKeyFile == NULL) {
         HDF_LOGE("%{public}s: open: \"%{public}s\" failed", __func__, offlineKeyFileName);
         // file do not exist, is allright
+=======
+    CLEARPLAY_HILOGI(ClearPlay::v1_0::COMP_SVC,
+        "%{public}s: start", __func__);
+
+    FILE *offlineKeyFile = fopen(offlineKeyFileName, "r+");
+    if (offlineKeyFile == nullptr) {
+        int saved = errno;
+        CLEARPLAY_HILOGW(ClearPlay::v1_0::COMP_SVC,
+            "%{public}s: open \"%{public}s\" failed, errno=%{public}d, msg=%{public}s",
+            __func__, offlineKeyFileName, saved, strerror(saved));
+        // 文件不存在不是致命错误，可以继续
+>>>>>>> eb25a4356 (change log)
         return HDF_SUCCESS;
     }
+
     char keyIdBase64Chars[keyIdMaxLength];
     char keyValueBase64Chars[keyIdMaxLength];
+<<<<<<< HEAD
     while (fscanf_s(offlineKeyFile, "%s %s", keyIdBase64Chars, sizeof(keyIdBase64Chars), keyValueBase64Chars,
         sizeof(keyValueBase64Chars)) != EOF) {
         std::string tempKeyIdBase64 = keyIdBase64Chars;
         std::string tempKeyValueBase64 = keyValueBase64Chars;
         tempKeyIdBase64.erase(std::remove(tempKeyIdBase64.begin(), tempKeyIdBase64.end(), '\0'), tempKeyIdBase64.end());
+=======
+    while (fscanf_s(offlineKeyFile, "%s %s",
+            keyIdBase64Chars, sizeof(keyIdBase64Chars),
+            keyValueBase64Chars, sizeof(keyValueBase64Chars)) != EOF) {
+        std::string tempKeyIdBase64 = keyIdBase64Chars;
+        std::string tempKeyValueBase64 = keyValueBase64Chars;
+        tempKeyIdBase64.erase(
+            std::remove(tempKeyIdBase64.begin(), tempKeyIdBase64.end(), '\0'),
+            tempKeyIdBase64.end());
+>>>>>>> eb25a4356 (change log)
         offlineKeyIdAndKeyValueBase64_[tempKeyIdBase64] = tempKeyValueBase64;
     }
+
     fclose(offlineKeyFile);
+<<<<<<< HEAD
     HDF_LOGI("%{public}s: end", __func__);
+=======
+
+    CLEARPLAY_HILOGI(ClearPlay::v1_0::COMP_SVC,
+        "%{public}s: end", __func__);
+>>>>>>> eb25a4356 (change log)
     return HDF_SUCCESS;
 }
 
 int32_t MediaKeySessionService::SetOfflineKeyToFile()
 {
+<<<<<<< HEAD
     HDF_LOGI("%{public}s: start", __func__);
     FILE *offlineKeyFile = fopen(offlineKeyFileName, "w+");
     if (offlineKeyFile == NULL) {
@@ -410,6 +443,50 @@ int32_t MediaKeySessionService::SetOfflineKeyToFile()
     offlineKeyIdAndKeyValueBase64_.clear();
     fclose(offlineKeyFile);
     HDF_LOGI("%{public}s: end", __func__);
+=======
+    CLEARPLAY_HILOGI(ClearPlay::v1_0::COMP_SVC,
+        "%{public}s: start", __func__);
+
+    std::ofstream ofs(offlineKeyFileName, std::ios::out | std::ios::trunc);
+    if (!ofs.is_open()) {
+        int saved = errno;
+        offlineKeyIdAndKeyValueBase64_.clear();
+        CLEARPLAY_HILOGE(ClearPlay::v1_0::COMP_SVC,
+            "%{public}s: open \"%{public}s\" failed, errno=%{public}d, msg=%{public}s",
+            __func__, offlineKeyFileName, saved, strerror(saved));
+        return -6;
+    }
+
+    for (const auto &kv : offlineKeyIdAndKeyValueBase64_) {
+        ofs << kv.first << ' ' << kv.second << '\n';
+        if (!ofs.good()) {
+            int saved = errno;
+            ofs.close();
+            offlineKeyIdAndKeyValueBase64_.clear();
+            CLEARPLAY_HILOGE(ClearPlay::v1_0::COMP_SVC,
+                "%{public}s: write failed, errno=%{public}d, msg=%{public}s",
+                __func__, saved, strerror(saved));
+            return -7;
+        }
+    }
+
+    ofs.flush();
+    if (!ofs.good()) {
+        int saved = errno;
+        ofs.close();
+        offlineKeyIdAndKeyValueBase64_.clear();
+        CLEARPLAY_HILOGE(ClearPlay::v1_0::COMP_SVC,
+            "%{public}s: flush failed, errno=%{public}d, msg=%{public}s",
+            __func__, saved, strerror(saved));
+        return -8;
+    }
+
+    ofs.close();
+    offlineKeyIdAndKeyValueBase64_.clear();
+
+    CLEARPLAY_HILOGI(ClearPlay::v1_0::COMP_SVC,
+        "%{public}s: end", __func__);
+>>>>>>> eb25a4356 (change log)
     return HDF_SUCCESS;
 }
 } // V1_0
-- 
Gitee