插件接口中增加以字符串的形式获取监控信息的接口

Author: zhongyang219

TrafficMonitor/TrafficMonitor.cpp

@@ -1397,7 +1397,7 @@ const wchar_t* CTrafficMonitorApp::GetVersion()
     return VERSION;
 }
 
-double CTrafficMonitorApp::GetMonitorData(MonitorItem item)
+double CTrafficMonitorApp::GetMonitorValue(MonitorItem item)
 {
     switch (item)
     {
@@ -1418,6 +1418,39 @@ double CTrafficMonitorApp::GetMonitorData(MonitorItem item)
     return 0.0;
 }
 
+const wchar_t* CTrafficMonitorApp::GetMonitorValueString(MonitorItem item, int is_main_window)
+{
+    static CString str_value;
+    if (item == MI_TODAY_UP_TRAFFIC)
+    {
+        str_value = CCommon::KBytesToString(theApp.m_today_up_traffic / 1024u);
+    }
+    else if (item == MI_TODAY_DOWN_TRAFFIC)
+    {
+        str_value = CCommon::KBytesToString(theApp.m_today_down_traffic / 1024u);
+    }
+    else
+    {
+        DisplayItem display_item{};
+        switch (item)
+        {
+        case MI_UP: display_item = DisplayItem::TDI_UP; break;
+        case MI_DOWN: display_item = DisplayItem::TDI_DOWN; break;
+        case MI_CPU: display_item = DisplayItem::TDI_CPU; break;
+        case MI_MEMORY: display_item = DisplayItem::TDI_MEMORY; break;
+        case MI_GPU_USAGE: display_item = DisplayItem::TDI_GPU_USAGE; break;
+        case MI_CPU_TEMP: display_item = DisplayItem::TDI_CPU_TEMP; break;
+        case MI_GPU_TEMP: display_item = DisplayItem::TDI_GPU_TEMP; break;
+        case MI_HDD_TEMP: display_item = DisplayItem::TDI_HDD_TEMP; break;
+        case MI_MAIN_BOARD_TEMP: display_item = DisplayItem::TDI_MAIN_BOARD_TEMP; break;
+        case MI_HDD_USAGE: display_item = DisplayItem::TDI_HDD_USAGE; break;
+        case MI_CPU_FREQ: display_item = DisplayItem::TDI_CPU_FREQ; break;
+        }
+        str_value = CommonDisplayItem(display_item).GetItemValueText(is_main_window);
+    }
+    return str_value.GetString();
+}
+
 void CTrafficMonitorApp::ShowNotifyMessage(const wchar_t* strMsg)
 {
     CTrafficMonitorDlg* pMainWnd = dynamic_cast<CTrafficMonitorDlg*>(m_pMainWnd);

TrafficMonitor/TrafficMonitor.h

@@ -203,8 +203,9 @@ class CTrafficMonitorApp : public CWinApp, public ITrafficMonitor
 private:
     virtual int GetAPIVersion() override;
     virtual const wchar_t* GetVersion() override;
+    double GetMonitorValue(MonitorItem item) override;
+    virtual const wchar_t* GetMonitorValueString(MonitorItem item, int is_main_window = false) override;
 public:
-    double GetMonitorData(MonitorItem item) override;
     void ShowNotifyMessage(const wchar_t* strMsg) override;
     unsigned short GetLanguageId() const override;
     const wchar_t* GetPluginConfigDir() const override;

include/PluginInterface.h

@@ -361,12 +361,20 @@ class ITrafficMonitor
     };
 
     /**
-     * @brief   获取一个主程序的监控信息
+     * @brief   获取一个主程序的监控信息的数值
      *          （ITMPlugin::OnMonitorInfo将被弃用）
      * @param   item 要获取监控信息的项目
      * @return  获取到监控信息
      */
-    virtual double GetMonitorData(MonitorItem item) = 0;
+    virtual double GetMonitorValue(MonitorItem item) = 0;
+
+    /**
+     * @brief   以字符串的形式获取一个主程序监控信息的数值
+     * @param   item 要获取监控信息的项目
+     * @param   is_main_window 是否为主窗口的数值
+     * @return  获取到监控信息
+     */
+    virtual const wchar_t* GetMonitorValueString(MonitorItem item, int is_main_window = false) = 0;
 
     /**
      * @brief   显示一个通知消息