diff --git a/Aida/alarm.js b/Aida/alarm.js index 06b8297..d983cce 100644 --- a/Aida/alarm.js +++ b/Aida/alarm.js @@ -4152,7 +4152,8 @@ function GetAlarm(alarm_data) { } } } - } + } + RenderAllCanvas(); ai_json = null; } diff --git a/Aida/alarm_on_airelay.js b/Aida/alarm_on_airelay.js index 9a99a95..71b9265 100644 --- a/Aida/alarm_on_airelay.js +++ b/Aida/alarm_on_airelay.js @@ -4015,6 +4015,13 @@ function GetAlarm(alarm_data) { canvasTripwire8.add(insertTrafficLightRectangle(x * G_CANVAS_WIDTH_RATIO, y * G_CANVAS_HEIGHT_RATIO, w * G_CANVAS_WIDTH_RATIO, h * G_CANVAS_HEIGHT_RATIO, 1, 1, plate_name, number_row)); } else { + // 11-01 + // console.log("trigger any events... , behavior_id: ", behavior_id); // 禁區 0 , 久留 4, 警戒線 8 + // console.log(ai_json.AiEngine[i]); // 沒有和 zone index 相關的資訊 + // console.log("detection_zone_id: ", detection_zone_id); // undefined + + func_checkTriggerZoneStatus(behavior_id); // 為了連動 zone polygon 變顏色 + canvasTripwire_all.add(insertTrafficLightRectangle_Red(x * G_CANVAS_WIDTH_RATIO, y * G_CANVAS_HEIGHT_RATIO, w * G_CANVAS_WIDTH_RATIO, h * G_CANVAS_HEIGHT_RATIO, 1, 1, plate_name)); canvasTripwire.add(insertTrafficLightRectangle_Red(x * G_CANVAS_WIDTH_RATIO, y * G_CANVAS_HEIGHT_RATIO, w * G_CANVAS_WIDTH_RATIO, h * G_CANVAS_HEIGHT_RATIO, 1, 1, plate_name)); canvasTripwire1.add(insertTrafficLightRectangle_Red(x * G_CANVAS_WIDTH_RATIO, y * G_CANVAS_HEIGHT_RATIO, w * G_CANVAS_WIDTH_RATIO, h * G_CANVAS_HEIGHT_RATIO, 1, 1, plate_name)); @@ -4355,6 +4362,9 @@ function GetAlarm(alarm_data) { canvasTripwire8.getObjects()[0].stroke = "#ff0000"; } + // 11-01 + func_checkZoneColor(); + if (canvasTripwire_all && canvasTripwire && canvasTripwire1 && canvasTripwire2 && canvasTripwire3 && canvasTripwire4 && canvasTripwire5 && canvasTripwire6 && canvasTripwire7 && canvasTripwire8) { for (var index_zone = 0; index_zone < count_zone; index_zone++) { if (parseInt(parking_space[index_zone], 10) >= 1 && parseInt(parking_line[index_zone], 10) >= 1) { @@ -6109,4 +6119,119 @@ function func_setconfigfile(json_data) { } }); return false; +} + +// 11-01 +var defaultPolygonColor = "#ffff00"; // 預設色號 亮黃色的 Zone +var alarmColor = "#ff0000"; // 觸發 禁區、違停、警戒線 事件時，顯示紅色的 Zone ( Polygon ) +var defaultZoneAlarmStatus = {'behavior_id': 0, 'red_zone': 0, 'time_stamp': 0}; +var g_zoneAlarmStatus = func_initZoneAlarmStatus(defaultZoneAlarmStatus); +var g_zoneAlarmColorDisplayTime = 2; // Unit : second + +function func_checkZoneColor() +{ + // console.log("g_zoneAlarmStatus: ", g_zoneAlarmStatus); + + var currentTimeDiff = null; + var zoneColor = defaultPolygonColor; + for (var zoneIndex = 0; zoneIndex < MAX_DETECTION_ZONE; zoneIndex++) + { + zoneColor = defaultPolygonColor; + + if (g_zoneAlarmStatus[zoneIndex]['time_stamp'] > 0) + { + currentTimeDiff = new Date().getTime() - g_zoneAlarmStatus[zoneIndex]['time_stamp']; + if (currentTimeDiff > (g_zoneAlarmColorDisplayTime * 1000)) + { + // console.log(`[func_checkZoneColor] reset g_zoneAlarmStatus[${zoneIndex}]`); + + g_zoneAlarmStatus[zoneIndex]['behavior_id'] = 0; + g_zoneAlarmStatus[zoneIndex]['red_zone'] = 0; + g_zoneAlarmStatus[zoneIndex]['time_stamp'] = 0; + } // else 的 zone 仍在顯示時間內，仰賴 red_zone 賦予警報顏色 + + if (g_zoneAlarmStatus[zoneIndex]['red_zone'] == 1) + { + zoneColor = alarmColor; + } // else 的 zone 應是剛被 reset 狀態值的，以預設顏色顯示 + + } // else 是 時間戳被歸零的 以預設顏色顯示 + + // console.log(`[func_checkZoneColor] check zone ${(zoneIndex+1)} color:${zoneColor}`); + + // check all zone + // console.log("check show_all_zone: ", show_all_zone); + if (show_all_zone == 0) + { + // check which canvas is active + try + { + window["canvasTripwire"+(zoneIndex+1)].getObjects()[0].stroke = zoneColor; + } + catch (error) + { + console.log(error); + } + + } + else + { + if (zoneIndex < count_zone) { + // console.log(`[func_checkZoneColor] activeZoneIndex: ${zoneIndex}`); + canvasTripwire_all.getObjects()[zoneIndex].stroke = zoneColor; + } + + + } + } + +} + + +function func_checkTriggerZoneStatus(behavior_id) +{ + // console.log("checked_trigger_events:"); + // console.log(checked_trigger_events); + + var trigger_index = null; + + if (behavior_id == 1) // 禁區 + { + trigger_index = 0; + } + else if (behavior_id == 4) // 違停 + { + trigger_index = 1; + } + else if (behavior_id == 8) // 警戒線 + { + trigger_index = 4; + } + + for (var zoneIndex = 0; zoneIndex < MAX_DETECTION_ZONE; zoneIndex++) { + if (checked_trigger_events[zoneIndex][trigger_index] == 1) + { + if (g_zoneAlarmStatus[zoneIndex]['time_stamp'] == 0) { + g_zoneAlarmStatus[zoneIndex]['behavior_id'] = behavior_id; + g_zoneAlarmStatus[zoneIndex]['time_stamp'] = new Date().getTime(); + // console.log(`[func_checkTriggerZoneStatus] init g_zoneAlarmStatus[${zoneIndex}]['time_stamp']:${g_zoneAlarmStatus[zoneIndex]['time_stamp']}`); + g_zoneAlarmStatus[zoneIndex]['red_zone'] = 1; + } + } + } + + // console.log("[func_checkTriggerZoneStatus] check g_zoneAlarmStatus:"); + // console.log(g_zoneAlarmStatus); + +} + +function func_initZoneAlarmStatus(defaultValue) +{ + var array = []; + for (var i = 0; i < MAX_DETECTION_ZONE; i++) + { + // 確保每個元素都是一個新的副本，避免不同 Zone 紀載不同行為時互相干擾狀態值 + array.push(JSON.parse(JSON.stringify(defaultValue))); + } + return array; } \ No newline at end of file diff --git a/Aida/lang.js b/Aida/lang.js index 08d9edc..23800bb 100644 --- a/Aida/lang.js +++ b/Aida/lang.js @@ -52,6 +52,7 @@ var LANGUAGE = '{'+ '"IDC_STATIC_FTP_REMOTE_DIRECTORY": "Remote directory",' + '"IDC_STATIC_ENABLE_EMAIL_JPEG": "Enable JPEG",' + '"IDC_STATIC_EMAIL_RESET_TIME_INTERVAL": "Send at",' + + '"IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR": "Send counter at",' + '"IDC_STATIC_ENABLE_EMAIL_NOTIFICATION": "Enable email notification",' + '"IDC_STATIC_SYNC_USER_DATA": "Synchronize camera settings",' + '"IDC_STATIC_CAMERA_IMAGE_ROTATION": "Camera image rotation",' + @@ -91,6 +92,7 @@ var LANGUAGE = '{'+ '"IDC_STATIC_TRACKING_ID_DWELL": "Tracking ID dwell (Sec)",' + '"IDC_STATIC_ENABLE_PERSON_INDEPENDENT": "Person independent detection",' + '"IDC_STATIC_ENABLE_ONVIF_PROFILE_M": "ONVIF Profile M",' + + '"IDC_STATIC_ENABLE_CROP_MODE": "Enable crop mode",' + '"IDC_STATIC_ENABLE_BOUNDING_BOX": "Display bounding box outside zone",' + '"IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX": "Vanish quickly",' + '"IDC_STATIC_ENABLE_GETALARMMOTION_SNAP": "Enable metadata base64 JPEG (snapshot, FTP, email)",' + @@ -809,6 +811,7 @@ var LANGUAGE = '{'+ '"IDC_STATIC_FTP_REMOTE_DIRECTORY": "遠端目錄",' + '"IDC_STATIC_ENABLE_EMAIL_JPEG": "啟用JPEG",' + '"IDC_STATIC_EMAIL_RESET_TIME_INTERVAL": "寄送週期",' + + '"IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR": "寄送計數器",' + '"IDC_STATIC_ENABLE_EMAIL_NOTIFICATION": "啟用電子郵件通知",' + '"IDC_STATIC_SYNC_USER_DATA": "同步攝影機設定",' + '"IDC_STATIC_CAMERA_IMAGE_ROTATION": "攝影機影像旋轉",' + @@ -848,6 +851,7 @@ var LANGUAGE = '{'+ '"IDC_STATIC_TRACKING_ID_DWELL": "追蹤ID偵測時間 (秒)",' + '"IDC_STATIC_ENABLE_PERSON_INDEPENDENT": "人員無其他物種交錯偵測",' + '"IDC_STATIC_ENABLE_ONVIF_PROFILE_M": "ONVIF Profile M",' + + '"IDC_STATIC_ENABLE_CROP_MODE": "啟動裁切模式",' + '"IDC_STATIC_ENABLE_BOUNDING_BOX": "警戒區外顯示物件框",' + '"IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX": "快速消失",' + '"IDC_STATIC_ENABLE_GETALARMMOTION_SNAP": "開啟數據串流base64截圖 (snapshot, FTP, email)",' + @@ -1561,6 +1565,7 @@ var LANGUAGE = '{'+ '"IDC_STATIC_FTP_REMOTE_DIRECTORY": "リモート ディレクトリ",' + '"IDC_STATIC_ENABLE_EMAIL_JPEG": "JPEGを有効にする",' + '"IDC_STATIC_EMAIL_RESET_TIME_INTERVAL": "配送サイクル",' + + '"IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR": "配送カウンター",' + '"IDC_STATIC_ENABLE_EMAIL_NOTIFICATION": "電子メール通知を有効にする",' + '"IDC_STATIC_SYNC_USER_DATA": "カメラ設定を同期する",' + '"IDC_STATIC_CAMERA_IMAGE_ROTATION": "カメラ画像の回転",' + @@ -1600,6 +1605,7 @@ var LANGUAGE = '{'+ '"IDC_STATIC_TRACKING_ID_DWELL": "追跡IDの滞留（秒）",' + '"IDC_STATIC_ENABLE_PERSON_INDEPENDENT": "人物に依存しない検出",' + '"IDC_STATIC_ENABLE_ONVIF_PROFILE_M": "ONVIF Profile M",' + + '"IDC_STATIC_ENABLE_CROP_MODE": "クロップモードを有効にする",' + '"IDC_STATIC_ENABLE_BOUNDING_BOX": "検出ゾーン外境界表示",' + '"IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX": "すぐに姿を消す",' + '"IDC_STATIC_ENABLE_GETALARMMOTION_SNAP": "メタデータbase64 JPEGを有効にする (snapshot, FTP, email)",' + @@ -2302,6 +2308,7 @@ var LANGUAGE = '{'+ '"IDC_STATIC_FTP_REMOTE_DIRECTORY": "Rubrica remota",' + '"IDC_STATIC_ENABLE_EMAIL_JPEG": "Abilita JPEG",' + '"IDC_STATIC_EMAIL_RESET_TIME_INTERVAL": "Invia a",' + + '"IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR": "Invia contatore a",' + '"IDC_STATIC_ENABLE_EMAIL_NOTIFICATION": "Invia notifica via email",' + '"IDC_STATIC_SYNC_USER_DATA": "Sincronizza i dati dell' + "'" + 'utente",' + '"IDC_STATIC_CAMERA_IMAGE_ROTATION": "Rotazione dell' + "'" +'immagine della fotocamera",' + @@ -2341,6 +2348,7 @@ var LANGUAGE = '{'+ '"IDC_STATIC_TRACKING_ID_DWELL": "Permanenza dell' + "'" + 'ID di monitoraggio (sec)",' + '"IDC_STATIC_ENABLE_PERSON_INDEPENDENT": "Rilevamento indipendente dalla persona",' + '"IDC_STATIC_ENABLE_ONVIF_PROFILE_M": "ONVIF Profile M",' + + '"IDC_STATIC_ENABLE_CROP_MODE": "Abilita la modalità ritaglio",' + '"IDC_STATIC_ENABLE_BOUNDING_BOX": "Visualizza riquadro esterno zona",' + '"IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX": "Svanire rapidamente",' + '"IDC_STATIC_ENABLE_GETALARMMOTION_SNAP": "Abilita metadata base64 JPEG (snapshot, FTP, email)",' + diff --git a/Aida/lang_cookie.js b/Aida/lang_cookie.js index c5979a2..6267fca 100644 --- a/Aida/lang_cookie.js +++ b/Aida/lang_cookie.js @@ -53,6 +53,7 @@ var IDC_STATIC_FTP_REMOTE_DIRECTORY = ''; var IDC_STATIC_ENABLE_EMAIL_JPEG = ''; var IDC_STATIC_EMAIL_RESET_TIME_INTERVAL = ''; +var IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR = ''; var IDC_STATIC_ENABLE_EMAIL_NOTIFICATION = ''; var IDC_STATIC_SYNC_USER_DATA = ''; var IDC_STATIC_CAMERA_IMAGE_ROTATION = ''; @@ -94,6 +95,7 @@ var IDC_STATIC_NMS_THRES = ''; var IDC_STATIC_TRACKING_ID_DWELL = ''; var IDC_STATIC_ENABLE_PERSON_INDEPENDENT = ''; var IDC_STATIC_ENABLE_ONVIF_PROFILE_M = ''; +var IDC_STATIC_ENABLE_CROP_MODE = ''; var IDC_STATIC_ENABLE_BOUNDING_BOX = ''; var IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX = ''; var IDC_STATIC_ENABLE_GETALARMMOTION_SNAP = ''; @@ -666,6 +668,7 @@ function func_get_lang_cookie() { IDC_STATIC_ENABLE_EMAIL_JPEG = json_lang.en_gb[0].IDC_STATIC_ENABLE_EMAIL_JPEG; IDC_STATIC_EMAIL_RESET_TIME_INTERVAL = json_lang.en_gb[0].IDC_STATIC_EMAIL_RESET_TIME_INTERVAL; + IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR = json_lang.en_gb[0].IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR; IDC_STATIC_ENABLE_EMAIL_NOTIFICATION = json_lang.en_gb[0].IDC_STATIC_ENABLE_EMAIL_NOTIFICATION; IDC_STATIC_SYNC_USER_DATA = json_lang.en_gb[0].IDC_STATIC_SYNC_USER_DATA; IDC_STATIC_CAMERA_IMAGE_ROTATION = json_lang.en_gb[0].IDC_STATIC_CAMERA_IMAGE_ROTATION; @@ -707,6 +710,7 @@ function func_get_lang_cookie() { IDC_STATIC_TRACKING_ID_DWELL = json_lang.en_gb[0].IDC_STATIC_TRACKING_ID_DWELL; IDC_STATIC_ENABLE_PERSON_INDEPENDENT = json_lang.en_gb[0].IDC_STATIC_ENABLE_PERSON_INDEPENDENT; IDC_STATIC_ENABLE_ONVIF_PROFILE_M = json_lang.en_gb[0].IDC_STATIC_ENABLE_ONVIF_PROFILE_M; + IDC_STATIC_ENABLE_CROP_MODE = json_lang.en_gb[0].IDC_STATIC_ENABLE_CROP_MODE; IDC_STATIC_ENABLE_BOUNDING_BOX = json_lang.en_gb[0].IDC_STATIC_ENABLE_BOUNDING_BOX; IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX = json_lang.en_gb[0].IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX; IDC_STATIC_ENABLE_GETALARMMOTION_SNAP = json_lang.en_gb[0].IDC_STATIC_ENABLE_GETALARMMOTION_SNAP; @@ -1318,6 +1322,7 @@ function func_get_lang_cookie() { IDC_STATIC_ENABLE_EMAIL_JPEG = json_lang.zh_tw[0].IDC_STATIC_ENABLE_EMAIL_JPEG; IDC_STATIC_EMAIL_RESET_TIME_INTERVAL = json_lang.zh_tw[0].IDC_STATIC_EMAIL_RESET_TIME_INTERVAL; + IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR = json_lang.zh_tw[0].IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR; IDC_STATIC_ENABLE_EMAIL_NOTIFICATION = json_lang.zh_tw[0].IDC_STATIC_ENABLE_EMAIL_NOTIFICATION; IDC_STATIC_SYNC_USER_DATA = json_lang.zh_tw[0].IDC_STATIC_SYNC_USER_DATA; IDC_STATIC_CAMERA_IMAGE_ROTATION = json_lang.zh_tw[0].IDC_STATIC_CAMERA_IMAGE_ROTATION; @@ -1359,6 +1364,7 @@ function func_get_lang_cookie() { IDC_STATIC_TRACKING_ID_DWELL = json_lang.zh_tw[0].IDC_STATIC_TRACKING_ID_DWELL; IDC_STATIC_ENABLE_PERSON_INDEPENDENT = json_lang.zh_tw[0].IDC_STATIC_ENABLE_PERSON_INDEPENDENT; IDC_STATIC_ENABLE_ONVIF_PROFILE_M = json_lang.zh_tw[0].IDC_STATIC_ENABLE_ONVIF_PROFILE_M; + IDC_STATIC_ENABLE_CROP_MODE = json_lang.zh_tw[0].IDC_STATIC_ENABLE_CROP_MODE; IDC_STATIC_ENABLE_BOUNDING_BOX = json_lang.zh_tw[0].IDC_STATIC_ENABLE_BOUNDING_BOX; IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX = json_lang.zh_tw[0].IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX; IDC_STATIC_ENABLE_GETALARMMOTION_SNAP = json_lang.zh_tw[0].IDC_STATIC_ENABLE_GETALARMMOTION_SNAP; @@ -1955,6 +1961,7 @@ function func_get_lang_cookie() { IDC_STATIC_ENABLE_EMAIL_JPEG = json_lang.ja_jp[0].IDC_STATIC_ENABLE_EMAIL_JPEG; IDC_STATIC_EMAIL_RESET_TIME_INTERVAL = json_lang.ja_jp[0].IDC_STATIC_EMAIL_RESET_TIME_INTERVAL; + IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR = json_lang.ja_jp[0].IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR; IDC_STATIC_ENABLE_EMAIL_NOTIFICATION = json_lang.ja_jp[0].IDC_STATIC_ENABLE_EMAIL_NOTIFICATION; IDC_STATIC_SYNC_USER_DATA = json_lang.ja_jp[0].IDC_STATIC_SYNC_USER_DATA; IDC_STATIC_CAMERA_IMAGE_ROTATION = json_lang.ja_jp[0].IDC_STATIC_CAMERA_IMAGE_ROTATION; @@ -1996,6 +2003,7 @@ function func_get_lang_cookie() { IDC_STATIC_TRACKING_ID_DWELL = json_lang.ja_jp[0].IDC_STATIC_TRACKING_ID_DWELL; IDC_STATIC_ENABLE_PERSON_INDEPENDENT = json_lang.ja_jp[0].IDC_STATIC_ENABLE_PERSON_INDEPENDENT; IDC_STATIC_ENABLE_ONVIF_PROFILE_M = json_lang.ja_jp[0].IDC_STATIC_ENABLE_ONVIF_PROFILE_M; + IDC_STATIC_ENABLE_CROP_MODE = json_lang.ja_jp[0].IDC_STATIC_ENABLE_CROP_MODE; IDC_STATIC_ENABLE_BOUNDING_BOX = json_lang.ja_jp[0].IDC_STATIC_ENABLE_BOUNDING_BOX; IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX = json_lang.ja_jp[0].IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX; IDC_STATIC_ENABLE_GETALARMMOTION_SNAP = json_lang.ja_jp[0].IDC_STATIC_ENABLE_GETALARMMOTION_SNAP; @@ -2578,6 +2586,7 @@ function func_get_lang_cookie() { IDC_STATIC_ENABLE_EMAIL_JPEG = json_lang.it_it[0].IDC_STATIC_ENABLE_EMAIL_JPEG; IDC_STATIC_EMAIL_RESET_TIME_INTERVAL = json_lang.it_it[0].IDC_STATIC_EMAIL_RESET_TIME_INTERVAL; + IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR = json_lang.it_it[0].IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR; IDC_STATIC_ENABLE_EMAIL_NOTIFICATION = json_lang.it_it[0].IDC_STATIC_ENABLE_EMAIL_NOTIFICATION; IDC_STATIC_SYNC_USER_DATA = json_lang.it_it[0].IDC_STATIC_SYNC_USER_DATA; IDC_STATIC_CAMERA_IMAGE_ROTATION = json_lang.it_it[0].IDC_STATIC_CAMERA_IMAGE_ROTATION; @@ -2619,6 +2628,7 @@ function func_get_lang_cookie() { IDC_STATIC_TRACKING_ID_DWELL = json_lang.it_it[0].IDC_STATIC_TRACKING_ID_DWELL; IDC_STATIC_ENABLE_PERSON_INDEPENDENT = json_lang.it_it[0].IDC_STATIC_ENABLE_PERSON_INDEPENDENT; IDC_STATIC_ENABLE_ONVIF_PROFILE_M = json_lang.it_it[0].IDC_STATIC_ENABLE_ONVIF_PROFILE_M; + IDC_STATIC_ENABLE_CROP_MODE = json_lang.it_it[0].IDC_STATIC_ENABLE_CROP_MODE; IDC_STATIC_ENABLE_BOUNDING_BOX = json_lang.it_it[0].IDC_STATIC_ENABLE_BOUNDING_BOX; IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX = json_lang.it_it[0].IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX; IDC_STATIC_ENABLE_GETALARMMOTION_SNAP = json_lang.it_it[0].IDC_STATIC_ENABLE_GETALARMMOTION_SNAP; @@ -3203,6 +3213,7 @@ function func_get_lang_cookie() { IDC_STATIC_ENABLE_EMAIL_JPEG = json_lang.en_gb[0].IDC_STATIC_ENABLE_EMAIL_JPEG; IDC_STATIC_EMAIL_RESET_TIME_INTERVAL = json_lang.en_gb[0].IDC_STATIC_EMAIL_RESET_TIME_INTERVAL; + IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR = json_lang.en_gb[0].IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR; IDC_STATIC_ENABLE_EMAIL_NOTIFICATION = json_lang.en_gb[0].IDC_STATIC_ENABLE_EMAIL_NOTIFICATION; IDC_STATIC_SYNC_USER_DATA = json_lang.en_gb[0].IDC_STATIC_SYNC_USER_DATA; IDC_STATIC_CAMERA_IMAGE_ROTATION = json_lang.en_gb[0].IDC_STATIC_CAMERA_IMAGE_ROTATION; @@ -3244,6 +3255,7 @@ function func_get_lang_cookie() { IDC_STATIC_TRACKING_ID_DWELL = json_lang.en_gb[0].IDC_STATIC_TRACKING_ID_DWELL; IDC_STATIC_ENABLE_PERSON_INDEPENDENT = json_lang.en_gb[0].IDC_STATIC_ENABLE_PERSON_INDEPENDENT; IDC_STATIC_ENABLE_ONVIF_PROFILE_M = json_lang.en_gb[0].IDC_STATIC_ENABLE_ONVIF_PROFILE_M; + IDC_STATIC_ENABLE_CROP_MODE = json_lang.en_gb[0].IDC_STATIC_ENABLE_CROP_MODE; IDC_STATIC_ENABLE_BOUNDING_BOX = json_lang.en_gb[0].IDC_STATIC_ENABLE_BOUNDING_BOX; IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX = json_lang.en_gb[0].IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX; IDC_STATIC_ENABLE_GETALARMMOTION_SNAP = json_lang.en_gb[0].IDC_STATIC_ENABLE_GETALARMMOTION_SNAP; diff --git a/Aida/lpr_list.html b/Aida/lpr_list.html index 83ccb1c..95d7cfe 100644 --- a/Aida/lpr_list.html +++ b/Aida/lpr_list.html @@ -39,10 +39,10 @@ loadScript("jqueryAll_compressed.js", function () { }); }/* - else if (url.search("jquery.blockUI.js") >= 1) { - loadScript("jquery.blockUI.js", function () { - }); - }*/ + else if (url.search("jquery.blockUI.js") >= 1) { + loadScript("jquery.blockUI.js", function () { + }); + }*/ else if (url.search("config.js") >= 1) { loadScript("config.js", function () { }); diff --git a/Aida/object_index.html b/Aida/object_index.html index a5c11b1..d4ab2c5 100644 --- a/Aida/object_index.html +++ b/Aida/object_index.html @@ -317,7 +317,7 @@
- +     diff --git a/Aida/python.html b/Aida/python.html index e06fb7d..99c752f 100644 --- a/Aida/python.html +++ b/Aida/python.html @@ -297,19 +297,26 @@ // 當網頁加載完成後自動載入 hello.py window.onload = function() { // Ming add 2024/08/22 - - // 自動加載並顯示 hello.py 的內容 - currentFileName = 'hello.py'; - func_FileGet(currentFileName); - - // 加載文件列表並選中 hello.py - func_getFileList(currentFileName); - // 確認之前執行狀態 func_enablePythonfile(); // 確認有無回傳的資料 func_getPythonStatus(); + + if (currentRunningFile.endsWith('.py')) + { + func_FileGet(currentRunningFile); + + func_getFileList(currentRunningFile); + } + else + { + currentFileName = 'hello.py'; + // 加載文件列表並選中 hello.py + func_FileGet(currentFileName); + // 自動加載並顯示 hello.py 的內容 + func_getFileList(currentFileName); + } }; // 初始化 CodeMirror diff --git a/Aida/python_ming.html b/Aida/python_ming.html deleted file mode 100644 index 4b9899c..0000000 --- a/Aida/python_ming.html +++ /dev/null @@ -1,1040 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- -
- -
-
- - - - - -
- -
- -
- -
- -
- -
- -
- -
-
-
- - - - - diff --git a/Aida/setting.html b/Aida/setting.html index 87ae704..3af7890 100644 --- a/Aida/setting.html +++ b/Aida/setting.html @@ -252,7 +252,7 @@ --> - +   @@ -353,6 +353,17 @@ + + +   + + + +   + + + +   @@ -1404,6 +1415,42 @@ + + +   + + + +   + + +   @@ -2011,6 +2058,7 @@ document.getElementById("IDC_STATIC_ENABLE_CLOUD_SNAP").innerHTML = IDC_STATIC_ENABLE_EMAIL_JPEG; document.getElementById("IDC_STATIC_ENABLE_PERSON_INDEPENDENT").innerHTML = IDC_STATIC_ENABLE_PERSON_INDEPENDENT; document.getElementById("IDC_STATIC_ENABLE_ONVIF_PROFILE_M").innerHTML = IDC_STATIC_ENABLE_ONVIF_PROFILE_M; + document.getElementById("IDC_STATIC_ENABLE_CROP_MODE").innerHTML = IDC_STATIC_ENABLE_CROP_MODE; document.getElementById("IDC_STATIC_ENABLE_BOUNDING_BOX").innerHTML = IDC_STATIC_ENABLE_BOUNDING_BOX; document.getElementById("IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX").innerHTML = IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX; document.getElementById("IDC_STATIC_CLOUD_ACCOUNT").innerHTML = IDC_STATIC_CLOUD_ACCOUNT; @@ -2109,7 +2157,6 @@ document.getElementById("IDC_STATIC_ENABLE_PYTHON").innerHTML = IDC_STATIC_ENABLE_PYTHON; document.getElementById("IDC_STATIC_ENABLE_PYTHON_FILE").innerHTML = IDC_STATIC_ENABLE_PYTHON_FILE; - document.getElementById("IDC_STATIC_RED_LIGHT_ZONE").innerHTML = IDC_STATIC_RED_LIGHT_ZONE; document.getElementById("IDC_STATIC_NO_GIVE_WAY_TOPIC").innerHTML = IDC_STATIC_NO_GIVE_WAY_TOPIC; document.getElementById("IDC_STATIC_NO_GIVE_WAY_ZONE_TO_PROTECT").innerHTML = IDC_STATIC_NO_GIVE_WAY_ZONE_TO_PROTECT + " A #"; @@ -2163,6 +2210,7 @@ document.getElementById("IDC_STATIC_ENABLE_EMAIL_JPEG").innerHTML = IDC_STATIC_ENABLE_EMAIL_JPEG; document.getElementById("IDC_STATIC_EMAIL_RESET_TIME_INTERVAL").innerHTML = IDC_STATIC_EMAIL_RESET_TIME_INTERVAL; + document.getElementById("IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR").innerHTML = IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR; document.getElementById("IDC_STATIC_ENABLE_EMAIL_NOTIFICATION").innerHTML = IDC_STATIC_ENABLE_EMAIL_NOTIFICATION; document.getElementById("IDC_STATIC_E_MAIL_CONTENT").innerHTML = IDC_STATIC_E_MAIL_CONTENT; @@ -2241,6 +2289,7 @@ var enable_email_jpeg = "Yes"; var email_content = ""; var email_reset_time_interval = ""; + var send_counter_at_specific_hour = "NULL"; var auth_password = ""; var red_light_zone = ""; @@ -2260,13 +2309,13 @@ var nms_thres = "10"; var tracking_id_dwell = "5"; - var dwell_to_the_same_location = "5"; var enable_cloud_notification = "No"; var enable_cloud_snap = "Yes"; var enable_person_independent = "No"; var enable_onvif_profile_m = "No"; + var enable_crop_mode = "Yes"; var enable_bounding_box = "Yes"; var enable_dwell_bounding_box = "No"; var user_account = "myaccount@mail.com"; @@ -2616,12 +2665,12 @@ } function func_show_system_logs() { - if (enable_system_logs == "Yes") { + //if (enable_system_logs == "Yes") { window.open('logs.html', '_blank', 'resizable=yes,top=' + window.screenTop + ',left=' + window.screenLeft + ',width=' + window.outerWidth + ',height=' + window.outerHeight); - } - else { - alert("Please enable logs."); - } + //} + //else { + //alert("Please enable logs."); + //} } function func_show_python() { @@ -3483,6 +3532,7 @@ json_data += '"system_setting": {'; json_data += '"enable_email_jpeg": "' + enable_email_jpeg + '",'; json_data += '"email_reset_time_interval": "' + email_reset_time_interval + '",'; + json_data += '"send_counter_at_specific_hour": "' + send_counter_at_specific_hour + '",'; json_data += '"enable_email_notification": "' + enable_email_notification + '"'; json_data += '}'; json_data += '}'; @@ -3664,7 +3714,7 @@ var json_data = '{'; json_data += '"view_setting":{"camera01":{"getnetwork_buffer_id":"' + getnetwork_buffer_id + '"' + '}}'; - json_data += ',"system_setting": {"display properties": "' + enable_color_detection + '","enable_getalarmmotion_snap": "' + enable_getalarmmotion_snap + '","enable_ai_mirror": "' + enable_ai_mirror + '","ai_mirror_feature": "' + ai_mirror_feature + '","getimage_encoder_id": "' + getimage_encoder_id + '","getimage_encoder_id_HD": "' + getimage_encoder_id_HD + '","sensors_type": "' + sensors_type + '","enable_person_independent": "' + enable_person_independent + '","enable_onvif_profile_m": "' + enable_onvif_profile_m + '","enable_bounding_box": "' + enable_bounding_box + '","enable_dwell_bounding_box": "' + enable_dwell_bounding_box + '","nms_thres": "' + nms_thres + '","tracking_id_dwell": "' + tracking_id_dwell + '","enable_low_cpu_usage": "' + enable_low_cpu_usage + '"}'; + json_data += ',"system_setting": {"display properties": "' + enable_color_detection + '","enable_getalarmmotion_snap": "' + enable_getalarmmotion_snap + '","enable_ai_mirror": "' + enable_ai_mirror + '","ai_mirror_feature": "' + ai_mirror_feature + '","getimage_encoder_id": "' + getimage_encoder_id + '","getimage_encoder_id_HD": "' + getimage_encoder_id_HD + '","sensors_type": "' + sensors_type + '","enable_person_independent": "' + enable_person_independent + '","enable_onvif_profile_m": "' + enable_onvif_profile_m + '","enable_crop_mode": "' + enable_crop_mode + '","enable_bounding_box": "' + enable_bounding_box + '","enable_dwell_bounding_box": "' + enable_dwell_bounding_box + '","nms_thres": "' + nms_thres + '","tracking_id_dwell": "' + tracking_id_dwell + '","enable_low_cpu_usage": "' + enable_low_cpu_usage + '"}'; json_data += '}'; func_setconfigfile(json_data); @@ -4228,6 +4278,7 @@ enable_person_independent = jsonbuf["system_setting"]["enable_person_independent"]; enable_onvif_profile_m = jsonbuf["system_setting"]["enable_onvif_profile_m"]; + enable_crop_mode = jsonbuf["system_setting"]["enable_crop_mode"]; enable_bounding_box = jsonbuf["system_setting"]["enable_bounding_box"]; enable_dwell_bounding_box = jsonbuf["system_setting"]["enable_dwell_bounding_box"]; @@ -4275,6 +4326,10 @@ if (email_reset_time_interval.length == 0) { email_reset_time_interval = "NULL"; } + send_counter_at_specific_hour = jsonbuf["system_setting"]["send_counter_at_specific_hour"]; + if (send_counter_at_specific_hour.length == 0) { + send_counter_at_specific_hour = "NULL"; + } enable_email_notification = jsonbuf["system_setting"]["enable_email_notification"]; enable_ftp = jsonbuf["system_setting"]["enable_ftp"]; @@ -4418,6 +4473,10 @@ document.getElementById("onvif_border").style.display = "none"; } + if (enable_PTZ == "Yes") { + document.getElementById("crop_mode_border").style.display = ""; + } + if (enable_cloud == "Yes") { //document.getElementById("IDOK_mail").style.visibility = "visible"; //document.getElementById("IDOK_mail").style.top = ""; @@ -4518,6 +4577,10 @@ document.getElementById("ID_DEFAULT").style.top = "0px"; } + if (localStorage.getItem("v_series") != null && localStorage.getItem("v_series") == "Yes") { + document.getElementById("mail_counter_border").style.display = "none"; + } + if (enable_cloud_notification === 'Yes') $('#enable_cloud_notification').prop("checked", true); else @@ -4538,6 +4601,11 @@ else $('#enable_onvif_profile_m').prop("checked", false); + if (enable_crop_mode === 'Yes') + $('#enable_crop_mode').prop("checked", true); + else + $('#enable_crop_mode').prop("checked", false); + if (enable_bounding_box === 'Yes') $('#enable_bounding_box').prop("checked", true); else @@ -4576,6 +4644,7 @@ $('#cloud_record_v2_content').val(cloud_record_v2_content); $('#email_reset_time_interval').val(email_reset_time_interval); + $('#send_counter_at_specific_hour').val(send_counter_at_specific_hour); if (enable_color_detection === 'Yes') $('#enable_color_detection').prop("checked", true); @@ -4877,6 +4946,13 @@ enable_onvif_profile_m = "No"; } + if ($('#enable_crop_mode').is(":checked")) { + enable_crop_mode = "Yes"; + } + else { + enable_crop_mode = "No"; + } + if ($('#enable_bounding_box').is(":checked")) { enable_bounding_box = "Yes"; } @@ -4969,7 +5045,16 @@ ftp_jpeg_file_name = $('#ftp_jpeg_file_name').val(); email_content = $('#email_content').val(); - email_reset_time_interval = $('#email_reset_time_interval').val(); + + if ($('#email_reset_time_interval').val() != "NULL" && $('#send_counter_at_specific_hour').val() != "NULL") { + email_reset_time_interval = "NULL"; + $('#email_reset_time_interval').val(email_reset_time_interval); + } + else { + email_reset_time_interval = $('#email_reset_time_interval').val(); + send_counter_at_specific_hour = $('#send_counter_at_specific_hour').val(); + } + auth_password = $('#auth_password').val(); red_light_zone = $('#red_light_zone').val(); diff --git a/Aida/setting_on_nvr.html b/Aida/setting_on_nvr.html index 35a5480..9a0ab59 100644 --- a/Aida/setting_on_nvr.html +++ b/Aida/setting_on_nvr.html @@ -276,7 +276,7 @@ --> - +   @@ -377,6 +377,17 @@ + + +   + + + +   + + + +   @@ -1429,6 +1440,42 @@ + + +   + + + +   + + +   @@ -1787,8 +1834,7 @@   - - + @@ -2026,6 +2072,7 @@ document.getElementById("IDC_STATIC_ENABLE_CLOUD_SNAP").innerHTML = IDC_STATIC_ENABLE_EMAIL_JPEG; document.getElementById("IDC_STATIC_ENABLE_PERSON_INDEPENDENT").innerHTML = IDC_STATIC_ENABLE_PERSON_INDEPENDENT; document.getElementById("IDC_STATIC_ENABLE_ONVIF_PROFILE_M").innerHTML = IDC_STATIC_ENABLE_ONVIF_PROFILE_M; + document.getElementById("IDC_STATIC_ENABLE_CROP_MODE").innerHTML = IDC_STATIC_ENABLE_CROP_MODE; document.getElementById("IDC_STATIC_ENABLE_BOUNDING_BOX").innerHTML = IDC_STATIC_ENABLE_BOUNDING_BOX; document.getElementById("IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX").innerHTML = IDC_STATIC_ENABLE_DWELL_BOUNDING_BOX; document.getElementById("IDC_STATIC_CLOUD_ACCOUNT").innerHTML = IDC_STATIC_CLOUD_ACCOUNT; @@ -2176,6 +2223,7 @@ document.getElementById("IDC_STATIC_ENABLE_EMAIL_JPEG").innerHTML = IDC_STATIC_ENABLE_EMAIL_JPEG; document.getElementById("IDC_STATIC_EMAIL_RESET_TIME_INTERVAL").innerHTML = IDC_STATIC_EMAIL_RESET_TIME_INTERVAL; + document.getElementById("IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR").innerHTML = IDC_STATIC_SEND_COUNTER_AT_SPECIFIC_HOUR; document.getElementById("IDC_STATIC_ENABLE_EMAIL_NOTIFICATION").innerHTML = IDC_STATIC_ENABLE_EMAIL_NOTIFICATION; document.getElementById("IDC_STATIC_E_MAIL_CONTENT").innerHTML = IDC_STATIC_E_MAIL_CONTENT; @@ -2253,6 +2301,7 @@ var enable_email_jpeg = "Yes"; var email_content = ""; var email_reset_time_interval = ""; + var send_counter_at_specific_hour = "NULL"; var auth_password = ""; var red_light_zone = ""; @@ -2272,13 +2321,13 @@ var nms_thres = "10"; var tracking_id_dwell = "5"; - var dwell_to_the_same_location = "5"; var enable_cloud_notification = "No"; var enable_cloud_snap = "Yes"; var enable_person_independent = "No"; var enable_onvif_profile_m = "No"; + var enable_crop_mode = "Yes"; var enable_bounding_box = "Yes"; var enable_dwell_bounding_box = "No"; var user_account = "myaccount@mail.com"; @@ -2628,12 +2677,12 @@ } function func_show_system_logs() { - if (enable_system_logs == "Yes") { + //if (enable_system_logs == "Yes") { window.open('logs.html', '_blank', 'resizable=yes,top=' + window.screenTop + ',left=' + window.screenLeft + ',width=' + window.outerWidth + ',height=' + window.outerHeight); - } - else { - alert("Please enable logs."); - } + //} + //else { + //alert("Please enable logs."); + //} } function func_show_python() { @@ -3495,6 +3544,7 @@ json_data += '"system_setting": {'; json_data += '"enable_email_jpeg": "' + enable_email_jpeg + '",'; json_data += '"email_reset_time_interval": "' + email_reset_time_interval + '",'; + json_data += '"send_counter_at_specific_hour": "' + send_counter_at_specific_hour + '",'; json_data += '"enable_email_notification": "' + enable_email_notification + '"'; json_data += '}'; json_data += '}'; @@ -3676,7 +3726,7 @@ var json_data = '{'; json_data += '"view_setting":{"camera01":{"getnetwork_buffer_id":"' + getnetwork_buffer_id + '"' + '}}'; - json_data += ',"system_setting": {"display properties": "' + enable_color_detection + '","enable_getalarmmotion_snap": "' + enable_getalarmmotion_snap + '","enable_ai_mirror": "' + enable_ai_mirror + '","ai_mirror_feature": "' + ai_mirror_feature + '","getimage_encoder_id": "' + getimage_encoder_id + '","getimage_encoder_id_HD": "' + getimage_encoder_id_HD + '","sensors_type": "' + sensors_type + '","enable_person_independent": "' + enable_person_independent + '","enable_onvif_profile_m": "' + enable_onvif_profile_m + '","enable_bounding_box": "' + enable_bounding_box + '","enable_dwell_bounding_box": "' + enable_dwell_bounding_box + '","nms_thres": "' + nms_thres + '","tracking_id_dwell": "' + tracking_id_dwell + '","enable_low_cpu_usage": "' + enable_low_cpu_usage + '"}'; + json_data += ',"system_setting": {"display properties": "' + enable_color_detection + '","enable_getalarmmotion_snap": "' + enable_getalarmmotion_snap + '","enable_ai_mirror": "' + enable_ai_mirror + '","ai_mirror_feature": "' + ai_mirror_feature + '","getimage_encoder_id": "' + getimage_encoder_id + '","getimage_encoder_id_HD": "' + getimage_encoder_id_HD + '","sensors_type": "' + sensors_type + '","enable_person_independent": "' + enable_person_independent + '","enable_onvif_profile_m": "' + enable_onvif_profile_m + '","enable_crop_mode": "' + enable_crop_mode + '","enable_bounding_box": "' + enable_bounding_box + '","enable_dwell_bounding_box": "' + enable_dwell_bounding_box + '","nms_thres": "' + nms_thres + '","tracking_id_dwell": "' + tracking_id_dwell + '","enable_low_cpu_usage": "' + enable_low_cpu_usage + '"}'; json_data += '}'; func_setconfigfile(json_data); @@ -4240,6 +4290,7 @@ enable_person_independent = jsonbuf["system_setting"]["enable_person_independent"]; enable_onvif_profile_m = jsonbuf["system_setting"]["enable_onvif_profile_m"]; + enable_crop_mode = jsonbuf["system_setting"]["enable_crop_mode"]; enable_bounding_box = jsonbuf["system_setting"]["enable_bounding_box"]; enable_dwell_bounding_box = jsonbuf["system_setting"]["enable_dwell_bounding_box"]; @@ -4286,6 +4337,10 @@ if (email_reset_time_interval.length == 0) { email_reset_time_interval = "NULL"; } + send_counter_at_specific_hour = jsonbuf["system_setting"]["send_counter_at_specific_hour"]; + if (send_counter_at_specific_hour.length == 0) { + send_counter_at_specific_hour = "NULL"; + } enable_email_notification = jsonbuf["system_setting"]["enable_email_notification"]; enable_ftp = jsonbuf["system_setting"]["enable_ftp"]; @@ -4429,6 +4484,10 @@ document.getElementById("onvif_border").style.display = "none"; } + if (enable_PTZ == "Yes") { + document.getElementById("crop_mode_border").style.display = ""; + } + if (enable_cloud == "Yes") { //document.getElementById("IDOK_mail").style.visibility = "visible"; //document.getElementById("IDOK_mail").style.top = ""; @@ -4529,6 +4588,10 @@ document.getElementById("ID_DEFAULT").style.top = "0px"; } + if (localStorage.getItem("v_series") != null && localStorage.getItem("v_series") == "Yes") { + document.getElementById("mail_counter_border").style.display = "none"; + } + if (enable_cloud_notification === 'Yes') $('#enable_cloud_notification').prop("checked", true); else @@ -4549,6 +4612,11 @@ else $('#enable_onvif_profile_m').prop("checked", false); + if (enable_crop_mode === 'Yes') + $('#enable_crop_mode').prop("checked", true); + else + $('#enable_crop_mode').prop("checked", false); + if (enable_bounding_box === 'Yes') $('#enable_bounding_box').prop("checked", true); else @@ -4567,7 +4635,6 @@ $('#nms_thres').slider('setValue', parseInt(nms_thres, 10)); $('#tracking_id_dwell').slider('setValue', parseInt(tracking_id_dwell, 10)); - $('#dwell_to_the_same_location').slider('setValue', parseInt(dwell_to_the_same_location, 10)); if (enable_cloud_v2 === 'Yes') @@ -4587,6 +4654,7 @@ $('#cloud_record_v2_content').val(cloud_record_v2_content); $('#email_reset_time_interval').val(email_reset_time_interval); + $('#send_counter_at_specific_hour').val(send_counter_at_specific_hour); if (enable_color_detection === 'Yes') $('#enable_color_detection').prop("checked", true); @@ -4885,6 +4953,13 @@ enable_onvif_profile_m = "No"; } + if ($('#enable_crop_mode').is(":checked")) { + enable_crop_mode = "Yes"; + } + else { + enable_crop_mode = "No"; + } + if ($('#enable_bounding_box').is(":checked")) { enable_bounding_box = "Yes"; } @@ -4906,7 +4981,6 @@ nms_thres = $('#nms_thres').slider('getValue'); tracking_id_dwell = $('#tracking_id_dwell').slider('getValue'); - dwell_to_the_same_location = $('#dwell_to_the_same_location').slider('getValue'); if ($('#enable_cloud_v2').is(":checked")) { @@ -4977,7 +5051,16 @@ ftp_jpeg_file_name = $('#ftp_jpeg_file_name').val(); email_content = $('#email_content').val(); - email_reset_time_interval = $('#email_reset_time_interval').val(); + + if ($('#email_reset_time_interval').val() != "NULL" && $('#send_counter_at_specific_hour').val() != "NULL") { + email_reset_time_interval = "NULL"; + $('#email_reset_time_interval').val(email_reset_time_interval); + } + else { + email_reset_time_interval = $('#email_reset_time_interval').val(); + send_counter_at_specific_hour = $('#send_counter_at_specific_hour').val(); + } + auth_password = $('#auth_password').val(); red_light_zone = $('#red_light_zone').val(); diff --git a/Aida_data/aiengine_initial b/Aida_data/aiengine_initial index 612e487..05f14a2 100644 --- a/Aida_data/aiengine_initial +++ b/Aida_data/aiengine_initial @@ -9,6 +9,8 @@ modprobe cavalry cp /emmc/plugin/Aida_data/libopencv_video.so.3.4.6 /usr/lib/libopencv_video.so.3.4.6 cp /emmc/plugin/Aida_data/libopencv_video.so.3.4 /usr/lib/libopencv_video.so.3.4 +cp /emmc/plugin/Aida_data/libopencv_img_hash.so.3.4.6 /usr/lib/libopencv_img_hash.so.3.4.6 +cp /emmc/plugin/Aida_data/libopencv_img_hash.so.3.4 /usr/lib/libopencv_img_hash.so.3.4 rmmod /lib/modules/5.4.199/kernel/drivers/video/fbdev/ambarella/ambarella_fb.ko rmmod /lib/modules/4.14.164/kernel/drivers/video/fbdev/ambarella/ambarella_fb.ko diff --git a/Aida_data/config_custom_1.json b/Aida_data/config_custom_1.json index e52f63c..dfcbdb8 100644 --- a/Aida_data/config_custom_1.json +++ b/Aida_data/config_custom_1.json @@ -2006,7 +2006,9 @@ "ftp_jpeg_file_name_format": "fixed", "ftp_jpeg_file_name": "snap", "enable_system_logs": "No", + "enable_crop_mode": "Yes", "enable_email_jpeg": "Yes", + "send_counter_at_specific_hour": "NULL", "email_reset_time_interval": "", "enable_email_notification": "No" }, diff --git a/Aida_data/config_custom_2.json b/Aida_data/config_custom_2.json index e52f63c..dfcbdb8 100644 --- a/Aida_data/config_custom_2.json +++ b/Aida_data/config_custom_2.json @@ -2006,7 +2006,9 @@ "ftp_jpeg_file_name_format": "fixed", "ftp_jpeg_file_name": "snap", "enable_system_logs": "No", + "enable_crop_mode": "Yes", "enable_email_jpeg": "Yes", + "send_counter_at_specific_hour": "NULL", "email_reset_time_interval": "", "enable_email_notification": "No" }, diff --git a/Aida_data/config_custom_4.json b/Aida_data/config_custom_4.json index 3411389..da5b93f 100644 --- a/Aida_data/config_custom_4.json +++ b/Aida_data/config_custom_4.json @@ -26,7 +26,7 @@ "min_characters": "4", "max_characters": "10", "confidence": "70", - "confidence2": "70", + "confidence2": "1", "confidence3": "30", "confidence4": "30", "getnetwork_buffer_id": "3", @@ -57,7 +57,7 @@ "enable_ivs_and_ai": "Yes", "enable_lpr_upon_triggered": "No", "dwell_lpr_upon_triggered": "10", - "unknown_object_max_proportion": "20", + "unknown_object_max_proportion": "33", "unknown_object_min_proportion": "0", "confidence_unknown_object": "0", "confidence2_unknown_object": "0", @@ -2006,7 +2006,9 @@ "ftp_jpeg_file_name_format": "fixed", "ftp_jpeg_file_name": "snap", "enable_system_logs": "No", + "enable_crop_mode": "Yes", "enable_email_jpeg": "Yes", + "send_counter_at_specific_hour": "NULL", "email_reset_time_interval": "", "enable_email_notification": "No" }, diff --git a/Aida_data/config_custom_5.json b/Aida_data/config_custom_5.json index e52f63c..dfcbdb8 100644 --- a/Aida_data/config_custom_5.json +++ b/Aida_data/config_custom_5.json @@ -2006,7 +2006,9 @@ "ftp_jpeg_file_name_format": "fixed", "ftp_jpeg_file_name": "snap", "enable_system_logs": "No", + "enable_crop_mode": "Yes", "enable_email_jpeg": "Yes", + "send_counter_at_specific_hour": "NULL", "email_reset_time_interval": "", "enable_email_notification": "No" }, diff --git a/Aida_data/config_install.json b/Aida_data/config_install.json index e52f63c..a2bfcc0 100644 --- a/Aida_data/config_install.json +++ b/Aida_data/config_install.json @@ -1961,6 +1961,7 @@ "enable_cloud": "No", "enable_special_edition": "No", "enable_python": "No", + "enable_python_file":"No python running", "enable_low_cpu_usage": "No", "cloud_enable_snap": "Yes", "cloud_enable_notification": "No", @@ -2006,7 +2007,9 @@ "ftp_jpeg_file_name_format": "fixed", "ftp_jpeg_file_name": "snap", "enable_system_logs": "No", + "enable_crop_mode": "Yes", "enable_email_jpeg": "Yes", + "send_counter_at_specific_hour": "NULL", "email_reset_time_interval": "", "enable_email_notification": "No" }, diff --git a/Aida_data/different_version/SDK_2_5/gynet b/Aida_data/different_version/SDK_2_5/gynet index 0294c30..d4dfc2f 100644 Binary files a/Aida_data/different_version/SDK_2_5/gynet and b/Aida_data/different_version/SDK_2_5/gynet differ diff --git a/Aida_data/different_version/SDK_3_0/gynet b/Aida_data/different_version/SDK_3_0/gynet index c8efe43..8b2763b 100644 Binary files a/Aida_data/different_version/SDK_3_0/gynet and b/Aida_data/different_version/SDK_3_0/gynet differ diff --git a/Aida_data/events_custom_4.json b/Aida_data/events_custom_4.json index 7ce0100..4ad47f7 100644 --- a/Aida_data/events_custom_4.json +++ b/Aida_data/events_custom_4.json @@ -101,10 +101,10 @@ { "post_protocol": "HTTP", "post_event_method": "GET", - "post_event_name": "NVR HTTP digital alarm output", + "post_event_name": "LVT Notification", "post_host_ip": "192.168.0.111", "post_host_port": "80", - "post_url": "/Relay?on=1&ch=0&num=0", + "post_url": "/LVTDetection?event=intrusion&scene=<|zone_id|>&object=<|name|>", "post_content_type": "text/html; charset=utf-8", "post_username": "admin", "post_password": "pass", diff --git a/Aida_data/gynet b/Aida_data/gynet index 24037b0..bd20a84 100644 Binary files a/Aida_data/gynet and b/Aida_data/gynet differ diff --git a/Aida_data/jvc_config.json b/Aida_data/jvc_config.json index 4a15f1e..bdb4851 100644 --- a/Aida_data/jvc_config.json +++ b/Aida_data/jvc_config.json @@ -2185,7 +2185,9 @@ "external_lpr_db_username": "admin", "external_lpr_db_password": "pass", "enable_system_logs": "Yes", + "enable_crop_mode": "Yes", "enable_email_jpeg": "Yes", + "send_counter_at_specific_hour": "NULL", "email_reset_time_interval": "", "enable_ftp": "No", "ftp_url": "ftp.example.com", diff --git a/Aida_data/jvc_config_bak.json b/Aida_data/jvc_config_bak.json index 1a156f8..fa3cbac 100644 --- a/Aida_data/jvc_config_bak.json +++ b/Aida_data/jvc_config_bak.json @@ -2185,7 +2185,9 @@ "external_lpr_db_username": "admin", "external_lpr_db_password": "pass", "enable_system_logs": "Yes", + "enable_crop_mode": "Yes", "enable_email_jpeg": "Yes", + "send_counter_at_specific_hour": "NULL", "email_reset_time_interval": "", "enable_ftp": "No", "ftp_url": "ftp.example.com", diff --git a/Aida_data/libopencv_img_hash.so.3.4 b/Aida_data/libopencv_img_hash.so.3.4 new file mode 100644 index 0000000..bc3d56d Binary files /dev/null and b/Aida_data/libopencv_img_hash.so.3.4 differ diff --git a/Aida_data/libopencv_img_hash.so.3.4.6 b/Aida_data/libopencv_img_hash.so.3.4.6 new file mode 100644 index 0000000..bc3d56d Binary files /dev/null and b/Aida_data/libopencv_img_hash.so.3.4.6 differ diff --git a/Aida_data/python_code/__pycache__/hello.cpython-36.pyc b/Aida_data/python_code/__pycache__/hello.cpython-36.pyc deleted file mode 100644 index 14519e1..0000000 Binary files a/Aida_data/python_code/__pycache__/hello.cpython-36.pyc and /dev/null differ