去除断网重启

jni/logic/mainLogic.cc

@@ -1012,8 +1012,9 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
 	const char* sendMsg = heartStr.c_str();
 	sendProtocolTo(UART_TTYS2, (byte*)(sendMsg), strlen(sendMsg));
 
+	StoragePreferences::putBool(STORE_NURSING_TYPE, false);
+
 	if (nursingTcpModel.json.size() != 0) {	// 对比一下，json里面不为空的时候
-		StoragePreferences::putBool(STORE_NURSING_TYPE, false);
 
 		// 发送tcp, tcp_type = SIDE, tcp_action = NURSING_END
 		TcpModel tcpModel;

jni/logic/startLogic.cc

@@ -519,17 +519,17 @@ void setRestartTimerRegistered(bool result) {
 		return;
 	}
 
-	if (result != isRestartTimerRegistered) {	// 在传过来的值不相等时，才继续进行
-		if (!isRestartTimerRegistered) {	// 如果是false，那就需要开启
-			isRestartTimerRegistered = true;
-			mActivityPtr->registerUserTimer(SYS_RESTART, 180000);
-		}
-		else {	// 如果是true，那就需要关闭
-			isRestartTimerRegistered = false;
-			mActivityPtr->unregisterUserTimer(SYS_RESTART);
-			dataRefresh();
-		}
-	}
+//	if (result != isRestartTimerRegistered) {	// 在传过来的值不相等时，才继续进行
+//		if (!isRestartTimerRegistered) {	// 如果是false，那就需要开启
+//			isRestartTimerRegistered = true;
+//			mActivityPtr->registerUserTimer(SYS_RESTART, 180000);
+//		}
+//		else {	// 如果是true，那就需要关闭
+//			isRestartTimerRegistered = false;
+//			mActivityPtr->unregisterUserTimer(SYS_RESTART);
+//			dataRefresh();
+//		}
+//	}
 }
 
 void scrrenOn() {