From 026e1750503ec74bbe181bce3ece9931c244e367 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期三, 03 二月 2021 09:23:31 +0800
Subject: [PATCH] 适配模拟灯光。
---
lib/src/main/cpp/rtk_module/virtual_rtk.cpp | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/lib/src/main/cpp/rtk_module/virtual_rtk.cpp b/lib/src/main/cpp/rtk_module/virtual_rtk.cpp
index 04e7a08..fcdfd30 100644
--- a/lib/src/main/cpp/rtk_module/virtual_rtk.cpp
+++ b/lib/src/main/cpp/rtk_module/virtual_rtk.cpp
@@ -35,6 +35,7 @@
static void TcpDataCallback2(void *buffer, int length, void *p, void *context);
static void ConnectLater(union sigval sig);
+static void ConnectLater2(union sigval sig);
void InitVirtualDevice(const char *domain_name, int port)
{
@@ -87,14 +88,17 @@
static void ConnectLater(union sigval sig) {
AppTimer_delete(ConnectLater);
- if (sig.sival_int == 1) {
- if (ctp != NULL) {
- ctp->OpenTcpPort(VAddr.domain_name, VAddr.port);
- }
- } else {
- if (ctp2 != NULL) {
- ctp2->OpenTcpPort(VAddr.domain_name, VAddr.port + 1);
- }
+ if (ctp != NULL) {
+ ctp->OpenTcpPort(VAddr.domain_name, VAddr.port);
+ }
+}
+
+static void ConnectLater2(union sigval sig)
+{
+ AppTimer_delete(ConnectLater2);
+
+ if (ctp2 != NULL) {
+ ctp2->OpenTcpPort(VAddr.domain_name, VAddr.port + 1);
}
}
@@ -155,7 +159,7 @@
connectCnt2++;
if (connectCnt2 < 3) {
- AppTimer_add(ConnectLater, D_SEC(3), 2);
+ AppTimer_add(ConnectLater2, D_SEC(3), 2);
}
PlayTTS("鐏厜妯℃嫙鍣ㄦ柇寮�", NULL);
}
--
Gitblit v1.8.0