Browse Source

修复wifi连接状态还是重启的问题

vothin 2 years ago
parent
commit
0e08553266

+ 1 - 1
jni/logic/statusbar.cc

@@ -130,7 +130,7 @@ static int netOffMax = 300;	//断网300秒,则重启
 static bool isDataRefresh = false;
 
 static void updateNetState(){
-	if (ETHERNETMANAGER->isConnected()){
+	if (ETHERNETMANAGER->isConnected() || WIFIMANAGER->isConnected()){
 		netOffCount = 0;
 		if (isDataRefresh) {
 			dataRefresh();

+ 2 - 2
jni/service/BusinessConfig.h

@@ -51,8 +51,8 @@
 #define STORE_SCREEN_LIGHT "screen_light"
 #define SIGNAL_TYPE "TCP" //TCP,SIP
 
-static std::string version = "v1.0.26";
-static int versionNo = 26;
+static std::string version = "v1.0.27";
+static int versionNo = 27;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;

BIN
libs/armeabi/libzkgui.so


BIN
obj/activity/DeviceUpdateActivity.o


BIN
obj/activity/callActivity.o


BIN
obj/activity/mainActivity.o


BIN
obj/activity/sipTestActivity.o


BIN
obj/activity/startActivity.o


BIN
obj/activity/statusbar.o


BIN
obj/activity/ui3Activity.o


BIN
obj/activity/warnActivity.o


BIN
obj/core/update_assistant.o


BIN
obj/net/tcp_client.o


BIN
obj/server/http_server.o


BIN
obj/service/BusinessConfig.o


BIN
obj/service/time.o