Merge branch 'main' of http://61.169.135.146:41230/xymp/TermApp

app/src/main/cpp/PhoneDevice.cpp

@@ -1073,7 +1073,7 @@ bool CPhoneDevice::QuerySystemProperties(std::map<std::string, std::string>& pro
         {
             it->second = std::to_string((m_signalLevel >> 8));
         }
-        else if ((it->first == (PROP_MOBILE_FLOW_TX)) || (it->first == (PROP_MOBILE_FLOW_RX)))
+        else if ((it->first == (PROP_MOBILE_FLOW_TX)) || (it->first == (PROP_MOBILE_FLOW_RX))|| (it->first == (PROP_MOBILE_FLOW_TODAY_TX))|| (it->first == (PROP_MOBILE_FLOW_TODAY_RX)))
         {
             if (flowInfo.empty())
             {

app/src/main/java/com/xypower/mpapp/MicroPhotoService.java

@@ -1676,7 +1676,13 @@ public class MicroPhotoService extends Service {
         long endTime = dt.getTime() - 1;
         NetworkUtils.Usage usage = NetworkUtils.getApplicationQuerySummary(this.getApplicationContext(), startTime, endTime, getApplicationInfo().uid);
 
-        return "RX=" + Long.toString(usage.mobleRxBytes) + "&TX=" + Long.toString(usage.mobleTxBytes);
+        Date now = new Date();
+        Date todayStart = new Date(now.getYear(), now.getMonth(), now.getDate(), 0, 0, 0);
+        long todayStartTime = todayStart.getTime();
+        long todayEndTime = now.getTime();
+        NetworkUtils.Usage todayUsage = NetworkUtils.getApplicationQuerySummary(this.getApplicationContext(), todayStartTime, todayEndTime, getApplicationInfo().uid);
+
+        return "todayRX=" + Long.toString(todayUsage.mobleRxBytes) + "&todayTX=" + Long.toString(todayUsage.mobleTxBytes) + "&RX=" + Long.toString(usage.mobleRxBytes) + "&TX=" + Long.toString(usage.mobleTxBytes);
     }
 
     public boolean installApp(final String path, long delayedTime) {