diff --git a/mpmaster/src/main/assets/mpapp/data/App.json b/mpmaster/src/main/assets/mpapp/data/App.json index 71e2c24a..3863a0d3 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","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} \ No newline at end of file +{"bsManufacturer":"\u4e0a\u6d77\u6b23\u5f71\u7535\u529b\u79d1\u6280\u80a1\u4efd\u6709\u9650\u516c\u53f8","channels":4,"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":1744675200,"protocol":65290,"quality":80,"reportFault":0,"server":"61.169.135.146","timeForKeepingLogs":1296000,"timeForKeepingPhotos":1296000,"upgradePacketBase":1,"workStatusTimes":3} \ No newline at end of file diff --git a/mpmaster/src/main/assets/mpapp/data/bc.json b/mpmaster/src/main/assets/mpapp/data/bc.json index 6c549583..f32667c8 100644 --- a/mpmaster/src/main/assets/mpapp/data/bc.json +++ b/mpmaster/src/main/assets/mpapp/data/bc.json @@ -1,100 +1,100 @@ -[{"v":6015, "c":1}, -{"v":6283, "c":2}, -{"v":6442, "c":3}, -{"v":6553, "c":4}, -{"v":6641, "c":5}, -{"v":6708, "c":6}, -{"v":6735, "c":7}, -{"v":6742, "c":8}, -{"v":6746, "c":9}, -{"v":6751, "c":10}, -{"v":6757, "c":11}, -{"v":6765, "c":12}, -{"v":6774, "c":13}, -{"v":6785, "c":14}, -{"v":6797, "c":15}, -{"v":6811, "c":16}, -{"v":6822, "c":17}, -{"v":6833, "c":18}, -{"v":6844, "c":19}, -{"v":6853, "c":20}, -{"v":6863, "c":21}, -{"v":6871, "c":22}, -{"v":6878, "c":23}, -{"v":6883, "c":24}, -{"v":6891, "c":25}, -{"v":6896, "c":26}, -{"v":6897, "c":27}, -{"v":6901, "c":28}, -{"v":6903, "c":29}, -{"v":6904, "c":30}, -{"v":6906, "c":31}, -{"v":6907, "c":32}, -{"v":6908, "c":33}, -{"v":6910, "c":34}, -{"v":6911, "c":35}, -{"v":6911, "c":36}, -{"v":6913, "c":37}, -{"v":6914, "c":38}, -{"v":6914, "c":39}, -{"v":6915, "c":40}, -{"v":6917, "c":41}, -{"v":6918, "c":42}, -{"v":6918, "c":43}, -{"v":6921, "c":44}, -{"v":6922, "c":45}, -{"v":6924, "c":46}, -{"v":6926, "c":47}, -{"v":6927, "c":48}, -{"v":6929, "c":49}, -{"v":6931, "c":50}, -{"v":6934, "c":51}, -{"v":6938, "c":52}, -{"v":6941, "c":53}, -{"v":6946, "c":54}, -{"v":6948, "c":55}, -{"v":6952, "c":56}, -{"v":6954, "c":57}, -{"v":6957, "c":58}, -{"v":6959, "c":59}, -{"v":6961, "c":60}, -{"v":6963, "c":61}, -{"v":6965, "c":62}, -{"v":6967, "c":63}, -{"v":6971, "c":64}, -{"v":6973, "c":65}, -{"v":6976, "c":66}, -{"v":6978, "c":67}, -{"v":6980, "c":68}, -{"v":6982, "c":69}, -{"v":6984, "c":70}, -{"v":6986, "c":71}, -{"v":6988, "c":72}, -{"v":6989, "c":73}, -{"v":6991, "c":74}, -{"v":6992, "c":75}, -{"v":6993, "c":76}, -{"v":6995, "c":77}, -{"v":6997, "c":78}, -{"v":6998, "c":79}, -{"v":7000, "c":80}, -{"v":7003, "c":81}, -{"v":7004, "c":82}, -{"v":7006, "c":83}, -{"v":7008, "c":84}, -{"v":7011, "c":85}, -{"v":7014, "c":86}, -{"v":7018, "c":87}, -{"v":7021, "c":88}, -{"v":7024, "c":89}, -{"v":7029, "c":90}, -{"v":7033, "c":91}, -{"v":7039, "c":92}, -{"v":7044, "c":93}, -{"v":7052, "c":94}, -{"v":7062, "c":95}, -{"v":7073, "c":96}, -{"v":7087, "c":97}, -{"v":7104, "c":98}, -{"v":7122, "c":99}, -{"v":7142, "c":100}] \ No newline at end of file +[{"v":5312, "c":1}, +{"v":5580, "c":2}, +{"v":5749, "c":3}, +{"v":5870, "c":4}, +{"v":5944, "c":5}, +{"v":5985, "c":6}, +{"v":6019, "c":7}, +{"v":6048, "c":8}, +{"v":6065, "c":9}, +{"v":6076, "c":10}, +{"v":6086, "c":11}, +{"v":6096, "c":12}, +{"v":6105, "c":13}, +{"v":6113, "c":14}, +{"v":6121, "c":15}, +{"v":6131, "c":16}, +{"v":6141, "c":17}, +{"v":6151, "c":18}, +{"v":6160, "c":19}, +{"v":6168, "c":20}, +{"v":6176, "c":21}, +{"v":6183, "c":22}, +{"v":6191, "c":23}, +{"v":6197, "c":24}, +{"v":6204, "c":25}, +{"v":6209, "c":26}, +{"v":6214, "c":27}, +{"v":6219, "c":28}, +{"v":6224, "c":29}, +{"v":6228, "c":30}, +{"v":6232, "c":31}, +{"v":6236, "c":32}, +{"v":6240, "c":33}, +{"v":6245, "c":34}, +{"v":6249, "c":35}, +{"v":6252, "c":36}, +{"v":6255, "c":37}, +{"v":6258, "c":38}, +{"v":6262, "c":39}, +{"v":6264, "c":40}, +{"v":6267, "c":41}, +{"v":6269, "c":42}, +{"v":6272, "c":43}, +{"v":6273, "c":44}, +{"v":6275, "c":45}, +{"v":6278, "c":46}, +{"v":6279, "c":47}, +{"v":6281, "c":48}, +{"v":6283, "c":49}, +{"v":6285, "c":50}, +{"v":6287, "c":51}, +{"v":6289, "c":52}, +{"v":6291, "c":53}, +{"v":6293, "c":54}, +{"v":6295, "c":55}, +{"v":6298, "c":56}, +{"v":6300, "c":57}, +{"v":6303, "c":58}, +{"v":6305, "c":59}, +{"v":6308, "c":60}, +{"v":6310, "c":61}, +{"v":6312, "c":62}, +{"v":6315, "c":63}, +{"v":6317, "c":64}, +{"v":6320, "c":65}, +{"v":6323, "c":66}, +{"v":6325, "c":67}, +{"v":6328, "c":68}, +{"v":6331, "c":69}, +{"v":6335, "c":70}, +{"v":6338, "c":71}, +{"v":6341, "c":72}, +{"v":6343, "c":73}, +{"v":6345, "c":74}, +{"v":6347, "c":75}, +{"v":6349, "c":76}, +{"v":6351, "c":77}, +{"v":6352, "c":78}, +{"v":6354, "c":79}, +{"v":6355, "c":80}, +{"v":6357, "c":81}, +{"v":6358, "c":82}, +{"v":6359, "c":83}, +{"v":6360, "c":84}, +{"v":6361, "c":85}, +{"v":6362, "c":86}, +{"v":6363, "c":87}, +{"v":6364, "c":88}, +{"v":6366, "c":89}, +{"v":6367, "c":90}, +{"v":6368, "c":91}, +{"v":6367, "c":92}, +{"v":6367, "c":93}, +{"v":6368, "c":94}, +{"v":6368, "c":95}, +{"v":6369, "c":96}, +{"v":6369, "c":97}, +{"v":6371, "c":98}, +{"v":6375, "c":99}, +{"v":6390, "c":100}] \ No newline at end of file diff --git a/mpmaster/src/main/assets/mpapp/data/channels/1.json b/mpmaster/src/main/assets/mpapp/data/channels/1.json index 5566dc42..00fdd6e9 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,"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 +{"autoExposure":1,"autoFocus":1,"awbMode":1,"cameraId":0,"cameraType":0,"compensation":0,"customHdr":0,"exposureTime":0,"hdrStep":0,"ldrEnabled":0,"orientation":0,"osd":{"leftTop":"%%DATETIME%%\r\n\u4fe1\u53f7:%%SL%% \u7535\u6c60\u7535\u538b:%%BV%%V \u5145\u7535\u7535\u538b:%%CV%%"},"recognization":0,"requestTemplate":2,"resolutionCX":5376,"resolutionCY":3024,"sceneMode":0,"sensitivity":0,"usbCamera":0,"usingRawFormat":0,"usingSysCamera":0,"vendor":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 cb68ae40..2b5fac08 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,"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} \ No newline at end of file +{"autoExposure":1,"autoFocus":1,"awbMode":1,"burstCaptures":1,"cameraId":1,"cameraType":0,"compensation":2,"customHdr":0,"exposureTime":0,"hdrStep":0,"ldrEnabled":0,"orientation":0,"osd":{"leftTop":"%%DATETIME%% \r\n\u4fe1\u53f7:%%SL%% \u7535\u6c60\u7535\u538b:%%BV%%V \u5145\u7535\u7535\u538b:%%CV%%"},"recognization":0,"requestTemplate":2,"resolutionCX":1920,"resolutionCY":1080,"sceneMode":0,"sensitivity":0,"usbCamera":0,"usingRawFormat":2,"usingSysCamera":0,"vendor":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/3.json b/mpmaster/src/main/assets/mpapp/data/channels/3.json index 6739448a..7dc3e153 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,"usbCamera":0,"usingRawFormat":0,"usingSysCamera":0,"videoCX":1280,"videoCY":720,"videoDuration":5,"wait3ALocked":0} \ No newline at end of file +{"autoExposure":1,"autoFocus":1,"awbMode":1,"cameraId":2,"cameraType":0,"compensation":0,"customHdr":0,"hdrStep":0,"ldrEnabled":0,"orientation":4,"osd":{"leftTop":"%%DATETIME%%\r\n\u4fe1\u53f7:%%SL%% \u7535\u6c60\u7535\u538b:%%BV%%V \u5145\u7535\u7535\u538b:%%CV%%"},"recognization":0,"requestTemplate":2,"resolutionCX":1920,"resolutionCY":1080,"sceneMode":0,"usbCamera":0,"usingRawFormat":2,"usingSysCamera":0,"vendor":0,"videoCX":1280,"videoCY":720,"videoDuration":5,"wait3ALocked":0} \ No newline at end of file diff --git a/mpmaster/src/main/assets/mpapp/data/channels/4.json b/mpmaster/src/main/assets/mpapp/data/channels/4.json new file mode 100644 index 00000000..9fe1550f --- /dev/null +++ b/mpmaster/src/main/assets/mpapp/data/channels/4.json @@ -0,0 +1 @@ +{"autoExposure":1,"autoFocus":1,"awbMode":1,"cameraId":1,"cameraType":2,"closeDelayTime":5,"compensation":0,"customHdr":0,"hdrStep":0,"ip":"192.168.68.101","ldrEnabled":0,"orientation":0,"osd":{"leftTop":"%%DATETIME%%\r\n\u4fe1\u53f7:%%SL%% \u7535\u6c60\u7535\u538b:%%BV%%V \u5145\u7535\u7535\u538b:%%CV%%"},"password":"SHxy2024","quality":80,"recognization":0,"requestTemplate":3,"sceneMode":0,"selfTestingTime":60,"userName":"admin","usingRawFormat":0,"vendor":5,"wait3ALocked":0} \ No newline at end of file diff --git a/mpmaster/src/main/assets/mpapp/data/imgparams/0 b/mpmaster/src/main/assets/mpapp/data/imgparams/0 new file mode 100644 index 00000000..33c855be --- /dev/null +++ b/mpmaster/src/main/assets/mpapp/data/imgparams/0 @@ -0,0 +1 @@ +ÿ222 \ No newline at end of file diff --git a/mpmaster/src/main/assets/mpapp/data/network.json b/mpmaster/src/main/assets/mpapp/data/network.json new file mode 100644 index 00000000..8ffc9767 --- /dev/null +++ b/mpmaster/src/main/assets/mpapp/data/network.json @@ -0,0 +1 @@ +{"gateway":"192.168.68.1","iface":"eth0","ip":"192.168.68.91","netmask":"255.255.255.0"} \ No newline at end of file diff --git a/mpmaster/src/main/assets/mpapp/data/recog.json b/mpmaster/src/main/assets/mpapp/data/recog.json index d7a42c7d..1f0e4bc8 100644 --- a/mpmaster/src/main/assets/mpapp/data/recog.json +++ b/mpmaster/src/main/assets/mpapp/data/recog.json @@ -1 +1 @@ -{"blobName16":"354","blobName32":"366","blobName8":"output","borderColor":16776960,"enabled":1,"items":[{"enabled":1,"iid":0,"name":"\u6316\u6398\u673a","prob":0.5,"subType":5,"type":1},{"enabled":1,"iid":1,"name":"\u540a\u5854","prob":0.5,"subType":2,"type":1},{"enabled":1,"iid":2,"name":"\u540a\u8f66","prob":0.5,"subType":1,"type":1},{"enabled":1,"iid":3,"name":"\u6c34\u6ce5\u6cf5\u8f66","prob":0.5,"subType":4,"type":1},{"enabled":1,"iid":4,"name":"\u5c71\u706b","prob":0.5,"subType":40,"type":4},{"enabled":1,"iid":5,"name":"\u70df\u96fe","prob":0.5,"subType":41,"type":4},{"enabled":1,"iid":6,"name":"\u63a8\u571f\u673a","prob":0.5,"subType":3,"type":1},{"enabled":1,"iid":7,"name":"\u7ffb\u6597\u8f66","prob":0.5,"subType":10,"type":1},{"enabled":1,"iid":8,"name":"\u5bfc\u7ebf\u5f02\u7269","prob":0.5,"subType":1,"type":3},{"enabled":1,"iid":9,"name":"\u9632\u5c18\u7f51","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":10,"name":"\u538b\u8def\u673a","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":11,"name":"\u6405\u62cc\u8f66","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":12,"name":"\u6869\u673a","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":13,"name":"\u56f4\u6321","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":14,"name":"\u6c34\u9a6c","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":15,"name":"\u5b89\u5168\u5e3d","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":16,"name":"\u4e95\u76d6\u7f3a\u5931","prob":1.0099999904632568,"subType":2,"type":3}],"textColor":16776960,"thickness":4} \ No newline at end of file +{"blobName16":"354","blobName32":"366","blobName8":"output","borderColor":16776960,"enabled":1,"items":[{"enabled":1,"iid":0,"name":"\u6316\u6398\u673a","prob":0.5,"subType":5,"type":1},{"enabled":1,"iid":1,"name":"\u540a\u5854","prob":0.5,"subType":2,"type":1},{"enabled":1,"iid":2,"name":"\u540a\u8f66","prob":0.5,"subType":1,"type":1},{"enabled":1,"iid":3,"name":"\u6c34\u6ce5\u6cf5\u8f66","prob":0.5,"subType":4,"type":1},{"enabled":1,"iid":4,"name":"\u5c71\u706b","prob":0.5,"subType":40,"type":4},{"enabled":1,"iid":5,"name":"\u70df\u96fe","prob":0.5,"subType":41,"type":4},{"enabled":1,"iid":6,"name":"\u63a8\u571f\u673a","prob":0.5,"subType":3,"type":1},{"enabled":1,"iid":7,"name":"\u7ffb\u6597\u8f66","prob":0.5,"subType":10,"type":1},{"enabled":1,"iid":8,"name":"\u5bfc\u7ebf\u5f02\u7269","prob":0.5,"subType":1,"type":3},{"enabled":1,"iid":9,"name":"\u9632\u5c18\u7f51","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":10,"name":"\u538b\u8def\u673a","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":11,"name":"\u6405\u62cc\u8f66","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":12,"name":"\u6869\u673a","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":13,"name":"\u56f4\u6321","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":14,"name":"\u6c34\u9a6c","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":15,"name":"\u5b89\u5168\u5e3d","prob":1.0099999904632568,"subType":2,"type":3},{"enabled":1,"iid":16,"name":"\u4e95\u76d6\u7f3a\u5931","prob":1.0099999904632568,"subType":2,"type":3}],"minSize":10,"textColor":16776960,"thickness":4,"version":"2024-12-30"} \ No newline at end of file diff --git a/mpmaster/src/main/assets/mpapp/data/recog/rb.dat b/mpmaster/src/main/assets/mpapp/data/recog/rb.dat index ddaccb4b..b2e8a070 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/mpapp/data/schedules/4 b/mpmaster/src/main/assets/mpapp/data/schedules/4 new file mode 100644 index 00000000..1f85307f Binary files /dev/null and b/mpmaster/src/main/assets/mpapp/data/schedules/4 differ diff --git a/mpmaster/src/main/assets/mpapp/data/serials.json b/mpmaster/src/main/assets/mpapp/data/serials.json new file mode 100644 index 00000000..03f71fc9 --- /dev/null +++ b/mpmaster/src/main/assets/mpapp/data/serials.json @@ -0,0 +1 @@ +{"sensors":[]} \ No newline at end of file diff --git a/mpmaster/src/main/assets/mpmst/data/Master.json b/mpmaster/src/main/assets/mpmst/data/Master.json index e13c3f7a..6b8751b1 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":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 +{"absHeartbeats":[33449,85836],"heartbeat":10,"mntnMode":0,"mpappMonitorTimeout":1800000,"port":40101,"quickHbMode":0,"quickHeartbeat":60,"separateNetwork":1,"server":"61.169.135.150","syncTime":0,"timeForKeepingLogs":15,"usingAbsHbTime":1} \ No newline at end of file