diff --git a/app/build.gradle b/app/build.gradle index 2d84fe56..89d04459 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ plugins { // 10,00,000 major-minor-build def AppMajorVersion = 1 def AppMinorVersion = 1 -def AppBuildNumber = 19 +def AppBuildNumber = 20 def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index a0e234ed..74e22855 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -4049,33 +4049,40 @@ int CPhoneDevice::GetWData(IDevice::WEATHER_INFO *weatherInfo) GetWeatherData(&airt, 4); weatherInfo->precipitation = airt.EuValue; -#if 0 - if (airt.AiState != 2 && weatherInfo->precipitation == 0) { + if(airt.AiState == 255 || airt.AiState == -1) + { + weatherInfo->precipitation = 0xff; + XYLOG(XYLOG_SEVERITY_INFO, "采样状态 = %d,降雨量未接传感器", airt.AiState); + }else if (airt.AiState != 2 && weatherInfo->precipitation == 0) + { XYLOG(XYLOG_SEVERITY_INFO, "采样状态 = %d,降雨量未采集到数据,重新采样", weatherInfo->precipitation, airt.AiState); status = 0; } -#endif GetWeatherData(&airt, 5); weatherInfo->air_pressure = airt.EuValue; -#if 0 - if (airt.AiState != 2 && weatherInfo->air_pressure == 0) { + if(airt.AiState == 255 || airt.AiState == -1) + { + weatherInfo->air_pressure = 0xff; + XYLOG(XYLOG_SEVERITY_INFO, "采样状态 = %d,气压未接传感器", airt.AiState); + }else if (airt.AiState != 2 && weatherInfo->air_pressure == 0) { XYLOG(XYLOG_SEVERITY_INFO, "采样状态 = %d,气压未采集到数据,重新采样", weatherInfo->air_pressure, airt.AiState); status = 0; } -#endif GetWeatherData(&airt, 6); weatherInfo->radiation_intensity = airt.EuValue; -#if 0 - if (airt.AiState != 2 && weatherInfo->radiation_intensity == 0) { + if(airt.AiState == 255 || airt.AiState == -1) + { + weatherInfo->radiation_intensity = 0xff; + XYLOG(XYLOG_SEVERITY_INFO, "采样状态 = %d,光照强度未接传感器", airt.AiState); + }else if (airt.AiState != 2 && weatherInfo->radiation_intensity == 0) { XYLOG(XYLOG_SEVERITY_INFO, "采样状态 = %d,光照强度未采集到数据,重新采样", weatherInfo->radiation_intensity, airt.AiState); status = 0; } -#endif if (status) return true; else diff --git a/gradle.properties b/gradle.properties index 717f7325..86a22bdc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,8 +20,8 @@ android.enableJetifier=true BUILD_TOOLS_VERSION=33.0.3 COMPILE_SDK_VERSION=33 -TARGET_SDK_VERSION=30 -COMPILE_MIN_SDK_VERSION=30 +TARGET_SDK_VERSION=28 +COMPILE_MIN_SDK_VERSION=28 TARGET_SDK_VERSION_N938=28 COMPILE_MIN_SDK_VERSION_N938=28