diff --git a/mpmaster/src/main/assets/mpapp/data/App.json b/mpmaster/src/main/assets/mpapp/data/App.json index fcd84e14..04d16d30 100644 --- a/mpmaster/src/main/assets/mpapp/data/App.json +++ b/mpmaster/src/main/assets/mpapp/data/App.json @@ -1 +1 @@ -{"bsManufacturer":"\u4e0a\u6d77\u6b23\u5f71\u7535\u529b\u79d1\u6280\u80a1\u4efd\u6709\u9650\u516c\u53f8","encryption":0,"equipName":"\u56fe\u50cf\u5728\u7ebf\u76d1\u6d4b","heartbeat":10,"imgQuality":80,"model":"MSRDT-1-WP","network":0,"networkProtocol":0,"packetBase":1,"packetSize":32768,"port":6891,"postDataPaused":0,"channels":3,"productionDate":1717200000,"protocol":65298,"quality":80,"reportFault":0,"server":"61.169.135.146","timeForKeepingLogs":1296000,"timeForKeepingPhotos":1296000,"upgradePacketBase":1,"workStatusTimes":3} \ No newline at end of file +{"bsManufacturer":"\u4e0a\u6d77\u6b23\u5f71\u7535\u529b\u79d1\u6280\u80a1\u4efd\u6709\u9650\u516c\u53f8","channels":3,"encryption":0,"equipName":"\u56fe\u50cf\u5728\u7ebf\u76d1\u6d4b","heartbeat":10,"imgQuality":80,"model":"MSRDT-1-WP","network":0,"networkProtocol":0,"outputDbgInfo":0,"packetBase":1,"packetSize":32768,"port":6891,"postDataPaused":0,"productionDate":1717200000,"protocol":65298,"quality":80,"reportFault":0,"server":"61.169.135.146","timeForKeepingLogs":1296000,"timeForKeepingPhotos":1296000,"upgradePacketBase":1,"workStatusTimes":3} diff --git a/mpmaster/src/main/assets/mpapp/data/channels/1.json b/mpmaster/src/main/assets/mpapp/data/channels/1.json index f240f22d..5566dc42 100644 --- a/mpmaster/src/main/assets/mpapp/data/channels/1.json +++ b/mpmaster/src/main/assets/mpapp/data/channels/1.json @@ -1 +1 @@ -{"autoExposure":1,"autoFocus":1,"compensation":0,"exposureTime":0,"ldrEnabled":0,"orientation":0,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%% \u7248\u672c:%%V%%\r\n\u4fe1\u53f7:%%SL%% \u7535\u6c60\u7535\u538b:%%BV%% \u7535\u6c60\u7535\u91cf:%%BP%% \u5145\u7535\u7535\u538b:%%CV%%"},"quality":80,"recognization":2,"resolutionCX":5376,"resolutionCY":3024,"sceneMode":0,"sensitivity":0,"usbCamera":0,"videoCX":1280,"videoCY":720,"videoDuration":5,"zoom":0,"zoomRatio":1} \ No newline at end of file +{"autoExposure":1,"autoFocus":1,"awbMode":1,"compensation":0,"exposureTime":0,"ldrEnabled":0,"orientation":0,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%% \u7248\u672c:%%V%%\r\n\u4fe1\u53f7:%%SL%% \u7535\u6c60\u7535\u538b:%%BV%% \u7535\u6c60\u7535\u91cf:%%BP%% \u5145\u7535\u7535\u538b:%%CV%%"},"quality":80,"recognization":2,"requestTemplate":2,"resolutionCX":5376,"resolutionCY":3024,"sceneMode":0,"sensitivity":0,"usbCamera":0,"usingRawFormat":0,"usingSysCamera":0,"videoCX":1280,"videoCY":720,"videoDuration":5,"wait3ALocked":0,"zoom":0,"zoomRatio":1} \ No newline at end of file diff --git a/mpmaster/src/main/assets/mpapp/data/channels/2.json b/mpmaster/src/main/assets/mpapp/data/channels/2.json index 8d62e9ef..25020402 100644 --- a/mpmaster/src/main/assets/mpapp/data/channels/2.json +++ b/mpmaster/src/main/assets/mpapp/data/channels/2.json @@ -1 +1 @@ -{"autoExposure":1,"autoFocus":1,"awbMode":1,"compensation":0,"exposureTime":0,"ldrEnabled":0,"orientation":3,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%% \u7248\u672c:%%V%%\r\n\u4fe1\u53f7:%%SL%% \u7535\u6c60\u7535\u538b:%%BV%% \u7535\u6c60\u7535\u91cf:%%BP%% \u5145\u7535\u7535\u538b:%%CV%%"},"quality":80,"recognization":2,"requestTemplate":1,"resolutionCX":1920,"resolutionCY":1080,"sceneMode":0,"sensitivity":0,"burstCaptures":4,"usingRawFormat":2,"usbCamera":0,"videoCX":1280,"videoCY":720,"videoDuration":5,"wait3ALocked":0,"zoom":0,"zoomRatio":1} \ No newline at end of file +{"autoExposure":1,"autoFocus":1,"awbMode":1,"burstCaptures":4,"compensation":0,"exposureTime":0,"ldrEnabled":0,"orientation":3,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%% \u7248\u672c:%%V%%\r\n\u4fe1\u53f7:%%SL%% \u7535\u6c60\u7535\u538b:%%BV%% \u7535\u6c60\u7535\u91cf:%%BP%% \u5145\u7535\u7535\u538b:%%CV%%"},"quality":80,"recognization":2,"requestTemplate":2,"resolutionCX":1920,"resolutionCY":1080,"sceneMode":0,"sensitivity":0,"usbCamera":0,"usingRawFormat":2,"usingSysCamera":0,"videoCX":1280,"videoCY":720,"videoDuration":5,"wait3ALocked":0,"zoom":0,"zoomRatio":1} diff --git a/mpmaster/src/main/assets/mpapp/data/channels/3.json b/mpmaster/src/main/assets/mpapp/data/channels/3.json index ea047bc9..6739448a 100644 --- a/mpmaster/src/main/assets/mpapp/data/channels/3.json +++ b/mpmaster/src/main/assets/mpapp/data/channels/3.json @@ -1 +1 @@ -{"autoExposure":1,"autoFocus":1,"awbMode":1,"compensation":0,"ldrEnabled":0,"orientation":4,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%% \u7248\u672c:%%V%%\r\n\u4fe1\u53f7:%%SL%% \u7535\u6c60\u7535\u538b:%%BV%% \u7535\u6c60\u7535\u91cf:%%BP%% \u5145\u7535\u7535\u538b:%%CV%%"},"recognization":2,"requestTemplate":1,"resolutionCX":3264,"resolutionCY":2448,"sceneMode":0,"videoCX":1280,"videoCY":720,"videoDuration":5,"wait3ALocked":0} \ No newline at end of file +{"autoExposure":1,"autoFocus":1,"awbMode":1,"compensation":0,"ldrEnabled":0,"orientation":4,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%% \u7248\u672c:%%V%%\r\n\u4fe1\u53f7:%%SL%% \u7535\u6c60\u7535\u538b:%%BV%% \u7535\u6c60\u7535\u91cf:%%BP%% \u5145\u7535\u7535\u538b:%%CV%%"},"recognization":2,"requestTemplate":1,"resolutionCX":3264,"resolutionCY":2448,"sceneMode":0,"usbCamera":0,"usingRawFormat":0,"usingSysCamera":0,"videoCX":1280,"videoCY":720,"videoDuration":5,"wait3ALocked":0} \ No newline at end of file diff --git a/mpmaster/src/main/assets/mpapp/data/imgparams/1 b/mpmaster/src/main/assets/mpapp/data/imgparams/1 deleted file mode 100644 index bdada2b7..00000000 Binary files a/mpmaster/src/main/assets/mpapp/data/imgparams/1 and /dev/null differ diff --git a/mpmaster/src/main/assets/mpapp/data/imgparams/3 b/mpmaster/src/main/assets/mpapp/data/imgparams/3 deleted file mode 100644 index bf350ba2..00000000 Binary files a/mpmaster/src/main/assets/mpapp/data/imgparams/3 and /dev/null differ diff --git a/mpmaster/src/main/assets/mpapp/data/recog/rb.dat b/mpmaster/src/main/assets/mpapp/data/recog/rb.dat index 8283d6b2..ddaccb4b 100644 Binary files a/mpmaster/src/main/assets/mpapp/data/recog/rb.dat and b/mpmaster/src/main/assets/mpapp/data/recog/rb.dat differ diff --git a/mpmaster/src/main/assets/mpmst/data/Master.json b/mpmaster/src/main/assets/mpmst/data/Master.json index 5e272df3..e13c3f7a 100644 --- a/mpmaster/src/main/assets/mpmst/data/Master.json +++ b/mpmaster/src/main/assets/mpmst/data/Master.json @@ -1 +1 @@ -{"absHeartbeats":[33420,85808],"heartbeat":10,"mntnMode":0,"mpappMonitorTimeout":1800000,"port":40101,"quickHbMode":0,"quickHeartbeat":60,"separateNetwork":1,"server":"61.169.135.150","timeForKeepingLogs":15,"usingAbsHbTime":1} \ No newline at end of file +{"absHeartbeats":[33420,85808],"heartbeat":10,"mntnMode":1,"mpappMonitorTimeout":1800000,"port":40101,"quickHbMode":0,"quickHeartbeat":60,"separateNetwork":1,"server":"61.169.135.150","timeForKeepingLogs":15,"usingAbsHbTime":1} \ No newline at end of file