check file modified

zhangshiming

2022-03-25 dcc1ad9462d964e63d1d09d4a7e570ad0efdbc6d

 main.py

@@ -127,7 +127,7 @@
    time_public=datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
    app.logger.info(time_now+' extract_voltage_send job started!')
    #camera = cv2.VideoCapture(0) #use 0 for web camera  deplyoment
    cap = cv2.VideoCapture(0) # for testing
    cap = cv2.VideoCapture('./debug/7422.mp4') # for testing
    #   以下设置显示屏的宽高
    cap.set(cv2.CAP_PROP_FRAME_WIDTH,   640)
    cap.set(cv2.CAP_PROP_FRAME_HEIGHT,   480)
@@ -137,10 +137,15 @@
        return_digital,job_status = extrct_digits_from_frame(frame,app.config['IMAGE_CLIP_COLS_START'],app.config['IMAGE_CLIP_COLS_END'],app.config['IMAGE_CLIP_ROWS_START'],app.config['IMAGE_CLIP_ROWS_END'],app)
        if job_status or fails_count > 10:
            #mqtt.publish(app.config['REMOTE_MQTT_PUBLISH_TOPIC'], "{'voltage':"+str(return_digital)+"}")
<<<<<<< HEAD
            mqtt.publish(app.config['REMOTE_MQTT_PUBLISH_TOPIC'], "{\"sn\":" + "\"" + app.config['MQTT_CLIENT_ID'] +"\"" + " , \"time\":"+ "\"" + time_public  +"\""+" , \"value\":"+ str(return_digital) +" }")
            app.logger.info(" send the digital "+str(return_digital))
            cv2.imwrite("./image_frame/success_"+time_now+".jpg", cv2.putText(frame, str(return_digital), (app.config['IMAGE_CLIP_ROWS_START'], app.config['IMAGE_CLIP_COLS_START']), cv2.FONT_HERSHEY_COMPLEX, 1.5, (0, 255, 255), 2))
            app.logger.info("image is identified successful")
=======
            mqtt.publish(app.config['REMOTE_MQTT_PUBLISH_TOPIC'], "{\"sn\":" + "\"" + app.config['MQTT_CLIENT_ID'] +"\"" + " , \"time\":"+ "\"" + time_now  +"\""+" , \"value\":"+ str(return_digital) +" }")
            cv2.imwrite("./imageframe/image_frame_"+time_now+".jpg", cv2.putText(frame, str(return_digital), (app.config['IMAGE_CLIP_ROWS_START'], app.config['IMAGE_CLIP_COLS_START']), cv2.FONT_HERSHEY_COMPLEX, 1.5, (0, 255, 255), 2))
>>>>>>> db44060a8de04f55557badee55cd617392d65c5b
            cap.release()
            break
        else: