payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,479 Commits 4 Branches 0 Tags 793 MiB
2854007c11
Commit Graph

1233 Commits

Author SHA1 Message Date
payton
abd5d2e350 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-03 19:10:20 +08:00
payton
f70d7b9d15 1.reset重置sf参数 2024-01-03 19:10:03 +08:00
xiehongyan
501eea8aee Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-03 18:50:32 +08:00
xiehongyan
ace86859f8 修改回放界面切换emmc和sd卡 2024-01-03 18:50:17 +08:00
payton
9a687b6685 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-03 16:52:07 +08:00
payton
ac7c19a327 1.Linux启动时获取rtos下的电池格数 2024-01-03 16:51:47 +08:00
xiaojiazhu
9ee4af14eb Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_emmc 2024-01-03 16:48:27 +08:00
xiaojiazhu
5b0ad73b40 Fixed:Message screen key event can not send to father screen. 2024-01-03 16:48:01 +08:00
payton
637119f1ac 1.拍摄后进行内存释放 2024-01-03 16:42:11 +08:00
xiehongyan
c3c53247e9 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-03 15:34:46 +08:00
xiehongyan
c23b991ecc 修复电池切换后不保存问题 2024-01-03 15:34:31 +08:00
payton
cf35d5a560 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-03 14:38:25 +08:00
payton
f8ef234da9 1.修复回放界面有红条的问题 2024-01-03 14:37:48 +08:00
xiehongyan
ffb0d6be0d 修改回放菜单√的位置 2024-01-03 13:39:14 +08:00
xiaojiazhu
94b1d4b7e6 Fixed:Key event of comfirm screen do not send to current screen. 2024-01-03 13:33:17 +08:00
xiehongyan
f3606cd190 去掉回放菜单左键回退功能 2024-01-03 11:56:53 +08:00
xiehongyan
aa2370ca9c Merge code 2024-01-03 10:48:34 +08:00
xiehongyan
02af726fb7 9842,10801 二维码显示逻辑问题, 回放界面设置菜单未插卡变灰 2024-01-03 10:43:18 +08:00
sober.song
d79f978f1b Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2024-01-03 10:30:32 +08:00
payton
29db87bf99 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-02 21:50:21 +08:00
payton
3e2e829485 1.参数加载提前到ui显示前；2.增加dump打印时序log功能 2024-01-02 21:50:06 +08:00
sober.song
14b2672856 Merge branch 'Branch_S550_Fast_Emmc' of http://192.168.6.216/linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-02 21:07:24 +08:00
sober.song
433499503f 删除emmc自动挂载失败后手动挂载逻辑 2024-01-02 21:06:03 +08:00
payton
91b03b29f8 1.去掉tty等待超时的打印 2024-01-02 21:03:38 +08:00
payton
86d43cbb8c 1.还原快捷关机，使用写mcu关机 2024-01-02 20:59:53 +08:00
payton
11bd6614f4 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-02 20:34:46 +08:00
payton
c527999869 1.修复运营商信息没有重置问题 2024-01-02 20:30:15 +08:00
sober.song
f3f13e5879 增加获取指定mmc设备dcf_handle接口 2024-01-02 18:37:54 +08:00
xiaojiazhu
c8e3665f3b Meger code. 2024-01-02 17:00:16 +08:00
xiehongyan
decc3ae138 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2024-01-02 16:56:32 +08:00
xiehongyan
a4e4952d00 修复倒计时界面插入usb不停止 2024-01-02 16:55:59 +08:00
xiaojiazhu
07762c255c Fixed:Message screen tips strings can not refresh. 2024-01-02 16:45:05 +08:00
payton
20b4440a10 1.插入usb后菜单的icon不需要显示；2.拔掉SD卡后无需检查A盘信息 2024-01-02 16:45:04 +08:00
payton
fd04e228d5 1.插入usb无需检测 2024-01-02 16:43:43 +08:00
payton
c54e521de2 1.修改battery测试log 2024-01-02 15:42:26 +08:00
xiaojiazhu
95e36546cd Fixed:Emmc status ok in photo screen. 2024-01-02 15:34:07 +08:00
payton
7afffdb5cf Merge branches 'Branch_S550_Fast_Emmc' and 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-02 14:23:00 +08:00
payton
34c50b2cc0 1.合并Linux下回复修改 2024-01-02 13:54:36 +08:00
xiaojiazhu
6dee93317a 7MR5RCwDC07 2024-01-02 13:45:56 +08:00
sober.song
47577a6f3e 修改编译失败问题 2024-01-02 10:25:21 +08:00
sober.song
87ece34cef Merge branch 'Branch_S550_Fast_Emmc' of http://192.168.6.216/linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2024-01-02 10:00:37 +08:00
sober.song
4879e7cc94 strgMng存储路径动态获取 2023-12-30 20:54:10 +08:00
xiehongyan
b41cb5454b 添加回放界面PlayExe_OnOpen输出 2023-12-30 19:31:19 +08:00
sober.song
72c115a00b 修复RTOS存储文件死机问题 2023-12-30 18:53:53 +08:00
xiehongyan
e1d467900d 修改二维码创建条件 2023-12-30 18:33:06 +08:00
sober.song
50ad347fc8 修改获取可用存储设备接口 2023-12-30 16:59:16 +08:00
xiehongyan
be0cddbabf 添加回放界面设置菜单 2023-12-30 15:00:17 +08:00
payton
0ca0cbaa30 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-29 22:16:26 +08:00
payton
9f3b279232 1.增加SF_4G_MODE_TEST宏开关 2023-12-29 22:16:10 +08:00
payton
1182e8f476 1.sms增加gprs开关控制 2023-12-29 22:15:49 +08:00
payton
86c0cc9ddd 1.陈反馈sdclk无需设置24M 2023-12-29 22:14:40 +08:00
xiehongyan
400bebebd6 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-29 19:37:38 +08:00
xiehongyan
9c462df6bb 调整回放界面按键 2023-12-29 19:36:15 +08:00
sober.song
f47a6c0b0b Merge branch 'Branch_S550_Fast_Emmc' of http://192.168.6.216/linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-29 18:19:56 +08:00
sober.song
2c13dc999b 修复UI获取可用存储设备异常逻辑 2023-12-29 18:18:48 +08:00
xiehongyan
3ebcf2320f BUG:10614 自动关机倒计时5秒后不能打断问题 2023-12-29 17:25:32 +08:00
xiehongyan
92aa1909ba BUG:10614 自动关机倒计时5秒后不能打断问题 2023-12-29 17:13:19 +08:00
sober.song
e6dde55948 加宏控制RTOS和Linux下mmc_dev_check逻辑，默认check逻辑关闭 2023-12-29 16:00:01 +08:00
xiaojiazhu
e04817b6ab Merge:Emmc function in photo screen. 2023-12-29 14:21:15 +08:00
xiaojiazhu
9c6521aa27 Meger:Add emmc gui code. 2023-12-29 10:51:49 +08:00
sober.song
f6e9ed6ab3 修改合并快起死机问题 2023-12-29 00:29:00 +08:00
sober.song
924dc666e9 增加USE_MMC_DEV_CHECK宏开关 2023-12-28 20:57:41 +08:00
payton
de9ac7869f 1.程序名称改R6.0 2023-12-28 16:20:32 +08:00
payton
fd81e9b252 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-28 16:17:10 +08:00
payton
b06f2298b8 1.内存优化 2023-12-28 16:14:05 +08:00
xiehongyan
7d3e70dd47 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-28 15:44:12 +08:00
xiehongyan
64dfd15bbe BUG:10539,10683 进度条播放弹跳/确认框默认为no 2023-12-28 15:42:27 +08:00
payton
fe10d516b0 1.Fast preview修改录像完毕后报错问题 2023-12-28 15:08:29 +08:00
xiaojiazhu
d311978d3a Add:Emmc function in playback screen. 2023-12-28 13:56:10 +08:00
sober.song
c091cc7b03 Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2023-12-28 13:41:56 +08:00
sober.song
57420f5c15 增加UIStorageCheckEMMC检测和UI格式化EMMC 2023-12-28 13:39:43 +08:00
xiaojiazhu
e336717f56 Improve:Emmc switch in playback screen. 2023-12-28 11:38:05 +08:00
payton
5737d78b10 1.修改gps；2.去掉多余的头文件 2023-12-28 10:41:06 +08:00
payton
23f4de153d 1.对bat检测进行补偿 2023-12-28 10:38:05 +08:00
xiehongyan
e7eb26c266 BUG10607,10610 录像模式下去掉红线和Searching 2023-12-27 18:56:47 +08:00
payton
4ba93de949 1.根据PRD更改24M图片尺寸 2023-12-27 18:09:25 +08:00
payton
0d0a407aba 1.重置参数时无需将WiFi相关的设置使用系统api设置 2023-12-27 18:03:07 +08:00
xiaojiazhu
be75a48f61 backup. 2023-12-27 17:35:39 +08:00
payton
141907efa5 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-27 17:07:51 +08:00
payton
f6375d1e30 1.无升级包不重启--预处理，暂时不修改 2023-12-27 17:07:23 +08:00
payton
5156752c1a 1.wifi切网时做互斥操作，以免频繁点击 2023-12-27 17:06:16 +08:00
sober.song
b9e1fda503 修改merge Branch_S550_Fast_Emmc文件冲突问题 2023-12-27 15:33:04 +08:00
xiehongyan
b08b85b0c6 BUG:10694 电量小于40%升级提示弹窗 2023-12-27 15:12:18 +08:00
sober.song
224c1c291c Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2023-12-27 13:52:29 +08:00
sober.song
49b78482b1 修改RTOS下无法保存缩略图到EMMC问题和优化存储设备切换逻辑 2023-12-27 13:41:11 +08:00
payton
26e56590ad 1.先连接ftp服务器再搜gps 2023-12-27 11:58:25 +08:00
payton
5ff97d0610 1.修复ftp下载升级包缺失部分 2023-12-27 11:57:50 +08:00
payton
b1452dad68 1.更换重启命令 2023-12-27 11:57:21 +08:00
payton
5d2ca48ce3 1.1.Linux增加区分自动和手动模式升级 2023-12-27 11:56:51 +08:00
xiehongyan
8935e03b70 BUG:106 对调弹窗按钮yes和no的位置 2023-12-27 11:21:07 +08:00
sober.song
8bbe9651b2 合入原厂Linux和Rtos下EMMC最新改动和存储设备切换逻辑 2023-12-26 21:16:40 +08:00
xiehongyan
36e55a3291 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-26 18:19:21 +08:00
xiehongyan
b3c93d9abd BUG:10646 切换运营商后显示并等待三秒重启 2023-12-26 18:19:04 +08:00
sober.song
b18d94f150 Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2023-12-26 17:12:48 +08:00
xiaojiazhu
0b99ec9878 Add:option function in playback screen. 2023-12-26 15:50:16 +08:00
payton
91e8812d3f 1.程序名改R5.0 2023-12-26 15:25:34 +08:00
payton
d63c3ad5cd Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-26 15:16:10 +08:00
payton
315c03e04d 1.Fast preview修改 2023-12-26 15:12:25 +08:00
payton
ce5a796aeb 1.关闭电池检测有机率宕机，暂时屏蔽 2023-12-26 15:00:38 +08:00
payton
bf0f59af83 1.usb插入时模式切换 2023-12-26 14:59:40 +08:00
payton
7c03334ca6 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-26 14:58:18 +08:00
payton
11152df385 1.合并emmc修改 2023-12-26 14:57:42 +08:00
xiaojiazhu
88938668ed Add:Emmc code in photo screen, which is needed to be test. 2023-12-26 14:55:02 +08:00
xiaojiazhu
2fb1a5900a Add:Emmc status wedget on photo screen. 2023-12-26 11:00:56 +08:00
xiehongyan
00f035982c Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-25 20:18:05 +08:00
xiehongyan
30dcf75c83 BUG:10639 二维码生成流程修改 2023-12-25 20:17:48 +08:00
xiaojiazhu
de5b58d770 Fixed:setting time and date failed bug. 2023-12-25 17:40:41 +08:00
sober.song
1a18ae504a 合并原厂EMMC和SD卡兼容修改 2023-12-25 15:41:01 +08:00
xiaojiazhu
f6034b6add Modified emmc loop function in setting screen. 2023-12-25 14:19:00 +08:00
sober.song
bc9f039106 Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize 2023-12-25 11:45:19 +08:00
xiaojiazhu
14c0659dfb Fixed bug:Option screen ui error about next page. 2023-12-25 11:39:33 +08:00
sober.song
69dc8b618c 修改部分EMMC和SD卡切换逻辑 2023-12-25 11:30:44 +08:00
xiaojiazhu
e8be05aac6 Meger EMMC function in setting screen. 2023-12-25 11:14:20 +08:00
xiaojiazhu
a3638ef02a EMMC memand in setting screen. 2023-12-25 11:07:16 +08:00
payton
b5b8983687 1.POWERON_FAST_PREVIEW宏定义 2023-12-25 10:22:07 +08:00
payton
088da1af36 1.FAST PREVIEW功能 2023-12-25 10:21:56 +08:00
sober.song
2a20d7fd2a rtos和linux下存储文件路径加入存储设备切换逻辑 2023-12-23 19:15:22 +08:00
sober.song
85230bb460 EMMC和SD卡切换逻辑代码实现 2023-12-23 16:51:21 +08:00
xiehongyan
c924d94dc7 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-22 19:24:32 +08:00
xiehongyan
6d386153ab bug:9796 电池界面锂电池跳转其他选项变灰 2023-12-22 19:24:13 +08:00
xiehongyan
6b5acd8890 密码界面失效问题 2023-12-22 11:34:52 +08:00
xiaojiazhu
b3eacd7bff Add format emmc code. 2023-12-21 17:49:34 +08:00
payton
4949561ac1 1.ver:7MR5RCwDC05 2023-12-20 19:35:08 +08:00
xiaojiazhu
126c130133 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_emmc 2023-12-20 17:20:42 +08:00
payton
7e4f40ccc0 1.修复启动模式获取错误问题 2023-12-20 16:48:51 +08:00
xiaojiazhu
cc78dae655 Improve:Can not show delete comfirm screen when no file. 2023-12-20 16:29:46 +08:00
payton
e8f2ea7d8f 1.增加动态回收mem 2023-12-20 16:25:17 +08:00
xiehongyan
b1d2650475 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-20 15:43:33 +08:00
xiehongyan
f5f825d7d2 bug:10571 修复开机后密码界面会自动关闭 2023-12-20 15:43:15 +08:00
payton
5d130e5df4 Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-20 10:21:29 +08:00
xiaojiazhu
9741bf7716 Fixed bug:show review screen when power off. 2023-12-20 10:17:03 +08:00
payton
80805e6786 1.修改拍摄过后cpu占用高的问题 2023-12-20 10:13:02 +08:00
xiehongyan
d1686a0290 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-20 10:10:43 +08:00
xiehongyan
1a351ee7cd bug:10532 qr界面gui功能 2023-12-20 10:10:26 +08:00
payton
14e8e020ca 1.log记录调整 2023-12-20 09:55:01 +08:00
payton
be37d33bc1 1.关闭gps时首次启动也发一次gps 2023-12-20 09:54:45 +08:00
payton
c1ef11a1cd 1.mcu升级调整：升级开lcd；mcu读写超时时间调整；2.lib里的usb标识调整 2023-12-20 09:54:14 +08:00
xiehongyan
412ae11b28 bug:10532 qr界面gui功能 2023-12-20 09:17:47 +08:00
payton
3ec82a2b9a 1.增加log中间文件删除功能 2023-12-19 16:53:57 +08:00
payton
ce3132dc91 1.增加些log确认信号；2.优化gps消息 2023-12-19 16:52:18 +08:00
payton
c4a322004b 1.修复cam id开启时在dp文件中 2023-12-19 16:49:18 +08:00
payton
eb3e4e257f 1.修改dp电池类型 2023-12-19 15:33:47 +08:00
xiaojiazhu
488c4c1e34 Fixed bug number 10204. 2023-12-19 14:52:25 +08:00
payton
9f7c58515f Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc 2023-12-19 10:47:36 +08:00
payton
63ec1857ad 1.程序给R6.0 2023-12-19 10:47:11 +08:00
payton
6e47f2c698 1.dp记录的错误码修改 2023-12-19 10:46:46 +08:00
payton
e5416993b6 1.去掉蓝牙的普通log 2023-12-19 10:46:10 +08:00
payton
8a68dab79b 1.wifi点击切换模式再工作过程中不切换模式 2023-12-19 10:45:38 +08:00
xiaojiazhu
60a77deb0d Fixed bug number 10539. 2023-12-19 10:38:42 +08:00
xiehongyan
e69d593ca0 Merge branch 'Branch_S550_Fast_Emmc' of 192.168.6.216:linux-em-group/s530-ntk into Branch_S550_Emmc 2023-12-19 10:06:35 +08:00
xiehongyan
453ca794d5 bug:10415 修复进入network会黑屏一段时间 2023-12-19 10:06:17 +08:00
xiaojiazhu
787ee85bbd Gui Megre emmc branch. 2023-12-18 19:48:39 +08:00
xiehongyan
1724927f57 修复send type界面二级菜单没有> 2023-12-18 18:24:20 +08:00
xiehongyan
ec7e70b9e0 Merge branch 'Branch_S550_GUI' into Branch_S550_Emmc 2023-12-18 17:00:26 +08:00
xiehongyan
c916f942ba backup. 2023-12-18 16:58:37 +08:00
payton
212f874943 Merge branch 'Branch_S550_Fast' into Branch_S550_Fast_Emmc 2023-12-18 16:40:06 +08:00
payton
73c15c532c 1.修改ota 2023-12-18 16:30:16 +08:00
payton
47674661ea 1.ota cmd优化 2023-12-18 16:29:54 +08:00
payton
7bc6174a29 1.emmc合并修改 2023-12-18 16:18:40 +08:00
payton
4712e1078b 1.更改sensor镜像 2023-12-18 16:09:22 +08:00
payton
a32f7c314a 1.1进入setup使用reboot重启系统 2023-12-18 13:56:32 +08:00
payton
52f09283fc 1.预约发送检查文件是否存在 2023-12-18 13:55:36 +08:00
payton
041d8d89a3 1.信号改使用全局变量 2023-12-18 13:55:23 +08:00
xiehongyan
975233c403 bug:10376串口打印按键提示问题 2023-12-18 09:58:51 +08:00
xiaojiazhu
3ae9ca53e6 7MR5RCwDC04 2023-12-15 19:04:47 +08:00
xiaojiazhu
73abb4e48d Merge branch 'branch_s550_gui' into branch_s550_fast 2023-12-15 18:41:17 +08:00
xiehongyan
ec1c2bf6ad bug:9709二级菜单没有> 2023-12-15 18:41:11 +08:00
payton
b11ea12d85 1.背光cmd 2023-12-15 16:30:14 +08:00
payton
13f633bf6c 1.增加cardv关机超时错误时sfapp关机 2023-12-15 16:29:58 +08:00
payton
80a26e8088 1.增加背光cmd；2.如要切换模式拍摄结束再切换 2023-12-15 16:29:49 +08:00
payton
86f848136f 1.iq test默认参数更改 2023-12-15 16:28:57 +08:00
payton
c4fb81c191 1.升级优化 2023-12-15 16:28:21 +08:00
payton
22f5080339 1.修复蓝牙连接可能不跳转预览的问题 2023-12-15 16:25:59 +08:00
xiaojiazhu
b2d21371d3 Fixed bug number 10227. 2023-12-15 14:15:48 +08:00
payton
413001226c 1.原厂修改msdc代码 2023-12-15 13:46:39 +08:00
xiaojiazhu
2865641ffa Fixed bug number 10499. 2023-12-14 17:16:36 +08:00
xiaojiazhu
1c2c526272 Fixed bug number 10057. 2023-12-14 16:32:39 +08:00
xiaojiazhu
50233ba499 Fixed bug number 10238. 2023-12-14 10:31:53 +08:00
xiaojiazhu
ef46d79229 Improve Enter work mode tips. 2023-12-13 18:58:54 +08:00
xiaojiazhu
8f549afebd Fixed bug number 10186. 2023-12-13 15:03:02 +08:00
payton
260288c3cb Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast 2023-12-12 19:25:59 +08:00
payton
736cfbb5d3 1.蓝牙WiFimakefile修改 2023-12-12 19:25:47 +08:00
payton
3000364201 1.WiFi适配 2023-12-12 19:25:14 +08:00
payton
e8a1816bfc 1.蓝牙适配 2023-12-12 19:24:49 +08:00
payton
5522667d3b 1.蓝牙固件 2023-12-12 19:21:56 +08:00
payton
d2fddee5db 1.sensor翻转 2023-12-12 19:21:28 +08:00
payton
f34dadb180 1.wifi驱动 2023-12-12 19:20:38 +08:00
xiaojiazhu
9f91125971 7MR5RCwDC03 2023-12-12 19:13:44 +08:00
xiaojiazhu
788eace2ba Merge branch 'branch_s550_gui' into branch_s550_fast 2023-12-12 18:46:22 +08:00
xiaojiazhu
390e256d52 Fixed bug number 10495. 2023-12-12 17:34:24 +08:00
xiaojiazhu
d5282fedc0 Fixed bug number 10238. 2023-12-12 17:05:49 +08:00
xiaojiazhu
615962355e Fixed bug number 10154. 2023-12-12 15:33:18 +08:00
xiaojiazhu
825c419830 Fixed bug number 10129. 2023-12-12 14:46:25 +08:00
payton
d71d1c07e2 1.优化自动模式注网流程 2023-12-12 13:55:52 +08:00
xiaojiazhu
791d3ca7fb Fixed bug number 10049. 2023-12-12 11:40:47 +08:00
xiaojiazhu
de771d252a Improve line in review screen. 2023-12-12 10:59:00 +08:00
xiaojiazhu
4ddb2fc68c Fixed bug number 10266. 2023-12-11 19:28:44 +08:00
payton
44b2c1d8a2 1.SendType宏定义更改 2023-12-11 19:18:28 +08:00
payton
fd7f905912 1.修复短信设置SendType 2023-12-11 19:18:09 +08:00
payton
9006d37230 1.修复蓝牙和WiFi设置sendtype 2023-12-11 19:17:39 +08:00
payton
3bf5f784e0 1.优化注网代码 2023-12-11 19:17:12 +08:00
xiaojiazhu
f7a938c374 Fixed bug number 10369. 2023-12-11 16:59:16 +08:00
payton
2b7af14a19 1.Linux下电池检测调整 2023-12-11 15:56:34 +08:00
payton
279907d8f8 1.dp生成修改 2023-12-11 15:56:09 +08:00
payton
d71f1a88e4 1.修改ui参数打印 2023-12-11 15:55:29 +08:00
payton
d5657b81c5 1.修复DebugMode开启后看门狗问题 2023-12-11 15:55:10 +08:00
payton
fdfbc22659 1.异常处理优化 2023-12-11 15:54:22 +08:00
payton
36698eb868 1.短信指令支持ftp开关修改 2023-12-11 15:53:46 +08:00
payton
bb49625dbf 1.优化模块睡眠流程 2023-12-11 15:53:18 +08:00
xiaojiazhu
ac74e6d5db Fixed bug number 9763. 2023-12-08 17:56:01 +08:00
xiaojiazhu
ccec0201e2 Fixed bug number 10454. 2023-12-08 17:09:12 +08:00
xiaojiazhu
1514cc5823 Merge branch 'branch_s550_gui' into branch_s550_fast 2023-12-08 15:47:28 +08:00
xiaojiazhu
43cd5a0844 Cancel code of ding about item screen. 2023-12-08 15:45:46 +08:00
payton
e8c8e11222 1.修改视频水印时间格式 2023-12-08 15:42:00 +08:00
xiaojiazhu
c3891c3ac5 Fixed bug about gps switch. 2023-12-08 15:23:33 +08:00
xiaojiazhu
65e8c9f67b Merge code of ding about playback screen. 2023-12-08 15:18:58 +08:00
xiaojiazhu
f170293da0 Megre code of ding to fixed disable item. 2023-12-08 14:42:57 +08:00
payton
b26ce942c4 1.1.ui关闭后设置错误的date编译报错 2023-12-08 14:39:24 +08:00
payton
ca4f2bded6 1.ui关闭后设置错误的date 2023-12-08 09:51:56 +08:00
xiaojiazhu
61ccc09bee Fixed bug number 10297. 2023-12-08 09:23:48 +08:00
xiaojiazhu
8d1e130df8 Fixed bug number 10492. 2023-12-07 17:30:38 +08:00
xiaojiazhu
93ce51c6c3 Fixed bug about sending show. 2023-12-07 17:08:10 +08:00
payton
2ecffd7895 1.增加log关闭 2023-12-07 16:18:00 +08:00
payton
df8cb7848d Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast 2023-12-07 16:17:37 +08:00
payton
e7f30cec59 1.log时间改rtc 2023-12-07 16:17:11 +08:00
payton
f7a2b7c45a 1.修复cpu高占用问题 2023-12-07 16:15:29 +08:00
payton
93990c03a1 1.修复tty读取不完整的问题 2023-12-07 15:56:49 +08:00
payton
409b49d5dd 1.优化关机读取sd卡信息；2.优化短信读取流程 2023-12-07 15:55:48 +08:00
xiaojiazhu
708b1f0427 Fixed bug number 10155. 2023-12-07 14:07:19 +08:00
xiaojiazhu
3a5d6379b3 Fixed bug number 10414. 2023-12-07 13:39:42 +08:00
xiaojiazhu
8d32ca76f1 Fixed bug number 10033. 2023-12-07 10:57:11 +08:00
xiaojiazhu
8b723b54b4 Fixed bug about max num/day. 2023-12-07 09:39:56 +08:00
payton
7874a6336e 1.修复模块初始化可能出现at超时问题 2023-12-07 09:10:04 +08:00
xiaojiazhu
f5ee68317b Fixed bug number 10292. 2023-12-06 17:49:35 +08:00
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
payton
dc9361e272 1.修复exfat卡文件系统问题 2023-12-05 11:30:03 +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
087c51cca8 1.连接蓝牙时也需要退出到预览 2023-11-29 16:50:51 +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
d377144dc9 1.中间文件更改 2023-11-24 10:12:47 +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
0d75e82d10 1.exfat工具支持 2023-11-23 15:48:05 +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
6a303efec9 1.rtsp标识更改 2023-11-22 18:05:45 +08:00
payton
13de078eaa 1.发送限制；2.rtsp配置调整 2023-11-22 18:02:54 +08:00
payton
2e274f4f7f 1.去掉一些log 2023-11-22 17:59:16 +08:00
payton
3560751dcf 1.gps发送更改；2.修改发送标识 2023-11-22 17:58:15 +08:00
xiaojiazhu
8941bb0a52 Fixed play screen bug and setting disable item ok. 2023-11-22 16:51:17 +08:00
xiaojiazhu
37e8b2a006 Backup. 2023-11-22 14:57:33 +08:00
xiaojiazhu
71c4f3351a Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast 2023-11-21 16:31:12 +08:00
xiaojiazhu
08de3740d2 Fixed setting screen bug about left key long pressing. 2023-11-21 16:29:35 +08:00
payton
381c3a282a 1.IQ test 默认参数更改 2023-11-21 16:08:50 +08:00
payton
0eb9afd500 1.修复Dailyreport发送问题 2023-11-21 15:50:38 +08:00
payton
0de21b91f9 1.IQ test修改 2023-11-21 15:50:18 +08:00
payton
7e1a981282 1.ver:7MR5RCwDB05 2023-11-21 10:21:09 +08:00
payton
911d0f3666 1.增加mcu dbg 2023-11-21 10:20:53 +08:00