Commit Graph

Select branches

Hide Pull Requests

dev

main

Mono Color

• 55891ee1ac fix 5 alert 赵明涛 2025-09-14 18:37:27 +0800
• 4ecc1d9c01 fix 4 赵明涛 2025-09-14 18:20:36 +0800
• 5d99fa4344 fix 3 赵明涛 2025-09-14 18:18:53 +0800
• 138f4afac6 fix 2 赵明涛 2025-09-14 18:13:26 +0800
• 1c9119b760 fix 1 赵明涛 2025-09-14 17:47:27 +0800
• cea08ef0cf add gateab alert 赵明涛 2025-09-14 17:43:10 +0800
• 299e9ecd55 fix 2 赵明涛 2025-09-13 16:58:50 +0800
• 9df29ee30d fix 1 赵明涛 2025-09-13 16:55:57 +0800
• a31179de57 change function 赵明涛 2025-09-13 16:52:18 +0800
• a850e4a10b run abGate test MTing 2025-09-13 16:32:10 +0800
• 045ddbd577 Merge branch 'dev' of https://git.ouxuan.net/APP/oxFaceAndroid into dev 赵明涛 2025-09-13 15:48:04 +0800
• 78b46e1a9d add abGateManager 赵明涛 2025-09-13 15:47:18 +0800
• d9ab3cb75d fix MTing 2025-09-13 15:42:55 +0800
• dd49d7225b add open B when no network MTing 2025-09-13 13:55:04 +0800
• 3f41b5f474 fix auth token MTing 2025-09-13 11:41:22 +0800
• d9d8fd3a66 Merge branch 'dev' of https://git.ouxuan.net/APP/oxFaceAndroid into dev MTing 2025-09-13 11:30:02 +0800
• 21864e9156 fix 1 MTing 2025-09-13 11:28:57 +0800
• e179abfab5 Merge branch 'dev' of https://git.ouxuan.net/APP/oxFaceAndroid into dev 赵明涛 2025-09-12 19:21:27 +0800
• f54feeff5d fix 1 赵明涛 2025-09-12 19:21:20 +0800
• df90b64386 remove OxGpio MTing 2025-09-12 18:54:38 +0800
• 896db0e6c3 fix 485 big change & CMake & all build.gradle change MTing 2025-09-12 18:36:53 +0800
• 88a2d06d16 fix 1 MTing 2025-09-12 18:05:04 +0800
• 261dccc7e5 add SerialPort lib MTing 2025-09-12 18:04:47 +0800
• 911d70f21a add Ox485 赵明涛 2025-09-12 17:44:33 +0800
• 8c2cb30312 add Gpio 485 test 赵明涛 2025-09-12 16:50:15 +0800
• 8f5405d2cc fix 赵明涛 2025-09-12 15:12:24 +0800
• d939e36ec5 add GateABController 赵明涛 2025-09-12 15:03:19 +0800
• 3a8c72b3d3 add gpio debug MTing 2025-09-12 14:26:41 +0800
• 58e5236faf add GPIO util 赵明涛 2025-09-12 13:59:46 +0800
• bb29e4fbbb fix 调整识别参数 MTing 2025-09-12 13:43:26 +0800
• 8790bff2b0 fix 在网络响应较慢的情况下（3966ms和2484ms），系统执行了多次checkOrder操作，导致弹出了多个订单选择页面. MTing 2025-09-12 11:24:53 +0800
• b492856680 fix 7 赵明涛 2025-09-11 20:24:55 +0800
• caf2c629b4 Merge branch 'dev' of https://git.ouxuan.net/APP/oxFaceAndroid into dev 赵明涛 2025-09-11 20:22:58 +0800
• bbdc67e153 fix 6 camera stop 赵明涛 2025-09-11 20:22:48 +0800
• b262e2b191 fix 6 MTing 2025-09-11 20:14:02 +0800
• 3831fbaea7 fix 5 赵明涛 2025-09-11 20:12:51 +0800
• 4a5a54e42e fix 4 赵明涛 2025-09-11 20:01:41 +0800
• cdf959f278 fix 3 赵明涛 2025-09-11 19:40:08 +0800
• 3d5e3fecb8 fix 2 parseGateState 赵明涛 2025-09-11 18:41:03 +0800
• 02393d1b2b fix 1 remove 赵明涛 2025-09-11 18:12:54 +0800
• 2be0b17bb6 add udp init & use in face detect 赵明涛 2025-09-11 18:06:50 +0800
• 4cb51b9668 add udp 赵明涛 2025-09-11 17:48:05 +0800
• 3a0e3eb949 fix 1 no test MTing 2025-09-11 17:24:26 +0800
• 503c37b700 add huawei scan in test MTing 2025-09-11 15:24:29 +0800
• 9fd376183a add initPadSettingConfig MTing 2025-09-11 14:37:46 +0800
• c7f01252b6 add pad config debug MTing 2025-09-11 14:20:54 +0800
• 2f1337eca3 fix 7 MTing 2025-09-11 11:50:47 +0800
• deafb3079d Merge branch 'dev' of https://git.ouxuan.net/APP/oxFaceAndroid into dev MTing 2025-09-11 11:32:32 +0800
• 435feccfee fix ui button MTing 2025-09-11 11:31:43 +0800
• 4a2a8a1f5c fix 6 for newwork check with detect 赵明涛 2025-09-11 11:30:56 +0800
• ea06ea014b fix ui 赵明涛 2025-09-11 10:47:38 +0800
• bfea615012 fix 5 赵明涛 2025-09-11 10:32:31 +0800
• a5dda6f15c fix 4 赵明涛 2025-09-11 10:30:47 +0800
• 911c1357ee fix 3 赵明涛 2025-09-11 10:29:08 +0800
• d6d6855ff5 fix 2 赵明涛 2025-09-11 10:17:52 +0800
• e9ad80121c Merge branch 'dev' of https://git.ouxuan.net/APP/oxFaceAndroid into dev 赵明涛 2025-09-11 10:13:27 +0800
• 473ae85378 add network check in detect 赵明涛 2025-09-11 10:13:11 +0800
• fbb2d635dc fix 1 MTing 2025-09-11 09:41:58 +0800
• f85148dcd8 add leave in flag in name MTing 2025-09-10 20:05:09 +0800
• 434e399ae2 add leave check 赵明涛 2025-09-10 19:52:26 +0800
• a78fd9510c add leave api 赵明涛 2025-09-10 19:37:46 +0800
• 2cef37616d handle 502 for check order 赵明涛 2025-09-10 18:50:10 +0800
• 54724a12e0 Merge branch 'dev' of https://git.ouxuan.net/APP/oxFaceAndroid into dev 赵明涛 2025-09-10 18:39:12 +0800
• 937d59451f handle 502 to show 赵明涛 2025-09-10 18:38:38 +0800
• ca4e90b323 fix 4 MTing 2025-09-10 18:21:54 +0800
• 04b411057c fix 3 MTing 2025-09-10 18:17:25 +0800
• b3209453df fix 2 MTing 2025-09-10 18:06:05 +0800
• f4fc2554a7 fix 1 赵明涛 2025-09-10 17:27:15 +0800
• 5dfe9770cd 订单核销结果页重构 赵明涛 2025-09-10 17:21:13 +0800
• 4bde9065b3 fix order_type 1 test MTing 2025-09-10 17:13:39 +0800
• 778b6d9b76 fix ui MTing 2025-09-10 16:37:57 +0800
• 571ce4f84e fix order_type 3 ui MTing 2025-09-10 16:02:45 +0800
• 784681f78d fix 1 MTing 2025-09-10 15:54:27 +0800
• 975f61df45 fix ui for order result MTing 2025-09-10 15:44:32 +0800
• d6acc3d7c4 fix 6 verify order MTing 2025-09-10 13:56:51 +0800
• 5e6e51ec5e fix 5 MTing 2025-09-10 13:45:38 +0800
• a1529d0b06 fix 4 MTing 2025-09-10 10:20:53 +0800
• 8cde02e78e Merge branch 'dev' of https://git.ouxuan.net/APP/oxFaceAndroid into dev MTing 2025-09-10 09:32:19 +0800
• 125c0be663 fix 3 MTing 2025-09-10 09:29:54 +0800
• 8fd4e22d9f fix 3 赵明涛 2025-09-09 19:59:07 +0800
• 49d016f425 fix 2 add api for order result 赵明涛 2025-09-09 19:44:08 +0800
• a4a5f33c96 fix 1 MTing 2025-09-09 19:32:35 +0800
• 1b521fefd5 add order result 赵明涛 2025-09-09 19:26:16 +0800
• 08c7e9f482 fix bug after select order MTing 2025-09-09 19:09:05 +0800
• e0cd0d8b47 fix 7 camera resume MTing 2025-09-09 18:56:59 +0800
• 66577a4542 fix 6 MTing 2025-09-09 18:41:47 +0800
• 2351182381 fix 5 MTing 2025-09-09 18:34:35 +0800
• 649393de15 fix 4 MTing 2025-09-09 18:29:32 +0800
• fb97eeb525 fix 3 赵明涛 2025-09-09 18:21:10 +0800
• 107dfe3192 fix 2 赵明涛 2025-09-09 18:10:47 +0800
• 818abd3a72 fix 1 赵明涛 2025-09-09 18:06:55 +0800
• e4c171d46d add camera pause 赵明涛 2025-09-09 18:04:49 +0800
• a274b09c03 fix 4 MTing 2025-09-09 17:41:51 +0800
• df89589b25 fix 3 赵明涛 2025-09-09 17:14:36 +0800
• a073fd1980 fix 2 赵明涛 2025-09-09 16:43:55 +0800
• f7b98bdd3a fix 赵明涛 2025-09-09 16:32:37 +0800
• e742f8d701 dev to test new order select 赵明涛 2025-09-09 16:09:49 +0800
• ed60593829 add checkorder list 赵明涛 2025-09-09 15:50:35 +0800
• 28e41ecf68 add log MTing 2025-09-09 15:42:37 +0800
• bbd42641b7 Merge branch 'dev' of https://git.ouxuan.net/APP/oxFaceAndroid into dev MTing 2025-09-09 15:33:47 +0800