Commit Graph

706 Commits

Author SHA1 Message Date
xiaojiazhu
d63f994fff 7MR5RCwDC01 2023-12-06 17:02:56 +08:00
xiaojiazhu
7658426211 Merge branch 'branch_s550_gui' into branch_s550_fast 2023-12-06 16:32:25 +08:00
xiaojiazhu
40928b1734 Fixed bug number 10169. 2023-12-06 16:28:29 +08:00
payton
ec08ee6bc4 1.修改sd卡读取判断 2023-12-06 15:32:15 +08:00
xiaojiazhu
f7c3bc0dff Fixed bug number 10174. 2023-12-06 14:31:02 +08:00
xiaojiazhu
29b3ede6a7 Fixed bug number 10297. 2023-12-06 14:14:55 +08:00
xiaojiazhu
8f58fd4c10 Fixed bug about connected to app. 2023-12-06 13:50:59 +08:00
xiaojiazhu
40ad7ab06d Modify string id. 2023-12-06 11:37:22 +08:00
xiaojiazhu
ffbec498fd Fixed bug about play back screen. 2023-12-06 09:38:26 +08:00
payton
5c73903ff2 1.修复短信指令和dp文件的短信指令 2023-12-05 18:08:17 +08:00
payton
20d7862827 1.更改超时时间 2023-12-05 17:04:12 +08:00
xiaojiazhu
9e9c365487 Fixed bug number 9537. 2023-12-05 16:42:29 +08:00
xiaojiazhu
a3015a5e1a Fixed bug number 10204. 2023-12-05 11:21:22 +08:00
xiaojiazhu
3f8febd903 Fixed bug number 10214. 2023-12-05 10:02:03 +08:00
xiaojiazhu
6defbcaf60 Fixed bug when delete video in the end. 2023-12-04 17:41:35 +08:00
xiaojiazhu
b303800a68 Improve netword select fuction when open usb device failed. 2023-12-04 16:49:23 +08:00
payton
17f1537ef9 1.屏蔽掉一些log 2023-12-04 16:17:36 +08:00
xiaojiazhu
bc7c1c583f Improve network select fuciton. 2023-12-04 16:14:25 +08:00
payton
714ae53626 1.WiFi gop改成8 2023-12-04 14:36:45 +08:00
payton
1842060c8e Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast 2023-12-04 14:33:22 +08:00
payton
c794f5903a 1.同步DS05 水印bug;2.去掉IQ test升级调试;3.同步DS05 IQ参数修改 2023-12-04 14:32:58 +08:00
payton
6809f6646a 1.Linux修改:视频水印改为与图片水印一样; 2023-12-04 14:30:36 +08:00
xiaojiazhu
59dcff9209 Improve sim card check bug. 2023-12-04 11:32:23 +08:00
xiaojiazhu
f99a2c2123 version:7MR5RCwDB08 2023-12-01 15:54:43 +08:00
xiaojiazhu
9d59abbafd Merge Branch_S550_Fast. 2023-12-01 15:37:19 +08:00
xiaojiazhu
54a7d4f99a Fixed bug number 10209. 2023-12-01 14:41:59 +08:00
payton
84b7b973dc 1.wifi状态和菜单切换更改 2023-12-01 14:27:52 +08:00
xiaojiazhu
0722c013ba Fixed bug number 10154. 2023-12-01 14:23:16 +08:00
xiaojiazhu
76501880ea Fixed bug number 10191. 2023-12-01 14:07:03 +08:00
xiaojiazhu
1b59e48eec Fixed bug number 10178. 2023-12-01 13:54:50 +08:00
xiaojiazhu
52949309db Backup. 2023-12-01 11:45:10 +08:00
xiaojiazhu
aec1448c3e Improve 4g module message on photo screen. 2023-12-01 09:37:54 +08:00
payton
38743429cd 1.修复WiFi和蓝牙设置集中发送 2023-11-30 19:17:29 +08:00
xiaojiazhu
9c13bba056 Improve connected tips. 2023-11-30 17:44:01 +08:00
xiaojiazhu
692ac34754 Fixed bug number 9848. 2023-11-30 15:21:50 +08:00
xiaojiazhu
e70f5a9f7a Fixed bug number 9839. 2023-11-30 11:30:41 +08:00
xiaojiazhu
3d9aca4688 Fixed bug number 9783. 2023-11-30 11:23:00 +08:00
payton
9cdfda03f5 1.sd卡循环增加异常目录处理,错误5次退出 2023-11-29 18:03:48 +08:00
xiaojiazhu
8633eba5e7 Fixed bug number 10227. 2023-11-29 17:47:59 +08:00
xiaojiazhu
9e79a73907 Fixed bug number 10226. 2023-11-29 17:01:45 +08:00
payton
2271f29b65 1.优化发送流程:自动模式下B启动和Instant时无需执行模块init,直接进行注网流程
2.8和a启动无线进行usb net初始化
3.优化ip检测代码加快检测频率
2023-11-29 14:59:27 +08:00
payton
abb834c296 1.优化注网代码;2.去掉一些log 2023-11-29 14:50:43 +08:00
xiaojiazhu
3695ed95c1 Disable setup date time screen. 2023-11-29 14:18:05 +08:00
xiaojiazhu
6c3a10fe9d Merge branch 'branch_s550_gui' into branch_s550_fast 2023-11-29 11:39:51 +08:00
xiaojiazhu
5bb1d3983c Fixed bug number 10195. 2023-11-29 11:38:07 +08:00
payton
24c8b031ec 1.LI_PACK 2023-11-29 10:14:16 +08:00
payton
e73791c1c1 1.优化锂电池盒插入 2023-11-29 09:51:10 +08:00
payton
054b0e9aac 1.修复date time 2023-11-29 09:50:38 +08:00
xiaojiazhu
e2a30ba440 Fixed bug number 9820. 2023-11-28 17:29:14 +08:00
xiaojiazhu
f785b8031b Fixed bug number 10190. 2023-11-28 17:04:51 +08:00
payton
d434287eeb 1.长按关机和密码界面按错10次关机 2023-11-28 15:21:41 +08:00
xiaojiazhu
8ceea2da17 Fixed bug number 10174. 2023-11-28 14:28:08 +08:00
xiaojiazhu
6a8f98821b Fixed bug number 10169. 2023-11-28 10:47:56 +08:00
payton
4f11c19e55 1.修复dp带图无法发送关机问题 2023-11-28 10:08:02 +08:00
xiaojiazhu
f9e4f75921 Fixed bug number 9518. 2023-11-28 09:39:36 +08:00
xiaojiazhu
58edb09d0b Merge branch 'branch_s550_gui' into branch_s550_fast 2023-11-27 18:42:21 +08:00
xiaojiazhu
fa0d2c61a3 Fixed bug about memory. 2023-11-27 18:41:06 +08:00
payton
af9263c995 1.WiFi链接后不进入回放 2023-11-27 16:51:28 +08:00
payton
43ed123735 1.wifi链接后退出到预览界面 2023-11-27 16:51:05 +08:00
xiaojiazhu
44fbdd9531 Fixed bug about no sd card text. 2023-11-27 15:22:05 +08:00
xiaojiazhu
b7989f72b0 Fixed bug number 9730. 2023-11-27 13:41:49 +08:00
payton
ee09338f59 1.修复WiFi点击拍照发图问题 2023-11-27 11:49:59 +08:00
payton
0ef0217d0f 1.date time默认值更改 2023-11-27 11:14:36 +08:00
payton
96110bbc3f 1.发送限制调整 2023-11-27 11:14:02 +08:00
xiaojiazhu
71174fa690 Improve movie screen. 2023-11-27 10:49:58 +08:00
xiaojiazhu
78c389bc4f Merge branch 'branch_s550_gui' into branch_s550_fast 2023-11-24 17:40:54 +08:00
xiaojiazhu
c03e1abcc0 Fixed check sim show bug. 2023-11-24 17:38:03 +08:00
payton
38840befb6 1.同步DS05 IQ更改 2023-11-24 16:56:17 +08:00
xiaojiazhu
b99d29fb10 Improve photo screen. 2023-11-24 16:16:57 +08:00
payton
40a52dc31c 1.mcu升级功能 2023-11-24 14:56:27 +08:00
xiaojiazhu
758c4f3cf2 Fixed password screen bug. 2023-11-24 14:28:49 +08:00
xiaojiazhu
602408f817 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-24 14:15:41 +08:00
xiaojiazhu
e2d55b0a38 Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-24 13:41:35 +08:00
payton
0c835f714d 1.修复插入usb识别问题 2023-11-24 10:11:05 +08:00
xiaojiazhu
e4b6218cb3 Fixed usb pc acm bug. 2023-11-24 09:46:23 +08:00
zyj
cb484d4361 完成预览界面下键显示信息的功能 2023-11-23 20:17:17 +08:00
xiaojiazhu
0151154d73 Fixed string id bug. 2023-11-23 19:47:38 +08:00
xiaojiazhu
54871795a2 Fixed bug about confirm screen. 2023-11-23 19:37:26 +08:00
xiaojiazhu
bc7012c979 Fixed delete pic bug. 2023-11-23 17:44:17 +08:00
xiaojiazhu
628b062d25 Fixed bug about send type setting. 2023-11-23 17:22:33 +08:00
xiaojiazhu
6ff5c2c0e4 Fixed bug about message screen. 2023-11-23 17:06:42 +08:00
xiaojiazhu
6510f272da Fixed bug about message screen. 2023-11-23 16:28:57 +08:00
payton
a685df607b 1.exfat支持 2023-11-23 15:45:32 +08:00
payton
ee41d9c0bd 1.qlog优化 2023-11-23 15:41:13 +08:00
xiaojiazhu
f6816d00ea Fixed bug about string and button matrix. 2023-11-23 15:39:41 +08:00
xiaojiazhu
38c4cd3366 Fixed bug of message screen. 2023-11-23 14:56:57 +08:00
xiaojiazhu
866df35bd6 Fixed bug number 10057. 2023-11-23 14:26:05 +08:00
xiaojiazhu
9b5295f7be Fixed bugs. 2023-11-23 11:48:12 +08:00
xiaojiazhu
a5205f8f17 Fixed bug number 9952. 2023-11-23 10:31:35 +08:00
xiaojiazhu
be3a706681 Fixed color of disable item bug. 2023-11-23 09:53:25 +08:00
xiaojiazhu
7771d8e7a6 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-23 09:13:31 +08:00
zyj
4a25f8d061 1.完善网络切换功能 2023-11-22 21:07:34 +08:00
payton
1ee469df69 1.ver:7MR5RCwDB06 2023-11-22 19:27:52 +08:00
payton
7dab6026f6 1.QLogSwitch和DebugMode互联 2023-11-22 19:14:54 +08:00
xiaojiazhu
cbd2ecee70 Merge branch 'branch_s550_gui' into branch_s550_fast 2023-11-22 18:09:42 +08:00
xiaojiazhu
90fe083170 Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast 2023-11-22 18:09:33 +08:00
payton
d9a008e5f2 1.gps文件路径更改 2023-11-22 18:07:46 +08:00
xiaojiazhu
fe345dd675 Upgrade item disable ok. 2023-11-22 18:07:39 +08:00
payton
4847a8db9a 1.注网时间改90s;2.优化模块初始化代码 2023-11-22 18:07:19 +08:00
payton
13de078eaa 1.发送限制;2.rtsp配置调整 2023-11-22 18:02:54 +08:00