diff --git a/configs/henan_2025/mpapp/data/App.json b/configs/henan_2025/mpapp/data/App.json new file mode 100644 index 00000000..71e2c24a --- /dev/null +++ b/configs/henan_2025/mpapp/data/App.json @@ -0,0 +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 diff --git a/configs/henan_2025/mpapp/data/Master.json b/configs/henan_2025/mpapp/data/Master.json new file mode 100644 index 00000000..5e272df3 --- /dev/null +++ b/configs/henan_2025/mpapp/data/Master.json @@ -0,0 +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 diff --git a/configs/henan_2025/mpapp/data/bc.json b/configs/henan_2025/mpapp/data/bc.json new file mode 100644 index 00000000..6c549583 --- /dev/null +++ b/configs/henan_2025/mpapp/data/bc.json @@ -0,0 +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 diff --git a/configs/henan_2025/mpapp/data/channels/1.json b/configs/henan_2025/mpapp/data/channels/1.json new file mode 100644 index 00000000..602413b2 --- /dev/null +++ b/configs/henan_2025/mpapp/data/channels/1.json @@ -0,0 +1 @@ +{"autoExposure":1,"autoFocus":1,"awbMode":1,"cameraType":0,"compensation":0,"customHdr":0,"exposureTime":0,"hdrStep":0,"ldrEnabled":0,"orientation":0,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%%\r\n\u4fe1\u53f7:%%SL%% %%BV%%V"},"quality":80,"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/configs/henan_2025/mpapp/data/channels/2.json b/configs/henan_2025/mpapp/data/channels/2.json new file mode 100644 index 00000000..307d8c44 --- /dev/null +++ b/configs/henan_2025/mpapp/data/channels/2.json @@ -0,0 +1 @@ +{"autoExposure":1,"autoFocus":1,"awbMode":1,"burstCaptures":4,"cameraType":0,"compensation":0,"customHdr":0,"exposureTime":0,"hdrStep":0,"ldrEnabled":0,"orientation":3,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%%\r\n\u4fe1\u53f7:%%SL%% %%BV%%V"},"quality":80,"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/configs/henan_2025/mpapp/data/channels/3.json b/configs/henan_2025/mpapp/data/channels/3.json new file mode 100644 index 00000000..53f0ad84 --- /dev/null +++ b/configs/henan_2025/mpapp/data/channels/3.json @@ -0,0 +1 @@ +{"autoExposure":1,"autoFocus":1,"awbMode":1,"cameraType":0,"compensation":0,"customHdr":0,"hdrStep":0,"ldrEnabled":0,"orientation":4,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%%\r\n\u4fe1\u53f7:%%SL%% %%BV%%V"},"recognization":0,"requestTemplate":1,"resolutionCX":3264,"resolutionCY":2448,"sceneMode":0,"usbCamera":0,"usingRawFormat":0,"usingSysCamera":0,"vendor":0,"videoCX":1280,"videoCY":720,"videoDuration":5,"wait3ALocked":0} \ No newline at end of file diff --git a/mpres/src/main/assets/mpapp/data/recog.json b/configs/henan_2025/mpapp/data/recog.json similarity index 91% rename from mpres/src/main/assets/mpapp/data/recog.json rename to configs/henan_2025/mpapp/data/recog.json index 1f0e4bc8..0d355a4a 100644 --- a/mpres/src/main/assets/mpapp/data/recog.json +++ b/configs/henan_2025/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}],"minSize":10,"textColor":16776960,"thickness":4,"version":"2024-12-30"} \ No newline at end of file +{"blobName16":"354","blobName32":"366","blobName8":"output","borderColor":16776960,"enabled":0,"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,"version":"2024-12-30"} \ No newline at end of file diff --git a/configs/henan_2025/mpapp/data/schedules/1 b/configs/henan_2025/mpapp/data/schedules/1 new file mode 100644 index 00000000..e5f8cb60 Binary files /dev/null and b/configs/henan_2025/mpapp/data/schedules/1 differ diff --git a/configs/henan_2025/mpapp/data/schedules/2 b/configs/henan_2025/mpapp/data/schedules/2 new file mode 100644 index 00000000..98058fcc Binary files /dev/null and b/configs/henan_2025/mpapp/data/schedules/2 differ diff --git a/configs/henan_2025/mpapp/data/schedules/3 b/configs/henan_2025/mpapp/data/schedules/3 new file mode 100644 index 00000000..a731e919 Binary files /dev/null and b/configs/henan_2025/mpapp/data/schedules/3 differ diff --git a/configs/henan_2025/mpmst/data/Master.json b/configs/henan_2025/mpmst/data/Master.json new file mode 100644 index 00000000..5e272df3 --- /dev/null +++ b/configs/henan_2025/mpmst/data/Master.json @@ -0,0 +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 diff --git a/configs/nx2024/mpapp/data/App.json b/configs/nx2024/mpapp/data/App.json new file mode 100644 index 00000000..71e2c24a --- /dev/null +++ b/configs/nx2024/mpapp/data/App.json @@ -0,0 +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 diff --git a/configs/nx2024/mpapp/data/Master.json b/configs/nx2024/mpapp/data/Master.json new file mode 100644 index 00000000..5e272df3 --- /dev/null +++ b/configs/nx2024/mpapp/data/Master.json @@ -0,0 +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 diff --git a/configs/nx2024/mpapp/data/bc.json b/configs/nx2024/mpapp/data/bc.json new file mode 100644 index 00000000..6c549583 --- /dev/null +++ b/configs/nx2024/mpapp/data/bc.json @@ -0,0 +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 diff --git a/configs/nx2024/mpapp/data/channels/1.json b/configs/nx2024/mpapp/data/channels/1.json new file mode 100644 index 00000000..602413b2 --- /dev/null +++ b/configs/nx2024/mpapp/data/channels/1.json @@ -0,0 +1 @@ +{"autoExposure":1,"autoFocus":1,"awbMode":1,"cameraType":0,"compensation":0,"customHdr":0,"exposureTime":0,"hdrStep":0,"ldrEnabled":0,"orientation":0,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%%\r\n\u4fe1\u53f7:%%SL%% %%BV%%V"},"quality":80,"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/configs/nx2024/mpapp/data/channels/2.json b/configs/nx2024/mpapp/data/channels/2.json new file mode 100644 index 00000000..307d8c44 --- /dev/null +++ b/configs/nx2024/mpapp/data/channels/2.json @@ -0,0 +1 @@ +{"autoExposure":1,"autoFocus":1,"awbMode":1,"burstCaptures":4,"cameraType":0,"compensation":0,"customHdr":0,"exposureTime":0,"hdrStep":0,"ldrEnabled":0,"orientation":3,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%%\r\n\u4fe1\u53f7:%%SL%% %%BV%%V"},"quality":80,"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/configs/nx2024/mpapp/data/channels/3.json b/configs/nx2024/mpapp/data/channels/3.json new file mode 100644 index 00000000..53f0ad84 --- /dev/null +++ b/configs/nx2024/mpapp/data/channels/3.json @@ -0,0 +1 @@ +{"autoExposure":1,"autoFocus":1,"awbMode":1,"cameraType":0,"compensation":0,"customHdr":0,"hdrStep":0,"ldrEnabled":0,"orientation":4,"osd":{"leftTop":"%%DATETIME%% CH:%%CH%%\r\n\u4fe1\u53f7:%%SL%% %%BV%%V"},"recognization":0,"requestTemplate":1,"resolutionCX":3264,"resolutionCY":2448,"sceneMode":0,"usbCamera":0,"usingRawFormat":0,"usingSysCamera":0,"vendor":0,"videoCX":1280,"videoCY":720,"videoDuration":5,"wait3ALocked":0} \ No newline at end of file diff --git a/configs/nx2024/mpapp/data/recog.json b/configs/nx2024/mpapp/data/recog.json new file mode 100644 index 00000000..0d355a4a --- /dev/null +++ b/configs/nx2024/mpapp/data/recog.json @@ -0,0 +1 @@ +{"blobName16":"354","blobName32":"366","blobName8":"output","borderColor":16776960,"enabled":0,"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,"version":"2024-12-30"} \ No newline at end of file diff --git a/configs/nx2024/mpapp/data/schedules/1 b/configs/nx2024/mpapp/data/schedules/1 new file mode 100644 index 00000000..e5f8cb60 Binary files /dev/null and b/configs/nx2024/mpapp/data/schedules/1 differ diff --git a/configs/nx2024/mpapp/data/schedules/2 b/configs/nx2024/mpapp/data/schedules/2 new file mode 100644 index 00000000..98058fcc Binary files /dev/null and b/configs/nx2024/mpapp/data/schedules/2 differ diff --git a/configs/nx2024/mpapp/data/schedules/3 b/configs/nx2024/mpapp/data/schedules/3 new file mode 100644 index 00000000..a731e919 Binary files /dev/null and b/configs/nx2024/mpapp/data/schedules/3 differ diff --git a/configs/nx2024/mpmst/data/Master.json b/configs/nx2024/mpmst/data/Master.json new file mode 100644 index 00000000..5e272df3 --- /dev/null +++ b/configs/nx2024/mpmst/data/Master.json @@ -0,0 +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 diff --git a/mpres/build.gradle b/mpres/build.gradle index 316c2163..9eee18fa 100644 --- a/mpres/build.gradle +++ b/mpres/build.gradle @@ -6,7 +6,7 @@ plugins { def AppMajorVersion = 1 def AppMinorVersion = 0 def AppBuildNumber = 14 -def ConfigProjectOwner = "HENAN_2024" +def ConfigProjectOwner = "NX_2024" def AppVersionName = AppMajorVersion + "." + AppMinorVersion + "." + AppBuildNumber def AppVersionCode = AppMajorVersion * 100000 + AppMinorVersion * 1000 + AppBuildNumber diff --git a/mpres/src/main/assets/mpapp/data/App.json b/mpres/src/main/assets/mpapp/data/App.json deleted file mode 100644 index 777ee757..00000000 --- a/mpres/src/main/assets/mpapp/data/App.json +++ /dev/null @@ -1 +0,0 @@ -{"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":5,"imgQuality":80,"model":"MSRDT-1-WP","network":0,"networkProtocol":0,"nightEnd":21601,"nightStart":64800,"nightSwitchMethod":0,"outputDbgInfo":0,"packetBase":0,"packetSize":10240,"port":6891,"postDataPaused":0,"productionDate":1744675200,"protocol":65290,"quality":80,"reportFault":0,"server":"61.169.135.146","timeForKeepingLogs":1296000,"timeForKeepingPhotos":1296000,"upgradePacketBase":0,"workStatusTimes":12} \ No newline at end of file diff --git a/mpres/src/main/assets/mpapp/data/bc.json b/mpres/src/main/assets/mpapp/data/bc.json deleted file mode 100644 index f32667c8..00000000 --- a/mpres/src/main/assets/mpapp/data/bc.json +++ /dev/null @@ -1,100 +0,0 @@ -[{"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/mpres/src/main/assets/mpapp/data/cbc.json b/mpres/src/main/assets/mpapp/data/cbc.json deleted file mode 100644 index 76702be1..00000000 --- a/mpres/src/main/assets/mpapp/data/cbc.json +++ /dev/null @@ -1,100 +0,0 @@ -[{"v":6209, "c":1}, -{"v":6362, "c":2}, -{"v":6480, "c":3}, -{"v":6576, "c":4}, -{"v":6652, "c":5}, -{"v":6718, "c":6}, -{"v":6769, "c":7}, -{"v":6794, "c":8}, -{"v":6800, "c":9}, -{"v":6804, "c":10}, -{"v":6809, "c":11}, -{"v":6814, "c":12}, -{"v":6820, "c":13}, -{"v":6827, "c":14}, -{"v":6836, "c":15}, -{"v":6845, "c":16}, -{"v":6857, "c":17}, -{"v":6868, "c":18}, -{"v":6880, "c":19}, -{"v":6892, "c":20}, -{"v":6902, "c":21}, -{"v":6922, "c":22}, -{"v":6923, "c":23}, -{"v":6931, "c":24}, -{"v":6940, "c":25}, -{"v":6948, "c":26}, -{"v":6956, "c":27}, -{"v":6963, "c":28}, -{"v":6969, "c":29}, -{"v":6974, "c":30}, -{"v":6976, "c":31}, -{"v":6979, "c":32}, -{"v":6982, "c":33}, -{"v":6983, "c":34}, -{"v":6984, "c":35}, -{"v":6985, "c":36}, -{"v":6986, "c":37}, -{"v":6987, "c":38}, -{"v":6988, "c":39}, -{"v":6989, "c":40}, -{"v":6990, "c":41}, -{"v":6991, "c":42}, -{"v":6992, "c":43}, -{"v":6993, "c":44}, -{"v":6994, "c":45}, -{"v":6995, "c":46}, -{"v":6996, "c":47}, -{"v":6997, "c":48}, -{"v":6998, "c":49}, -{"v":6999, "c":50}, -{"v":7000, "c":51}, -{"v":7001, "c":52}, -{"v":7003, "c":53}, -{"v":7005, "c":54}, -{"v":7007, "c":55}, -{"v":7008, "c":56}, -{"v":1010, "c":57}, -{"v":7012, "c":58}, -{"v":7013, "c":59}, -{"v":7015, "c":60}, -{"v":7018, "c":61}, -{"v":7021, "c":62}, -{"v":7025, "c":63}, -{"v":7028, "c":64}, -{"v":7031, "c":65}, -{"v":7035, "c":66}, -{"v":7038, "c":67}, -{"v":7043, "c":68}, -{"v":7047, "c":69}, -{"v":7051, "c":70}, -{"v":7056, "c":71}, -{"v":7060, "c":72}, -{"v":7064, "c":73}, -{"v":7067, "c":74}, -{"v":7068, "c":75}, -{"v":7069, "c":76}, -{"v":7070, "c":77}, -{"v":7072, "c":78}, -{"v":7073, "c":79}, -{"v":7074, "c":80}, -{"v":7075, "c":81}, -{"v":7078, "c":82}, -{"v":7080, "c":83}, -{"v":7082, "c":84}, -{"v":7084, "c":85}, -{"v":7087, "c":86}, -{"v":7090, "c":87}, -{"v":7093, "c":88}, -{"v":7096, "c":89}, -{"v":7099, "c":90}, -{"v":7103, "c":91}, -{"v":7108, "c":92}, -{"v":7114, "c":93}, -{"v":7121, "c":94}, -{"v":7131, "c":95}, -{"v":7144, "c":96}, -{"v":7164, "c":97}, -{"v":7198, "c":98}, -{"v":7282, "c":99}, -{"v":7297, "c":100}] \ No newline at end of file diff --git a/mpres/src/main/assets/mpapp/data/channels/1.json b/mpres/src/main/assets/mpapp/data/channels/1.json deleted file mode 100644 index 6bafb0ae..00000000 --- a/mpres/src/main/assets/mpapp/data/channels/1.json +++ /dev/null @@ -1 +0,0 @@ -{"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%%"},"quality":80,"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/mpres/src/main/assets/mpapp/data/channels/2.json b/mpres/src/main/assets/mpapp/data/channels/2.json deleted file mode 100644 index ce80b72e..00000000 --- a/mpres/src/main/assets/mpapp/data/channels/2.json +++ /dev/null @@ -1 +0,0 @@ -{"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%%"},"quality":80,"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/mpres/src/main/assets/mpapp/data/channels/3.json b/mpres/src/main/assets/mpapp/data/channels/3.json deleted file mode 100644 index 28a819ee..00000000 --- a/mpres/src/main/assets/mpapp/data/channels/3.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "autoExposure": 1, - "autoFocus": 1, - "awbMode": 1, - "burstCaptures": 1, - "cameraId": 2, - "cameraType": 0, - "compensation": 2, - "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%%" - }, - "quality": 80, - "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 -} diff --git a/mpres/src/main/assets/mpapp/data/channels/4.json b/mpres/src/main/assets/mpapp/data/channels/4.json deleted file mode 100644 index 9fe1550f..00000000 --- a/mpres/src/main/assets/mpapp/data/channels/4.json +++ /dev/null @@ -1 +0,0 @@ -{"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/mpres/src/main/assets/mpapp/data/imgparams/0 b/mpres/src/main/assets/mpapp/data/imgparams/0 deleted file mode 100644 index 33c855be..00000000 --- a/mpres/src/main/assets/mpapp/data/imgparams/0 +++ /dev/null @@ -1 +0,0 @@ -ÿ222 \ No newline at end of file diff --git a/mpres/src/main/assets/mpapp/data/network.json b/mpres/src/main/assets/mpapp/data/network.json deleted file mode 100644 index 8ffc9767..00000000 --- a/mpres/src/main/assets/mpapp/data/network.json +++ /dev/null @@ -1 +0,0 @@ -{"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/mpres/src/main/assets/mpapp/data/recog/rb.dat b/mpres/src/main/assets/mpapp/data/recog/rb.dat deleted file mode 100644 index b2e8a070..00000000 Binary files a/mpres/src/main/assets/mpapp/data/recog/rb.dat and /dev/null differ diff --git a/mpres/src/main/assets/mpapp/data/recog/rp.dat b/mpres/src/main/assets/mpapp/data/recog/rp.dat deleted file mode 100644 index dbc47ac3..00000000 --- a/mpres/src/main/assets/mpapp/data/recog/rp.dat +++ /dev/null @@ -1,175 +0,0 @@ -7767517 -173 197 -Input images 0 1 images -Convolution /model.0/conv/Conv 1 1 images /model.0/conv/Conv_output_0 0=32 1=6 11=6 2=1 12=1 3=2 13=2 4=2 14=2 15=2 16=2 5=1 6=3456 -Swish /model.0/act/Mul 1 1 /model.0/conv/Conv_output_0 /model.0/act/Mul_output_0 -Convolution /model.1/conv/Conv 1 1 /model.0/act/Mul_output_0 /model.1/conv/Conv_output_0 0=64 1=3 11=3 2=1 12=1 3=2 13=2 4=1 14=1 15=1 16=1 5=1 6=18432 -Swish /model.1/act/Mul 1 1 /model.1/conv/Conv_output_0 /model.1/act/Mul_output_0 -Split splitncnn_0 1 2 /model.1/act/Mul_output_0 /model.1/act/Mul_output_0_splitncnn_0 /model.1/act/Mul_output_0_splitncnn_1 -Convolution /model.2/cv1/conv/Conv 1 1 /model.1/act/Mul_output_0_splitncnn_1 /model.2/cv1/conv/Conv_output_0 0=32 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=2048 -Swish /model.2/cv1/act/Mul 1 1 /model.2/cv1/conv/Conv_output_0 /model.2/cv1/act/Mul_output_0 -Split splitncnn_1 1 2 /model.2/cv1/act/Mul_output_0 /model.2/cv1/act/Mul_output_0_splitncnn_0 /model.2/cv1/act/Mul_output_0_splitncnn_1 -Convolution /model.2/m/m.0/cv1/conv/Conv 1 1 /model.2/cv1/act/Mul_output_0_splitncnn_1 /model.2/m/m.0/cv1/conv/Conv_output_0 0=32 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=1024 -Swish /model.2/m/m.0/cv1/act/Mul 1 1 /model.2/m/m.0/cv1/conv/Conv_output_0 /model.2/m/m.0/cv1/act/Mul_output_0 -Convolution /model.2/m/m.0/cv2/conv/Conv 1 1 /model.2/m/m.0/cv1/act/Mul_output_0 /model.2/m/m.0/cv2/conv/Conv_output_0 0=32 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=9216 -Swish /model.2/m/m.0/cv2/act/Mul 1 1 /model.2/m/m.0/cv2/conv/Conv_output_0 /model.2/m/m.0/cv2/act/Mul_output_0 -BinaryOp /model.2/m/m.0/Add 2 1 /model.2/cv1/act/Mul_output_0_splitncnn_0 /model.2/m/m.0/cv2/act/Mul_output_0 /model.2/m/m.0/Add_output_0 0=0 -Convolution /model.2/cv2/conv/Conv 1 1 /model.1/act/Mul_output_0_splitncnn_0 /model.2/cv2/conv/Conv_output_0 0=32 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=2048 -Swish /model.2/cv2/act/Mul 1 1 /model.2/cv2/conv/Conv_output_0 /model.2/cv2/act/Mul_output_0 -Concat /model.2/Concat 2 1 /model.2/m/m.0/Add_output_0 /model.2/cv2/act/Mul_output_0 /model.2/Concat_output_0 0=0 -Convolution /model.2/cv3/conv/Conv 1 1 /model.2/Concat_output_0 /model.2/cv3/conv/Conv_output_0 0=64 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=4096 -Swish /model.2/cv3/act/Mul 1 1 /model.2/cv3/conv/Conv_output_0 /model.2/cv3/act/Mul_output_0 -Convolution /model.3/conv/Conv 1 1 /model.2/cv3/act/Mul_output_0 /model.3/conv/Conv_output_0 0=128 1=3 11=3 2=1 12=1 3=2 13=2 4=1 14=1 15=1 16=1 5=1 6=73728 -Swish /model.3/act/Mul 1 1 /model.3/conv/Conv_output_0 /model.3/act/Mul_output_0 -Split splitncnn_2 1 2 /model.3/act/Mul_output_0 /model.3/act/Mul_output_0_splitncnn_0 /model.3/act/Mul_output_0_splitncnn_1 -Convolution /model.4/cv1/conv/Conv 1 1 /model.3/act/Mul_output_0_splitncnn_1 /model.4/cv1/conv/Conv_output_0 0=64 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=8192 -Swish /model.4/cv1/act/Mul 1 1 /model.4/cv1/conv/Conv_output_0 /model.4/cv1/act/Mul_output_0 -Split splitncnn_3 1 2 /model.4/cv1/act/Mul_output_0 /model.4/cv1/act/Mul_output_0_splitncnn_0 /model.4/cv1/act/Mul_output_0_splitncnn_1 -Convolution /model.4/m/m.0/cv1/conv/Conv 1 1 /model.4/cv1/act/Mul_output_0_splitncnn_1 /model.4/m/m.0/cv1/conv/Conv_output_0 0=64 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=4096 -Swish /model.4/m/m.0/cv1/act/Mul 1 1 /model.4/m/m.0/cv1/conv/Conv_output_0 /model.4/m/m.0/cv1/act/Mul_output_0 -Convolution /model.4/m/m.0/cv2/conv/Conv 1 1 /model.4/m/m.0/cv1/act/Mul_output_0 /model.4/m/m.0/cv2/conv/Conv_output_0 0=64 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=36864 -Swish /model.4/m/m.0/cv2/act/Mul 1 1 /model.4/m/m.0/cv2/conv/Conv_output_0 /model.4/m/m.0/cv2/act/Mul_output_0 -BinaryOp /model.4/m/m.0/Add 2 1 /model.4/cv1/act/Mul_output_0_splitncnn_0 /model.4/m/m.0/cv2/act/Mul_output_0 /model.4/m/m.0/Add_output_0 0=0 -Split splitncnn_4 1 2 /model.4/m/m.0/Add_output_0 /model.4/m/m.0/Add_output_0_splitncnn_0 /model.4/m/m.0/Add_output_0_splitncnn_1 -Convolution /model.4/m/m.1/cv1/conv/Conv 1 1 /model.4/m/m.0/Add_output_0_splitncnn_1 /model.4/m/m.1/cv1/conv/Conv_output_0 0=64 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=4096 -Swish /model.4/m/m.1/cv1/act/Mul 1 1 /model.4/m/m.1/cv1/conv/Conv_output_0 /model.4/m/m.1/cv1/act/Mul_output_0 -Convolution /model.4/m/m.1/cv2/conv/Conv 1 1 /model.4/m/m.1/cv1/act/Mul_output_0 /model.4/m/m.1/cv2/conv/Conv_output_0 0=64 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=36864 -Swish /model.4/m/m.1/cv2/act/Mul 1 1 /model.4/m/m.1/cv2/conv/Conv_output_0 /model.4/m/m.1/cv2/act/Mul_output_0 -BinaryOp /model.4/m/m.1/Add 2 1 /model.4/m/m.0/Add_output_0_splitncnn_0 /model.4/m/m.1/cv2/act/Mul_output_0 /model.4/m/m.1/Add_output_0 0=0 -Convolution /model.4/cv2/conv/Conv 1 1 /model.3/act/Mul_output_0_splitncnn_0 /model.4/cv2/conv/Conv_output_0 0=64 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=8192 -Swish /model.4/cv2/act/Mul 1 1 /model.4/cv2/conv/Conv_output_0 /model.4/cv2/act/Mul_output_0 -Concat /model.4/Concat 2 1 /model.4/m/m.1/Add_output_0 /model.4/cv2/act/Mul_output_0 /model.4/Concat_output_0 0=0 -Convolution /model.4/cv3/conv/Conv 1 1 /model.4/Concat_output_0 /model.4/cv3/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=16384 -Swish /model.4/cv3/act/Mul 1 1 /model.4/cv3/conv/Conv_output_0 /model.4/cv3/act/Mul_output_0 -Split splitncnn_5 1 2 /model.4/cv3/act/Mul_output_0 /model.4/cv3/act/Mul_output_0_splitncnn_0 /model.4/cv3/act/Mul_output_0_splitncnn_1 -Convolution /model.5/conv/Conv 1 1 /model.4/cv3/act/Mul_output_0_splitncnn_1 /model.5/conv/Conv_output_0 0=256 1=3 11=3 2=1 12=1 3=2 13=2 4=1 14=1 15=1 16=1 5=1 6=294912 -Swish /model.5/act/Mul 1 1 /model.5/conv/Conv_output_0 /model.5/act/Mul_output_0 -Split splitncnn_6 1 2 /model.5/act/Mul_output_0 /model.5/act/Mul_output_0_splitncnn_0 /model.5/act/Mul_output_0_splitncnn_1 -Convolution /model.6/cv1/conv/Conv 1 1 /model.5/act/Mul_output_0_splitncnn_1 /model.6/cv1/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=32768 -Swish /model.6/cv1/act/Mul 1 1 /model.6/cv1/conv/Conv_output_0 /model.6/cv1/act/Mul_output_0 -Split splitncnn_7 1 2 /model.6/cv1/act/Mul_output_0 /model.6/cv1/act/Mul_output_0_splitncnn_0 /model.6/cv1/act/Mul_output_0_splitncnn_1 -Convolution /model.6/m/m.0/cv1/conv/Conv 1 1 /model.6/cv1/act/Mul_output_0_splitncnn_1 /model.6/m/m.0/cv1/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=16384 -Swish /model.6/m/m.0/cv1/act/Mul 1 1 /model.6/m/m.0/cv1/conv/Conv_output_0 /model.6/m/m.0/cv1/act/Mul_output_0 -Convolution /model.6/m/m.0/cv2/conv/Conv 1 1 /model.6/m/m.0/cv1/act/Mul_output_0 /model.6/m/m.0/cv2/conv/Conv_output_0 0=128 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=147456 -Swish /model.6/m/m.0/cv2/act/Mul 1 1 /model.6/m/m.0/cv2/conv/Conv_output_0 /model.6/m/m.0/cv2/act/Mul_output_0 -BinaryOp /model.6/m/m.0/Add 2 1 /model.6/cv1/act/Mul_output_0_splitncnn_0 /model.6/m/m.0/cv2/act/Mul_output_0 /model.6/m/m.0/Add_output_0 0=0 -Split splitncnn_8 1 2 /model.6/m/m.0/Add_output_0 /model.6/m/m.0/Add_output_0_splitncnn_0 /model.6/m/m.0/Add_output_0_splitncnn_1 -Convolution /model.6/m/m.1/cv1/conv/Conv 1 1 /model.6/m/m.0/Add_output_0_splitncnn_1 /model.6/m/m.1/cv1/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=16384 -Swish /model.6/m/m.1/cv1/act/Mul 1 1 /model.6/m/m.1/cv1/conv/Conv_output_0 /model.6/m/m.1/cv1/act/Mul_output_0 -Convolution /model.6/m/m.1/cv2/conv/Conv 1 1 /model.6/m/m.1/cv1/act/Mul_output_0 /model.6/m/m.1/cv2/conv/Conv_output_0 0=128 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=147456 -Swish /model.6/m/m.1/cv2/act/Mul 1 1 /model.6/m/m.1/cv2/conv/Conv_output_0 /model.6/m/m.1/cv2/act/Mul_output_0 -BinaryOp /model.6/m/m.1/Add 2 1 /model.6/m/m.0/Add_output_0_splitncnn_0 /model.6/m/m.1/cv2/act/Mul_output_0 /model.6/m/m.1/Add_output_0 0=0 -Split splitncnn_9 1 2 /model.6/m/m.1/Add_output_0 /model.6/m/m.1/Add_output_0_splitncnn_0 /model.6/m/m.1/Add_output_0_splitncnn_1 -Convolution /model.6/m/m.2/cv1/conv/Conv 1 1 /model.6/m/m.1/Add_output_0_splitncnn_1 /model.6/m/m.2/cv1/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=16384 -Swish /model.6/m/m.2/cv1/act/Mul 1 1 /model.6/m/m.2/cv1/conv/Conv_output_0 /model.6/m/m.2/cv1/act/Mul_output_0 -Convolution /model.6/m/m.2/cv2/conv/Conv 1 1 /model.6/m/m.2/cv1/act/Mul_output_0 /model.6/m/m.2/cv2/conv/Conv_output_0 0=128 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=147456 -Swish /model.6/m/m.2/cv2/act/Mul 1 1 /model.6/m/m.2/cv2/conv/Conv_output_0 /model.6/m/m.2/cv2/act/Mul_output_0 -BinaryOp /model.6/m/m.2/Add 2 1 /model.6/m/m.1/Add_output_0_splitncnn_0 /model.6/m/m.2/cv2/act/Mul_output_0 /model.6/m/m.2/Add_output_0 0=0 -Convolution /model.6/cv2/conv/Conv 1 1 /model.5/act/Mul_output_0_splitncnn_0 /model.6/cv2/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=32768 -Swish /model.6/cv2/act/Mul 1 1 /model.6/cv2/conv/Conv_output_0 /model.6/cv2/act/Mul_output_0 -Concat /model.6/Concat 2 1 /model.6/m/m.2/Add_output_0 /model.6/cv2/act/Mul_output_0 /model.6/Concat_output_0 0=0 -Convolution /model.6/cv3/conv/Conv 1 1 /model.6/Concat_output_0 /model.6/cv3/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=65536 -Swish /model.6/cv3/act/Mul 1 1 /model.6/cv3/conv/Conv_output_0 /model.6/cv3/act/Mul_output_0 -Split splitncnn_10 1 2 /model.6/cv3/act/Mul_output_0 /model.6/cv3/act/Mul_output_0_splitncnn_0 /model.6/cv3/act/Mul_output_0_splitncnn_1 -Convolution /model.7/conv/Conv 1 1 /model.6/cv3/act/Mul_output_0_splitncnn_1 /model.7/conv/Conv_output_0 0=512 1=3 11=3 2=1 12=1 3=2 13=2 4=1 14=1 15=1 16=1 5=1 6=1179648 -Swish /model.7/act/Mul 1 1 /model.7/conv/Conv_output_0 /model.7/act/Mul_output_0 -Split splitncnn_11 1 2 /model.7/act/Mul_output_0 /model.7/act/Mul_output_0_splitncnn_0 /model.7/act/Mul_output_0_splitncnn_1 -Convolution /model.8/cv1/conv/Conv 1 1 /model.7/act/Mul_output_0_splitncnn_1 /model.8/cv1/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=131072 -Swish /model.8/cv1/act/Mul 1 1 /model.8/cv1/conv/Conv_output_0 /model.8/cv1/act/Mul_output_0 -Split splitncnn_12 1 2 /model.8/cv1/act/Mul_output_0 /model.8/cv1/act/Mul_output_0_splitncnn_0 /model.8/cv1/act/Mul_output_0_splitncnn_1 -Convolution /model.8/m/m.0/cv1/conv/Conv 1 1 /model.8/cv1/act/Mul_output_0_splitncnn_1 /model.8/m/m.0/cv1/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=65536 -Swish /model.8/m/m.0/cv1/act/Mul 1 1 /model.8/m/m.0/cv1/conv/Conv_output_0 /model.8/m/m.0/cv1/act/Mul_output_0 -Convolution /model.8/m/m.0/cv2/conv/Conv 1 1 /model.8/m/m.0/cv1/act/Mul_output_0 /model.8/m/m.0/cv2/conv/Conv_output_0 0=256 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=589824 -Swish /model.8/m/m.0/cv2/act/Mul 1 1 /model.8/m/m.0/cv2/conv/Conv_output_0 /model.8/m/m.0/cv2/act/Mul_output_0 -BinaryOp /model.8/m/m.0/Add 2 1 /model.8/cv1/act/Mul_output_0_splitncnn_0 /model.8/m/m.0/cv2/act/Mul_output_0 /model.8/m/m.0/Add_output_0 0=0 -Convolution /model.8/cv2/conv/Conv 1 1 /model.7/act/Mul_output_0_splitncnn_0 /model.8/cv2/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=131072 -Swish /model.8/cv2/act/Mul 1 1 /model.8/cv2/conv/Conv_output_0 /model.8/cv2/act/Mul_output_0 -Concat /model.8/Concat 2 1 /model.8/m/m.0/Add_output_0 /model.8/cv2/act/Mul_output_0 /model.8/Concat_output_0 0=0 -Convolution /model.8/cv3/conv/Conv 1 1 /model.8/Concat_output_0 /model.8/cv3/conv/Conv_output_0 0=512 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=262144 -Swish /model.8/cv3/act/Mul 1 1 /model.8/cv3/conv/Conv_output_0 /model.8/cv3/act/Mul_output_0 -Convolution /model.9/cv1/conv/Conv 1 1 /model.8/cv3/act/Mul_output_0 /model.9/cv1/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=131072 -Swish /model.9/cv1/act/Mul 1 1 /model.9/cv1/conv/Conv_output_0 /model.9/cv1/act/Mul_output_0 -Split splitncnn_13 1 2 /model.9/cv1/act/Mul_output_0 /model.9/cv1/act/Mul_output_0_splitncnn_0 /model.9/cv1/act/Mul_output_0_splitncnn_1 -Pooling /model.9/m/MaxPool 1 1 /model.9/cv1/act/Mul_output_0_splitncnn_1 /model.9/m/MaxPool_output_0 0=0 1=5 11=5 2=1 12=1 3=2 13=2 14=2 15=2 5=1 -Split splitncnn_14 1 2 /model.9/m/MaxPool_output_0 /model.9/m/MaxPool_output_0_splitncnn_0 /model.9/m/MaxPool_output_0_splitncnn_1 -Pooling /model.9/m_1/MaxPool 1 1 /model.9/m/MaxPool_output_0_splitncnn_1 /model.9/m_1/MaxPool_output_0 0=0 1=5 11=5 2=1 12=1 3=2 13=2 14=2 15=2 5=1 -Split splitncnn_15 1 2 /model.9/m_1/MaxPool_output_0 /model.9/m_1/MaxPool_output_0_splitncnn_0 /model.9/m_1/MaxPool_output_0_splitncnn_1 -Pooling /model.9/m_2/MaxPool 1 1 /model.9/m_1/MaxPool_output_0_splitncnn_1 /model.9/m_2/MaxPool_output_0 0=0 1=5 11=5 2=1 12=1 3=2 13=2 14=2 15=2 5=1 -Concat /model.9/Concat 4 1 /model.9/cv1/act/Mul_output_0_splitncnn_0 /model.9/m/MaxPool_output_0_splitncnn_0 /model.9/m_1/MaxPool_output_0_splitncnn_0 /model.9/m_2/MaxPool_output_0 /model.9/Concat_output_0 0=0 -Convolution /model.9/cv2/conv/Conv 1 1 /model.9/Concat_output_0 /model.9/cv2/conv/Conv_output_0 0=512 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=524288 -Swish /model.9/cv2/act/Mul 1 1 /model.9/cv2/conv/Conv_output_0 /model.9/cv2/act/Mul_output_0 -Convolution /model.10/conv/Conv 1 1 /model.9/cv2/act/Mul_output_0 /model.10/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=131072 -Swish /model.10/act/Mul 1 1 /model.10/conv/Conv_output_0 /model.10/act/Mul_output_0 -Split splitncnn_16 1 2 /model.10/act/Mul_output_0 /model.10/act/Mul_output_0_splitncnn_0 /model.10/act/Mul_output_0_splitncnn_1 -Interp /model.11/Resize 1 1 /model.10/act/Mul_output_0_splitncnn_1 /model.11/Resize_output_0 0=1 1=2.000000e+00 2=2.000000e+00 3=0 4=0 6=0 -Concat /model.12/Concat 2 1 /model.11/Resize_output_0 /model.6/cv3/act/Mul_output_0_splitncnn_0 /model.12/Concat_output_0 0=0 -Split splitncnn_17 1 2 /model.12/Concat_output_0 /model.12/Concat_output_0_splitncnn_0 /model.12/Concat_output_0_splitncnn_1 -Convolution /model.13/cv1/conv/Conv 1 1 /model.12/Concat_output_0_splitncnn_1 /model.13/cv1/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=65536 -Swish /model.13/cv1/act/Mul 1 1 /model.13/cv1/conv/Conv_output_0 /model.13/cv1/act/Mul_output_0 -Convolution /model.13/m/m.0/cv1/conv/Conv 1 1 /model.13/cv1/act/Mul_output_0 /model.13/m/m.0/cv1/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=16384 -Swish /model.13/m/m.0/cv1/act/Mul 1 1 /model.13/m/m.0/cv1/conv/Conv_output_0 /model.13/m/m.0/cv1/act/Mul_output_0 -Convolution /model.13/m/m.0/cv2/conv/Conv 1 1 /model.13/m/m.0/cv1/act/Mul_output_0 /model.13/m/m.0/cv2/conv/Conv_output_0 0=128 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=147456 -Swish /model.13/m/m.0/cv2/act/Mul 1 1 /model.13/m/m.0/cv2/conv/Conv_output_0 /model.13/m/m.0/cv2/act/Mul_output_0 -Convolution /model.13/cv2/conv/Conv 1 1 /model.12/Concat_output_0_splitncnn_0 /model.13/cv2/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=65536 -Swish /model.13/cv2/act/Mul 1 1 /model.13/cv2/conv/Conv_output_0 /model.13/cv2/act/Mul_output_0 -Concat /model.13/Concat 2 1 /model.13/m/m.0/cv2/act/Mul_output_0 /model.13/cv2/act/Mul_output_0 /model.13/Concat_output_0 0=0 -Convolution /model.13/cv3/conv/Conv 1 1 /model.13/Concat_output_0 /model.13/cv3/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=65536 -Swish /model.13/cv3/act/Mul 1 1 /model.13/cv3/conv/Conv_output_0 /model.13/cv3/act/Mul_output_0 -Convolution /model.14/conv/Conv 1 1 /model.13/cv3/act/Mul_output_0 /model.14/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=32768 -Swish /model.14/act/Mul 1 1 /model.14/conv/Conv_output_0 /model.14/act/Mul_output_0 -Split splitncnn_18 1 2 /model.14/act/Mul_output_0 /model.14/act/Mul_output_0_splitncnn_0 /model.14/act/Mul_output_0_splitncnn_1 -Interp /model.15/Resize 1 1 /model.14/act/Mul_output_0_splitncnn_1 /model.15/Resize_output_0 0=1 1=2.000000e+00 2=2.000000e+00 3=0 4=0 6=0 -Concat /model.16/Concat 2 1 /model.15/Resize_output_0 /model.4/cv3/act/Mul_output_0_splitncnn_0 /model.16/Concat_output_0 0=0 -Split splitncnn_19 1 2 /model.16/Concat_output_0 /model.16/Concat_output_0_splitncnn_0 /model.16/Concat_output_0_splitncnn_1 -Convolution /model.17/cv1/conv/Conv 1 1 /model.16/Concat_output_0_splitncnn_1 /model.17/cv1/conv/Conv_output_0 0=64 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=16384 -Swish /model.17/cv1/act/Mul 1 1 /model.17/cv1/conv/Conv_output_0 /model.17/cv1/act/Mul_output_0 -Convolution /model.17/m/m.0/cv1/conv/Conv 1 1 /model.17/cv1/act/Mul_output_0 /model.17/m/m.0/cv1/conv/Conv_output_0 0=64 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=4096 -Swish /model.17/m/m.0/cv1/act/Mul 1 1 /model.17/m/m.0/cv1/conv/Conv_output_0 /model.17/m/m.0/cv1/act/Mul_output_0 -Convolution /model.17/m/m.0/cv2/conv/Conv 1 1 /model.17/m/m.0/cv1/act/Mul_output_0 /model.17/m/m.0/cv2/conv/Conv_output_0 0=64 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=36864 -Swish /model.17/m/m.0/cv2/act/Mul 1 1 /model.17/m/m.0/cv2/conv/Conv_output_0 /model.17/m/m.0/cv2/act/Mul_output_0 -Convolution /model.17/cv2/conv/Conv 1 1 /model.16/Concat_output_0_splitncnn_0 /model.17/cv2/conv/Conv_output_0 0=64 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=16384 -Swish /model.17/cv2/act/Mul 1 1 /model.17/cv2/conv/Conv_output_0 /model.17/cv2/act/Mul_output_0 -Concat /model.17/Concat 2 1 /model.17/m/m.0/cv2/act/Mul_output_0 /model.17/cv2/act/Mul_output_0 /model.17/Concat_output_0 0=0 -Convolution /model.17/cv3/conv/Conv 1 1 /model.17/Concat_output_0 /model.17/cv3/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=16384 -Swish /model.17/cv3/act/Mul 1 1 /model.17/cv3/conv/Conv_output_0 /model.17/cv3/act/Mul_output_0 -Split splitncnn_20 1 2 /model.17/cv3/act/Mul_output_0 /model.17/cv3/act/Mul_output_0_splitncnn_0 /model.17/cv3/act/Mul_output_0_splitncnn_1 -Convolution /model.18/conv/Conv 1 1 /model.17/cv3/act/Mul_output_0_splitncnn_1 /model.18/conv/Conv_output_0 0=128 1=3 11=3 2=1 12=1 3=2 13=2 4=1 14=1 15=1 16=1 5=1 6=147456 -Swish /model.18/act/Mul 1 1 /model.18/conv/Conv_output_0 /model.18/act/Mul_output_0 -Concat /model.19/Concat 2 1 /model.18/act/Mul_output_0 /model.14/act/Mul_output_0_splitncnn_0 /model.19/Concat_output_0 0=0 -Split splitncnn_21 1 2 /model.19/Concat_output_0 /model.19/Concat_output_0_splitncnn_0 /model.19/Concat_output_0_splitncnn_1 -Convolution /model.20/cv1/conv/Conv 1 1 /model.19/Concat_output_0_splitncnn_1 /model.20/cv1/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=32768 -Swish /model.20/cv1/act/Mul 1 1 /model.20/cv1/conv/Conv_output_0 /model.20/cv1/act/Mul_output_0 -Convolution /model.20/m/m.0/cv1/conv/Conv 1 1 /model.20/cv1/act/Mul_output_0 /model.20/m/m.0/cv1/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=16384 -Swish /model.20/m/m.0/cv1/act/Mul 1 1 /model.20/m/m.0/cv1/conv/Conv_output_0 /model.20/m/m.0/cv1/act/Mul_output_0 -Convolution /model.20/m/m.0/cv2/conv/Conv 1 1 /model.20/m/m.0/cv1/act/Mul_output_0 /model.20/m/m.0/cv2/conv/Conv_output_0 0=128 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=147456 -Swish /model.20/m/m.0/cv2/act/Mul 1 1 /model.20/m/m.0/cv2/conv/Conv_output_0 /model.20/m/m.0/cv2/act/Mul_output_0 -Convolution /model.20/cv2/conv/Conv 1 1 /model.19/Concat_output_0_splitncnn_0 /model.20/cv2/conv/Conv_output_0 0=128 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=32768 -Swish /model.20/cv2/act/Mul 1 1 /model.20/cv2/conv/Conv_output_0 /model.20/cv2/act/Mul_output_0 -Concat /model.20/Concat 2 1 /model.20/m/m.0/cv2/act/Mul_output_0 /model.20/cv2/act/Mul_output_0 /model.20/Concat_output_0 0=0 -Convolution /model.20/cv3/conv/Conv 1 1 /model.20/Concat_output_0 /model.20/cv3/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=65536 -Swish /model.20/cv3/act/Mul 1 1 /model.20/cv3/conv/Conv_output_0 /model.20/cv3/act/Mul_output_0 -Split splitncnn_22 1 2 /model.20/cv3/act/Mul_output_0 /model.20/cv3/act/Mul_output_0_splitncnn_0 /model.20/cv3/act/Mul_output_0_splitncnn_1 -Convolution /model.21/conv/Conv 1 1 /model.20/cv3/act/Mul_output_0_splitncnn_1 /model.21/conv/Conv_output_0 0=256 1=3 11=3 2=1 12=1 3=2 13=2 4=1 14=1 15=1 16=1 5=1 6=589824 -Swish /model.21/act/Mul 1 1 /model.21/conv/Conv_output_0 /model.21/act/Mul_output_0 -Concat /model.22/Concat 2 1 /model.21/act/Mul_output_0 /model.10/act/Mul_output_0_splitncnn_0 /model.22/Concat_output_0 0=0 -Split splitncnn_23 1 2 /model.22/Concat_output_0 /model.22/Concat_output_0_splitncnn_0 /model.22/Concat_output_0_splitncnn_1 -Convolution /model.23/cv1/conv/Conv 1 1 /model.22/Concat_output_0_splitncnn_1 /model.23/cv1/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=131072 -Swish /model.23/cv1/act/Mul 1 1 /model.23/cv1/conv/Conv_output_0 /model.23/cv1/act/Mul_output_0 -Convolution /model.23/m/m.0/cv1/conv/Conv 1 1 /model.23/cv1/act/Mul_output_0 /model.23/m/m.0/cv1/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=65536 -Swish /model.23/m/m.0/cv1/act/Mul 1 1 /model.23/m/m.0/cv1/conv/Conv_output_0 /model.23/m/m.0/cv1/act/Mul_output_0 -Convolution /model.23/m/m.0/cv2/conv/Conv 1 1 /model.23/m/m.0/cv1/act/Mul_output_0 /model.23/m/m.0/cv2/conv/Conv_output_0 0=256 1=3 11=3 2=1 12=1 3=1 13=1 4=1 14=1 15=1 16=1 5=1 6=589824 -Swish /model.23/m/m.0/cv2/act/Mul 1 1 /model.23/m/m.0/cv2/conv/Conv_output_0 /model.23/m/m.0/cv2/act/Mul_output_0 -Convolution /model.23/cv2/conv/Conv 1 1 /model.22/Concat_output_0_splitncnn_0 /model.23/cv2/conv/Conv_output_0 0=256 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=131072 -Swish /model.23/cv2/act/Mul 1 1 /model.23/cv2/conv/Conv_output_0 /model.23/cv2/act/Mul_output_0 -Concat /model.23/Concat 2 1 /model.23/m/m.0/cv2/act/Mul_output_0 /model.23/cv2/act/Mul_output_0 /model.23/Concat_output_0 0=0 -Convolution /model.23/cv3/conv/Conv 1 1 /model.23/Concat_output_0 /model.23/cv3/conv/Conv_output_0 0=512 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=262144 -Swish /model.23/cv3/act/Mul 1 1 /model.23/cv3/conv/Conv_output_0 /model.23/cv3/act/Mul_output_0 -Convolution /model.24/m.0/Conv 1 1 /model.17/cv3/act/Mul_output_0_splitncnn_0 /model.24/m.0/Conv_output_0 0=66 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=8448 -Reshape /model.24/Reshape 1 1 /model.24/m.0/Conv_output_0 /model.24/Reshape_output_0 0=-1 1=22 2=3 -Permute /model.24/Transpose 1 1 /model.24/Reshape_output_0 output 0=1 -Convolution /model.24/m.1/Conv 1 1 /model.20/cv3/act/Mul_output_0_splitncnn_0 /model.24/m.1/Conv_output_0 0=66 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=16896 -Reshape /model.24/Reshape_1 1 1 /model.24/m.1/Conv_output_0 /model.24/Reshape_1_output_0 0=-1 1=22 2=3 -Permute /model.24/Transpose_1 1 1 /model.24/Reshape_1_output_0 354 0=1 -Convolution /model.24/m.2/Conv 1 1 /model.23/cv3/act/Mul_output_0 /model.24/m.2/Conv_output_0 0=66 1=1 11=1 2=1 12=1 3=1 13=1 4=0 14=0 15=0 16=0 5=1 6=33792 -Reshape /model.24/Reshape_2 1 1 /model.24/m.2/Conv_output_0 /model.24/Reshape_2_output_0 0=-1 1=22 2=3 -Permute /model.24/Transpose_2 1 1 /model.24/Reshape_2_output_0 366 0=1 diff --git a/mpres/src/main/assets/mpapp/data/schedules/1 b/mpres/src/main/assets/mpapp/data/schedules/1 deleted file mode 100644 index 009f0940..00000000 Binary files a/mpres/src/main/assets/mpapp/data/schedules/1 and /dev/null differ diff --git a/mpres/src/main/assets/mpapp/data/schedules/2 b/mpres/src/main/assets/mpapp/data/schedules/2 deleted file mode 100644 index 3fd01ec5..00000000 Binary files a/mpres/src/main/assets/mpapp/data/schedules/2 and /dev/null differ diff --git a/mpres/src/main/assets/mpapp/data/schedules/3 b/mpres/src/main/assets/mpapp/data/schedules/3 deleted file mode 100644 index dfae32e2..00000000 Binary files a/mpres/src/main/assets/mpapp/data/schedules/3 and /dev/null differ diff --git a/mpres/src/main/assets/mpapp/data/schedules/4 b/mpres/src/main/assets/mpapp/data/schedules/4 deleted file mode 100644 index 1f85307f..00000000 Binary files a/mpres/src/main/assets/mpapp/data/schedules/4 and /dev/null differ diff --git a/mpres/src/main/assets/mpapp/data/serials.json b/mpres/src/main/assets/mpapp/data/serials.json deleted file mode 100644 index 03f71fc9..00000000 --- a/mpres/src/main/assets/mpapp/data/serials.json +++ /dev/null @@ -1 +0,0 @@ -{"sensors":[]} \ No newline at end of file diff --git a/mpres/src/main/assets/mpmst/data/Master.json b/mpres/src/main/assets/mpmst/data/Master.json deleted file mode 100644 index 6b8751b1..00000000 --- a/mpres/src/main/assets/mpmst/data/Master.json +++ /dev/null @@ -1 +0,0 @@ -{"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