diff --git a/interfaces/inner_kits/native_cpp/include/dm_device_info.h b/interfaces/inner_kits/native_cpp/include/dm_device_info.h index 542ee8f14ee07733bcadf005ab6d440c577a29e4..93a39b4a3b07f3a9a63cba6d180740ec3b92bcd5 100644 --- a/interfaces/inner_kits/native_cpp/include/dm_device_info.h +++ b/interfaces/inner_kits/native_cpp/include/dm_device_info.h @@ -457,13 +457,13 @@ struct DmDeviceInfoExt : public Parcelable DmDeviceInfoExt(const DmDeviceInfo &devInfo) { strncpy(deviceId, devInfo.deviceId, DM_MAX_DEVICE_ID_LEN - 1); - deviceId[DM_MAX_DEVICE_ID_LEN - 1] = '\0'; // 纭繚瀛楃涓蹭互 '\0' 缁撳熬 + deviceId[DM_MAX_DEVICE_ID_LEN - 1] = '\0'; strncpy(deviceName, devInfo.deviceName, DM_MAX_DEVICE_NAME_LEN - 1); - deviceName[DM_MAX_DEVICE_NAME_LEN - 1] = '\0'; // 纭繚瀛楃涓蹭互 '\0' 缁撳熬 + deviceName[DM_MAX_DEVICE_NAME_LEN - 1] = '\0'; strncpy(networkId, devInfo.networkId, DM_MAX_DEVICE_ID_LEN - 1); - networkId[DM_MAX_DEVICE_ID_LEN - 1] = '\0'; // 纭繚瀛楃涓蹭互 '\0' 缁撳熬 + networkId[DM_MAX_DEVICE_ID_LEN - 1] = '\0'; deviceTypeId = devInfo.deviceTypeId; range = devInfo.range; @@ -498,39 +498,6 @@ struct DmDeviceInfoExt : public Parcelable static DmDeviceInfoExt *Unmarshalling(Parcel &parcel); }; - -struct PeerTargetIdExt : public PeerTargetId, public Parcelable { - - using PeerTargetId::PeerTargetId; - - PeerTargetIdExt(const PeerTargetId& peerTargetId) : PeerTargetId(peerTargetId) {} - - virtual bool Marshalling(Parcel &parcel) const override; - - static PeerTargetIdExt *Unmarshalling(Parcel &parcel); -}; - -struct DmAccessCallerExt : public DmAccessCaller, public Parcelable { - - using DmAccessCaller::DmAccessCaller; - - DmAccessCallerExt(const DmAccessCaller& dmAccessCaller) : DmAccessCaller(dmAccessCaller) {} - - virtual bool Marshalling(Parcel &parcel) const override; - - static DmAccessCallerExt *Unmarshalling(Parcel &parcel); -}; - -struct DmAccessCalleeExt : public DmAccessCallee, public Parcelable { - - using DmAccessCallee::DmAccessCallee; - - DmAccessCalleeExt(const DmAccessCallee& dmAccessCallee) : DmAccessCallee(dmAccessCallee) {} - - virtual bool Marshalling(Parcel &parcel) const override; - - static DmAccessCalleeExt *Unmarshalling(Parcel &parcel); -}; } // namespace DistributedHardware } // namespace OHOS #endif // OHOS_DM_DEVICE_INFO_H \ No newline at end of file diff --git a/interfaces/inner_kits/native_cpp/src/dm_device_info.cpp b/interfaces/inner_kits/native_cpp/src/dm_device_info.cpp index a6f0a4e9b9a3b3af6cb3a1e44726f91021a2e342..45f416c6474f0c198294598dc965f5b2f16bc6a8 100644 --- a/interfaces/inner_kits/native_cpp/src/dm_device_info.cpp +++ b/interfaces/inner_kits/native_cpp/src/dm_device_info.cpp @@ -77,86 +77,5 @@ DmDeviceInfoExt *DmDeviceInfoExt::Unmarshalling(Parcel &parcel) return deviceInfoExt; } -bool PeerTargetIdExt::Marshalling(Parcel &parcel) const -{ - bool bRet = true; - bRet = (bRet && parcel.WriteString(deviceId)); - bRet = (bRet && parcel.WriteString(brMac)); - bRet = (bRet && parcel.WriteString(bleMac)); - bRet = (bRet && parcel.WriteString(wifiIp)); - bRet = (bRet && parcel.WriteUint16(wifiPort)); - return bRet; -} - -PeerTargetIdExt *PeerTargetIdExt::Unmarshalling(Parcel &parcel) -{ - PeerTargetIdExt *targetIdExt = new (std::nothrow) PeerTargetIdExt(); - if (targetIdExt == nullptr) { - LOGE("Create PeerTargetIdExt failed"); - return nullptr; - } - targetIdExt->deviceId = parcel.ReadString(); - targetIdExt->brMac = parcel.ReadString(); - targetIdExt->bleMac = parcel.ReadString(); - targetIdExt->wifiIp = parcel.ReadString(); - targetIdExt->wifiPort = parcel.ReadUint16(); - return targetIdExt; -} - -bool DmAccessCallerExt::Marshalling(Parcel &parcel) const -{ - bool bRet = true; - bRet = (bRet && parcel.WriteString(accountId)); - bRet = (bRet && parcel.WriteString(pkgName)); - bRet = (bRet && parcel.WriteString(networkId)); - bRet = (bRet && parcel.WriteInt32(userId)); - bRet = (bRet && parcel.WriteUint64(tokenId)); - bRet = (bRet && parcel.WriteString(extra)); - return bRet; -} - -DmAccessCallerExt *DmAccessCallerExt::Unmarshalling(Parcel &parcel) -{ - DmAccessCallerExt *callerExt = new (std::nothrow) DmAccessCallerExt(); - if (callerExt == nullptr) { - LOGE("Create DmAccessCallerExt failed"); - return nullptr; - } - callerExt->accountId = parcel.ReadString(); - callerExt->pkgName = parcel.ReadString(); - callerExt->networkId = parcel.ReadString(); - callerExt->userId = parcel.ReadInt32(); - callerExt->tokenId = parcel.ReadUint64(); - callerExt->extra = parcel.ReadString(); - return callerExt; -} - -bool DmAccessCalleeExt::Marshalling(Parcel &parcel) const -{ - bool bRet = true; - bRet = (bRet && parcel.WriteString(accountId)); - bRet = (bRet && parcel.WriteString(networkId)); - bRet = (bRet && parcel.WriteString(peerId)); - bRet = (bRet && parcel.WriteInt32(userId)); - bRet = (bRet && parcel.WriteString(extra)); - return bRet; -} - -DmAccessCalleeExt *DmAccessCalleeExt::Unmarshalling(Parcel &parcel) -{ - DmAccessCalleeExt *calleeExt = new (std::nothrow) DmAccessCalleeExt(); - if (calleeExt == nullptr) { - LOGE("Create DmAccessCallerExt failed"); - return nullptr; - } - calleeExt->accountId = parcel.ReadString(); - calleeExt->networkId = parcel.ReadString(); - calleeExt->peerId = parcel.ReadString(); - calleeExt->userId = parcel.ReadInt32(); - calleeExt->extra = parcel.ReadString(); - - return calleeExt; -} - } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file