Просмотр исходного кода

1, 修正按天拍照自然日计算的时区问题, 并优化按天拍照间隔频率的判断算法; 2, 发布版本v2.0.0.6

niujiuru 2 месяцев назад
Родитель
Сommit
567b03e703
5 измененных файлов с 9 добавлено и 6 удалено
  1. 1 1
      Makefile
  2. BIN
      mk_rootfs/rootfs.tar.bz2
  3. 1 1
      package/armv7hf.sh
  4. BIN
      package/rtu_bxs_seyou_2.0.0.5.tar.gz
  5. 7 4
      reporter/takephoto.go

+ 1 - 1
Makefile

@@ -7,7 +7,7 @@ DEFINS = -D_GNU_SOURCE
 
 GO := go
 GO_BUILD := $(GO) build
-GO_FLAGS := -ldflags "-s -w -X hnyfkj.com.cn/rtu/linux/baseapp.Version=2.0.0.5 -X hnyfkj.com.cn/rtu/linux/baseapp.BuildTime=$(shell date +%Y-%m-%dT%H:%M:%S)"
+GO_FLAGS := -ldflags "-s -w -X hnyfkj.com.cn/rtu/linux/baseapp.Version=2.0.0.6 -X hnyfkj.com.cn/rtu/linux/baseapp.BuildTime=$(shell date +%Y-%m-%dT%H:%M:%S)"
 
 target ?= x86_64
 ifeq ($(target),armv7hf)

BIN
mk_rootfs/rootfs.tar.bz2


+ 1 - 1
package/armv7hf.sh

@@ -4,7 +4,7 @@
 set -e
 set -o pipefail
 
-ver_num="2.0.0.5"
+ver_num="2.0.0.6"
 cur_dir="$(pwd)"
 pre_dir="$(dirname "$cur_dir")"
 RTU_LINUX_MODULES_PATH="${pre_dir}/../rtu_linux_modules"

BIN
package/rtu_bxs_seyou_2.0.0.5.tar.gz


+ 7 - 4
reporter/takephoto.go

@@ -60,14 +60,17 @@ func canTakePhoto() bool {
 		return true
 	}
 
-	days := int(today.Sub(lastDate).Hours() / 24)
-	if days < mcu.CfgParams.TakePhotoIntervalDays {
+	lastUTC := time.Date(lastDate.Year(), lastDate.Month(), lastDate.Day(), 0, 0, 0, 0, time.UTC)
+	todayUTC := time.Date(today.Year(), today.Month(), today.Day(), 0, 0, 0, 0, time.UTC)
+	days := int(todayUTC.Sub(lastUTC) / (24 * time.Hour))
+
+	allowed := days == 0 || days >= mcu.CfgParams.TakePhotoIntervalDays
+	if !allowed {
 		baseapp.Logger.Infof("[%s] 未达到拍照间隔天数要求, 上次拍照日期: %s, 已间隔: %d天, 间隔要求: %d天, 忽略本次拍照请求",
 			MODULE_NAME, lastDate.Format("2006-01-02"), days, mcu.CfgParams.TakePhotoIntervalDays)
-		return false
 	}
 
-	return true
+	return allowed
 }
 
 func (r *MQTTReporter) takePhotoAndUpToFtp() (string, error) {