Parcourir la source

增加device_reboot

vothin il y a 1 an
Parent
commit
8e2c2bfac9

+ 7 - 0
jni/logic/startLogic.cc

@@ -258,6 +258,13 @@ void handleMsg(byte* inBytes){
 			sync();
 			reboot(RB_AUTOBOOT);
 		}
+		else if (tcpModel.action == DeviceAction::REBOOT) {
+			const char* req = "-1";
+			TcpClient::instance()->sendMsg(req);
+			//重启
+			sync();
+			reboot(RB_AUTOBOOT);
+		}
 	} else if (tcpModel.type == TcpType::DATA){
 		if (tcpModel.action == DataAction::REFRESH){	// 刷新数据
 			dataRefresh();

+ 1 - 0
jni/net/tcp_model.h

@@ -66,6 +66,7 @@ public:
 	inline static std::string DEVICE_REFRESH = "DEVICE_REFRESH";
 	inline static std::string SYSTEM_SETTING = "SYSTEM_SETTING";
 	inline static std::string SERVER_CHANGE = "SERVER_CHANGE";
+	inline static std::string REBOOT = "REBOOT";
 };
 
 class DataAction {

BIN
libs/armeabi/libzkgui.so


BIN
obj/activity/DeviceUpdateActivity.o


BIN
obj/activity/callActivity.o


BIN
obj/activity/mainActivity.o


BIN
obj/activity/settingActivity.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/net/tcp_model.o


BIN
obj/server/http_server.o


BIN
obj/service/BusinessConfig.o


BIN
obj/service/time.o