Commit Graph

700 Commits

Author SHA1 Message Date
payton
75bff8a174 1.电池盒切换类型 2023-11-16 09:55:01 +08:00
payton
95e8020192 1.mem发图测试代码 2023-11-16 09:54:50 +08:00
payton
5df191f658 1.mem取图 2023-11-16 09:54:05 +08:00
payton
096a5d3f97 1.调整log 2023-11-16 09:53:11 +08:00
payton
878b5bc8a2 1.增加mem存图代码 2023-11-16 09:53:04 +08:00
xiaojiazhu
821028dede Fixed bug number 9751. 2023-11-15 17:41:48 +08:00
xiaojiazhu
03673dad1a Improve password screen. 2023-11-15 17:09:05 +08:00
xiaojiazhu
4640033758 Merge code of ding. 2023-11-15 11:16:56 +08:00
xiaojiazhu
8d7033a548 Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-15 09:27:22 +08:00
payton
33dec69bff 1.修改log 2023-11-14 19:23:24 +08:00
payton
a60cfa1acf 1.更改gps 相关内容 2023-11-14 19:22:35 +08:00
payton
4a7e905855 1.4G标识优化 2023-11-14 19:21:44 +08:00
payton
d7e783bdc6 1.更改SendMaxNum限制 2023-11-14 19:21:18 +08:00
xiaojiazhu
7c23947404 Fixed msg screen bug. 2023-11-14 19:21:09 +08:00
xiaojiazhu
c59a619b51 Improve password screen function. 2023-11-14 17:20:11 +08:00
xiaojiazhu
ea09cd8860 Improve send type setting. 2023-11-14 11:46:47 +08:00
xiaojiazhu
00a0d25ff9 Improve send type setting. 2023-11-13 19:31:57 +08:00
xiaojiazhu
00c432d029 Fixed bug about send type. 2023-11-13 18:56:40 +08:00
zyj
fa22fbab45 完善Sensitivity功能 2023-11-13 17:14:52 +08:00
zyj
b5d4e8f727 在builder中添加所需资源 2023-11-13 17:14:04 +08:00
payton
cfb6bdd395 1.cardv启动首次不加载usb ko,在sfapp加载 2023-11-13 16:53:26 +08:00
payton
ec944cd1db 1.开启log记录功能 2023-11-13 16:51:54 +08:00
zyj
49a5c30da4 完善sensitivity功能及UI 2023-11-13 15:56:03 +08:00
payton
d1ce4e56c5 1.修改可能出现漏发送问题 2023-11-13 15:42:19 +08:00
payton
65ccdbc3fb 1.setup下再加载蓝牙模块 2023-11-13 15:41:26 +08:00
xiaojiazhu
62d6ab47ff Fixed bug number 9751. 2023-11-13 15:21:22 +08:00
xiaojiazhu
52bd40f539 Fixed bug number 9913. 2023-11-13 13:38:38 +08:00
xiaojiazhu
de5a8e8e3c Merge branch 'branch_s550_gui' into branch_s550_fast 2023-11-10 19:07:42 +08:00
payton
cfed656433 1.修改dp在P+V中只拍图发送 2023-11-10 19:00:59 +08:00
payton
4d8a071757 1.修复dp发送带图 2023-11-10 19:00:22 +08:00
xiaojiazhu
634b2e06f6 Sync branch_s550_to_s530 2023-11-10 19:00:00 +08:00
xiaojiazhu
095d4afe0d Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-10 18:55:30 +08:00
xiaojiazhu
13665cca5e Sync Branch_S550. 2023-11-10 18:49:11 +08:00
payton
ec264793ea 1.屏蔽新P+V蓝牙和WiFi的设置 2023-11-10 18:33:21 +08:00
zyj
c3ba572d50 1.修改设置菜单的部分问题
2.完成生成CAM_INFO.txt和QR.BMP的功能
2023-11-10 18:22:48 +08:00
xiaojiazhu
5481dd9b5f Fixed bug about play screen. 2023-11-10 17:05:45 +08:00
xiaojiazhu
37f7cd1481 Add sending picture message in ui. 2023-11-10 16:37:10 +08:00
payton
4ac8c0fb7d Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast 2023-11-10 15:58:58 +08:00
payton
c6a6f96575 1.wifi预览缩略图更改 2023-11-10 15:58:17 +08:00
xiaojiazhu
befc2d0c0d Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast 2023-11-09 19:16:18 +08:00
payton
c5f3229efe 1.优化utc、ntp 2023-11-09 19:08:59 +08:00
xiaojiazhu
fe374bb97b Merge branch 'branch_s550_gui' into branch_s550_fast 2023-11-09 19:08:25 +08:00
payton
87d09196c7 1.默认更改为1月 2023-11-09 19:07:11 +08:00
xiaojiazhu
72406b5e5a Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-09 17:07:45 +08:00
xiaojiazhu
56fa8c1548 Fixed bug about image size show. 2023-11-09 17:07:35 +08:00
zyj
487d66c1f4 在Builder中添加所需资源 2023-11-09 16:24:01 +08:00
zyj
989cde7238 完善Date&Time的UI 2023-11-09 16:07:06 +08:00
xiaojiazhu
e8f932ecb1 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-09 14:46:11 +08:00
xiaojiazhu
3e1ec06d9c Fixed bug about auto shutdown. 2023-11-09 14:45:56 +08:00
payton
750df328ea 1.更改版本7M开头 2023-11-09 14:35:30 +08:00
zyj
5c14360b7a 完善Delay功能及UI 2023-11-09 14:10:23 +08:00
zyj
3ca10087ad 完善Operating Time功能及UI 2023-11-09 12:39:06 +08:00
zyj
d963512fe1 完善Sensitivity的UI显示 2023-11-09 10:15:09 +08:00
xiaojiazhu
105521f234 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-08 20:25:20 +08:00
xiaojiazhu
03ba4e7249 Fixed bug number 9727. 2023-11-08 20:25:05 +08:00
zyj
0193784396 完善Password功能 2023-11-08 20:23:40 +08:00
zyj
6053e38e26 Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug 2023-11-08 17:48:11 +08:00
zyj
f0e25f7fbf 完善CamName功能 2023-11-08 17:46:58 +08:00
payton
e7c9b61e69 1.修改sms短信指令 2023-11-08 16:41:37 +08:00
payton
64bf9bbad3 1.修复蓝牙设置问题 2023-11-08 16:41:10 +08:00
xiaojiazhu
86e019e2fc Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-08 15:25:23 +08:00
xiaojiazhu
64dc1454e0 Fixed bug number 9821. 2023-11-08 15:25:10 +08:00
zyj
109a593348 完善CamInfo功能 2023-11-08 14:25:25 +08:00
xiaojiazhu
8b94d36727 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-08 14:02:28 +08:00
xiaojiazhu
36dbd1e71f Fixed bug nember 9776. 2023-11-08 14:02:11 +08:00
zyj
da7c051787 在Builder中添加所需资源 2023-11-08 11:07:30 +08:00
xiaojiazhu
7d4265a06b Merge code of gui. 2023-11-08 10:12:03 +08:00
xiaojiazhu
54e07ef722 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_gui 2023-11-08 09:48:56 +08:00
payton
49c47f0edc 1.默认合法时间更改为2023到2050 2023-11-07 20:50:35 +08:00
payton
a9d2466106 1.去掉一些log 2023-11-07 20:49:59 +08:00
payton
7148a60b5d 1.修改缩略图水印问题 2023-11-07 20:49:37 +08:00
zyj
6182a5e3da 实现CamInfo功能 2023-11-07 20:00:36 +08:00
zyj
56a56dd97e 在Builder中添加所需资源 2023-11-07 19:47:59 +08:00
payton
b04488bb59 1.Delay默认15s 2023-11-07 18:14:12 +08:00
payton
2b0116a391 1.优化utc和ntp代码 2023-11-07 18:09:23 +08:00
xiaojiazhu
39a2adb4cb Fixed bug about delay setting. 2023-11-07 16:50:25 +08:00
xiaojiazhu
4ea2045894 Fixed bluetooth status show bug. 2023-11-07 15:52:10 +08:00
payton
0c2b323a1c 1.修复dp+拍照参数同步问题;2.返回值调整 2023-11-07 15:27:24 +08:00
payton
5bdad7bb69 1.修复B启动后卡异常导致卡机问题 2023-11-07 15:26:22 +08:00
xiaojiazhu
d9f7089394 Fixed bug 9676. 2023-11-07 14:13:28 +08:00
xiaojiazhu
f43927a29c Fixed sensitivity bug. 2023-11-07 09:36:22 +08:00
payton
91c720aeca 1.Linux下ANR 2023-11-06 19:28:55 +08:00
payton
68eced2e23 1.wifi加载修改 2023-11-06 19:27:35 +08:00
payton
852c05efab 1.msdc模式时设置sdclk 24M 2023-11-06 18:26:26 +08:00
payton
35aa37ab60 1.增加WiFi开关控制 2023-11-06 18:25:49 +08:00
xiaojiazhu
71f16968c2 Enter work mode in photo screen. 2023-11-06 17:02:01 +08:00
xiaojiazhu
aa2e833ea3 Fixed bug number 9517. 2023-11-06 15:22:01 +08:00
payton
e99fad6ff1 1.adc更正电池部分修改;2.s550 rtoofs更新 2023-11-06 15:14:42 +08:00
6e3727cab8 1.adc lib更改 2023-11-06 14:30:19 +08:00
payton
36182e1e9e 1.一次删除20个文件 2023-11-06 14:08:57 +08:00
payton
2c1ef5b8e8 1.dp发送结束统计 2023-11-06 10:34:56 +08:00
payton
c0981ed481 1.dp信息统计 2023-11-06 10:34:14 +08:00
payton
83ac60d9ae 1.发送开始时间记录 2023-11-06 10:33:31 +08:00
payton
2cf15cc0a9 1.sd卡挂载检测优化 2023-11-06 10:32:31 +08:00
payton
3ff91d1451 1.power off信息统计 2023-11-06 10:31:09 +08:00
payton
9b02efa6e9 1.还原40M尺寸 2023-11-06 10:30:47 +08:00
payton
6ed7dba5e1 1.修复预览偶发卡死问题 2023-11-06 10:30:26 +08:00
payton
87feaba1d0 1.WiFi调整 2023-11-06 10:29:39 +08:00
payton
e5e4573e1d 1.blue调整 2023-11-06 10:27:46 +08:00
payton
0c1f201b72 1.蓝牙状态 2023-11-06 10:12:29 +08:00
d22539c5a3 Renew bmp file. 2023-11-04 16:42:59 +08:00
f9fddafa83 Merge code of ding. 2023-11-04 15:56:15 +08:00
576b10ede1 Fixed wifi and bluetooth status show bug. 2023-11-03 19:37:38 +08:00
57fea3c641 Fiex qr code show bug. 2023-11-03 19:01:04 +08:00
12e1555ac3 Merg code of ding:fixed setting screen and play screen bug. 2023-11-03 17:01:40 +08:00
1ecfe61844 Merge code of ding to fixed setting and play screen bug. 2023-11-03 14:32:51 +08:00
zyj
b313530625 Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug 2023-11-02 19:55:26 +08:00
zyj
98c0281177 完成Network Selection部分功能 2023-11-02 19:55:13 +08:00
533307f2e0 Merge code of gui. 2023-11-02 17:07:40 +08:00
0bad53d7ee Fixed bug about rtc time. 2023-11-02 16:58:37 +08:00
55ff409a05 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui 2023-11-02 15:43:42 +08:00
68bc60589c Renew some bmp source. 2023-11-02 15:43:19 +08:00
zyj
73b864bb33 在Builder中添加所需资源 2023-11-02 15:28:10 +08:00
be193949e0 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui 2023-11-02 13:59:52 +08:00
5d9135431f Fixed font bug. 2023-11-02 13:59:35 +08:00
zyj
a4282f8253 Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug 2023-11-02 11:37:13 +08:00
zyj
3a63cc3464 完成Network Selection部分功能,修改了LPA业务 2023-11-02 11:36:37 +08:00
139a66c818 Improve lvgl from ding. 2023-11-02 10:56:12 +08:00
payton
09e2e5a948 1.P+V优化后Linux下的调整 2023-11-02 10:22:08 +08:00
payton
299feee950 1.蓝牙指令sd卡相关处理业务 2023-11-02 10:19:49 +08:00
0dbe58adbd Fixed long press key event bug. 2023-11-02 10:14:06 +08:00
payton
d9a2cb4df1 1.格式化处理的更改 2023-11-02 10:08:26 +08:00
payton
95c1db834a 1.bluez修改 2023-11-02 10:08:13 +08:00
payton
d62d2d4525 1.蓝牙业务修改 2023-11-02 10:08:13 +08:00
payton
baefeb41c0 1.Linux下水印修改 2023-11-02 10:04:20 +08:00
payton
f6886c0878 1.关机画面 2023-11-02 10:04:20 +08:00
2ea7b78010 Fixed bug about next page icon of setting screen. 2023-11-01 17:49:10 +08:00
b1ff7d0f0e Fixed bug number 9746. 2023-11-01 15:52:17 +08:00
d9a0c77e13 Fixed bug number 9744. 2023-11-01 15:24:19 +08:00
c71c326c31 Fixed bug number 9677 2023-11-01 14:38:44 +08:00
f1765d227f Fixed bug number 9531. 2023-11-01 10:25:11 +08:00
payton
89892c2012 1.sd卡和UI显示的代码优化 2023-10-31 16:10:00 +08:00
0798d69d71 Fixed key release event bug. 2023-10-30 19:39:38 +08:00
1d79b833e7 Load sf data to sync when open setting screen. 2023-10-30 17:50:12 +08:00
386cd1eded Fixex compile failed bug. 2023-10-30 13:48:17 +08:00
3dabb39860 Fixed signal level show bug. 2023-10-30 11:28:15 +08:00
177734f48f Add common api file of lvgl. 2023-10-30 10:25:38 +08:00
ad18b96aa0 Add long press event. 2023-10-27 16:53:48 +08:00
fca55f1bf2 Merge code of ding to fix setting item callback function bug. 2023-10-27 10:19:54 +08:00
1f02d965c0 Fixed bug about settings. 2023-10-26 19:41:04 +08:00
37aff7d963 Fixed a bug about setting password. 2023-10-26 17:48:11 +08:00
6fec7f0960 Fixed a bug about setting date and time. 2023-10-26 16:42:25 +08:00
d9aa98e2a3 Setting date and time ok. 2023-10-26 16:33:39 +08:00
f8d1b1c298 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui 2023-10-26 15:24:49 +08:00
7324e477b2 Setting send type ok. 2023-10-26 15:24:26 +08:00
antony.wang
3791d1bf87 1. 为避免cardv进程偶发不能起来,修改message名称,避免和cardv进程名称重合 2023-10-26 15:19:18 +08:00
zyj
e3969e2d00 Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug 2023-10-26 14:41:39 +08:00
zyj
0c3672cafa 初步完成软件升级,模块升级,设备重置功能 2023-10-26 14:39:53 +08:00
zyj
3468be7600 添加部分文字资源 2023-10-26 14:02:34 +08:00
37ab151fa1 Setting send type function. 2023-10-26 11:42:13 +08:00
35fe03f9f4 Fixed a bug of date and time icon. 2023-10-25 17:42:16 +08:00
649e52d885 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui 2023-10-25 15:57:50 +08:00
2e1ac0fd8a Improve setting screen. 2023-10-25 15:57:33 +08:00
zyj
b8027138af 1.实现设置界面的SD卡格式化的功能 2023-10-25 15:29:55 +08:00
12955a038b Fixed bug about setting screen. 2023-10-25 11:39:09 +08:00
5610dd477c Merge branch 'branch_s550_fast_gui' into branch_s550_fast 2023-10-24 21:08:05 +08:00
57e212d083 Improve setting screen. 2023-10-24 21:06:04 +08:00
d3956f5fb3 Merge branch 'branch_s550_fast_gui' into branch_s550_fast 2023-10-24 20:12:25 +08:00
b43e32fb3d Merge code of ding. 2023-10-24 20:06:37 +08:00
e997d66904 Fixed compile bug about front. 2023-10-24 19:04:07 +08:00
109f4b29f8 Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui 2023-10-24 17:39:15 +08:00
2851e26f42 Improve password screen. 2023-10-24 17:35:49 +08:00
payton
e82393a5d6 1.esim卡的iccid 2023-10-24 17:10:13 +08:00
payton
7ce822975c 1.软升级改到uboot下 2023-10-24 17:08:35 +08:00
zyj
f2c157c5ec Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug 2023-10-24 10:43:31 +08:00
zyj
116f1377e2 1.SD卡格式化相关字符串添加 2023-10-24 10:40:50 +08:00
feb9db88c6 Fixed bug about comfirm screen. 2023-10-23 20:46:28 +08:00
f3275513a5 Add password screen. 2023-10-23 17:06:05 +08:00
510b11920d Merge branch 'Branch_S550_GUI' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_gui 2023-10-23 14:36:06 +08:00
2f2ee6c278 Fixed bug when open play screen. 2023-10-23 14:35:52 +08:00
zyj
e274d2035b 1.完成设置菜单中的密码功能 2023-10-23 14:31:11 +08:00
zyj
0a4ce6f506 1.删除文件功能完成
2.完成设置界面部分功能
2023-10-23 11:30:35 +08:00
zyj
74062bd831 完成General页面的Operating Time功能 2023-10-21 15:05:41 +08:00
zyj
5bad061dfb Merge branch 'Branch_S550_Fast' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug 2023-10-21 13:44:43 +08:00
zyj
2b19ea7fcf 完成General页面的Delay功能,修改二级菜单按钮逻辑 2023-10-21 13:42:30 +08:00
payton
a9d2903ad3 1.蓝牙业务调整
2.log记录修改,调整log
2023-10-20 20:30:05 +08:00
zyj
a632b57a78 修复UI中对消息的错误处理 2023-10-20 17:06:15 +08:00
zyj
0f935f16ea Merge setting screen code. 2023-10-20 12:49:15 +08:00
zyj
c5058da280 finish QR General 2023-10-20 11:52:51 +08:00
42874c5574 Improve comfirm screen. 2023-10-20 11:41:58 +08:00
94afaa5317 Merge gui code. 2023-10-19 17:30:56 +08:00
fbb055c289 Auto Off time show. 2023-10-19 17:19:05 +08:00
9373577880 GUI show auto off time. 2023-10-19 13:51:19 +08:00
zyj
f307b3bc13 Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug 2023-10-19 11:19:26 +08:00
zyj
9313451aa3 1.General Page parameter save
2.Complete CamInfo Option
2023-10-19 11:18:54 +08:00
c4dffcd1c1 Improve play screen. 2023-10-18 17:19:21 +08:00
payton
4015d47723 1.蓝牙业务 2023-10-18 11:09:28 +08:00
payton
b2e697ed1e 1.增加蓝牙ssid;
2调整分区
2023-10-18 11:07:31 +08:00
antony.wang
1fbf6d07bc 1. 修改24M, 32M,40M分辨率 2023-10-18 10:14:26 +08:00
zyj
07e0c59ab9 Merge branch 'Branch_S550_GUI' of 192.168.6.216:/linux-em-group/s530-ntk into branch_s550_gui_debug 2023-10-17 21:16:34 +08:00
zyj
f67eb52c26 add debug log 2023-10-17 21:15:56 +08:00
be0fcb06c1 Add qrcode show function. 2023-10-17 21:10:31 +08:00
0d64183720 Improve preview screen. 2023-10-17 11:41:12 +08:00
antony.wang
f6918ec81d 1.修改设置指令重复导致执行错位问题.
2.修改版本号.
3.修改机审编译脚本.
2023-10-17 10:05:11 +08:00
b1176dc336 Backup switch setting code. 2023-10-17 09:08:53 +08:00
payton
c332c5873f Merge branch 'Branch_S550_Fast' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast 2023-10-16 21:14:52 +08:00
payton
57c4457306 1.增加两个cmd 2023-10-16 20:48:58 +08:00
payton
3363f6b6d1 1.修改sd卡循环 2023-10-16 17:26:50 +08:00
payton
d954d1bea2 1.去掉中间文件 2023-10-16 15:59:14 +08:00
789db4be0f Improve setting screen. 2023-10-16 15:56:01 +08:00