Merge pull request #1321 from tiemuhua/release/xwechat/2024-t4

Release/xwechat/2024 t4

Author: garryyan

mars/app/app_manager.cc

@@ -12,6 +12,9 @@
 
 #include "mars/comm/dns/dns.h"
 #include "mars/comm/xlogger/xlogger.h"
+#ifdef ANDROID
+#include "mars/comm/alarm.h"
+#endif
 
 using namespace mars::comm;
 using namespace mars::boot;
@@ -171,6 +174,19 @@ void AppManager::GetProxyInfo(const std::string& _host, uint64_t _timetick) {
     }
 }
 
+void AppManager::__CheckCommSetting(const std::string& key) {
+#ifdef ANDROID
+    xinfo2(TSF "AppConfig CheckCommSetting key:%_", key);
+    if (key == kKeyAlarmStartWakeupLook) {
+        int wakeup = GetConfig<int>(kKeyAlarmStartWakeupLook, kAlarmStartWakeupLook);
+        comm::Alarm::SetStartAlarmWakeLock(wakeup);
+    } else if (key == kKeyAlarmOnWakeupLook) {
+        int wakeup = GetConfig<int>(kKeyAlarmOnWakeupLook, kAlarmOnWakeupLook);
+        comm::Alarm::SetOnAlarmWakeLock(wakeup);
+    }
+#endif
+}
+
 // #if TARGET_OS_IPHONE
 void AppManager::ClearProxyInfo() {
     std::lock_guard<std::timed_mutex> lock(slproxymutex_);
@@ -181,5 +197,11 @@ void AppManager::ClearProxyInfo() {
 }
 // #endif
 
+AppManager* GetDefaultAppManager() {
+    auto* context = mars::boot::Context::CreateContext("default");
+    auto* manager = context->GetManager<mars::app::AppManager>();
+    return manager;
+}
+
 }  // namespace app
 }  // namespace mars

mars/app/app_manager.h

@@ -6,9 +6,9 @@
 #define MMNET_APP_MANAGER_H
 
 #include <memory>
+#include <thread>
 #include <typeindex>
 #include <unordered_map>
-#include <thread>
 
 #include "mars/app/app.h"
 //#include "mars/boost/any.hpp"
@@ -17,9 +17,7 @@
 #include "mars/comm/comm_data.h"
 #include "mars/comm/time_utils.h"
 #include "mars/xlog/xlogger.h"
-#ifdef ANDROID
-#include "mars/comm/alarm.h"
-#endif
+
 namespace mars {
 namespace app {
 
@@ -37,7 +35,7 @@ class AppManager : public mars::boot::BaseManager {
     mars::comm::ProxyInfo GetProxyInfo(const std::string& _host);
     std::string GetAppFilePath();
     AccountInfo GetAccountInfo();
-    std::string GetAppUserName();   // WinBase.h里面定义了GetUserName这个宏
+    std::string GetAppUserName();  // WinBase.h里面定义了GetUserName这个宏
     std::string GetRecentUserName();
     unsigned int GetClientVersion();
     DeviceInfo GetDeviceInfo();
@@ -73,18 +71,7 @@ class AppManager : public mars::boot::BaseManager {
         __CheckCommSetting(key);
     }
 
-    void __CheckCommSetting(const std::string& key) {
-#ifdef ANDROID
-        xinfo2(TSF "AppConfig CheckCommSetting key:%_", key);
-        if (key == kKeyAlarmStartWakeupLook) {
-            int wakeup = GetConfig<int>(kKeyAlarmStartWakeupLook, kAlarmStartWakeupLook);
-            comm::Alarm::SetStartAlarmWakeLock(wakeup);
-        } else if (key == kKeyAlarmOnWakeupLook) {
-            int wakeup = GetConfig<int>(kKeyAlarmOnWakeupLook, kAlarmOnWakeupLook);
-            comm::Alarm::SetOnAlarmWakeLock(wakeup);
-        }
-#endif
-    }
+    void __CheckCommSetting(const std::string& key);
 
  private:
     Callback* callback_;
@@ -101,6 +88,7 @@ class AppManager : public mars::boot::BaseManager {
     std::unordered_map<std::string, std::string> types_;
 };
 
+AppManager* GetDefaultAppManager();
 }  // namespace app
 }  // namespace mars
 

mars/baseevent/baseprjevent.h

@@ -32,7 +32,7 @@ extern boost::signals2::signal<void()>& GetSignalOnExceptionCrash();
 extern boost::signals2::signal<void(bool _isForeground)>& GetSignalOnForeground();
 extern boost::signals2::signal<void()>& GetSignalOnNetworkChange();
 
-extern boost::signals2::signal<void(const char* _tag, ssize_t _send, ssize_t _recv)>& GetSignalOnNetworkDataChange();
+extern boost::signals2::signal<void(const char* _tag, int64_t _send, int64_t _recv)>& GetSignalOnNetworkDataChange();
 extern boost::signals2::signal<void(int64_t _id)>& GetSignalOnAlarm();
 
 #endif /* BASEPRJEVENT_H_ */

mars/baseevent/src/baseprjevent.cc

@@ -59,8 +59,8 @@ boost::signals2::signal<void()>& GetSignalOnNetworkChange() {
     return SignalOnNetworkChange;
 }
 
-boost::signals2::signal<void(const char* _tag, ssize_t _send, ssize_t _recv)>& GetSignalOnNetworkDataChange() {
-    static boost::signals2::signal<void(const char* _tag, ssize_t _send, ssize_t _recv)> SignalOnNetworkDataChange;
+boost::signals2::signal<void(const char* _tag, int64_t _send, int64_t _recv)>& GetSignalOnNetworkDataChange() {
+    static boost::signals2::signal<void(const char* _tag, int64_t _send, int64_t _recv)> SignalOnNetworkDataChange;
     return SignalOnNetworkDataChange;
 }