修正当监控时间周期设置得过小时，显示的网速可能会大于实际网速问题 #1263 #1674

Author: zhongyang219

TrafficMonitor/Common.cpp

@@ -498,6 +498,24 @@ SYSTEMTIME CCommon::CompareSystemTime(SYSTEMTIME a, SYSTEMTIME b)
     return result;
 }
 
+ULONGLONG CCommon::GetCurrentTimeSinceEpochMilliseconds()
+{
+    FILETIME fileTime;
+    GetSystemTimeAsFileTime(&fileTime);  // 获取当前系统时间
+
+    // 将FILETIME转换为ULARGE_INTEGER以便计算
+    ULARGE_INTEGER uli;
+    uli.LowPart = fileTime.dwLowDateTime;
+    uli.HighPart = fileTime.dwHighDateTime;
+
+    // 从1601年1月1日到1970年1月1日的100纳秒间隔数
+    const ULONGLONG EPOCH_OFFSET = 116444736000000000ULL;
+
+    // 转换为从1970年1月1日开始的毫秒数
+    ULONGLONG millisecondsSince1970 = (uli.QuadPart - EPOCH_OFFSET) / 10000;
+    return millisecondsSince1970;
+}
+
 wstring CCommon::GetModuleDir()
 {
     wchar_t path[MAX_PATH];

TrafficMonitor/Common.h

@@ -178,6 +178,9 @@ class CCommon
     //计算两个SYSTEMTIME结构时间的差（a-b，只保留时、分、秒）
     static SYSTEMTIME CompareSystemTime(SYSTEMTIME a, SYSTEMTIME b);
 
+    //获取从1970年1月1日到现在的毫秒数
+    static ULONGLONG GetCurrentTimeSinceEpochMilliseconds();
+
     //获取当前程序的目录
     static wstring GetModuleDir();
 

TrafficMonitor/TrafficMonitorDlg.cpp

@@ -1235,9 +1235,17 @@ UINT CTrafficMonitorDlg::MonitorThreadCallback(LPVOID dwUser)
     //if (cur_out_speed > 1073741824)
     //  cur_out_speed = 0;
 
+    //计算两次获取网速的时间间隔
+    static ULONGLONG last_net_speed_time = 0;
+    ULONGLONG net_speed_time = CCommon::GetCurrentTimeSinceEpochMilliseconds();
+    int time_span = theApp.m_general_data.monitor_time_span;
+    if (last_net_speed_time != 0)
+        time_span = static_cast<int>(net_speed_time - last_net_speed_time);
+    last_net_speed_time = net_speed_time;
+
     //将当前监控时间间隔的流量转换成每秒时间间隔内的流量
-    theApp.m_in_speed = static_cast<unsigned __int64>(cur_in_speed * 1000 / theApp.m_general_data.monitor_time_span);
-    theApp.m_out_speed = static_cast<unsigned __int64>(cur_out_speed * 1000 / theApp.m_general_data.monitor_time_span);
+    theApp.m_in_speed = static_cast<unsigned __int64>(cur_in_speed * 1000 / time_span);
+    theApp.m_out_speed = static_cast<unsigned __int64>(cur_out_speed * 1000 / time_span);
 
     pThis->m_connection_change_flag = false;    //清除连接发生变化的标志