|
@@ -31,18 +31,13 @@ func (r *MQTTReporter) StartImagWorker() {
|
|
|
}()
|
|
}()
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func saveLastPhotoDate() error {
|
|
|
|
|
- file := filepath.Join(baseapp.IMG_DIR, "last_photo_date.txt")
|
|
|
|
|
- return os.WriteFile(file, []byte(time.Now().Format("2006-01-02")+"\n"), 0644)
|
|
|
|
|
-}
|
|
|
|
|
-
|
|
|
|
|
func (r *MQTTReporter) takePhotoAndUploadToServers() bool {
|
|
func (r *MQTTReporter) takePhotoAndUploadToServers() bool {
|
|
|
r.pruneOldPhotos(baseapp.IMG_DIR, photoMaxNums) // 先清理旧照片, 避免磁盘空间不足
|
|
r.pruneOldPhotos(baseapp.IMG_DIR, photoMaxNums) // 先清理旧照片, 避免磁盘空间不足
|
|
|
|
|
|
|
|
baseapp.Logger.Infof("[%s] 拍照中, 请稍后...", MODULE_NAME)
|
|
baseapp.Logger.Infof("[%s] 拍照中, 请稍后...", MODULE_NAME)
|
|
|
|
|
|
|
|
start := time.Now()
|
|
start := time.Now()
|
|
|
- imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s.jpg", start.Format("2006-01-02_15-04-05.000")))
|
|
|
|
|
|
|
+ imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s-%s.jpg", r.deviceID, start.Format("20060102-150405")))
|
|
|
_, err := local_rpc.TakePhoto(r.ctx, imgFile)
|
|
_, err := local_rpc.TakePhoto(r.ctx, imgFile)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
baseapp.Logger.Errorf("[%s] 拍照失败: %v!!", MODULE_NAME, err)
|
|
baseapp.Logger.Errorf("[%s] 拍照失败: %v!!", MODULE_NAME, err)
|
|
@@ -51,8 +46,6 @@ func (r *MQTTReporter) takePhotoAndUploadToServers() bool {
|
|
|
elapsed := time.Since(start).Milliseconds()
|
|
elapsed := time.Since(start).Milliseconds()
|
|
|
baseapp.Logger.Infof("[%s] 拍照完成, 输出到本地文件: %q, 用时: %d毫秒", MODULE_NAME, imgFile, elapsed)
|
|
baseapp.Logger.Infof("[%s] 拍照完成, 输出到本地文件: %q, 用时: %d毫秒", MODULE_NAME, imgFile, elapsed)
|
|
|
|
|
|
|
|
- saveLastPhotoDate()
|
|
|
|
|
-
|
|
|
|
|
r.uploadPhotoToServers(imgFile)
|
|
r.uploadPhotoToServers(imgFile)
|
|
|
|
|
|
|
|
return true
|
|
return true
|