Commit Graph

610 Commits

Author SHA1 Message Date
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
antony.wang
ab8cc2954f 去掉searching 打印 2023-10-16 11:47:52 +08:00
3bdd082a9f Setting More page show. 2023-10-16 11:15:49 +08:00
bd661101d5 Fix setting page bug on select page. 2023-10-14 20:24:35 +08:00
payton
234ee8e48e 1.卡循环函数命名冲突 2023-10-14 17:41:09 +08:00
payton
2a260473a7 1.sd卡循环 2023-10-14 17:08:49 +08:00
5ba4a9f588 Merge code of ding. 2023-10-14 15:38:17 +08:00
2e2ce5a8a2 Setting send page improve. 2023-10-14 14:55:09 +08:00
payton
3ac769ad80 1.蓝牙相关库 2023-10-13 21:01:29 +08:00
payton
0608191fe8 1.dbus相关目录 2023-10-13 20:45:34 +08:00
c9542619fb Setting send page improve. 2023-10-13 17:48:41 +08:00
payton
93c62e0cb4 1.还原电池检测线程 2023-10-13 17:41:32 +08:00
payton
3f2930a021 1.蓝牙配置文件
2.相关目录拷贝
2023-10-13 17:40:06 +08:00
payton
e991dec869 1.蓝牙应用 2023-10-13 17:38:51 +08:00
payton
3e94aa8dd5 1.蓝牙硬件上电控制
2.修复关机时logo可能宕机问题
3.调整RAMFS
2023-10-13 17:37:48 +08:00
payton
2b70e194a7 1.还原菜单状态标识设置 2023-10-13 17:32:45 +08:00
payton
068a8db64b 1.蓝牙相关工具和库 2023-10-13 17:31:17 +08:00
884486a4e9 Setting send page show. 2023-10-13 16:54:35 +08:00
930806e1e9 backup. 2023-10-13 15:33:05 +08:00
84bb6aeb8f Fixed key event in lvgl callback. 2023-10-13 13:54:09 +08:00
11129f22ef Meger setting screen code of ding. 2023-10-13 09:41:13 +08:00
d2c93fd7bb General page show. 2023-10-12 16:38:41 +08:00
28577d2e75 QR page show and renew some pictures. 2023-10-12 15:34:08 +08:00
ed9c3251cb Fixed font bug. 2023-10-12 13:44:58 +08:00
3647984f0f Setting page QR and General backup. 2023-10-11 20:55:05 +08:00
dd45ba2fb0 Add QR setting page. 2023-10-11 17:56:01 +08:00
ded81acf68 Confirm screen. 2023-10-11 11:41:40 +08:00
94add66b25 Message screen. 2023-10-10 20:53:02 +08:00
6733f62bbb Merge setting screen from ding. 2023-10-10 15:45:28 +08:00
9b1dfafdff Fix bug about ui builder. 2023-10-10 14:54:37 +08:00
13dc50e940 Sync with ding. 2023-10-10 11:18:14 +08:00
c81ac468a5 Close play screen. 2023-10-09 21:04:30 +08:00
34eea2eaf8 Open play screen. 2023-10-09 16:12:02 +08:00
8103657b8e No sd card show. 2023-10-09 11:22:49 +08:00
ab8819cc89 Movie screen show. 2023-10-09 10:17:13 +08:00
a369f09caa Merge s550_fast with gui code. 2023-10-08 18:54:55 +08:00
049e3d4a69 backup. 2023-10-08 16:33:59 +08:00
10174b26ef Get camera message. 2023-10-08 15:32:18 +08:00
efe4488672 1.修复sd卡用量不准问题 2023-10-08 14:18:23 +08:00
95ef77a50f photo screen message icon. 2023-10-07 21:14:15 +08:00
4f4a927a86 Battery icon show. 2023-10-07 20:28:39 +08:00
541bb66326 Signal show. 2023-10-07 16:07:03 +08:00
22b2ca2d32 Warning message screen. 2023-10-07 09:55:43 +08:00
19a5bd3278 1.按键调整
2.alg分辨率调整,修复却换视频模式是卡画面问题
3.加logo一些log
2023-10-07 09:45:10 +08:00
3f16cfaa20 1.关机画面 2023-10-07 09:43:23 +08:00
953e5e9a4c 1.WiFi适配调整 2023-10-07 09:42:57 +08:00
6dd50fc9be Preview screen. 2023-09-28 14:44:25 +08:00
e236ba8f47 Setting screen show. 2023-09-27 21:08:28 +08:00
8a0b030104 Fix compile error bug. 2023-09-27 11:52:03 +08:00
eb20eeb39a Password screen show. 2023-09-26 19:47:26 +08:00
090ed9fed8 1.修改wifi;2.去除编译警告 2023-09-26 18:02:34 +08:00
2c2e9641e8 1.更改版本号 2023-09-26 18:01:57 +08:00
0e35773fb7 1.客户logo 2023-09-26 15:58:26 +08:00
4f5197801f 1.关闭Linux下的logo显示 2023-09-26 15:58:01 +08:00
ba1d477653 Add password screen. 2023-09-26 15:38:36 +08:00
900d307e54 1.电池读取修改 2023-09-26 15:17:34 +08:00
bb9d4361e8 1.wifi启动 2023-09-25 17:40:41 +08:00
cf6a40b46d 1.wifi驱动 2023-09-25 17:39:41 +08:00
89ebb4f530 1.pwm调整为S510一样的 2023-09-25 17:18:07 +08:00
943e269b3d 1.根据prd将图片logo改为小logo 2023-09-25 17:16:44 +08:00
328213fda5 1.修改客户图片信息 2023-09-25 17:15:59 +08:00
8b63a6cb6d 1.修复按键不断有消息 2023-09-25 17:13:27 +08:00
7ebfe5a653 Fix ftp timeout bug. 2023-09-22 16:41:55 +08:00
ca9d22573c 1.按键适配S550 2023-09-22 14:28:19 +08:00
7622d6903e 1.优化wifi代码 2023-09-22 10:02:32 +08:00
471b9d5c34 1.修复检查短信延时2s问题 2023-09-21 12:27:01 +08:00
5f3545fef5 1.开启log功能 2023-09-15 18:09:34 +08:00
258fb65dd3 1.dbg开关控制 2023-09-15 18:08:26 +08:00
b0ebf77e2e 1.修复插入usb 2023-09-15 10:47:52 +08:00
4b7b30d76a Merge branch 'Branch_S530' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S530 2023-09-15 09:47:23 +08:00
fa9ae2e537 1.log文件路径更改 2023-09-15 09:41:54 +08:00
61bd5c42b6 1.修复usb驱动加载 2023-09-15 09:41:20 +08:00
alisa
cb3c5a95f2 Merge remote-tracking branch 'origin/Branch_S530' into branch_s530 2023-09-15 00:14:44 +08:00
alisa
497fb019f7 [sifarsdk]1.sifarsdk绑定更新 2023-09-15 00:09:00 +08:00
alisa
75c2e73357 [sim]1.修改sim卡,version和其他卡不关闭模块PDP链路 2023-09-15 00:06:13 +08:00
ad1ff2a26c Merge branch 'Branch_S530' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S530 2023-09-14 11:45:03 +08:00
3b1edd9be7 1.降噪功能开启;2.优化代码;3.WiFi开启dbg功能 2023-09-14 11:34:30 +08:00
cd39782efe 1.增加S550 model 2023-09-14 11:31:34 +08:00
0924de5678 1.S550适配 2023-09-14 11:28:44 +08:00
4dd6c4e3b3 1.修复冲突;2.增加dbg开关 2023-09-14 09:51:08 +08:00
alisa
ad9a4b1687 [warning]1.去除编译的警告 2023-09-12 23:26:57 +08:00
alisa
886ff536b7 Merge remote-tracking branch 'origin/Branch_S530' into branch_s530 2023-09-12 23:20:06 +08:00
alisa
5553611f59 [sifar SDK].更新sifar SDK 2023-09-12 23:00:43 +08:00
alisa
abeb8975d7 [业务]1.调试 E-sim的流程 2023-09-12 22:58:26 +08:00
4207e0eb72 Merge branch 'Branch_S530' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S530 2023-09-11 15:56:01 +08:00
alisa
d6fdec636e [业务]1.合并代码后编译失败问题处理 2023-09-11 00:48:40 +08:00
alisa
0a5c35d505 Merge remote-tracking branch 'origin/Branch_S530' into branch_s530 2023-09-10 23:30:34 +08:00
alisa
995fc920fc [业务]1.e-sim卡注册网络流程优化 2023-09-10 23:17:55 +08:00
19307baf27 1.修改参数同步问题 2023-09-08 16:12:56 +08:00
049a600c44 1.去除一些编译警告
2.修复ftp发送后led灯显示
3.去除ntp时间同步
2023-09-07 15:56:44 +08:00
0a7fbcec2f 1.优化升级写mcu
2.修复cardv下写mcu不生效问题
2023-09-07 14:10:01 +08:00