diff --git a/entry/src/main/cpp/bin/voice/10101.mp3 b/entry/src/main/cpp/bin/voice/10101.mp3
index e3bccf03..4bd948b3 100644
Binary files a/entry/src/main/cpp/bin/voice/10101.mp3 and b/entry/src/main/cpp/bin/voice/10101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10102.mp3 b/entry/src/main/cpp/bin/voice/10102.mp3
index 00c45070..191e5033 100644
Binary files a/entry/src/main/cpp/bin/voice/10102.mp3 and b/entry/src/main/cpp/bin/voice/10102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10103.mp3 b/entry/src/main/cpp/bin/voice/10103.mp3
index ce53b26f..863ae4ea 100644
Binary files a/entry/src/main/cpp/bin/voice/10103.mp3 and b/entry/src/main/cpp/bin/voice/10103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10104.mp3 b/entry/src/main/cpp/bin/voice/10104.mp3
index 229ff02f..968b7b48 100644
Binary files a/entry/src/main/cpp/bin/voice/10104.mp3 and b/entry/src/main/cpp/bin/voice/10104.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10105.mp3 b/entry/src/main/cpp/bin/voice/10105.mp3
index 392a2857..6148854d 100644
Binary files a/entry/src/main/cpp/bin/voice/10105.mp3 and b/entry/src/main/cpp/bin/voice/10105.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10106.mp3 b/entry/src/main/cpp/bin/voice/10106.mp3
index c290be1e..56203532 100644
Binary files a/entry/src/main/cpp/bin/voice/10106.mp3 and b/entry/src/main/cpp/bin/voice/10106.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10107.mp3 b/entry/src/main/cpp/bin/voice/10107.mp3
index 9449724a..733f571e 100644
Binary files a/entry/src/main/cpp/bin/voice/10107.mp3 and b/entry/src/main/cpp/bin/voice/10107.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10108.mp3 b/entry/src/main/cpp/bin/voice/10108.mp3
index 5fb8f7c3..86e3ed6c 100644
Binary files a/entry/src/main/cpp/bin/voice/10108.mp3 and b/entry/src/main/cpp/bin/voice/10108.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10109.mp3 b/entry/src/main/cpp/bin/voice/10109.mp3
index 3490c030..e2faf137 100644
Binary files a/entry/src/main/cpp/bin/voice/10109.mp3 and b/entry/src/main/cpp/bin/voice/10109.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10110.mp3 b/entry/src/main/cpp/bin/voice/10110.mp3
index ef114391..2c4a0e0d 100644
Binary files a/entry/src/main/cpp/bin/voice/10110.mp3 and b/entry/src/main/cpp/bin/voice/10110.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10111.mp3 b/entry/src/main/cpp/bin/voice/10111.mp3
index 3a636e0f..b3281a00 100644
Binary files a/entry/src/main/cpp/bin/voice/10111.mp3 and b/entry/src/main/cpp/bin/voice/10111.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10112.mp3 b/entry/src/main/cpp/bin/voice/10112.mp3
index 7f0abcfa..d7ba5628 100644
Binary files a/entry/src/main/cpp/bin/voice/10112.mp3 and b/entry/src/main/cpp/bin/voice/10112.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10113.mp3 b/entry/src/main/cpp/bin/voice/10113.mp3
index 05e692d0..7df14e46 100644
Binary files a/entry/src/main/cpp/bin/voice/10113.mp3 and b/entry/src/main/cpp/bin/voice/10113.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10114.mp3 b/entry/src/main/cpp/bin/voice/10114.mp3
index eea3c11f..7b1c8d37 100644
Binary files a/entry/src/main/cpp/bin/voice/10114.mp3 and b/entry/src/main/cpp/bin/voice/10114.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10115.mp3 b/entry/src/main/cpp/bin/voice/10115.mp3
index 036f8d9d..9e254d46 100644
Binary files a/entry/src/main/cpp/bin/voice/10115.mp3 and b/entry/src/main/cpp/bin/voice/10115.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10116.mp3 b/entry/src/main/cpp/bin/voice/10116.mp3
index 165dedb2..de647e9d 100644
Binary files a/entry/src/main/cpp/bin/voice/10116.mp3 and b/entry/src/main/cpp/bin/voice/10116.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10117.mp3 b/entry/src/main/cpp/bin/voice/10117.mp3
index faf79f37..fb125883 100644
Binary files a/entry/src/main/cpp/bin/voice/10117.mp3 and b/entry/src/main/cpp/bin/voice/10117.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10118.mp3 b/entry/src/main/cpp/bin/voice/10118.mp3
index dff0275c..96686090 100644
Binary files a/entry/src/main/cpp/bin/voice/10118.mp3 and b/entry/src/main/cpp/bin/voice/10118.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10119.mp3 b/entry/src/main/cpp/bin/voice/10119.mp3
index e5bc7758..7785d08c 100644
Binary files a/entry/src/main/cpp/bin/voice/10119.mp3 and b/entry/src/main/cpp/bin/voice/10119.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10120.mp3 b/entry/src/main/cpp/bin/voice/10120.mp3
index 87ee1eff..610dfeef 100644
Binary files a/entry/src/main/cpp/bin/voice/10120.mp3 and b/entry/src/main/cpp/bin/voice/10120.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10121.mp3 b/entry/src/main/cpp/bin/voice/10121.mp3
index 49ec4137..fdda4bce 100644
Binary files a/entry/src/main/cpp/bin/voice/10121.mp3 and b/entry/src/main/cpp/bin/voice/10121.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10122.mp3 b/entry/src/main/cpp/bin/voice/10122.mp3
index 6499c810..dc370a54 100644
Binary files a/entry/src/main/cpp/bin/voice/10122.mp3 and b/entry/src/main/cpp/bin/voice/10122.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10123.mp3 b/entry/src/main/cpp/bin/voice/10123.mp3
index d4a77fc7..52af40c9 100644
Binary files a/entry/src/main/cpp/bin/voice/10123.mp3 and b/entry/src/main/cpp/bin/voice/10123.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10124.mp3 b/entry/src/main/cpp/bin/voice/10124.mp3
index 213048a8..06f1f41f 100644
Binary files a/entry/src/main/cpp/bin/voice/10124.mp3 and b/entry/src/main/cpp/bin/voice/10124.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10125.mp3 b/entry/src/main/cpp/bin/voice/10125.mp3
index 8cc93464..3fe872a0 100644
Binary files a/entry/src/main/cpp/bin/voice/10125.mp3 and b/entry/src/main/cpp/bin/voice/10125.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10126.mp3 b/entry/src/main/cpp/bin/voice/10126.mp3
index 4fc5b566..8979cf89 100644
Binary files a/entry/src/main/cpp/bin/voice/10126.mp3 and b/entry/src/main/cpp/bin/voice/10126.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10127.mp3 b/entry/src/main/cpp/bin/voice/10127.mp3
index b3ac5b75..985751d0 100644
Binary files a/entry/src/main/cpp/bin/voice/10127.mp3 and b/entry/src/main/cpp/bin/voice/10127.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10201.mp3 b/entry/src/main/cpp/bin/voice/10201.mp3
index f135220f..3272528c 100644
Binary files a/entry/src/main/cpp/bin/voice/10201.mp3 and b/entry/src/main/cpp/bin/voice/10201.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10202.mp3 b/entry/src/main/cpp/bin/voice/10202.mp3
index 5856832c..5cf68917 100644
Binary files a/entry/src/main/cpp/bin/voice/10202.mp3 and b/entry/src/main/cpp/bin/voice/10202.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10203.mp3 b/entry/src/main/cpp/bin/voice/10203.mp3
index e38884e6..fb70ffbe 100644
Binary files a/entry/src/main/cpp/bin/voice/10203.mp3 and b/entry/src/main/cpp/bin/voice/10203.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10204.mp3 b/entry/src/main/cpp/bin/voice/10204.mp3
index 55739cd7..f2dfa8a8 100644
Binary files a/entry/src/main/cpp/bin/voice/10204.mp3 and b/entry/src/main/cpp/bin/voice/10204.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10205.mp3 b/entry/src/main/cpp/bin/voice/10205.mp3
index c85c41cb..adbb33e0 100644
Binary files a/entry/src/main/cpp/bin/voice/10205.mp3 and b/entry/src/main/cpp/bin/voice/10205.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10206.mp3 b/entry/src/main/cpp/bin/voice/10206.mp3
index a4e4ce23..34a65356 100644
Binary files a/entry/src/main/cpp/bin/voice/10206.mp3 and b/entry/src/main/cpp/bin/voice/10206.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10207.mp3 b/entry/src/main/cpp/bin/voice/10207.mp3
index ff677c41..877b6930 100644
Binary files a/entry/src/main/cpp/bin/voice/10207.mp3 and b/entry/src/main/cpp/bin/voice/10207.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10209.mp3 b/entry/src/main/cpp/bin/voice/10209.mp3
index 8c982620..2843760e 100644
Binary files a/entry/src/main/cpp/bin/voice/10209.mp3 and b/entry/src/main/cpp/bin/voice/10209.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10210.mp3 b/entry/src/main/cpp/bin/voice/10210.mp3
index 4d837fa8..cce37fbd 100644
Binary files a/entry/src/main/cpp/bin/voice/10210.mp3 and b/entry/src/main/cpp/bin/voice/10210.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10211.mp3 b/entry/src/main/cpp/bin/voice/10211.mp3
index 34a1a741..77bf9b00 100644
Binary files a/entry/src/main/cpp/bin/voice/10211.mp3 and b/entry/src/main/cpp/bin/voice/10211.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_01.mp3 b/entry/src/main/cpp/bin/voice/10_01.mp3
index d8cccc87..1479d87c 100644
Binary files a/entry/src/main/cpp/bin/voice/10_01.mp3 and b/entry/src/main/cpp/bin/voice/10_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_02.mp3 b/entry/src/main/cpp/bin/voice/10_02.mp3
index 066f3da1..576162ce 100644
Binary files a/entry/src/main/cpp/bin/voice/10_02.mp3 and b/entry/src/main/cpp/bin/voice/10_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_03.mp3 b/entry/src/main/cpp/bin/voice/10_03.mp3
index 761f20da..23545268 100644
Binary files a/entry/src/main/cpp/bin/voice/10_03.mp3 and b/entry/src/main/cpp/bin/voice/10_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_04.mp3 b/entry/src/main/cpp/bin/voice/10_04.mp3
index 079dd96c..38f4f658 100644
Binary files a/entry/src/main/cpp/bin/voice/10_04.mp3 and b/entry/src/main/cpp/bin/voice/10_04.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_05.mp3 b/entry/src/main/cpp/bin/voice/10_05.mp3
index 6bad0661..e3ddf0d1 100644
Binary files a/entry/src/main/cpp/bin/voice/10_05.mp3 and b/entry/src/main/cpp/bin/voice/10_05.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_06.mp3 b/entry/src/main/cpp/bin/voice/10_06.mp3
index 634c9352..ab42be07 100644
Binary files a/entry/src/main/cpp/bin/voice/10_06.mp3 and b/entry/src/main/cpp/bin/voice/10_06.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_101.mp3 b/entry/src/main/cpp/bin/voice/10_101.mp3
index 47e6ddea..1479d87c 100644
Binary files a/entry/src/main/cpp/bin/voice/10_101.mp3 and b/entry/src/main/cpp/bin/voice/10_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_102.mp3 b/entry/src/main/cpp/bin/voice/10_102.mp3
index ec16f75b..576162ce 100644
Binary files a/entry/src/main/cpp/bin/voice/10_102.mp3 and b/entry/src/main/cpp/bin/voice/10_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_103.mp3 b/entry/src/main/cpp/bin/voice/10_103.mp3
index 8b7b5443..da28cb95 100644
Binary files a/entry/src/main/cpp/bin/voice/10_103.mp3 and b/entry/src/main/cpp/bin/voice/10_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_104.mp3 b/entry/src/main/cpp/bin/voice/10_104.mp3
index 37824a6c..23545268 100644
Binary files a/entry/src/main/cpp/bin/voice/10_104.mp3 and b/entry/src/main/cpp/bin/voice/10_104.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_105.mp3 b/entry/src/main/cpp/bin/voice/10_105.mp3
index 9dc77bb2..38f4f658 100644
Binary files a/entry/src/main/cpp/bin/voice/10_105.mp3 and b/entry/src/main/cpp/bin/voice/10_105.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_106.mp3 b/entry/src/main/cpp/bin/voice/10_106.mp3
index 1a569eb4..e3ddf0d1 100644
Binary files a/entry/src/main/cpp/bin/voice/10_106.mp3 and b/entry/src/main/cpp/bin/voice/10_106.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_107.mp3 b/entry/src/main/cpp/bin/voice/10_107.mp3
index 678d9f95..71823f26 100644
Binary files a/entry/src/main/cpp/bin/voice/10_107.mp3 and b/entry/src/main/cpp/bin/voice/10_107.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_41.mp3 b/entry/src/main/cpp/bin/voice/10_41.mp3
index a07f8a66..7e36f2d0 100644
Binary files a/entry/src/main/cpp/bin/voice/10_41.mp3 and b/entry/src/main/cpp/bin/voice/10_41.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_42.mp3 b/entry/src/main/cpp/bin/voice/10_42.mp3
index d3b11fef..6f6f46b2 100644
Binary files a/entry/src/main/cpp/bin/voice/10_42.mp3 and b/entry/src/main/cpp/bin/voice/10_42.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/10_43.mp3 b/entry/src/main/cpp/bin/voice/10_43.mp3
index a96c60d0..6c87339e 100644
Binary files a/entry/src/main/cpp/bin/voice/10_43.mp3 and b/entry/src/main/cpp/bin/voice/10_43.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_01.mp3 b/entry/src/main/cpp/bin/voice/11_01.mp3
index 3a00ea94..e4ba56bf 100644
Binary files a/entry/src/main/cpp/bin/voice/11_01.mp3 and b/entry/src/main/cpp/bin/voice/11_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_02.mp3 b/entry/src/main/cpp/bin/voice/11_02.mp3
index cbba69d4..82d0773c 100644
Binary files a/entry/src/main/cpp/bin/voice/11_02.mp3 and b/entry/src/main/cpp/bin/voice/11_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_03.mp3 b/entry/src/main/cpp/bin/voice/11_03.mp3
index 1dc623d7..82d69100 100644
Binary files a/entry/src/main/cpp/bin/voice/11_03.mp3 and b/entry/src/main/cpp/bin/voice/11_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_04.mp3 b/entry/src/main/cpp/bin/voice/11_04.mp3
index deae6523..e84b32f5 100644
Binary files a/entry/src/main/cpp/bin/voice/11_04.mp3 and b/entry/src/main/cpp/bin/voice/11_04.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_05.mp3 b/entry/src/main/cpp/bin/voice/11_05.mp3
index 12cd9626..494817d6 100644
Binary files a/entry/src/main/cpp/bin/voice/11_05.mp3 and b/entry/src/main/cpp/bin/voice/11_05.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_06.mp3 b/entry/src/main/cpp/bin/voice/11_06.mp3
index a21e7831..faec408c 100644
Binary files a/entry/src/main/cpp/bin/voice/11_06.mp3 and b/entry/src/main/cpp/bin/voice/11_06.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_07.mp3 b/entry/src/main/cpp/bin/voice/11_07.mp3
index 95459cd7..3287bec3 100644
Binary files a/entry/src/main/cpp/bin/voice/11_07.mp3 and b/entry/src/main/cpp/bin/voice/11_07.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_08.mp3 b/entry/src/main/cpp/bin/voice/11_08.mp3
index 0613c485..31f5926b 100644
Binary files a/entry/src/main/cpp/bin/voice/11_08.mp3 and b/entry/src/main/cpp/bin/voice/11_08.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_09.mp3 b/entry/src/main/cpp/bin/voice/11_09.mp3
index 012ef244..3cb2e85b 100644
Binary files a/entry/src/main/cpp/bin/voice/11_09.mp3 and b/entry/src/main/cpp/bin/voice/11_09.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_10.mp3 b/entry/src/main/cpp/bin/voice/11_10.mp3
index 68c690f3..3a788ea2 100644
Binary files a/entry/src/main/cpp/bin/voice/11_10.mp3 and b/entry/src/main/cpp/bin/voice/11_10.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_101.mp3 b/entry/src/main/cpp/bin/voice/11_101.mp3
index dcb83055..e4ba56bf 100644
Binary files a/entry/src/main/cpp/bin/voice/11_101.mp3 and b/entry/src/main/cpp/bin/voice/11_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_102.mp3 b/entry/src/main/cpp/bin/voice/11_102.mp3
index 81c88572..88a40857 100644
Binary files a/entry/src/main/cpp/bin/voice/11_102.mp3 and b/entry/src/main/cpp/bin/voice/11_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_41.mp3 b/entry/src/main/cpp/bin/voice/11_41.mp3
index c0f09b06..e1caac95 100644
Binary files a/entry/src/main/cpp/bin/voice/11_41.mp3 and b/entry/src/main/cpp/bin/voice/11_41.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_42.mp3 b/entry/src/main/cpp/bin/voice/11_42.mp3
index a7498e9a..577851e1 100644
Binary files a/entry/src/main/cpp/bin/voice/11_42.mp3 and b/entry/src/main/cpp/bin/voice/11_42.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_43.mp3 b/entry/src/main/cpp/bin/voice/11_43.mp3
index fdb63a89..2150b4d1 100644
Binary files a/entry/src/main/cpp/bin/voice/11_43.mp3 and b/entry/src/main/cpp/bin/voice/11_43.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/11_44.mp3 b/entry/src/main/cpp/bin/voice/11_44.mp3
index 93979867..77bf9b00 100644
Binary files a/entry/src/main/cpp/bin/voice/11_44.mp3 and b/entry/src/main/cpp/bin/voice/11_44.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_01.mp3 b/entry/src/main/cpp/bin/voice/12_01.mp3
index 04334e26..63e11472 100644
Binary files a/entry/src/main/cpp/bin/voice/12_01.mp3 and b/entry/src/main/cpp/bin/voice/12_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_02.mp3 b/entry/src/main/cpp/bin/voice/12_02.mp3
index dd0901a2..8fa5b2ec 100644
Binary files a/entry/src/main/cpp/bin/voice/12_02.mp3 and b/entry/src/main/cpp/bin/voice/12_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_04.mp3 b/entry/src/main/cpp/bin/voice/12_04.mp3
index 8ead106d..dd6567db 100644
Binary files a/entry/src/main/cpp/bin/voice/12_04.mp3 and b/entry/src/main/cpp/bin/voice/12_04.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_101.mp3 b/entry/src/main/cpp/bin/voice/12_101.mp3
index 04334e26..63e11472 100644
Binary files a/entry/src/main/cpp/bin/voice/12_101.mp3 and b/entry/src/main/cpp/bin/voice/12_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_102.mp3 b/entry/src/main/cpp/bin/voice/12_102.mp3
index dd0901a2..8fa5b2ec 100644
Binary files a/entry/src/main/cpp/bin/voice/12_102.mp3 and b/entry/src/main/cpp/bin/voice/12_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_103.mp3 b/entry/src/main/cpp/bin/voice/12_103.mp3
index 8ead106d..dd6567db 100644
Binary files a/entry/src/main/cpp/bin/voice/12_103.mp3 and b/entry/src/main/cpp/bin/voice/12_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_104.mp3 b/entry/src/main/cpp/bin/voice/12_104.mp3
index f92a20f2..241ddcf4 100644
Binary files a/entry/src/main/cpp/bin/voice/12_104.mp3 and b/entry/src/main/cpp/bin/voice/12_104.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_41.mp3 b/entry/src/main/cpp/bin/voice/12_41.mp3
index f92a20f2..241ddcf4 100644
Binary files a/entry/src/main/cpp/bin/voice/12_41.mp3 and b/entry/src/main/cpp/bin/voice/12_41.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_42.mp3 b/entry/src/main/cpp/bin/voice/12_42.mp3
index 408f5a32..4bd32b5a 100644
Binary files a/entry/src/main/cpp/bin/voice/12_42.mp3 and b/entry/src/main/cpp/bin/voice/12_42.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_44.mp3 b/entry/src/main/cpp/bin/voice/12_44.mp3
index 6c6ee349..2be6c9d4 100644
Binary files a/entry/src/main/cpp/bin/voice/12_44.mp3 and b/entry/src/main/cpp/bin/voice/12_44.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_45.mp3 b/entry/src/main/cpp/bin/voice/12_45.mp3
index 2ce5d769..fd4c88d3 100644
Binary files a/entry/src/main/cpp/bin/voice/12_45.mp3 and b/entry/src/main/cpp/bin/voice/12_45.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/12_46.mp3 b/entry/src/main/cpp/bin/voice/12_46.mp3
index 01116189..192d0593 100644
Binary files a/entry/src/main/cpp/bin/voice/12_46.mp3 and b/entry/src/main/cpp/bin/voice/12_46.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_01.mp3 b/entry/src/main/cpp/bin/voice/13_01.mp3
index 979ae723..7e13b2d6 100644
Binary files a/entry/src/main/cpp/bin/voice/13_01.mp3 and b/entry/src/main/cpp/bin/voice/13_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_02.mp3 b/entry/src/main/cpp/bin/voice/13_02.mp3
index d358ffad..d8b07fe4 100644
Binary files a/entry/src/main/cpp/bin/voice/13_02.mp3 and b/entry/src/main/cpp/bin/voice/13_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_03.mp3 b/entry/src/main/cpp/bin/voice/13_03.mp3
index ad1623d8..d4c30e67 100644
Binary files a/entry/src/main/cpp/bin/voice/13_03.mp3 and b/entry/src/main/cpp/bin/voice/13_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_04.mp3 b/entry/src/main/cpp/bin/voice/13_04.mp3
index 844a5b0a..ef2e7f5e 100644
Binary files a/entry/src/main/cpp/bin/voice/13_04.mp3 and b/entry/src/main/cpp/bin/voice/13_04.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_05.mp3 b/entry/src/main/cpp/bin/voice/13_05.mp3
index 8cc341e2..0d00cddb 100644
Binary files a/entry/src/main/cpp/bin/voice/13_05.mp3 and b/entry/src/main/cpp/bin/voice/13_05.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_06.mp3 b/entry/src/main/cpp/bin/voice/13_06.mp3
index c17111a1..e3b84c33 100644
Binary files a/entry/src/main/cpp/bin/voice/13_06.mp3 and b/entry/src/main/cpp/bin/voice/13_06.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_08.mp3 b/entry/src/main/cpp/bin/voice/13_08.mp3
index f882b611..4822ee1a 100644
Binary files a/entry/src/main/cpp/bin/voice/13_08.mp3 and b/entry/src/main/cpp/bin/voice/13_08.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_09.mp3 b/entry/src/main/cpp/bin/voice/13_09.mp3
index 2b177088..40d534c6 100644
Binary files a/entry/src/main/cpp/bin/voice/13_09.mp3 and b/entry/src/main/cpp/bin/voice/13_09.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_101.mp3 b/entry/src/main/cpp/bin/voice/13_101.mp3
index d358ffad..4ebba010 100644
Binary files a/entry/src/main/cpp/bin/voice/13_101.mp3 and b/entry/src/main/cpp/bin/voice/13_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_102.mp3 b/entry/src/main/cpp/bin/voice/13_102.mp3
index 844a5b0a..ef2e7f5e 100644
Binary files a/entry/src/main/cpp/bin/voice/13_102.mp3 and b/entry/src/main/cpp/bin/voice/13_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/13_103.mp3 b/entry/src/main/cpp/bin/voice/13_103.mp3
index c381193b..e3b84c33 100644
Binary files a/entry/src/main/cpp/bin/voice/13_103.mp3 and b/entry/src/main/cpp/bin/voice/13_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/14_01.mp3 b/entry/src/main/cpp/bin/voice/14_01.mp3
index f1821dca..93859b03 100644
Binary files a/entry/src/main/cpp/bin/voice/14_01.mp3 and b/entry/src/main/cpp/bin/voice/14_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/14_02.mp3 b/entry/src/main/cpp/bin/voice/14_02.mp3
index f570ffcd..f8041a07 100644
Binary files a/entry/src/main/cpp/bin/voice/14_02.mp3 and b/entry/src/main/cpp/bin/voice/14_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/14_66.mp3 b/entry/src/main/cpp/bin/voice/14_66.mp3
index 2e5ea1c6..cd6fe458 100644
Binary files a/entry/src/main/cpp/bin/voice/14_66.mp3 and b/entry/src/main/cpp/bin/voice/14_66.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/14_67.mp3 b/entry/src/main/cpp/bin/voice/14_67.mp3
index 368cc7a6..80944f2b 100644
Binary files a/entry/src/main/cpp/bin/voice/14_67.mp3 and b/entry/src/main/cpp/bin/voice/14_67.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/14_68.mp3 b/entry/src/main/cpp/bin/voice/14_68.mp3
index d6f293e9..23801f47 100644
Binary files a/entry/src/main/cpp/bin/voice/14_68.mp3 and b/entry/src/main/cpp/bin/voice/14_68.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/14_71.mp3 b/entry/src/main/cpp/bin/voice/14_71.mp3
index 322f58a8..fb434b91 100644
Binary files a/entry/src/main/cpp/bin/voice/14_71.mp3 and b/entry/src/main/cpp/bin/voice/14_71.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/14_72.mp3 b/entry/src/main/cpp/bin/voice/14_72.mp3
index 6ccef9dd..ffecaa60 100644
Binary files a/entry/src/main/cpp/bin/voice/14_72.mp3 and b/entry/src/main/cpp/bin/voice/14_72.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/14_82.mp3 b/entry/src/main/cpp/bin/voice/14_82.mp3
index b4e29972..d65397d9 100644
Binary files a/entry/src/main/cpp/bin/voice/14_82.mp3 and b/entry/src/main/cpp/bin/voice/14_82.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/14_90.mp3 b/entry/src/main/cpp/bin/voice/14_90.mp3
index 063af419..7fded128 100644
Binary files a/entry/src/main/cpp/bin/voice/14_90.mp3 and b/entry/src/main/cpp/bin/voice/14_90.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/14_91.mp3 b/entry/src/main/cpp/bin/voice/14_91.mp3
index 348c9ada..3ef72add 100644
Binary files a/entry/src/main/cpp/bin/voice/14_91.mp3 and b/entry/src/main/cpp/bin/voice/14_91.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_01.mp3 b/entry/src/main/cpp/bin/voice/15_01.mp3
index 1ed0d520..c1e3c9d3 100644
Binary files a/entry/src/main/cpp/bin/voice/15_01.mp3 and b/entry/src/main/cpp/bin/voice/15_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_02.mp3 b/entry/src/main/cpp/bin/voice/15_02.mp3
index 73463336..10cfc194 100644
Binary files a/entry/src/main/cpp/bin/voice/15_02.mp3 and b/entry/src/main/cpp/bin/voice/15_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_03.mp3 b/entry/src/main/cpp/bin/voice/15_03.mp3
index 49f2fedf..0bb6ce1c 100644
Binary files a/entry/src/main/cpp/bin/voice/15_03.mp3 and b/entry/src/main/cpp/bin/voice/15_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_04.mp3 b/entry/src/main/cpp/bin/voice/15_04.mp3
index 449ccdb2..bc788b33 100644
Binary files a/entry/src/main/cpp/bin/voice/15_04.mp3 and b/entry/src/main/cpp/bin/voice/15_04.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_05.mp3 b/entry/src/main/cpp/bin/voice/15_05.mp3
index e910c6b0..a163b08f 100644
Binary files a/entry/src/main/cpp/bin/voice/15_05.mp3 and b/entry/src/main/cpp/bin/voice/15_05.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_06.mp3 b/entry/src/main/cpp/bin/voice/15_06.mp3
index 1d6ae0f4..f560e62f 100644
Binary files a/entry/src/main/cpp/bin/voice/15_06.mp3 and b/entry/src/main/cpp/bin/voice/15_06.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_101.mp3 b/entry/src/main/cpp/bin/voice/15_101.mp3
index a25c5f31..10cfc194 100644
Binary files a/entry/src/main/cpp/bin/voice/15_101.mp3 and b/entry/src/main/cpp/bin/voice/15_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_102.mp3 b/entry/src/main/cpp/bin/voice/15_102.mp3
index 43d78b9f..f560e62f 100644
Binary files a/entry/src/main/cpp/bin/voice/15_102.mp3 and b/entry/src/main/cpp/bin/voice/15_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_103.mp3 b/entry/src/main/cpp/bin/voice/15_103.mp3
index 0cf62d91..bc788b33 100644
Binary files a/entry/src/main/cpp/bin/voice/15_103.mp3 and b/entry/src/main/cpp/bin/voice/15_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_41.mp3 b/entry/src/main/cpp/bin/voice/15_41.mp3
index ac416863..2af29fa5 100644
Binary files a/entry/src/main/cpp/bin/voice/15_41.mp3 and b/entry/src/main/cpp/bin/voice/15_41.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_42.mp3 b/entry/src/main/cpp/bin/voice/15_42.mp3
index 8b1505c5..e16c319f 100644
Binary files a/entry/src/main/cpp/bin/voice/15_42.mp3 and b/entry/src/main/cpp/bin/voice/15_42.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_43.mp3 b/entry/src/main/cpp/bin/voice/15_43.mp3
index 71b60dc1..3d0765c5 100644
Binary files a/entry/src/main/cpp/bin/voice/15_43.mp3 and b/entry/src/main/cpp/bin/voice/15_43.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_44.mp3 b/entry/src/main/cpp/bin/voice/15_44.mp3
index 6c6ee349..2be6c9d4 100644
Binary files a/entry/src/main/cpp/bin/voice/15_44.mp3 and b/entry/src/main/cpp/bin/voice/15_44.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/15_45.mp3 b/entry/src/main/cpp/bin/voice/15_45.mp3
index 2ce5d769..fd4c88d3 100644
Binary files a/entry/src/main/cpp/bin/voice/15_45.mp3 and b/entry/src/main/cpp/bin/voice/15_45.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_01.mp3 b/entry/src/main/cpp/bin/voice/16_01.mp3
index 80c144cc..c1e3c9d3 100644
Binary files a/entry/src/main/cpp/bin/voice/16_01.mp3 and b/entry/src/main/cpp/bin/voice/16_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_02.mp3 b/entry/src/main/cpp/bin/voice/16_02.mp3
index 73463336..10cfc194 100644
Binary files a/entry/src/main/cpp/bin/voice/16_02.mp3 and b/entry/src/main/cpp/bin/voice/16_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_03.mp3 b/entry/src/main/cpp/bin/voice/16_03.mp3
index e80a674a..0bb6ce1c 100644
Binary files a/entry/src/main/cpp/bin/voice/16_03.mp3 and b/entry/src/main/cpp/bin/voice/16_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_04.mp3 b/entry/src/main/cpp/bin/voice/16_04.mp3
index 449ccdb2..bc788b33 100644
Binary files a/entry/src/main/cpp/bin/voice/16_04.mp3 and b/entry/src/main/cpp/bin/voice/16_04.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_06.mp3 b/entry/src/main/cpp/bin/voice/16_06.mp3
index 1d6ae0f4..10cfc194 100644
Binary files a/entry/src/main/cpp/bin/voice/16_06.mp3 and b/entry/src/main/cpp/bin/voice/16_06.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_101.mp3 b/entry/src/main/cpp/bin/voice/16_101.mp3
index 755ff41b..10cfc194 100644
Binary files a/entry/src/main/cpp/bin/voice/16_101.mp3 and b/entry/src/main/cpp/bin/voice/16_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_102.mp3 b/entry/src/main/cpp/bin/voice/16_102.mp3
index 1d6ae0f4..f560e62f 100644
Binary files a/entry/src/main/cpp/bin/voice/16_102.mp3 and b/entry/src/main/cpp/bin/voice/16_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_103.mp3 b/entry/src/main/cpp/bin/voice/16_103.mp3
index 449ccdb2..bc788b33 100644
Binary files a/entry/src/main/cpp/bin/voice/16_103.mp3 and b/entry/src/main/cpp/bin/voice/16_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_42.mp3 b/entry/src/main/cpp/bin/voice/16_42.mp3
index 8b1505c5..e16c319f 100644
Binary files a/entry/src/main/cpp/bin/voice/16_42.mp3 and b/entry/src/main/cpp/bin/voice/16_42.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_43.mp3 b/entry/src/main/cpp/bin/voice/16_43.mp3
index 71b60dc1..3d0765c5 100644
Binary files a/entry/src/main/cpp/bin/voice/16_43.mp3 and b/entry/src/main/cpp/bin/voice/16_43.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_44.mp3 b/entry/src/main/cpp/bin/voice/16_44.mp3
index 6c6ee349..2be6c9d4 100644
Binary files a/entry/src/main/cpp/bin/voice/16_44.mp3 and b/entry/src/main/cpp/bin/voice/16_44.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/16_45.mp3 b/entry/src/main/cpp/bin/voice/16_45.mp3
index 2ce5d769..fd4c88d3 100644
Binary files a/entry/src/main/cpp/bin/voice/16_45.mp3 and b/entry/src/main/cpp/bin/voice/16_45.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/1_01.mp3 b/entry/src/main/cpp/bin/voice/1_01.mp3
index da6c373a..0fc5f7db 100644
Binary files a/entry/src/main/cpp/bin/voice/1_01.mp3 and b/entry/src/main/cpp/bin/voice/1_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/1_101.mp3 b/entry/src/main/cpp/bin/voice/1_101.mp3
index f313b579..aebe9b49 100644
Binary files a/entry/src/main/cpp/bin/voice/1_101.mp3 and b/entry/src/main/cpp/bin/voice/1_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20100.mp3 b/entry/src/main/cpp/bin/voice/20100.mp3
index bac349a9..3794d601 100644
Binary files a/entry/src/main/cpp/bin/voice/20100.mp3 and b/entry/src/main/cpp/bin/voice/20100.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20101.mp3 b/entry/src/main/cpp/bin/voice/20101.mp3
index 1da11f77..0fc16213 100644
Binary files a/entry/src/main/cpp/bin/voice/20101.mp3 and b/entry/src/main/cpp/bin/voice/20101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20102.mp3 b/entry/src/main/cpp/bin/voice/20102.mp3
index 1089e26f..6f330925 100644
Binary files a/entry/src/main/cpp/bin/voice/20102.mp3 and b/entry/src/main/cpp/bin/voice/20102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20103.mp3 b/entry/src/main/cpp/bin/voice/20103.mp3
index 819ec032..289e5b57 100644
Binary files a/entry/src/main/cpp/bin/voice/20103.mp3 and b/entry/src/main/cpp/bin/voice/20103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20104.mp3 b/entry/src/main/cpp/bin/voice/20104.mp3
index 3ab70eb5..5d4fbbbe 100644
Binary files a/entry/src/main/cpp/bin/voice/20104.mp3 and b/entry/src/main/cpp/bin/voice/20104.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20105.mp3 b/entry/src/main/cpp/bin/voice/20105.mp3
index c3673a06..27b93039 100644
Binary files a/entry/src/main/cpp/bin/voice/20105.mp3 and b/entry/src/main/cpp/bin/voice/20105.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20106.mp3 b/entry/src/main/cpp/bin/voice/20106.mp3
index a67f8e4f..3f2d2db6 100644
Binary files a/entry/src/main/cpp/bin/voice/20106.mp3 and b/entry/src/main/cpp/bin/voice/20106.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20200.mp3 b/entry/src/main/cpp/bin/voice/20200.mp3
index ad0a01b6..d71f2071 100644
Binary files a/entry/src/main/cpp/bin/voice/20200.mp3 and b/entry/src/main/cpp/bin/voice/20200.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20201.mp3 b/entry/src/main/cpp/bin/voice/20201.mp3
index 74fcb486..3d29ea13 100644
Binary files a/entry/src/main/cpp/bin/voice/20201.mp3 and b/entry/src/main/cpp/bin/voice/20201.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20202.mp3 b/entry/src/main/cpp/bin/voice/20202.mp3
index 5f0a79b9..468cea8a 100644
Binary files a/entry/src/main/cpp/bin/voice/20202.mp3 and b/entry/src/main/cpp/bin/voice/20202.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20203.mp3 b/entry/src/main/cpp/bin/voice/20203.mp3
index f0de804a..e9029ce2 100644
Binary files a/entry/src/main/cpp/bin/voice/20203.mp3 and b/entry/src/main/cpp/bin/voice/20203.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20300.mp3 b/entry/src/main/cpp/bin/voice/20300.mp3
index 756f3116..5c60d669 100644
Binary files a/entry/src/main/cpp/bin/voice/20300.mp3 and b/entry/src/main/cpp/bin/voice/20300.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20301.mp3 b/entry/src/main/cpp/bin/voice/20301.mp3
index 0aec2ae7..9f19bee0 100644
Binary files a/entry/src/main/cpp/bin/voice/20301.mp3 and b/entry/src/main/cpp/bin/voice/20301.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20302.mp3 b/entry/src/main/cpp/bin/voice/20302.mp3
index ca8c68f7..c0b0f6bd 100644
Binary files a/entry/src/main/cpp/bin/voice/20302.mp3 and b/entry/src/main/cpp/bin/voice/20302.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20303.mp3 b/entry/src/main/cpp/bin/voice/20303.mp3
index 1fb8b90c..62f98eae 100644
Binary files a/entry/src/main/cpp/bin/voice/20303.mp3 and b/entry/src/main/cpp/bin/voice/20303.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20304.mp3 b/entry/src/main/cpp/bin/voice/20304.mp3
index 1c89f74d..1bf8b620 100644
Binary files a/entry/src/main/cpp/bin/voice/20304.mp3 and b/entry/src/main/cpp/bin/voice/20304.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20305.mp3 b/entry/src/main/cpp/bin/voice/20305.mp3
index 19e06081..cebab415 100644
Binary files a/entry/src/main/cpp/bin/voice/20305.mp3 and b/entry/src/main/cpp/bin/voice/20305.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20306.mp3 b/entry/src/main/cpp/bin/voice/20306.mp3
index 1c88775f..494817d6 100644
Binary files a/entry/src/main/cpp/bin/voice/20306.mp3 and b/entry/src/main/cpp/bin/voice/20306.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20400.mp3 b/entry/src/main/cpp/bin/voice/20400.mp3
index ada9358b..9e705210 100644
Binary files a/entry/src/main/cpp/bin/voice/20400.mp3 and b/entry/src/main/cpp/bin/voice/20400.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20401.mp3 b/entry/src/main/cpp/bin/voice/20401.mp3
index 5051234c..747263fe 100644
Binary files a/entry/src/main/cpp/bin/voice/20401.mp3 and b/entry/src/main/cpp/bin/voice/20401.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20402.mp3 b/entry/src/main/cpp/bin/voice/20402.mp3
index d93aa224..5d4fbbbe 100644
Binary files a/entry/src/main/cpp/bin/voice/20402.mp3 and b/entry/src/main/cpp/bin/voice/20402.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20403.mp3 b/entry/src/main/cpp/bin/voice/20403.mp3
index 1f4f7f25..9e0b5e0b 100644
Binary files a/entry/src/main/cpp/bin/voice/20403.mp3 and b/entry/src/main/cpp/bin/voice/20403.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20404.mp3 b/entry/src/main/cpp/bin/voice/20404.mp3
index dcf5558e..abccaef0 100644
Binary files a/entry/src/main/cpp/bin/voice/20404.mp3 and b/entry/src/main/cpp/bin/voice/20404.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20405.mp3 b/entry/src/main/cpp/bin/voice/20405.mp3
index 0ff602bf..f1b6e8be 100644
Binary files a/entry/src/main/cpp/bin/voice/20405.mp3 and b/entry/src/main/cpp/bin/voice/20405.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20406.mp3 b/entry/src/main/cpp/bin/voice/20406.mp3
index d2a82042..27b93039 100644
Binary files a/entry/src/main/cpp/bin/voice/20406.mp3 and b/entry/src/main/cpp/bin/voice/20406.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20500.mp3 b/entry/src/main/cpp/bin/voice/20500.mp3
index df0c0212..c6a913ff 100644
Binary files a/entry/src/main/cpp/bin/voice/20500.mp3 and b/entry/src/main/cpp/bin/voice/20500.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20501.mp3 b/entry/src/main/cpp/bin/voice/20501.mp3
index 87f4d148..d0d7516e 100644
Binary files a/entry/src/main/cpp/bin/voice/20501.mp3 and b/entry/src/main/cpp/bin/voice/20501.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20502.mp3 b/entry/src/main/cpp/bin/voice/20502.mp3
index 8fd09636..e4366e81 100644
Binary files a/entry/src/main/cpp/bin/voice/20502.mp3 and b/entry/src/main/cpp/bin/voice/20502.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20503.mp3 b/entry/src/main/cpp/bin/voice/20503.mp3
index aefbc05c..ed4317aa 100644
Binary files a/entry/src/main/cpp/bin/voice/20503.mp3 and b/entry/src/main/cpp/bin/voice/20503.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20504.mp3 b/entry/src/main/cpp/bin/voice/20504.mp3
index d2a82042..27b93039 100644
Binary files a/entry/src/main/cpp/bin/voice/20504.mp3 and b/entry/src/main/cpp/bin/voice/20504.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20505.mp3 b/entry/src/main/cpp/bin/voice/20505.mp3
index 24369ea5..dd77786e 100644
Binary files a/entry/src/main/cpp/bin/voice/20505.mp3 and b/entry/src/main/cpp/bin/voice/20505.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20600.mp3 b/entry/src/main/cpp/bin/voice/20600.mp3
index 282e6999..b7930aea 100644
Binary files a/entry/src/main/cpp/bin/voice/20600.mp3 and b/entry/src/main/cpp/bin/voice/20600.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20601.mp3 b/entry/src/main/cpp/bin/voice/20601.mp3
index 612a0095..9b384f91 100644
Binary files a/entry/src/main/cpp/bin/voice/20601.mp3 and b/entry/src/main/cpp/bin/voice/20601.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20602.mp3 b/entry/src/main/cpp/bin/voice/20602.mp3
index d2a82042..27b93039 100644
Binary files a/entry/src/main/cpp/bin/voice/20602.mp3 and b/entry/src/main/cpp/bin/voice/20602.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20603.mp3 b/entry/src/main/cpp/bin/voice/20603.mp3
index 77c5b6b1..c3d96762 100644
Binary files a/entry/src/main/cpp/bin/voice/20603.mp3 and b/entry/src/main/cpp/bin/voice/20603.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20700.mp3 b/entry/src/main/cpp/bin/voice/20700.mp3
index caa2261a..2bc15e0e 100644
Binary files a/entry/src/main/cpp/bin/voice/20700.mp3 and b/entry/src/main/cpp/bin/voice/20700.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20701.mp3 b/entry/src/main/cpp/bin/voice/20701.mp3
index 9292f759..9b384f91 100644
Binary files a/entry/src/main/cpp/bin/voice/20701.mp3 and b/entry/src/main/cpp/bin/voice/20701.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20702.mp3 b/entry/src/main/cpp/bin/voice/20702.mp3
index f848724f..6eeced39 100644
Binary files a/entry/src/main/cpp/bin/voice/20702.mp3 and b/entry/src/main/cpp/bin/voice/20702.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20703.mp3 b/entry/src/main/cpp/bin/voice/20703.mp3
index b3d47dfb..a1caa331 100644
Binary files a/entry/src/main/cpp/bin/voice/20703.mp3 and b/entry/src/main/cpp/bin/voice/20703.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20704.mp3 b/entry/src/main/cpp/bin/voice/20704.mp3
index c3673a06..27b93039 100644
Binary files a/entry/src/main/cpp/bin/voice/20704.mp3 and b/entry/src/main/cpp/bin/voice/20704.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20800.mp3 b/entry/src/main/cpp/bin/voice/20800.mp3
index c9e83367..6d7e0591 100644
Binary files a/entry/src/main/cpp/bin/voice/20800.mp3 and b/entry/src/main/cpp/bin/voice/20800.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20801.mp3 b/entry/src/main/cpp/bin/voice/20801.mp3
index 4a0ac991..968b7b48 100644
Binary files a/entry/src/main/cpp/bin/voice/20801.mp3 and b/entry/src/main/cpp/bin/voice/20801.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20802.mp3 b/entry/src/main/cpp/bin/voice/20802.mp3
index 9db13124..bf665038 100644
Binary files a/entry/src/main/cpp/bin/voice/20802.mp3 and b/entry/src/main/cpp/bin/voice/20802.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20803.mp3 b/entry/src/main/cpp/bin/voice/20803.mp3
index 6c185092..5d4fbbbe 100644
Binary files a/entry/src/main/cpp/bin/voice/20803.mp3 and b/entry/src/main/cpp/bin/voice/20803.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20900.mp3 b/entry/src/main/cpp/bin/voice/20900.mp3
index eab23019..1c5e9a46 100644
Binary files a/entry/src/main/cpp/bin/voice/20900.mp3 and b/entry/src/main/cpp/bin/voice/20900.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20901.mp3 b/entry/src/main/cpp/bin/voice/20901.mp3
index eee97c31..932f5731 100644
Binary files a/entry/src/main/cpp/bin/voice/20901.mp3 and b/entry/src/main/cpp/bin/voice/20901.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20902.mp3 b/entry/src/main/cpp/bin/voice/20902.mp3
index 5a5ac7ac..9b384f91 100644
Binary files a/entry/src/main/cpp/bin/voice/20902.mp3 and b/entry/src/main/cpp/bin/voice/20902.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20903.mp3 b/entry/src/main/cpp/bin/voice/20903.mp3
index 743f6fb3..5d4fbbbe 100644
Binary files a/entry/src/main/cpp/bin/voice/20903.mp3 and b/entry/src/main/cpp/bin/voice/20903.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_01.mp3 b/entry/src/main/cpp/bin/voice/20_01.mp3
index e948f851..4bd948b3 100644
Binary files a/entry/src/main/cpp/bin/voice/20_01.mp3 and b/entry/src/main/cpp/bin/voice/20_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_05.mp3 b/entry/src/main/cpp/bin/voice/20_05.mp3
index 5faf4e95..c60926be 100644
Binary files a/entry/src/main/cpp/bin/voice/20_05.mp3 and b/entry/src/main/cpp/bin/voice/20_05.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_06.mp3 b/entry/src/main/cpp/bin/voice/20_06.mp3
index 887a2b3b..6ef1d9bc 100644
Binary files a/entry/src/main/cpp/bin/voice/20_06.mp3 and b/entry/src/main/cpp/bin/voice/20_06.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_101.mp3 b/entry/src/main/cpp/bin/voice/20_101.mp3
index 96228752..6148854d 100644
Binary files a/entry/src/main/cpp/bin/voice/20_101.mp3 and b/entry/src/main/cpp/bin/voice/20_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_102.mp3 b/entry/src/main/cpp/bin/voice/20_102.mp3
index 71938b65..32610bc3 100644
Binary files a/entry/src/main/cpp/bin/voice/20_102.mp3 and b/entry/src/main/cpp/bin/voice/20_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_103.mp3 b/entry/src/main/cpp/bin/voice/20_103.mp3
index 61d2d748..b23a2995 100644
Binary files a/entry/src/main/cpp/bin/voice/20_103.mp3 and b/entry/src/main/cpp/bin/voice/20_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_104.mp3 b/entry/src/main/cpp/bin/voice/20_104.mp3
index d15b2887..fa645030 100644
Binary files a/entry/src/main/cpp/bin/voice/20_104.mp3 and b/entry/src/main/cpp/bin/voice/20_104.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_105.mp3 b/entry/src/main/cpp/bin/voice/20_105.mp3
index f40b24c6..6d2d4516 100644
Binary files a/entry/src/main/cpp/bin/voice/20_105.mp3 and b/entry/src/main/cpp/bin/voice/20_105.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_106.mp3 b/entry/src/main/cpp/bin/voice/20_106.mp3
index a9a342c7..f32c870e 100644
Binary files a/entry/src/main/cpp/bin/voice/20_106.mp3 and b/entry/src/main/cpp/bin/voice/20_106.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_107.mp3 b/entry/src/main/cpp/bin/voice/20_107.mp3
index 13d10a49..0aa5aaad 100644
Binary files a/entry/src/main/cpp/bin/voice/20_107.mp3 and b/entry/src/main/cpp/bin/voice/20_107.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_108.mp3 b/entry/src/main/cpp/bin/voice/20_108.mp3
index 7bc91fe3..93935c09 100644
Binary files a/entry/src/main/cpp/bin/voice/20_108.mp3 and b/entry/src/main/cpp/bin/voice/20_108.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_109.mp3 b/entry/src/main/cpp/bin/voice/20_109.mp3
index dde37bf9..8979cf89 100644
Binary files a/entry/src/main/cpp/bin/voice/20_109.mp3 and b/entry/src/main/cpp/bin/voice/20_109.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_11.mp3 b/entry/src/main/cpp/bin/voice/20_11.mp3
index 387489ea..7b1c8d37 100644
Binary files a/entry/src/main/cpp/bin/voice/20_11.mp3 and b/entry/src/main/cpp/bin/voice/20_11.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_110.mp3 b/entry/src/main/cpp/bin/voice/20_110.mp3
index b1441e1d..7785d08c 100644
Binary files a/entry/src/main/cpp/bin/voice/20_110.mp3 and b/entry/src/main/cpp/bin/voice/20_110.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_111.mp3 b/entry/src/main/cpp/bin/voice/20_111.mp3
index 64a82b12..96686090 100644
Binary files a/entry/src/main/cpp/bin/voice/20_111.mp3 and b/entry/src/main/cpp/bin/voice/20_111.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_112.mp3 b/entry/src/main/cpp/bin/voice/20_112.mp3
index ada49b7b..2df59570 100644
Binary files a/entry/src/main/cpp/bin/voice/20_112.mp3 and b/entry/src/main/cpp/bin/voice/20_112.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_113.mp3 b/entry/src/main/cpp/bin/voice/20_113.mp3
index 1def8043..fb125883 100644
Binary files a/entry/src/main/cpp/bin/voice/20_113.mp3 and b/entry/src/main/cpp/bin/voice/20_113.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_114.mp3 b/entry/src/main/cpp/bin/voice/20_114.mp3
index d0176203..a4e899a6 100644
Binary files a/entry/src/main/cpp/bin/voice/20_114.mp3 and b/entry/src/main/cpp/bin/voice/20_114.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_115.mp3 b/entry/src/main/cpp/bin/voice/20_115.mp3
index fcfeacbd..17c95e87 100644
Binary files a/entry/src/main/cpp/bin/voice/20_115.mp3 and b/entry/src/main/cpp/bin/voice/20_115.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_116.mp3 b/entry/src/main/cpp/bin/voice/20_116.mp3
index 74c48163..c29bc6b6 100644
Binary files a/entry/src/main/cpp/bin/voice/20_116.mp3 and b/entry/src/main/cpp/bin/voice/20_116.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_117.mp3 b/entry/src/main/cpp/bin/voice/20_117.mp3
index 8c9eeea8..de647e9d 100644
Binary files a/entry/src/main/cpp/bin/voice/20_117.mp3 and b/entry/src/main/cpp/bin/voice/20_117.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_118.mp3 b/entry/src/main/cpp/bin/voice/20_118.mp3
index 34e4341d..984fad3b 100644
Binary files a/entry/src/main/cpp/bin/voice/20_118.mp3 and b/entry/src/main/cpp/bin/voice/20_118.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_119.mp3 b/entry/src/main/cpp/bin/voice/20_119.mp3
index 50bbbe2d..06f1f41f 100644
Binary files a/entry/src/main/cpp/bin/voice/20_119.mp3 and b/entry/src/main/cpp/bin/voice/20_119.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_120.mp3 b/entry/src/main/cpp/bin/voice/20_120.mp3
index 75867c34..3fe872a0 100644
Binary files a/entry/src/main/cpp/bin/voice/20_120.mp3 and b/entry/src/main/cpp/bin/voice/20_120.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_121.mp3 b/entry/src/main/cpp/bin/voice/20_121.mp3
index e10e69dc..fb70ffbe 100644
Binary files a/entry/src/main/cpp/bin/voice/20_121.mp3 and b/entry/src/main/cpp/bin/voice/20_121.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_122.mp3 b/entry/src/main/cpp/bin/voice/20_122.mp3
index 47b653fc..adbb33e0 100644
Binary files a/entry/src/main/cpp/bin/voice/20_122.mp3 and b/entry/src/main/cpp/bin/voice/20_122.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_123.mp3 b/entry/src/main/cpp/bin/voice/20_123.mp3
index 1f2445a9..877b6930 100644
Binary files a/entry/src/main/cpp/bin/voice/20_123.mp3 and b/entry/src/main/cpp/bin/voice/20_123.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_124.mp3 b/entry/src/main/cpp/bin/voice/20_124.mp3
index 896a46fe..360228f9 100644
Binary files a/entry/src/main/cpp/bin/voice/20_124.mp3 and b/entry/src/main/cpp/bin/voice/20_124.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_125.mp3 b/entry/src/main/cpp/bin/voice/20_125.mp3
index 1238190b..2843760e 100644
Binary files a/entry/src/main/cpp/bin/voice/20_125.mp3 and b/entry/src/main/cpp/bin/voice/20_125.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_126.mp3 b/entry/src/main/cpp/bin/voice/20_126.mp3
index af5bf986..e40ae4e5 100644
Binary files a/entry/src/main/cpp/bin/voice/20_126.mp3 and b/entry/src/main/cpp/bin/voice/20_126.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_127.mp3 b/entry/src/main/cpp/bin/voice/20_127.mp3
index 93979867..77bf9b00 100644
Binary files a/entry/src/main/cpp/bin/voice/20_127.mp3 and b/entry/src/main/cpp/bin/voice/20_127.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_128.mp3 b/entry/src/main/cpp/bin/voice/20_128.mp3
index 9fc9023c..a725630f 100644
Binary files a/entry/src/main/cpp/bin/voice/20_128.mp3 and b/entry/src/main/cpp/bin/voice/20_128.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_129.mp3 b/entry/src/main/cpp/bin/voice/20_129.mp3
index e948f851..4bd948b3 100644
Binary files a/entry/src/main/cpp/bin/voice/20_129.mp3 and b/entry/src/main/cpp/bin/voice/20_129.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_132.mp3 b/entry/src/main/cpp/bin/voice/20_132.mp3
index 8fd3216a..3acd94f3 100644
Binary files a/entry/src/main/cpp/bin/voice/20_132.mp3 and b/entry/src/main/cpp/bin/voice/20_132.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_15.mp3 b/entry/src/main/cpp/bin/voice/20_15.mp3
index f90dec6c..4bc5673b 100644
Binary files a/entry/src/main/cpp/bin/voice/20_15.mp3 and b/entry/src/main/cpp/bin/voice/20_15.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_35.mp3 b/entry/src/main/cpp/bin/voice/20_35.mp3
index 1238190b..61e31616 100644
Binary files a/entry/src/main/cpp/bin/voice/20_35.mp3 and b/entry/src/main/cpp/bin/voice/20_35.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_36.mp3 b/entry/src/main/cpp/bin/voice/20_36.mp3
index fbdefb0a..cce37fbd 100644
Binary files a/entry/src/main/cpp/bin/voice/20_36.mp3 and b/entry/src/main/cpp/bin/voice/20_36.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_39.mp3 b/entry/src/main/cpp/bin/voice/20_39.mp3
index 1f2445a9..877b6930 100644
Binary files a/entry/src/main/cpp/bin/voice/20_39.mp3 and b/entry/src/main/cpp/bin/voice/20_39.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_40.mp3 b/entry/src/main/cpp/bin/voice/20_40.mp3
index c3edf0ed..2ad493d0 100644
Binary files a/entry/src/main/cpp/bin/voice/20_40.mp3 and b/entry/src/main/cpp/bin/voice/20_40.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_41.mp3 b/entry/src/main/cpp/bin/voice/20_41.mp3
index 6543c733..3865f38a 100644
Binary files a/entry/src/main/cpp/bin/voice/20_41.mp3 and b/entry/src/main/cpp/bin/voice/20_41.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_42.mp3 b/entry/src/main/cpp/bin/voice/20_42.mp3
index 0aa8e9dd..2b9b374b 100644
Binary files a/entry/src/main/cpp/bin/voice/20_42.mp3 and b/entry/src/main/cpp/bin/voice/20_42.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_43.mp3 b/entry/src/main/cpp/bin/voice/20_43.mp3
index 1def8043..fb125883 100644
Binary files a/entry/src/main/cpp/bin/voice/20_43.mp3 and b/entry/src/main/cpp/bin/voice/20_43.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_44.mp3 b/entry/src/main/cpp/bin/voice/20_44.mp3
index 93979867..77bf9b00 100644
Binary files a/entry/src/main/cpp/bin/voice/20_44.mp3 and b/entry/src/main/cpp/bin/voice/20_44.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_45.mp3 b/entry/src/main/cpp/bin/voice/20_45.mp3
index 59b5808e..93935c09 100644
Binary files a/entry/src/main/cpp/bin/voice/20_45.mp3 and b/entry/src/main/cpp/bin/voice/20_45.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_46.mp3 b/entry/src/main/cpp/bin/voice/20_46.mp3
index daf3216d..863ae4ea 100644
Binary files a/entry/src/main/cpp/bin/voice/20_46.mp3 and b/entry/src/main/cpp/bin/voice/20_46.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_51.mp3 b/entry/src/main/cpp/bin/voice/20_51.mp3
index 0fb31a99..f7b68867 100644
Binary files a/entry/src/main/cpp/bin/voice/20_51.mp3 and b/entry/src/main/cpp/bin/voice/20_51.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_52.mp3 b/entry/src/main/cpp/bin/voice/20_52.mp3
index c0455dca..73ebf0a9 100644
Binary files a/entry/src/main/cpp/bin/voice/20_52.mp3 and b/entry/src/main/cpp/bin/voice/20_52.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_53.mp3 b/entry/src/main/cpp/bin/voice/20_53.mp3
index db1a5b6c..49cf381e 100644
Binary files a/entry/src/main/cpp/bin/voice/20_53.mp3 and b/entry/src/main/cpp/bin/voice/20_53.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_54.mp3 b/entry/src/main/cpp/bin/voice/20_54.mp3
index 88bf9da3..33150f69 100644
Binary files a/entry/src/main/cpp/bin/voice/20_54.mp3 and b/entry/src/main/cpp/bin/voice/20_54.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_55.mp3 b/entry/src/main/cpp/bin/voice/20_55.mp3
index cfcf5159..6fc0c95a 100644
Binary files a/entry/src/main/cpp/bin/voice/20_55.mp3 and b/entry/src/main/cpp/bin/voice/20_55.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_56.mp3 b/entry/src/main/cpp/bin/voice/20_56.mp3
index a13ad044..402e3b2e 100644
Binary files a/entry/src/main/cpp/bin/voice/20_56.mp3 and b/entry/src/main/cpp/bin/voice/20_56.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_57.mp3 b/entry/src/main/cpp/bin/voice/20_57.mp3
index a9a3a1d4..50462ba4 100644
Binary files a/entry/src/main/cpp/bin/voice/20_57.mp3 and b/entry/src/main/cpp/bin/voice/20_57.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_58.mp3 b/entry/src/main/cpp/bin/voice/20_58.mp3
index f3fe6816..ee15f3cb 100644
Binary files a/entry/src/main/cpp/bin/voice/20_58.mp3 and b/entry/src/main/cpp/bin/voice/20_58.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_59.mp3 b/entry/src/main/cpp/bin/voice/20_59.mp3
index 4a4c066b..51806aca 100644
Binary files a/entry/src/main/cpp/bin/voice/20_59.mp3 and b/entry/src/main/cpp/bin/voice/20_59.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_60.mp3 b/entry/src/main/cpp/bin/voice/20_60.mp3
index 3cbc3330..5991b1e7 100644
Binary files a/entry/src/main/cpp/bin/voice/20_60.mp3 and b/entry/src/main/cpp/bin/voice/20_60.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_61.mp3 b/entry/src/main/cpp/bin/voice/20_61.mp3
index 71938b65..32610bc3 100644
Binary files a/entry/src/main/cpp/bin/voice/20_61.mp3 and b/entry/src/main/cpp/bin/voice/20_61.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_62.mp3 b/entry/src/main/cpp/bin/voice/20_62.mp3
index fcfeacbd..17c95e87 100644
Binary files a/entry/src/main/cpp/bin/voice/20_62.mp3 and b/entry/src/main/cpp/bin/voice/20_62.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_63.mp3 b/entry/src/main/cpp/bin/voice/20_63.mp3
index 61d2d748..b23a2995 100644
Binary files a/entry/src/main/cpp/bin/voice/20_63.mp3 and b/entry/src/main/cpp/bin/voice/20_63.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_64.mp3 b/entry/src/main/cpp/bin/voice/20_64.mp3
index 74c48163..c29bc6b6 100644
Binary files a/entry/src/main/cpp/bin/voice/20_64.mp3 and b/entry/src/main/cpp/bin/voice/20_64.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_65.mp3 b/entry/src/main/cpp/bin/voice/20_65.mp3
index 70fbd794..23780acc 100644
Binary files a/entry/src/main/cpp/bin/voice/20_65.mp3 and b/entry/src/main/cpp/bin/voice/20_65.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_66.mp3 b/entry/src/main/cpp/bin/voice/20_66.mp3
index 9f9a9aec..fa645030 100644
Binary files a/entry/src/main/cpp/bin/voice/20_66.mp3 and b/entry/src/main/cpp/bin/voice/20_66.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_67.mp3 b/entry/src/main/cpp/bin/voice/20_67.mp3
index 8c9eeea8..de647e9d 100644
Binary files a/entry/src/main/cpp/bin/voice/20_67.mp3 and b/entry/src/main/cpp/bin/voice/20_67.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_70.mp3 b/entry/src/main/cpp/bin/voice/20_70.mp3
index d21876af..1d159551 100644
Binary files a/entry/src/main/cpp/bin/voice/20_70.mp3 and b/entry/src/main/cpp/bin/voice/20_70.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_73.mp3 b/entry/src/main/cpp/bin/voice/20_73.mp3
index 9a7f7322..ae898f5a 100644
Binary files a/entry/src/main/cpp/bin/voice/20_73.mp3 and b/entry/src/main/cpp/bin/voice/20_73.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_75.mp3 b/entry/src/main/cpp/bin/voice/20_75.mp3
index 8a4f0f9e..c34fa4ba 100644
Binary files a/entry/src/main/cpp/bin/voice/20_75.mp3 and b/entry/src/main/cpp/bin/voice/20_75.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_76.mp3 b/entry/src/main/cpp/bin/voice/20_76.mp3
index ada49b7b..2df59570 100644
Binary files a/entry/src/main/cpp/bin/voice/20_76.mp3 and b/entry/src/main/cpp/bin/voice/20_76.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_77.mp3 b/entry/src/main/cpp/bin/voice/20_77.mp3
index 8fd3216a..3acd94f3 100644
Binary files a/entry/src/main/cpp/bin/voice/20_77.mp3 and b/entry/src/main/cpp/bin/voice/20_77.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_78.mp3 b/entry/src/main/cpp/bin/voice/20_78.mp3
index 50bbbe2d..06f1f41f 100644
Binary files a/entry/src/main/cpp/bin/voice/20_78.mp3 and b/entry/src/main/cpp/bin/voice/20_78.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_79.mp3 b/entry/src/main/cpp/bin/voice/20_79.mp3
index 7f2fb790..2f492d41 100644
Binary files a/entry/src/main/cpp/bin/voice/20_79.mp3 and b/entry/src/main/cpp/bin/voice/20_79.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_80.mp3 b/entry/src/main/cpp/bin/voice/20_80.mp3
index 7e85f3e3..e5a9a212 100644
Binary files a/entry/src/main/cpp/bin/voice/20_80.mp3 and b/entry/src/main/cpp/bin/voice/20_80.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_81.mp3 b/entry/src/main/cpp/bin/voice/20_81.mp3
index a17cf340..c591a4d7 100644
Binary files a/entry/src/main/cpp/bin/voice/20_81.mp3 and b/entry/src/main/cpp/bin/voice/20_81.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_83.mp3 b/entry/src/main/cpp/bin/voice/20_83.mp3
index 40e897a5..20cffa01 100644
Binary files a/entry/src/main/cpp/bin/voice/20_83.mp3 and b/entry/src/main/cpp/bin/voice/20_83.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_84.mp3 b/entry/src/main/cpp/bin/voice/20_84.mp3
index 0c83c3b5..3ad75f5f 100644
Binary files a/entry/src/main/cpp/bin/voice/20_84.mp3 and b/entry/src/main/cpp/bin/voice/20_84.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_85.mp3 b/entry/src/main/cpp/bin/voice/20_85.mp3
index 6d54cc8b..060d0551 100644
Binary files a/entry/src/main/cpp/bin/voice/20_85.mp3 and b/entry/src/main/cpp/bin/voice/20_85.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_86.mp3 b/entry/src/main/cpp/bin/voice/20_86.mp3
index 1f14e430..d7ba5628 100644
Binary files a/entry/src/main/cpp/bin/voice/20_86.mp3 and b/entry/src/main/cpp/bin/voice/20_86.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_87.mp3 b/entry/src/main/cpp/bin/voice/20_87.mp3
index a1a55020..191e5033 100644
Binary files a/entry/src/main/cpp/bin/voice/20_87.mp3 and b/entry/src/main/cpp/bin/voice/20_87.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_88.mp3 b/entry/src/main/cpp/bin/voice/20_88.mp3
index 4e77d132..c6e429b6 100644
Binary files a/entry/src/main/cpp/bin/voice/20_88.mp3 and b/entry/src/main/cpp/bin/voice/20_88.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_89.mp3 b/entry/src/main/cpp/bin/voice/20_89.mp3
index a02cca94..9c65d759 100644
Binary files a/entry/src/main/cpp/bin/voice/20_89.mp3 and b/entry/src/main/cpp/bin/voice/20_89.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_90.mp3 b/entry/src/main/cpp/bin/voice/20_90.mp3
index 415bb3f7..ec7b149e 100644
Binary files a/entry/src/main/cpp/bin/voice/20_90.mp3 and b/entry/src/main/cpp/bin/voice/20_90.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_91.mp3 b/entry/src/main/cpp/bin/voice/20_91.mp3
index 73d30bc6..c69a5293 100644
Binary files a/entry/src/main/cpp/bin/voice/20_91.mp3 and b/entry/src/main/cpp/bin/voice/20_91.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_92.mp3 b/entry/src/main/cpp/bin/voice/20_92.mp3
index 8d1afca2..f416b5fd 100644
Binary files a/entry/src/main/cpp/bin/voice/20_92.mp3 and b/entry/src/main/cpp/bin/voice/20_92.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_93.mp3 b/entry/src/main/cpp/bin/voice/20_93.mp3
index 96228752..6148854d 100644
Binary files a/entry/src/main/cpp/bin/voice/20_93.mp3 and b/entry/src/main/cpp/bin/voice/20_93.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_94.mp3 b/entry/src/main/cpp/bin/voice/20_94.mp3
index cdfbf69a..0e93d67c 100644
Binary files a/entry/src/main/cpp/bin/voice/20_94.mp3 and b/entry/src/main/cpp/bin/voice/20_94.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_95.mp3 b/entry/src/main/cpp/bin/voice/20_95.mp3
index c4ed6fdb..0bfc1dd5 100644
Binary files a/entry/src/main/cpp/bin/voice/20_95.mp3 and b/entry/src/main/cpp/bin/voice/20_95.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/20_97.mp3 b/entry/src/main/cpp/bin/voice/20_97.mp3
index de16eed7..363566a3 100644
Binary files a/entry/src/main/cpp/bin/voice/20_97.mp3 and b/entry/src/main/cpp/bin/voice/20_97.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21000.mp3 b/entry/src/main/cpp/bin/voice/21000.mp3
index 649f7744..a29e204e 100644
Binary files a/entry/src/main/cpp/bin/voice/21000.mp3 and b/entry/src/main/cpp/bin/voice/21000.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21001.mp3 b/entry/src/main/cpp/bin/voice/21001.mp3
index 4c803930..cba1063a 100644
Binary files a/entry/src/main/cpp/bin/voice/21001.mp3 and b/entry/src/main/cpp/bin/voice/21001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21100.mp3 b/entry/src/main/cpp/bin/voice/21100.mp3
index 6c97b0ed..1c5e9a46 100644
Binary files a/entry/src/main/cpp/bin/voice/21100.mp3 and b/entry/src/main/cpp/bin/voice/21100.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21101.mp3 b/entry/src/main/cpp/bin/voice/21101.mp3
index c22031a3..932f5731 100644
Binary files a/entry/src/main/cpp/bin/voice/21101.mp3 and b/entry/src/main/cpp/bin/voice/21101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21102.mp3 b/entry/src/main/cpp/bin/voice/21102.mp3
index 19ad5c75..eb2bff69 100644
Binary files a/entry/src/main/cpp/bin/voice/21102.mp3 and b/entry/src/main/cpp/bin/voice/21102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21103.mp3 b/entry/src/main/cpp/bin/voice/21103.mp3
index cc205026..8b8f3c0c 100644
Binary files a/entry/src/main/cpp/bin/voice/21103.mp3 and b/entry/src/main/cpp/bin/voice/21103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21200.mp3 b/entry/src/main/cpp/bin/voice/21200.mp3
index 76b275af..2592f086 100644
Binary files a/entry/src/main/cpp/bin/voice/21200.mp3 and b/entry/src/main/cpp/bin/voice/21200.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21201.mp3 b/entry/src/main/cpp/bin/voice/21201.mp3
index 80ade923..fe6f9241 100644
Binary files a/entry/src/main/cpp/bin/voice/21201.mp3 and b/entry/src/main/cpp/bin/voice/21201.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21202.mp3 b/entry/src/main/cpp/bin/voice/21202.mp3
index e45cd82a..bae6425a 100644
Binary files a/entry/src/main/cpp/bin/voice/21202.mp3 and b/entry/src/main/cpp/bin/voice/21202.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21203.mp3 b/entry/src/main/cpp/bin/voice/21203.mp3
index 1663ea8c..b79f7580 100644
Binary files a/entry/src/main/cpp/bin/voice/21203.mp3 and b/entry/src/main/cpp/bin/voice/21203.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21300.mp3 b/entry/src/main/cpp/bin/voice/21300.mp3
index 2e093809..6daa0a75 100644
Binary files a/entry/src/main/cpp/bin/voice/21300.mp3 and b/entry/src/main/cpp/bin/voice/21300.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21301.mp3 b/entry/src/main/cpp/bin/voice/21301.mp3
index d04cc549..2c5551c5 100644
Binary files a/entry/src/main/cpp/bin/voice/21301.mp3 and b/entry/src/main/cpp/bin/voice/21301.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21302.mp3 b/entry/src/main/cpp/bin/voice/21302.mp3
index cc81cb51..fcf955a6 100644
Binary files a/entry/src/main/cpp/bin/voice/21302.mp3 and b/entry/src/main/cpp/bin/voice/21302.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21400.mp3 b/entry/src/main/cpp/bin/voice/21400.mp3
index e4bc20db..c9bd9924 100644
Binary files a/entry/src/main/cpp/bin/voice/21400.mp3 and b/entry/src/main/cpp/bin/voice/21400.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21401.mp3 b/entry/src/main/cpp/bin/voice/21401.mp3
index 0899aec9..8d456c1c 100644
Binary files a/entry/src/main/cpp/bin/voice/21401.mp3 and b/entry/src/main/cpp/bin/voice/21401.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21402.mp3 b/entry/src/main/cpp/bin/voice/21402.mp3
index 4b6789a1..ffc37627 100644
Binary files a/entry/src/main/cpp/bin/voice/21402.mp3 and b/entry/src/main/cpp/bin/voice/21402.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21403.mp3 b/entry/src/main/cpp/bin/voice/21403.mp3
index acb91370..b82d898f 100644
Binary files a/entry/src/main/cpp/bin/voice/21403.mp3 and b/entry/src/main/cpp/bin/voice/21403.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21500.mp3 b/entry/src/main/cpp/bin/voice/21500.mp3
index c0025941..c0d6f62b 100644
Binary files a/entry/src/main/cpp/bin/voice/21500.mp3 and b/entry/src/main/cpp/bin/voice/21500.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21501.mp3 b/entry/src/main/cpp/bin/voice/21501.mp3
index f3777d7e..2134581d 100644
Binary files a/entry/src/main/cpp/bin/voice/21501.mp3 and b/entry/src/main/cpp/bin/voice/21501.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21502.mp3 b/entry/src/main/cpp/bin/voice/21502.mp3
index d378716b..48c5acb7 100644
Binary files a/entry/src/main/cpp/bin/voice/21502.mp3 and b/entry/src/main/cpp/bin/voice/21502.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21600.mp3 b/entry/src/main/cpp/bin/voice/21600.mp3
index edf8ab89..4ef8c18e 100644
Binary files a/entry/src/main/cpp/bin/voice/21600.mp3 and b/entry/src/main/cpp/bin/voice/21600.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21601.mp3 b/entry/src/main/cpp/bin/voice/21601.mp3
index d4291b96..698cae89 100644
Binary files a/entry/src/main/cpp/bin/voice/21601.mp3 and b/entry/src/main/cpp/bin/voice/21601.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21604.mp3 b/entry/src/main/cpp/bin/voice/21604.mp3
index 2e151bc4..17a2c8c8 100644
Binary files a/entry/src/main/cpp/bin/voice/21604.mp3 and b/entry/src/main/cpp/bin/voice/21604.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21605.mp3 b/entry/src/main/cpp/bin/voice/21605.mp3
index a6a5c133..c4de2d47 100644
Binary files a/entry/src/main/cpp/bin/voice/21605.mp3 and b/entry/src/main/cpp/bin/voice/21605.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21700.mp3 b/entry/src/main/cpp/bin/voice/21700.mp3
index 5616909c..ca733ea2 100644
Binary files a/entry/src/main/cpp/bin/voice/21700.mp3 and b/entry/src/main/cpp/bin/voice/21700.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21701.mp3 b/entry/src/main/cpp/bin/voice/21701.mp3
index 0b10eade..a921f808 100644
Binary files a/entry/src/main/cpp/bin/voice/21701.mp3 and b/entry/src/main/cpp/bin/voice/21701.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/21702.mp3 b/entry/src/main/cpp/bin/voice/21702.mp3
index 2f225ef2..063c959c 100644
Binary files a/entry/src/main/cpp/bin/voice/21702.mp3 and b/entry/src/main/cpp/bin/voice/21702.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/23001.mp3 b/entry/src/main/cpp/bin/voice/23001.mp3
index fa307f2d..9b384f91 100644
Binary files a/entry/src/main/cpp/bin/voice/23001.mp3 and b/entry/src/main/cpp/bin/voice/23001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/23002.mp3 b/entry/src/main/cpp/bin/voice/23002.mp3
index d3d5204e..3d0eaed5 100644
Binary files a/entry/src/main/cpp/bin/voice/23002.mp3 and b/entry/src/main/cpp/bin/voice/23002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/23003.mp3 b/entry/src/main/cpp/bin/voice/23003.mp3
index 4c4fdbe0..84ba500f 100644
Binary files a/entry/src/main/cpp/bin/voice/23003.mp3 and b/entry/src/main/cpp/bin/voice/23003.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/23004.mp3 b/entry/src/main/cpp/bin/voice/23004.mp3
index 98a65373..6caf0544 100644
Binary files a/entry/src/main/cpp/bin/voice/23004.mp3 and b/entry/src/main/cpp/bin/voice/23004.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/23005.mp3 b/entry/src/main/cpp/bin/voice/23005.mp3
index 1e9afb66..b37d1953 100644
Binary files a/entry/src/main/cpp/bin/voice/23005.mp3 and b/entry/src/main/cpp/bin/voice/23005.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/23106.mp3 b/entry/src/main/cpp/bin/voice/23106.mp3
index 9fc1f2b0..8262bb68 100644
Binary files a/entry/src/main/cpp/bin/voice/23106.mp3 and b/entry/src/main/cpp/bin/voice/23106.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_01.mp3 b/entry/src/main/cpp/bin/voice/2_01.mp3
index 6a935f8f..c661c602 100644
Binary files a/entry/src/main/cpp/bin/voice/2_01.mp3 and b/entry/src/main/cpp/bin/voice/2_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_02.mp3 b/entry/src/main/cpp/bin/voice/2_02.mp3
index b6fa326a..5b2e8ae9 100644
Binary files a/entry/src/main/cpp/bin/voice/2_02.mp3 and b/entry/src/main/cpp/bin/voice/2_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_03.mp3 b/entry/src/main/cpp/bin/voice/2_03.mp3
index 8f8a0d79..f85e2a58 100644
Binary files a/entry/src/main/cpp/bin/voice/2_03.mp3 and b/entry/src/main/cpp/bin/voice/2_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_04.mp3 b/entry/src/main/cpp/bin/voice/2_04.mp3
index 1c2ee152..c60926be 100644
Binary files a/entry/src/main/cpp/bin/voice/2_04.mp3 and b/entry/src/main/cpp/bin/voice/2_04.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_05.mp3 b/entry/src/main/cpp/bin/voice/2_05.mp3
index 2167a83b..cab093d7 100644
Binary files a/entry/src/main/cpp/bin/voice/2_05.mp3 and b/entry/src/main/cpp/bin/voice/2_05.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_06.mp3 b/entry/src/main/cpp/bin/voice/2_06.mp3
index befd4423..5cf68917 100644
Binary files a/entry/src/main/cpp/bin/voice/2_06.mp3 and b/entry/src/main/cpp/bin/voice/2_06.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_07.mp3 b/entry/src/main/cpp/bin/voice/2_07.mp3
index 4db88a98..0dfe1030 100644
Binary files a/entry/src/main/cpp/bin/voice/2_07.mp3 and b/entry/src/main/cpp/bin/voice/2_07.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_08.mp3 b/entry/src/main/cpp/bin/voice/2_08.mp3
index d38f86f6..de025142 100644
Binary files a/entry/src/main/cpp/bin/voice/2_08.mp3 and b/entry/src/main/cpp/bin/voice/2_08.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_09.mp3 b/entry/src/main/cpp/bin/voice/2_09.mp3
index 136c859a..cd1b5c98 100644
Binary files a/entry/src/main/cpp/bin/voice/2_09.mp3 and b/entry/src/main/cpp/bin/voice/2_09.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_10.mp3 b/entry/src/main/cpp/bin/voice/2_10.mp3
index 9b0d99b6..66c46aba 100644
Binary files a/entry/src/main/cpp/bin/voice/2_10.mp3 and b/entry/src/main/cpp/bin/voice/2_10.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_101.mp3 b/entry/src/main/cpp/bin/voice/2_101.mp3
index 20237055..84969275 100644
Binary files a/entry/src/main/cpp/bin/voice/2_101.mp3 and b/entry/src/main/cpp/bin/voice/2_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_102.mp3 b/entry/src/main/cpp/bin/voice/2_102.mp3
index 4db88a98..0dfe1030 100644
Binary files a/entry/src/main/cpp/bin/voice/2_102.mp3 and b/entry/src/main/cpp/bin/voice/2_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_103.mp3 b/entry/src/main/cpp/bin/voice/2_103.mp3
index 8cd3a140..c6c3c445 100644
Binary files a/entry/src/main/cpp/bin/voice/2_103.mp3 and b/entry/src/main/cpp/bin/voice/2_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_105.mp3 b/entry/src/main/cpp/bin/voice/2_105.mp3
index b1feba42..f11a2c77 100644
Binary files a/entry/src/main/cpp/bin/voice/2_105.mp3 and b/entry/src/main/cpp/bin/voice/2_105.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_115.mp3 b/entry/src/main/cpp/bin/voice/2_115.mp3
index befd4423..44ab7e6d 100644
Binary files a/entry/src/main/cpp/bin/voice/2_115.mp3 and b/entry/src/main/cpp/bin/voice/2_115.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_42.mp3 b/entry/src/main/cpp/bin/voice/2_42.mp3
index 83ebd192..f68bb678 100644
Binary files a/entry/src/main/cpp/bin/voice/2_42.mp3 and b/entry/src/main/cpp/bin/voice/2_42.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_43.mp3 b/entry/src/main/cpp/bin/voice/2_43.mp3
index a76caab9..61940a72 100644
Binary files a/entry/src/main/cpp/bin/voice/2_43.mp3 and b/entry/src/main/cpp/bin/voice/2_43.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_44.mp3 b/entry/src/main/cpp/bin/voice/2_44.mp3
index dcf36b7b..f3d1ab4c 100644
Binary files a/entry/src/main/cpp/bin/voice/2_44.mp3 and b/entry/src/main/cpp/bin/voice/2_44.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_46.mp3 b/entry/src/main/cpp/bin/voice/2_46.mp3
index 1c28e3d6..733f571e 100644
Binary files a/entry/src/main/cpp/bin/voice/2_46.mp3 and b/entry/src/main/cpp/bin/voice/2_46.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_47.mp3 b/entry/src/main/cpp/bin/voice/2_47.mp3
index 7a09f8ed..f2dfa8a8 100644
Binary files a/entry/src/main/cpp/bin/voice/2_47.mp3 and b/entry/src/main/cpp/bin/voice/2_47.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_48.mp3 b/entry/src/main/cpp/bin/voice/2_48.mp3
index b1feba42..f11a2c77 100644
Binary files a/entry/src/main/cpp/bin/voice/2_48.mp3 and b/entry/src/main/cpp/bin/voice/2_48.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2_50.mp3 b/entry/src/main/cpp/bin/voice/2_50.mp3
index 8cd3a140..c6c3c445 100644
Binary files a/entry/src/main/cpp/bin/voice/2_50.mp3 and b/entry/src/main/cpp/bin/voice/2_50.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/2号线.mp3 b/entry/src/main/cpp/bin/voice/2号线.mp3
index 95f4ec50..c13bf395 100644
Binary files a/entry/src/main/cpp/bin/voice/2号线.mp3 and b/entry/src/main/cpp/bin/voice/2号线.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/300001.mp3 b/entry/src/main/cpp/bin/voice/300001.mp3
index 39544eeb..c26a32f9 100644
Binary files a/entry/src/main/cpp/bin/voice/300001.mp3 and b/entry/src/main/cpp/bin/voice/300001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/300002.mp3 b/entry/src/main/cpp/bin/voice/300002.mp3
index 39544eeb..c26a32f9 100644
Binary files a/entry/src/main/cpp/bin/voice/300002.mp3 and b/entry/src/main/cpp/bin/voice/300002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/300003.mp3 b/entry/src/main/cpp/bin/voice/300003.mp3
index 39544eeb..c26a32f9 100644
Binary files a/entry/src/main/cpp/bin/voice/300003.mp3 and b/entry/src/main/cpp/bin/voice/300003.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30101.mp3 b/entry/src/main/cpp/bin/voice/30101.mp3
index 37020bc4..4bd948b3 100644
Binary files a/entry/src/main/cpp/bin/voice/30101.mp3 and b/entry/src/main/cpp/bin/voice/30101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30102.mp3 b/entry/src/main/cpp/bin/voice/30102.mp3
index 4966db1b..191e5033 100644
Binary files a/entry/src/main/cpp/bin/voice/30102.mp3 and b/entry/src/main/cpp/bin/voice/30102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30103.mp3 b/entry/src/main/cpp/bin/voice/30103.mp3
index daf3216d..863ae4ea 100644
Binary files a/entry/src/main/cpp/bin/voice/30103.mp3 and b/entry/src/main/cpp/bin/voice/30103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30104.mp3 b/entry/src/main/cpp/bin/voice/30104.mp3
index a8b1a945..6148854d 100644
Binary files a/entry/src/main/cpp/bin/voice/30104.mp3 and b/entry/src/main/cpp/bin/voice/30104.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30105.mp3 b/entry/src/main/cpp/bin/voice/30105.mp3
index eb707a46..56203532 100644
Binary files a/entry/src/main/cpp/bin/voice/30105.mp3 and b/entry/src/main/cpp/bin/voice/30105.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30106.mp3 b/entry/src/main/cpp/bin/voice/30106.mp3
index f0b641b2..733f571e 100644
Binary files a/entry/src/main/cpp/bin/voice/30106.mp3 and b/entry/src/main/cpp/bin/voice/30106.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30107.mp3 b/entry/src/main/cpp/bin/voice/30107.mp3
index e9619f61..32610bc3 100644
Binary files a/entry/src/main/cpp/bin/voice/30107.mp3 and b/entry/src/main/cpp/bin/voice/30107.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30108.mp3 b/entry/src/main/cpp/bin/voice/30108.mp3
index 0b2e234e..7df14e46 100644
Binary files a/entry/src/main/cpp/bin/voice/30108.mp3 and b/entry/src/main/cpp/bin/voice/30108.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30109.mp3 b/entry/src/main/cpp/bin/voice/30109.mp3
index c87c29a6..3acd94f3 100644
Binary files a/entry/src/main/cpp/bin/voice/30109.mp3 and b/entry/src/main/cpp/bin/voice/30109.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30110.mp3 b/entry/src/main/cpp/bin/voice/30110.mp3
index a385c361..fa645030 100644
Binary files a/entry/src/main/cpp/bin/voice/30110.mp3 and b/entry/src/main/cpp/bin/voice/30110.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30111.mp3 b/entry/src/main/cpp/bin/voice/30111.mp3
index f7cbdc03..6d2d4516 100644
Binary files a/entry/src/main/cpp/bin/voice/30111.mp3 and b/entry/src/main/cpp/bin/voice/30111.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30112.mp3 b/entry/src/main/cpp/bin/voice/30112.mp3
index c39420f4..77996ac8 100644
Binary files a/entry/src/main/cpp/bin/voice/30112.mp3 and b/entry/src/main/cpp/bin/voice/30112.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30113.mp3 b/entry/src/main/cpp/bin/voice/30113.mp3
index e1930270..d7ba5628 100644
Binary files a/entry/src/main/cpp/bin/voice/30113.mp3 and b/entry/src/main/cpp/bin/voice/30113.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30114.mp3 b/entry/src/main/cpp/bin/voice/30114.mp3
index 5aac6110..534de92d 100644
Binary files a/entry/src/main/cpp/bin/voice/30114.mp3 and b/entry/src/main/cpp/bin/voice/30114.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30115.mp3 b/entry/src/main/cpp/bin/voice/30115.mp3
index 2d245d1d..7b1c8d37 100644
Binary files a/entry/src/main/cpp/bin/voice/30115.mp3 and b/entry/src/main/cpp/bin/voice/30115.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30116.mp3 b/entry/src/main/cpp/bin/voice/30116.mp3
index 0eec6b03..9e254d46 100644
Binary files a/entry/src/main/cpp/bin/voice/30116.mp3 and b/entry/src/main/cpp/bin/voice/30116.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30117.mp3 b/entry/src/main/cpp/bin/voice/30117.mp3
index dd7d11a3..8979cf89 100644
Binary files a/entry/src/main/cpp/bin/voice/30117.mp3 and b/entry/src/main/cpp/bin/voice/30117.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30118.mp3 b/entry/src/main/cpp/bin/voice/30118.mp3
index b052e77d..7785d08c 100644
Binary files a/entry/src/main/cpp/bin/voice/30118.mp3 and b/entry/src/main/cpp/bin/voice/30118.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30119.mp3 b/entry/src/main/cpp/bin/voice/30119.mp3
index 9fd3ce34..610dfeef 100644
Binary files a/entry/src/main/cpp/bin/voice/30119.mp3 and b/entry/src/main/cpp/bin/voice/30119.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30120.mp3 b/entry/src/main/cpp/bin/voice/30120.mp3
index 3e5147aa..60469198 100644
Binary files a/entry/src/main/cpp/bin/voice/30120.mp3 and b/entry/src/main/cpp/bin/voice/30120.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30121.mp3 b/entry/src/main/cpp/bin/voice/30121.mp3
index 0b11490e..23780acc 100644
Binary files a/entry/src/main/cpp/bin/voice/30121.mp3 and b/entry/src/main/cpp/bin/voice/30121.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30122.mp3 b/entry/src/main/cpp/bin/voice/30122.mp3
index 69676139..d40cc572 100644
Binary files a/entry/src/main/cpp/bin/voice/30122.mp3 and b/entry/src/main/cpp/bin/voice/30122.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30123.mp3 b/entry/src/main/cpp/bin/voice/30123.mp3
index 7c19964a..05264136 100644
Binary files a/entry/src/main/cpp/bin/voice/30123.mp3 and b/entry/src/main/cpp/bin/voice/30123.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30124.mp3 b/entry/src/main/cpp/bin/voice/30124.mp3
index d8a3e15f..2df59570 100644
Binary files a/entry/src/main/cpp/bin/voice/30124.mp3 and b/entry/src/main/cpp/bin/voice/30124.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30125.mp3 b/entry/src/main/cpp/bin/voice/30125.mp3
index f6dd2c9a..fb125883 100644
Binary files a/entry/src/main/cpp/bin/voice/30125.mp3 and b/entry/src/main/cpp/bin/voice/30125.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30126.mp3 b/entry/src/main/cpp/bin/voice/30126.mp3
index e0da0ae3..9c65d759 100644
Binary files a/entry/src/main/cpp/bin/voice/30126.mp3 and b/entry/src/main/cpp/bin/voice/30126.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30127.mp3 b/entry/src/main/cpp/bin/voice/30127.mp3
index af0a8f62..a4e899a6 100644
Binary files a/entry/src/main/cpp/bin/voice/30127.mp3 and b/entry/src/main/cpp/bin/voice/30127.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30128.mp3 b/entry/src/main/cpp/bin/voice/30128.mp3
index 76266e0f..17c95e87 100644
Binary files a/entry/src/main/cpp/bin/voice/30128.mp3 and b/entry/src/main/cpp/bin/voice/30128.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30129.mp3 b/entry/src/main/cpp/bin/voice/30129.mp3
index ce6e45bc..c29bc6b6 100644
Binary files a/entry/src/main/cpp/bin/voice/30129.mp3 and b/entry/src/main/cpp/bin/voice/30129.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30130.mp3 b/entry/src/main/cpp/bin/voice/30130.mp3
index ce82f9e0..fed68bd2 100644
Binary files a/entry/src/main/cpp/bin/voice/30130.mp3 and b/entry/src/main/cpp/bin/voice/30130.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30131.mp3 b/entry/src/main/cpp/bin/voice/30131.mp3
index b901e84f..984fad3b 100644
Binary files a/entry/src/main/cpp/bin/voice/30131.mp3 and b/entry/src/main/cpp/bin/voice/30131.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30132.mp3 b/entry/src/main/cpp/bin/voice/30132.mp3
index 9fac860f..06f1f41f 100644
Binary files a/entry/src/main/cpp/bin/voice/30132.mp3 and b/entry/src/main/cpp/bin/voice/30132.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30133.mp3 b/entry/src/main/cpp/bin/voice/30133.mp3
index 091b6d4e..aa55f710 100644
Binary files a/entry/src/main/cpp/bin/voice/30133.mp3 and b/entry/src/main/cpp/bin/voice/30133.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30201.mp3 b/entry/src/main/cpp/bin/voice/30201.mp3
index 56d79800..fb70ffbe 100644
Binary files a/entry/src/main/cpp/bin/voice/30201.mp3 and b/entry/src/main/cpp/bin/voice/30201.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30202.mp3 b/entry/src/main/cpp/bin/voice/30202.mp3
index 2744050a..f2dfa8a8 100644
Binary files a/entry/src/main/cpp/bin/voice/30202.mp3 and b/entry/src/main/cpp/bin/voice/30202.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30203.mp3 b/entry/src/main/cpp/bin/voice/30203.mp3
index 121ec161..adbb33e0 100644
Binary files a/entry/src/main/cpp/bin/voice/30203.mp3 and b/entry/src/main/cpp/bin/voice/30203.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30204.mp3 b/entry/src/main/cpp/bin/voice/30204.mp3
index 8f973b75..34a65356 100644
Binary files a/entry/src/main/cpp/bin/voice/30204.mp3 and b/entry/src/main/cpp/bin/voice/30204.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30205.mp3 b/entry/src/main/cpp/bin/voice/30205.mp3
index 66f4a4ac..877b6930 100644
Binary files a/entry/src/main/cpp/bin/voice/30205.mp3 and b/entry/src/main/cpp/bin/voice/30205.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30206.mp3 b/entry/src/main/cpp/bin/voice/30206.mp3
index 6c878b49..360228f9 100644
Binary files a/entry/src/main/cpp/bin/voice/30206.mp3 and b/entry/src/main/cpp/bin/voice/30206.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30207.mp3 b/entry/src/main/cpp/bin/voice/30207.mp3
index 6c3208c5..2843760e 100644
Binary files a/entry/src/main/cpp/bin/voice/30207.mp3 and b/entry/src/main/cpp/bin/voice/30207.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30208.mp3 b/entry/src/main/cpp/bin/voice/30208.mp3
index 0f032381..cce37fbd 100644
Binary files a/entry/src/main/cpp/bin/voice/30208.mp3 and b/entry/src/main/cpp/bin/voice/30208.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30209.mp3 b/entry/src/main/cpp/bin/voice/30209.mp3
index 457bf832..e40ae4e5 100644
Binary files a/entry/src/main/cpp/bin/voice/30209.mp3 and b/entry/src/main/cpp/bin/voice/30209.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30210.mp3 b/entry/src/main/cpp/bin/voice/30210.mp3
index b793c822..77bf9b00 100644
Binary files a/entry/src/main/cpp/bin/voice/30210.mp3 and b/entry/src/main/cpp/bin/voice/30210.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30211.mp3 b/entry/src/main/cpp/bin/voice/30211.mp3
index 539618c0..a725630f 100644
Binary files a/entry/src/main/cpp/bin/voice/30211.mp3 and b/entry/src/main/cpp/bin/voice/30211.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/30212.mp3 b/entry/src/main/cpp/bin/voice/30212.mp3
index 2ec09144..913b543e 100644
Binary files a/entry/src/main/cpp/bin/voice/30212.mp3 and b/entry/src/main/cpp/bin/voice/30212.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/3_01.mp3 b/entry/src/main/cpp/bin/voice/3_01.mp3
index 392c4c91..1913f775 100644
Binary files a/entry/src/main/cpp/bin/voice/3_01.mp3 and b/entry/src/main/cpp/bin/voice/3_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/3_02.mp3 b/entry/src/main/cpp/bin/voice/3_02.mp3
index d605f96f..71b1d127 100644
Binary files a/entry/src/main/cpp/bin/voice/3_02.mp3 and b/entry/src/main/cpp/bin/voice/3_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/3_03.mp3 b/entry/src/main/cpp/bin/voice/3_03.mp3
index 6b7b1c9c..db3d7a3c 100644
Binary files a/entry/src/main/cpp/bin/voice/3_03.mp3 and b/entry/src/main/cpp/bin/voice/3_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/3_04.mp3 b/entry/src/main/cpp/bin/voice/3_04.mp3
index 7cc822c6..9e059e88 100644
Binary files a/entry/src/main/cpp/bin/voice/3_04.mp3 and b/entry/src/main/cpp/bin/voice/3_04.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/3_05.mp3 b/entry/src/main/cpp/bin/voice/3_05.mp3
index 23581c2f..84a07507 100644
Binary files a/entry/src/main/cpp/bin/voice/3_05.mp3 and b/entry/src/main/cpp/bin/voice/3_05.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/3_101.mp3 b/entry/src/main/cpp/bin/voice/3_101.mp3
index d605f96f..71b1d127 100644
Binary files a/entry/src/main/cpp/bin/voice/3_101.mp3 and b/entry/src/main/cpp/bin/voice/3_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/3_102.mp3 b/entry/src/main/cpp/bin/voice/3_102.mp3
index 1c20aee2..b65b344f 100644
Binary files a/entry/src/main/cpp/bin/voice/3_102.mp3 and b/entry/src/main/cpp/bin/voice/3_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/3_103.mp3 b/entry/src/main/cpp/bin/voice/3_103.mp3
index e38d0a59..a94b26ab 100644
Binary files a/entry/src/main/cpp/bin/voice/3_103.mp3 and b/entry/src/main/cpp/bin/voice/3_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/3号线.mp3 b/entry/src/main/cpp/bin/voice/3号线.mp3
index 40298efa..976886f3 100644
Binary files a/entry/src/main/cpp/bin/voice/3号线.mp3 and b/entry/src/main/cpp/bin/voice/3号线.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/401001.mp3 b/entry/src/main/cpp/bin/voice/401001.mp3
index b183a35a..7186ad50 100644
Binary files a/entry/src/main/cpp/bin/voice/401001.mp3 and b/entry/src/main/cpp/bin/voice/401001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/401002.mp3 b/entry/src/main/cpp/bin/voice/401002.mp3
index ec92602d..117e9c84 100644
Binary files a/entry/src/main/cpp/bin/voice/401002.mp3 and b/entry/src/main/cpp/bin/voice/401002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/401003.mp3 b/entry/src/main/cpp/bin/voice/401003.mp3
index 133e3f77..5c9647df 100644
Binary files a/entry/src/main/cpp/bin/voice/401003.mp3 and b/entry/src/main/cpp/bin/voice/401003.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/401004.mp3 b/entry/src/main/cpp/bin/voice/401004.mp3
index 397d210c..9d2aa9d4 100644
Binary files a/entry/src/main/cpp/bin/voice/401004.mp3 and b/entry/src/main/cpp/bin/voice/401004.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40101.mp3 b/entry/src/main/cpp/bin/voice/40101.mp3
index 4418ff49..4d33ec25 100644
Binary files a/entry/src/main/cpp/bin/voice/40101.mp3 and b/entry/src/main/cpp/bin/voice/40101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40102.mp3 b/entry/src/main/cpp/bin/voice/40102.mp3
index 270e59fc..709960cf 100644
Binary files a/entry/src/main/cpp/bin/voice/40102.mp3 and b/entry/src/main/cpp/bin/voice/40102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/402001.mp3 b/entry/src/main/cpp/bin/voice/402001.mp3
index 4f55cbf8..1285cb23 100644
Binary files a/entry/src/main/cpp/bin/voice/402001.mp3 and b/entry/src/main/cpp/bin/voice/402001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40201.mp3 b/entry/src/main/cpp/bin/voice/40201.mp3
index 46423dbd..3b6e7312 100644
Binary files a/entry/src/main/cpp/bin/voice/40201.mp3 and b/entry/src/main/cpp/bin/voice/40201.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40202.mp3 b/entry/src/main/cpp/bin/voice/40202.mp3
index 4346e105..1598fa07 100644
Binary files a/entry/src/main/cpp/bin/voice/40202.mp3 and b/entry/src/main/cpp/bin/voice/40202.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40203.mp3 b/entry/src/main/cpp/bin/voice/40203.mp3
index 4317437a..56203532 100644
Binary files a/entry/src/main/cpp/bin/voice/40203.mp3 and b/entry/src/main/cpp/bin/voice/40203.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40204.mp3 b/entry/src/main/cpp/bin/voice/40204.mp3
index 15981ef0..b3281a00 100644
Binary files a/entry/src/main/cpp/bin/voice/40204.mp3 and b/entry/src/main/cpp/bin/voice/40204.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40205.mp3 b/entry/src/main/cpp/bin/voice/40205.mp3
index a28aaed0..86e3ed6c 100644
Binary files a/entry/src/main/cpp/bin/voice/40205.mp3 and b/entry/src/main/cpp/bin/voice/40205.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40206.mp3 b/entry/src/main/cpp/bin/voice/40206.mp3
index c24e86bd..5cf68917 100644
Binary files a/entry/src/main/cpp/bin/voice/40206.mp3 and b/entry/src/main/cpp/bin/voice/40206.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40207.mp3 b/entry/src/main/cpp/bin/voice/40207.mp3
index 55b543c3..cab093d7 100644
Binary files a/entry/src/main/cpp/bin/voice/40207.mp3 and b/entry/src/main/cpp/bin/voice/40207.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40208.mp3 b/entry/src/main/cpp/bin/voice/40208.mp3
index 86c1488a..f11a2c77 100644
Binary files a/entry/src/main/cpp/bin/voice/40208.mp3 and b/entry/src/main/cpp/bin/voice/40208.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40209.mp3 b/entry/src/main/cpp/bin/voice/40209.mp3
index b08fe37f..0dfe1030 100644
Binary files a/entry/src/main/cpp/bin/voice/40209.mp3 and b/entry/src/main/cpp/bin/voice/40209.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40210.mp3 b/entry/src/main/cpp/bin/voice/40210.mp3
index d8826a23..de025142 100644
Binary files a/entry/src/main/cpp/bin/voice/40210.mp3 and b/entry/src/main/cpp/bin/voice/40210.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40211.mp3 b/entry/src/main/cpp/bin/voice/40211.mp3
index e6bff9d3..cd1b5c98 100644
Binary files a/entry/src/main/cpp/bin/voice/40211.mp3 and b/entry/src/main/cpp/bin/voice/40211.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40212.mp3 b/entry/src/main/cpp/bin/voice/40212.mp3
index 3e54938f..c6c3c445 100644
Binary files a/entry/src/main/cpp/bin/voice/40212.mp3 and b/entry/src/main/cpp/bin/voice/40212.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40213.mp3 b/entry/src/main/cpp/bin/voice/40213.mp3
index 26402196..e65c638f 100644
Binary files a/entry/src/main/cpp/bin/voice/40213.mp3 and b/entry/src/main/cpp/bin/voice/40213.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/403001.mp3 b/entry/src/main/cpp/bin/voice/403001.mp3
index cb227a79..0aad668f 100644
Binary files a/entry/src/main/cpp/bin/voice/403001.mp3 and b/entry/src/main/cpp/bin/voice/403001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/403002.mp3 b/entry/src/main/cpp/bin/voice/403002.mp3
index ebbca421..e06c6954 100644
Binary files a/entry/src/main/cpp/bin/voice/403002.mp3 and b/entry/src/main/cpp/bin/voice/403002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40301.mp3 b/entry/src/main/cpp/bin/voice/40301.mp3
index 8c5952b5..1913f775 100644
Binary files a/entry/src/main/cpp/bin/voice/40301.mp3 and b/entry/src/main/cpp/bin/voice/40301.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40302.mp3 b/entry/src/main/cpp/bin/voice/40302.mp3
index ff446bbd..71b1d127 100644
Binary files a/entry/src/main/cpp/bin/voice/40302.mp3 and b/entry/src/main/cpp/bin/voice/40302.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40303.mp3 b/entry/src/main/cpp/bin/voice/40303.mp3
index f1e0df35..a96f0717 100644
Binary files a/entry/src/main/cpp/bin/voice/40303.mp3 and b/entry/src/main/cpp/bin/voice/40303.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40304.mp3 b/entry/src/main/cpp/bin/voice/40304.mp3
index dde63e8a..a94b26ab 100644
Binary files a/entry/src/main/cpp/bin/voice/40304.mp3 and b/entry/src/main/cpp/bin/voice/40304.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/404001.mp3 b/entry/src/main/cpp/bin/voice/404001.mp3
index 8b3bf2bd..bf3b87c5 100644
Binary files a/entry/src/main/cpp/bin/voice/404001.mp3 and b/entry/src/main/cpp/bin/voice/404001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4040021.mp3 b/entry/src/main/cpp/bin/voice/4040021.mp3
index 07e787b3..703b7b9e 100644
Binary files a/entry/src/main/cpp/bin/voice/4040021.mp3 and b/entry/src/main/cpp/bin/voice/4040021.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4040022.mp3 b/entry/src/main/cpp/bin/voice/4040022.mp3
index 9c63d8ba..d70e6473 100644
Binary files a/entry/src/main/cpp/bin/voice/4040022.mp3 and b/entry/src/main/cpp/bin/voice/4040022.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4040023.mp3 b/entry/src/main/cpp/bin/voice/4040023.mp3
index 9c60e546..1049967c 100644
Binary files a/entry/src/main/cpp/bin/voice/4040023.mp3 and b/entry/src/main/cpp/bin/voice/4040023.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4040024.mp3 b/entry/src/main/cpp/bin/voice/4040024.mp3
index 0234245f..5dd93dea 100644
Binary files a/entry/src/main/cpp/bin/voice/4040024.mp3 and b/entry/src/main/cpp/bin/voice/4040024.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4040032.mp3 b/entry/src/main/cpp/bin/voice/4040032.mp3
index 9374e9dd..c6b43b0b 100644
Binary files a/entry/src/main/cpp/bin/voice/4040032.mp3 and b/entry/src/main/cpp/bin/voice/4040032.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4040033.mp3 b/entry/src/main/cpp/bin/voice/4040033.mp3
index 9ea11dd9..36b30e7b 100644
Binary files a/entry/src/main/cpp/bin/voice/4040033.mp3 and b/entry/src/main/cpp/bin/voice/4040033.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4040034.mp3 b/entry/src/main/cpp/bin/voice/4040034.mp3
index 3ebbda56..51d2de7a 100644
Binary files a/entry/src/main/cpp/bin/voice/4040034.mp3 and b/entry/src/main/cpp/bin/voice/4040034.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4040035.mp3 b/entry/src/main/cpp/bin/voice/4040035.mp3
index e29e4c50..ba713448 100644
Binary files a/entry/src/main/cpp/bin/voice/4040035.mp3 and b/entry/src/main/cpp/bin/voice/4040035.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/404004.mp3 b/entry/src/main/cpp/bin/voice/404004.mp3
index 782b1179..9464feb3 100644
Binary files a/entry/src/main/cpp/bin/voice/404004.mp3 and b/entry/src/main/cpp/bin/voice/404004.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40401.mp3 b/entry/src/main/cpp/bin/voice/40401.mp3
index bdd1a868..b23ccb35 100644
Binary files a/entry/src/main/cpp/bin/voice/40401.mp3 and b/entry/src/main/cpp/bin/voice/40401.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40402.mp3 b/entry/src/main/cpp/bin/voice/40402.mp3
index 6df7442f..1e3e362d 100644
Binary files a/entry/src/main/cpp/bin/voice/40402.mp3 and b/entry/src/main/cpp/bin/voice/40402.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40403.mp3 b/entry/src/main/cpp/bin/voice/40403.mp3
index cba2b53b..f8041a07 100644
Binary files a/entry/src/main/cpp/bin/voice/40403.mp3 and b/entry/src/main/cpp/bin/voice/40403.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40404.mp3 b/entry/src/main/cpp/bin/voice/40404.mp3
index 1e6c73de..8147088e 100644
Binary files a/entry/src/main/cpp/bin/voice/40404.mp3 and b/entry/src/main/cpp/bin/voice/40404.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/405001.mp3 b/entry/src/main/cpp/bin/voice/405001.mp3
index 30a3f65d..98c7cc9f 100644
Binary files a/entry/src/main/cpp/bin/voice/405001.mp3 and b/entry/src/main/cpp/bin/voice/405001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/405002.mp3 b/entry/src/main/cpp/bin/voice/405002.mp3
index 4d23959b..f56b7213 100644
Binary files a/entry/src/main/cpp/bin/voice/405002.mp3 and b/entry/src/main/cpp/bin/voice/405002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/405004.mp3 b/entry/src/main/cpp/bin/voice/405004.mp3
index 7a1c53ac..39f918e1 100644
Binary files a/entry/src/main/cpp/bin/voice/405004.mp3 and b/entry/src/main/cpp/bin/voice/405004.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40501.mp3 b/entry/src/main/cpp/bin/voice/40501.mp3
index 7b94b791..38a312e0 100644
Binary files a/entry/src/main/cpp/bin/voice/40501.mp3 and b/entry/src/main/cpp/bin/voice/40501.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40503.mp3 b/entry/src/main/cpp/bin/voice/40503.mp3
index 11ce4db2..10da1c68 100644
Binary files a/entry/src/main/cpp/bin/voice/40503.mp3 and b/entry/src/main/cpp/bin/voice/40503.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/406001.mp3 b/entry/src/main/cpp/bin/voice/406001.mp3
index df373154..07853dca 100644
Binary files a/entry/src/main/cpp/bin/voice/406001.mp3 and b/entry/src/main/cpp/bin/voice/406001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/406002.mp3 b/entry/src/main/cpp/bin/voice/406002.mp3
index 4d523eb8..0e2b392c 100644
Binary files a/entry/src/main/cpp/bin/voice/406002.mp3 and b/entry/src/main/cpp/bin/voice/406002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/406003.mp3 b/entry/src/main/cpp/bin/voice/406003.mp3
index 8136ba85..1285cb23 100644
Binary files a/entry/src/main/cpp/bin/voice/406003.mp3 and b/entry/src/main/cpp/bin/voice/406003.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/406004.mp3 b/entry/src/main/cpp/bin/voice/406004.mp3
index 81e2a29d..f8e93831 100644
Binary files a/entry/src/main/cpp/bin/voice/406004.mp3 and b/entry/src/main/cpp/bin/voice/406004.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/406005.mp3 b/entry/src/main/cpp/bin/voice/406005.mp3
index 11a62080..b5d5f2b8 100644
Binary files a/entry/src/main/cpp/bin/voice/406005.mp3 and b/entry/src/main/cpp/bin/voice/406005.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40601.mp3 b/entry/src/main/cpp/bin/voice/40601.mp3
index 851ee3bf..e4ba56bf 100644
Binary files a/entry/src/main/cpp/bin/voice/40601.mp3 and b/entry/src/main/cpp/bin/voice/40601.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40602.mp3 b/entry/src/main/cpp/bin/voice/40602.mp3
index 6e48009a..0ef11136 100644
Binary files a/entry/src/main/cpp/bin/voice/40602.mp3 and b/entry/src/main/cpp/bin/voice/40602.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40603.mp3 b/entry/src/main/cpp/bin/voice/40603.mp3
index c124edca..82d69100 100644
Binary files a/entry/src/main/cpp/bin/voice/40603.mp3 and b/entry/src/main/cpp/bin/voice/40603.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40604.mp3 b/entry/src/main/cpp/bin/voice/40604.mp3
index 4d7e29b2..88a40857 100644
Binary files a/entry/src/main/cpp/bin/voice/40604.mp3 and b/entry/src/main/cpp/bin/voice/40604.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40605.mp3 b/entry/src/main/cpp/bin/voice/40605.mp3
index cc620396..cec4935f 100644
Binary files a/entry/src/main/cpp/bin/voice/40605.mp3 and b/entry/src/main/cpp/bin/voice/40605.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40606.mp3 b/entry/src/main/cpp/bin/voice/40606.mp3
index 612f7520..e84b32f5 100644
Binary files a/entry/src/main/cpp/bin/voice/40606.mp3 and b/entry/src/main/cpp/bin/voice/40606.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40607.mp3 b/entry/src/main/cpp/bin/voice/40607.mp3
index 4634e76e..3a788ea2 100644
Binary files a/entry/src/main/cpp/bin/voice/40607.mp3 and b/entry/src/main/cpp/bin/voice/40607.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40608.mp3 b/entry/src/main/cpp/bin/voice/40608.mp3
index ce223bc4..494817d6 100644
Binary files a/entry/src/main/cpp/bin/voice/40608.mp3 and b/entry/src/main/cpp/bin/voice/40608.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40609.mp3 b/entry/src/main/cpp/bin/voice/40609.mp3
index 25911637..3c3f4d89 100644
Binary files a/entry/src/main/cpp/bin/voice/40609.mp3 and b/entry/src/main/cpp/bin/voice/40609.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40610.mp3 b/entry/src/main/cpp/bin/voice/40610.mp3
index 1574d44f..422b6a69 100644
Binary files a/entry/src/main/cpp/bin/voice/40610.mp3 and b/entry/src/main/cpp/bin/voice/40610.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40611.mp3 b/entry/src/main/cpp/bin/voice/40611.mp3
index 5b125038..31f5926b 100644
Binary files a/entry/src/main/cpp/bin/voice/40611.mp3 and b/entry/src/main/cpp/bin/voice/40611.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/407001.mp3 b/entry/src/main/cpp/bin/voice/407001.mp3
index a43ed8cb..2fff48fc 100644
Binary files a/entry/src/main/cpp/bin/voice/407001.mp3 and b/entry/src/main/cpp/bin/voice/407001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40701.mp3 b/entry/src/main/cpp/bin/voice/40701.mp3
index 852156a7..c1e3c9d3 100644
Binary files a/entry/src/main/cpp/bin/voice/40701.mp3 and b/entry/src/main/cpp/bin/voice/40701.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40702.mp3 b/entry/src/main/cpp/bin/voice/40702.mp3
index 4ad13594..0bb6ce1c 100644
Binary files a/entry/src/main/cpp/bin/voice/40702.mp3 and b/entry/src/main/cpp/bin/voice/40702.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40703.mp3 b/entry/src/main/cpp/bin/voice/40703.mp3
index 8336a154..10cfc194 100644
Binary files a/entry/src/main/cpp/bin/voice/40703.mp3 and b/entry/src/main/cpp/bin/voice/40703.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40704.mp3 b/entry/src/main/cpp/bin/voice/40704.mp3
index 55571330..f560e62f 100644
Binary files a/entry/src/main/cpp/bin/voice/40704.mp3 and b/entry/src/main/cpp/bin/voice/40704.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40705.mp3 b/entry/src/main/cpp/bin/voice/40705.mp3
index 674342fa..bc788b33 100644
Binary files a/entry/src/main/cpp/bin/voice/40705.mp3 and b/entry/src/main/cpp/bin/voice/40705.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/408001.mp3 b/entry/src/main/cpp/bin/voice/408001.mp3
index 7d0e8b97..54a4878f 100644
Binary files a/entry/src/main/cpp/bin/voice/408001.mp3 and b/entry/src/main/cpp/bin/voice/408001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40801.mp3 b/entry/src/main/cpp/bin/voice/40801.mp3
index 852156a7..c1e3c9d3 100644
Binary files a/entry/src/main/cpp/bin/voice/40801.mp3 and b/entry/src/main/cpp/bin/voice/40801.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40802.mp3 b/entry/src/main/cpp/bin/voice/40802.mp3
index 7522e5db..0bb6ce1c 100644
Binary files a/entry/src/main/cpp/bin/voice/40802.mp3 and b/entry/src/main/cpp/bin/voice/40802.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40803.mp3 b/entry/src/main/cpp/bin/voice/40803.mp3
index baa0291a..10cfc194 100644
Binary files a/entry/src/main/cpp/bin/voice/40803.mp3 and b/entry/src/main/cpp/bin/voice/40803.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40804.mp3 b/entry/src/main/cpp/bin/voice/40804.mp3
index d6e38f0c..f560e62f 100644
Binary files a/entry/src/main/cpp/bin/voice/40804.mp3 and b/entry/src/main/cpp/bin/voice/40804.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40805.mp3 b/entry/src/main/cpp/bin/voice/40805.mp3
index 25e40e3f..bc788b33 100644
Binary files a/entry/src/main/cpp/bin/voice/40805.mp3 and b/entry/src/main/cpp/bin/voice/40805.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40806.mp3 b/entry/src/main/cpp/bin/voice/40806.mp3
index 2c530e71..a163b08f 100644
Binary files a/entry/src/main/cpp/bin/voice/40806.mp3 and b/entry/src/main/cpp/bin/voice/40806.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/409001.mp3 b/entry/src/main/cpp/bin/voice/409001.mp3
index 03547d5b..a8c224b1 100644
Binary files a/entry/src/main/cpp/bin/voice/409001.mp3 and b/entry/src/main/cpp/bin/voice/409001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40901.mp3 b/entry/src/main/cpp/bin/voice/40901.mp3
index 4356c4b4..c1e3c9d3 100644
Binary files a/entry/src/main/cpp/bin/voice/40901.mp3 and b/entry/src/main/cpp/bin/voice/40901.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40902.mp3 b/entry/src/main/cpp/bin/voice/40902.mp3
index ac019a1b..0bb6ce1c 100644
Binary files a/entry/src/main/cpp/bin/voice/40902.mp3 and b/entry/src/main/cpp/bin/voice/40902.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40903.mp3 b/entry/src/main/cpp/bin/voice/40903.mp3
index bb456019..10cfc194 100644
Binary files a/entry/src/main/cpp/bin/voice/40903.mp3 and b/entry/src/main/cpp/bin/voice/40903.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40904.mp3 b/entry/src/main/cpp/bin/voice/40904.mp3
index 07ff4ab5..f560e62f 100644
Binary files a/entry/src/main/cpp/bin/voice/40904.mp3 and b/entry/src/main/cpp/bin/voice/40904.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/40905.mp3 b/entry/src/main/cpp/bin/voice/40905.mp3
index c66b5221..bc788b33 100644
Binary files a/entry/src/main/cpp/bin/voice/40905.mp3 and b/entry/src/main/cpp/bin/voice/40905.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/410002.mp3 b/entry/src/main/cpp/bin/voice/410002.mp3
index 6333f2ac..37886b22 100644
Binary files a/entry/src/main/cpp/bin/voice/410002.mp3 and b/entry/src/main/cpp/bin/voice/410002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/410003.mp3 b/entry/src/main/cpp/bin/voice/410003.mp3
index 0cd039fa..a36323b1 100644
Binary files a/entry/src/main/cpp/bin/voice/410003.mp3 and b/entry/src/main/cpp/bin/voice/410003.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41001.mp3 b/entry/src/main/cpp/bin/voice/41001.mp3
index fbca135e..c1e3c9d3 100644
Binary files a/entry/src/main/cpp/bin/voice/41001.mp3 and b/entry/src/main/cpp/bin/voice/41001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41002.mp3 b/entry/src/main/cpp/bin/voice/41002.mp3
index a2261c61..c669f5e3 100644
Binary files a/entry/src/main/cpp/bin/voice/41002.mp3 and b/entry/src/main/cpp/bin/voice/41002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41003.mp3 b/entry/src/main/cpp/bin/voice/41003.mp3
index 7ed2f4ff..929a2aac 100644
Binary files a/entry/src/main/cpp/bin/voice/41003.mp3 and b/entry/src/main/cpp/bin/voice/41003.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/411002.mp3 b/entry/src/main/cpp/bin/voice/411002.mp3
index 1cdc844f..ab10dcd4 100644
Binary files a/entry/src/main/cpp/bin/voice/411002.mp3 and b/entry/src/main/cpp/bin/voice/411002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/411003.mp3 b/entry/src/main/cpp/bin/voice/411003.mp3
index 0cd039fa..a36323b1 100644
Binary files a/entry/src/main/cpp/bin/voice/411003.mp3 and b/entry/src/main/cpp/bin/voice/411003.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/411004.mp3 b/entry/src/main/cpp/bin/voice/411004.mp3
index ae5cd79e..8fd2aca1 100644
Binary files a/entry/src/main/cpp/bin/voice/411004.mp3 and b/entry/src/main/cpp/bin/voice/411004.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41101.mp3 b/entry/src/main/cpp/bin/voice/41101.mp3
index fbca135e..c1e3c9d3 100644
Binary files a/entry/src/main/cpp/bin/voice/41101.mp3 and b/entry/src/main/cpp/bin/voice/41101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41102.mp3 b/entry/src/main/cpp/bin/voice/41102.mp3
index 0449ee7e..c669f5e3 100644
Binary files a/entry/src/main/cpp/bin/voice/41102.mp3 and b/entry/src/main/cpp/bin/voice/41102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41103.mp3 b/entry/src/main/cpp/bin/voice/41103.mp3
index bae2375a..929a2aac 100644
Binary files a/entry/src/main/cpp/bin/voice/41103.mp3 and b/entry/src/main/cpp/bin/voice/41103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/412002.mp3 b/entry/src/main/cpp/bin/voice/412002.mp3
index 4463fdbd..71dbf4a0 100644
Binary files a/entry/src/main/cpp/bin/voice/412002.mp3 and b/entry/src/main/cpp/bin/voice/412002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/412003.mp3 b/entry/src/main/cpp/bin/voice/412003.mp3
index 0cd039fa..a36323b1 100644
Binary files a/entry/src/main/cpp/bin/voice/412003.mp3 and b/entry/src/main/cpp/bin/voice/412003.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41201.mp3 b/entry/src/main/cpp/bin/voice/41201.mp3
index fbca135e..c1e3c9d3 100644
Binary files a/entry/src/main/cpp/bin/voice/41201.mp3 and b/entry/src/main/cpp/bin/voice/41201.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41203.mp3 b/entry/src/main/cpp/bin/voice/41203.mp3
index f115edd8..929a2aac 100644
Binary files a/entry/src/main/cpp/bin/voice/41203.mp3 and b/entry/src/main/cpp/bin/voice/41203.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/413001.mp3 b/entry/src/main/cpp/bin/voice/413001.mp3
index 577f1903..109550e4 100644
Binary files a/entry/src/main/cpp/bin/voice/413001.mp3 and b/entry/src/main/cpp/bin/voice/413001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/413002.mp3 b/entry/src/main/cpp/bin/voice/413002.mp3
index 1293a1db..39f8b7a4 100644
Binary files a/entry/src/main/cpp/bin/voice/413002.mp3 and b/entry/src/main/cpp/bin/voice/413002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41301.mp3 b/entry/src/main/cpp/bin/voice/41301.mp3
index efab6e3d..41414c94 100644
Binary files a/entry/src/main/cpp/bin/voice/41301.mp3 and b/entry/src/main/cpp/bin/voice/41301.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41302.mp3 b/entry/src/main/cpp/bin/voice/41302.mp3
index ff5d8a64..9a8891cc 100644
Binary files a/entry/src/main/cpp/bin/voice/41302.mp3 and b/entry/src/main/cpp/bin/voice/41302.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41303.mp3 b/entry/src/main/cpp/bin/voice/41303.mp3
index 2ec055d8..f8c0acdf 100644
Binary files a/entry/src/main/cpp/bin/voice/41303.mp3 and b/entry/src/main/cpp/bin/voice/41303.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/414001.mp3 b/entry/src/main/cpp/bin/voice/414001.mp3
index 9f88650b..0082938e 100644
Binary files a/entry/src/main/cpp/bin/voice/414001.mp3 and b/entry/src/main/cpp/bin/voice/414001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/414003.mp3 b/entry/src/main/cpp/bin/voice/414003.mp3
index eb31da12..28f66733 100644
Binary files a/entry/src/main/cpp/bin/voice/414003.mp3 and b/entry/src/main/cpp/bin/voice/414003.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/414004.mp3 b/entry/src/main/cpp/bin/voice/414004.mp3
index 05e36a22..a0d198fd 100644
Binary files a/entry/src/main/cpp/bin/voice/414004.mp3 and b/entry/src/main/cpp/bin/voice/414004.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/414005.mp3 b/entry/src/main/cpp/bin/voice/414005.mp3
index c70e73dc..82073b3c 100644
Binary files a/entry/src/main/cpp/bin/voice/414005.mp3 and b/entry/src/main/cpp/bin/voice/414005.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41401.mp3 b/entry/src/main/cpp/bin/voice/41401.mp3
index 5294c430..1479d87c 100644
Binary files a/entry/src/main/cpp/bin/voice/41401.mp3 and b/entry/src/main/cpp/bin/voice/41401.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41402.mp3 b/entry/src/main/cpp/bin/voice/41402.mp3
index 243d16ea..576162ce 100644
Binary files a/entry/src/main/cpp/bin/voice/41402.mp3 and b/entry/src/main/cpp/bin/voice/41402.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41403.mp3 b/entry/src/main/cpp/bin/voice/41403.mp3
index 08364bf6..0ca02a53 100644
Binary files a/entry/src/main/cpp/bin/voice/41403.mp3 and b/entry/src/main/cpp/bin/voice/41403.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41404.mp3 b/entry/src/main/cpp/bin/voice/41404.mp3
index fae36806..23545268 100644
Binary files a/entry/src/main/cpp/bin/voice/41404.mp3 and b/entry/src/main/cpp/bin/voice/41404.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41405.mp3 b/entry/src/main/cpp/bin/voice/41405.mp3
index 6dff735f..38f4f658 100644
Binary files a/entry/src/main/cpp/bin/voice/41405.mp3 and b/entry/src/main/cpp/bin/voice/41405.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41406.mp3 b/entry/src/main/cpp/bin/voice/41406.mp3
index 0a016337..e3ddf0d1 100644
Binary files a/entry/src/main/cpp/bin/voice/41406.mp3 and b/entry/src/main/cpp/bin/voice/41406.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41407.mp3 b/entry/src/main/cpp/bin/voice/41407.mp3
index 06cd3ea8..61667052 100644
Binary files a/entry/src/main/cpp/bin/voice/41407.mp3 and b/entry/src/main/cpp/bin/voice/41407.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41408.mp3 b/entry/src/main/cpp/bin/voice/41408.mp3
index 74c7aef7..71823f26 100644
Binary files a/entry/src/main/cpp/bin/voice/41408.mp3 and b/entry/src/main/cpp/bin/voice/41408.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/415001.mp3 b/entry/src/main/cpp/bin/voice/415001.mp3
index 3cec34bc..d7586d74 100644
Binary files a/entry/src/main/cpp/bin/voice/415001.mp3 and b/entry/src/main/cpp/bin/voice/415001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41501.mp3 b/entry/src/main/cpp/bin/voice/41501.mp3
index dbd6d25e..63e11472 100644
Binary files a/entry/src/main/cpp/bin/voice/41501.mp3 and b/entry/src/main/cpp/bin/voice/41501.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41502.mp3 b/entry/src/main/cpp/bin/voice/41502.mp3
index 69b6dacc..8fa5b2ec 100644
Binary files a/entry/src/main/cpp/bin/voice/41502.mp3 and b/entry/src/main/cpp/bin/voice/41502.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41503.mp3 b/entry/src/main/cpp/bin/voice/41503.mp3
index 9a0f23f8..4bd32b5a 100644
Binary files a/entry/src/main/cpp/bin/voice/41503.mp3 and b/entry/src/main/cpp/bin/voice/41503.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41504.mp3 b/entry/src/main/cpp/bin/voice/41504.mp3
index 8f8368b6..dd6567db 100644
Binary files a/entry/src/main/cpp/bin/voice/41504.mp3 and b/entry/src/main/cpp/bin/voice/41504.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41601.mp3 b/entry/src/main/cpp/bin/voice/41601.mp3
index 8533c5db..7e13b2d6 100644
Binary files a/entry/src/main/cpp/bin/voice/41601.mp3 and b/entry/src/main/cpp/bin/voice/41601.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41602.mp3 b/entry/src/main/cpp/bin/voice/41602.mp3
index a2693b1f..01beac87 100644
Binary files a/entry/src/main/cpp/bin/voice/41602.mp3 and b/entry/src/main/cpp/bin/voice/41602.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41603.mp3 b/entry/src/main/cpp/bin/voice/41603.mp3
index 7d6d4a63..e30b8889 100644
Binary files a/entry/src/main/cpp/bin/voice/41603.mp3 and b/entry/src/main/cpp/bin/voice/41603.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41604.mp3 b/entry/src/main/cpp/bin/voice/41604.mp3
index 7fe96100..ef2e7f5e 100644
Binary files a/entry/src/main/cpp/bin/voice/41604.mp3 and b/entry/src/main/cpp/bin/voice/41604.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41605.mp3 b/entry/src/main/cpp/bin/voice/41605.mp3
index 78a52daf..0d00cddb 100644
Binary files a/entry/src/main/cpp/bin/voice/41605.mp3 and b/entry/src/main/cpp/bin/voice/41605.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41606.mp3 b/entry/src/main/cpp/bin/voice/41606.mp3
index b7aba78c..e3b84c33 100644
Binary files a/entry/src/main/cpp/bin/voice/41606.mp3 and b/entry/src/main/cpp/bin/voice/41606.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41607.mp3 b/entry/src/main/cpp/bin/voice/41607.mp3
index 2e9c0fa0..4822ee1a 100644
Binary files a/entry/src/main/cpp/bin/voice/41607.mp3 and b/entry/src/main/cpp/bin/voice/41607.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41608.mp3 b/entry/src/main/cpp/bin/voice/41608.mp3
index 1f0447db..cc8f0044 100644
Binary files a/entry/src/main/cpp/bin/voice/41608.mp3 and b/entry/src/main/cpp/bin/voice/41608.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41609.mp3 b/entry/src/main/cpp/bin/voice/41609.mp3
index a0a3113b..40d534c6 100644
Binary files a/entry/src/main/cpp/bin/voice/41609.mp3 and b/entry/src/main/cpp/bin/voice/41609.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/417000.mp3 b/entry/src/main/cpp/bin/voice/417000.mp3
index db2d41c5..7d191556 100644
Binary files a/entry/src/main/cpp/bin/voice/417000.mp3 and b/entry/src/main/cpp/bin/voice/417000.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/417001.mp3 b/entry/src/main/cpp/bin/voice/417001.mp3
index e0884262..7d191556 100644
Binary files a/entry/src/main/cpp/bin/voice/417001.mp3 and b/entry/src/main/cpp/bin/voice/417001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4170010.mp3 b/entry/src/main/cpp/bin/voice/4170010.mp3
index b2562bcc..c0d1ec6f 100644
Binary files a/entry/src/main/cpp/bin/voice/4170010.mp3 and b/entry/src/main/cpp/bin/voice/4170010.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4170011.mp3 b/entry/src/main/cpp/bin/voice/4170011.mp3
index 39e34b36..9703db9a 100644
Binary files a/entry/src/main/cpp/bin/voice/4170011.mp3 and b/entry/src/main/cpp/bin/voice/4170011.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4170012.mp3 b/entry/src/main/cpp/bin/voice/4170012.mp3
index 088b8770..1f5112b8 100644
Binary files a/entry/src/main/cpp/bin/voice/4170012.mp3 and b/entry/src/main/cpp/bin/voice/4170012.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4170013.mp3 b/entry/src/main/cpp/bin/voice/4170013.mp3
index 7d6d093f..265ea3b3 100644
Binary files a/entry/src/main/cpp/bin/voice/4170013.mp3 and b/entry/src/main/cpp/bin/voice/4170013.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4170014.mp3 b/entry/src/main/cpp/bin/voice/4170014.mp3
index cdd4e5bc..8739b731 100644
Binary files a/entry/src/main/cpp/bin/voice/4170014.mp3 and b/entry/src/main/cpp/bin/voice/4170014.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4170015.mp3 b/entry/src/main/cpp/bin/voice/4170015.mp3
index e17541e7..19d11034 100644
Binary files a/entry/src/main/cpp/bin/voice/4170015.mp3 and b/entry/src/main/cpp/bin/voice/4170015.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4170016.mp3 b/entry/src/main/cpp/bin/voice/4170016.mp3
index cac3079b..59289e3b 100644
Binary files a/entry/src/main/cpp/bin/voice/4170016.mp3 and b/entry/src/main/cpp/bin/voice/4170016.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4170018.mp3 b/entry/src/main/cpp/bin/voice/4170018.mp3
index bd42bf4a..41f4c382 100644
Binary files a/entry/src/main/cpp/bin/voice/4170018.mp3 and b/entry/src/main/cpp/bin/voice/4170018.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4170019.mp3 b/entry/src/main/cpp/bin/voice/4170019.mp3
index 9988dc75..a2142baa 100644
Binary files a/entry/src/main/cpp/bin/voice/4170019.mp3 and b/entry/src/main/cpp/bin/voice/4170019.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/417002.mp3 b/entry/src/main/cpp/bin/voice/417002.mp3
index b276cf6a..47850254 100644
Binary files a/entry/src/main/cpp/bin/voice/417002.mp3 and b/entry/src/main/cpp/bin/voice/417002.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4170020.mp3 b/entry/src/main/cpp/bin/voice/4170020.mp3
index 3a61847c..d0577297 100644
Binary files a/entry/src/main/cpp/bin/voice/4170020.mp3 and b/entry/src/main/cpp/bin/voice/4170020.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/417003.mp3 b/entry/src/main/cpp/bin/voice/417003.mp3
index 7ecbd419..2d96ee76 100644
Binary files a/entry/src/main/cpp/bin/voice/417003.mp3 and b/entry/src/main/cpp/bin/voice/417003.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/417004.mp3 b/entry/src/main/cpp/bin/voice/417004.mp3
index 75b73e2d..109550e4 100644
Binary files a/entry/src/main/cpp/bin/voice/417004.mp3 and b/entry/src/main/cpp/bin/voice/417004.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/417005.mp3 b/entry/src/main/cpp/bin/voice/417005.mp3
index 34c9eb26..0d2e6d36 100644
Binary files a/entry/src/main/cpp/bin/voice/417005.mp3 and b/entry/src/main/cpp/bin/voice/417005.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/417006.mp3 b/entry/src/main/cpp/bin/voice/417006.mp3
index 25bc70cb..c9102cfa 100644
Binary files a/entry/src/main/cpp/bin/voice/417006.mp3 and b/entry/src/main/cpp/bin/voice/417006.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/417007.mp3 b/entry/src/main/cpp/bin/voice/417007.mp3
index 4e8b4f3c..ccf0ce24 100644
Binary files a/entry/src/main/cpp/bin/voice/417007.mp3 and b/entry/src/main/cpp/bin/voice/417007.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/417008.mp3 b/entry/src/main/cpp/bin/voice/417008.mp3
index bd169612..3296ca80 100644
Binary files a/entry/src/main/cpp/bin/voice/417008.mp3 and b/entry/src/main/cpp/bin/voice/417008.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/417009.mp3 b/entry/src/main/cpp/bin/voice/417009.mp3
index 733add7f..2dda0f4f 100644
Binary files a/entry/src/main/cpp/bin/voice/417009.mp3 and b/entry/src/main/cpp/bin/voice/417009.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41701.mp3 b/entry/src/main/cpp/bin/voice/41701.mp3
index 8533c5db..7e13b2d6 100644
Binary files a/entry/src/main/cpp/bin/voice/41701.mp3 and b/entry/src/main/cpp/bin/voice/41701.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41702.mp3 b/entry/src/main/cpp/bin/voice/41702.mp3
index 8024dd1b..01beac87 100644
Binary files a/entry/src/main/cpp/bin/voice/41702.mp3 and b/entry/src/main/cpp/bin/voice/41702.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41703.mp3 b/entry/src/main/cpp/bin/voice/41703.mp3
index 7d6d4a63..e30b8889 100644
Binary files a/entry/src/main/cpp/bin/voice/41703.mp3 and b/entry/src/main/cpp/bin/voice/41703.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41704.mp3 b/entry/src/main/cpp/bin/voice/41704.mp3
index 7fe96100..ef2e7f5e 100644
Binary files a/entry/src/main/cpp/bin/voice/41704.mp3 and b/entry/src/main/cpp/bin/voice/41704.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41705.mp3 b/entry/src/main/cpp/bin/voice/41705.mp3
index 78a52daf..0d00cddb 100644
Binary files a/entry/src/main/cpp/bin/voice/41705.mp3 and b/entry/src/main/cpp/bin/voice/41705.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41706.mp3 b/entry/src/main/cpp/bin/voice/41706.mp3
index 4591be57..e3b84c33 100644
Binary files a/entry/src/main/cpp/bin/voice/41706.mp3 and b/entry/src/main/cpp/bin/voice/41706.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41707.mp3 b/entry/src/main/cpp/bin/voice/41707.mp3
index ead2837b..4822ee1a 100644
Binary files a/entry/src/main/cpp/bin/voice/41707.mp3 and b/entry/src/main/cpp/bin/voice/41707.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41708.mp3 b/entry/src/main/cpp/bin/voice/41708.mp3
index 1f0447db..cc8f0044 100644
Binary files a/entry/src/main/cpp/bin/voice/41708.mp3 and b/entry/src/main/cpp/bin/voice/41708.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41709.mp3 b/entry/src/main/cpp/bin/voice/41709.mp3
index d1ce7bd6..40d534c6 100644
Binary files a/entry/src/main/cpp/bin/voice/41709.mp3 and b/entry/src/main/cpp/bin/voice/41709.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41_01.mp3 b/entry/src/main/cpp/bin/voice/41_01.mp3
index 979ae723..7e13b2d6 100644
Binary files a/entry/src/main/cpp/bin/voice/41_01.mp3 and b/entry/src/main/cpp/bin/voice/41_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41_02.mp3 b/entry/src/main/cpp/bin/voice/41_02.mp3
index d358ffad..d8b07fe4 100644
Binary files a/entry/src/main/cpp/bin/voice/41_02.mp3 and b/entry/src/main/cpp/bin/voice/41_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41_03.mp3 b/entry/src/main/cpp/bin/voice/41_03.mp3
index b9f0706e..e30b8889 100644
Binary files a/entry/src/main/cpp/bin/voice/41_03.mp3 and b/entry/src/main/cpp/bin/voice/41_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41_05.mp3 b/entry/src/main/cpp/bin/voice/41_05.mp3
index 768dfc69..0d00cddb 100644
Binary files a/entry/src/main/cpp/bin/voice/41_05.mp3 and b/entry/src/main/cpp/bin/voice/41_05.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41_06.mp3 b/entry/src/main/cpp/bin/voice/41_06.mp3
index 30fe89a3..cc8f0044 100644
Binary files a/entry/src/main/cpp/bin/voice/41_06.mp3 and b/entry/src/main/cpp/bin/voice/41_06.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41_07.mp3 b/entry/src/main/cpp/bin/voice/41_07.mp3
index f882b611..4822ee1a 100644
Binary files a/entry/src/main/cpp/bin/voice/41_07.mp3 and b/entry/src/main/cpp/bin/voice/41_07.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41_08.mp3 b/entry/src/main/cpp/bin/voice/41_08.mp3
index 013d406b..e3b84c33 100644
Binary files a/entry/src/main/cpp/bin/voice/41_08.mp3 and b/entry/src/main/cpp/bin/voice/41_08.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41_09.mp3 b/entry/src/main/cpp/bin/voice/41_09.mp3
index 2b177088..40d534c6 100644
Binary files a/entry/src/main/cpp/bin/voice/41_09.mp3 and b/entry/src/main/cpp/bin/voice/41_09.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/41_42.mp3 b/entry/src/main/cpp/bin/voice/41_42.mp3
index a9f1ad48..ec45b9b7 100644
Binary files a/entry/src/main/cpp/bin/voice/41_42.mp3 and b/entry/src/main/cpp/bin/voice/41_42.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/456001.mp3 b/entry/src/main/cpp/bin/voice/456001.mp3
index a943917a..ccf0ce24 100644
Binary files a/entry/src/main/cpp/bin/voice/456001.mp3 and b/entry/src/main/cpp/bin/voice/456001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/458001.mp3 b/entry/src/main/cpp/bin/voice/458001.mp3
index 9fbe2008..2dda0f4f 100644
Binary files a/entry/src/main/cpp/bin/voice/458001.mp3 and b/entry/src/main/cpp/bin/voice/458001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/471001.mp3 b/entry/src/main/cpp/bin/voice/471001.mp3
index 0300b05c..847f75fc 100644
Binary files a/entry/src/main/cpp/bin/voice/471001.mp3 and b/entry/src/main/cpp/bin/voice/471001.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4_01.mp3 b/entry/src/main/cpp/bin/voice/4_01.mp3
index fb7a4c8a..38a312e0 100644
Binary files a/entry/src/main/cpp/bin/voice/4_01.mp3 and b/entry/src/main/cpp/bin/voice/4_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4_02.mp3 b/entry/src/main/cpp/bin/voice/4_02.mp3
index 774a0784..71e41430 100644
Binary files a/entry/src/main/cpp/bin/voice/4_02.mp3 and b/entry/src/main/cpp/bin/voice/4_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4_04.mp3 b/entry/src/main/cpp/bin/voice/4_04.mp3
index 67016fb8..10da1c68 100644
Binary files a/entry/src/main/cpp/bin/voice/4_04.mp3 and b/entry/src/main/cpp/bin/voice/4_04.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4_101.mp3 b/entry/src/main/cpp/bin/voice/4_101.mp3
index a8ff5cb3..081c1395 100644
Binary files a/entry/src/main/cpp/bin/voice/4_101.mp3 and b/entry/src/main/cpp/bin/voice/4_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4_102.mp3 b/entry/src/main/cpp/bin/voice/4_102.mp3
index 3c295008..71e41430 100644
Binary files a/entry/src/main/cpp/bin/voice/4_102.mp3 and b/entry/src/main/cpp/bin/voice/4_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4_103.mp3 b/entry/src/main/cpp/bin/voice/4_103.mp3
index ab5a7f21..10da1c68 100644
Binary files a/entry/src/main/cpp/bin/voice/4_103.mp3 and b/entry/src/main/cpp/bin/voice/4_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4_41.mp3 b/entry/src/main/cpp/bin/voice/4_41.mp3
index faa49c66..1fbd5232 100644
Binary files a/entry/src/main/cpp/bin/voice/4_41.mp3 and b/entry/src/main/cpp/bin/voice/4_41.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4_42.mp3 b/entry/src/main/cpp/bin/voice/4_42.mp3
index 713eb491..adfb5888 100644
Binary files a/entry/src/main/cpp/bin/voice/4_42.mp3 and b/entry/src/main/cpp/bin/voice/4_42.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4_43.mp3 b/entry/src/main/cpp/bin/voice/4_43.mp3
index 6e843761..bcc29097 100644
Binary files a/entry/src/main/cpp/bin/voice/4_43.mp3 and b/entry/src/main/cpp/bin/voice/4_43.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/4号线.mp3 b/entry/src/main/cpp/bin/voice/4号线.mp3
index 66fc2150..13c3c303 100644
Binary files a/entry/src/main/cpp/bin/voice/4号线.mp3 and b/entry/src/main/cpp/bin/voice/4号线.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_01.mp3 b/entry/src/main/cpp/bin/voice/5_01.mp3
index 769c0f75..c1e3c9d3 100644
Binary files a/entry/src/main/cpp/bin/voice/5_01.mp3 and b/entry/src/main/cpp/bin/voice/5_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_02.mp3 b/entry/src/main/cpp/bin/voice/5_02.mp3
index 1cc773c4..4cff66bc 100644
Binary files a/entry/src/main/cpp/bin/voice/5_02.mp3 and b/entry/src/main/cpp/bin/voice/5_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_03.mp3 b/entry/src/main/cpp/bin/voice/5_03.mp3
index 8e0eab9e..0bb6ce1c 100644
Binary files a/entry/src/main/cpp/bin/voice/5_03.mp3 and b/entry/src/main/cpp/bin/voice/5_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_06.mp3 b/entry/src/main/cpp/bin/voice/5_06.mp3
index 1d6ae0f4..f560e62f 100644
Binary files a/entry/src/main/cpp/bin/voice/5_06.mp3 and b/entry/src/main/cpp/bin/voice/5_06.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_101.mp3 b/entry/src/main/cpp/bin/voice/5_101.mp3
index 380517c8..9d068e61 100644
Binary files a/entry/src/main/cpp/bin/voice/5_101.mp3 and b/entry/src/main/cpp/bin/voice/5_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_102.mp3 b/entry/src/main/cpp/bin/voice/5_102.mp3
index 4d70f6a1..8a71e4db 100644
Binary files a/entry/src/main/cpp/bin/voice/5_102.mp3 and b/entry/src/main/cpp/bin/voice/5_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_103.mp3 b/entry/src/main/cpp/bin/voice/5_103.mp3
index 43d78b9f..a2567698 100644
Binary files a/entry/src/main/cpp/bin/voice/5_103.mp3 and b/entry/src/main/cpp/bin/voice/5_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_104.mp3 b/entry/src/main/cpp/bin/voice/5_104.mp3
index 0cf62d91..bc788b33 100644
Binary files a/entry/src/main/cpp/bin/voice/5_104.mp3 and b/entry/src/main/cpp/bin/voice/5_104.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_41.mp3 b/entry/src/main/cpp/bin/voice/5_41.mp3
index ac416863..2af29fa5 100644
Binary files a/entry/src/main/cpp/bin/voice/5_41.mp3 and b/entry/src/main/cpp/bin/voice/5_41.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_42.mp3 b/entry/src/main/cpp/bin/voice/5_42.mp3
index 6a9f75a5..e16c319f 100644
Binary files a/entry/src/main/cpp/bin/voice/5_42.mp3 and b/entry/src/main/cpp/bin/voice/5_42.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_43.mp3 b/entry/src/main/cpp/bin/voice/5_43.mp3
index 7dc2cc1a..3d0765c5 100644
Binary files a/entry/src/main/cpp/bin/voice/5_43.mp3 and b/entry/src/main/cpp/bin/voice/5_43.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_44.mp3 b/entry/src/main/cpp/bin/voice/5_44.mp3
index bd484dd6..2be6c9d4 100644
Binary files a/entry/src/main/cpp/bin/voice/5_44.mp3 and b/entry/src/main/cpp/bin/voice/5_44.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5_45.mp3 b/entry/src/main/cpp/bin/voice/5_45.mp3
index c99709b1..bb16ab27 100644
Binary files a/entry/src/main/cpp/bin/voice/5_45.mp3 and b/entry/src/main/cpp/bin/voice/5_45.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/5号线.mp3 b/entry/src/main/cpp/bin/voice/5号线.mp3
index c2d3cc9a..597636f5 100644
Binary files a/entry/src/main/cpp/bin/voice/5号线.mp3 and b/entry/src/main/cpp/bin/voice/5号线.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/6_01.mp3 b/entry/src/main/cpp/bin/voice/6_01.mp3
index 1cc773c4..8a71e4db 100644
Binary files a/entry/src/main/cpp/bin/voice/6_01.mp3 and b/entry/src/main/cpp/bin/voice/6_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/6_02.mp3 b/entry/src/main/cpp/bin/voice/6_02.mp3
index 6571ba94..a702188f 100644
Binary files a/entry/src/main/cpp/bin/voice/6_02.mp3 and b/entry/src/main/cpp/bin/voice/6_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/6_03.mp3 b/entry/src/main/cpp/bin/voice/6_03.mp3
index 7e4bf200..929a2aac 100644
Binary files a/entry/src/main/cpp/bin/voice/6_03.mp3 and b/entry/src/main/cpp/bin/voice/6_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/6_101.mp3 b/entry/src/main/cpp/bin/voice/6_101.mp3
index 1cc773c4..8a71e4db 100644
Binary files a/entry/src/main/cpp/bin/voice/6_101.mp3 and b/entry/src/main/cpp/bin/voice/6_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/6_102.mp3 b/entry/src/main/cpp/bin/voice/6_102.mp3
index 323f4658..929a2aac 100644
Binary files a/entry/src/main/cpp/bin/voice/6_102.mp3 and b/entry/src/main/cpp/bin/voice/6_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/7_01.mp3 b/entry/src/main/cpp/bin/voice/7_01.mp3
index 1cc773c4..8a71e4db 100644
Binary files a/entry/src/main/cpp/bin/voice/7_01.mp3 and b/entry/src/main/cpp/bin/voice/7_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/7_02.mp3 b/entry/src/main/cpp/bin/voice/7_02.mp3
index 3cb98991..a702188f 100644
Binary files a/entry/src/main/cpp/bin/voice/7_02.mp3 and b/entry/src/main/cpp/bin/voice/7_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/7_03.mp3 b/entry/src/main/cpp/bin/voice/7_03.mp3
index 7e4bf200..929a2aac 100644
Binary files a/entry/src/main/cpp/bin/voice/7_03.mp3 and b/entry/src/main/cpp/bin/voice/7_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/7_101.mp3 b/entry/src/main/cpp/bin/voice/7_101.mp3
index 1cc773c4..8a71e4db 100644
Binary files a/entry/src/main/cpp/bin/voice/7_101.mp3 and b/entry/src/main/cpp/bin/voice/7_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/7_102.mp3 b/entry/src/main/cpp/bin/voice/7_102.mp3
index 323f4658..929a2aac 100644
Binary files a/entry/src/main/cpp/bin/voice/7_102.mp3 and b/entry/src/main/cpp/bin/voice/7_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/88888.mp3 b/entry/src/main/cpp/bin/voice/88888.mp3
index fa307f2d..9b384f91 100644
Binary files a/entry/src/main/cpp/bin/voice/88888.mp3 and b/entry/src/main/cpp/bin/voice/88888.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/8_01.mp3 b/entry/src/main/cpp/bin/voice/8_01.mp3
index 1cc773c4..8a71e4db 100644
Binary files a/entry/src/main/cpp/bin/voice/8_01.mp3 and b/entry/src/main/cpp/bin/voice/8_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/8_02.mp3 b/entry/src/main/cpp/bin/voice/8_02.mp3
index 3cb98991..a702188f 100644
Binary files a/entry/src/main/cpp/bin/voice/8_02.mp3 and b/entry/src/main/cpp/bin/voice/8_02.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/8_03.mp3 b/entry/src/main/cpp/bin/voice/8_03.mp3
index 7e4bf200..929a2aac 100644
Binary files a/entry/src/main/cpp/bin/voice/8_03.mp3 and b/entry/src/main/cpp/bin/voice/8_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/8_101.mp3 b/entry/src/main/cpp/bin/voice/8_101.mp3
index 95e15918..8a71e4db 100644
Binary files a/entry/src/main/cpp/bin/voice/8_101.mp3 and b/entry/src/main/cpp/bin/voice/8_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/8_102.mp3 b/entry/src/main/cpp/bin/voice/8_102.mp3
index 7e4bf200..929a2aac 100644
Binary files a/entry/src/main/cpp/bin/voice/8_102.mp3 and b/entry/src/main/cpp/bin/voice/8_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/9_01.mp3 b/entry/src/main/cpp/bin/voice/9_01.mp3
index 967c848d..41414c94 100644
Binary files a/entry/src/main/cpp/bin/voice/9_01.mp3 and b/entry/src/main/cpp/bin/voice/9_01.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/9_03.mp3 b/entry/src/main/cpp/bin/voice/9_03.mp3
index a5eb2a8a..4956c74e 100644
Binary files a/entry/src/main/cpp/bin/voice/9_03.mp3 and b/entry/src/main/cpp/bin/voice/9_03.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/9_101.mp3 b/entry/src/main/cpp/bin/voice/9_101.mp3
index c86eac58..41414c94 100644
Binary files a/entry/src/main/cpp/bin/voice/9_101.mp3 and b/entry/src/main/cpp/bin/voice/9_101.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/9_102.mp3 b/entry/src/main/cpp/bin/voice/9_102.mp3
index 4d29f833..9a8891cc 100644
Binary files a/entry/src/main/cpp/bin/voice/9_102.mp3 and b/entry/src/main/cpp/bin/voice/9_102.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/9_103.mp3 b/entry/src/main/cpp/bin/voice/9_103.mp3
index a5eb2a8a..f8c0acdf 100644
Binary files a/entry/src/main/cpp/bin/voice/9_103.mp3 and b/entry/src/main/cpp/bin/voice/9_103.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/auth_fail.mp3 b/entry/src/main/cpp/bin/voice/auth_fail.mp3
index af7756f3..52a01939 100644
Binary files a/entry/src/main/cpp/bin/voice/auth_fail.mp3 and b/entry/src/main/cpp/bin/voice/auth_fail.mp3 differ
diff --git a/entry/src/main/cpp/bin/voice/xmhg.mp3 b/entry/src/main/cpp/bin/voice/xmhg.mp3
index bc5ce767..aca970e2 100644
Binary files a/entry/src/main/cpp/bin/voice/xmhg.mp3 and b/entry/src/main/cpp/bin/voice/xmhg.mp3 differ
diff --git a/entry/src/main/cpp/sdk/common/HVersion.h b/entry/src/main/cpp/sdk/common/HVersion.h
index 2cad944f..3af95402 100644
--- a/entry/src/main/cpp/sdk/common/HVersion.h
+++ b/entry/src/main/cpp/sdk/common/HVersion.h
@@ -27,7 +27,7 @@
 #define JUDGE_VERSION_MAJOR  1
 #define JUDGE_VERSION_MINOR  0
 #define JUDGE_VERSION_PATCH  3
-#define JUDGE_VERSION_STAMP  "2504110912b"
+#define JUDGE_VERSION_STAMP  "2504191100b"
 #if JUDGE_USE_OLD
 #   undef JUDGE_VERSION_STAMP
 #   define JUDGE_VERSION_STAMP  "2411121010b.old"
diff --git a/entry/src/main/cpp/sdk/database/HDBTable.h b/entry/src/main/cpp/sdk/database/HDBTable.h
index a6205d80..d5f189aa 100644
--- a/entry/src/main/cpp/sdk/database/HDBTable.h
+++ b/entry/src/main/cpp/sdk/database/HDBTable.h
@@ -121,6 +121,7 @@ namespace siteof
     siteof_declare(JXYTSF001);
     siteof_declare(hnzzkm3);
     siteof_declare(jswxbz);
+    siteof_declare(scms);
     siteof_declare(tcrx);  //无锡所检测地点版本特殊
 
 
@@ -245,6 +246,7 @@ namespace sound
     sound_sub3(471001);      // \sound\临时停车.wav
     sound_sub3(456001);      // \sound\通过急弯.wav
     sound_sub3(458001);      // \sound\通过拱桥.wav
+    sound_sub3(zhpp);        // \sound\综合评判.wav 请考官综合评判
 
     sound_subx(xmqx);        //项目取消
 
diff --git a/entry/src/main/cpp/sdk/database/sysset/SysSetTable.h b/entry/src/main/cpp/sdk/database/sysset/SysSetTable.h
index f13d7eb5..4ac7b2f5 100644
--- a/entry/src/main/cpp/sdk/database/sysset/SysSetTable.h
+++ b/entry/src/main/cpp/sdk/database/sysset/SysSetTable.h
@@ -148,6 +148,7 @@ class JUDGE_API SysSetTable : public IDBTable
     SYSSET_DECLARE(19, type_array, ":");             //夜间考试考试时间
     SYSSET_DECLARE(211);                             //考试地点参数
     SYSSET_DECLARE(301, type_array, "^");            //条件1:档位,车速,持续时间,结束标志(0-不结束,1红闪,2黑闪),距离,^条件2:档位,车速,持续时间,0,距离,^评判时间(0-最后评判,1-里程达到就评判)^ //示例:4,35,3,0,1,^5,50,3,0,1,^
+    SYSSET_DECLARE(302);                             //结束考试方式(0-不合格继续,1-考试不合格报靠边 2-不合格不报靠边 3-训练不合格报靠边 4-自动退出 5-不合格自动退出 6-合格自动退出  7-符合条件自动退出8^延时S秒^-不合格自动退出，合格时延时S秒再自动退出)
     SYSSET_DECLARE(303);                             //行驶距离限制(米)  //3000
     SYSSET_DECLARE(306);                             //直行键(0-直行,1-加速行驶)	//1
     SYSSET_DECLARE(307);                             //只考一次的项目 //5,15,16
@@ -160,7 +161,7 @@ class JUDGE_API SysSetTable : public IDBTable
     SYSSET_DECLARE(322);                             //模拟夜间检查灯光时机(0-考试前后 1-仅考试后 2-仅考试前) //0	扣20-93
     SYSSET_DECLARE(323);                             //模拟夜间模式（0-必考 1-未扣分补考时不考 2-不模拟 3-夜考时模拟+实际夜间灯光)   //1
     SYSSET_DECLARE(325);                             //靠边停车压线条件(0-停车压线才判;1-压线立即判) //0
-    SYSSET_DECLARE(326);                             //靠边停车后是否进入下车状态评判（0-否 1-是）  //0
+    SYSSET_DECLARE(326);                             //靠边停车后是否进入下车状态评判（0-否 1-是）2否（大车夜间拉手刹钱要打开示宽灯） //0
     SYSSET_DECLARE(329, type_array, ",");            //GPS搜索范围(大范围CM,小范围CM,)	//6000,3000,
     SYSSET_DECLARE(332);                             //不允许人工触发的项目列表，以","分隔
     SYSSET_DECLARE(333);                             //直线行驶结束是否判减速带(0-不判，1-判) 0
@@ -264,6 +265,7 @@ class JUDGE_API SysSetTable : public IDBTable
     SYSSET_DECLARE(660);                             //侧方停车项目 停车距离判断阈值控制参数
     SYSSET_DECLARE(668);                             //安全带评判模式
     SYSSET_DECLARE(671);                             //停车距离判断阈值控制参数
+    SYSSET_DECLARE(686, type_int);                   //1:倒车入库车头穿过10线读卡进项目 不配置按照0处理,686参数默认是车子在库区域内读卡
     SYSSET_DECLARE(687, type_int);                   //科二差分信号异常时持续N秒后不进行评判 单位秒
     SYSSET_DECLARE(696);                             //696	直角关灯模式	0	0：车尾出项目线（标准），1：车头出项目线结束项目，2：车后轮出项目线结束项目。3：前轮过项目线，4：车身脱离转弯后垂线
     SYSSET_DECLARE(697);                             //697	直角开灯模式	0	0：车头到直角入口，1：车头到转弯前垂线，2：车头到转弯处斜线，3：2022新标准 新标准，入口线到转弯区间内有过方向灯
@@ -292,6 +294,7 @@ class JUDGE_API SysSetTable : public IDBTable
         SYSSET_ASSIGN(19);
         SYSSET_ASSIGN(211);
         SYSSET_ASSIGN(301);
+        SYSSET_ASSIGN(302);
         SYSSET_ASSIGN(303);
         SYSSET_ASSIGN(306);
         SYSSET_ASSIGN(307);
@@ -408,6 +411,7 @@ class JUDGE_API SysSetTable : public IDBTable
         SYSSET_ASSIGN(660);
         SYSSET_ASSIGN(668);
         SYSSET_ASSIGN(671);
+        SYSSET_ASSIGN(686);
         SYSSET_ASSIGN(687);
         SYSSET_ASSIGN(696);
         SYSSET_ASSIGN(697);
diff --git a/entry/src/main/cpp/sdk/exam/ExamCarSub2.cpp b/entry/src/main/cpp/sdk/exam/ExamCarSub2.cpp
index d0213483..d79e630b 100644
--- a/entry/src/main/cpp/sdk/exam/ExamCarSub2.cpp
+++ b/entry/src/main/cpp/sdk/exam/ExamCarSub2.cpp
@@ -135,7 +135,8 @@ ErrorCode ExamCarSub2::examGoonExam()
     }
 
     //已经不合格了 如果是考试模式，只要分数不合格就立即结束考试
-    if( (isExamMode() && !isQualified()) || allItemFinish() )
+    //20250418无锡科目二考试结束的地方网络不好，存在考试结束无法上传，需要支持ykxm项目全部做完了，评判初始化、开始考试能调用成功；问过工程wins是这么操作的。
+    if( (isExamMode() && !isQualified()) /*|| allItemFinish()*/ )
     {
         //createEventExamFinish(ExamFinishAuto); //杨 20240724 都由苏那边控制
         return QE(errorBeginNotQual); //已经不合格了
@@ -347,7 +348,7 @@ void ExamCarSub2::dealJudgeExam()
     }
     if(allItemFinish())  //如果所有项目都做过了，就不用再读项目了
     {
-        logdebug("allItemFinish");
+        //logdebug("allItemFinish");
         return;
     }
 
@@ -442,11 +443,6 @@ void ExamCarSub2::dealJudgeExam()
 ISub2JudgeItem* ExamCarSub2::readEnterItem()
 {
     //必须是前进状态进项目
-    if(historyMoveState() != moveForward)
-    {
-        //logdebug("not moveForward move=%d", m_cg->move);
-        return nullptr;
-    }
 
     for(auto k = m_itemsAll.begin(); k != m_itemsAll.end(); k++)
     {
diff --git a/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp b/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp
index 9b6c359e..efa032d1 100644
--- a/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp
+++ b/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp
@@ -1045,6 +1045,14 @@ void ExamCarSub3::UpdateCarParmWithSystemParm()
         }
     };
 
+    const auto PARM_NO3_70 = [&](const TSystemparm* parm)->void
+    {
+        if(parm->TXT1 != "")
+        {
+            m_car.XiHuo = std::atoi(parm->TXT1.c_str());
+        }
+    };
+
     //得到考车参数
     int parm3Size = TableSysParm->parm3Size();
     for(int i = 0; i < parm3Size; i++)
@@ -1094,6 +1102,7 @@ void ExamCarSub3::UpdateCarParmWithSystemParm()
             PARM_CASE_WITH(61); //61:按车型设置的靠边停车参数
             PARM_CASE_WITH(62); //62:按车型设置的夜间模拟灯光触发条件
             PARM_CASE_WITH(63); //63:满分学习的学员考试必考项目（非正常的科目三学员),目前可以暂不考虑这种学员
+            PARM_CASE_WITH(70); //同500熄火参数
 
         PARM_SWITCH_END;
     }
@@ -1478,7 +1487,7 @@ bool ExamCarSub3::RTKLane()
         {
             //如果落到了当前路段的某个车道内
             const TModelPolygon& poly = road->Lanes[j];
-            if(poly.Pts.size() >= 5)  //包括圆弧 Length(TempModelPolygon.Pts)
+            if(poly.Pts.size() >= 5)  //包括圆弧
             {
                 if(GpsMath::IsPtInArcLane(b1_b, poly))
                 {
@@ -1517,7 +1526,7 @@ bool ExamCarSub3::RTKLane()
         if(a > 0) a = a - 1;
         for(int i = a; i <= b; i++) //I := a to b do
         {
-            if(i > roadSize - 1) continue;
+            if(i >= roadSize) continue;
 
             const TMapRoadRec* road = FactoryRoads->getRoad(i);
             for(int j = 0; j < road->LaneCount; j++)
@@ -1586,7 +1595,7 @@ bool ExamCarSub3::RTKLane()
     //车头中点所属车道
     for(int i = curRoadIndex; i <= curRoadIndex + 4; i++)
     {
-        if(i > roadSize - 1) break;
+        if(i >= roadSize) break;
 
         const TMapRoadRec* road = FactoryRoads->getRoad(i);
         const Pointi& pt = m_cg->body.points_b[II(1)]; //CarStatus.Body_24_RealTimePt[0];
@@ -1957,121 +1966,103 @@ void ExamCarSub3::Calc_LaneDistance()
 
     //Kind:1: 车身左1（上）  2：车身右1（上）  3：车身左2（下）  4：车身右2（下）
     ExamCarType cartype = carType();
-    int LeftFront = GetCarBodyPointNo(cartype, 1);
-    int LeftBack = GetCarBodyPointNo(cartype, 3);
-    int RightFront = GetCarBodyPointNo(cartype, 2);
-    int RightBack = GetCarBodyPointNo(cartype, 4);
+    int LF_I = GetCarBodyPointNo(cartype, BODY_LF);
+    int LB_I = GetCarBodyPointNo(cartype, BODY_LB);
+    int RF_I = GetCarBodyPointNo(cartype, BODY_RF);
+    int RB_I = GetCarBodyPointNo(cartype, BODY_RB);
 
-    if(LeftFront == -1 || LeftBack == -1 || RightFront == -1 || RightBack == -1)
-    {
-        logerror("cartype=%d,LeftFront=%d, LeftBack=%d, RightFront=%d, RightBack=%d",
-                 cartype, LeftFront, LeftBack, RightFront, RightBack);
-        return;
-    }
+    TASSERT_VOID(LF_I >= 0 && LB_I >= 0 && RF_I >= 0 && RB_I >= 0,
+                 "cartype=%d, LF_I=%d, LB_I=%d, RF_I=%d, RB_I=%d", cartype, LF_I, LB_I, RF_I, RB_I);
 
     int curRoadIndex = RTKKM3.MapRoadIndex;
     //int curLaneIndex = RTKKM3.LaneIndex;
     int roadSize = FactoryRoads->size();
     const TCarBody& body = m_cg->body;
-    TModelLine line;
     //判断车轮离本车道右边线距离1(左 1，左2，右1，右2）
     //P-->1、车轮与本车道右侧距离  2：车轮与最右侧车道右侧距离  3：车身左侧与本车道左侧距离 4：车身右侧与本车道右侧距离
     const TMeshDefine* curMesh = FactoryMesh->getMesh(m_meshIndex);
     TASSERT_VOID(curMesh != nullptr, "");
+    //logdebug("mesh=%d,roadSize=%d, RoadIndex=%d,LaneIndex=%d",m_meshIndex,roadSize,curRoadIndex,RTKKM3.LaneIndex);
 
     const TModelLine* laneDriving = nullptr;
-    for(int p = 1; p <= 4; p++)
+    for(int i = curRoadIndex - 2; i <= curRoadIndex + 2; i++)
     {
-        for(int i = curRoadIndex - 2; i <= curRoadIndex + 2; i++)
+        //1、不能大于数组的最大下标
+        if(i < 0) continue;
+        if(i >= roadSize) break;
+        //2、检查当前的路段是否在可视区域
+        if(!curMesh->has(i)) continue;
+
+        const TMapRoadRec* road = FactoryRoads->getRoad(i);
+        int endof = road->LaneCount - 1;
+        //if(p == 2)  //车轮与最右侧车道右侧距离
+        //{
+        //    endof = 0;
+        //}
+
+        //const TModelLine& L0 = road->BorderLines[0];
+        for(int j = 0; j <= endof; j++)
         {
-            //1、不能大于数组的最大下标
-            if(i < 0) continue;
-            if(i > roadSize - 1) break;
-            //2、检查当前的路段是否在可视区域
-            bool findFlag = false;
-            for(int f = 0; f < curMesh->MapRoadKeyLen; f++)
-            {
-                if(curMesh->MapRoad_Keys[f] == i)
-                {
-                    findFlag = true;
-                    break;
-                }
-            }
-            if(!findFlag) continue;
+            const TModelLine& Lj = road->BorderLines[j];
+            const TModelLine& Lj1 = road->BorderLines[j + 1];
+            const TModelPolygon& poly = road->Lanes[j];
 
-            const TMapRoadRec* road = FactoryRoads->getRoad(i);
-            int endof = road->LaneCount - 1;
-            if(p == 2)  //车轮与最右侧车道右侧距离
+            if(poly.Pts.size() >= 5)  //圆弧路段
             {
-                endof = 0;
-            }
-            const TModelLine& L0 = road->BorderLines[0];
-            for(int j = 0; j <= endof; j++)
-            {
-                const TModelLine& Lj = road->BorderLines[j];
-                const TModelLine& Lj1 = road->BorderLines[j + 1];
-                const TModelPolygon& poly = road->Lanes[j];
+                //if(p == 1)  //1、车轮与本车道右侧距离
+                laneDriving = &road->BorderLines[0];
+                calcToLaneArc(Lj, poly, body.b1_b, body.ZQ_W_b, RTKKM3.Wheel_LF_ToRightEdge);
+                calcToLaneArc(Lj, poly, body.b1_b, body.YQ_W_b, RTKKM3.Wheel_RF_ToRightEdge);
+                calcToLaneArc(Lj, poly, body.b1_b, body.ZH_W_b, RTKKM3.Wheel_LB_ToRightEdge);
+                calcToLaneArc(Lj, poly, body.b1_b, body.YH_W_b, RTKKM3.Wheel_RB_ToRightEdge);
 
-                if(poly.Pts.size() >= 5)  //圆弧路段
+                //else if(p == 2) //2：车轮与最右侧车道右侧距离
+                if(j == 0) //j等于0,说明Lj就是最右侧车道,L0 = Lj
                 {
-                    if(p == 1)  //1、车轮与本车道右侧距离
-                    {
-                        laneDriving = &road->BorderLines[0];
-                        calcToDistanceArc(Lj, poly, body.b1_b, body.ZQ_W_b, RTKKM3.Wheel_LF_ToRightEdge);
-                        calcToDistanceArc(Lj, poly, body.b1_b, body.YQ_W_b, RTKKM3.Wheel_RF_ToRightEdge);
-                        calcToDistanceArc(Lj, poly, body.b1_b, body.ZH_W_b, RTKKM3.Wheel_LB_ToRightEdge);
-                        calcToDistanceArc(Lj, poly, body.b1_b, body.YH_W_b, RTKKM3.Wheel_RB_ToRightEdge);
-                    }
-                    else if(p == 2) //2：车轮与最右侧车道右侧距离
-                    {
-                        calcToDistanceArc2(L0, road->Area, body.b1_b, body.ZQ_W_b, RTKKM3.Wheel_LF_ToBaseLine);
-                        calcToDistanceArc2(L0, road->Area, body.b1_b, body.YQ_W_b, RTKKM3.Wheel_RF_ToBaseLine);
-                        calcToDistanceArc2(L0, road->Area, body.b1_b, body.ZH_W_b, RTKKM3.Wheel_LB_ToBaseLine);
-                        calcToDistanceArc2(L0, road->Area, body.b1_b, body.YH_W_b, RTKKM3.Wheel_RB_ToBaseLine);
-                        calcToDistanceArc2(L0, road->Area, body.b1_b, body.points_b[RightFront], RTKKM3.Body_RF_ToBaseLine); //20240801
-                        calcToDistanceArc2(L0, road->Area, body.b1_b, body.points_b[RightBack],  RTKKM3.Body_RB_ToBaseLine); //20240801
-                    }
-                    else if(p == 3)  //3：车身左侧与本车道左侧距离
-                    {
-                        calcToDistanceArc(Lj1, poly, body.b1_b, body.points_b[LeftFront], RTKKM3.Body_LF_ToLeftEdge);
-                        calcToDistanceArc(Lj1, poly, body.b1_b, body.points_b[LeftBack],  RTKKM3.Body_LB_ToLeftEdge);
-                    }
-                    else if(p == 4)  //4：车身右侧与本车道右侧距离
-                    {
-                        calcToDistanceArc(Lj, poly, body.b1_b, body.points_b[RightFront],  RTKKM3.Body_RF_ToRightEdge);
-                        calcToDistanceArc(Lj, poly, body.b1_b, body.points_b[RightFront],  RTKKM3.Body_RB_ToRightEdge);
-                    }
+                    calcToLaneArc2(Lj, road->Area, body.b1_b, body.ZQ_W_b, RTKKM3.Wheel_LF_ToBaseLine);
+                    calcToLaneArc2(Lj, road->Area, body.b1_b, body.YQ_W_b, RTKKM3.Wheel_RF_ToBaseLine);
+                    calcToLaneArc2(Lj, road->Area, body.b1_b, body.ZH_W_b, RTKKM3.Wheel_LB_ToBaseLine);
+                    calcToLaneArc2(Lj, road->Area, body.b1_b, body.YH_W_b, RTKKM3.Wheel_RB_ToBaseLine);
+                    calcToLaneArc2(Lj, road->Area, body.b1_b, body.b(RF_I), RTKKM3.Body_RF_ToBaseLine); //20240801
+                    calcToLaneArc2(Lj, road->Area, body.b1_b, body.b(RB_I), RTKKM3.Body_RB_ToBaseLine); //20240801
                 }
-                else
+
+                //else if(p == 3)  //3：车身左侧与本车道左侧距离
+                calcToLaneArc(Lj1, poly, body.b1_b, body.b(LF_I), RTKKM3.Body_LF_ToLeftEdge);
+                calcToLaneArc(Lj1, poly, body.b1_b, body.b(LB_I), RTKKM3.Body_LB_ToLeftEdge);
+
+                //else if(p == 4)  //4：车身右侧与本车道右侧距离
+                calcToLaneArc(Lj, poly, body.b1_b, body.b(RF_I), RTKKM3.Body_RF_ToRightEdge);
+                calcToLaneArc(Lj, poly, body.b1_b, body.b(RB_I), RTKKM3.Body_RB_ToRightEdge);
+            }
+            else
+            {
+                //if(p == 1)  //1、车轮与本车道右侧距离
+                laneDriving = &road->BorderLines[0];
+                calcToLaneLine(Lj, poly.Pts, body.b1_b, body.ZQ_W_b, RTKKM3.Wheel_LF_ToRightEdge);
+                calcToLaneLine(Lj, poly.Pts, body.b1_b, body.YQ_W_b, RTKKM3.Wheel_RF_ToRightEdge);
+                calcToLaneLine(Lj, poly.Pts, body.b1_b, body.ZH_W_b, RTKKM3.Wheel_LB_ToRightEdge);
+                calcToLaneLine(Lj, poly.Pts, body.b1_b, body.YH_W_b, RTKKM3.Wheel_RB_ToRightEdge);
+
+                //else if(p == 2)  //2：车轮与最右侧车道右侧距离
+                if(j == 0) //j等于0,说明Lj就是最右侧车道,L0 = Lj
                 {
-                    if(p == 1)  //1、车轮与本车道右侧距离
-                    {
-                        laneDriving = &road->BorderLines[0];
-                        calcToDistanceLine(Lj, poly.Pts, body.b1_b, body.ZQ_W_b, RTKKM3.Wheel_LF_ToRightEdge);
-                        calcToDistanceLine(Lj, poly.Pts, body.b1_b, body.YQ_W_b, RTKKM3.Wheel_RF_ToRightEdge);
-                        calcToDistanceLine(Lj, poly.Pts, body.b1_b, body.ZH_W_b, RTKKM3.Wheel_LB_ToRightEdge);
-                        calcToDistanceLine(Lj, poly.Pts, body.b1_b, body.YH_W_b, RTKKM3.Wheel_RB_ToRightEdge);
-                    }
-                    else if(p == 2)  //2：车轮与最右侧车道右侧距离
-                    {
-                        calcToDistanceLine(L0, road->Area.Pts, body.b1_b, body.ZQ_W_b, RTKKM3.Wheel_LF_ToBaseLine);
-                        calcToDistanceLine(L0, road->Area.Pts, body.b1_b, body.YQ_W_b, RTKKM3.Wheel_RF_ToBaseLine);
-                        calcToDistanceLine(L0, road->Area.Pts, body.b1_b, body.ZH_W_b, RTKKM3.Wheel_LB_ToBaseLine);
-                        calcToDistanceLine(L0, road->Area.Pts, body.b1_b, body.YH_W_b, RTKKM3.Wheel_RB_ToBaseLine);
-                        calcToDistanceLine(L0, road->Area.Pts, body.b1_b, body.points_b[RightFront], RTKKM3.Body_RF_ToBaseLine, true); //20240801
-                        calcToDistanceLine(L0, road->Area.Pts, body.b1_b, body.points_b[RightBack], RTKKM3.Body_RB_ToBaseLine, true); //20240801
-                    }
-                    else if(p == 3)  //3：车身左侧与本车道左侧距离
-                    {
-                        calcToDistanceLine(Lj1, poly.Pts, body.b1_b, body.points_b[LeftFront], RTKKM3.Body_LF_ToLeftEdge);
-                        calcToDistanceLine(Lj1, poly.Pts, body.b1_b, body.points_b[LeftBack], RTKKM3.Body_LB_ToLeftEdge);
-                    }
-                    else if(p == 4)  //4：车身右侧与本车道右侧距离
-                    {
-                        calcToDistanceLine(Lj, poly.Pts, body.b1_b, body.points_b[RightFront], RTKKM3.Body_RF_ToRightEdge);
-                        calcToDistanceLine(Lj, poly.Pts, body.b1_b, body.points_b[RightBack], RTKKM3.Body_RB_ToRightEdge);
-                    }
+                    calcToLaneLine(Lj, road->Area.Pts, body.b1_b, body.ZQ_W_b, RTKKM3.Wheel_LF_ToBaseLine);
+                    calcToLaneLine(Lj, road->Area.Pts, body.b1_b, body.YQ_W_b, RTKKM3.Wheel_RF_ToBaseLine);
+                    calcToLaneLine(Lj, road->Area.Pts, body.b1_b, body.ZH_W_b, RTKKM3.Wheel_LB_ToBaseLine);
+                    calcToLaneLine(Lj, road->Area.Pts, body.b1_b, body.YH_W_b, RTKKM3.Wheel_RB_ToBaseLine);
+                    calcToLaneLine(Lj, road->Area.Pts, body.b1_b, body.b(RF_I), RTKKM3.Body_RF_ToBaseLine, true); //20240801
+                    calcToLaneLine(Lj, road->Area.Pts, body.b1_b, body.b(RB_I), RTKKM3.Body_RB_ToBaseLine, true); //20240801
                 }
+
+                //else if(p == 3)  //3：车身左侧与本车道左侧距离
+                calcToLaneLine(Lj1, poly.Pts, body.b1_b, body.b(LF_I), RTKKM3.Body_LF_ToLeftEdge);
+                calcToLaneLine(Lj1, poly.Pts, body.b1_b, body.b(LB_I), RTKKM3.Body_LB_ToLeftEdge);
+
+                //else if(p == 4)  //4：车身右侧与本车道右侧距离
+                calcToLaneLine(Lj, poly.Pts, body.b1_b, body.b(RF_I), RTKKM3.Body_RF_ToRightEdge);
+                calcToLaneLine(Lj, poly.Pts, body.b1_b, body.b(RB_I), RTKKM3.Body_RB_ToRightEdge);
+
             }
         }
     }
@@ -2118,7 +2109,7 @@ void ExamCarSub3::Calc_CheShenYaXian()
     }
 }
 
-int ExamCarSub3::GetCarBodyPointNo(ExamCarType cartype, int8 kind, bool tail)
+int ExamCarSub3::GetCarBodyPointNo(ExamCarType cartype, const BodyPointSite& kind, bool tail)
 {
     //1、根据车型得到考车的车身位置(其实是最靠近车轮的点） Kind:1: 车身左1（上）  2：车身右1（上）  3：车身左2（下）  4：车身右2（下）
     //5、车头中心点  //6、车尾中心点
@@ -2131,12 +2122,12 @@ int ExamCarSub3::GetCarBodyPointNo(ExamCarType cartype, int8 kind, bool tail)
         {
             switch (kind)
             {
-            case 1:  result = II(9);  break; //车身左1（上）
-            case 2:  result = II(12); break; //车身右1（上）
-            case 3:  result = II(9);  break; //车身左2（下）
-            case 4:  result = II(12); break; //车身右2（下）
-            case 5:  result = II(1);  break; //车头中心点
-            case 6:  result = INVALID_INDEX; break; //车尾中心点
+            case BODY_LF: result = II(9);  break; //车身左1（上）
+            case BODY_RF: result = II(12); break; //车身右1（上）
+            case BODY_LB: result = II(9);  break; //车身左2（下）
+            case BODY_RB: result = II(12); break; //车身右2（下）
+            case BODY_CF: result = II(1);  break; //车头中心点
+            case BODY_CB: result = INVALID_INDEX; break; //车尾中心点
             default: result = INVALID_INDEX; break;
             }
         }
@@ -2145,12 +2136,12 @@ int ExamCarSub3::GetCarBodyPointNo(ExamCarType cartype, int8 kind, bool tail)
             int G_offset = m_carModel->CheShenOffsetTail();
             switch (kind)
             {
-            case 1:  result = G_offset+II(1); break;    //挂车*车身左1（上）
-            case 2:  result = G_offset+II(5); break;    //挂车*车身右1（上）
-            case 3:  result = G_offset+II(2); break;    //挂车*车身左2（下）
-            case 4:  result = G_offset+II(4); break;    //挂车*车身右2（下）
-            case 5:  result = INVALID_INDEX;  break;    //挂车*车头中心点
-            case 6:  result = G_offset+II(3); break;    //挂车*车尾中心点
+            case BODY_LF: result = G_offset+II(1); break;    //挂车*车身左1（上）
+            case BODY_RF: result = G_offset+II(5); break;    //挂车*车身右1（上）
+            case BODY_LB: result = G_offset+II(2); break;    //挂车*车身左2（下）
+            case BODY_RB: result = G_offset+II(4); break;    //挂车*车身右2（下）
+            case BODY_CF: result = INVALID_INDEX;  break;    //挂车*车头中心点
+            case BODY_CB: result = G_offset+II(3); break;    //挂车*车尾中心点
             default: result = INVALID_INDEX;  break;
             }
         }
@@ -2162,12 +2153,12 @@ int ExamCarSub3::GetCarBodyPointNo(ExamCarType cartype, int8 kind, bool tail)
         {
             switch (kind)
             {
-            case 1:  result = II(5);  break; //车身左1（上）
-            case 2:  result = II(21); break; //车身右1（上）
-            case 3:  result = II(9);  break; //车身左2（下）
-            case 4:  result = II(17); break; //车身右2（下）
-            case 5:  result = II(1);  break; //车头中心点
-            case 6:  result = II(13); break; //车尾中心点
+            case BODY_LF: result = II(5);  break; //车身左1（上）
+            case BODY_RF: result = II(21); break; //车身右1（上）
+            case BODY_LB: result = II(9);  break; //车身左2（下）
+            case BODY_RB: result = II(17); break; //车身右2（下）
+            case BODY_CF: result = II(1);  break; //车头中心点
+            case BODY_CB: result = II(13); break; //车尾中心点
             default: result = INVALID_INDEX; break;
             }
         }
@@ -2176,12 +2167,12 @@ int ExamCarSub3::GetCarBodyPointNo(ExamCarType cartype, int8 kind, bool tail)
             int G_offset = m_carModel->CheShenOffsetTail();
             switch (kind)
             {
-            case 1:  result = G_offset+II(4);  break; //挂车*车身左1（上）
-            case 2:  result = G_offset+II(22); break; //挂车*车身右1（上）
-            case 3:  result = G_offset+II(6);  break; //挂车*车身左2（下）
-            case 4:  result = G_offset+II(20); break; //挂车*车身右2（下）
-            case 5:  result = G_offset+II(1);  break; //挂车*车头中心点
-            case 6:  result = G_offset+II(13); break; //挂车*车尾中心点
+            case BODY_LF: result = G_offset+II(4);  break; //挂车*车身左1（上）
+            case BODY_RF: result = G_offset+II(22); break; //挂车*车身右1（上）
+            case BODY_LB: result = G_offset+II(6);  break; //挂车*车身左2（下）
+            case BODY_RB: result = G_offset+II(20); break; //挂车*车身右2（下）
+            case BODY_CF: result = G_offset+II(1);  break; //挂车*车头中心点
+            case BODY_CB: result = G_offset+II(13); break; //挂车*车尾中心点
             default: result = INVALID_INDEX; break;
             }
         }
@@ -2190,12 +2181,12 @@ int ExamCarSub3::GetCarBodyPointNo(ExamCarType cartype, int8 kind, bool tail)
     {
         switch (kind)
         {
-        case 1:  result = II(5);  break;  //车身左1（上）
-        case 2:  result = II(21); break;  //车身右1（上）
-        case 3:  result = II(9);  break;  //车身左2（下）
-        case 4:  result = II(17); break;  //车身右2（下）
-        case 5:  result = II(1);  break;  //车头中心点
-        case 6:  result = II(13); break;  //车尾中心点
+        case BODY_LF: result = II(5);  break;  //车身左1（上）
+        case BODY_RF: result = II(21); break;  //车身右1（上）
+        case BODY_LB: result = II(9);  break;  //车身左2（下）
+        case BODY_RB: result = II(17); break;  //车身右2（下）
+        case BODY_CF: result = II(1);  break;  //车头中心点
+        case BODY_CB: result = II(13); break;  //车尾中心点
         default: result = INVALID_INDEX; break;
         }
     }
@@ -2203,12 +2194,12 @@ int ExamCarSub3::GetCarBodyPointNo(ExamCarType cartype, int8 kind, bool tail)
     {
         switch (kind)
         {
-        case 1:  result = II(9);   break;  //车身左1（上）
-        case 2:  result = II(17);  break;  //车身右1（上）
-        case 3:  result = II(10);  break;  //车身左2（下）
-        case 4:  result = II(16);  break;  //车身右2（下）
-        case 5:  result = II(1);   break;  //车头中心点
-        case 6:  result = II(13);  break;  //车尾中心点
+        case BODY_LF: result = II(9);   break;  //车身左1（上）
+        case BODY_RF: result = II(17);  break;  //车身右1（上）
+        case BODY_LB: result = II(10);  break;  //车身左2（下）
+        case BODY_RB: result = II(16);  break;  //车身右2（下）
+        case BODY_CF: result = II(1);   break;  //车头中心点
+        case BODY_CB: result = II(13);  break;  //车尾中心点
         default: result = INVALID_INDEX; break;
         }
     }
@@ -4004,10 +3995,14 @@ void ExamCarSub3::KM3EndItem(int ItemNo, bool event, bool sound)
 bool ExamCarSub3::examMarkItem(ExamItemCode itemNo, const std::string& serial, bool once, bool force, bool event, MarkType type)
 {
     //正式考试 扣分扣到不合格为止
-    if(isExamMode() && !isQualified())
+    const std::string& s302 = TableSysSet->get302();
+    if(s302 != "0") //302=0的时候，考试结束方式：不合格继续
     {
-        logtrace("is not qualified %s itemNo=%d,serial=%s", target().c_str(), itemNo, serial.c_str());
-        return false;
+        if(isExamMode() && !isQualified())
+        {
+            logtrace("is not qualified %s itemNo=%d,serial=%s", target().c_str(), itemNo, serial.c_str());
+            return false;
+        }
     }
 
     //Kind:0 自动评判  1：考车人工扣分  2：远程下发的考试扣分
@@ -5075,7 +5070,7 @@ void ExamCarSub3::dealItemNoIDEnd14Jjdw()
     }
 }
 
-bool ExamCarSub3::calcToDistanceArc(const TModelLine& Lxx, const TModelPolygon& poly, const Pointi& b1, const Pointi& pt, int& dm, bool cross)
+bool ExamCarSub3::calcToLaneArc(const TModelLine& Lxx, const TModelPolygon& poly, const Pointi& b1, const Pointi& pt, int& dm, bool cross)
 {
     TModelLine line;
     line.PtBegin = b1; //CarStatus.BasePoint1_RealTime;
@@ -5094,7 +5089,7 @@ bool ExamCarSub3::calcToDistanceArc(const TModelLine& Lxx, const TModelPolygon&
     return false;
 }
 
-bool ExamCarSub3::calcToDistanceArc2(const TModelLine& Lxx, const TModelPolygon& area, const Pointi& b1, const Pointi& pt, int& dm, bool cross)
+bool ExamCarSub3::calcToLaneArc2(const TModelLine& Lxx, const TModelPolygon& area, const Pointi& b1, const Pointi& pt, int& dm, bool cross)
 {
     TModelLine line;
     line.PtBegin = b1; //CarStatus.BasePoint1_RealTime;
@@ -5113,7 +5108,7 @@ bool ExamCarSub3::calcToDistanceArc2(const TModelLine& Lxx, const TModelPolygon&
     return false;
 }
 
-bool ExamCarSub3::calcToDistanceLine(const TModelLine& Lxx, const std::vector<Pointi>& Pts, const Pointi& b1, const Pointi& pt, int& dm, bool cross)
+bool ExamCarSub3::calcToLaneLine(const TModelLine& Lxx, const std::vector<Pointi>& Pts, const Pointi& b1, const Pointi& pt, int& dm, bool cross)
 {
     TModelLine line;
     line.PtBegin = b1;
@@ -5419,7 +5414,7 @@ bool ExamCarSub3::RTKLane_Tail()
         if(a > 0) a = a - 1;
         for(int i = a; i <= b; i++)
         {
-            if(i > roadSize - 1)  continue;
+            if(i >= roadSize)  continue;
 
             const TMapRoadRec* road = FactoryRoads->getRoad(i);
             for(int j = 0; j < road->LaneCount; j++)
@@ -5506,7 +5501,7 @@ bool ExamCarSub3::RTKLane_Tail()
 
     for(int i = curRoadIndex; i <= curRoadIndex + 4; i++)
     {
-        if(i > roadSize - 1)  break;
+        if(i >= roadSize)  break;
 
         const TMapRoadRec* road = FactoryRoads->getRoad(i);
         //const Pointi& pt = m_cg->body.points_b[II(1)]; //CarStatus.Body_24_RealTimePt[0];
@@ -5678,109 +5673,88 @@ void ExamCarSub3::Calc_LaneDistance_Tail()
     if(RTKKM3_Tail.LaneIndex == INVALID_INDEX)  return;
 
     //Kind:1: 车身左1（上）  2：车身右1（上）  3：车身左2（下）  4：车身右2（下）
-    int LeftFront = GetCarBodyPointNo(cartype, 1, true);
-    int LeftBack = GetCarBodyPointNo(cartype, 3, true);
-    int RightFront = GetCarBodyPointNo(cartype, 2, true);
-    int RightBack = GetCarBodyPointNo(cartype, 4, true);
+    int LF_I = GetCarBodyPointNo(cartype, BODY_LF, true);
+    int LB_I = GetCarBodyPointNo(cartype, BODY_LB, true);
+    int RF_I = GetCarBodyPointNo(cartype, BODY_RF, true);
+    int RB_I = GetCarBodyPointNo(cartype, BODY_RB, true);
 
-    if(LeftFront == -1 || LeftBack == -1 || RightFront == -1 || RightBack == -1)
-    {
-        logerror("cartype=%d,LeftFront=%d, LeftBack=%d, RightFront=%d, RightBack=%d",
-                 cartype, LeftFront, LeftBack, RightFront, RightBack);
-        return;
-    }
+    TASSERT_VOID(LF_I >= 0 && LB_I >= 0 && RF_I >= 0 && RB_I >= 0,
+                 "cartype=%d, LF_I=%d, LB_I=%d, RF_I=%d, RB_I=%d", cartype, LF_I, LB_I, RF_I, RB_I);
 
     int curRoadIndex = RTKKM3_Tail.MapRoadIndex;
     //int curLaneIndex = RTKKM3_Tail.LaneIndex;
     int roadSize = FactoryRoads->size();
     const TCarBody& body = m_cg->body;
-    TModelLine line;
     //判断车轮离本车道右边线距离1(左 1，左2，右1，右2）
     //P-->1、车轮与本车道右侧距离  2：车轮与最右侧车道右侧距离  3：车身左侧与本车道左侧距离 4：车身右侧与本车道右侧距离
     const TMeshDefine* curMesh = FactoryMesh->getMesh(m_meshIndex_Tail);
     TASSERT_VOID(curMesh != nullptr, "");
 
     const TModelLine* laneDriving = nullptr;
-    for(int p = 1; p <= 4; p++)
+    for(int i = curRoadIndex - 2; i <= curRoadIndex + 2; i++)
     {
-        for(int i = curRoadIndex - 2; i <= curRoadIndex + 2; i++)
+        //1、不能大于数组的最大下标
+        if(i < 0) continue;
+        if(i >= roadSize) break;
+        //2、检查当前的路段是否在可视区域
+        if(!curMesh->has(i)) continue;
+
+        const TMapRoadRec* road = FactoryRoads->getRoad(i);
+        int endof = road->LaneCount - 1;
+        //if(p == 2)  //车轮与最右侧车道右侧距离
+        //{
+        //    endof = 0;
+        //}
+
+        //const TModelLine& L0 = road->BorderLines[0];
+        for(int j = 0; j <= endof; j++)
         {
-            //1、不能大于数组的最大下标
-            if(i < 0) continue;
-            if(i > roadSize - 1) break;
-            //2、检查当前的路段是否在可视区域
-            bool findFlag = false;
-            for(int f = 0; f < curMesh->MapRoadKeyLen; f++)
+            const TModelLine& Lj = road->BorderLines[j];
+            const TModelLine& Lj1 = road->BorderLines[j + 1];
+            const TModelPolygon& poly = road->Lanes[j];
+            if(poly.Pts.size() >= 5) //圆弧路段
             {
-                if(curMesh->MapRoad_Keys[f] == i)
-                {
-                    findFlag = true;
-                    break;
-                }
-            }
-            if(!findFlag) continue;
+                //if(p == 1)  //1、车轮与本车道右侧距离
+                laneDriving = &road->BorderLines[0];
+                calcToLaneArc(Lj, poly, body.b1_b_G, body.ZH_W_b_G, RTKKM3_Tail.Wheel_LB_ToRightEdge);
+                calcToLaneArc(Lj, poly, body.b1_b_G, body.YH_W_b_G, RTKKM3_Tail.Wheel_RB_ToRightEdge);
 
-            const TMapRoadRec* road = FactoryRoads->getRoad(i);
-            int endof = road->LaneCount - 1;
-            if(p == 2)  //车轮与最右侧车道右侧距离
-            {
-                endof = 0;
-            }
+                //else if(p == 2) //2：车轮与最右侧车道右侧距离
+                if(j == 0) //j等于0,说明Lj就是最右侧车道,L0 = Lj
+                {
+                    calcToLaneArc2(Lj, road->Area, body.b1_b_G, body.ZH_W_b_G, RTKKM3_Tail.Wheel_LB_ToBaseLine);
+                    calcToLaneArc2(Lj, road->Area, body.b1_b_G, body.YH_W_b_G, RTKKM3_Tail.Wheel_RB_ToBaseLine);
+                }
 
-            const TModelLine& L0 = road->BorderLines[0];
-            for(int j = 0; j <= endof; j++)
+                //else if(p == 3) //3：车身左侧与本车道左侧距离
+                calcToLaneArc(Lj1, poly, body.b1_b_G, body.b(LF_I), RTKKM3_Tail.Body_LF_ToLeftEdge);
+                calcToLaneArc(Lj1, poly, body.b1_b_G, body.b(LB_I), RTKKM3_Tail.Body_LB_ToLeftEdge);
+
+                //else if(p == 4)  //4：车身右侧与本车道右侧距离
+                calcToLaneArc(Lj, poly, body.b1_b_G, body.b(RF_I), RTKKM3_Tail.Body_RF_ToRightEdge);
+                calcToLaneArc(Lj, poly, body.b1_b_G, body.b(RB_I), RTKKM3_Tail.Body_RB_ToRightEdge);
+            }
+            else
             {
-                const TModelLine& Lj = road->BorderLines[j];
-                const TModelLine& Lj1 = road->BorderLines[j + 1];
-                const TModelPolygon& poly = road->Lanes[j];
-                if(poly.Pts.size() >= 5) //圆弧路段
+                //if(p == 1)  //1、车轮与本车道右侧距离
+                laneDriving = &road->BorderLines[0];
+                calcToLaneLine(Lj, poly.Pts, body.b1_b_G, body.ZH_W_b_G, RTKKM3_Tail.Wheel_LB_ToRightEdge);
+                calcToLaneLine(Lj, poly.Pts, body.b1_b_G, body.YH_W_b_G, RTKKM3_Tail.Wheel_RB_ToRightEdge);
+
+                //else if(p == 2)  //2：车轮与最右侧车道右侧距离
+                if(j == 0) //j等于0,说明Lj就是最右侧车道,L0 = Lj
                 {
-                    if(p == 1)  //1、车轮与本车道右侧距离
-                    {
-                        laneDriving = &road->BorderLines[0];
-                        calcToDistanceArc(Lj, poly, body.b1_b_G, body.ZH_W_b_G, RTKKM3_Tail.Wheel_LB_ToRightEdge);
-                        calcToDistanceArc(Lj, poly, body.b1_b_G, body.YH_W_b_G, RTKKM3_Tail.Wheel_RB_ToRightEdge);
-                    }
-                    else if(p == 2) //2：车轮与最右侧车道右侧距离
-                    {
-                        calcToDistanceArc2(L0, road->Area, body.b1_b_G, body.ZH_W_b_G, RTKKM3_Tail.Wheel_LB_ToBaseLine);
-                        calcToDistanceArc2(L0, road->Area, body.b1_b_G, body.YH_W_b_G, RTKKM3_Tail.Wheel_RB_ToBaseLine);
-                    }
-                    else if(p == 3) //3：车身左侧与本车道左侧距离
-                    {
-                        calcToDistanceArc(Lj1, poly, body.b1_b_G, body.points_b[LeftFront], RTKKM3_Tail.Body_LF_ToLeftEdge);
-                        calcToDistanceArc(Lj1, poly, body.b1_b_G, body.points_b[LeftBack],  RTKKM3_Tail.Body_LB_ToLeftEdge);
-                    }
-                    else if(p == 4)  //4：车身右侧与本车道右侧距离
-                    {
-                        calcToDistanceArc(Lj, poly, body.b1_b_G, body.points_b[RightFront], RTKKM3_Tail.Body_RF_ToRightEdge);
-                        calcToDistanceArc(Lj, poly, body.b1_b_G, body.points_b[RightBack],  RTKKM3_Tail.Body_RB_ToRightEdge);
-                    }
-                }
-                else
-                {
-                    if(p == 1)  //1、车轮与本车道右侧距离
-                    {
-                        laneDriving = &road->BorderLines[0];
-                        calcToDistanceLine(Lj, poly.Pts, body.b1_b_G, body.ZH_W_b_G, RTKKM3_Tail.Wheel_LB_ToRightEdge);
-                        calcToDistanceLine(Lj, poly.Pts, body.b1_b_G, body.YH_W_b_G, RTKKM3_Tail.Wheel_RB_ToRightEdge);
-                    }
-                    else if(p == 2)  //2：车轮与最右侧车道右侧距离
-                    {
-                        calcToDistanceLine(L0, road->Area.Pts, body.b1_b_G, body.ZH_W_b_G, RTKKM3_Tail.Wheel_LB_ToBaseLine);
-                        calcToDistanceLine(L0, road->Area.Pts, body.b1_b_G, body.YH_W_b_G, RTKKM3_Tail.Wheel_RB_ToBaseLine);
-                    }
-                    else if(p == 3)  //3：车身左侧与本车道左侧距离
-                    {
-                        calcToDistanceLine(Lj1, poly.Pts, body.b1_b_G, body.points_b[LeftFront], RTKKM3_Tail.Body_LF_ToLeftEdge);
-                        calcToDistanceLine(Lj1, poly.Pts, body.b1_b_G, body.points_b[LeftBack],  RTKKM3_Tail.Body_LB_ToLeftEdge);
-                    }
-                    else if(p == 4)  //4：车身右侧与本车道右侧距离
-                    {
-                        calcToDistanceLine(Lj, poly.Pts, body.b1_b_G, body.points_b[RightFront], RTKKM3_Tail.Body_RF_ToRightEdge);
-                        calcToDistanceLine(Lj, poly.Pts, body.b1_b_G, body.points_b[RightBack],  RTKKM3_Tail.Body_RB_ToRightEdge);
-                    }
+                    calcToLaneLine(Lj, road->Area.Pts, body.b1_b_G, body.ZH_W_b_G, RTKKM3_Tail.Wheel_LB_ToBaseLine);
+                    calcToLaneLine(Lj, road->Area.Pts, body.b1_b_G, body.YH_W_b_G, RTKKM3_Tail.Wheel_RB_ToBaseLine);
                 }
+
+                //else if(p == 3)  //3：车身左侧与本车道左侧距离
+                calcToLaneLine(Lj1, poly.Pts, body.b1_b_G, body.b(LF_I), RTKKM3_Tail.Body_LF_ToLeftEdge);
+                calcToLaneLine(Lj1, poly.Pts, body.b1_b_G, body.b(LB_I), RTKKM3_Tail.Body_LB_ToLeftEdge);
+
+                //else if(p == 4)  //4：车身右侧与本车道右侧距离
+                calcToLaneLine(Lj, poly.Pts, body.b1_b_G, body.b(RF_I), RTKKM3_Tail.Body_RF_ToRightEdge);
+                calcToLaneLine(Lj, poly.Pts, body.b1_b_G, body.b(RB_I), RTKKM3_Tail.Body_RB_ToRightEdge);
             }
         }
     }
diff --git a/entry/src/main/cpp/sdk/exam/ExamCarSub3.h b/entry/src/main/cpp/sdk/exam/ExamCarSub3.h
index 6ced047a..bf840154 100644
--- a/entry/src/main/cpp/sdk/exam/ExamCarSub3.h
+++ b/entry/src/main/cpp/sdk/exam/ExamCarSub3.h
@@ -80,9 +80,9 @@ protected:
     void dealItemNoIDEndItem();
     void dealItemNoIDEnd14Jjdw();
 
-    bool calcToDistanceArc(const TModelLine& Lxx, const TModelPolygon& poly, const Pointi& b1, const Pointi& pt, int& dm, bool cross=false);
-    bool calcToDistanceArc2(const TModelLine& Lxx, const TModelPolygon& area, const Pointi& b1, const Pointi& pt, int& dm, bool cross=false);
-    bool calcToDistanceLine(const TModelLine& Lxx, const std::vector<Pointi>& Pts, const Pointi& b1, const Pointi& pt, int& dm, bool cross=false);
+    bool calcToLaneArc(const TModelLine& Lxx, const TModelPolygon& poly, const Pointi& b1, const Pointi& pt, int& dm, bool cross=false);
+    bool calcToLaneArc2(const TModelLine& Lxx, const TModelPolygon& area, const Pointi& b1, const Pointi& pt, int& dm, bool cross=false);
+    bool calcToLaneLine(const TModelLine& Lxx, const std::vector<Pointi>& Pts, const Pointi& b1, const Pointi& pt, int& dm, bool cross=false);
     //行驶方向，1正向行驶，-1逆向行驶
     DriveDirType driveDirection(const TModelLine* lane);
 
@@ -110,9 +110,10 @@ protected:
     void Calc_LaneDistance();
     //计算车身压线
     void Calc_CheShenYaXian();
-    //1、根据车型得到考车的车身位置(其实是最靠近车轮的点）kind:1: 车身左1（上） 2：车身右1（上） 3：车身左2（下） 4：车身右2（下）
-    //5、车头中心点  //6、车尾中心点
-    int GetCarBodyPointNo(ExamCarType cartype, int8 kind, bool tail = false);
+    //1、根据车型得到考车的车身位置(其实是最靠近车轮的点）
+    //kind:1: 车身左1（上） 2：车身右1（上） 3：车身左2（下） 4：车身右2（下） 5、车头中心点  6、车尾中心点
+    enum BodyPointSite{BODY_LF=1, BODY_RF=2, BODY_LB=3, BODY_RB=4, BODY_CF=5, BODY_CB=6};
+    int GetCarBodyPointNo(ExamCarType cartype, const BodyPointSite& kind, bool tail = false);
 
     bool DrawKM3Map(int width=IMG_SIZE_WIDTH, int height=IMG_SIZE_HEIGHT);
     //计算考车显示网格
diff --git a/entry/src/main/cpp/sdk/exam/ExamHistory.h b/entry/src/main/cpp/sdk/exam/ExamHistory.h
index 976c3d09..8ea68b44 100644
--- a/entry/src/main/cpp/sdk/exam/ExamHistory.h
+++ b/entry/src/main/cpp/sdk/exam/ExamHistory.h
@@ -18,7 +18,7 @@ public:
     explicit ExamHistory() : m_num(N) { m_que = __NEW__(HistoryQueue); }
     virtual ~ExamHistory() { clear();  __DELETE__(m_que); }
 
-    T* operator[](int n) { int size = m_que->size(); return n < size ? (*m_que)[n] : nullptr; }
+    T* operator[](int n) { int size = m_que->size(); return n < size ? m_que->operator[](n) /* (*m_que)[n] */ : nullptr; }
 
     T* at(int n) { TASSERT(n < (int)m_que->size(), ""); return (*this)[n]; }
 
diff --git a/entry/src/main/cpp/sdk/judge/sub2/ISub2JudgeWrap.cpp b/entry/src/main/cpp/sdk/judge/sub2/ISub2JudgeWrap.cpp
index 243bc6f9..475a8c72 100644
--- a/entry/src/main/cpp/sdk/judge/sub2/ISub2JudgeWrap.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub2/ISub2JudgeWrap.cpp
@@ -3,6 +3,11 @@
 
 bool ISub2JudgeWrap::pureJudgeEnter() const noexcept
 {
+    if(m_car->historyMoveState() != moveForward) //必须是前进状态进项目
+    {
+        //logdebug("not moveForward move=%d", m_cg->move);
+        return false;
+    }
     return pureJudgeEnter(m_mod->beg());
 }
 
diff --git a/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge00Dcrk.cpp b/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge00Dcrk.cpp
index 1e8a0e18..32db291d 100644
--- a/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge00Dcrk.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge00Dcrk.cpp
@@ -97,8 +97,17 @@ bool Sub2Judge00Dcrk::dealJudgeEnter()
     //    enter = pureCarSomeInPoly({II(4), II(22)}, m_model->poly1278());
     //}
 
+    int s686 = TableSysSet->asInt686();
+    bool enter = false;
+    if(s686 == 1)  //1:倒车入库车头穿过10线读卡进项目
+    {
+        enter = this->pureJudgeEnter();
+    }
+    else  //不配置按照0处理,686参数默认是车子在库区域内读卡
+    {
+        enter = pureCarSomeInPoly(m_car->carModel()->body(), m_model->poly1278());
+    }
     //库位两边都可以进, 防止从L12开到L78直接开过去又可以取消，会多次触发预进项目，加上车头1点必须在poly1278内过滤
-    bool enter = this->pureJudgeEnter() || (this->pureJudgeEnter(m_model->end()) && pureCarPointInPoly(II(1), m_model->poly1278()));
     if(enter)
     {
 #if JUDGE_USE_OLD
@@ -315,20 +324,25 @@ void Sub2Judge00Dcrk::divorcedItemArea()
     bool in1 = pureInArea({cg1->body.ZH_Z_a,cg1->body.YH_Z_a}, m_model->area(), true);
     bool out = ((!in0 && in1) || !pureCarInItemArea());  //阶段10，后轮先不在项目区域结束项目，然后才会走道这里
 #else
-    bool out = (!pureCarInItemArea());
+    //bool out = (!pureCarInItemArea());
+    bool out = pureCarTouchSoloLine(m_model->L12_10(), II(13), 5);
 #endif
     if(out)
     {
-        int syset = TableSysSet->asInt606();
-        if(syset == 1 || m_secondInverted == true || m_stage >= Sub2DcrkStage3 || m_existMark == true)  //不可以取消的
+        TChuanGan* cg = m_car->historyChuanGan();
+        if(cg->move == moveForward)
         {
-            ENTER_ITEM_AND_MARK(JUDGE_MARK_ITEM_MUST_ONCE(MARK_SUB2_DCRK_01));
-            setState(itemStateEnd);
-        }
-        else
-        {
-            //取消倒车入库
-            cancelItem();
+            int syset = TableSysSet->asInt606();
+            if(syset == 1 || m_secondInverted == true || m_stage >= Sub2DcrkStage3 /*|| m_existMark == true*/)  //不可以取消的
+            {
+                ENTER_ITEM_AND_MARK(JUDGE_MARK_ITEM_MUST_ONCE(MARK_SUB2_DCRK_01));
+                setState(itemStateEnd);
+            }
+            else
+            {
+                cancelItem(); //取消倒车入库
+                return;
+            }
         }
     }
 }
@@ -343,7 +357,9 @@ JUDGE_STAGE_IMPL(Sub2Judge00Dcrk, Sub2DcrkStage1)
     //前进至停车线阶段
     TChuanGan* cg  = m_car->historyChuanGan();
     TChuanGan* cg1 = m_car->historyChuanGan(1);
-    if(cg->move == moveStop && cg1->move == moveStop)
+    if((cg->move == moveStop && cg1->move == moveStop) ||
+            (TableSysSet->asInt686() != 1 && cg->move == moveBackward && cg1->move == moveBackward &&
+             pureCarSomeInPoly(m_car->carModel()->wheelBack(), m_model->poly1278())))
     {
         m_stage = Sub2DcrkStage2; //初始停车
         if(cg->rk_Shape_Status[L11] == TChuanGan::rk_Shape_1)
diff --git a/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge03Cftc.cpp b/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge03Cftc.cpp
index fc12b2e7..2221c597 100644
--- a/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge03Cftc.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge03Cftc.cpp
@@ -116,8 +116,12 @@ JUDGE_STAGE_IMPL(Sub2Judge03Cftc, Sub2CftcStage0)
     //穿越结束线了
     if(m_endLineFlag == true && cgcu->move == moveForward)
     {
+        //2025年04月15日和军华确认的原话 修改无锡地方问题
+        //我问:有扣分不能取消，如果有扣分之后直接开跑了怎么处理？直接判不按规定考试？@老军
+        //军华:我看现在评判本地给取消了。然后监管会报错，考不了下一个项目，学员要先考侧方
+        //备注:后又当面交流确认开回去走断点续考或者重新进项目
         int s606 = TableSysSet->asInt606();
-        if(s606 == 1 || m_existMark == true)  //不可以取消项目，或者侧方已经扣过分了
+        if(s606 == 1 /*|| m_existMark == true*/)  //不可以取消项目，或者侧方已经扣过分了
         {
             ENTER_ITEM_AND_MARK(JUDGE_MARK_ITEM_MUST_ONCE(MARK_SUB2_CFTC_41));
         }
@@ -431,12 +435,6 @@ void Sub2Judge03Cftc::judgeTouchLine()
         touchLineBody_C1C2C5(LineNum::L45_NUM);
         touchLineBody_C1C2C5(LineNum::L56_NUM);
         //#endif
-
-        //车轮排线压线（道路边线，不评判库位压线，库位有4个轮子的评判）
-        //以下计算所有的压线扣分(这里只针对车轮排线）
-        touchLineWind_C1C2C5(LineNum::L23_NUM);
-        touchLineWind_C1C2C5(LineNum::L67_NUM);
-        touchLineWind_C1C2C5(LineNum::L18_NUM);
     }
 }
 
@@ -450,7 +448,8 @@ void Sub2Judge03Cftc::touchLineWheel_C1C2C5(LineNum num)
     static constexpr int history = 2;
 
     //2024年6月4日无锡所检测，多个轮子压线只扣1次，即：前进或者后退中只扣1次
-    if(pureCarTouchSomeLine(line, model->wheelAll(), history)) //前后左右轮子
+    if(pureCarTouchSomeLine(line, model->wheelAll(), history) ||
+       pureCarTouchPairsLine(line, model->wheelWindAll())) //前后左右轮子和排线
     {
         if(!touch->wheelFlag)
         {
@@ -458,6 +457,10 @@ void Sub2Judge03Cftc::touchLineWheel_C1C2C5(LineNum num)
             touchLineMark(num);
         }
     }
+    else
+    {
+        touch->wheelFlag = false;
+    }
 }
 
 void Sub2Judge03Cftc::touchLineWind_C1C2C5(LineNum num)
@@ -481,7 +484,6 @@ void Sub2Judge03Cftc::touchLineWind_C1C2C5(LineNum num)
     }
 }
 
-
 void Sub2Judge03Cftc::touchLineBody_C1C2C5(LineNum num)
 {
     TSub2CftcTouch* touch = nullptr;
@@ -499,6 +501,10 @@ void Sub2Judge03Cftc::touchLineBody_C1C2C5(LineNum num)
             ENTER_ITEM_AND_MARK(JUDGE_MARK_ITEM_MUST_MORE(MARK_SUB2_CFTC_203));
         }
     }
+    else
+    {
+        touch->bodyFlag = false;
+    }
 }
 
 void Sub2Judge03Cftc::touchLineMark(LineNum num)
diff --git a/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge03Cftc.h b/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge03Cftc.h
index 463d64b8..5bae6c6f 100644
--- a/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge03Cftc.h
+++ b/entry/src/main/cpp/sdk/judge/sub2/Sub2Judge03Cftc.h
@@ -22,9 +22,9 @@ private:
         bool rightFront = false; //右前轮压线 right front
         bool leftBack   = false; //左后轮压线 left back
         bool rightBack  = false; //右后轮压线 right back
+        bool windFlag   = false; //排线压线(道路边缘线)
         bool wheelFlag  = false; //20240604 车轮前进或者后退中多个轮子压同一条线只算1次了
         bool bodyFlag   = false; //20240605 车身触碰库位边线
-        bool windFlag   = false; //排线压线(道路边缘线)
     };
     enum LineNum { L23_NUM, L34_NUM, L45_NUM, L56_NUM, L67_NUM, L18_NUM, L36_NUM, SIZE_NUM };
 
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp
index 5e0413db..883ee378 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp
@@ -1277,6 +1277,10 @@ void Sub3Judge11Kbtc::DoStatus_100()
         //ToDo: 语音提示-->请起步，继续完成考试
         m_car->createEventSound({itemNo(), sound::sub3_406005});
     }
+    else
+    {
+        m_car->createEventSound({itemNo(), sound::sub3_zhpp}); //请考官综合评判
+    }
 }
 
 void Sub3Judge11Kbtc::Judge_KBTC_YaXian()
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp
index 71702aba..2f6b2e43 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp
@@ -282,6 +282,10 @@ void Sub3Judge20Comm::Init_ZongHe()
 
     //自动熄火评判方式：熄火次数扣分,1:根据PLC熄火次数  2：根据点火2，其它值：根据发动机转速为0或点火2+转速大于100
     m_itemvCJH.zdxhkf = s500.size() > 1 && s500[1] != "" ? std::atoi(s500[1].c_str()) : 0;
+    if(tcar->XiHuo != INVALID_INDEX) //优先以车型代码参数NO3=70,同500参数
+    {
+        m_itemvCJH.zdxhkf = tcar->XiHuo;
+    }
     //踩副刹时长
     m_itemvCJH.fscys  = s500.size() > 2 && s500[2] != "" ? std::atoi(s500[2].c_str()) : 5;
     //挡位扣分间隔
@@ -1316,9 +1320,23 @@ void Sub3Judge20Comm::Judge_KongDangHuaXing()
     //空挡滑行：30115 相关评判
     if(m_itemvCJH.kdhx_tk > 0)
     {
-        if(sor.dw > 0 || cg->move != moveForward || Tools::isZero(gps.sd) || sor.lhq == SYES ||
-                (ksdd == siteof::changzhoukm3 && sor.lhq == SYES) ||
-                (ksdd == siteof::zjhz && sor.lhq == SYES))
+        bool i = false;
+        if(sor.dw > 0 || cg->move != moveForward || Tools::isZero(gps.sd))
+        {
+            i = true;
+        }
+        if(ksdd != siteof::scms && sor.lhq == SYES)
+        {
+            i = true;
+        }
+        const std::vector<std::string>& s507 = TableSysSet->asArray507();
+        std::string ss507 = s507.size() > 11 ? s507[11] : "";
+        if(ss507 != "1" && sor.lhq == SYES)
+        {
+            i = true;
+        }
+
+        if(i)
         {
             m_itemvCJH.kdhx_tk = 0;
         }
@@ -4334,7 +4352,7 @@ void Sub3Judge20Comm::Mark_FXD_42_43(bool Flag42)
     else
     {
         bool BGCD_ItemFlag = m_car->itemsSomeExaming2(Sub3ItemType04Bgcd); //变更车道
-        if(BGCD_ItemFlag == true)  return;
+        if(BGCD_ItemFlag == true)  return;  //(*XLG_Modify 2024-06-04*)
         if(Flag42 == true)
         {
             JUDGE_MARK_SUB3(4, "42", false);
@@ -4400,14 +4418,12 @@ void Sub3Judge20Comm::HandleSysSet409_1_Special()
                 //超车项目检查
                 if(item10 != nullptr)
                 {
-                    if(item10->TestPro == ItemProFlagIdle || item10->TestPro == ItemProFlagEnd)
+                    if(!m_car->itemsSomeExaming2(item04->ItemNo))
                     {
-                        //ToDo1:通知上层生成当前项目的进项目事件
-                        //ToDo2:通知上层生成当前项目的拍照事件
                         m_car->createEventEnterItem({item10->ItemNo, ""});
                         m_car->KM3EndItem(item10->ItemNo,true,false);
                     }
-                    else if(item10->TestPro == ItemProFlagInit || item10->TestPro == ItemProFlagJudge)
+                    else
                     {
                         m_car->KM3EndItem(item10->ItemNo);
                     }
@@ -4420,20 +4436,13 @@ void Sub3Judge20Comm::HandleSysSet409_1_Special()
     TKM3Item* item04 = m_car->findExamItem(Sub3ItemType04Bgcd); //变更车道
     if(item04 != nullptr)
     {
-        if(item04->TestPro == ItemProFlagIdle || item04->TestPro == ItemProFlagEnd)
+        //这个参数的意思是，不在变更车道项目里面，就是说，
+        //我们没有读卡或者说考试员触发变更车道项目，学员自己在路上自己变道了。
+        //然后他变道完成的时候，我们会把变更车道项目。变成完已完成状态，就认为已经做过了。
+        if(!m_car->itemsSomeExaming2(item04->ItemNo) && !m_car->isItemPassed(item04->ItemNo)) //Tools::pos(',4,', ',' + Ctl.PassedItem) = 0
         {
-            //ToDo1:通知上层生成当前项目的进项目事件
-            //ToDo2:通知上层生成当前项目的拍照事件
             m_car->createEventEnterItem({item04->ItemNo, ""});
             m_car->KM3EndItem(item04->ItemNo,true,false);
-        }
-        else if(item04->TestPro == ItemProFlagInit || item04->TestPro == ItemProFlagJudge)
-        {
-            m_car->KM3EndItem(item04->ItemNo);
-        }
-
-        if(!m_car->isItemPassed(item04->ItemNo)) //Tools::pos(',4,', ',' + Ctl.PassedItem) = 0
-        {
             if(ksdd == siteof::ynljys)
             {
                 //ToDo:语音播报：结束变更
@@ -4566,6 +4575,7 @@ void Sub3Judge20Comm::Judge_YueJi_JiaJianDang()
 
     if(gps.sd < 5.0 && gps1.sd < 5.0 && gps2.sd < 5.0) return;
 
+    #define HIS(x)   m_car->historySensor(x).dw
     //SysSet[425] 一档一离合相关
     // (*
     // 加减档位操作挂一个挡位要松一次离合器（项目,全程）（0-否 1-是）（）
@@ -4575,8 +4585,7 @@ void Sub3Judge20Comm::Judge_YueJi_JiaJianDang()
     TKM3Item* item14 = m_car->findExamItem(Sub3ItemType14Jjdw);//加减挡
     if(item14 && item14->TestPro == ItemProFlagIdle && ss425 == "1")
     {
-        const TSensorInfo& sor3 = m_car->historySensor(3);
-        if(sor.dw == sor1.dw && sor.dw != sor2.dw && sor.dw != sor3.dw && sor.dw > 0)
+        if(sor.dw == HIS(1) && sor.dw != HIS(2) && sor.dw != HIS(3) && sor.dw > 0)
         {
             int dw = sor.dw;
             int k = 0;
@@ -4589,18 +4598,12 @@ void Sub3Judge20Comm::Judge_YueJi_JiaJianDang()
                 }
 
                 const TSensorInfo& sori = m_car->historySensor(i);
-                int dw_i0 = sori.dw;
-                int dw_i1 = m_car->historySensor(i + 1).dw;
-                int dw_i2 = m_car->historySensor(i + 2).dw;
-                int dw_i3 = m_car->historySensor(i + 3).dw;
-                int dw_i4 = m_car->historySensor(i + 4).dw;
-                int dw_i5 = m_car->historySensor(i + 5).dw;
-                int dw_i6 = m_car->historySensor(i + 6).dw;
 
                 if(sori.lhq == SNOT) break;
-                if(dw_i0 == SNOT) continue;
-                if(dw != dw_i0 && dw_i0 == dw_i1 && dw_i0  == dw_i2 && dw_i0 == dw_i3 &&
-                        dw_i0  == dw_i4 && dw_i0 == dw_i5 && dw_i0 == dw_i6)
+                if(sori.dw == 0) continue;
+                if(dw != sori.dw &&
+                   sori.dw == HIS(i+1) && sori.dw == HIS(i+2) && sori.dw == HIS(i+3) &&
+                   sori.dw == HIS(i+4) && sori.dw == HIS(i+5) && sori.dw == HIS(i+6))
                 {
                     k = k + 1;
                     dw = sori.dw;
@@ -4613,11 +4616,45 @@ void Sub3Judge20Comm::Judge_YueJi_JiaJianDang()
         }
     }
 
+    /*
+     if Ctl.ksdd = 'wuxijiance' then
+      begin
+        if (cg.di_lhq = 1) and (cg.ai_dw = 3) then
+        begin
+          for i := 1 to 100 do
+          begin
+            if lscg[zj(i)].di_lhq = 0 then
+              Break;
+            if lscg[zj(i)].ai_dw > 3 then
+              Break;
+            if lscg[zj(i)].ai_dw = 1 then
+            begin
+              Mark(14, '01', True);
+              Break;
+            end;
+          end;
+        end;
+     end;
+    */
+
     int count = m_car->historyCount();
+    bool btempkf = false;
+    bool btemp1 = false;
+    bool btemp2 = false;
     //越级加减档持续时间
     if(m_itemvCJH.yjjdcxsj == 0)
     {
-        if(sor.dw == sor1.dw && sor.dw == sor2.dw && sor.dw > 0 && sor.dw < 9 &&
+        bool ix = 0;
+        if(sor.lhq == SNOT)
+        {
+            ix = 1;
+        }
+        if(ksdd == siteof::lfgakm3)
+        {
+            ix = 1;
+        }
+
+        if(sor.dw == HIS(1) && sor.dw == HIS(2) && sor.dw > 0 && sor.dw < 9 &&
            sor.lhq == SNOT && gps.sd > 5 && !IS_C2(m_carType) && !IS_C5(m_carType))  //增加了车速>5 20151214
         {
             for(int i = 3; i < 53; i++)
@@ -4628,31 +4665,27 @@ void Sub3Judge20Comm::Judge_YueJi_JiaJianDang()
                 }
                 const TChuanGan* hisi = m_car->historyChuanGan(i);
                 const TSensorInfo& sori = hisi->real.sensor;
-                int dw_i0 = sori.dw;
-                if(dw_i0 != 0) break;
 
-                int dw_i1 = m_car->historySensor(i + 1).dw;
-                int dw_i2 = m_car->historySensor(i + 2).dw;
+                if(sori.dw >= sor.dw && sori.lhq == SNOT) break;
+                if(sori.dw + 1 == sor.dw && sori.lhq == SNOT) break;
 
-                if(dw_i1 >= sor.dw && sori.lhq == SNOT) break;
-                if(dw_i1 + 1 == sor.dw && sori.lhq == SNOT) break;
+                if(sori.dw == 0)
+                    btemp1 = true;
+                if(sori.lhq == SYES)
+                    btemp2 = true;
+                if(ksdd == siteof::shandong)
+                    btemp2 = true;
+                if(ksdd == siteof::scms || ksdd == siteof::hnay || ksdd == siteof::lfgakm3)
+                    btemp1 = true;
+                if(btemp1 && btemp2)
+                    btempkf = true;
 
-                if(dw_i1 < sor.dw  && dw_i1 > 0 && dw_i1 == dw_i2)
+                if(sori.dw < sor.dw && HIS(i+1) == sori.dw && sori.dw > 0)
                 {
-                    if(sor.dw - dw_i1 > 1 && m_itemvCJH.yjjdkfjs != hisi->tkCnt)
+                    if(sor.dw - sori.dw > 1 && m_itemvCJH.yjjdkfjs != hisi->tkCnt && btempkf)
                     {
-                        bool FindFlag = false;
-                        if(ksdd == siteof::JXNC || m_itemvCJH.qcyjjdkf == 1)
-                        {
-                            FindFlag = true;
-                        }
-
                         TKM3Item* item14 = m_car->findExamItem(Sub3ItemType14Jjdw); //加减挡
-                        if(item14 && item14->TestPro > ItemProFlagIdle)
-                        {
-                            FindFlag = true;
-                        }
-                        if(FindFlag == true)
+                        if((item14 && item14->TestPro > ItemProFlagIdle) || ksdd == siteof::JXNC || m_itemvCJH.qcyjjdkf == 1)
                         {
                             JUDGE_MARK_SUB3(14, "01", true);
                         }
@@ -4669,12 +4702,18 @@ void Sub3Judge20Comm::Judge_YueJi_JiaJianDang()
     }
     else if(m_itemvCJH.yjjdcxsj == 1)
     {
-        const TSensorInfo& sor2 = m_car->historySensor(2);
-        const TSensorInfo& sor3 = m_car->historySensor(3);
-        const TSensorInfo& sor4 = m_car->historySensor(4);
-        if(sor.dw == sor1.dw && sor.dw == sor2.dw && sor.dw == sor3.dw && sor.dw == sor4.dw &&
-                sor.dw > 0 && sor.dw < 9 && sor.lhq == SNOT && sor4.lhq == SNOT && gps.sd > 5 &&
-                !IS_C2(m_carType) && !IS_C5(m_carType)) //增加了车速>5 20151214
+        bool ix = 0;
+        if(sor.lhq == SNOT && sor1.lhq == SNOT)
+        {
+            ix = 1;
+        }
+        if(ksdd == siteof::lfgakm3)
+        {
+            ix = 1;
+        }
+        if(sor.dw == HIS(1) && sor.dw == HIS(2) && sor.dw == HIS(3) && sor.dw == HIS(4) &&
+                sor.dw > 0 && sor.dw < 9 && sor.lhq == SNOT && sor1.lhq == SNOT &&
+                gps.sd > 5 && !IS_C2(m_carType) && !IS_C5(m_carType)) //增加了车速>5 20151214
         {
             for(int i = 5; i <= 55; i++)
             {
@@ -4685,35 +4724,29 @@ void Sub3Judge20Comm::Judge_YueJi_JiaJianDang()
 
                 const TChuanGan* hisi = m_car->historyChuanGan(i);
                 const TSensorInfo& sori  = hisi->real.sensor;
-                int dw_i0 = sori.dw;
-                if(dw_i0 != 0) break;
 
-                int dw_i1 = m_car->historySensor(i + 1).dw;
-                int dw_i2 = m_car->historySensor(i + 2).dw;
-                int dw_i3 = m_car->historySensor(i + 3).dw;
-                int dw_i4 = m_car->historySensor(i + 4).dw;
-                int dw_i5 = m_car->historySensor(i + 5).dw;
+                if(sori.dw > sor.dw && sori.lhq == SNOT) break;
+                if(sori.dw + 1 == sor.dw && sori.lhq == SNOT) break;
 
-                if(dw_i1 > sor.dw && sori.lhq == SNOT) break;
-                if(dw_i1 + 1 == sor.dw && sori.lhq == SNOT) break;
+                if(sori.dw == 0)
+                    btemp1 = true;
+                if(sori.lhq == SYES)
+                    btemp2 = true;
+                if(ksdd == siteof::shandong)
+                    btemp2 = true;
+                if(ksdd == siteof::scms || ksdd == siteof::hnay || ksdd == siteof::lfgakm3)
+                    btemp1 = true;
+                if(btemp1 && btemp2)
+                    btempkf = true;
 
-                if(dw_i1 < sor.dw && dw_i1 > 0 &&
-                   dw_i2 == dw_i1 && dw_i3 == dw_i1 && dw_i4 == dw_i1 && dw_i5 == dw_i1)
+                if(sori.dw < sor.dw &&
+                   HIS(i+1) == sori.dw && HIS(i+2) == sori.dw &&
+                   HIS(i+3) == sori.dw && HIS(i+4) == sori.dw && sori.dw > 0)
                 {
-                    if(sor.dw - dw_i1 > 1 && m_itemvCJH.yjjdkfjs != hisi->tkCnt)
+                    if(sor.dw - sori.dw > 1 && m_itemvCJH.yjjdkfjs != hisi->tkCnt && btempkf)
                     {
-                        bool FindFlag = false;
-                        if(ksdd == siteof::JXNC || m_itemvCJH.qcyjjdkf == 1)
-                        {
-                            FindFlag = true;
-                        }
-
                         TKM3Item* item14 = m_car->findExamItem(Sub3ItemType14Jjdw); //加减挡
-                        if(item14 && item14->TestPro > ItemProFlagIdle)
-                        {
-                            FindFlag = true;
-                        }
-                        if(FindFlag == true)
+                        if((item14 && item14->TestPro > ItemProFlagIdle) || ksdd == siteof::JXNC || m_itemvCJH.qcyjjdkf == 1)
                         {
                             JUDGE_MARK_SUB3(14, "01", true);
                         }
@@ -4730,18 +4763,20 @@ void Sub3Judge20Comm::Judge_YueJi_JiaJianDang()
     }
     else if(m_itemvCJH.yjjdcxsj == 2)
     {
-        const TSensorInfo& sor3 = m_car->historySensor(3);
-        const TSensorInfo& sor4 = m_car->historySensor(4);
-        const TSensorInfo& sor5 = m_car->historySensor(5);
-        const TSensorInfo& sor6 = m_car->historySensor(6);
-        const TSensorInfo& sor7 = m_car->historySensor(7);
-        const TSensorInfo& sor8 = m_car->historySensor(8);
+        bool ix = 0;
+        if(sor.lhq == SNOT && sor2.lhq == SNOT)
+        {
+            ix = 1;
+        }
+        if(ksdd == siteof::lfgakm3)
+        {
+            ix = 1;
+        }
 
-        if(sor.dw == sor1.dw && sor.dw == sor2.dw && sor.dw == sor3.dw &&
-                sor.dw == sor4.dw && sor.dw == sor5.dw && sor.dw == sor6.dw &&
-                sor.dw == sor7.dw && sor.dw == sor8.dw && sor.dw > 0 &&
-                sor.dw < 9 && sor.lhq == SNOT && sor2.lhq == SNOT &&
-                gps.sd > 5 && !IS_C2(m_carType) && !IS_C5(m_carType)) //增加了车速>5 20151214
+        if(sor.dw == HIS(1) && sor.dw == HIS(2) && sor.dw == HIS(3) &&
+                sor.dw == HIS(4) && sor.dw == HIS(5) && sor.dw == HIS(6) &&
+                sor.dw == HIS(7) && sor.dw == HIS(8) && sor.dw > 0 && sor.dw < 9 &&
+                ix == 1 && gps.sd > 5 && !IS_C2(m_carType) && !IS_C5(m_carType)) //增加了车速>5 20151214
         {
             for(int i = 9; i < 59; i++)
             {
@@ -4751,44 +4786,31 @@ void Sub3Judge20Comm::Judge_YueJi_JiaJianDang()
                 }
                 const TChuanGan* hisi = m_car->historyChuanGan(i);
                 const TSensorInfo& sori = hisi->real.sensor;
-                int dw_i0 = sori.dw;
-                if(dw_i0 != 0) break;
 
-                int dw_i1 = m_car->historySensor(i + 1).dw;
-                int dw_i2 = m_car->historySensor(i + 2).dw;
-                int dw_i3 = m_car->historySensor(i + 3).dw;
-                int dw_i4 = m_car->historySensor(i + 4).dw;
-                int dw_i5 = m_car->historySensor(i + 5).dw;
-                int dw_i6 = m_car->historySensor(i + 6).dw;
-                int dw_i7 = m_car->historySensor(i + 7).dw;
-                int dw_i8 = m_car->historySensor(i + 8).dw;
-                int dw_i9 = m_car->historySensor(i + 9).dw;
-                int dw_i10 = m_car->historySensor(i + 10).dw;
+                if(sori.dw > sor.dw && sori.lhq == SNOT) break;
+                if(sori.dw + 1 == sor.dw && sori.lhq == SNOT) break;
 
-                if(dw_i1 > sor.dw && sori.lhq == SNOT) break;
-                if(dw_i1 + 1 == sor.dw && sori.lhq == SNOT) break;
+                if(sori.dw == 0)
+                    btemp1 = true;
+                if(sori.lhq == SYES)
+                    btemp2 = true;
+                if(ksdd == siteof::shandong)
+                    btemp2 = true;
+                if(ksdd == siteof::scms || ksdd == siteof::hnay || ksdd == siteof::lfgakm3)
+                    btemp1 = true;
+                if(btemp1 && btemp2)
+                    btempkf = true;
 
-                if(dw_i1 < sor.dw && dw_i1 > 0 && dw_i2 == dw_i1 && dw_i3 == dw_i1 &&
-                   dw_i4 == dw_i1 && dw_i5 == dw_i1 && dw_i6 == dw_i1 && dw_i7 == dw_i1 &&
-                        dw_i8 == dw_i1 && dw_i9 == dw_i1 && dw_i10 == dw_i1)
+                if(sori.dw < sor.dw  &&
+                   HIS(i+1) == sori.dw && HIS(i+2) == sori.dw && HIS(i+3) == sori.dw &&
+                   HIS(i+4) == sori.dw && HIS(i+5) == sori.dw && HIS(i+6) == sori.dw &&
+                   HIS(i+7) == sori.dw && HIS(i+8) == sori.dw && HIS(i+9) == sori.dw && sori.dw > 0)
                 {
-                    if(sor.dw - dw_i1 > 1 && m_itemvCJH.yjjdkfjs != hisi->tkCnt)
+                    if(sor.dw - sori.dw > 1 && m_itemvCJH.yjjdkfjs != hisi->tkCnt && btempkf)
                     {
-                        bool FindFlag = false;
-                        if(ksdd == siteof::JXNC || m_itemvCJH.qcyjjdkf == 1)
-                        {
-                            FindFlag = true;
-                        }
-
                         TKM3Item* item14 = m_car->findExamItem(Sub3ItemType14Jjdw); //加减挡
-                        if(item14 && item14->TestPro > ItemProFlagIdle)
+                        if((item14 && item14->TestPro > ItemProFlagIdle) || ksdd == siteof::JXNC || m_itemvCJH.qcyjjdkf == 1)
                         {
-                            FindFlag = true;
-                        }
-                        if(FindFlag == true)
-                        {
-                            //安卓档位评判好像逻辑上做了优化，比方说越级加档，中间必须出现 0 才判，1 跳 3 的情况，没出现 0 不判
-                            //项目经理吉说的先按照这样做
                             JUDGE_MARK_SUB3(14, "01", true);
                         }
                         else
@@ -4809,44 +4831,23 @@ void Sub3Judge20Comm::Judge_YueJi_JiaJianDang()
                     {
                         break;
                     }
-
                     const TChuanGan* hisi = m_car->historyChuanGan(i);
                     const TSensorInfo& sori = hisi->real.sensor;
-                    int dw_i0 = sori.dw;
 
-                    int dw_i1 = m_car->historySensor(i + 1).dw;
-                    int dw_i2 = m_car->historySensor(i + 2).dw;
-                    int dw_i3 = m_car->historySensor(i + 3).dw;
-                    int dw_i4 = m_car->historySensor(i + 4).dw;
-                    int dw_i5 = m_car->historySensor(i + 5).dw;
-                    int dw_i6 = m_car->historySensor(i + 6).dw;
-                    int dw_i7 = m_car->historySensor(i + 7).dw;
-                    int dw_i8 = m_car->historySensor(i + 8).dw;
-                    int dw_i9 = m_car->historySensor(i + 9).dw;
-
-                    if(dw_i0 == 9)  break;
+                    if(sori.dw == 9)  break;
                     if(hisi->move != moveForward) break;
-                    if(dw_i0 < sor.dw && sori.lhq == SNOT) break;
-                    if(dw_i0 - 1 == sor.dw && sori.lhq == SNOT) break;
+                    if(sori.dw < sor.dw && sori.lhq == SNOT) break;
+                    if(sori.dw - 1 == sor.dw && sori.lhq == SNOT) break;
 
-                    if(dw_i0 > sor.dw && dw_i0 > 0 &&
-                            dw_i1 == dw_i0 && dw_i2 == dw_i0 && dw_i3 == dw_i0 &&
-                            dw_i4 == dw_i0 && dw_i5 == dw_i0 && dw_i6 == dw_i0 &&
-                            dw_i7 == dw_i0 && dw_i8 == dw_i0 && dw_i9 == dw_i0)
+                    if(sori.dw > sor.dw &&
+                       HIS(i+1) == sori.dw && HIS(i+2) == sori.dw && HIS(i+3) == sori.dw &&
+                       HIS(i+4) == sori.dw && HIS(i+5) == sori.dw && HIS(i+6) == sori.dw &&
+                       HIS(i+7) == sori.dw && HIS(i+8) == sori.dw && HIS(i+9) == sori.dw && sori.dw > 0)
                     {
-                        if(dw_i0 - sor.dw > 1 && m_itemvCJH.yjjdkfjs != hisi->tkCnt)
+                        if(sori.dw - sor.dw > 1 && m_itemvCJH.yjjdkfjs != hisi->tkCnt)
                         {
-                            bool FindFlag = false;
-                            if(ksdd == siteof::JXNC || m_itemvCJH.qcyjjdkf == 1)
-                            {
-                                FindFlag = true;
-                            }
                             TKM3Item* item14 = m_car->findExamItem(Sub3ItemType14Jjdw); //加减挡
-                            if(item14 && item14->TestPro > ItemProFlagIdle)
-                            {
-                                FindFlag = true;
-                            }
-                            if(FindFlag == true)
+                            if((item14 && item14->TestPro > ItemProFlagIdle) || ksdd == siteof::JXNC || m_itemvCJH.qcyjjdkf == 1)
                             {
                                 JUDGE_MARK_SUB3(14, "01", true);
                             }
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.cpp
index ed0fc204..a64a5c14 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.cpp
@@ -2439,23 +2439,35 @@ void Sub3Judge41Mndg::CheLiangGuZhang()
                 a = 1;
             }
         }
-        if((a == 1) && ((ksdd != siteof::nj && sor.wd == SNOT) || ksdd == siteof::nj) && ((m_itemv.lstcstd == 1 && sor.shtd == SYES) || m_itemv.lstcstd != 1))
+        if((a == 1) && ((ksdd != siteof::nj && sor.wd == SNOT) || ksdd == siteof::nj) &&
+                ((m_itemv.lstcstd == 1 && sor.shtd == SYES) || m_itemv.lstcstd != 1))
         {
             if(m_itemv.Lt_LastChange_TM == 0) //表示没有灯光动作
             {
-                if(MilliSecondsBetween(gps.sj, m_itemv.Snd_Wav_End_TM) > m_itemv.P_CSOK_YanShi)
+                int64 tm = MilliSecondsBetween(gps.sj, m_itemv.Snd_Wav_End_TM);
+                if(tm > m_itemv.P_CSOK_YanShi)
                 {
                     m_itemv.Lt_YesID = true;
                 }
             }
             else
             {
-                if(MilliSecondsBetween(gps.sj, m_itemv.Lt_LastChange_TM) >= m_itemv.P_YJGD_JT_YS) //正确的灯光持续了一段时间
+                int64 tm = MilliSecondsBetween(gps.sj, m_itemv.Lt_LastChange_TM);
+                if(tm >= m_itemv.P_YJGD_JT_YS) //正确的灯光持续了一段时间
                 {
                      m_itemv.Lt_YesID = true;
                 }
             }
         }
+        if(ksdd == siteof::shandong)
+        {
+            //地点版本shandong下，双跳灯信号开过就可以 20250415鸿蒙终端调试群说的，4月16日再次和军华当面确认的
+            if(sor.shtd == SYES && sor1.shtd == SYES)
+            {
+                m_itemv.Lt_YesID = true;
+            }
+        }
+
         //20190308
         if(ksdd == siteof::guizhou)
         {
@@ -2469,7 +2481,8 @@ void Sub3Judge41Mndg::CheLiangGuZhang()
             }
         }
         //总时间到 或 灯光操作正确
-        if(m_itemv.Lt_YesID == true || MilliSecondsBetween(gps.sj, m_itemv.Snd_Wav_End_TM) > m_itemv.P_zys)
+        int64 tm = MilliSecondsBetween(gps.sj, m_itemv.Snd_Wav_End_TM);
+        if(m_itemv.Lt_YesID == true || tm > m_itemv.P_zys)
         {
             if(m_itemv.Lt_YesID)
             {
@@ -2495,7 +2508,8 @@ void Sub3Judge41Mndg::CheLiangGuZhang()
             }
             else
             {
-                if(a == 1 && ((ksdd != siteof::nj && sor.wd == 0) || ksdd == siteof::nj) && ((m_itemv.lstcstd == 1 && sor.shtd == SYES) || m_itemv.lstcstd != 1))
+                if(a == 1 && ((ksdd != siteof::nj && sor.wd == 0) || ksdd == siteof::nj) &&
+                        ((m_itemv.lstcstd == 1 && sor.shtd == SYES) || m_itemv.lstcstd != 1))
                 {
                     m_itemv.ItemNo = 0;
                     m_itemv.stdjs = gps.sj; //20171018
diff --git a/entry/src/main/cpp/sdk/utility/HTypes.h b/entry/src/main/cpp/sdk/utility/HTypes.h
index 4708ecb1..87c91669 100644
--- a/entry/src/main/cpp/sdk/utility/HTypes.h
+++ b/entry/src/main/cpp/sdk/utility/HTypes.h
@@ -1141,6 +1141,9 @@ struct TCarBody
     Pointi b1_b_G;    //挂车*GPS主天线
     Pointi b2_b_G;    //挂车*GPS从天线
 
+    const TGPSPoint& a(int idx) const { return points_a[idx]; }
+    const Pointi& b(int idx) const { return points_b[idx]; }
+
     TCarBody() noexcept { clean(); }
     virtual ~TCarBody() noexcept { clean(); }
     void clean() noexcept
@@ -1346,6 +1349,18 @@ struct TMeshDefine
                       MapSubItemKeyLen,PointItemKeyLen,FangXiangDianKeyLen,RowNo,ColNo,Area);
 
     DISABLE_COPY_DECLARE_WITH(TMeshDefine);
+
+    bool has(int roadIndex) const
+    {
+        for(int f = 0; f < MapRoadKeyLen; f++)
+        {
+            if(MapRoad_Keys[f] == roadIndex)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
 };
 using TMeshDefines = std::vector<TMeshDefine*>;
 
@@ -1453,6 +1468,8 @@ struct TCar
 
     std::string         XSJL_Parm;
 
+    int                 XiHuo = INVALID_INDEX;
+
     //档位转速比 2014111
     struct TCarZsBl { int CarZsBmin = -1; int CarZsBMax = -1; };
     std::array<TCarZsBl, 7> DwZsBl; //20141111 档位转速比 档位转速比  array[1..5]
diff --git a/entry/src/main/cpp/toolkit/inc/HKitInc.h b/entry/src/main/cpp/toolkit/inc/HKitInc.h
index c99fbd6f..3bb8c9b8 100644
--- a/entry/src/main/cpp/toolkit/inc/HKitInc.h
+++ b/entry/src/main/cpp/toolkit/inc/HKitInc.h
@@ -19,7 +19,7 @@
 #define KIT_VERSION_MAJOR  1
 #define KIT_VERSION_MINOR  0
 #define KIT_VERSION_PATCH  2
-#define KIT_VERSION_STAMP  "2504091505b"
+#define KIT_VERSION_STAMP  "2504191102b"
 
 #define KIT_VERSION_STR    JUDGE_STR(KIT_VERSION_MAJOR.KIT_VERSION_MINOR.KIT_VERSION_PATCH)
 
diff --git a/entry/src/main/cpp/toolkit/ui/MainWindow.cpp b/entry/src/main/cpp/toolkit/ui/MainWindow.cpp
index 2be37adc..651008ee 100644
--- a/entry/src/main/cpp/toolkit/ui/MainWindow.cpp
+++ b/entry/src/main/cpp/toolkit/ui/MainWindow.cpp
@@ -26,6 +26,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     int x = (sw - w) / 2;
     int y = (sh - h) / 2;
     setGeometry(x, y, w, h);
+
 }
 
 MainWindow::~MainWindow()
@@ -70,6 +71,16 @@ void MainWindow::init()
     KIT_CONNECT(updateNextDoing());
     KIT_CONNECT(updateCheckVersion(int, const QString&));
 
+    //connect(&m_audio, SIGNAL(QMediaPlayer::error(QMediaPlayer::Error)),
+    //        SLOT([&](QMediaPlayer::Error error)
+    //        {
+    //            QMediaPlayer::Error err = m_audio.error();
+    //            QString errStr = m_audio.errorString();
+    //
+    //            logwarning("paly-audio file:%s, err:%d-%s ",
+    //            filepath.toUtf8().data(), err, errStr.toUtf8().data());
+    //        }));
+
     m_ui->loop->clear();
     m_ui->loop->addItem(CL8("否"), false);
     m_ui->loop->addItem(CL8("是"), true);
@@ -406,9 +417,16 @@ void MainWindow::playSoundVoice(const std::string& code)
         logwarning("not-find-audio file:%s", filepath.toLocal8Bit().data());
         return;
     }
-
     m_audio.setMedia(QUrl::fromLocalFile(file));
     m_audio.play();
+
+    QMediaPlayer::Error err = m_audio.error();
+    QString errStr = m_audio.errorString();
+    if(err != QMediaPlayer::NoError)
+    {
+        logwarning("paly-audio file:%s, err:%d-%s ",
+                   filepath.toUtf8().data(), err, errStr.toUtf8().data());
+    }
     return;
 }
 
diff --git a/entry/src/main/cpp/toolkit/ui/MainWindow.ui b/entry/src/main/cpp/toolkit/ui/MainWindow.ui
index b38345da..304c750f 100644
--- a/entry/src/main/cpp/toolkit/ui/MainWindow.ui
+++ b/entry/src/main/cpp/toolkit/ui/MainWindow.ui
@@ -413,7 +413,7 @@ p, li { white-space: pre-wrap; }
      <rect>
       <x>600</x>
       <y>180</y>
-      <width>101</width>
+      <width>111</width>
       <height>20</height>
      </rect>
     </property>
@@ -426,7 +426,7 @@ p, li { white-space: pre-wrap; }
      <rect>
       <x>600</x>
       <y>163</y>
-      <width>101</width>
+      <width>111</width>
       <height>20</height>
      </rect>
     </property>