diff --git a/services/distributedhardwarefwkserviceimpl/include/componentmanager/component_manager.h b/services/distributedhardwarefwkserviceimpl/include/componentmanager/component_manager.h
index 706f0e2127c6231ad2c3d2077d5c3add7f24332c..65eda93bb1c8f48d8d652a83ab2eba9e81540064 100644
--- a/services/distributedhardwarefwkserviceimpl/include/componentmanager/component_manager.h
+++ b/services/distributedhardwarefwkserviceimpl/include/componentmanager/component_manager.h
@@ -39,8 +39,8 @@ public:
 public:
     int32_t Init();
     int32_t UnInit();
-    int32_t Enable(const std::string &networkId, const std::string &uuid, const std::string &dhId);
-    int32_t Disable(const std::string &networkId, const std::string &uuid, const std::string &dhId);
+    int32_t Enable(const std::string &networkId, const std::string &uuid, const std::string &dhId, const DHType &dhType);
+    int32_t Disable(const std::string &networkId, const std::string &uuid, const std::string &dhId, const DHType &dhType);
 
 private:
     enum class Action : int32_t {
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/disable_task.h b/services/distributedhardwarefwkserviceimpl/include/task/disable_task.h
index 5298235b44a622ce4f08d499f4bbc364eb59de40..9956d7f9140d0e8619c62533f45375f89e2f8bdd 100644
--- a/services/distributedhardwarefwkserviceimpl/include/task/disable_task.h
+++ b/services/distributedhardwarefwkserviceimpl/include/task/disable_task.h
@@ -23,7 +23,7 @@ namespace DistributedHardware {
 class DisableTask : public Task {
 public:
     DisableTask() = delete;
-    DisableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId);
+    DisableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId, const DHType &dhType);
     virtual ~DisableTask();
     virtual void DoTask();
 
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/enable_task.h b/services/distributedhardwarefwkserviceimpl/include/task/enable_task.h
index 55842ce3b50f31ad9c45f979c4a4f46303d48a79..524e48cdb1a6aa7e6b23fce09821cd7e6978c473 100644
--- a/services/distributedhardwarefwkserviceimpl/include/task/enable_task.h
+++ b/services/distributedhardwarefwkserviceimpl/include/task/enable_task.h
@@ -23,7 +23,7 @@ namespace DistributedHardware {
 class EnableTask : public Task {
 public:
     EnableTask() = delete;
-    EnableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId);
+    EnableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId, const DHType &dhType);
     virtual ~EnableTask();
     virtual void DoTask();
 
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/offline_task.h b/services/distributedhardwarefwkserviceimpl/include/task/offline_task.h
index adb2ecdcfb35a65faa1506baacfc85a7c0c8fcdc..167f87fe68bfa8230f56d64946a343ff198dc5a3 100644
--- a/services/distributedhardwarefwkserviceimpl/include/task/offline_task.h
+++ b/services/distributedhardwarefwkserviceimpl/include/task/offline_task.h
@@ -25,7 +25,7 @@ namespace DistributedHardware {
 class OffLineTask : public Task {
 public:
     OffLineTask() = delete;
-    OffLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId);
+    OffLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId, const DHType &dhType);
     virtual ~OffLineTask();
     virtual void DoTask();
 
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/online_task.h b/services/distributedhardwarefwkserviceimpl/include/task/online_task.h
index 6e9eead87b9b488096634507976cd17d35a4473f..ddb8b639bbb61aa2509859c714f42d2be5b27c74 100644
--- a/services/distributedhardwarefwkserviceimpl/include/task/online_task.h
+++ b/services/distributedhardwarefwkserviceimpl/include/task/online_task.h
@@ -23,7 +23,7 @@ namespace DistributedHardware {
 class OnLineTask : public Task {
 public:
     OnLineTask() = delete;
-    OnLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId);
+    OnLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId, const DHType &dhType);
     virtual ~OnLineTask();
     virtual void DoTask();
 
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/task.h b/services/distributedhardwarefwkserviceimpl/include/task/task.h
index 65a007cedfebc09f389d4e40112aba970c3062b2..a51eb5d879ed279358c3f7d3e5f3c84afc159a9a 100644
--- a/services/distributedhardwarefwkserviceimpl/include/task/task.h
+++ b/services/distributedhardwarefwkserviceimpl/include/task/task.h
@@ -29,7 +29,7 @@ namespace DistributedHardware {
 class Task : public std::enable_shared_from_this<Task> {
 public:
     Task() = delete;
-    Task(const std::string &networkId, const std::string &uuid, const std::string &dhId);
+    Task(const std::string &networkId, const std::string &uuid, const std::string &dhId, const DHType &dhType);
     virtual ~Task();
     virtual void DoTask() = 0;
 
@@ -37,6 +37,7 @@ public:
     std::string GetNetworkId();
     std::string GetUUID();
     std::string GetDhId();
+    DHType GetDhType();
     TaskType GetTaskType();
     void SetTaskType(TaskType taskType);
     void SetTaskSteps(std::vector<TaskStep> taskSteps);
@@ -56,6 +57,7 @@ private:
     std::string networkId_;
     std::string uuid_;
     std::string dhId_;
+    DHType dhType_;
     TaskType taskType_ { TaskType::UNKNOWN };
     std::vector<TaskStep> taskSteps_;
     std::weak_ptr<Task> fatherTask_;
diff --git a/services/distributedhardwarefwkserviceimpl/include/task/task_factory.h b/services/distributedhardwarefwkserviceimpl/include/task/task_factory.h
index 90f519c4cc0ab292337eb2aa0348422ed24b8e49..c52c5b3fa5dd950f78fab04093a2c23e8c8f4a9d 100644
--- a/services/distributedhardwarefwkserviceimpl/include/task/task_factory.h
+++ b/services/distributedhardwarefwkserviceimpl/include/task/task_factory.h
@@ -26,8 +26,7 @@ namespace DistributedHardware {
 class TaskFactory {
 DECLARE_SINGLE_INSTANCE(TaskFactory);
 public:
-    std::shared_ptr<Task> CreateTask(TaskType taskType, const std::string &networkId, const std::string &uuid,
-        const std::string &dhId, std::shared_ptr<Task> fatherTask);
+    std::shared_ptr<Task> CreateTask(TaskType taskType, TaskParam taskParam, std::shared_ptr<Task> fatherTask);
 };
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkserviceimpl/include/utils/impl_utils.h b/services/distributedhardwarefwkserviceimpl/include/utils/impl_utils.h
index ff549114aac83133b4a1b40a26a728c3161989ef..4c7ab4c73505597e28920dae0765e3018d15c8ce 100644
--- a/services/distributedhardwarefwkserviceimpl/include/utils/impl_utils.h
+++ b/services/distributedhardwarefwkserviceimpl/include/utils/impl_utils.h
@@ -60,6 +60,13 @@ struct DHVersion {
     std::string dhVersion;
     std::unordered_map<DHType, CompVersion> compVersions;
 };
+
+struct TaskParam {
+    std::string networkId;
+    std::string uuid;
+    std::string dhId;
+    DHType dhType;
+};
 } // namespace DistributedHardware
 } // namespace OHOS
 #endif
diff --git a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_manager.cpp b/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_manager.cpp
index 0a3277b488c0c98078645d382994de2d871740b9..19e8a307c5b037e393ffb4a73b3ac40bb3924cfb 100644
--- a/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_manager.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/componentmanager/component_manager.cpp
@@ -219,10 +219,10 @@ bool ComponentManager::InitCompSink()
     return !compSink_.empty();
 }
 
-int32_t ComponentManager::Enable(const std::string &networkId, const std::string &uuid, const std::string &dhId)
+int32_t ComponentManager::Enable(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+    const DHType &dhType)
 {
     DHLOGI("start.");
-    auto dhType = GetDHType(uuid, dhId);
     auto find = compSource_.find(dhType);
     if (find == compSource_.end()) {
         DHLOGE("can not find handler for dhId = %s.", dhId.c_str());
@@ -267,9 +267,9 @@ int32_t ComponentManager::Enable(const std::string &networkId, const std::string
     return result;
 }
 
-int32_t ComponentManager::Disable(const std::string &networkId, const std::string &uuid, const std::string &dhId)
+int32_t ComponentManager::Disable(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+    const DHType &dhType)
 {
-    auto dhType = GetDHType(uuid, dhId);
     auto find = compSource_.find(dhType);
     if (find == compSource_.end()) {
         DHLOGE("can not find handler for dhId = %s.", dhId.c_str());
diff --git a/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_manager.cpp b/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_manager.cpp
index f198aa345d636b8427604353add28f50f7a6b75e..5b741ba1cdccac41a104aa8dfbcaf09920601aa2 100644
--- a/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_manager.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/distributed_hardware_manager.cpp
@@ -101,8 +101,13 @@ int32_t DistributedHardwareManager::SendOnLineEvent(const std::string &networkId
         DHLOGW("device is already online, uuid = %s", GetAnonyString(uuid).c_str());
         return ERR_DH_FWK_HARDWARE_MANAGER_DEVICE_REPEAT_ONLINE;
     }
-
-    auto task = TaskFactory::GetInstance().CreateTask(TaskType::ON_LINE, networkId, uuid, "", nullptr);
+    TaskParam taskParam = {
+        .networkId = networkId,
+        .uuid = uuid,
+        .dhId = "",
+        .dhType = DHType::UNKNOWN
+    };
+    auto task = TaskFactory::GetInstance().CreateTask(TaskType::ON_LINE, taskParam, nullptr);
     TaskExecutor::GetInstance().PushTask(task);
     DHContext::GetInstance().AddOnlineDevice(uuid, networkId);
     CapabilityInfoManager::GetInstance()->CreateManualSyncCount(GetDeviceIdByUUID(uuid));
@@ -136,8 +141,13 @@ int32_t DistributedHardwareManager::SendOffLineEvent(const std::string &networkI
         DHLOGW("device is already offline, uuid = %s", GetAnonyString(realUUID).c_str());
         return ERR_DH_FWK_HARDWARE_MANAGER_DEVICE_REPEAT_OFFLINE;
     }
-
-    auto task = TaskFactory::GetInstance().CreateTask(TaskType::OFF_LINE, networkId, realUUID, "", nullptr);
+    TaskParam taskParam = {
+        .networkId = networkId,
+        .uuid = realUUID,
+        .dhId = "",
+        .dhType = DHType::UNKNOWN
+    };
+    auto task = TaskFactory::GetInstance().CreateTask(TaskType::OFF_LINE, taskParam, nullptr);
     TaskExecutor::GetInstance().PushTask(task);
 
     DHContext::GetInstance().RemoveOnlineDevice(realUUID);
diff --git a/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/plugin_listener_impl.cpp b/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/plugin_listener_impl.cpp
index a21bcd919fa627ca4f5b6a07671b8f3dd105e420..f7c90628be1a95ee59da693cc63f3e965f77b104 100644
--- a/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/plugin_listener_impl.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/localhardwaremanager/plugin_listener_impl.cpp
@@ -26,6 +26,7 @@ namespace DistributedHardware {
 
 void PluginListenerImpl::PluginHardware(const std::string &dhId, const std::string &attrs)
 {
+    DHLOGI("plugin start, dhId: %s", dhId.c_str());
     std::vector<std::shared_ptr<CapabilityInfo>> capabilityInfos;
     std::string deviceId = DHContext::GetInstance().GetDeviceInfo().deviceId;
     std::string devName = DHContext::GetInstance().GetDeviceInfo().deviceName;
@@ -35,10 +36,12 @@ void PluginListenerImpl::PluginHardware(const std::string &dhId, const std::stri
     capabilityInfos.push_back(dhCapabilityInfo);
 
     CapabilityInfoManager::GetInstance()->AddCapability(capabilityInfos);
+    DHLOGI("plugin end, dhId: %s", dhId.c_str());
 }
 
 void PluginListenerImpl::UnPluginHardware(const std::string &dhId)
 {
+    DHLOGI("unplugin start, dhId: %s", dhId.c_str());
     std::string deviceId = DHContext::GetInstance().GetDeviceInfo().deviceId;
     std::shared_ptr<CapabilityInfo> capability = nullptr;
     auto ret = CapabilityInfoManager::GetInstance()->GetCapability(deviceId, dhId, capability);
@@ -48,6 +51,7 @@ void PluginListenerImpl::UnPluginHardware(const std::string &dhId)
         return;
     }
     CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoByKey(capability->GetKey());
+    DHLOGI("unplugin end, dhId: %s", dhId.c_str());
 }
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp
index d70a9270f9879c753353ed219356724b4ac59776..7d6db2c06cf557cfcae87fa68e3bc93cd365582e 100644
--- a/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/resourcemanager/capability_info_manager.cpp
@@ -357,11 +357,16 @@ void CapabilityInfoManager::HandleCapabilityAddChange(const std::vector<Distribu
         }
         std::string networkId = DHContext::GetInstance().GetNetworkIdByUUID(uuid);
         if (networkId.empty()) {
-            DHLOGI("Find network failed and never enable, deviceId: %s", GetAnonyString(uuid).c_str());
+            DHLOGI("Find network failed and never enable, uuid: %s", GetAnonyString(uuid).c_str());
             continue;
         }
-        auto task = TaskFactory::GetInstance().CreateTask(TaskType::ENABLE, networkId, uuid,
-            capPtr->GetDHId(), nullptr);
+        TaskParam taskParam = {
+            .networkId = networkId,
+            .uuid = uuid,
+            .dhId = capPtr->GetDHId(),
+            .dhType = capPtr->GetDHType()
+        };
+        auto task = TaskFactory::GetInstance().CreateTask(TaskType::ENABLE, taskParam, nullptr);
         TaskExecutor::GetInstance().PushTask(task);
     }
 }
@@ -393,6 +398,24 @@ void CapabilityInfoManager::HandleCapabilityDeleteChange(const std::vector<Distr
             continue;
         }
         const auto keyString = capPtr->GetKey();
+        std::string uuid = DHContext::GetInstance().GetUUIDByDeviceId(capPtr->GetDeviceId());
+        if (uuid.empty()) {
+            DHLOGI("Find uuid failed and never disable");
+            continue;
+        }
+        std::string networkId = DHContext::GetInstance().GetNetworkIdByUUID(uuid);
+        if (networkId.empty()) {
+            DHLOGI("Find network failed and never disable, uuid: %s", GetAnonyString(uuid).c_str());
+            continue;
+        }
+        TaskParam taskParam = {
+            .networkId = networkId,
+            .uuid = uuid,
+            .dhId = capPtr->GetDHId(),
+            .dhType = capPtr->GetDHType()
+        };
+        auto task = TaskFactory::GetInstance().CreateTask(TaskType::DISABLE, taskParam, nullptr);
+        TaskExecutor::GetInstance().PushTask(task);
         DHLOGI("Delete capability key: %s", capPtr->GetAnonymousKey().c_str());
         globalCapInfoMap_.erase(keyString);
     }
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/disable_task.cpp b/services/distributedhardwarefwkserviceimpl/src/task/disable_task.cpp
index 11a23449e4849b2d227b750847ecdf707d291e84..07bc52cfbd04d09d18f4fe90a60aad58a4ae476c 100644
--- a/services/distributedhardwarefwkserviceimpl/src/task/disable_task.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/task/disable_task.cpp
@@ -27,8 +27,8 @@ namespace DistributedHardware {
 #undef DH_LOG_TAG
 #define DH_LOG_TAG "DisableTask"
 
-DisableTask::DisableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId)
-    : Task(networkId, uuid, dhId)
+DisableTask::DisableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+    const DHType &dhType) : Task(networkId, uuid, dhId, dhType)
 {
     SetTaskType(TaskType::DISABLE);
     SetTaskSteps(std::vector<TaskStep> { TaskStep::DO_DISABLE });
@@ -61,14 +61,13 @@ void DisableTask::DoTaskInner()
         auto offLineTask = std::static_pointer_cast<OffLineTask>(father);
         offLineTask->NotifyFatherFinish(GetId());
     }
-
-    TaskBoard::GetInstance().RemoveTask(GetId());
     DHLOGD("finish disable task, remove it, id = %s", GetId().c_str());
+    TaskBoard::GetInstance().RemoveTask(GetId());
 }
 
 int32_t DisableTask::UnRegisterHardware()
 {
-    auto result = ComponentManager::GetInstance().Disable(GetNetworkId(), GetUUID(), GetDhId());
+    auto result = ComponentManager::GetInstance().Disable(GetNetworkId(), GetUUID(), GetDhId(), GetDhType());
     DHLOGI("disable task %s, id = %s, uuid = %s, dhId = %s", (result == DH_FWK_SUCCESS) ? "success" : "failed",
         GetId().c_str(), GetAnonyString(GetUUID()).c_str(), GetDhId().c_str());
     return result;
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp b/services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp
index 536986d9e4e88cb8367d8d167d4435aca71aec2f..3e92cbb59c7c98a173c4d99a4eb811f53a26000b 100644
--- a/services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/task/enable_task.cpp
@@ -26,8 +26,8 @@ namespace DistributedHardware {
 #undef DH_LOG_TAG
 #define DH_LOG_TAG "EnableTask"
 
-EnableTask::EnableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId)
-    : Task(networkId, uuid, dhId)
+EnableTask::EnableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+    const DHType &dhType) : Task(networkId, uuid, dhId, dhType)
 {
     SetTaskType(TaskType::ENABLE);
     SetTaskSteps(std::vector<TaskStep> { TaskStep::DO_ENABLE });
@@ -51,13 +51,13 @@ void EnableTask::DoTaskInner()
     auto result = RegisterHardware();
     auto state = (result == DH_FWK_SUCCESS) ? TaskState::SUCCESS : TaskState::FAIL;
     SetTaskState(state);
-    TaskBoard::GetInstance().RemoveTask(GetId());
     DHLOGD("finish enable task, remove it, id = %s", GetId().c_str());
+    TaskBoard::GetInstance().RemoveTask(GetId());
 }
 
 int32_t EnableTask::RegisterHardware()
 {
-    auto result = ComponentManager::GetInstance().Enable(GetNetworkId(), GetUUID(), GetDhId());
+    auto result = ComponentManager::GetInstance().Enable(GetNetworkId(), GetUUID(), GetDhId(), GetDhType());
     DHLOGI("enable task %s, id = %s, uuid = %s, dhId = %s", (result == DH_FWK_SUCCESS) ? "success" : "failed",
         GetId().c_str(), GetAnonyString(GetUUID()).c_str(), GetDhId().c_str());
     return result;
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/offline_task.cpp b/services/distributedhardwarefwkserviceimpl/src/task/offline_task.cpp
index a7875fb12ffa6290c16c41625d2716e569eb2283..0322a737abd353d800622df06231f354b2bfc7c9 100644
--- a/services/distributedhardwarefwkserviceimpl/src/task/offline_task.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/task/offline_task.cpp
@@ -31,8 +31,8 @@ namespace DistributedHardware {
 #undef DH_LOG_TAG
 #define DH_LOG_TAG "OffLineTask"
 
-OffLineTask::OffLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId)
-    : Task(networkId, uuid, dhId)
+OffLineTask::OffLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+    const DHType &dhType) : Task(networkId, uuid, dhId, dhType)
 {
     this->SetTaskType(TaskType::OFF_LINE);
     this->SetTaskSteps({TaskStep::UNREGISTER_OFFLINE_DISTRIBUTED_HARDWARE, TaskStep::WAIT_UNREGISTGER_COMPLETE,
@@ -75,8 +75,8 @@ void OffLineTask::DoTaskInner()
     }
 
     this->SetTaskState(TaskState::SUCCESS);
-    TaskBoard::GetInstance().RemoveTask(this->GetId());
     DHLOGD("Finish OffLine task, remove it, id: %s", GetId().c_str());
+    TaskBoard::GetInstance().RemoveTask(this->GetId());
 }
 
 void OffLineTask::CreateDisableTask()
@@ -93,8 +93,13 @@ void OffLineTask::CreateDisableTask()
             DHLOGE("capabilityInfo is null");
             continue;
         }
-        auto task = TaskFactory::GetInstance().CreateTask(TaskType::DISABLE, GetNetworkId(), GetUUID(),
-            iter->GetDHId(), shared_from_this());
+        TaskParam taskParam = {
+            .networkId = GetNetworkId(),
+            .uuid = GetUUID(),
+            .dhId = iter->GetDHId(),
+            .dhType = iter->GetDHType()
+        };
+        auto task = TaskFactory::GetInstance().CreateTask(TaskType::DISABLE, taskParam, shared_from_this());
         TaskExecutor::GetInstance().PushTask(task);
     }
 }
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/online_task.cpp b/services/distributedhardwarefwkserviceimpl/src/task/online_task.cpp
index 0b4b5db11a7c31fd9c348d795edd90d4d703d784..294c55c9b41f2b4d769c145f366b83c4918fd2f0 100644
--- a/services/distributedhardwarefwkserviceimpl/src/task/online_task.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/task/online_task.cpp
@@ -29,8 +29,8 @@ namespace DistributedHardware {
 #undef DH_LOG_TAG
 #define DH_LOG_TAG "OnLineTask"
 
-OnLineTask::OnLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId)
-    : Task(networkId, uuid, dhId)
+OnLineTask::OnLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+    const DHType &dhType) : Task(networkId, uuid, dhId, dhType)
 {
     SetTaskType(TaskType::ON_LINE);
     SetTaskSteps(std::vector<TaskStep> { TaskStep::SYNC_ONLINE_INFO, TaskStep::REGISTER_ONLINE_DISTRIBUTED_HARDWARE });
@@ -62,8 +62,8 @@ void OnLineTask::DoTask()
         }
     }
     SetTaskState(TaskState::SUCCESS);
-    TaskBoard::GetInstance().RemoveTask(this->GetId());
     DHLOGD("finish online task, remove it, id = %s.", GetId().c_str());
+    TaskBoard::GetInstance().RemoveTask(this->GetId());
 }
 
 void OnLineTask::DoSyncInfo()
@@ -94,8 +94,13 @@ void OnLineTask::CreateEnableTask()
             DHLOGE("capabilityInfo is null");
             continue;
         }
-        auto task = TaskFactory::GetInstance().CreateTask(TaskType::ENABLE, GetNetworkId(), GetUUID(),
-            iter->GetDHId(), shared_from_this());
+        TaskParam taskParam = {
+            .networkId = GetNetworkId(),
+            .uuid = GetUUID(),
+            .dhId = iter->GetDHId(),
+            .dhType = iter->GetDHType()
+        };
+        auto task = TaskFactory::GetInstance().CreateTask(TaskType::ENABLE, taskParam, shared_from_this());
         TaskExecutor::GetInstance().PushTask(task);
     }
 }
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/task.cpp b/services/distributedhardwarefwkserviceimpl/src/task/task.cpp
index d5f789654e40ec19765c8e7b9ad194c51f274d1c..bfe56b0b102fc57b57bd3d36a3639c6c6fb00ae3 100644
--- a/services/distributedhardwarefwkserviceimpl/src/task/task.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/task/task.cpp
@@ -20,8 +20,8 @@
 
 namespace OHOS {
 namespace DistributedHardware {
-Task::Task(const std::string &networkId, const std::string &uuid, const std::string &dhId)
-    : id_(DH_TASK_NAME_PREFIX + GetRandomID()), networkId_(networkId), uuid_(uuid), dhId_(dhId)
+Task::Task(const std::string &networkId, const std::string &uuid, const std::string &dhId, const DHType &dhType)
+    : id_(DH_TASK_NAME_PREFIX + GetRandomID()), networkId_(networkId), uuid_(uuid), dhId_(dhId), dhType_(dhType)
 {}
 
 Task::~Task()
@@ -49,6 +49,11 @@ std::string Task::GetDhId()
     return this->dhId_;
 }
 
+DHType Task::GetDhType()
+{
+    return this->dhType_;
+}
+
 TaskType Task::GetTaskType()
 {
     return this->taskType_;
diff --git a/services/distributedhardwarefwkserviceimpl/src/task/task_factory.cpp b/services/distributedhardwarefwkserviceimpl/src/task/task_factory.cpp
index bb84623c343c76ebbaeb12de969046c95055b2ed..838b72816916c04f4e35f85ad6bae13f6e9c364c 100644
--- a/services/distributedhardwarefwkserviceimpl/src/task/task_factory.cpp
+++ b/services/distributedhardwarefwkserviceimpl/src/task/task_factory.cpp
@@ -29,27 +29,26 @@ namespace DistributedHardware {
 #define DH_LOG_TAG "TaskFactory"
 
 IMPLEMENT_SINGLE_INSTANCE(TaskFactory);
-std::shared_ptr<Task> TaskFactory::CreateTask(TaskType taskType, const std::string &networkId, const std::string &uuid,
-    const std::string &dhId, std::shared_ptr<Task> fatherTask)
+std::shared_ptr<Task> TaskFactory::CreateTask(TaskType taskType, TaskParam taskParam, std::shared_ptr<Task> fatherTask)
 {
     DHLOGI("taskType = %d, networkId = %s, uuid = %s, dhId = %s", static_cast<int32_t>(taskType),
-        GetAnonyString(networkId).c_str(), GetAnonyString(uuid).c_str(), dhId.c_str());
+        GetAnonyString(taskParam.networkId).c_str(), GetAnonyString(taskParam.uuid).c_str(), taskParam.dhId.c_str());
     std::shared_ptr<Task> task = nullptr;
     switch (taskType) {
         case TaskType::ENABLE: {
-            task = std::make_shared<EnableTask>(networkId, uuid, dhId);
+            task = std::make_shared<EnableTask>(taskParam.networkId, taskParam.uuid, taskParam.dhId, taskParam.dhType);
             break;
         }
         case TaskType::DISABLE: {
-            task = std::make_shared<DisableTask>(networkId, uuid, dhId);
+            task = std::make_shared<DisableTask>(taskParam.networkId, taskParam.uuid, taskParam.dhId, taskParam.dhType);
             break;
         }
         case TaskType::ON_LINE: {
-            task = std::make_shared<OnLineTask>(networkId, uuid, dhId);
+            task = std::make_shared<OnLineTask>(taskParam.networkId, taskParam.uuid, taskParam.dhId, taskParam.dhType);
             break;
         }
         case TaskType::OFF_LINE: {
-            task = std::make_shared<OffLineTask>(networkId, uuid, dhId);
+            task = std::make_shared<OffLineTask>(taskParam.networkId, taskParam.uuid, taskParam.dhId, taskParam.dhType);
             break;
         }
         default: {
diff --git a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/test_componentmanager_fuzzer.cpp b/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/test_componentmanager_fuzzer.cpp
index dabf9a3ee994fa52b8e7816f9eb8712934538d53..bcb5bfed9f80ac7934287c66c302675b1e8736f0 100644
--- a/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/test_componentmanager_fuzzer.cpp
+++ b/services/distributedhardwarefwkserviceimpl/test/fuzztest/test_componentmanager_fuzzer/test_componentmanager_fuzzer.cpp
@@ -27,6 +27,13 @@
 
 namespace OHOS {
 namespace DistributedHardware {
+namespace {
+    const uint32_t DH_TYPE_SIZE = 10;
+    const DHType dhTypeFuzz[DH_TYPE_SIZE] = {
+        DHType::CAMERA, DHType::MIC, DHType::SPEAKER, DHType::DISPLAY, DHType::VIRMODEM_MIC,
+        DHType::BUTTON, DHType::A2D, DHType::GPS, DHType::HFP, DHType::VIRMODEM_SPEAKER
+    };
+}
 void ComponentManagerFuzzTest(const uint8_t* data, size_t size)
 {
     if ((data == nullptr) || (size <= 0)) {
@@ -36,10 +43,11 @@ void ComponentManagerFuzzTest(const uint8_t* data, size_t size)
     std::string networkId(reinterpret_cast<const char*>(data), size);
     std::string uuid(reinterpret_cast<const char*>(data), size);
     std::string dhId(reinterpret_cast<const char*>(data), size);
+    DHType dhType = dhTypeFuzz[data[0] % DH_TYPE_SIZE];
 
     ComponentManager::GetInstance().Init();
-    ComponentManager::GetInstance().Enable(networkId, uuid, dhId);
-    ComponentManager::GetInstance().Disable(networkId, uuid, dhId);
+    ComponentManager::GetInstance().Enable(networkId, uuid, dhId, dhType);
+    ComponentManager::GetInstance().Disable(networkId, uuid, dhId, dhType);
     ComponentManager::GetInstance().UnInit();
 }
 }
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_disable_task.h b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_disable_task.h
index 20d894dfc3e11333005a0d8d769865d5e3144e54..e0dfe9c6859e01bb143f49a32ae9c826c32b0650 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_disable_task.h
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_disable_task.h
@@ -23,7 +23,8 @@ namespace DistributedHardware {
 class MockDisableTask : public DisableTask {
 public:
     MockDisableTask() = delete;
-    MockDisableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId);
+    MockDisableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+        const DHType &dhType);
 
 private:
     /* synchronous function for unregister distributed hardware, return on asynchronous unregister finish */
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_enable_task.h b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_enable_task.h
index de78236503376c295e7ee8e5b554e1276c20daa9..b4cc656c493340fa8ba38c05d8925463100717f8 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_enable_task.h
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_enable_task.h
@@ -23,7 +23,8 @@ namespace DistributedHardware {
 class MockEnableTask : public EnableTask {
 public:
     MockEnableTask() = delete;
-    MockEnableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId);
+    MockEnableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+        const DHType &dhType);
 
 private:
     /* synchronous function for register distributed hardware, return on asynchronous register finish */
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_offline_task.h b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_offline_task.h
index 1ed33d2b735a9b189f1f28325ac26a29ddfda4f4..cc152c2df1fbab0eca13cfdadf09789d18002803 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_offline_task.h
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_offline_task.h
@@ -24,7 +24,8 @@ namespace DistributedHardware {
 class MockOffLineTask : public OffLineTask {
 public:
     MockOffLineTask() = delete;
-    MockOffLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId);
+    MockOffLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+        const DHType &dhType);
 
     void SetOffLineDevInfos(std::vector<MockDevInfo> offLineDevInfos);
 private:
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_online_task.h b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_online_task.h
index ea5351b813065aa28923327b8df09dfd3ed1fb41..e6cd431558954b3ed5df551599edcf9bdf3542b1 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_online_task.h
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_online_task.h
@@ -26,7 +26,8 @@ namespace DistributedHardware {
 class MockOnLineTask : public OnLineTask {
 public:
     MockOnLineTask() = delete;
-    MockOnLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId);
+    MockOnLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+        const DHType &dhType);
 
     void SetOnLineDevInfos(std::vector<MockDevInfo> devInfos);
 private:
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_factory.h b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_factory.h
index f0e8612802ae162bba28626e944bd6e1c3605069..3559b3a837e2f8aefb62c2b5fa1d0e79ea15cba6 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_factory.h
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_factory.h
@@ -26,8 +26,7 @@ namespace DistributedHardware {
 class MockTaskFactory {
 DECLARE_SINGLE_INSTANCE(MockTaskFactory);
 public:
-    std::shared_ptr<Task> CreateTask(TaskType taskType, const std::string &networkId, const std::string &uuid,
-        const std::string &dhId, std::shared_ptr<Task> fatherTask);
+    std::shared_ptr<Task> CreateTask(TaskType taskType, TaskParam taskParam, std::shared_ptr<Task> fatherTask);
 };
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_utils.h b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_utils.h
index 04b3da8b3aacf3fb3f2deb3148280b69f64d4ced..ed9f373653e149cd85f805ae78f6f2a0912a011a 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_utils.h
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/include/mock_task_utils.h
@@ -18,12 +18,15 @@
 
 #include <string>
 
+#include "device_type.h"
+
 namespace OHOS {
 namespace DistributedHardware {
 struct MockDevInfo {
     std::string networkId;
     std::string uuid;
     std::string dhId;
+    DHType dhType;
 };
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp
index 9beec548700120fc90b1b00887ec0b361c01330f..3c2d2af2363c09dd7f656747886723c3355d34bf 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_disable_task.cpp
@@ -23,8 +23,8 @@
 
 namespace OHOS {
 namespace DistributedHardware {
-MockDisableTask::MockDisableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId)
-    : DisableTask(networkId, uuid, dhId)
+MockDisableTask::MockDisableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+    const DHType &dhType) : DisableTask(networkId, uuid, dhId, dhType)
 {}
 
 int32_t MockDisableTask::UnRegisterHardware()
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp
index 58e6586ae428237b7b653628bc56d147db191d57..b85c26d83706e8e5a217416d165e1f338417a4b2 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_enable_task.cpp
@@ -22,8 +22,8 @@
 
 namespace OHOS {
 namespace DistributedHardware {
-MockEnableTask::MockEnableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId)
-    : EnableTask(networkId, uuid, dhId)
+MockEnableTask::MockEnableTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+    const DHType &dhType) : EnableTask(networkId, uuid, dhId, dhType)
 {}
 
 int32_t MockEnableTask::RegisterHardware()
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp
index d514c646acf9e225bd3bd656afd60bd7dde67b5a..85ee38087c1f7896d17c018db8bed8cd6de7db02 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_offline_task.cpp
@@ -24,15 +24,21 @@
 
 namespace OHOS {
 namespace DistributedHardware {
-MockOffLineTask::MockOffLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId)
-    : OffLineTask(networkId, uuid, dhId)
+MockOffLineTask::MockOffLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+    const DHType &dhType) : OffLineTask(networkId, uuid, dhId, dhType)
 {}
 
 void MockOffLineTask::CreateDisableTask()
 {
     for (auto &devInfo : offLineDevInfos) {
+        TaskParam taskParam = {
+            .networkId = devInfo.networkId,
+            .uuid = devInfo.uuid,
+            .dhId = devInfo.dhId,
+            .dhType = devInfo.dhType
+        };
         std::shared_ptr<Task> disableTask = MockTaskFactory::GetInstance().CreateTask(TaskType::DISABLE,
-            devInfo.networkId, devInfo.uuid, devInfo.dhId, shared_from_this());
+            taskParam,shared_from_this());
         TaskExecutor::GetInstance().PushTask(disableTask);
     }
 }
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp
index 310ce6823c5cf480b1a524c2fa8539aa3d0704bd..2bd79d100df3e794b09f9e6e4de63b3b6cd2d680 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_online_task.cpp
@@ -24,8 +24,8 @@
 
 namespace OHOS {
 namespace DistributedHardware {
-MockOnLineTask::MockOnLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId)
-    : OnLineTask(networkId, uuid, dhId)
+MockOnLineTask::MockOnLineTask(const std::string &networkId, const std::string &uuid, const std::string &dhId,
+    const DHType &dhType) : OnLineTask(networkId, uuid, dhId, dhType)
 {
     DHLOGI("Ctor MockOnLineTask: %s, type: %d", this->GetId().c_str(), this->GetTaskType());
 }
@@ -40,8 +40,14 @@ void MockOnLineTask::DoSyncInfo()
 void MockOnLineTask::CreateEnableTask()
 {
     for (const auto& devInfo : onLineDevInfos) {
+        TaskParam taskParam = {
+                .networkId = devInfo.networkId,
+                .uuid = devInfo.uuid,
+                .dhId = devInfo.dhId,
+                .dhType = devInfo.dhType
+        };
         std::shared_ptr<Task> enableTask = MockTaskFactory::GetInstance().CreateTask(TaskType::ENABLE,
-            devInfo.networkId, devInfo.uuid, devInfo.dhId, shared_from_this());
+            taskParam, shared_from_this());
         TaskExecutor::GetInstance().PushTask(enableTask);
     }
 }
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_task_factory.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_task_factory.cpp
index 479adaca2cbe77a472437c30531227abfe4971d6..45ef5439a17081873386dc697b34264b65140986 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_task_factory.cpp
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/mock_task_factory.cpp
@@ -25,25 +25,29 @@
 namespace OHOS {
 namespace DistributedHardware {
 IMPLEMENT_SINGLE_INSTANCE(MockTaskFactory);
-std::shared_ptr<Task> MockTaskFactory::CreateTask(TaskType taskType, const std::string &networkId,
-    const std::string &uuid, const std::string &dhId, std::shared_ptr<Task> fatherTask)
+std::shared_ptr<Task> MockTaskFactory::CreateTask(TaskType taskType, TaskParam taskParam,
+    std::shared_ptr<Task> fatherTask)
 {
     std::shared_ptr<Task> task = nullptr;
     switch (taskType) {
         case TaskType::ENABLE: {
-            task = std::make_shared<MockEnableTask>(networkId, uuid, dhId);
+            task = std::make_shared<MockEnableTask>(taskParam.networkId, taskParam.uuid, taskParam.dhId,
+                taskParam.dhType);
             break;
         }
         case TaskType::DISABLE: {
-            task = std::make_shared<MockDisableTask>(networkId, uuid, dhId);
+            task = std::make_shared<MockDisableTask>(taskParam.networkId, taskParam.uuid, taskParam.dhId,
+                taskParam.dhType);
             break;
         }
         case TaskType::ON_LINE: {
-            task = std::make_shared<MockOnLineTask>(networkId, uuid, dhId);
+            task = std::make_shared<MockOnLineTask>(taskParam.networkId, taskParam.uuid, taskParam.dhId,
+                taskParam.dhType);
             break;
         }
         case TaskType::OFF_LINE: {
-            task = std::make_shared<MockOffLineTask>(networkId, uuid, dhId);
+            task = std::make_shared<MockOffLineTask>(taskParam.networkId, taskParam.uuid, taskParam.dhId,
+                taskParam.dhType);
             break;
         }
         default: {
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp
index 6f99d654e9130fbf1cc77d20e208a4cc8054c722..e5393c7d243976d1d5dd4a986ac8084058d99499 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/src/task_test.cpp
@@ -37,19 +37,33 @@ namespace DistributedHardware {
 namespace {
 const std::string DEV_ID_1 = "bb536a637105409e904d4da83790a4a8";
 const std::string DEV_NETWORK_ID_1 = "nt36a637105409e904d4da83790a4a8";
-const MockDevInfo DEV_INFO_11 = { DEV_NETWORK_ID_1, DEV_ID_1, "Camera_1" };
-const MockDevInfo DEV_INFO_12 = { DEV_NETWORK_ID_1, DEV_ID_1, "Speaker_1" };
-const MockDevInfo DEV_INFO_13 = { DEV_NETWORK_ID_1, DEV_ID_1, "Mic_1" };
-const MockDevInfo DEV_INFO_14 = { DEV_NETWORK_ID_1, DEV_ID_1, "Display_1" };
-const MockDevInfo DEV_INFO_15 = { DEV_NETWORK_ID_1, DEV_ID_1, "Input_1" };
+const MockDevInfo DEV_INFO_11 = { DEV_NETWORK_ID_1, DEV_ID_1, "Camera_1", DHType::CAMERA };
+const MockDevInfo DEV_INFO_12 = { DEV_NETWORK_ID_1, DEV_ID_1, "Speaker_1", DHType::SPEAKER };
+const MockDevInfo DEV_INFO_13 = { DEV_NETWORK_ID_1, DEV_ID_1, "Mic_1", DHType::MIC };
+const MockDevInfo DEV_INFO_14 = { DEV_NETWORK_ID_1, DEV_ID_1, "Display_1", DHType::DISPLAY };
+const MockDevInfo DEV_INFO_15 = { DEV_NETWORK_ID_1, DEV_ID_1, "Input_1", DHType::BUTTON };
 
 const std::string DEV_ID_2 = "06d177ffa09543389f3b445b4722f9be";
 const std::string DEV_NETWORK_ID_2 = "ntd177ffa09543389f3b445b4722f9be";
-const MockDevInfo DEV_INFO_21 = { DEV_NETWORK_ID_2, DEV_ID_2, "Camera_1" };
-const MockDevInfo DEV_INFO_22 = { DEV_NETWORK_ID_2, DEV_ID_2, "Speaker_1" };
-const MockDevInfo DEV_INFO_23 = { DEV_NETWORK_ID_2, DEV_ID_2, "Mic_1" };
-const MockDevInfo DEV_INFO_24 = { DEV_NETWORK_ID_2, DEV_ID_2, "Display_1" };
-const MockDevInfo DEV_INFO_25 = { DEV_NETWORK_ID_2, DEV_ID_2, "Input_1" };
+const MockDevInfo DEV_INFO_21 = { DEV_NETWORK_ID_2, DEV_ID_2, "Camera_1", DHType::CAMERA };
+const MockDevInfo DEV_INFO_22 = { DEV_NETWORK_ID_2, DEV_ID_2, "Speaker_1", DHType::SPEAKER };
+const MockDevInfo DEV_INFO_23 = { DEV_NETWORK_ID_2, DEV_ID_2, "Mic_1", DHType::MIC };
+const MockDevInfo DEV_INFO_24 = { DEV_NETWORK_ID_2, DEV_ID_2, "Display_1", DHType::DISPLAY };
+const MockDevInfo DEV_INFO_25 = { DEV_NETWORK_ID_2, DEV_ID_2, "Input_1", DHType::BUTTON };
+
+const TaskParam TASK_PARAM_1 = {
+    .networkId = DEV_NETWORK_ID_1,
+    .uuid = DEV_ID_1,
+    .dhId = "",
+    .dhType = DHType::UNKNOWN
+};
+
+const TaskParam TASK_PARAM_2 = {
+    .networkId = DEV_NETWORK_ID_2,
+    .uuid = DEV_ID_2,
+    .dhId = "",
+    .dhType = DHType::UNKNOWN
+};
 }
 
 void TaskTest::SetUpTestCase(void)
@@ -78,7 +92,7 @@ HWTEST_F(TaskTest, task_test_001, TestSize.Level0)
 {
     std::shared_ptr<MockOnLineTask> onlineTask =
         std::static_pointer_cast<MockOnLineTask>(
-        MockTaskFactory::GetInstance().CreateTask(TaskType::ON_LINE, DEV_NETWORK_ID_1, DEV_ID_1, "", nullptr));
+        MockTaskFactory::GetInstance().CreateTask(TaskType::ON_LINE, TASK_PARAM_1, nullptr));
     onlineTask->SetOnLineDevInfos({ DEV_INFO_11, DEV_INFO_12, DEV_INFO_13, DEV_INFO_14, DEV_INFO_15 });
     TaskExecutor::GetInstance().PushTask(onlineTask);
 
@@ -95,11 +109,11 @@ HWTEST_F(TaskTest, task_test_001, TestSize.Level0)
 HWTEST_F(TaskTest, task_test_002, TestSize.Level0)
 {
     std::shared_ptr<MockOnLineTask> onlineTask1 = std::static_pointer_cast<MockOnLineTask>(
-        MockTaskFactory::GetInstance().CreateTask(TaskType::ON_LINE, DEV_NETWORK_ID_1, DEV_ID_1, "", nullptr));
+        MockTaskFactory::GetInstance().CreateTask(TaskType::ON_LINE, TASK_PARAM_1, nullptr));
     onlineTask1->SetOnLineDevInfos({ DEV_INFO_11, DEV_INFO_12, DEV_INFO_13, DEV_INFO_14, DEV_INFO_15 });
 
     std::shared_ptr<MockOnLineTask> onlineTask2 = std::static_pointer_cast<MockOnLineTask>(
-        MockTaskFactory::GetInstance().CreateTask(TaskType::ON_LINE, DEV_NETWORK_ID_2, DEV_ID_2, "", nullptr));
+        MockTaskFactory::GetInstance().CreateTask(TaskType::ON_LINE, TASK_PARAM_2, nullptr));
     onlineTask2->SetOnLineDevInfos({ DEV_INFO_21, DEV_INFO_22, DEV_INFO_23, DEV_INFO_24, DEV_INFO_25 });
 
     TaskExecutor::GetInstance().PushTask(onlineTask1);
@@ -119,7 +133,7 @@ HWTEST_F(TaskTest, task_test_003, TestSize.Level0)
 {
     std::shared_ptr<MockOffLineTask> offlineTask =
         std::static_pointer_cast<MockOffLineTask>(
-        MockTaskFactory::GetInstance().CreateTask(TaskType::OFF_LINE, DEV_NETWORK_ID_1, DEV_ID_1, "", nullptr));
+        MockTaskFactory::GetInstance().CreateTask(TaskType::OFF_LINE, TASK_PARAM_1, nullptr));
     offlineTask->SetOffLineDevInfos({ DEV_INFO_11, DEV_INFO_12, DEV_INFO_13, DEV_INFO_14, DEV_INFO_15 });
     TaskExecutor::GetInstance().PushTask(offlineTask);
 
@@ -137,12 +151,12 @@ HWTEST_F(TaskTest, task_test_004, TestSize.Level0)
 {
     std::shared_ptr<MockOnLineTask> onlineTask =
         std::static_pointer_cast<MockOnLineTask>(
-        MockTaskFactory::GetInstance().CreateTask(TaskType::ON_LINE, DEV_NETWORK_ID_1, DEV_ID_1, "", nullptr));
+        MockTaskFactory::GetInstance().CreateTask(TaskType::ON_LINE, TASK_PARAM_1, nullptr));
     onlineTask->SetOnLineDevInfos({ DEV_INFO_11, DEV_INFO_12, DEV_INFO_13, DEV_INFO_14, DEV_INFO_15 });
 
     std::shared_ptr<MockOffLineTask> offlineTask =
         std::static_pointer_cast<MockOffLineTask>(
-        MockTaskFactory::GetInstance().CreateTask(TaskType::OFF_LINE, DEV_NETWORK_ID_1, DEV_ID_1, "", nullptr));
+        MockTaskFactory::GetInstance().CreateTask(TaskType::OFF_LINE, TASK_PARAM_1, nullptr));
     offlineTask->SetOffLineDevInfos({ DEV_INFO_11, DEV_INFO_12, DEV_INFO_13, DEV_INFO_14, DEV_INFO_15 });
 
     TaskExecutor::GetInstance().PushTask(onlineTask);