From 00de4e630b82d38d1302d8cab67c354f4b6fbeab Mon Sep 17 00:00:00 2001 From: bakashigure Date: Mon, 7 Mar 2022 15:29:39 +0800 Subject: [PATCH] =?UTF-8?q?feat.=E6=96=B0=E5=A2=9Eaddress=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/回调消息协议.md | 1 + src/MeoAssistant/Controller.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/回调消息协议.md b/docs/回调消息协议.md index d6d0c5483c..4f98a7c8cb 100644 --- a/docs/回调消息协议.md +++ b/docs/回调消息协议.md @@ -61,6 +61,7 @@ Todo "why": string, // 错误原因 "details": object, // 错误详情 "uuid": string // 设备唯一码 + "address": string // 设备连接地址 } ``` diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 9c6c8d6393..fc9dec2af0 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -758,7 +758,8 @@ bool asst::Controller::connect(const std::string & adb_path, const std::string & {"what", "UuidGetted"}, {"why", ""}, {"details", json::object { - { "uuid", m_uuid} + { "uuid", m_uuid}, + {"address",address}, }} }; m_callback(AsstMsg::ConnectionInfo, info, m_callback_arg); @@ -797,4 +798,4 @@ std::vector asst::Controller::get_image_encode() const cv::imencode(".png", img, buf); return buf; -} \ No newline at end of file +}