Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

app/build.gradle

@@ -5,7 +5,7 @@ plugins {
 // 10,00,000 major-minor-build
 def AppMajorVersion = 1
 def AppMinorVersion = 3
-def AppBuildNumber = 72
+def AppBuildNumber = 73
 
 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber
 def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber

app/src/main/cpp/PhoneDevice.cpp

@@ -1165,8 +1165,11 @@ bool CPhoneDevice::Reboot(int resetType, bool manually, const std::string& reaso
         }
         if (manually)
         {
-            // GpioControl::reboot();
+#ifdef USING_N938
+            GpioControl::reboot();
+#else
             RestartApp(resetType, timeout, reason);
+#endif
         }
     }
     else

app/src/main/cpp/SensorsProtocol.cpp

@@ -2675,6 +2675,8 @@ void ShxyProtocolDataProcess(int devno)
 		switch (curserial->m_au8RecvBuf[j])
 		{
 			case	1:	/*温度*/
+                if(devparam[devno].ProtocolIdx == WIND_PROTOCOL)
+                    break;
 				if ((fvalue < -60) || (fvalue > 100))
 				{
 					frnb = (GeneratingRandomNumber() % 101 - 50) / 1000.0;
@@ -2697,6 +2699,8 @@ void ShxyProtocolDataProcess(int devno)
 				}
 				break;
 			case	2:	/*气压*/
+                if(devparam[devno].ProtocolIdx == WIND_PROTOCOL)
+                    break;
 				if ((fvalue < 550) || (fvalue > 1060))
 				{
 					frnb = (GeneratingRandomNumber() % 41 - 20) / 10000.0;
@@ -2718,6 +2722,8 @@ void ShxyProtocolDataProcess(int devno)
 				}
 				break;
 			case	3:	/*湿度*/
+                if(devparam[devno].ProtocolIdx == WIND_PROTOCOL)
+                    break;
 				if ((fvalue < 0) || (fvalue > 100))
 				{
 					frnb = (GeneratingRandomNumber() % 41 - 20) / 1000.0;