openharmony/deviceprofile_device_info_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/deviceprofile_device_info_manager synced 2024-11-26 17:21:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!703 表数据同步

Browse Source 
Merge pull request !703 from torrizo/master
This commit is contained in:
openharmony_ci 2024-10-25 11:23:02 +00:00 committed by Gitee
commit 3f465427dc
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/include/deviceprofilemanager/device_profile_manager.h
View File

@ -95,6 +95,7 @@ private:
void NotifyNotOHBaseOnline(const DistributedHardware::DmDeviceInfo deviceInfo);
void E2ESyncDynamicProfile(const DistributedHardware::DmDeviceInfo deviceInfo);
void ClearDataWithPeerLogout(const std::string& peerUdid, const std::string& peerUuid);
void FixDiffProfiles();
bool isAdapterSoLoaded_ = false;
std::mutex isAdapterLoadLock_;
std::mutex dynamicStoreMutex_;

1
services/core/include/i_dp_sync_adapter.h
View File

@ -32,6 +32,7 @@ public:
bool isP2p) = 0;
virtual int32_t SyncProfile(const std::string& peerUdid, const std::string& peerNetworkId,
const sptr<IRemoteObject> syncCb, bool isP2p) = 0;
virtual int32_t FixDiffProfiles(const std::vector<std::string>& udidVtr) = 0;
};
using CreateDPSyncAdapterFuncPtr = IDPSyncAdapter *(*)(void);
} // namespace DeviceProfile

17
services/core/src/deviceprofilemanager/device_profile_manager.cpp
View File

@ -978,6 +978,23 @@ void DeviceProfileManager::ClearDataWithPeerLogout(const std::string& peerUdid,
HILOGE("RemoveDeviceData fail, peerUuid=%{public}s", ProfileUtils::GetAnonyString(peerUuid).c_str());
return;
}
FixDiffProfiles();
}
void DeviceProfileManager::FixDiffProfiles()
{
HILOGI("call");
std::lock_guard<std::mutex> lock(isAdapterLoadLock_);
if (dpSyncAdapter_ == nullptr) {
HILOGE("dpSyncAdapter is nullptr!");
return;
}
int32_t ret = dpSyncAdapter_->FixDiffProfiles({});
if (ret!= DP_SUCCESS) {
HILOGE("FixDiffProfiles fail! ret=%{public}d", ret);
return;
}
return;
}
} // namespace DeviceProfile
} // namespace OHOS