|
@@ -10,6 +10,7 @@ import (
|
|
|
|
|
|
|
|
"hnyfkj.com.cn/rtu/linux/baseapp"
|
|
"hnyfkj.com.cn/rtu/linux/baseapp"
|
|
|
"hnyfkj.com.cn/rtu/linux/rtu/cbd/local_rpc"
|
|
"hnyfkj.com.cn/rtu/linux/rtu/cbd/local_rpc"
|
|
|
|
|
+ "hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
|
|
|
mcu "hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
|
|
mcu "hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
|
|
|
"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
|
|
"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
|
|
|
"hnyfkj.com.cn/rtu/linux/utils/ftpclient"
|
|
"hnyfkj.com.cn/rtu/linux/utils/ftpclient"
|
|
@@ -43,6 +44,9 @@ func (r *MQTTReporter) takePhotoAndUploadToImagServers() bool {
|
|
|
s := time.Now()
|
|
s := time.Now()
|
|
|
imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s-%s.jpg", r.deviceID, s.Format("20060102-150405")))
|
|
imgFile := filepath.Join(baseapp.IMG_DIR, fmt.Sprintf("%s-%s.jpg", r.deviceID, s.Format("20060102-150405")))
|
|
|
|
|
|
|
|
|
|
+ mcu_ctrl_board.GlobalWorkState.Add(mcu_ctrl_board.BitmapCapturing)
|
|
|
|
|
+ defer mcu_ctrl_board.GlobalWorkState.Remove(mcu_ctrl_board.BitmapCapturing)
|
|
|
|
|
+
|
|
|
_, 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)
|
|
@@ -55,7 +59,7 @@ func (r *MQTTReporter) takePhotoAndUploadToImagServers() bool {
|
|
|
utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
|
|
utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices",
|
|
|
"takephotodone.wav")) // 播报拍照完成语音
|
|
"takephotodone.wav")) // 播报拍照完成语音
|
|
|
|
|
|
|
|
- r.uploadPhotoToImagServers(imgFile, false)
|
|
|
|
|
|
|
+ go r.uploadPhotoToImagServers(imgFile, false)
|
|
|
|
|
|
|
|
return true
|
|
return true
|
|
|
}
|
|
}
|