Improve the new interface of barrage (#164)

wiliwili/include/api/live/danmaku_live.hpp

@@ -1,4 +1,3 @@
-
 //
 // Created by maye174 on 2023/4/6.
 //
@@ -26,26 +25,31 @@ class LiveDanmaku : public brls::Singleton<LiveDanmaku> {
  int uid;
  void connect(int room_id, int uid);
  void disconnect();
- bool is_connected();
-
  void send_join_request(int room_id, int uid);
+
  void send_heartbeat();
  void send_text_message(const std::string &message);
 
  void setonMessage(std::function<void(std::string)> func);
  std::function<void(std::string)> onMessage;
 
+ void set_wait_time(int time);
+ int wait_time = 600;
+
  LiveDanmaku();
  ~LiveDanmaku();
 
+ bool is_connected();
  std::atomic_bool connected{false};
+ bool is_evOK();
  std::atomic_bool ms_ev_ok{false};
 
  std::thread mongoose_thread;
+ std::thread heartbeat_thread;
  std::mutex mongoose_mutex;
  mg_mgr *mgr;
  mg_connection *nc;
 
  //人气值
  int popularity = 0;
-};
+};

wiliwili/source/api/danmaku_live.cpp

@@ -30,6 +30,14 @@ LiveDanmaku::LiveDanmaku() {
  printf("WSAStartup failed with error: %d\n", result);
  }
 #endif
+ heartbeat_thread = std::thread([this]() {
+ while (true) {
+ std::this_thread::sleep_for(std::chrono::seconds(20));
+ if (this->is_connected() and this->is_evOK()) {
+ this->send_heartbeat();
+ }
+ }
+ });
 }
 
 LiveDanmaku::~LiveDanmaku() {
@@ -74,24 +82,13 @@ void LiveDanmaku::connect(int room_id, int uid) {
 
  // Start Mongoose event loop and heartbeat thread
  mongoose_thread = std::thread([this]() {
- int last = 0;
- int s = 0;
  while (this->is_connected()) {
  this->mongoose_mutex.lock();
  if(this->nc == nullptr) {
  break;
  }
  this->mongoose_mutex.unlock();
- mg_mgr_poll(this->mgr, 800);
- s += 1;
- if (s - last >= 36) {
- this->send_heartbeat();
- last = s;
- }
- if (s < 0) {
- s = 0;
- last = 0;
- }
+ mg_mgr_poll(this->mgr, wait_time);
  }
  mg_mgr_free(this->mgr);
  delete this->mgr;
@@ -114,10 +111,18 @@ void LiveDanmaku::disconnect() {
  }
 }
 
+void LiveDanmaku::set_wait_time(int time){
+ wait_time = time;
+}
+
 bool LiveDanmaku::is_connected() {
  return connected.load(std::memory_order_acquire);
 }
 
+bool LiveDanmaku::is_evOK(){
+ return ms_ev_ok.load(std::memory_order_acquire);
+}
+
 void LiveDanmaku::send_join_request(int room_id, int uid) {
  json join_request = {
  {"clientver", "1.6.3"},