diff --git a/entry/src/main/cpp/sdk/api/include/JudgeSdk.h b/entry/src/main/cpp/sdk/api/include/JudgeSdk.h
index aec1fd2d..53192186 100644
--- a/entry/src/main/cpp/sdk/api/include/JudgeSdk.h
+++ b/entry/src/main/cpp/sdk/api/include/JudgeSdk.h
@@ -74,6 +74,7 @@ typedef int         (JUDGE_SDK_METHOD *examJudgeMapSetScalingHandle)       (int
 typedef int         (JUDGE_SDK_METHOD *examJudgeMapSetDrawingHandle)       (bool drawing);
 typedef const char* (JUDGE_SDK_METHOD *examJudgeMapImageHandle)            ();
 typedef const char* (JUDGE_SDK_METHOD *examJudgeMapImageSetCallbackHandle) (examJudgeCallbackMapImage callback);
+typedef double      (JUDGE_SDK_METHOD *examCalcGpsDistanceHandle)          (double jd1, double wd1, double jd2, double wd2, double h);
 
 
 /********************************************************************
@@ -207,7 +208,7 @@ JUDGE_SDK_API int JUDGE_SDK_METHOD examJudgeMapSetScaling(int scaling);
 JUDGE_SDK_API int JUDGE_SDK_METHOD examJudgeMapSetDrawing(bool drawing);
 
 /*
- * 说明: 获取地图轨迹图像
+ * 说明: 同步方式获取地图轨迹图像
  * 参数: (无)
  * 返回值: RGB图像，JS返回值类型:napi_uint8_clamped_array
  */
@@ -215,12 +216,19 @@ JUDGE_SDK_DEPRECATED("Use [examJudgeMapImageSetCallback()] instead!")
 JUDGE_SDK_API const char* JUDGE_SDK_METHOD examJudgeMapImage();
 
 /*
- * 说明: 设置地图轨迹图像回调函数
+ * 说明: 异步方式设置地图轨迹图像回调函数
  * 参数: callback:轨迹图像异步回调函数，注意:回调函数里严禁有耗时操作
  * 返回值: 调用执行结果错误码 0:成功,其他:失败
  */
 JUDGE_SDK_API int JUDGE_SDK_METHOD examJudgeMapImageSetCallback(examJudgeCallbackMapImage callback);
 
+/*
+* 说明: 计算GPS两点之间的距离
+* 参数: jd1:1点经度，wd1:1点纬度，jd2:2点经度，wd2:2点纬度，h:高层（高度差）
+* 返回值: 返回距离，单位厘米
+*/
+JUDGE_SDK_API double JUDGE_SDK_METHOD examCalcGpsDistance(double jd1, double wd1, double jd2, double wd2, double h);
+
 
 JUDGE_SDK_EXTERN_C_END
 
diff --git a/entry/src/main/cpp/sdk/api/jni/JNIApiBridge.cpp b/entry/src/main/cpp/sdk/api/jni/JNIApiBridge.cpp
index 6553dd18..ccc46297 100644
--- a/entry/src/main/cpp/sdk/api/jni/JNIApiBridge.cpp
+++ b/entry/src/main/cpp/sdk/api/jni/JNIApiBridge.cpp
@@ -208,6 +208,13 @@ jint JNI_JUDGE_FUN_IMPL(examJudgeMapImageSetCallback)(JNIEnv* env, jobject thiz)
     return (jint)QE(code);
 }
 
+jdouble JNI_JUDGE_FUN_IMPL(examCalcGpsDistance)(JNIEnv* env, jobject thiz, jdouble jd1, jdouble wd1, jdouble jd2, jdouble wd2, jdouble h)
+{
+    logdebug("call JNI_examCalcGpsDistance");
+    double distance = ExamService::examCalcGpsDistance(jd1, wd1, jd2, wd2, h);
+    return (jdouble)distance;
+}
+
 void JNIApiBridge::examJudgeCallbackLogToCaller(int level, const char* info, int len)
 {
     if(NULL == m_cbLog || level < LOG_LV_CLOSE || level > LOG_LV_ALL || NULL == info || len <= 0)
diff --git a/entry/src/main/cpp/sdk/api/jni/JNIApiBridge.h b/entry/src/main/cpp/sdk/api/jni/JNIApiBridge.h
index 8c9e9d3c..3a061851 100644
--- a/entry/src/main/cpp/sdk/api/jni/JNIApiBridge.h
+++ b/entry/src/main/cpp/sdk/api/jni/JNIApiBridge.h
@@ -32,13 +32,15 @@ public:
     jint       JNI_JUDGE_FUN_DECL(examJudgeRealExam)            (JNIEnv* env, jobject thiz, jstring data, jint len);
     jint       JNI_JUDGE_FUN_DECL(examJudgeSetRealExamCallback) (JNIEnv* env, jobject thiz);
     jint       JNI_JUDGE_FUN_DECL(examJudgeSetPerformCallback)  (JNIEnv* env, jobject thiz);
-    jint       JNI_JUDGE_FUN_DECL(examJudgeArtificialMark)      (JNIEnv* env, jobject thiz, jint itemno, jstring seria, jint type);
+    jint       JNI_JUDGE_FUN_DECL(examJudgeArtificialMark)      (JNIEnv* env, jobject thiz, jint itemno, jstring serial, jint type);
+    jint       JNI_JUDGE_FUN_DECL(examJudgeArtificialItem)      (JNIEnv* env, jobject thiz, jint itemno, jint type);
     jstring    JNI_JUDGE_FUN_DECL(examJudgeTrackFile)           (JNIEnv* env, jobject thiz);
     jint       JNI_JUDGE_FUN_DECL(examJudgeMapSetParam)         (JNIEnv* env, jobject thiz, jint width, jint height);
     jint       JNI_JUDGE_FUN_DECL(examJudgeMapSetScaling)       (JNIEnv* env, jobject thiz, jint scaling);
     jint       JNI_JUDGE_FUN_DECL(examJudgeMapSetDrawing)       (JNIEnv* env, jobject thiz, jboolean drawing);
     jbyteArray JNI_JUDGE_FUN_DECL(examJudgeMapImage)            (JNIEnv* env, jobject thiz);
     jint       JNI_JUDGE_FUN_DECL(examJudgeMapImageSetCallback) (JNIEnv* env, jobject thiz);
+    jdouble    JNI_JUDGE_FUN_DECL(examCalcGpsDistance)          (JNIEnv* env, jobject thiz, jdouble jd1, jdouble wd1, jdouble jd2, jdouble wd2, jdouble h);
 
     virtual void examJudgeCallbackLogToCaller(int level, const char* info, int len) override;
     virtual void examJudgeCallbackRealExamToCaller(const char* data, int len) override;
diff --git a/entry/src/main/cpp/sdk/api/jni/JNIMethodTable.cpp b/entry/src/main/cpp/sdk/api/jni/JNIMethodTable.cpp
index 2f263ebc..f554e94a 100644
--- a/entry/src/main/cpp/sdk/api/jni/JNIMethodTable.cpp
+++ b/entry/src/main/cpp/sdk/api/jni/JNIMethodTable.cpp
@@ -25,6 +25,7 @@ JNIMethodTable::JNIMethodTable()
     jniSign(JNI_RET(jint),       JNI_FUN(examJudgeMapSetDrawing), JNI_ARG(jboolean)); // "(Z)I"
     jniSign(JNI_RET(jbyteArray), JNI_FUN(examJudgeMapImage)); // "()[B"
     jniSign(JNI_RET(jint),       JNI_FUN(examJudgeMapImageSetCallback)); // "()I"
+    jniSign(JNI_RET(jdouble),    JNI_FUN(examCalcGpsDistance), JNI_ARG(jdouble), JNI_ARG(jdouble), JNI_ARG(jdouble), JNI_ARG(jdouble), JNI_ARG(jdouble)); // "(DDDDD)D"
 
     jniSign(JNI_RET(jvoid), JNI_FUN(examJudgeCallbackLog),      JNI_ARG(jint), JNI_ARG(jstring), JNI_ARG(jint)); // "(ILjava/lang/String;I)V"
     jniSign(JNI_RET(jvoid), JNI_FUN(examJudgeCallbackRealExam), JNI_ARG(jstring), JNI_ARG(jint)); // "(Ljava/lang/String;I)V"
diff --git a/entry/src/main/cpp/sdk/api/jni/JNITypedef.h b/entry/src/main/cpp/sdk/api/jni/JNITypedef.h
index 553db7b6..8f373c7d 100644
--- a/entry/src/main/cpp/sdk/api/jni/JNITypedef.h
+++ b/entry/src/main/cpp/sdk/api/jni/JNITypedef.h
@@ -33,7 +33,7 @@ JUDGE_C_API void __jni_judge_log_func__(const char* file, int line, const char*
 
 #define JNI_JUDGE_API_JOIN(ret, func, args, calls)                 \
 JNIEXPORT ret JNICALL JNI_JUDGE_CAT_NAME(func) args                \
-{ return FactoryExamApi->JNI_JUDGE_CAT_NAME(func) calls; } \
+{ return FactoryExamApi->JNI_JUDGE_CAT_NAME(func) calls; }         \
 
 #define JNI_JUDGE_FUN_DECL(func)  JNI_JUDGE_CAT_NAME(func)
 #define JNI_JUDGE_FUN_IMPL(func)  JNIApiBridge::JNI_JUDGE_CAT_NAME(func)
diff --git a/entry/src/main/cpp/sdk/api/js/JSApiBridge.cpp b/entry/src/main/cpp/sdk/api/js/JSApiBridge.cpp
index 29a34977..95f7cb39 100644
--- a/entry/src/main/cpp/sdk/api/js/JSApiBridge.cpp
+++ b/entry/src/main/cpp/sdk/api/js/JSApiBridge.cpp
@@ -438,6 +438,30 @@ JS_JUDGE_FUN_IMPL(examJudgeMapImageSetCallback)
     return createErrorCode(env, code);
 }
 
+JS_JUDGE_FUN_IMPL(examCalcGpsDistance)
+{
+    logdebug("call js_examCalcGpsDistance");
+    size_t argc = 5; napi_value args[5] = {nullptr};
+
+    if(!getArg(env, cbinfo, argc, args))
+    {
+        return createErrorCode(env, errorNapiArgCount);
+    }
+
+    double jd1=0.0, wd1=0.0, jd2=0.0, wd2=0.0, h=0.0;
+    if(!getDouble(env, args[0], jd1) ||
+       !getDouble(env, args[1], wd1) ||
+       !getDouble(env, args[2], jd2) ||
+       !getDouble(env, args[3], wd2) ||
+       !getDouble(env, args[4], h) )
+    {
+        return createErrorCode(env, errorNapiArgType);
+    }
+
+    double distance = ExamService::examCalcGpsDistance(jd1,wd1,jd2,wd2,h);
+    return createDouble(env, distance);
+}
+
 void JSApiBridge::examJudgeCallbackLogToCaller(int level, const char* info, int len)
 {
     if(level < LOG_LV_CLOSE || level > LOG_LV_ALL || nullptr == info || len <= 0) return;
@@ -589,6 +613,31 @@ bool JSApiBridge::getBool(napi_env env, napi_value nva, bool& value)
     return true;
 }
 
+bool JSApiBridge::getDouble(napi_env env, napi_value nva, double& value)
+{
+    napi_valuetype type;
+    napi_status status = napi_typeof(env, nva, &type);
+    if(napi_ok != status)
+    {
+        logerror("call napi_typeof failed status=%d", status);
+        return false;
+    }
+    if(type != napi_number)
+    {
+        logerror("is not napi_number type=%d", type);
+        return false;
+    }
+    double result;
+    status = napi_get_value_double(env, nva, &result);
+    if(napi_ok != status)
+    {
+        logerror("call napi_get_value_double failed status=%d", status);
+        return false;
+    }
+    value = result;
+    return true;
+}
+
 bool JSApiBridge::getRef(napi_env env, napi_value nva, napi_ref& value)
 {
     napi_valuetype type = napi_undefined;
@@ -656,6 +705,18 @@ napi_value JSApiBridge::createString(napi_env env, const std::string& value)
     return result;
 }
 
+napi_value JSApiBridge::createDouble(napi_env env, double value)
+{
+    napi_value result = nullptr;
+    napi_status status = napi_create_double(env, value, &result);
+    if(napi_ok != status)
+    {
+        logerror("call napi_create_double error, status=%d", status);
+    }
+    return result;
+}
+
+
 napi_value JSApiBridge::createArrayBuffer(napi_env env, const void* data, size_t size, size_t chunk, napi_typedarray_type type)
 {
     const size_t offset = 0; //偏移字节数
diff --git a/entry/src/main/cpp/sdk/api/js/JSApiBridge.h b/entry/src/main/cpp/sdk/api/js/JSApiBridge.h
index 0c6ec7b9..7acd76d2 100644
--- a/entry/src/main/cpp/sdk/api/js/JSApiBridge.h
+++ b/entry/src/main/cpp/sdk/api/js/JSApiBridge.h
@@ -39,6 +39,7 @@ public:
     JS_JUDGE_FUN_DECL(examJudgeMapSetDrawing);
     JS_JUDGE_FUN_DECL(examJudgeMapImage);
     JS_JUDGE_FUN_DECL(examJudgeMapImageSetCallback);
+    JS_JUDGE_FUN_DECL(examCalcGpsDistance);
 
     virtual void examJudgeCallbackLogToCaller(int level, const char* info, int len) override;
     virtual void examJudgeCallbackRealExamToCaller(const char* data, int len) override;
@@ -57,12 +58,14 @@ public:
     bool getInt64 (napi_env env, napi_value nva, int64& value);
     bool getString(napi_env env, napi_value nva, std::string& value);
     bool getBool  (napi_env env, napi_value nva, bool& value);
+    bool getDouble(napi_env env, napi_value nva, double& value);
     bool getRef   (napi_env env, napi_value nva, napi_ref& value);
 
     napi_value createErrorCode(napi_env env, int code, const char* desc = "", const char* file = __FILE__, int line = __LINE__);
     napi_value createInt      (napi_env env, int value);
     napi_value createInt64    (napi_env env, int64 value);
     napi_value createString   (napi_env env, const std::string& value);
+    napi_value createDouble   (napi_env env, double value);
     //size元素数量 chunk每个元素字节大小
     napi_value createArrayBuffer(napi_env env, const void* data, size_t size, size_t chunk=sizeof(char), napi_typedarray_type type = napi_uint8_clamped_array);
 
diff --git a/entry/src/main/cpp/sdk/api/platform/JudgeSdk.cpp b/entry/src/main/cpp/sdk/api/platform/JudgeSdk.cpp
index 7790de3c..6de7e709 100644
--- a/entry/src/main/cpp/sdk/api/platform/JudgeSdk.cpp
+++ b/entry/src/main/cpp/sdk/api/platform/JudgeSdk.cpp
@@ -26,6 +26,7 @@ JS_JUDGE_API_JOIN(examJudgeMapSetScaling);
 JS_JUDGE_API_JOIN(examJudgeMapSetDrawing);
 JS_JUDGE_API_JOIN(examJudgeMapImage);
 JS_JUDGE_API_JOIN(examJudgeMapImageSetCallback);
+JS_JUDGE_API_JOIN(examCalcGpsDistance);
 
 // EXTERN_C_START
 
@@ -56,6 +57,7 @@ static napi_value JS_JUDGE_MODULE_EXPORT(napi_env env, napi_value exports)
             JS_JUDGE_CAT_DESC(examJudgeMapSetDrawing),
             JS_JUDGE_CAT_DESC(examJudgeMapImage),
             JS_JUDGE_CAT_DESC(examJudgeMapImageSetCallback),
+            JS_JUDGE_CAT_DESC(examCalcGpsDistance),
         };
         //napi_set_named_property
         napi_define_properties(env, exports, sizeof(desc)/sizeof(desc[0]), desc);
@@ -115,7 +117,8 @@ JNI_JUDGE_API_JOIN(jint,       examJudgeMapSetParam,         (JNIEnv* env, jobje
 JNI_JUDGE_API_JOIN(jint,       examJudgeMapSetScaling,       (JNIEnv* env, jobject thiz, jint scaling),                (env,thiz,scaling));
 JNI_JUDGE_API_JOIN(jint,       examJudgeMapSetDrawing,       (JNIEnv* env, jobject thiz, jboolean drawing),            (env,thiz,drawing));
 JNI_JUDGE_API_JOIN(jbyteArray, examJudgeMapImage,            (JNIEnv* env, jobject thiz),                              (env,thiz));
-JNI_JUDGE_API_JOIN(jint,       examJudgeMapImageSetCallback, (JNIEnv* env, jobject thiz),                              (env,thiz));                                                                           \
+JNI_JUDGE_API_JOIN(jint,       examJudgeMapImageSetCallback, (JNIEnv* env, jobject thiz),                              (env,thiz));
+JNI_JUDGE_API_JOIN(jdouble,    examCalcGpsDistance,          (JNIEnv* env, jobject thiz, jdouble jd1, jdouble wd1, jdouble jd2, jdouble wd2, jdouble h), (env,thiz,jd1,wd1,jd2,wd2,h));                                                                          \
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* jvm, void* reserved)
 {
@@ -163,6 +166,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* jvm, void* reserved)
     JNI_JUDGE_CHECK_METHOD(examJudgeMapSetDrawing);
     JNI_JUDGE_CHECK_METHOD(examJudgeMapImage);
     JNI_JUDGE_CHECK_METHOD(examJudgeMapImageSetCallback);
+    JNI_JUDGE_CHECK_METHOD(examCalcGpsDistance);
 
     static JNINativeMethod methods[] =
     {
@@ -185,6 +189,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* jvm, void* reserved)
         JNI_JUDGE_CAT_DESC(examJudgeMapSetDrawing),
         JNI_JUDGE_CAT_DESC(examJudgeMapImage),
         JNI_JUDGE_CAT_DESC(examJudgeMapImageSetCallback),
+        JNI_JUDGE_CAT_DESC(examCalcGpsDistance),
     };
 
     ret = env->RegisterNatives(clazz, methods, sizeof(methods)/sizeof(methods[0]));
@@ -322,11 +327,17 @@ JUDGE_SDK_API const char* JUDGE_SDK_METHOD examJudgeMapImage()
     return FactoryExamApi->examJudgeMapImage();
 }
 
-JUDGE_SDK_API int examJudgeMapImageSetCallback(examJudgeCallbackMapImage callback)
+JUDGE_SDK_API int JUDGE_SDK_METHOD examJudgeMapImageSetCallback(examJudgeCallbackMapImage callback)
 {
     return FactoryExamApi->examJudgeMapImageSetCallback(callback);
 }
 
+JUDGE_SDK_API double JUDGE_SDK_METHOD examCalcGpsDistance(double jd1, double wd1, double jd2, double wd2, double h)
+{
+    return FactoryExamApi->examCalcGpsDistance(jd1, wd1, jd2, wd2, h);
+}
+
+
 #endif  // JUDGE_OS_OHOS  JUDGE_OS_ANDROID
 
 
diff --git a/entry/src/main/cpp/sdk/common/CleverHelper.h b/entry/src/main/cpp/sdk/common/CleverHelper.h
index d2dddb93..78f56a22 100644
--- a/entry/src/main/cpp/sdk/common/CleverHelper.h
+++ b/entry/src/main/cpp/sdk/common/CleverHelper.h
@@ -2,7 +2,7 @@
  * 说明: 一些方便调试编译控制助手
  *
  * 作者: 杨海洋
- * 日期: 2025-05-11
+ * 日期: 2023-05-11
  */
 
 #ifndef CLEVERHELPER_H
diff --git a/entry/src/main/cpp/sdk/common/HVersion.cpp b/entry/src/main/cpp/sdk/common/HVersion.cpp
index 62c1a3ac..1fa18791 100644
--- a/entry/src/main/cpp/sdk/common/HVersion.cpp
+++ b/entry/src/main/cpp/sdk/common/HVersion.cpp
@@ -125,21 +125,35 @@
 #define BUILD_SEC_CH0   (__TIME__[6])
 #define BUILD_SEC_CH1   (__TIME__[7])
 
-#define JUDGE_COMPILE_TIME              \
-    BUILD_YEAR_CH2,  BUILD_YEAR_CH3,    \
-    BUILD_MONTH_CH0, BUILD_MONTH_CH1,   \
-    BUILD_DAY_CH0,   BUILD_DAY_CH1,     \
-    BUILD_HOUR_CH0,  BUILD_HOUR_CH1,    \
-    BUILD_MIN_CH0,   BUILD_MIN_CH1,     \
-    BUILD_SEC_CH0,   BUILD_SEC_CH1      \
 
+const char JUDGE_VERSION_TIME[] =
+{
+    BUILD_YEAR_CH2,  BUILD_YEAR_CH3,
+    BUILD_MONTH_CH0, BUILD_MONTH_CH1,
+    BUILD_DAY_CH0,   BUILD_DAY_CH1,
+    BUILD_HOUR_CH0,  BUILD_HOUR_CH1,
+    BUILD_MIN_CH0,   BUILD_MIN_CH1,
+    BUILD_SEC_CH0,   BUILD_SEC_CH1,
+    '\0'
+};
 
-const char _JUDGE_VERSION_INFO_[] =
+const char JUDGE_VERSION_INFO[] =
 {
     JUDGE_CHARS_MAJOR, '.',
     JUDGE_CHARS_MINOR, '.',
     JUDGE_CHARS_PATCH, '.',
-    JUDGE_COMPILE_TIME,
+    JUDGE_VERSION_TIME[0],
+    JUDGE_VERSION_TIME[1],
+    JUDGE_VERSION_TIME[2],
+    JUDGE_VERSION_TIME[3],
+    JUDGE_VERSION_TIME[4],
+    JUDGE_VERSION_TIME[5],
+    JUDGE_VERSION_TIME[6],
+    JUDGE_VERSION_TIME[7],
+    JUDGE_VERSION_TIME[8],
+    JUDGE_VERSION_TIME[9],
+    JUDGE_VERSION_TIME[10],
+    JUDGE_VERSION_TIME[11],
     '\0'
 };
 
diff --git a/entry/src/main/cpp/sdk/common/HVersion.h b/entry/src/main/cpp/sdk/common/HVersion.h
index 22c712d9..5f262103 100644
--- a/entry/src/main/cpp/sdk/common/HVersion.h
+++ b/entry/src/main/cpp/sdk/common/HVersion.h
@@ -30,9 +30,12 @@
                              JUDGE_AUX_STR(JUDGE_VERSION_MINOR) "." \
                              JUDGE_AUX_STR(JUDGE_VERSION_PATCH)
 
-extern const char _JUDGE_VERSION_INFO_[];
-//版本详细信息[版本号+版本编译时间] 2.0.0.240401131705
-#define JUDGE_VERSION_INFO   _JUDGE_VERSION_INFO_
+
+//版本编译时间 240401131705
+extern const char JUDGE_VERSION_TIME[];
+
+//版本详细信息[版本号+版本编译时间] 1.0.0.240401131705
+extern const char JUDGE_VERSION_INFO[];
 
 
 #endif // HVERSION_H
diff --git a/entry/src/main/cpp/sdk/database/HDBTable.h b/entry/src/main/cpp/sdk/database/HDBTable.h
index b6550609..309af5a6 100644
--- a/entry/src/main/cpp/sdk/database/HDBTable.h
+++ b/entry/src/main/cpp/sdk/database/HDBTable.h
@@ -119,6 +119,8 @@ namespace siteof
     siteof_declare(zjjh);
     siteof_declare(hbwhjz);
     siteof_declare(JXYTSF001);
+    siteof_declare(hnzzkm3);
+    siteof_declare(jswxbz);
     siteof_declare(tcrx);  //无锡所检测地点版本特殊
 
 
diff --git a/entry/src/main/cpp/sdk/database/IDBTables.h b/entry/src/main/cpp/sdk/database/IDBTables.h
index 62e1f193..03f8c5d5 100644
--- a/entry/src/main/cpp/sdk/database/IDBTables.h
+++ b/entry/src/main/cpp/sdk/database/IDBTables.h
@@ -31,7 +31,7 @@ public:
     inline MapPointTable*     getMapPointTable()      const noexcept { return m_mapPoint; }
     inline MapPointItemTable* getMapPointItemsTable() const noexcept { return m_mapPointItem; }
 private:
-    ItemInfoTable*     m_itemInfo      = nullptr;
+    ItemInfoTable*     m_itemInfo     = nullptr;
     MarkTable*         m_mark         = nullptr;
     SysSetTable*       m_sysset       = nullptr;
     SysParmTable*      m_sysparm      = nullptr;
diff --git a/entry/src/main/cpp/sdk/database/sysset/SysSetTable.h b/entry/src/main/cpp/sdk/database/sysset/SysSetTable.h
index 500b7e03..e10b52ad 100644
--- a/entry/src/main/cpp/sdk/database/sysset/SysSetTable.h
+++ b/entry/src/main/cpp/sdk/database/sysset/SysSetTable.h
@@ -170,6 +170,7 @@ class JUDGE_API SysSetTable : public IDBTable
     SYSSET_DECLARE(346);                             //RTK差分改正数串口(-1-普通GPS，0-共用串口2，>0-额外串口) // 0
     SYSSET_DECLARE(348);                             //直线行驶中不进其他考试项目(0-否 1-是) //0
     SYSSET_DECLARE(349, type_array, ",");            //RTK基准站参数   //43.83836419,125.25308285,226.013,1.3,5
+    SYSSET_DECLARE(350, type_int);                   //采用车速类型（0-GPS 1-PLC 2-脉冲距离计算）
     SYSSET_DECLARE(355);                             //差分模式下任何时刻都判变道不打方向灯(0-否 1-以前点车道数变化 2-以基准点车道数发生变化  3-车轮压线) // 0
     SYSSET_DECLARE(359);                             //自动搜索差分车道(0-路段号无关，每次都搜索当前车道，>0-根据路段号搜索，如果路段号为空则为搜索时间秒)  //0
     SYSSET_DECLARE(360, type_array, "^");            //起步取消压线评判距离（米） //0
@@ -269,6 +270,7 @@ class JUDGE_API SysSetTable : public IDBTable
         SYSSET_ASSIGN(346);
         SYSSET_ASSIGN(348);
         SYSSET_ASSIGN(349);
+        SYSSET_ASSIGN(350);
         SYSSET_ASSIGN(355);
         SYSSET_ASSIGN(359);
         SYSSET_ASSIGN(360);
diff --git a/entry/src/main/cpp/sdk/exam/ExamCarSub2.cpp b/entry/src/main/cpp/sdk/exam/ExamCarSub2.cpp
index 1b15c653..a5e2c8dc 100644
--- a/entry/src/main/cpp/sdk/exam/ExamCarSub2.cpp
+++ b/entry/src/main/cpp/sdk/exam/ExamCarSub2.cpp
@@ -163,6 +163,12 @@ bool ExamCarSub2::examDrawMap()
 
 bool ExamCarSub2::examMarkItem(ExamItemCode itemNo, const std::string& serial, bool once, bool force, bool event, MarkType type)
 {
+    //正式考试 扣分扣到不合格为止
+    if(isExamMode() && !isQualified())
+    {
+        logtrace("is not qualified %s itemNo=%d,serial=%s", target().c_str(), itemNo, serial.c_str());
+        return false;
+    }
     if(m_examState != examStateIng)
     {
         logwarning("mark-warning itemNo=%d, serial=%s,type=%d", itemNo, serial.c_str(), type);
@@ -176,12 +182,6 @@ bool ExamCarSub2::examMarkItem(ExamItemCode itemNo, const std::string& serial, b
 
     if(false == force)
     {
-        //正式考试 扣分扣到不合格为止
-        if(isExamMode() && !isQualified())
-        {
-            return false;
-        }
-
         if(true == once)
         {
             const int size = m_marks.size();
diff --git a/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp b/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp
index 8a34692b..75c31948 100644
--- a/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp
+++ b/entry/src/main/cpp/sdk/exam/ExamCarSub3.cpp
@@ -108,12 +108,13 @@ ErrorCode ExamCarSub3::examGoonExam()
             //断点扣分不要生成任何事件通知，关心的就是本地扣出来即可 //???yhyflag
             //Mark(markItem.xmdm, markItem.kfdm, false, true, 0, true); //Self.Mark(TempItemNo, Str3, False, True, 0, True);
 
-            TKM3Item* item = findExamItem(markItem.xmdm);
-            TASSERT(item != nullptr, "");
-            if(item)
-            {
-                item->Item_Color = itemStateBhg;
-            }
+            //扣分只记录分数，不需要根据扣分记录项目状态 20240816 在洛阳确认的
+            //TKM3Item* item = findExamItem(markItem.xmdm);
+            //TASSERT(item != nullptr, "");
+            //if(item)
+            //{
+            //    item->Item_Color = itemStateBhg;
+            //}
 
             loginfo("ddxk-mark xmdm=%d,kfdm=%s", markItem.xmdm, markItem.kfdm.c_str());
         }
@@ -1244,17 +1245,17 @@ void ExamCarSub3::Deal_KM3_Judge()
         bool qualified = isQualified();
 
         //ToDo1:检查当前正在进行的项目状态
-        if(!qualified)
-        {
-            for(auto it = m_sub3Items.begin(); it != m_sub3Items.end(); it++)
-            {
-                const TKM3Item* examItem = it->second->getExamItem();
-                if(examItem->TestPro == ItemProFlagInit || examItem->TestPro == ItemProFlagJudge)
-                {
-                    KM3EndItem(examItem->ItemNo);
-                }
-            }
-        }
+        //if(!qualified)
+        //{
+        //    for(auto it = m_sub3Items.begin(); it != m_sub3Items.end(); it++)
+        //    {
+        //        const TKM3Item* examItem = it->second->getExamItem();
+        //        if(examItem->TestPro == ItemProFlagInit || examItem->TestPro == ItemProFlagJudge)
+        //        {
+        //            KM3EndItem(examItem->ItemNo);
+        //        }
+        //    }
+        //}
 
         if(finish || !qualified)
         {
@@ -2112,11 +2113,24 @@ void ExamCarSub3::Calc_LaneDistance()
                                 case 2: RTKKM3.Wheel_RF_ToBaseLine = distance; break;
                                 case 3: RTKKM3.Wheel_LB_ToBaseLine = distance; break;
                                 case 4: RTKKM3.Wheel_RB_ToBaseLine = distance; break;
-                                case 5: RTKKM3.Body_RF_ToBaseLine  = distance; break; //20240801
-                                case 6: RTKKM3.Body_RB_ToBaseLine  = distance; break; //20240801
+                                case 5: RTKKM3.Body_RF_ToBaseLine = distance; break; //20240801
+                                case 6: RTKKM3.Body_RB_ToBaseLine = distance; break; //20240801
                                 default: break;
                                 }
                             }
+                            else
+                            {
+                                if(GpsMath::IsCross(line, L0))
+                                {
+                                    int distance = -GpsMath::PointToSeg(pt, L0);
+                                    switch(k)
+                                    {
+                                    case 5: RTKKM3.Body_RF_ToBaseLine = distance; break; //20240801
+                                    case 6: RTKKM3.Body_RB_ToBaseLine = distance; break; //20240801
+                                    default: break;
+                                    }
+                                }
+                            }
                         }
                     }
                     else if(p == 3)  //3：车身左侧与本车道左侧距离
@@ -3983,6 +3997,13 @@ void ExamCarSub3::KM3EndItem(int ItemNo)
 
 bool ExamCarSub3::examMarkItem(int itemNo, const std::string& serial, bool once, bool force, bool event, MarkType type)
 {
+    //正式考试 扣分扣到不合格为止
+    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：远程下发的考试扣分
     bool result = false;
     //*if(Test_Status == 1) return result;
@@ -4679,11 +4700,19 @@ DriveDirType ExamCarSub3::driveDirection(const TModelLine* lane)
 {
     //ptBegin 车道线起始点
     //ptEnd 车道线起终点点
-    //double angle1 = GpsMath::getAngle(lane->PtBegin, lane->PtEnd);
-    //double angle2 = GpsMath::getAngle(m_cg->body.points_b[II(13)], m_cg->body.points_b[II(1)]);
+    //double a1 = GpsMath::getAngle(lane->PtBegin, lane->PtEnd);
+    //double a2 = GpsMath::getAngle(m_cg->body.points_b[II(13)], m_cg->body.points_b[II(1)]);
     double a1 = GpsMath::GetAngle_HQ(lane->PtBegin, lane->PtEnd, -1);
     double a2 = GpsMath::GetAngle_HQ(m_cg->body.points_b[II(13)], m_cg->body.points_b[II(1)], -1);
 
+    //Pointi p1 = m_cg->body.points_b[II(1)];
+    //Pointi p13 = m_cg->body.points_b[II(13)];
+    //logtrace("p1(%d,%d),p13(%d,%d),begin(%d,%d),end(%d,%d)",
+    //         p1.x, p1.y,
+    //         p13.x, p13.y,
+    //         lane->PtBegin.x, lane->PtBegin.y,
+    //         lane->PtEnd.x, lane->PtEnd.y);
+
     DriveDirType dir = DriveDirX;
     int angle = ((int)std::round(a1 - a2) + 360) % 360;
     if(angle < 60 || angle > 300)
diff --git a/entry/src/main/cpp/sdk/exam/ExamSensor.cpp b/entry/src/main/cpp/sdk/exam/ExamSensor.cpp
index 6639c599..5d944750 100644
--- a/entry/src/main/cpp/sdk/exam/ExamSensor.cpp
+++ b/entry/src/main/cpp/sdk/exam/ExamSensor.cpp
@@ -28,7 +28,6 @@ bool ExamSensor::pretreatment(TChuanGan* cg)
 {
     if(cg == nullptr) return false;
 
-
     TChuanGan* his = m_car->historyChuanGan();
     if(his)
     {
@@ -109,7 +108,9 @@ bool ExamSensor::pretreatment(TChuanGan* cg)
 bool ExamSensor::convertDatas(TChuanGan* cg)
 {
     TSensorInfo& sor = cg->real.sensor;
+    TGpsInfo& gps = cg->real.gps;
     sor.dw_plc = sor.dw;
+
     // if(m_car->examSubject() == ExamSubject2)
     // {
     // }
@@ -173,7 +174,6 @@ bool ExamSensor::convertDatas(TChuanGan* cg)
         }
     }
 
-    TGpsInfo& gps = cg->real.gps;
     gps.errorFlag = true;
 
     //测试是否逆向行驶
@@ -195,7 +195,7 @@ bool ExamSensor::convertDatas(TChuanGan* cg)
     }
 
 #ifndef JUDGE_USE_INSPECT
-    gps.sd *= 1.852;   //无锡所检测不需要乘这个系数，因为我们实际用的时候是gps速度，无锡所是加工后的数据
+    gps.sd *= GPS_VEL_COEFF;   //无锡所检测不需要乘这个系数，因为我们实际用的时候是gps速度，无锡所是加工后的数据
 #endif
 
     //lognote("jd=%0.14f gps.wd==%0.14f, gps.hxj=%0.14f, gps.gdc=%0.14f, gps.bklx=%d",
@@ -205,6 +205,16 @@ bool ExamSensor::convertDatas(TChuanGan* cg)
     gps.jd = GpsMath::convertGpsCoord2(gps.jd);
     gps.wd = GpsMath::convertGpsCoord2(gps.wd);
 
+    int s350 = TableSysSet->asInt350();
+    if(s350 == 1) //采用车速类型（0-GPS 1-PLC 2-脉冲距离计算）
+    {
+        gps.sd = sor.cs;
+    }
+    else
+    {
+        sor.cs = gps.sd;
+    }
+
     //位置差分, 角度差分
     if(gps.dwzt == gpsStatusNARROW_INT && gps.jdzt == gpsStatusANGLE)
     {
@@ -218,9 +228,7 @@ bool ExamSensor::convertDatas(TChuanGan* cg)
     }
 
     gps.errorFlag = false;
-    // return gps.rtkEnabled == true && gps.errorFlag == false; //不能如果不在差分，行驶距离什么的计算都不对 yhy 2024-06-18
-    // return true;  //yhy 2024-04-30
-    // return !Tools::isZero(gps.jd) && !Tools::isZero(gps.wd);
+
     ExamSubject sub = m_car->examSubject();
     if(ExamSubject2 == sub)
     {
@@ -228,8 +236,20 @@ bool ExamSensor::convertDatas(TChuanGan* cg)
     }
     else if(ExamSubject3 == sub)
     {
+        if(gps.dwzt > 0 && gps.jdzt > 0 && gps.jd > 1 && gps.wd > 1) //20240811 yhy
+        {
+            //数据是正常的
+        }
+        else
+        {
+            if(m_car->historyCount() > 0)
+            {
+                cloneWith(m_car->historyChuanGan(), cg);
+            }
+        }
         return true;
     }
+
     return true;
 }
 
@@ -300,18 +320,7 @@ bool ExamSensor::calcCarBody(TChuanGan* cg)
         GpsMath::calcEastAndNorthDistanceCM(m_basePoint, ps[II(33)], m_basePoint.gc, x, y);
 
         TGpsInfo& gps = cg->real.gps;
-        if(gps.rtkEnabled && gps.jd > 1 && gps.wd > 1)
-        {
-            gps.ai_gps = Pointi(x, y);
-        }
-        else
-        {
-            if(m_car->historyCount() > 0)
-            {
-                gps.ai_gps = m_car->historyAiGps();  //20240702 yhy
-                //return false; //这里不能返回false 第一帧数据就是非差分状态？如果做模拟灯光的时候一直没差分进不了项目了
-            }
-        }
+        gps.ai_gps = Pointi(x, y);
 
         if(ExamSubject2 == subject)
         {
@@ -419,12 +428,6 @@ bool ExamSensor::GetCarDirStauts(TChuanGan* cg)
         }
     }
 
-    if(cg->real.gps.rtkEnabled == false) //20240702 yhy
-    {
-        cloneWith(m_car->historyChuanGan(), cg);
-        return true;
-    }
-
     //if(cg.Rtk_Enabled = False) or (Lscg[zj(1)].Rtk_Enabled = False) or (Lscg[zj(2)].Rtk_Enabled = False) then Exit;
     if(cg->move == moveStop && cg->real.gps.rtkEnabled == false)
     {
@@ -826,12 +829,14 @@ bool ExamSensor::GetCarDirStatus_KM2(TChuanGan* cg)
 
 void ExamSensor::cloneWith(TChuanGan* src, TChuanGan* dest)
 {
-    dest->move = src->move;
-    dest->real.gps.ai_gps = src->real.gps.ai_gps;
-    dest->ai_ljjl = src->ai_ljjl;
-    dest->ai_dcjl = src->ai_dcjl;
-    dest->ai_ljjl_cm = src->ai_ljjl_cm;
-    dest->ai_dcjl_cm = src->ai_dcjl_cm;
+    dest->real.gps = src->real.gps;
+    dest->real.gps2 = src->real.gps2;
+    //dest->move = src->move;
+    //dest->real.gps.ai_gps = src->real.gps.ai_gps;
+    //dest->ai_ljjl = src->ai_ljjl;
+    //dest->ai_dcjl = src->ai_dcjl;
+    //dest->ai_ljjl_cm = src->ai_ljjl_cm;
+    //dest->ai_dcjl_cm = src->ai_dcjl_cm;
     //dest->tkCnt = src->tkCnt;
 
 }
diff --git a/entry/src/main/cpp/sdk/exam/ExamService.cpp b/entry/src/main/cpp/sdk/exam/ExamService.cpp
index 3b17cfd1..2bfd7735 100644
--- a/entry/src/main/cpp/sdk/exam/ExamService.cpp
+++ b/entry/src/main/cpp/sdk/exam/ExamService.cpp
@@ -255,6 +255,19 @@ int ExamService::examJudgeMapImageSetCallback(examJudgeCallbackMapImage callback
     return QE(codeSuccess);
 }
 
+double ExamService::examCalcGpsDistance(double jd1, double wd1, double jd2, double wd2, double h)
+{
+    logdebug("call examCalcGpsDistance.");
+    //if(!m_init) return QE(errorInitNot);
+
+    double jd1_ = GpsMath::convertGpsCoord2(jd1);
+    double wd1_ = GpsMath::convertGpsCoord2(wd1);
+    double jd2_ = GpsMath::convertGpsCoord2(jd2);
+    double wd2_ = GpsMath::convertGpsCoord2(wd2);
+
+    return GpsMath::calcGpsDistanceCM(jd1_, wd1_, jd2_, wd2_, h);
+}
+
 int ExamService::examJudgeMapWidth()
 {
     logdebug("call examJudgeMapWidth.");
diff --git a/entry/src/main/cpp/sdk/exam/ExamService.h b/entry/src/main/cpp/sdk/exam/ExamService.h
index efabd8c0..e7beedc2 100644
--- a/entry/src/main/cpp/sdk/exam/ExamService.h
+++ b/entry/src/main/cpp/sdk/exam/ExamService.h
@@ -37,6 +37,7 @@ public:
     virtual int examJudgeMapSetDrawing(bool drawing) override;
     virtual const char* examJudgeMapImage() override;
     virtual int examJudgeMapImageSetCallback(examJudgeCallbackMapImage callback) override;
+    virtual double examCalcGpsDistance(double jd1, double wd1, double jd2, double wd2, double h) override;
 
     //暂时未导出给APP端使用
     virtual int examJudgeMapWidth() override;
diff --git a/entry/src/main/cpp/sdk/exam/IExamCar.cpp b/entry/src/main/cpp/sdk/exam/IExamCar.cpp
index 9176dc27..9a1b765e 100644
--- a/entry/src/main/cpp/sdk/exam/IExamCar.cpp
+++ b/entry/src/main/cpp/sdk/exam/IExamCar.cpp
@@ -85,7 +85,7 @@ int IExamCar::examJudgeBeginExam(const char* data, int len)
     ExamCarType cartype = carType();
     ExamSubject subject = examSubject();
     m_grade = GRADE_TOTAL_FULL;
-    m_gradePass = examCarType2Pass(subject, cartype);  //及格分数
+    if(m_stuInfo.passing <= 0) { m_stuInfo.passing = examCarType2Pass(subject, cartype); }  //及格分数
     m_timeBegin = isReplay() ? 0 : Tools::nowTime();
     m_timeEnd = 0;
     m_disForward = 0;
diff --git a/entry/src/main/cpp/sdk/exam/IExamCar.h b/entry/src/main/cpp/sdk/exam/IExamCar.h
index 6b24df0f..5589108d 100644
--- a/entry/src/main/cpp/sdk/exam/IExamCar.h
+++ b/entry/src/main/cpp/sdk/exam/IExamCar.h
@@ -97,11 +97,11 @@ public:
     virtual const std::string&   carType2()         MEANS { return m_carInfo->kscx; }
     virtual int                  carID()            MEANS { return m_carInfo->kchm; }
     virtual int                  grade()            MEANS { return m_grade; }
-    virtual int                  gradePass()        MEANS { return m_gradePass; }
+    virtual int                  gradePass()        MEANS { return m_stuInfo.passing; }
     virtual int                  disForward()       MEANS { return m_disForward; }
     virtual int                  disBackward()      MEANS { return m_disBackward; }
     virtual int                  disTravel()        MEANS { return m_disForward - m_disBackward; }
-    virtual bool                 isQualified()      MEANS { return m_grade >= m_gradePass; }
+    virtual bool                 isQualified()      MEANS { return m_grade >= m_stuInfo.passing; }
     virtual bool                 isExamMode()       MEANS { return m_stuInfo.exam == examModeExam; }
     virtual bool                 isExamDrill()      MEANS { return m_stuInfo.exam == examModeDrill; }
     virtual bool                 canContinueExam()  MEANS { return isQualified() || isExamDrill(); }
@@ -150,7 +150,6 @@ protected:
     int                 m_disGears[20];    //档位距离
 
     int                 m_grade      = 0;  //当前得分
-    int                 m_gradePass  = 0;  //考试及格分数
     int64               m_timeBegin  = 0;  //开始时间(毫秒)
     int64               m_timeEnd    = 0;  //结束时间(毫秒)
     TMarkInfos          m_marks      = {}; //具体的扣分信息
diff --git a/entry/src/main/cpp/sdk/exam/IExamService.h b/entry/src/main/cpp/sdk/exam/IExamService.h
index 3da355dd..08c0d8f1 100644
--- a/entry/src/main/cpp/sdk/exam/IExamService.h
+++ b/entry/src/main/cpp/sdk/exam/IExamService.h
@@ -25,6 +25,8 @@ public:
     virtual int examJudgeSetRealExamCallback(examJudgeCallbackRealExam callback) = 0;
     virtual int examJudgeSetPerformCallback(examJudgeCallbackPerform callback) = 0;
     virtual int examJudgeMapImageSetCallback(examJudgeCallbackMapImage callback) = 0;
+    virtual double examCalcGpsDistance(double jd1, double wd1, double jd2, double wd2, double h) = 0;
+
 
     virtual void examJudgeCallbackLogToCaller(int level, const char* info, int len) = 0;
     virtual void examJudgeCallbackRealExamToCaller(const char* data, int len) = 0;
diff --git a/entry/src/main/cpp/sdk/judge/HJudgeItem.h b/entry/src/main/cpp/sdk/judge/HJudgeItem.h
index dd369b9b..26bdf11d 100644
--- a/entry/src/main/cpp/sdk/judge/HJudgeItem.h
+++ b/entry/src/main/cpp/sdk/judge/HJudgeItem.h
@@ -456,6 +456,10 @@ struct TSub3Item41Mndg  //模拟灯光 41
     int64 yjjtbeg = 0, yjjtend = 0; //20171031
 
     int LastSubItemNo = 0;
+
+    int64 endTick = 0;
+    bool  endFlag = false;
+
 };
 
 struct TSub3Item02Qbxx   //起步  2
@@ -479,8 +483,6 @@ struct TSub3Item02Qbxx   //起步  2
     //以下是溜车评判需要用到的变量
     int PubMaxLCValue = 0;
     Pointi PubLCTCPtt;
-    double PubLCTC_GPS_JD = 0.0;
-    double PubLCTC_GPS_WD = 0.0;
     bool PubCanMarkLC50Flag = true;  //注意初始必须是true
 };
 
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp
index 02299fdf..7fadedbc 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge02Qbxx.cpp
@@ -92,12 +92,13 @@ void Sub3Judge02Qbxx::dealJudgeItem()
             TCar* tcar = m_car->getTCar();
 
             int fdjds = tcar->FDJDS * tcar->fdjds_cdbl;
-            if(  (sor.fdjzs > 10 && sor.fdjzs < fdjds && cg->move == moveForward)
-                 && (sor1.fdjzs > 10 && sor1.fdjzs < fdjds && his1->move == moveForward)
-                 && (sor2.fdjzs > 10 && sor2.fdjzs < fdjds && his2->move == moveForward)
-                 && (sor3.fdjzs > 10 && sor3.fdjzs < fdjds && his3->move == moveForward)
-                 && (sor4.fdjzs > 10 && sor4.fdjzs < fdjds && his4->move == moveForward) &&
-                 (m_itemv.Mark_ChuangDong == false) ) //闯动
+            //保持和windows一模一样 原先还叠加了fdjzs>10和前进状态条件
+            if(  (sor.fdjzs > 0 && sor.fdjzs < fdjds)        // && cg->move == moveForward
+                 && (sor1.fdjzs > 0 && sor1.fdjzs < fdjds)   // && his1->move == moveForward
+                 && (sor2.fdjzs > 0 && sor2.fdjzs < fdjds)   // && his2->move == moveForward
+                 && (sor3.fdjzs > 0 && sor3.fdjzs < fdjds)   // && his3->move == moveForward
+                 && (sor4.fdjzs > 0 && sor4.fdjzs < fdjds)   // && his4->move == moveForward
+                 && (m_itemv.Mark_ChuangDong == false) ) //闯动
             {
                 m_itemv.Mark_ChuangDong = true;
                 JUDGE_MARK_SUB3(2, "08", false);
@@ -114,8 +115,10 @@ void Sub3Judge02Qbxx::dealJudgeItem()
             if(sor.fdjzs > ZSMax && sor1.fdjzs > ZSMax && sor2.fdjzs > ZSMax && sor3.fdjzs > ZSMax)
             {
                 bool bb = true;
+                int count  = m_car->historyCount();
                 for(int i = 1; i <= 10; i++)
                 {
+                    if(i >= count) break;
                     const TSensorInfo& sori = m_car->historySensor(i);
                     if(sori.dh2 == SYES)
                     {
@@ -198,9 +201,9 @@ void Sub3Judge02Qbxx::dealJudgeItem()
 
     //状态提示
     char buf[128] = {0};
-    SafeSprintf(buf, sizeof(buf), XCharacter("%s->State:%d,项目距离=%d厘米"),
+    SafeSprintf(buf, sizeof(buf), XCharacter("%s->State:%d,项目距离=%d厘米,最大后溜=%dCM"),
                 m_itemv.State == 1 ? XCharacter("起步未到达1米...") : XCharacter("起步超过1米..."),
-                m_itemv.State, cg->ai_ljjl_cm - m_itemv.Temp_JL_CM);
+                m_itemv.State, cg->ai_ljjl_cm - m_itemv.Temp_JL_CM, m_itemv.PubMaxLCValue);
 
     showStatus(buf);
 }
@@ -214,6 +217,7 @@ void Sub3Judge02Qbxx::nogo_timeout()
     const TChuanGan* his1 = m_car->historyChuanGan(1);
     const TSensorInfo& sor1 = his1->real.sensor;
 
+    // C2  N空挡是0  R倒车档9  P驻车档10  D前进挡11
     //档位或者手刹信号发生变化，且变化的结果是前进挡和松手刹状态，开始计时，10秒后扣分
     if(m_itemv.ZhunBeiQiBuTK == 0)
     {
@@ -241,7 +245,7 @@ void Sub3Judge02Qbxx::nogo_timeout()
                 if(cg->move != moveForward)
                 {
                     JUDGE_MARK_SUB3(2, "48", false);
-                    m_itemv.ZhunBeiQiBuTK = cg->tkCnt;
+                    m_itemv.ZhunBeiQiBuTK = 0; //赋值0就是动作变化才重新扣 如果是循环扣分赋值成cg->tkCnt
                 }
             }
         }
@@ -400,11 +404,11 @@ void Sub3Judge02Qbxx::Judge_LiuChe()
     const TSensorInfo& sor = cg->real.sensor;
     const TChuanGan* his1 = m_car->historyChuanGan(1);
 
-    static constexpr int LCValue = 32; //后溜车距离
-    static constexpr int LC30FaZhi = 12;
+    static constexpr int dis30CM = 30; //32 后溜车距离
+    static constexpr int dis10CM = 10; //12
     if(cg->move == moveForward && his1->move == moveForward)  //前进的时候要评判溜车小于30厘米的
     {
-        if(m_itemv.PubMaxLCValue >= LC30FaZhi && m_itemv.PubMaxLCValue <= LCValue)
+        if(m_itemv.PubMaxLCValue >= dis10CM && m_itemv.PubMaxLCValue <= dis30CM)
         {
             //通用或起步项目
             JUDGE_MARK_SUB3(2, "47", false);
@@ -418,32 +422,29 @@ void Sub3Judge02Qbxx::Judge_LiuChe()
     if(sor.dw != 9 && sor.dw != 6 && sor.ssc == SNOT)
     {
         //if(m_itemv.PubLCTCPtt.x == 0 && m_itemv.PubLCTCPtt.y == 0 && m_car->rtkEnabled())
+        if(m_car->rtkEnabled())
         {
             const TChuanGan* his2 = m_car->historyChuanGan(2);
             if(cg->move == moveStop && his1->move == moveStop && his2->move == moveStop)
             {
                 m_itemv.PubLCTCPtt.x = gps.ai_gps.x;
                 m_itemv.PubLCTCPtt.y = gps.ai_gps.y;
-                m_itemv.PubLCTC_GPS_JD = gps.jd;
-                m_itemv.PubLCTC_GPS_WD = gps.wd;
-                m_itemv.PubMaxLCValue = 0;
+                //m_itemv.PubMaxLCValue = 0;
             }
         }
-
-        //ExamSensor* sensor = m_car->sensor();  //sensor->calcMoveState();
-        if(m_itemv.PubLCTCPtt.x != 0 && m_itemv.PubLCTCPtt.y != 0 && cg->move != moveForward)  // JudgeKM3Obj.GetMovingState <> 1
+        ExamSensor* sensor = m_car->sensor();
+        if(m_itemv.PubLCTCPtt.x != 0 && m_itemv.PubLCTCPtt.y != 0 && sensor->calcMoveState() != moveForward)
         {
             Point Ptt = gps.ai_gps;
-            int b = m_itemv.PubLCTCPtt.x - Ptt.x;
-            int c = m_itemv.PubLCTCPtt.y - Ptt.y;
-            int a = std::round(std::sqrt(b*b + c*c)); //cm
-            int LC = a;
-            if(m_itemv.PubMaxLCValue < LC)
+            int x = m_itemv.PubLCTCPtt.x - Ptt.x;
+            int y = m_itemv.PubLCTCPtt.y - Ptt.y;
+            int a = std::round(std::sqrt(x*x + y*y)); //cm
+            if(m_itemv.PubMaxLCValue < a)
             {
-                m_itemv.PubMaxLCValue = LC;
+                m_itemv.PubMaxLCValue = a;
             }
             //溜车大于30了，直接扣分
-            if(m_itemv.PubCanMarkLC50Flag == true && m_itemv.PubMaxLCValue > LCValue)
+            if(m_itemv.PubCanMarkLC50Flag == true && m_itemv.PubMaxLCValue > dis30CM)
             {
                 JUDGE_MARK_SUB3(2, "46", false);
                 m_itemv.PubCanMarkLC50Flag = false;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.cpp
index c4c25f0b..778a8c4d 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.cpp
@@ -98,7 +98,7 @@ void Sub3Judge05Lkzx::dealJudgeItem()
         if(!m_car->isQualified())
         {
             m_exam->TestPro = ItemProFlagEnd;
-            flagEndJudge();
+            JudgeFlagEnd();
             return;
         }
     }
@@ -223,7 +223,7 @@ void Sub3Judge05Lkzx::dealJudgeItem()
             if(cg->ai_ljjl_cm - m_itemv.StopLine_JLCM >= dis2)
             {
                 m_exam->TestPro = ItemProFlagEnd;
-                flagEndJudge();
+                JudgeFlagEnd();
                 return;
             }
         }
@@ -291,21 +291,21 @@ void Sub3Judge05Lkzx::dealJudgeItem()
             //1000 0100 0010 0001
             if(RTKKM3.BasePointInLaneDir != "" && RTKKM3.BasePointInLaneDir != "0000")
             {
-                if(RTKKM3.BasePointInLaneDir.substr(1, 1) != "1")
+                if(RTKKM3.BasePointInLaneDir[TURN_Z] != TURN_1)
                 {
                     JUDGE_MARK_SUB3(5, "45", true);
                 }
             }
         }
 #else
-        if(m_itemv.Check_CheDao == false)
+        //if(m_itemv.Check_CheDao == false)
         {
-            m_itemv.Check_CheDao = true;
+            //m_itemv.Check_CheDao = true;
             //路段状况:基准天线所在车道方向: 1-右转 2-直行 3-左转 4-掉头
             //1000 0100 0010 0001
             if(RTKKM3.BasePointInLaneDir != "")
             {
-                if(RTKKM3.BasePointInLaneDir.substr(1, 1) != "1")
+                if(RTKKM3.BasePointInLaneDir[TURN_Z] != TURN_1)
                 {
                     JUDGE_MARK_SUB3(5, "45", true);
                 }
@@ -359,7 +359,7 @@ void Sub3Judge05Lkzx::dealJudgeItem()
         if(cg->ai_ljjl_cm - m_itemv.Start_JL_CM > m_itemv.XMJL_Mi * 100)
         {
             m_exam->TestPro = ItemProFlagEnd;
-            flagEndJudge();
+            JudgeFlagEnd();
             return;
         }
     }
@@ -437,7 +437,7 @@ void Sub3Judge05Lkzx::dealJudgeItem()
                 if(OKFlag == true)
                 {
                     m_exam->TestPro = ItemProFlagEnd;
-                    flagEndJudge();
+                    JudgeFlagEnd();
                     return;
                 }
             }
@@ -473,13 +473,13 @@ void Sub3Judge05Lkzx::dealJudgeItem()
         str += buf;
     }
 
-    //替换为 flagEndJudge();
+    //替换为 JudgeFlagEnd();
 
     str += msg;
     showStatus(str);
 }
 
-void Sub3Judge05Lkzx::flagEndJudge()
+void Sub3Judge05Lkzx::JudgeFlagEnd()
 {
     if(m_exam->TestPro == ItemProFlagEnd)
     {
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.h b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.h
index 1165c12a..78a3da57 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.h
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge05Lkzx.h
@@ -21,7 +21,7 @@ public:
 
 protected:
     void JudgeFXD();
-    void flagEndJudge();
+    void JudgeFlagEnd();
 private:
     ISub3Item05Lkzx m_itemv;
 };
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.cpp
index a83b7dae..6bf4b149 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.cpp
@@ -35,28 +35,34 @@ bool Sub3Judge10Ccxx::dealJudgeEnter()
     m_itemv.Temp_XMJL = s504.size() > 0 && s504[0] != "" ? std::atoi(s504[0].c_str()) : 150;  //StrToIntDef(getdotstr(1, sysset[504], ','), 150); //20170718
     //超车时在超车道上需驶离超车道 （0-否 1-是  2-不进项目）
     bool CSCCDFlag = false;  //超车时是否在超车车道
-    if(TableSysSet->get405() == "1")
+    std::string s405 = TableSysSet->get405();
+    if(s405 == "0" || s405 == "1")
     {
         if(RTKKM3.BasePointInLaneNo == RTKKM3.BaseLaneCount)  //表示在最左侧  20140623
         {
             //Itmv10.In_CCD_Kind := 1;
             if(RTKKM3.BaseLaneCount >= 2)
             {
-                //在超车道上的距离限制 (在这个距离内要离开超车道）
-                m_itemv.CS_CCD_Max_XSJL = s504.size() > 2 && s504[2] != "" ? std::atoi(s504[2].c_str()) : 30;  //StrToIntDef(getdotstr(3, sysset[504], ','), 30); //20170718
-                //初始超车道上至少需要行驶的距离，行驶完这个距离才能到普通车道（否则不按规定考试）
+                if(s405 == "1")
+                {
 
-                //初始超车道，二次超车最小行驶距离（如果初始在超车道上，需要驶离超车道，
-                //然后行驶规定的距离后，再次进入超车道超车）
-                m_itemv.CS_CCD_ErCiChaoChe_Min_XSJL = s504.size() > 3 && s504[3] != "" ? std::atoi(s504[3].c_str()) : 30; //StrToIntDef(getdotstr(4, sysset[504], ','), 30); //20170718
+                    //在超车道上的距离限制 (在这个距离内要离开超车道）
+                    m_itemv.CS_CCD_Max_XSJL = s504.size() > 2 && s504[2] != "" ? std::atoi(s504[2].c_str()) : 30;  //StrToIntDef(getdotstr(3, sysset[504], ','), 30); //20170718
+                    //初始超车道上至少需要行驶的距离，行驶完这个距离才能到普通车道（否则不按规定考试）
+
+                    //初始超车道，二次超车最小行驶距离（如果初始在超车道上，需要驶离超车道，
+                    //然后行驶规定的距离后，再次进入超车道超车）
+                    m_itemv.CS_CCD_ErCiChaoChe_Min_XSJL = s504.size() > 3 && s504[3] != "" ? std::atoi(s504[3].c_str()) : 30; //StrToIntDef(getdotstr(4, sysset[504], ','), 30); //20170718
+
+                    //1:初始超车道阶段  2：初始普通车道阶段   3：左侧超车阶段
+                    //4:超车道行驶阶段  5：回原车道阶段  6：结束项目阶段
+                    //语音提示:请驶离超车道??? yhyflag
+                    m_car->createEventSound({itemNo(), sound::sub3_414003});
+                }
 
-                m_itemv.CS_CCD_Flag = true;
                 CSCCDFlag = true;
-                //1:初始超车道阶段  2：初始普通车道阶段   3：左侧超车阶段
-                //4:超车道行驶阶段  5：回原车道阶段  6：结束项目阶段
+                m_itemv.CS_CCD_Flag = true;
                 m_itemv.Status = 1;
-                //语音提示:请驶离超车道??? yhyflag
-                m_car->createEventSound({itemNo(), sound::sub3_414003});
             }
         }
     }
@@ -358,45 +364,53 @@ void Sub3Judge10Ccxx::dealJudgeItem()
 
     //1:初始超车道阶段  2：初始普通车道阶段   3：左侧超车阶段  4:完成左侧超车阶段
     //5:回原车道阶段    6：完成回原车道阶段
-    if(m_itemv.Status == 1)
+    //取消项目 军华说的378等于2打双跳就取消项目不需要判断其他条件 20240802 洛阳
+    if(m_exam->ItemEnterCancelID == false && TableSysSet->get378() == "2" && sor.shtd == SYES)
     {
-        //405:超车时在超车道上需驶离超车道
-        //378:变更车道和超车:取消第1个项目 (0-不能 1-不变道也不开转向灯 2-开双跳)
-
-        if(TableSysSet->get405() == "1")  //初始行驶在超车道上，在超车道上需驶离超车道
-        {
-            //取消项目
-            if(m_exam->ItemEnterCancelID == false && TableSysSet->get378() == "1" && sor.shtd == SYES)
-            {
-                m_exam->TestPro = ItemProFlagIdle;
-                m_exam->Item_Color = itemStateWk;
-                m_exam->ItemEnterCancelID = true;
-                m_car->setPUB_JDCC_ZT(0); //借道超车
-                m_car->setChaoChe_Start_TM(0);
-                //ToDo:语音播报:取消变更车道或者取消超车
-                m_car->createEventCancelItem({m_exam->ItemNo, ""});
-                //m_car->createEventSound({itemNo(), sound::sub3_414004});
-                return;
-            }
-        }
+        m_exam->TestPro = ItemProFlagIdle;
+        m_exam->Item_Color = itemStateWk;
+        m_exam->ItemEnterCancelID = true;
+        m_car->setPUB_JDCC_ZT(0); //借道超车
+        m_car->setChaoChe_Start_TM(0);
+        //ToDo:语音播报:取消变更车道或者取消超车
+        m_car->createEventCancelItem({m_exam->ItemNo, ""});
+        //m_car->createEventSound({itemNo(), sound::sub3_414004});
+        return;
     }
 
-    if(cg->ai_ljjl - m_itemv.Start_LJJL >= m_itemv.Temp_XMJL)  //出项目距离，结束
+    if(m_itemv.Temp_XMJL > 0)
     {
-        //到达这个距离，还没有完成项目，肯定要扣分的（除非你取消了项目）
-        //SysSet[378]:变更车道和超车:取消第1个项目 (0-不能 1-不变道也不开转向灯 2-开双跳)
-        if(TableSysSet->get378() == "1")  //如果你正常完成了，不可能直行到项目距离这里
+        if(cg->ai_ljjl - m_itemv.Start_LJJL >= m_itemv.Temp_XMJL)  //出项目距离，结束
         {
-            if(m_exam->ItemEnterCancelID == false)
+            //到达这个距离，还没有完成项目，肯定要扣分的（除非你取消了项目）
+            //SysSet[378]:变更车道和超车:取消第1个项目 (0-不能 1-不变道也不开转向灯 2-开双跳)
+            if(TableSysSet->get378() == "1")  //如果你正常完成了，不可能直行到项目距离这里
             {
-                m_exam->TestPro = ItemProFlagIdle;
-                m_exam->Item_Color = itemStateWk;
-                m_exam->ItemEnterCancelID = true;
-                m_car->setPUB_JDCC_ZT(0); //借道超车
-                m_car->setChaoChe_Start_TM(0);
-                //ToDo:语音播报:取消变更车道或者取消超车
-                m_car->createEventCancelItem({m_exam->ItemNo, ""});
-                //m_car->createEventSound({itemNo(), sound::sub3_414004});
+                if(m_exam->ItemEnterCancelID == false &&
+                        (m_itemv.Status == 1 || (m_itemv.Status == 2 && !m_itemv.CS_CCD_Flag)))
+                {
+                    m_exam->TestPro = ItemProFlagIdle;
+                    m_exam->Item_Color = itemStateWk;
+                    m_exam->ItemEnterCancelID = true;
+                    m_car->setPUB_JDCC_ZT(0); //借道超车
+                    m_car->setChaoChe_Start_TM(0);
+                    //ToDo:语音播报:取消变更车道或者取消超车
+                    m_car->createEventCancelItem({m_exam->ItemNo, ""});
+                    //m_car->createEventSound({itemNo(), sound::sub3_414004});
+                }
+                else
+                {
+                    if(m_itemv.Status < 6)
+                    {
+                        if(!m_itemv.Mark_10_41_Flag)
+                        {
+                            m_itemv.Mark_10_41_Flag = true;
+                            JUDGE_MARK_SUB3(10, "41", false);
+                        }
+                    }
+                    m_exam->TestPro = ItemProFlagEnd;
+                    return;
+                }
             }
             else
             {
@@ -412,7 +426,19 @@ void Sub3Judge10Ccxx::dealJudgeItem()
                 return;
             }
         }
-        else
+    }
+    else
+    {
+        //项目距离设置等于0的：读到下一个项目点时，结束项目，未完成完整动作的，扣分后结束项目
+        if(m_car->itemsSomeExaming2(Sub3ItemType06Rxhd) ||
+                m_car->itemsSomeExaming2(Sub3ItemType07Xxqy) ||
+                m_car->itemsSomeExaming2(Sub3ItemType08Gjzt) ||
+                m_car->itemsSomeExaming2(Sub3ItemType11Kbtc) ||
+                m_car->itemsSomeExaming2(Sub3ItemType12Dtxx) ||
+                m_car->itemsSomeExaming2(Sub3ItemType03Zxxs) ||
+                m_car->itemsSomeExaming2(Sub3ItemType05Lkzx) ||
+                m_car->itemsSomeExaming2(Sub3ItemType15Lkzz) ||
+                m_car->itemsSomeExaming2(Sub3ItemType16Lkyz))
         {
             if(m_itemv.Status < 6)
             {
@@ -425,9 +451,9 @@ void Sub3Judge10Ccxx::dealJudgeItem()
             m_exam->TestPro = ItemProFlagEnd;
             return;
         }
-
     }
 
+
     //借道超车状态 0：非借道 1:表示超车   2：表示正在返回原车道  3：回原车道道完成
     //以下是借道超车相关的业务逻辑
     if(RTKKM3.TouchLineType == TRTKResult::TouchLineType6 && RTKKM3_1.TouchLineType == TRTKResult::TouchLineType6 && m_car->getPUB_JDCC_ZT() == 1)
@@ -454,6 +480,7 @@ void Sub3Judge10Ccxx::dealJudgeItem()
         }
     }
 
+    std::string s405 = TableSysSet->get405();
     //特殊地方需求1 ，临沂
     if(LinYiFlag == true)
     {
@@ -484,34 +511,32 @@ void Sub3Judge10Ccxx::dealJudgeItem()
         //如果初始在超车到
         if(m_itemv.Status == 1)  //初始在超车道阶段
         {
-            if(cg->ai_ljjl - m_itemv.Start_LJJL > m_itemv.CS_CCD_Max_XSJL)
+            if(RTKKM3.BasePointInLaneNo > 0 && RTKKM3.BasePointInLaneNo != RTKKM3.BaseLaneCount)
+            {
+                m_itemv.Status = 2; //已经从超车到-->非超车道
+                m_itemv.Temp_BasePointInLaneNo = RTKKM3.BasePointInLaneNo;
+                m_itemv.Temp_BaseLaneCount = RTKKM3.BaseLaneCount;
+                m_itemv.Temp_LJJL_CCD_PTCD = cg->ai_ljjl; //记下此时的距离
+
+                m_itemv.Temp_St2_CheDaoHao = RTKKM3.BasePointInLaneNo; //初始在普通车道的车道号
+                m_itemv.Temp_St2_CheDaoCount = RTKKM3.BaseLaneCount; //初始在普通车道的车道数
+
+                return;
+            }
+
+            if(s405 == "1" && cg->ai_ljjl - m_itemv.Start_LJJL > m_itemv.CS_CCD_Max_XSJL)
             {
                 JUDGE_MARK_SUB3(10, "41", false); //20160928
                 m_exam->TestPro = ItemProFlagEnd;
                 return;
             }
-            else
-            {
-                if(RTKKM3.BasePointInLaneNo > 0 && RTKKM3.BasePointInLaneNo != RTKKM3.BaseLaneCount)
-                {
-                    m_itemv.Status = 2; //已经从超车到-->非超车道
-                    m_itemv.Temp_BasePointInLaneNo = RTKKM3.BasePointInLaneNo;
-                    m_itemv.Temp_BaseLaneCount = RTKKM3.BaseLaneCount;
-                    m_itemv.Temp_LJJL_CCD_PTCD = cg->ai_ljjl; //记下此时的距离
-
-                    m_itemv.Temp_St2_CheDaoHao = RTKKM3.BasePointInLaneNo; //初始在普通车道的车道号
-                    m_itemv.Temp_St2_CheDaoCount = RTKKM3.BaseLaneCount; //初始在普通车道的车道数
-
-                    return;
-                }
-            }
         }
 
         //在普通车道上，开始超车距离
         if(m_itemv.Status == 2)  //普通车道上，准备超车
         {
             //如果初始在超车道，行驶到普通车道，要行驶一段距离504参数才能在进超车道
-            if(m_itemv.CS_CCD_Flag == true && m_itemv.CS_CCD_ErCiChaoChe_Min_XSJL_OK == false)
+            if(m_itemv.CS_CCD_Flag == true && s405 == "1" && m_itemv.CS_CCD_ErCiChaoChe_Min_XSJL_OK == false)
             {
                 //初始超车道，二次超车最小行驶距离（如果初始在超车道上，需要驶离超车道，
                 //然后行驶规定的距离后，再次进入超车道超车）
@@ -542,7 +567,7 @@ void Sub3Judge10Ccxx::dealJudgeItem()
 
             if(BianDaoKind != 0)
             {
-                if(m_itemv.CS_CCD_Flag == true && m_itemv.CS_CCD_ErCiChaoChe_Min_XSJL_OK == false)
+                if(m_itemv.CS_CCD_Flag == true && s405 == "1" && m_itemv.CS_CCD_ErCiChaoChe_Min_XSJL_OK == false)
                 {
                     JUDGE_MARK_SUB3(10, "41", false); //20160928
                     m_exam->TestPro = ItemProFlagEnd;
@@ -556,7 +581,7 @@ void Sub3Judge10Ccxx::dealJudgeItem()
                         if(!m_itemv.Mark_10_42_Flag)
                         {
                             m_itemv.Mark_10_42_Flag = true;
-                            JUDGE_MARK_SUB3(10, "42", false);
+                            //JUDGE_MARK_SUB3(10, "42", false);  //在通用评判里了
                         }
                     }
                     else if(!m_itemv.Temp_ZFXD3s)
@@ -564,7 +589,7 @@ void Sub3Judge10Ccxx::dealJudgeItem()
                         if(!m_itemv.Mark_10_43_Flag)
                         {
                             m_itemv.Mark_10_43_Flag = true;
-                            JUDGE_MARK_SUB3(10, "43", false);
+                            //JUDGE_MARK_SUB3(10, "43", false);  //在通用评判里了
                         }
                     }
                 }
@@ -589,7 +614,7 @@ void Sub3Judge10Ccxx::dealJudgeItem()
             //m_itemv.In_CCD_Must_JL
             //SysSet[414]:变道、超车以前后轮都过线（0-否 1-是）
             bool OKFlag = true;
-            if(TableSysSet->get414() == "1" && RTKKM3.TouchLineType != 0)
+            if(TableSysSet->get414() == "1" && RTKKM3.TouchLineType != TRTKResult::TouchLineType0)
             {
                 OKFlag = false;
             }
@@ -622,7 +647,7 @@ void Sub3Judge10Ccxx::dealJudgeItem()
             {
                 if(gps.sj - m_itemv.St4_HuiYuanCheDao_TM > m_itemv.St4_HuiYuanCheDao_Miao*SECOND)
                 {
-                    if(m_itemv.Mark_10_41_Flag)
+                    if(!m_itemv.Mark_10_41_Flag)
                     {
                         m_itemv.Mark_10_41_Flag = true;
                         JUDGE_MARK_SUB3(10, "41", false);
@@ -665,7 +690,7 @@ void Sub3Judge10Ccxx::dealJudgeItem()
                 //SysSet[414]:变道、超车以前后轮都过线（0-否 1-是）
                 if(TableSysSet->get414() == "1")
                 {
-                    if(RTKKM3.TouchLineType == 0)
+                    if(RTKKM3.TouchLineType == TRTKResult::TouchLineType0)
                     {
                         m_itemv.Status = 6;
                         return;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.h b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.h
index 97f496d7..94385dd2 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.h
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge10Ccxx.h
@@ -112,6 +112,14 @@
  *
  * 2338帧后，步进跟踪超车项目。
  *
+ * 超车结束和取消规则：
+ * 1、项目只能取消一次；
+ * 2、做完一套完整动作的，结束项目
+ * 3、378=2，开启双挑灯，立即取消
+ * 3、项目距离设置等于0的：读到下一个项目点时，未完成完整动作的，扣分后结束项目
+ * 4、项目距离设置大于0，距离达到项目距离的，且378=1：从未变过道的，取消项目；有过变道但未完成完整动作的，扣分后结束项目
+ * 5、项目距离设置大于0，距离达到项目距离的，且378!=1：扣分后结束项目
+ *
  */
 
 #ifndef SUB3JUDGE10CCXX_H
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp
index f04e4427..ae98f1c7 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge11Kbtc.cpp
@@ -19,7 +19,7 @@ bool Sub3Judge11Kbtc::dealJudgeEnter()
     const TChuanGan* cg = m_car->historyChuanGan();
     const std::string& ksdd = TableSysSet->get211();
 
-    m_car->setPubCanJudge_XiHuoFlag(false);
+    m_car->setPubCanJudge_XiHuoFlag(true);
     m_car->setPubKaoBianTCFinish_LJJL(0);
     m_itemv = TSub3Item11Kbtc();
 
@@ -148,6 +148,8 @@ void Sub3Judge11Kbtc::dealJudgeItem()
     const TSensorInfo& sor = cg->real.sensor;
     const std::string& ksdd = TableSysSet->get211();
 
+    m_car->setPubCanJudge_XiHuoFlag(m_itemv.Status < 3);
+
     //特殊地区功能1
     if(ksdd == siteof::nj || ksdd == siteof::njdckm3)
     {
@@ -469,7 +471,8 @@ void Sub3Judge11Kbtc::DoStatus_2()
         const TChuanGan* his5 = m_car->historyChuanGan(5);
         const TChuanGan* his6 = m_car->historyChuanGan(6);
         if(cg->move == moveBackward && (sor.dw < 1 || sor.dw > 5) &&
-                his1->move == moveBackward && his2->move == moveBackward && his3->move == moveBackward && his4->move == moveBackward &&
+                his1->move == moveBackward && his2->move == moveBackward &&
+                his3->move == moveBackward && his4->move == moveBackward &&
                 his5->move != moveBackward && his6->move != moveBackward)
         {
             JUDGE_MARK_SUB3(11, "45", false);
@@ -533,7 +536,7 @@ void Sub3Judge11Kbtc::DoStatus_2()
     }
 
     //靠边停车确认停车条件（0-拉手刹放空挡或拉手刹动作或开车门或解开安全带  1-拉手刹同时置空档 2-停车就判 3-开车门才判）
-    if(s430 == "3") //拉手刹放空挡
+    if(s430 == "3") //开车门
     {
         const TSensorInfo& sor2 = m_car->historySensor(2);
         const TSensorInfo& sor3 = m_car->historySensor(3);
@@ -556,12 +559,10 @@ void Sub3Judge11Kbtc::DoStatus_2()
     {
         const TSensorInfo& sor2 = m_car->historySensor(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);
         //拉手刹放空挡 或 拉手刹动作 或 开车门 或 解开安全带 进入下一阶段
-        if((sor.ssc == SYES && sor.dw == SNOT) || (sor.ssc == SYES && sor1.ssc == SYES && sor2.ssc == SYES)  ||
-           (sor.mkg == SYES && sor1.mkg == SYES && sor2.mkg == SYES && sor3.mkg == SYES && sor4.mkg == SYES && sor5.mkg == SNOT && sor6.mkg == SNOT) ||
+        if((sor.ssc == SYES && sor.dw == SNOT) ||
+           (sor.ssc == SYES && sor1.ssc == SYES && sor2.ssc == SYES && sor3.ssc == SNOT) ||
+           (sor.mkg == SYES && sor1.mkg == SYES && sor2.mkg == SYES && sor3.mkg == SNOT) ||
            (sor.aqd == SNOT && sor1.aqd == SNOT && sor2.aqd == SNOT && sor3.aqd == SYES)) //20180130
         {
             m_itemv.Status = 3;
@@ -1053,9 +1054,10 @@ void Sub3Judge11Kbtc::DoStatus_4()
                     JUDGE_MARK_SUB3(11, "45", true);
                 }
             }
-            if(ksdd == siteof::nmgcfkm3 || ksdd == siteof::nmgtlkm3)
+            if(ksdd == siteof::nmgcfkm3 || ksdd == siteof::nmgtlkm3 || ksdd == siteof::hnzzkm3)
             {
-                if(sor.dw > 0 && sor1.dw > 0 && sor2.dw > 0)
+                if(sor.dw > 0 && sor1.dw > 0 && sor2.dw > 0 &&
+                   sor.dw < 10 && sor1.dw < 10 && sor2.dw < 10)
                 {
                     //不按考试员指令驾驶
                     JUDGE_MARK_SUB3(11, "45", true);
@@ -1332,7 +1334,9 @@ void Sub3Judge11Kbtc::Judge_KBTC_YaXian()
     {
         FindFlag = true;
     }
-    if(RTKKM3_0.TouchLineTypeCS == 3 && RTKKM3_1.TouchLineTypeCS == 3 && RTKKM3_2.TouchLineTypeCS == 3)
+    if(RTKKM3_0.TouchLineTypeCS == TRTKResult::TouchLineTypeCS3 &&
+            RTKKM3_1.TouchLineTypeCS == TRTKResult::TouchLineTypeCS3 &&
+            RTKKM3_2.TouchLineTypeCS == TRTKResult::TouchLineTypeCS3)
     {
         FindFlag = true;
     }
@@ -1342,8 +1346,12 @@ void Sub3Judge11Kbtc::Judge_KBTC_YaXian()
     // 20150415  出线，边缘线为负值
     if(FindFlag == true)
     {
+        int JL0 = std::min(RTKKM3_0.Body_RF_ToBaseLine, RTKKM3_0.Body_RB_ToBaseLine);
+        int JL1 = std::min(RTKKM3_1.Body_RF_ToBaseLine, RTKKM3_1.Body_RB_ToBaseLine);
+        int JL2 = std::min(RTKKM3_2.Body_RF_ToBaseLine, RTKKM3_2.Body_RB_ToBaseLine);
+
         int s481 = TableSysSet->asInt481();
-        if((Max_JL0 + s481) < 0 && Max_JL1 + s481 < 0  && Max_JL2 + s481 < 0 && !m_itemv.Kf03)
+        if(JL0 + s481 < 0 && JL1 + s481 < 0 && JL2 + s481 < 0 && !m_itemv.Kf03)
         {
             CheShenChuXian = true;
         }
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Lkdt.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Lkdt.cpp
index 5253067f..1f834197 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Lkdt.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Lkdt.cpp
@@ -200,19 +200,19 @@ void Sub3Judge12Lkdt::dealJudgeItem()
     }
 
     //如果设置了路口掉头的方向灯立刻判（打错立刻判）
-    const std::vector<std::string>& s508 = TableSysSet->asArray508();
-    if(s508.size() > 2 && std::atoi(s508[2].c_str()) == 1)
-    {
-        const TSensorInfo& sor1 = m_car->historySensor(1);
-        const TSensorInfo& sor2 = m_car->historySensor(2);
-        if(sor.yfxd == SYES && sor1.yfxd == SYES && sor2.yfxd == SYES)
-        {
-            if(!m_itemv.Mark_12_42_Flag)
-            {
-                JUDGE_MARK_SUB3(12, "42", false);
-            }
-        }
-    }
+    //const std::vector<std::string>& s508 = TableSysSet->asArray508();
+    //if(s508.size() > 2 && std::atoi(s508[2].c_str()) == 1)
+    //{
+    //    const TSensorInfo& sor1 = m_car->historySensor(1);
+    //    const TSensorInfo& sor2 = m_car->historySensor(2);
+    //    if(sor.yfxd == SYES && sor1.yfxd == SYES && sor2.yfxd == SYES)
+    //    {
+    //        if(!m_itemv.Mark_12_42_Flag)
+    //        {
+    //            JUDGE_MARK_SUB3(12, "42", false);
+    //        }
+    //    }
+    //}
 
     //方向灯评判
     //方向灯标志
@@ -292,21 +292,21 @@ void Sub3Judge12Lkdt::dealJudgeItem()
             //1000 0100 0010 0001
             if(RTKKM3.BasePointInLaneDir != "")
             {
-                if(RTKKM3.BasePointInLaneDir.substr(1, 1) != "1")
+                if(RTKKM3.BasePointInLaneDir[TURN_Z] != TURN_1)
                 {
                     JUDGE_MARK_SUB3(12, "45", true);
                 }
             }
         }
 #else
-        if(m_itemv.Check_CheDao == false)
+        //if(m_itemv.Check_CheDao == false)
         {
-            m_itemv.Check_CheDao = true;
+            //m_itemv.Check_CheDao = true;
             //路段状况:基准天线所在车道方向: 1-右转 2-直行 3-左转 4-掉头
             //1000 0100 0010 0001
             if(RTKKM3.BasePointInLaneDir != "")
             {
-                if(RTKKM3.BasePointInLaneDir.substr(3, 1) != "1") //if(Copy(RTKKM3.BasePointInLaneDir, 2, 1) != "1")
+                if(RTKKM3.BasePointInLaneDir[TURN_D] != TURN_1) //if(Copy(RTKKM3.BasePointInLaneDir, 2, 1) != "1")
                 {
                     JUDGE_MARK_SUB3(12, "45", true);
                 }
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Ptdt.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Ptdt.cpp
index f72bc54f..186ef99a 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Ptdt.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge12Ptdt.cpp
@@ -223,6 +223,20 @@ void Sub3Judge12Ptdt::dealJudgeItem()
     //掉头角度变化
     double a = std::abs(gps.hxj - m_itemv.CS_GPS_D);
     double b = std::abs(gps5.hxj- m_itemv.CS_GPS_D);
+
+    //if(Tools::greater(gps.hxj, m_itemv.CS_GPS_D))
+    //{
+    //    a = std::abs(360 -  gps.hxj + m_itemv.CS_GPS_D);
+    //}
+    //
+    //if(Tools::greater(gps5.hxj, m_itemv.CS_GPS_D))
+    //{
+    //    b = std::abs(360 -  gps5.hxj + m_itemv.CS_GPS_D);
+    //}
+    //
+    //logdebug("CS_GPS_D=%0.2f,hxj=%0.2f,hxj5=%0.2f, a=%0.2f,b=%0.2f",
+    //         m_itemv.CS_GPS_D, gps.hxj, gps5.hxj, a, b);
+
     //528:掉头N米内不判连续变道和方向灯
     if(m_car->getNJ_DiaoTou_JL() == 0 && TableSysSet->asInt528() > 0)
     {
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge15Lkzz.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge15Lkzz.cpp
index 47ce97f9..7f66f857 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge15Lkzz.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge15Lkzz.cpp
@@ -216,17 +216,21 @@ void Sub3Judge15Lkzz::dealJudgeItem()
     //fxdcc：方向灯错误评判，如左转开右方向灯立即扣分
     //大车右转必停时长（毫秒，默认为0不用停车）
     //方向灯必须持续到路口停止线
-    const std::vector<std::string>& s508 = TableSysSet->asArray508();
-    if(s508.size() > 2 && std::atoi(s508[2].c_str()) == 1)
+
+    if(!m_itemv.Step3Flag)
     {
-        const TSensorInfo& sor1 = m_car->historySensor(1);
-        const TSensorInfo& sor2 = m_car->historySensor(2);
-        if(sor.yfxd == SYES && sor1.yfxd == SYES && sor2.yfxd == SYES)
+        const std::vector<std::string>& s508 = TableSysSet->asArray508();
+        if(s508.size() > 2 && std::atoi(s508[2].c_str()) == 1)
         {
-            if(!m_itemv.Mark_20_73_Flag)
+            const TSensorInfo& sor1 = m_car->historySensor(1);
+            const TSensorInfo& sor2 = m_car->historySensor(2);
+            if(sor.yfxd == SYES && sor1.yfxd == SYES && sor2.yfxd == SYES)
             {
-                m_itemv.Mark_20_73_Flag = true;
-                JUDGE_MARK_SUB3(20, "73", false);
+                if(!m_itemv.Mark_20_73_Flag)
+                {
+                    m_itemv.Mark_20_73_Flag = true;
+                    JUDGE_MARK_SUB3(20, "73", false);
+                }
             }
         }
     }
@@ -318,14 +322,14 @@ void Sub3Judge15Lkzz::dealJudgeItem()
     //检查车道是否正确
     if(RTKKM3.CrossLineAttr == TRTKResult::CrossLineAttr1 || m_exam->Gps_Itemno1 == 2 || m_exam->Gps_Itemno1 == 3)
     {
-        if(m_itemv.Check_CheDao == false)
+        //if(m_itemv.Check_CheDao == false)
         {
-            m_itemv.Check_CheDao = true;
+            //m_itemv.Check_CheDao = true;
             //路段状况:基准天线所在车道方向: 1-右转 2-直行 3-左转 4-掉头
             //1000 0100 0010 0001
             if(RTKKM3.BasePointInLaneDir != "")
             {
-                if(RTKKM3.BasePointInLaneDir.substr(2, 1) != "1") //if(Copy(RTKKM3.BasePointInLaneDir, 3, 1) != "1")
+                if(RTKKM3.BasePointInLaneDir[TURN_L] != TURN_1) //if(Copy(RTKKM3.BasePointInLaneDir, 3, 1) != "1")
                 {
                     JUDGE_MARK_SUB3(15, "45", true);
                 }
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.cpp
index 5b60f006..0efc8f1e 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.cpp
@@ -93,6 +93,7 @@ void Sub3Judge16Lkyz::dealJudgeItem()
         if(!m_car->isQualified())
         {
             m_exam->TestPro = ItemProFlagEnd;
+            JudgeFlagEnd();
             return;
         }
     }
@@ -213,17 +214,20 @@ void Sub3Judge16Lkyz::dealJudgeItem()
     //fxdcc：方向灯错误评判，如左转开右方向灯立即扣分
     //大车右转必停时长（毫秒，默认为0不用停车）
     //方向灯必须持续到路口停止线
-    const std::vector<std::string>& s508 = TableSysSet->asArray508();
-    if(s508.size() > 2 && std::atoi(s508[2].c_str()) == 1)
+    if(!m_itemv.Step3Flag)
     {
-        const TSensorInfo& sor1 = m_car->historySensor(1);
-        const TSensorInfo& sor2 = m_car->historySensor(2);
-        if(sor.zfxd == SYES && sor1.zfxd == SYES && sor2.zfxd == SYES)
+        const std::vector<std::string>& s508 = TableSysSet->asArray508();
+        if(s508.size() > 2 && std::atoi(s508[2].c_str()) == 1)
         {
-            if(!m_itemv.Mark_20_73_Flag )
+            const TSensorInfo& sor1 = m_car->historySensor(1);
+            const TSensorInfo& sor2 = m_car->historySensor(2);
+            if(sor.zfxd == SYES && sor1.zfxd == SYES && sor2.zfxd == SYES)
             {
-                m_itemv.Mark_20_73_Flag = true;
-                JUDGE_MARK_SUB3(20, "73", false);
+                if(!m_itemv.Mark_20_73_Flag)
+                {
+                    m_itemv.Mark_20_73_Flag = true;
+                    JUDGE_MARK_SUB3(20, "73", false);
+                }
             }
         }
     }
@@ -241,6 +245,7 @@ void Sub3Judge16Lkyz::dealJudgeItem()
             if(cg->ai_ljjl_cm - m_itemv.StopLine_JLCM >= dis2)
             {
                 m_exam->TestPro = ItemProFlagEnd;
+                JudgeFlagEnd();
                 return;
             }
         }
@@ -310,14 +315,14 @@ void Sub3Judge16Lkyz::dealJudgeItem()
     //检查车道是否正确
     if(RTKKM3.CrossLineAttr == TRTKResult::CrossLineAttr1 || m_exam->Gps_Itemno1 == 2 || m_exam->Gps_Itemno1 == 3)
     {
-        if(m_itemv.Check_CheDao == false)
+        //if(m_itemv.Check_CheDao == false)
         {
-            m_itemv.Check_CheDao = true;
+            //m_itemv.Check_CheDao = true;
             //路段状况:基准天线所在车道方向: 1-右转 2-直行 3-左转 4-掉头
             //1000 0100 0010 0001
             if(RTKKM3.BasePointInLaneDir != "")
             {
-                if(RTKKM3.BasePointInLaneDir.substr(0, 1) != "1") //if(Copy(RTKKM3.BasePointInLaneDir, 1, 1) != "1")
+                if(RTKKM3.BasePointInLaneDir[TURN_R] != TURN_1) //if(Copy(RTKKM3.BasePointInLaneDir, 1, 1) != "1")
                 {
                     JUDGE_MARK_SUB3(16, "45", true);
                 }
@@ -362,6 +367,7 @@ void Sub3Judge16Lkyz::dealJudgeItem()
         if(cg->ai_ljjl_cm - m_itemv.Start_JL_CM > m_itemv.XMJL_Mi * 100)
         {
             m_exam->TestPro = ItemProFlagEnd;
+            JudgeFlagEnd();
             return;
         }
     }
@@ -439,6 +445,7 @@ void Sub3Judge16Lkyz::dealJudgeItem()
                 if(OKFlag == true)
                 {
                     m_exam->TestPro = ItemProFlagEnd;
+                    JudgeFlagEnd();
                     return;
                 }
             }
@@ -475,16 +482,6 @@ void Sub3Judge16Lkyz::dealJudgeItem()
         str += buf;
     }
 
-    if(m_exam->TestPro == ItemProFlagEnd)
-    {
-        if(m_itemv.LuK_Fx_PointNo > 0)
-        {
-            if(m_itemv.OKFangXiangPt_SuccessFlag == false && m_itemv.ReadNextLuDuanFlag == true)
-            {
-                JUDGE_MARK_SUB3(16, "41", true);
-            }
-        }
-    }
 
     str += msg;
     showStatus(str);
@@ -529,3 +526,17 @@ void Sub3Judge16Lkyz::JudgeFXD()
         }
     }
 }
+
+void Sub3Judge16Lkyz::JudgeFlagEnd()
+{
+    if(m_exam->TestPro == ItemProFlagEnd)
+    {
+        if(m_itemv.LuK_Fx_PointNo > 0)
+        {
+            if(m_itemv.OKFangXiangPt_SuccessFlag == false && m_itemv.ReadNextLuDuanFlag == true)
+            {
+                JUDGE_MARK_SUB3(16, "41", true);
+            }
+        }
+    }
+}
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.h b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.h
index 340a62ba..8a154f87 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.h
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge16Lkyz.h
@@ -45,6 +45,7 @@ public:
 
 protected:
     void JudgeFXD();
+    void JudgeFlagEnd();
 
 private:
     TSub3Item16Lkyz m_itemv;
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp
index fb5eabfb..5ba83edb 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.cpp
@@ -1,6 +1,7 @@
 #include "Sub3Judge20Comm.h"
 #include "HFactory.h"
 #include "Sub3Judge14Jjdw.h"
+#include "Sub3Judge41Mndg.h"
 
 Sub3Judge20Comm::Sub3Judge20Comm()
 {
@@ -139,6 +140,8 @@ void Sub3Judge20Comm::dealJudgeItem()
     //24、全程必须达到次高挡位 、全程必须次高挡达到5秒
     Judge_CiGaoDang();
 
+    //逆向行驶评判
+    //JudgeDriveDirection();
     //////////////////////////////////////////////////////////////////////////////
     //附加评判（比如：非法掉头、超速SystemParm8、夜间行驶)
     Judge_Extra();
@@ -755,27 +758,42 @@ void Sub3Judge20Comm::CallMoNiDengGuang()
     return;  //屏蔽模拟灯光
 #endif
 
-    const std::string& s386 = TableSysSet->get386();
-    //模拟灯光：参数386=0,开始考试后，就触发模拟灯光
-    if(s386 != "0")
-    {
-        TKM3Item* item01 = m_car->findExamItem(Sub3ItemType01Sczb); //上车准备
-        if(item01 && item01->Item_Color != itemStateHg && item01->Item_Color != itemStateBhg)
-        {
-            return;
-        }
-    }
-
     TKM3Item* item41 = m_car->findExamItem(Sub3ItemType41Mndg);
     if(item41 == nullptr) //有可能免考,可能没这个项目
     {
         return;
     }
+
+    if(item41->FinishFlag == true)  //考结束了
+    {
+        ISub3JudgeItem* item = m_car->findJudgeItem(Sub3ItemType41Mndg);
+        if(item)
+        {
+            Sub3Judge41Mndg* item41mndg = dynamic_cast<Sub3Judge41Mndg*>(item);
+            if(item41mndg)
+            {
+                item41mndg->JudgeEndCloseLight();
+            }
+        }
+        return;
+    }
+
     if(item41->Item_Color != itemStateWk) //正在考或者已经考过了
     {
         return;
     }
 
+    const std::string& s386 = TableSysSet->get386();
+    //模拟灯光：参数386=0,开始考试后，就触发模拟灯光
+    if(s386 != "0")
+    {
+        TKM3Item* item01 = m_car->findExamItem(Sub3ItemType01Sczb); //上车准备
+        if(item01 && item01->FinishFlag == false)
+        {
+            return;
+        }
+    }
+
     const TChuanGan* cg = m_car->historyChuanGan();
     const TSensorInfo& sor = cg->real.sensor;
     const TChuanGan* his1 = m_car->historyChuanGan(1);
@@ -786,13 +804,16 @@ void Sub3Judge20Comm::CallMoNiDengGuang()
     const TSensorInfo& sor3 = his3->real.sensor;
 
     const std::string& ksdd = TableSysSet->get211();
+
+    //322参数0:模拟灯光开始和结束都要检查 1:只检查结束 2:只检查开始  默认不配置都检查
+    //501第10个参数时间毫秒、如果不配置那就是2米检查，如果过程中关闭再打开也算关闭
     const std::string& s322 = TableSysSet->get322();
 
     TCar* tcar = m_car->getTCar();
     if((sor.fdjzs > 100 && sor1.fdjzs > 100 && sor2.fdjzs > 100 && sor3.fdjzs > 100) ||
             (Tools::pos(XCharacter("江淮电动"), tcar->CarTypeName) && sor.dh1 == SYES) ||
             (s386 == "5" && sor.dh1 == SYES) ||
-            (sor.aqd == SYES && sor1.aqd == SYES && s386 == "6") ) //20170314 训练模式 只要有dh1就可以进行模拟灯光
+            (s386 == "6" && sor.aqd == SYES && sor1.aqd == SYES) ) //20170314 训练模式 只要有dh1就可以进行模拟灯光
     {
         //关闭灯光  20180809
         if((s322 != "1") && (sor.shtd + sor.skd + sor.ygd + sor.jgd + sor.zfxd + sor.yfxd > 0 || ksdd == siteof::nj))
@@ -843,12 +864,15 @@ void Sub3Judge20Comm::CallMoNiDengGuang()
                         JUDGE_MARK_SUB3(41, "42", true);
                     }
 
-                    //开始模拟灯光
-                    if(item41 && item41->Item_Color == itemStateWk) //有可能免考,可能没这个项目
+                    if(m_car->isExamDrill())
                     {
-                        item41->Item_Color = itemStateZk;
-                        item41->TestPro = ItemProFlagInit;
-                        item41->FinishFlag = false;
+                        //开始模拟灯光
+                        if(item41 && item41->Item_Color == itemStateWk) //有可能免考,可能没这个项目
+                        {
+                            item41->Item_Color = itemStateZk;
+                            item41->TestPro = ItemProFlagInit;
+                            item41->FinishFlag = false;
+                        }
                     }
                 }
             }
@@ -1083,6 +1107,7 @@ void Sub3Judge20Comm::Judge_GuaDangBuJin()
         int j = 0;
         int k = sor2.dw; //最近的一个前进档
         int itc = 0;
+        //SysSet[507]>5: 2次挂挡不进在停车状态下也判
         const std::vector<std::string>& s507 = TableSysSet->asArray507();
         if(s507.size() > 4 && s507[4] == "1")    //getdotstr(5, sysset[507], ',') = '1'
         {
@@ -1090,7 +1115,7 @@ void Sub3Judge20Comm::Judge_GuaDangBuJin()
         }
         else
         {
-            if(cg->move== moveForward)
+            if(cg->move == moveForward)
                 itc = 1;
         }
         if(itc == 1 && k > 0 && k != 9)
@@ -1104,7 +1129,6 @@ void Sub3Judge20Comm::Judge_GuaDangBuJin()
             {
                 if(i >= count) break;
                 const TSensorInfo& sori = m_car->historySensor(i);
-
                 int Temp = sori.dw;
                 //挂过其他档，不算两次换档不进
                 if(k != Temp && Temp > 0)
@@ -1754,7 +1778,7 @@ void Sub3Judge20Comm::Judge_YaXian_30120()
             (RTKKM3.TouchLineType == 7 && RTKKM3_1.TouchLineType == 7 && RTKKM3_2.TouchLineType == 7 && RTKKM3_3.TouchLineType == 7 &&
              Tools::greater(gps.sd, 0)) ||
             (RTKKM3.TouchLineType == 5 && RTKKM3_1.TouchLineType == 5 && RTKKM3_2.TouchLineType == 5 && RTKKM3_3.TouchLineType == 5 &&
-             ItemFlag2 == true && ItemFlag11 == true))
+             ItemFlag2 == true && ksdd == siteof::jswxbz))
     {
         int TempZT = 0;
 
@@ -1766,7 +1790,8 @@ void Sub3Judge20Comm::Judge_YaXian_30120()
 
         const std::string s325 = TableSysSet->get325();
         //SysSet[325] 靠边停车压线条件(0-停车压线才判;1-压线立即判)
-        if(TempZT == ItemProFlagIdle || (TempZT > ItemProFlagInit && cg->move == moveForward && s325 == "1"))  //不在靠边停车  或在靠边停车非停车状态  20150807
+        //if(TempZT == ItemProFlagIdle || (TempZT > ItemProFlagInit && ((cg->move == moveForward && s325 == "1") || (cg->move == moveStop && s325 != "1"))))  //不在靠边停车  或在靠边停车非停车状态  20150807
+        if(TempZT == ItemProFlagIdle || (TempZT > ItemProFlagInit && Tools::greater(gps.sd, 0)))
         {
             //20190115
             if(ksdd == siteof::heb)
@@ -3320,7 +3345,7 @@ void Sub3Judge20Comm::Judge_BianDaoFangXiangDeng2()
                         {
                             OKFlag = true;
                         }
-                        if(s355 == "2" || s355 == "1" || (s355 == "1" && OKFlag == true))
+                        if(s355 == "2" || s355 == "1" || (s355 == "0" && OKFlag == true))
                         {
                             if(m_itemvCJH.BeforeBgcd_LaneNo > 0)
                             {
@@ -4296,30 +4321,38 @@ void Sub3Judge20Comm::Judge_XiHuo()
     const TChuanGan* his2 = m_car->historyChuanGan(2);
     const TSensorInfo& sor2 = his2->real.sensor;
 
-    if(m_car->getPubCanJudge_XiHuoFlag() == false)
-    {
-        if(m_car->getPubKaoBianTCFinish_LJJL() == 0) return;
-        if(cg->ai_ljjl - m_car->getPubKaoBianTCFinish_LJJL() >= 10)
-        {
-            m_car->setPubCanJudge_XiHuoFlag(true);
-        }
-    }
-    if(m_car->getPubCanJudge_XiHuoFlag() == false) return;
     //ToDo:目前先按发动机转速评判
     //靠边停车项目中不判熄火
     if(sor.fdjzs > 20 && sor1.fdjzs > 20 && sor2.fdjzs > 20)
     {
         m_itemvXLG.XH_Enabled = true;
     }
-    bool KBTCFlag = false;
 
-    KBTCFlag = m_car->itemsSomeExaming2(Sub3ItemType11Kbtc);
+    bool JudgeXiHuo = true;
+    if(m_car->itemsSomeExaming2(Sub3ItemType11Kbtc)) //如果是靠边停车确认停车之前要判
+    {
+        JudgeXiHuo = m_car->getPubCanJudge_XiHuoFlag();
+    }
+    int dis = m_car->getPubKaoBianTCFinish_LJJL();
+    if(dis != 0 && cg->ai_ljjl - dis < 5) //防止在考完所有项目这个时候还没点结束考试，这个时候熄火
+    {
+        JudgeXiHuo = false;
+        //if(m_car->itemsSomeExaming())
+        //{
+        //    JudgeXiHuo = true; //中途做靠边停车，如果进了别的项目或者有项目还没做也判
+        //}
+    }
+
+    if(JudgeXiHuo == false)
+    {
+        return;
+    }
 
     if(m_itemvCJH.zdxhkf == 2)  //点火2评判熄火
     {
         if(sor.dh2 == SYES && sor1.dh2 == SNOT && Tools::lessequal(gps.sd, 1.001))
         {
-            if(!KBTCFlag)
+            if(JudgeXiHuo)
             {
                 JUDGE_MARK_SUB3(20, "36", false);
             }
@@ -4332,15 +4365,13 @@ void Sub3Judge20Comm::Judge_XiHuo()
         //发动机转速
         if(sor.fdjzs == 0 && sor1.fdjzs == 0 && sor2.fdjzs == 0 && sor3.fdjzs == 0)
         {
-            if(Tools::lessequal(gps.sd, 1.001))  //加上车速过滤
+            //发动机转速模式判熄火的没有速度条件。如果是点火2判熄火的有速度条件。
+            if(m_itemvXLG.XH_Enabled == true)
             {
-                if(m_itemvXLG.XH_Enabled == true)
+                m_itemvXLG.XH_Enabled = false;
+                if(JudgeXiHuo)
                 {
-                    m_itemvXLG.XH_Enabled = false;
-                    if(!KBTCFlag)
-                    {
-                        JUDGE_MARK_SUB3(20, "36", false);
-                    }
+                    JUDGE_MARK_SUB3(20, "36", false);
                 }
             }
         }
@@ -4676,7 +4707,6 @@ void Sub3Judge20Comm::Judge_DangWei_CS_ZS()
                             }
                         }
                     }
-                    ////////////////////////////////////////////////////////////////////////
                 }
             }
             else
@@ -4698,15 +4728,15 @@ void Sub3Judge20Comm::Judge_DangWei_CS_ZS()
             }
             else
             {
-                if(m_itemvCJH.DW_CS_High_Flag == true)  //低档高速
+                if(m_itemvCJH.DW_CS_High_Flag == true)
                 {
-                    constexpr int jskf = 2000; // 20170712m_itemvCJH.dw_cs_err_sj;
+                    //低档高速
+                    static constexpr int jskf = 2*SECOND;
                     if(cg->tkCnt - m_itemvCJH.DW_CS_ERROR_TK > jskf)
                     {
                         int TempDW = m_itemvCJH.DW_CS_ERROR_DW;
                         if(TempDW >= 1 && TempDW <= 5)
                         {
-
                             TDWErrorRec& dwerr = m_itemvCJH.DWErrArr[TempDW];
                             if(dwerr.djtkCnt != m_itemvCJH.DW_CS_ERROR_TK)
                             {
@@ -4761,7 +4791,8 @@ void Sub3Judge20Comm::Judge_DangWei_CS_ZS()
                     }
                 }
                 else
-                { //高档低速，发动机转速低
+                {
+                    //高档低速，发动机转速低
                     constexpr int jskf = 2000;
                     if(cg->tkCnt - m_itemvCJH.DW_CS_ERROR_TK >= jskf)
                     {
@@ -5406,3 +5437,28 @@ bool Sub3Judge20Comm::Check_Diaotou(int jl, int dtjd)
 
     return false;
 }
+
+void Sub3Judge20Comm::JudgeDriveDirection()
+{
+    if(m_car->historyCount() > 25)
+    {
+        const TRTKResult& RTK0 = m_car->historyRtkKM3(0);
+        const TRTKResult& RTK1 = m_car->historyRtkKM3(1);
+        if(RTK0.DirInverse == DriveDirN &&
+                RTK1.DirInverse == DriveDirN &&
+                m_car->historyRtkKM3(5).DirInverse == DriveDirN &&
+                m_car->historyRtkKM3(10).DirInverse == DriveDirN &&
+                m_car->historyRtkKM3(15).DirInverse == DriveDirN &&
+                m_car->historyRtkKM3(20).DirInverse == DriveDirN &&
+                m_car->historyRtkKM3(25).DirInverse == DriveDirN )
+        {
+
+            //连续5秒逆向行驶，并且在测绘道路上
+            if(RTK0.BasePointInLaneNo > 0 && RTK0.BaseLaneCount > 0 &&
+                    RTK1.BasePointInLaneNo > 0 && RTK1.BaseLaneCount > 0)
+            {
+                JUDGE_MARK_SUB3(20, "88", true);
+            }
+        }
+    }
+}
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.h b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.h
index b3fd942a..9d5d8ebe 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.h
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge20Comm.h
@@ -194,6 +194,9 @@ protected:
     //25、自动靠边停车（重点）
     void Call_Auto_KBTC();
 
+    //逆向行驶评判
+    void JudgeDriveDirection();
+
     //26、夜间行驶及其他业务逻辑
     void Judge_Extra();
     bool Check_Diaotou(int jl, int dtjd);
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.cpp b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.cpp
index 91f56e46..8a340599 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.cpp
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.cpp
@@ -272,6 +272,7 @@ void Sub3Judge41Mndg::dealJudgeItem()
     {
         logtrace("mndg-item-end");
         m_exam->TestPro = ItemProFlagEnd;
+        m_itemv.endTick = gps.sj;
         if(m_car->isExamDrill())  //训练模式
         {
             //Windows语音
@@ -3034,3 +3035,60 @@ void Sub3Judge41Mndg::playSoundEnd(const std::string& code)
 
 }
 
+void Sub3Judge41Mndg::JudgeEndCloseLight()
+{
+    if(!m_exam->FinishFlag)
+    {
+        return;
+    }
+
+    //322参数0:模拟灯光开始和结束都要检查 1:只检查结束 2:只检查开始  默认不配置都检查
+    //501第10个参数时间毫秒、如果不配置那就是2米检查，如果过程中关闭再打开也算关闭
+    const std::string& s322 = TableSysSet->get322();
+    if(s322 == "2")  //只检查开始
+    {
+        return;
+    }
+
+    if(m_itemv.endFlag)
+    {
+        return;
+    }
+    else
+    {
+        const TSensorInfo& sor = m_car->historySensor();
+        //检查双跳 示宽灯关闭，如果有远近光灯，示宽灯必然打开
+        if(sor.shtd == SNOT && sor.skd == SNOT)
+        {
+            m_itemv.endFlag = true;
+        }
+    }
+
+    const std::vector<std::string>& s501 = TableSysSet->asArray501();
+    int ms = s501.size() > 9 && s501[9] != "" ? std::atoi(s501[9].c_str()) : 0;
+    if(ms > 0)
+    {
+        const TGpsInfo& gps = m_car->historyGps();
+        if(gps.sj - m_itemv.endTick > ms)
+        {
+            //模拟灯光结束没关灯要扣这个分，做模拟灯光之前没关闭灯光扣的是41,"42" 20240817在洛阳军华确认
+            if(m_itemv.endFlag == false)
+            {
+                m_itemv.endFlag = true;
+                JUDGE_MARK_SUB3(20, "93", true);
+            }
+        }
+    }
+    else
+    {
+        if(m_car->disForward() > 200) //前进2米
+        {
+            if(m_itemv.endFlag == false)
+            {
+                m_itemv.endFlag = true;
+                JUDGE_MARK_SUB3(20, "93", true);
+            }
+        }
+    }
+}
+
diff --git a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.h b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.h
index 1937c503..fce604d0 100644
--- a/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.h
+++ b/entry/src/main/cpp/sdk/judge/sub3/Sub3Judge41Mndg.h
@@ -179,6 +179,7 @@ public:
 
     //语音播报结束
     void playSoundEnd(const std::string& code);
+    void JudgeEndCloseLight();
 protected:
     //更新灯光变化
     void UpdateDengGuangChange();
diff --git a/entry/src/main/cpp/sdk/parser/XParser.cpp b/entry/src/main/cpp/sdk/parser/XParser.cpp
index 2e261a2c..0ffdf347 100644
--- a/entry/src/main/cpp/sdk/parser/XParser.cpp
+++ b/entry/src/main/cpp/sdk/parser/XParser.cpp
@@ -65,6 +65,7 @@ bool XParser::parseBeginExam(const std::string& data, TStuInfo& info)
     CHECK_GET_PARAM(object, "exam",    info.exam);
     CHECK_GET_PARAM(object, "replay",  info.replay);
     CHECK_GET_PARAM(object, "track",   info.track);
+    CHECK_GET_PARAM(object, "passing", info.passing);
     CHECK_GET_PARAM(object, "xm",      info.xm);
     CHECK_GET_PARAM(object, "sex",     info.sex);
     CHECK_GET_PARAM(object, "kslsh",   info.kslsh);
@@ -462,6 +463,7 @@ std::string XParser::toDataString(const TStuInfo& data)
     set(root, "exam",    data.exam);
     set(root, "replay",  data.replay);
     set(root, "track",   data.track);
+    set(root, "passing", data.passing);
     set(root, "xm",      data.xm);
     set(root, "sex",     data.sex);
     set(root, "kslsh",   data.kslsh);
diff --git a/entry/src/main/cpp/sdk/parser/XParser2.cpp b/entry/src/main/cpp/sdk/parser/XParser2.cpp
index 30252a25..8265ee0c 100644
--- a/entry/src/main/cpp/sdk/parser/XParser2.cpp
+++ b/entry/src/main/cpp/sdk/parser/XParser2.cpp
@@ -104,7 +104,7 @@ bool XParser2::getCGDatas(const std::vector<std::string>& array, T2ChuanGan::Ptr
     }
 
     //16: GPS速度
-    cg->ai_gps_v = Tools::atof(array[II(98)]) * 1.852;
+    cg->ai_gps_v = Tools::atof(array[II(98)]) * GPS_VEL_COEFF;
     //17: 纬度 Gps_N
     cg->ai_gps_nk = getGPSZuoBiao2(array[II(97)]);
     //25: 精度 Gps_E
diff --git a/entry/src/main/cpp/sdk/track/HTrack.h b/entry/src/main/cpp/sdk/track/HTrack.h
index cabfe13c..97f21053 100644
--- a/entry/src/main/cpp/sdk/track/HTrack.h
+++ b/entry/src/main/cpp/sdk/track/HTrack.h
@@ -54,6 +54,7 @@ enum TTrackType
     TTrackTypeArtificialMark,
     TTrackTypeArtificialItem,
     TTrackTypeSoundEnd,
+    TTrackTypeEndExam,
 };
 
 //轨迹文件数据头定义
diff --git a/entry/src/main/cpp/sdk/track/TrackReader.cpp b/entry/src/main/cpp/sdk/track/TrackReader.cpp
index a54a2bd6..eb3a20fb 100644
--- a/entry/src/main/cpp/sdk/track/TrackReader.cpp
+++ b/entry/src/main/cpp/sdk/track/TrackReader.cpp
@@ -13,23 +13,25 @@ TrackReader::TrackReader(const std::string& filename)
         using isbi = std::istreambuf_iterator<char>;
         m_content = std::string(isbi(m_file), (isbi()));
         m_stream = std::stringstream(m_content);
+        m_file.close();
     }
 }
 
 TrackReader::~TrackReader()
 {
     if(m_file.is_open())
+    {
         m_file.close();
+    }
 }
 
 bool TrackReader::failed()
 {
-    return !m_file.is_open() || m_content.empty();
+    return m_content.empty();
 }
 
 bool TrackReader::read(TTrackDataList& datas)
 {
-    TASSERT_BOOL(m_file.is_open(), "file %s not open", m_filename.c_str());
     TTrackData::Ptr data = nullptr;
     while(read(data))
     {
@@ -90,6 +92,10 @@ bool TrackReader::read(TTrackData::Ptr& data)
         {
             data->type = TTrackTypeSoundEnd;
         }
+        else if(root.isMember("method") && (root["method"].asString() == "examjudgeEndExam" || root["method"].asString() == "examJudgeEndExam"))
+        {
+            data->type = TTrackTypeEndExam;
+        }
         else
         {
             TASSERT_BOOL(false, "");
diff --git a/entry/src/main/cpp/sdk/utility/GpsMath.cpp b/entry/src/main/cpp/sdk/utility/GpsMath.cpp
index 960e607e..66f13808 100644
--- a/entry/src/main/cpp/sdk/utility/GpsMath.cpp
+++ b/entry/src/main/cpp/sdk/utility/GpsMath.cpp
@@ -6,9 +6,9 @@ double GpsMath::calcGpsAngle(const TGPSPoint& p1, const TGPSPoint& p2) noexcept
     return bearing(p1.wd, p1.jd, p2.wd, p2.jd);
 }
 
-inline double GpsMath::calcGpsDistanceCM(const double& E1, const double& N1,
-                                         const double& E2, const double& N2,
-                                         const double& H) noexcept
+double GpsMath::calcGpsDistanceCM(const double& E1, const double& N1,
+                                  const double& E2, const double& N2,
+                                  const double& H) noexcept
 {
     double XCoor = 0.0, YCoor = 0.0;
     getDimensionalCoordinate(E1, N1, E2, N2, H, XCoor, YCoor);
@@ -28,7 +28,7 @@ double GpsMath::calcGpsDistanceMI(const TGPSPoint& p1, const TGPSPoint& p2, cons
     return calcGpsDistanceCM(p1.jd, p1.wd, p2.jd, p2.wd, H) / 100.0;
 }
 
-inline double GpsMath::calcGpsDistanceMI(const double& E1, const double& N1, const double& E2, const double& N2, const double& H) noexcept
+double GpsMath::calcGpsDistanceMI(const double& E1, const double& N1, const double& E2, const double& N2, const double& H) noexcept
 {
     return calcGpsDistanceCM(E1, N1, E2, N2, H) / 100.0;
 }
diff --git a/entry/src/main/cpp/sdk/utility/GpsMath.h b/entry/src/main/cpp/sdk/utility/GpsMath.h
index 374d77b3..ce2077b0 100644
--- a/entry/src/main/cpp/sdk/utility/GpsMath.h
+++ b/entry/src/main/cpp/sdk/utility/GpsMath.h
@@ -32,9 +32,9 @@ public:
 
     //***计算距离, 输入第一点的经纬度坐标、第二点的经纬度坐标、椭圆高，输出相对坐标，以厘米为单位，偏东为正，偏北为正
     static double calcGpsDistanceCM(const TGPSPoint& p1, const TGPSPoint& p2, const double& H = 0) noexcept;
-    static inline double calcGpsDistanceCM(const double& E1, const double& N1, const double& E2, const double& N2, const double& H = 0) noexcept;
+    static double calcGpsDistanceCM(const double& E1, const double& N1, const double& E2, const double& N2, const double& H = 0) noexcept;
     static double calcGpsDistanceMI(const TGPSPoint& p1, const TGPSPoint& p2, const double& H = 0) noexcept;
-    static inline double calcGpsDistanceMI(const double& E1, const double& N1, const double& E2, const double& N2, const double& H = 0) noexcept;
+    static double calcGpsDistanceMI(const double& E1, const double& N1, const double& E2, const double& N2, const double& H = 0) noexcept;
 
     //***经纬度距离计算(在这个经纬度上，旋转到某个角度，并且长度扩展distMi(单位米))
     static TGPSPoint calcThatLonLat(const TGPSPoint& p, const double& angle,const double& distMI) noexcept;
diff --git a/entry/src/main/cpp/sdk/utility/HBean.h b/entry/src/main/cpp/sdk/utility/HBean.h
index 8b292ab1..c87c52c2 100644
--- a/entry/src/main/cpp/sdk/utility/HBean.h
+++ b/entry/src/main/cpp/sdk/utility/HBean.h
@@ -28,6 +28,9 @@
 //科目三除以这个数才得到经纬度
 #define GPS_DIV  double(1000000.0)
 
+//GPS速度要乘这个系数
+#define GPS_VEL_COEFF (1.852)
+
 #define DEAL_API     virtual
 #define DEAL_METHOD  override
 #define PURE_API
diff --git a/entry/src/main/cpp/sdk/utility/HTypes.h b/entry/src/main/cpp/sdk/utility/HTypes.h
index 489a5d83..66df767d 100644
--- a/entry/src/main/cpp/sdk/utility/HTypes.h
+++ b/entry/src/main/cpp/sdk/utility/HTypes.h
@@ -318,6 +318,7 @@ struct TStuInfo
     int8               exam      = 0;   //考试模式（0-训练 1-考试） ExamMode
     int8               replay    = 0;   //是否是回放，0-否 1-是，app端全部填0，正常考试和训练时必须填0,如果是轨迹回放才会填1
     std::string        track     = "";  //要生成的轨迹文件 空字符串("")不生成 //2023-11-02修改 杨 //是否轨迹（回放）（0-否 1-是）
+    int32              passing   = 0;   //合格分数
     std::string        xm        = "";  //考生姓名
     int8               sex       = 0;   //考生性别 0:女 1:男 2023-04-24 杨海洋增加
     std::string        kslsh     = "";  //流水号（考生号）
@@ -782,6 +783,19 @@ struct TJudgeData
     //std::string        lxxx   = {}; //录像信息（录像文件名）扣分项目_扣分序号_录像倒退时长_录像顺延时长_是否扣分@关键数据2_03_10_5_1@-13_9
 };
 
+
+//路段状况:基准天线所在车道方向: 1-右转 2-直行 3-左转 4-掉头
+//1000 0100 0010 0001
+enum
+{
+    TURN_R = 0,
+    TURN_Z = 1,
+    TURN_L = 2,
+    TURN_D = 3,
+};
+
+#define TURN_1  ('1')
+
 struct TRTKResult
 {
     std::string MapRoad_Name; //路段名字
diff --git a/entry/src/main/ets/common/utils/GetDistance.ts b/entry/src/main/ets/common/utils/GetDistance.ts
index 0a287464..916457a9 100644
--- a/entry/src/main/ets/common/utils/GetDistance.ts
+++ b/entry/src/main/ets/common/utils/GetDistance.ts
@@ -9,6 +9,7 @@ export default class GetDistance {
   public folderPath: string
   public timeStr: string
   public totalDistance: number
+  public totalTime:number
   public date: string
 
   constructor(context) {
@@ -27,9 +28,10 @@ export default class GetDistance {
     this.timeStr = timeStr
     this.folderPath = folderPath;
     this.totalDistance = 0;
+    this.totalTime = 0;
     this.date = date;
     await fileUtil.editFile(
-      `${folderPath}/${date}.txt`,`程序启动时间：${timeStr} 累计行驶距离:${this.totalDistance}m`
+      `${folderPath}/${date}.txt`,`程序启动时间：${timeStr} 累计行驶距离:${this.totalDistance}m 累计运行时常:${this.totalTime}min`
     );
     return folderPath
   }
@@ -38,11 +40,11 @@ export default class GetDistance {
   public setTimeData = async (str:number) => {
     const {fileUtil,folderPath,timeStr,date,totalDistance} = this;
     const content = await fileUtil.readFile(`${folderPath}/${date}.txt`) || '';
-    console.info('surenjun',str)
     const contentArr = content.split('\n').filter(item => item)
     console.info('surenjun contentArr',JSON.stringify(contentArr))
     this.totalDistance += str * 1
-    contentArr[contentArr.length - 1] = `程序启动时间：${timeStr} 累计行驶距离:${(this.totalDistance).toFixed(2)}m`+ '\n'
+    this.totalTime += 1;
+    contentArr[contentArr.length - 1] = `程序启动时间：${timeStr} 累计行驶距离:${(this.totalDistance).toFixed(2)}m 累计运行时常:${Math.ceil(this.totalTime/60)}min`+ '\n'
     console.info('surenjun',contentArr.join('\n'))
     await fileUtil.addFile(
       `${folderPath}/${date}.txt`,contentArr.join('\n')
diff --git a/entry/src/main/ets/pages/judgeSDK/judge.ts b/entry/src/main/ets/pages/judgeSDK/judge.ts
index acaa1dfd..02f7bee0 100644
--- a/entry/src/main/ets/pages/judgeSDK/judge.ts
+++ b/entry/src/main/ets/pages/judgeSDK/judge.ts
@@ -14,7 +14,6 @@ import { judgeConfig } from './utils/judgeConfig';
 import { uploadExamProgressData, writeObjectOut } from '../../api/judge';
 import UsbService from '../../common/service/usbService';
 import { LANE,KF } from '../judgeSDK/api/judgeSDK.d';
-
 import {
   Array2Byte,
   convertGpsCoord2,
@@ -49,7 +48,8 @@ import {
   examJudgeRealExam,
   examJudgeSetLogCallback,
   examJudgeSetPerformCallback,
-  examJudgeSetRealExamCallback
+  examJudgeSetRealExamCallback,
+  examCalcGpsDistance
 } from './api/index';
 
 const judgeTag = 'SURENJUN_JUDGE'
@@ -109,7 +109,7 @@ export default class Judge {
     this.fileLog = fileLog;
     this.filePath = filePath;
 
-    const {getJudgeBeginData,handleUdp,fileUtil,handleTrajectoryUdp,isTrajectoryOpen,trajectoryPath,avPlayer} = this;
+    const {getJudgeBeginData,handleUdp,handDistance,fileUtil,handleTrajectoryUdp,isTrajectoryOpen,trajectoryPath,avPlayer} = this;
     const isJudgeInitBool = globalThis.isJudgeInitBool;
     let strArr = [];
     if (isTrajectoryOpen) {
@@ -174,13 +174,44 @@ export default class Judge {
     globalThis.udpClient.onMessage_1(async (msg) => {
       console.info('socketTag[PLC.UdpClient]', '收到udp回调数据')
       handleUdp(msg)
+      const udpIndex = globalThis.udpIndex;
+      if (udpIndex % 5 === 0) {
+        handDistance();
+      }
     })
 
-
-
     //TODO 监听远程扣分
   }
 
+
+  handDistance= async ()=>{
+    const {jd,wd,hxj,dwzt} = this.tempData.gps;
+    const tJD = convertGpsCoord2(jd)
+    const tWD = convertGpsCoord2(wd)
+    const {prevJd,prevWd} = this
+    console.info('surenjun =>prevJd',prevJd)
+    console.info('surenjun =>dwzt',dwzt)
+    if(prevJd && dwzt == 4){
+      console.info('surenjun =>tJD',tJD)
+      console.info('surenjun =>tWD',tWD)
+      console.info('surenjun =>prevJd',prevJd)
+      console.info('surenjun =>preWd',prevWd)
+      console.info('surenjun =>hxj',hxj)
+      const distance = await examCalcGpsDistance({
+        jd1:prevJd,
+        wd1:prevWd,
+        jd2:tJD,
+        wd2:tWD,
+        h:hxj || 1,
+      })
+      console.info('surenjun =>distance',distance)
+      //@ts-ignore
+      globalThis.distanceClass.setTimeData(((distance / 100).toFixed(2)) * 1)
+    }
+    this.prevJd = tJD;
+    this.prevWd = tWD;
+  }
+
   // 获取评判初始化数据
   getJudgeInitData = async () => {
     const {getModelData,getKm3JudgeInitConfig} = this
@@ -1343,16 +1374,16 @@ export default class Judge {
     //@ts-ignore
     this.judgeUI.sd = ((param350 == 0? plcData.gps.sd :plcData.sensor.cs) as number * 1.852).toFixed(0)   + ''
     this.judgeUI.dw = (Math.floor(plcData.sensor.dw as number) || 0) + ''
-
-    await this.checkDwzt(plcData.gps.dwzt);
+    //TODO 暂时关闭差分检测异常
+    // await this.checkDwzt(plcData.gps.dwzt);
     if(!isExamEnd){
       await examJudgeRealExam(plcData)
     }
     const udpIndex = globalThis.udpIndex;
+    let [prevJd,preWd] = [0,0]
     if (udpIndex % 5 === 0 && !isUdpEnd) {
       const judgeUdp = globalThis.judgeUdp
       const bytes = await this.getMessageHeartbeat(isExamEnd);
-      console.info(judgeTag+'UDP',JSON.stringify(bytes))
       judgeUdp.send(bytes)
     }
     globalThis.udpIndex += 1
@@ -1482,6 +1513,7 @@ export default class Judge {
       this.dwztNum += 1
     }else{
       this.dwztNum = 0;
+      this.judgeUI.dwztErrorVisible = false;
     }
   }
 
@@ -1490,6 +1522,8 @@ export default class Judge {
   private fileLog
   private filePath
   private totalScore: number
+  private prevJd: number = 0
+  private prevWd: number = 0
   private dwztNum:number = 0
   private folderPath: string
   private modelPath: string
diff --git a/entry/src/main/resources/rawfile/voice/10101.mp3 b/entry/src/main/resources/rawfile/voice/10101.mp3
index 147be7a7..e3bccf03 100644
Binary files a/entry/src/main/resources/rawfile/voice/10101.mp3 and b/entry/src/main/resources/rawfile/voice/10101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10102.mp3 b/entry/src/main/resources/rawfile/voice/10102.mp3
index 8d7c8215..00c45070 100644
Binary files a/entry/src/main/resources/rawfile/voice/10102.mp3 and b/entry/src/main/resources/rawfile/voice/10102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10103.mp3 b/entry/src/main/resources/rawfile/voice/10103.mp3
index ea3e9617..ce53b26f 100644
Binary files a/entry/src/main/resources/rawfile/voice/10103.mp3 and b/entry/src/main/resources/rawfile/voice/10103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10104.mp3 b/entry/src/main/resources/rawfile/voice/10104.mp3
index b418c1be..229ff02f 100644
Binary files a/entry/src/main/resources/rawfile/voice/10104.mp3 and b/entry/src/main/resources/rawfile/voice/10104.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10105.mp3 b/entry/src/main/resources/rawfile/voice/10105.mp3
index b50fed3d..392a2857 100644
Binary files a/entry/src/main/resources/rawfile/voice/10105.mp3 and b/entry/src/main/resources/rawfile/voice/10105.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10106.mp3 b/entry/src/main/resources/rawfile/voice/10106.mp3
index affc995f..c290be1e 100644
Binary files a/entry/src/main/resources/rawfile/voice/10106.mp3 and b/entry/src/main/resources/rawfile/voice/10106.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10107.mp3 b/entry/src/main/resources/rawfile/voice/10107.mp3
index e29b3918..9449724a 100644
Binary files a/entry/src/main/resources/rawfile/voice/10107.mp3 and b/entry/src/main/resources/rawfile/voice/10107.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10108.mp3 b/entry/src/main/resources/rawfile/voice/10108.mp3
index 696d615e..5fb8f7c3 100644
Binary files a/entry/src/main/resources/rawfile/voice/10108.mp3 and b/entry/src/main/resources/rawfile/voice/10108.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10109.mp3 b/entry/src/main/resources/rawfile/voice/10109.mp3
index 942c4bc5..3490c030 100644
Binary files a/entry/src/main/resources/rawfile/voice/10109.mp3 and b/entry/src/main/resources/rawfile/voice/10109.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10111.mp3 b/entry/src/main/resources/rawfile/voice/10111.mp3
index f860f3f4..3a636e0f 100644
Binary files a/entry/src/main/resources/rawfile/voice/10111.mp3 and b/entry/src/main/resources/rawfile/voice/10111.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10112.mp3 b/entry/src/main/resources/rawfile/voice/10112.mp3
index 5821aac4..7f0abcfa 100644
Binary files a/entry/src/main/resources/rawfile/voice/10112.mp3 and b/entry/src/main/resources/rawfile/voice/10112.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10113.mp3 b/entry/src/main/resources/rawfile/voice/10113.mp3
index 64a39e8d..05e692d0 100644
Binary files a/entry/src/main/resources/rawfile/voice/10113.mp3 and b/entry/src/main/resources/rawfile/voice/10113.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10114.mp3 b/entry/src/main/resources/rawfile/voice/10114.mp3
index fed8c4eb..eea3c11f 100644
Binary files a/entry/src/main/resources/rawfile/voice/10114.mp3 and b/entry/src/main/resources/rawfile/voice/10114.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10115.mp3 b/entry/src/main/resources/rawfile/voice/10115.mp3
index 8b6de7b7..036f8d9d 100644
Binary files a/entry/src/main/resources/rawfile/voice/10115.mp3 and b/entry/src/main/resources/rawfile/voice/10115.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10116.mp3 b/entry/src/main/resources/rawfile/voice/10116.mp3
index c50ac417..165dedb2 100644
Binary files a/entry/src/main/resources/rawfile/voice/10116.mp3 and b/entry/src/main/resources/rawfile/voice/10116.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10117.mp3 b/entry/src/main/resources/rawfile/voice/10117.mp3
index 3927877b..faf79f37 100644
Binary files a/entry/src/main/resources/rawfile/voice/10117.mp3 and b/entry/src/main/resources/rawfile/voice/10117.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10118.mp3 b/entry/src/main/resources/rawfile/voice/10118.mp3
index 4077de7c..dff0275c 100644
Binary files a/entry/src/main/resources/rawfile/voice/10118.mp3 and b/entry/src/main/resources/rawfile/voice/10118.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10119.mp3 b/entry/src/main/resources/rawfile/voice/10119.mp3
index 866857f0..e5bc7758 100644
Binary files a/entry/src/main/resources/rawfile/voice/10119.mp3 and b/entry/src/main/resources/rawfile/voice/10119.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10120.mp3 b/entry/src/main/resources/rawfile/voice/10120.mp3
index 9ac52f40..87ee1eff 100644
Binary files a/entry/src/main/resources/rawfile/voice/10120.mp3 and b/entry/src/main/resources/rawfile/voice/10120.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10121.mp3 b/entry/src/main/resources/rawfile/voice/10121.mp3
index c245858e..49ec4137 100644
Binary files a/entry/src/main/resources/rawfile/voice/10121.mp3 and b/entry/src/main/resources/rawfile/voice/10121.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10122.mp3 b/entry/src/main/resources/rawfile/voice/10122.mp3
index c20f7a9e..6499c810 100644
Binary files a/entry/src/main/resources/rawfile/voice/10122.mp3 and b/entry/src/main/resources/rawfile/voice/10122.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10123.mp3 b/entry/src/main/resources/rawfile/voice/10123.mp3
index ea59ca43..d4a77fc7 100644
Binary files a/entry/src/main/resources/rawfile/voice/10123.mp3 and b/entry/src/main/resources/rawfile/voice/10123.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10124.mp3 b/entry/src/main/resources/rawfile/voice/10124.mp3
index c7a9046c..213048a8 100644
Binary files a/entry/src/main/resources/rawfile/voice/10124.mp3 and b/entry/src/main/resources/rawfile/voice/10124.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10125.mp3 b/entry/src/main/resources/rawfile/voice/10125.mp3
index 87037319..8cc93464 100644
Binary files a/entry/src/main/resources/rawfile/voice/10125.mp3 and b/entry/src/main/resources/rawfile/voice/10125.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10126.mp3 b/entry/src/main/resources/rawfile/voice/10126.mp3
index 8bb05b34..4fc5b566 100644
Binary files a/entry/src/main/resources/rawfile/voice/10126.mp3 and b/entry/src/main/resources/rawfile/voice/10126.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10127.mp3 b/entry/src/main/resources/rawfile/voice/10127.mp3
index 87928232..b3ac5b75 100644
Binary files a/entry/src/main/resources/rawfile/voice/10127.mp3 and b/entry/src/main/resources/rawfile/voice/10127.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10201.mp3 b/entry/src/main/resources/rawfile/voice/10201.mp3
index 1d57dca4..f135220f 100644
Binary files a/entry/src/main/resources/rawfile/voice/10201.mp3 and b/entry/src/main/resources/rawfile/voice/10201.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10202.mp3 b/entry/src/main/resources/rawfile/voice/10202.mp3
index 2a876c30..5856832c 100644
Binary files a/entry/src/main/resources/rawfile/voice/10202.mp3 and b/entry/src/main/resources/rawfile/voice/10202.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10203.mp3 b/entry/src/main/resources/rawfile/voice/10203.mp3
index 6f278e83..e38884e6 100644
Binary files a/entry/src/main/resources/rawfile/voice/10203.mp3 and b/entry/src/main/resources/rawfile/voice/10203.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10204.mp3 b/entry/src/main/resources/rawfile/voice/10204.mp3
index ed911201..55739cd7 100644
Binary files a/entry/src/main/resources/rawfile/voice/10204.mp3 and b/entry/src/main/resources/rawfile/voice/10204.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10205.mp3 b/entry/src/main/resources/rawfile/voice/10205.mp3
index bf239981..c85c41cb 100644
Binary files a/entry/src/main/resources/rawfile/voice/10205.mp3 and b/entry/src/main/resources/rawfile/voice/10205.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10206.mp3 b/entry/src/main/resources/rawfile/voice/10206.mp3
index 8917c90f..a4e4ce23 100644
Binary files a/entry/src/main/resources/rawfile/voice/10206.mp3 and b/entry/src/main/resources/rawfile/voice/10206.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10207.mp3 b/entry/src/main/resources/rawfile/voice/10207.mp3
index 95ec2d1a..ff677c41 100644
Binary files a/entry/src/main/resources/rawfile/voice/10207.mp3 and b/entry/src/main/resources/rawfile/voice/10207.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10209.mp3 b/entry/src/main/resources/rawfile/voice/10209.mp3
index 457e93f2..8c982620 100644
Binary files a/entry/src/main/resources/rawfile/voice/10209.mp3 and b/entry/src/main/resources/rawfile/voice/10209.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10210.mp3 b/entry/src/main/resources/rawfile/voice/10210.mp3
index 33af7edf..4d837fa8 100644
Binary files a/entry/src/main/resources/rawfile/voice/10210.mp3 and b/entry/src/main/resources/rawfile/voice/10210.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10211.mp3 b/entry/src/main/resources/rawfile/voice/10211.mp3
index 34b86e27..34a1a741 100644
Binary files a/entry/src/main/resources/rawfile/voice/10211.mp3 and b/entry/src/main/resources/rawfile/voice/10211.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_01.mp3 b/entry/src/main/resources/rawfile/voice/10_01.mp3
index 15ede5a7..d8cccc87 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_01.mp3 and b/entry/src/main/resources/rawfile/voice/10_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_02.mp3 b/entry/src/main/resources/rawfile/voice/10_02.mp3
index eaec1667..066f3da1 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_02.mp3 and b/entry/src/main/resources/rawfile/voice/10_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_03.mp3 b/entry/src/main/resources/rawfile/voice/10_03.mp3
index 3fe6d0b7..761f20da 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_03.mp3 and b/entry/src/main/resources/rawfile/voice/10_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_04.mp3 b/entry/src/main/resources/rawfile/voice/10_04.mp3
index caac0a84..079dd96c 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_04.mp3 and b/entry/src/main/resources/rawfile/voice/10_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_05.mp3 b/entry/src/main/resources/rawfile/voice/10_05.mp3
index 66b4f968..6bad0661 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_05.mp3 and b/entry/src/main/resources/rawfile/voice/10_05.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_06.mp3 b/entry/src/main/resources/rawfile/voice/10_06.mp3
index 764a0966..634c9352 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_06.mp3 and b/entry/src/main/resources/rawfile/voice/10_06.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_101.mp3 b/entry/src/main/resources/rawfile/voice/10_101.mp3
index eca82072..47e6ddea 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_101.mp3 and b/entry/src/main/resources/rawfile/voice/10_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_102.mp3 b/entry/src/main/resources/rawfile/voice/10_102.mp3
index 7325b3d5..ec16f75b 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_102.mp3 and b/entry/src/main/resources/rawfile/voice/10_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_103.mp3 b/entry/src/main/resources/rawfile/voice/10_103.mp3
index 929daad9..8b7b5443 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_103.mp3 and b/entry/src/main/resources/rawfile/voice/10_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_104.mp3 b/entry/src/main/resources/rawfile/voice/10_104.mp3
index fb147112..37824a6c 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_104.mp3 and b/entry/src/main/resources/rawfile/voice/10_104.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_105.mp3 b/entry/src/main/resources/rawfile/voice/10_105.mp3
index ae0d6674..9dc77bb2 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_105.mp3 and b/entry/src/main/resources/rawfile/voice/10_105.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_106.mp3 b/entry/src/main/resources/rawfile/voice/10_106.mp3
index 16bf3dbd..1a569eb4 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_106.mp3 and b/entry/src/main/resources/rawfile/voice/10_106.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_107.mp3 b/entry/src/main/resources/rawfile/voice/10_107.mp3
index 5e560354..678d9f95 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_107.mp3 and b/entry/src/main/resources/rawfile/voice/10_107.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_41.mp3 b/entry/src/main/resources/rawfile/voice/10_41.mp3
index 866d0859..a07f8a66 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_41.mp3 and b/entry/src/main/resources/rawfile/voice/10_41.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_42.mp3 b/entry/src/main/resources/rawfile/voice/10_42.mp3
index ee122d49..d3b11fef 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_42.mp3 and b/entry/src/main/resources/rawfile/voice/10_42.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/10_43.mp3 b/entry/src/main/resources/rawfile/voice/10_43.mp3
index a4cdedba..a96c60d0 100644
Binary files a/entry/src/main/resources/rawfile/voice/10_43.mp3 and b/entry/src/main/resources/rawfile/voice/10_43.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_01.mp3 b/entry/src/main/resources/rawfile/voice/11_01.mp3
index 0fcac503..3a00ea94 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_01.mp3 and b/entry/src/main/resources/rawfile/voice/11_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_02.mp3 b/entry/src/main/resources/rawfile/voice/11_02.mp3
index 04b7e56b..cbba69d4 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_02.mp3 and b/entry/src/main/resources/rawfile/voice/11_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_03.mp3 b/entry/src/main/resources/rawfile/voice/11_03.mp3
index ab5e3860..1dc623d7 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_03.mp3 and b/entry/src/main/resources/rawfile/voice/11_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_04.mp3 b/entry/src/main/resources/rawfile/voice/11_04.mp3
index 4679722b..deae6523 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_04.mp3 and b/entry/src/main/resources/rawfile/voice/11_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_05.mp3 b/entry/src/main/resources/rawfile/voice/11_05.mp3
index 100e5e6b..12cd9626 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_05.mp3 and b/entry/src/main/resources/rawfile/voice/11_05.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_06.mp3 b/entry/src/main/resources/rawfile/voice/11_06.mp3
index e583513f..a21e7831 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_06.mp3 and b/entry/src/main/resources/rawfile/voice/11_06.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_07.mp3 b/entry/src/main/resources/rawfile/voice/11_07.mp3
index aff21c3a..95459cd7 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_07.mp3 and b/entry/src/main/resources/rawfile/voice/11_07.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_08.mp3 b/entry/src/main/resources/rawfile/voice/11_08.mp3
index 77e0effa..0613c485 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_08.mp3 and b/entry/src/main/resources/rawfile/voice/11_08.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_09.mp3 b/entry/src/main/resources/rawfile/voice/11_09.mp3
index 62698f28..012ef244 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_09.mp3 and b/entry/src/main/resources/rawfile/voice/11_09.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_10.mp3 b/entry/src/main/resources/rawfile/voice/11_10.mp3
index 694354b6..68c690f3 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_10.mp3 and b/entry/src/main/resources/rawfile/voice/11_10.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_101.mp3 b/entry/src/main/resources/rawfile/voice/11_101.mp3
index f67ce0b5..dcb83055 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_101.mp3 and b/entry/src/main/resources/rawfile/voice/11_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_102.mp3 b/entry/src/main/resources/rawfile/voice/11_102.mp3
index 72d4df73..81c88572 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_102.mp3 and b/entry/src/main/resources/rawfile/voice/11_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_41.mp3 b/entry/src/main/resources/rawfile/voice/11_41.mp3
index f5fa4021..c0f09b06 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_41.mp3 and b/entry/src/main/resources/rawfile/voice/11_41.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_42.mp3 b/entry/src/main/resources/rawfile/voice/11_42.mp3
index fceedc44..a7498e9a 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_42.mp3 and b/entry/src/main/resources/rawfile/voice/11_42.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_43.mp3 b/entry/src/main/resources/rawfile/voice/11_43.mp3
index 321a568f..fdb63a89 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_43.mp3 and b/entry/src/main/resources/rawfile/voice/11_43.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/11_44.mp3 b/entry/src/main/resources/rawfile/voice/11_44.mp3
index 55b0aad0..93979867 100644
Binary files a/entry/src/main/resources/rawfile/voice/11_44.mp3 and b/entry/src/main/resources/rawfile/voice/11_44.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_01.mp3 b/entry/src/main/resources/rawfile/voice/12_01.mp3
index 85a12e1c..04334e26 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_01.mp3 and b/entry/src/main/resources/rawfile/voice/12_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_02.mp3 b/entry/src/main/resources/rawfile/voice/12_02.mp3
index b488311e..dd0901a2 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_02.mp3 and b/entry/src/main/resources/rawfile/voice/12_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_04.mp3 b/entry/src/main/resources/rawfile/voice/12_04.mp3
index 735ae2db..8ead106d 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_04.mp3 and b/entry/src/main/resources/rawfile/voice/12_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_101.mp3 b/entry/src/main/resources/rawfile/voice/12_101.mp3
index 85a12e1c..04334e26 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_101.mp3 and b/entry/src/main/resources/rawfile/voice/12_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_102.mp3 b/entry/src/main/resources/rawfile/voice/12_102.mp3
index b488311e..dd0901a2 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_102.mp3 and b/entry/src/main/resources/rawfile/voice/12_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_103.mp3 b/entry/src/main/resources/rawfile/voice/12_103.mp3
index 735ae2db..8ead106d 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_103.mp3 and b/entry/src/main/resources/rawfile/voice/12_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_104.mp3 b/entry/src/main/resources/rawfile/voice/12_104.mp3
index c19df523..f92a20f2 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_104.mp3 and b/entry/src/main/resources/rawfile/voice/12_104.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_41.mp3 b/entry/src/main/resources/rawfile/voice/12_41.mp3
index c19df523..f92a20f2 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_41.mp3 and b/entry/src/main/resources/rawfile/voice/12_41.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_42.mp3 b/entry/src/main/resources/rawfile/voice/12_42.mp3
index 6d9869bd..408f5a32 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_42.mp3 and b/entry/src/main/resources/rawfile/voice/12_42.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_44.mp3 b/entry/src/main/resources/rawfile/voice/12_44.mp3
index 9333d497..6c6ee349 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_44.mp3 and b/entry/src/main/resources/rawfile/voice/12_44.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_45.mp3 b/entry/src/main/resources/rawfile/voice/12_45.mp3
index 5f6a6bcc..2ce5d769 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_45.mp3 and b/entry/src/main/resources/rawfile/voice/12_45.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/12_46.mp3 b/entry/src/main/resources/rawfile/voice/12_46.mp3
index ed840524..01116189 100644
Binary files a/entry/src/main/resources/rawfile/voice/12_46.mp3 and b/entry/src/main/resources/rawfile/voice/12_46.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_01.mp3 b/entry/src/main/resources/rawfile/voice/13_01.mp3
index 1bcacbff..979ae723 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_01.mp3 and b/entry/src/main/resources/rawfile/voice/13_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_02.mp3 b/entry/src/main/resources/rawfile/voice/13_02.mp3
index 727b4b83..d358ffad 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_02.mp3 and b/entry/src/main/resources/rawfile/voice/13_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_03.mp3 b/entry/src/main/resources/rawfile/voice/13_03.mp3
index 50b13965..ad1623d8 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_03.mp3 and b/entry/src/main/resources/rawfile/voice/13_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_04.mp3 b/entry/src/main/resources/rawfile/voice/13_04.mp3
index 0ee8554d..844a5b0a 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_04.mp3 and b/entry/src/main/resources/rawfile/voice/13_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_05.mp3 b/entry/src/main/resources/rawfile/voice/13_05.mp3
index 6f8db1a7..8cc341e2 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_05.mp3 and b/entry/src/main/resources/rawfile/voice/13_05.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_06.mp3 b/entry/src/main/resources/rawfile/voice/13_06.mp3
index 3adbe8d4..c17111a1 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_06.mp3 and b/entry/src/main/resources/rawfile/voice/13_06.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_08.mp3 b/entry/src/main/resources/rawfile/voice/13_08.mp3
index 54fb5e5e..f882b611 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_08.mp3 and b/entry/src/main/resources/rawfile/voice/13_08.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_09.mp3 b/entry/src/main/resources/rawfile/voice/13_09.mp3
index f8a7a013..2b177088 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_09.mp3 and b/entry/src/main/resources/rawfile/voice/13_09.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_101.mp3 b/entry/src/main/resources/rawfile/voice/13_101.mp3
index 727b4b83..d358ffad 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_101.mp3 and b/entry/src/main/resources/rawfile/voice/13_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_102.mp3 b/entry/src/main/resources/rawfile/voice/13_102.mp3
index 0ee8554d..844a5b0a 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_102.mp3 and b/entry/src/main/resources/rawfile/voice/13_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/13_103.mp3 b/entry/src/main/resources/rawfile/voice/13_103.mp3
index d872a04a..c381193b 100644
Binary files a/entry/src/main/resources/rawfile/voice/13_103.mp3 and b/entry/src/main/resources/rawfile/voice/13_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/14_01.mp3 b/entry/src/main/resources/rawfile/voice/14_01.mp3
index ed616dae..f1821dca 100644
Binary files a/entry/src/main/resources/rawfile/voice/14_01.mp3 and b/entry/src/main/resources/rawfile/voice/14_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/14_02.mp3 b/entry/src/main/resources/rawfile/voice/14_02.mp3
index e11d4351..f570ffcd 100644
Binary files a/entry/src/main/resources/rawfile/voice/14_02.mp3 and b/entry/src/main/resources/rawfile/voice/14_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/14_66.mp3 b/entry/src/main/resources/rawfile/voice/14_66.mp3
index 05c672d6..2e5ea1c6 100644
Binary files a/entry/src/main/resources/rawfile/voice/14_66.mp3 and b/entry/src/main/resources/rawfile/voice/14_66.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/14_67.mp3 b/entry/src/main/resources/rawfile/voice/14_67.mp3
index 508e20e3..368cc7a6 100644
Binary files a/entry/src/main/resources/rawfile/voice/14_67.mp3 and b/entry/src/main/resources/rawfile/voice/14_67.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/14_68.mp3 b/entry/src/main/resources/rawfile/voice/14_68.mp3
index 4a0759ad..d6f293e9 100644
Binary files a/entry/src/main/resources/rawfile/voice/14_68.mp3 and b/entry/src/main/resources/rawfile/voice/14_68.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/14_71.mp3 b/entry/src/main/resources/rawfile/voice/14_71.mp3
index dfed07e0..322f58a8 100644
Binary files a/entry/src/main/resources/rawfile/voice/14_71.mp3 and b/entry/src/main/resources/rawfile/voice/14_71.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/14_72.mp3 b/entry/src/main/resources/rawfile/voice/14_72.mp3
index 652be9ff..6ccef9dd 100644
Binary files a/entry/src/main/resources/rawfile/voice/14_72.mp3 and b/entry/src/main/resources/rawfile/voice/14_72.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/14_82.mp3 b/entry/src/main/resources/rawfile/voice/14_82.mp3
index 0b972886..b4e29972 100644
Binary files a/entry/src/main/resources/rawfile/voice/14_82.mp3 and b/entry/src/main/resources/rawfile/voice/14_82.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/14_90.mp3 b/entry/src/main/resources/rawfile/voice/14_90.mp3
index 2e545537..063af419 100644
Binary files a/entry/src/main/resources/rawfile/voice/14_90.mp3 and b/entry/src/main/resources/rawfile/voice/14_90.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/14_91.mp3 b/entry/src/main/resources/rawfile/voice/14_91.mp3
index 80f6e379..348c9ada 100644
Binary files a/entry/src/main/resources/rawfile/voice/14_91.mp3 and b/entry/src/main/resources/rawfile/voice/14_91.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_01.mp3 b/entry/src/main/resources/rawfile/voice/15_01.mp3
index 0212dffa..1ed0d520 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_01.mp3 and b/entry/src/main/resources/rawfile/voice/15_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_02.mp3 b/entry/src/main/resources/rawfile/voice/15_02.mp3
index 71ede8d4..73463336 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_02.mp3 and b/entry/src/main/resources/rawfile/voice/15_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_03.mp3 b/entry/src/main/resources/rawfile/voice/15_03.mp3
index 4adf4fe8..49f2fedf 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_03.mp3 and b/entry/src/main/resources/rawfile/voice/15_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_04.mp3 b/entry/src/main/resources/rawfile/voice/15_04.mp3
index 0ece33d6..449ccdb2 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_04.mp3 and b/entry/src/main/resources/rawfile/voice/15_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_05.mp3 b/entry/src/main/resources/rawfile/voice/15_05.mp3
index 32c797a4..e910c6b0 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_05.mp3 and b/entry/src/main/resources/rawfile/voice/15_05.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_06.mp3 b/entry/src/main/resources/rawfile/voice/15_06.mp3
index 2b757a56..1d6ae0f4 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_06.mp3 and b/entry/src/main/resources/rawfile/voice/15_06.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_101.mp3 b/entry/src/main/resources/rawfile/voice/15_101.mp3
index 06c3c73b..a25c5f31 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_101.mp3 and b/entry/src/main/resources/rawfile/voice/15_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_102.mp3 b/entry/src/main/resources/rawfile/voice/15_102.mp3
index 985d3a3c..43d78b9f 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_102.mp3 and b/entry/src/main/resources/rawfile/voice/15_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_103.mp3 b/entry/src/main/resources/rawfile/voice/15_103.mp3
index b9eb7d1b..0cf62d91 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_103.mp3 and b/entry/src/main/resources/rawfile/voice/15_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_41.mp3 b/entry/src/main/resources/rawfile/voice/15_41.mp3
index 8b8ada92..ac416863 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_41.mp3 and b/entry/src/main/resources/rawfile/voice/15_41.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_42.mp3 b/entry/src/main/resources/rawfile/voice/15_42.mp3
index 66cc3674..8b1505c5 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_42.mp3 and b/entry/src/main/resources/rawfile/voice/15_42.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_43.mp3 b/entry/src/main/resources/rawfile/voice/15_43.mp3
index 82e4a6b0..71b60dc1 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_43.mp3 and b/entry/src/main/resources/rawfile/voice/15_43.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_44.mp3 b/entry/src/main/resources/rawfile/voice/15_44.mp3
index 9333d497..6c6ee349 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_44.mp3 and b/entry/src/main/resources/rawfile/voice/15_44.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/15_45.mp3 b/entry/src/main/resources/rawfile/voice/15_45.mp3
index 5f6a6bcc..2ce5d769 100644
Binary files a/entry/src/main/resources/rawfile/voice/15_45.mp3 and b/entry/src/main/resources/rawfile/voice/15_45.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_01.mp3 b/entry/src/main/resources/rawfile/voice/16_01.mp3
index d208d03a..80c144cc 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_01.mp3 and b/entry/src/main/resources/rawfile/voice/16_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_02.mp3 b/entry/src/main/resources/rawfile/voice/16_02.mp3
index 71ede8d4..73463336 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_02.mp3 and b/entry/src/main/resources/rawfile/voice/16_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_03.mp3 b/entry/src/main/resources/rawfile/voice/16_03.mp3
index 2b83a773..e80a674a 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_03.mp3 and b/entry/src/main/resources/rawfile/voice/16_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_04.mp3 b/entry/src/main/resources/rawfile/voice/16_04.mp3
index 0ece33d6..449ccdb2 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_04.mp3 and b/entry/src/main/resources/rawfile/voice/16_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_06.mp3 b/entry/src/main/resources/rawfile/voice/16_06.mp3
index 2b757a56..1d6ae0f4 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_06.mp3 and b/entry/src/main/resources/rawfile/voice/16_06.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_101.mp3 b/entry/src/main/resources/rawfile/voice/16_101.mp3
index 57735c68..755ff41b 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_101.mp3 and b/entry/src/main/resources/rawfile/voice/16_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_102.mp3 b/entry/src/main/resources/rawfile/voice/16_102.mp3
index 2b757a56..1d6ae0f4 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_102.mp3 and b/entry/src/main/resources/rawfile/voice/16_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_103.mp3 b/entry/src/main/resources/rawfile/voice/16_103.mp3
index 0ece33d6..449ccdb2 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_103.mp3 and b/entry/src/main/resources/rawfile/voice/16_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_41.mp3 b/entry/src/main/resources/rawfile/voice/16_41.mp3
index 3bba5305..8738dfe3 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_41.mp3 and b/entry/src/main/resources/rawfile/voice/16_41.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_42.mp3 b/entry/src/main/resources/rawfile/voice/16_42.mp3
index 66cc3674..8b1505c5 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_42.mp3 and b/entry/src/main/resources/rawfile/voice/16_42.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_43.mp3 b/entry/src/main/resources/rawfile/voice/16_43.mp3
index 82e4a6b0..71b60dc1 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_43.mp3 and b/entry/src/main/resources/rawfile/voice/16_43.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_44.mp3 b/entry/src/main/resources/rawfile/voice/16_44.mp3
index 9333d497..6c6ee349 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_44.mp3 and b/entry/src/main/resources/rawfile/voice/16_44.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/16_45.mp3 b/entry/src/main/resources/rawfile/voice/16_45.mp3
index 5f6a6bcc..2ce5d769 100644
Binary files a/entry/src/main/resources/rawfile/voice/16_45.mp3 and b/entry/src/main/resources/rawfile/voice/16_45.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/1_01.mp3 b/entry/src/main/resources/rawfile/voice/1_01.mp3
index da4eba9e..da6c373a 100644
Binary files a/entry/src/main/resources/rawfile/voice/1_01.mp3 and b/entry/src/main/resources/rawfile/voice/1_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/1_101.mp3 b/entry/src/main/resources/rawfile/voice/1_101.mp3
index 842b803d..f313b579 100644
Binary files a/entry/src/main/resources/rawfile/voice/1_101.mp3 and b/entry/src/main/resources/rawfile/voice/1_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/1号线.mp3 b/entry/src/main/resources/rawfile/voice/1号线.mp3
index 1f29bbe5..d5e33275 100644
Binary files a/entry/src/main/resources/rawfile/voice/1号线.mp3 and b/entry/src/main/resources/rawfile/voice/1号线.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20100.mp3 b/entry/src/main/resources/rawfile/voice/20100.mp3
index c7eb0443..bac349a9 100644
Binary files a/entry/src/main/resources/rawfile/voice/20100.mp3 and b/entry/src/main/resources/rawfile/voice/20100.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20101.mp3 b/entry/src/main/resources/rawfile/voice/20101.mp3
index 978a5212..1da11f77 100644
Binary files a/entry/src/main/resources/rawfile/voice/20101.mp3 and b/entry/src/main/resources/rawfile/voice/20101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20102.mp3 b/entry/src/main/resources/rawfile/voice/20102.mp3
index dc5c5eef..1089e26f 100644
Binary files a/entry/src/main/resources/rawfile/voice/20102.mp3 and b/entry/src/main/resources/rawfile/voice/20102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20103.mp3 b/entry/src/main/resources/rawfile/voice/20103.mp3
index 962ef6d0..819ec032 100644
Binary files a/entry/src/main/resources/rawfile/voice/20103.mp3 and b/entry/src/main/resources/rawfile/voice/20103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20104.mp3 b/entry/src/main/resources/rawfile/voice/20104.mp3
index b3947326..3ab70eb5 100644
Binary files a/entry/src/main/resources/rawfile/voice/20104.mp3 and b/entry/src/main/resources/rawfile/voice/20104.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20105.mp3 b/entry/src/main/resources/rawfile/voice/20105.mp3
index 5191be30..c3673a06 100644
Binary files a/entry/src/main/resources/rawfile/voice/20105.mp3 and b/entry/src/main/resources/rawfile/voice/20105.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20106.mp3 b/entry/src/main/resources/rawfile/voice/20106.mp3
index e7e508a2..a67f8e4f 100644
Binary files a/entry/src/main/resources/rawfile/voice/20106.mp3 and b/entry/src/main/resources/rawfile/voice/20106.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20200.mp3 b/entry/src/main/resources/rawfile/voice/20200.mp3
index f756b0a3..ad0a01b6 100644
Binary files a/entry/src/main/resources/rawfile/voice/20200.mp3 and b/entry/src/main/resources/rawfile/voice/20200.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20201.mp3 b/entry/src/main/resources/rawfile/voice/20201.mp3
index af0e2aaa..74fcb486 100644
Binary files a/entry/src/main/resources/rawfile/voice/20201.mp3 and b/entry/src/main/resources/rawfile/voice/20201.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20202.mp3 b/entry/src/main/resources/rawfile/voice/20202.mp3
index f1746fb6..5f0a79b9 100644
Binary files a/entry/src/main/resources/rawfile/voice/20202.mp3 and b/entry/src/main/resources/rawfile/voice/20202.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20203.mp3 b/entry/src/main/resources/rawfile/voice/20203.mp3
index 6b99d83e..f0de804a 100644
Binary files a/entry/src/main/resources/rawfile/voice/20203.mp3 and b/entry/src/main/resources/rawfile/voice/20203.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20300.mp3 b/entry/src/main/resources/rawfile/voice/20300.mp3
index 694b718b..756f3116 100644
Binary files a/entry/src/main/resources/rawfile/voice/20300.mp3 and b/entry/src/main/resources/rawfile/voice/20300.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20301.mp3 b/entry/src/main/resources/rawfile/voice/20301.mp3
index 902e05fd..0aec2ae7 100644
Binary files a/entry/src/main/resources/rawfile/voice/20301.mp3 and b/entry/src/main/resources/rawfile/voice/20301.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20302.mp3 b/entry/src/main/resources/rawfile/voice/20302.mp3
index 86241a88..ca8c68f7 100644
Binary files a/entry/src/main/resources/rawfile/voice/20302.mp3 and b/entry/src/main/resources/rawfile/voice/20302.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20303.mp3 b/entry/src/main/resources/rawfile/voice/20303.mp3
index 9f89311a..1fb8b90c 100644
Binary files a/entry/src/main/resources/rawfile/voice/20303.mp3 and b/entry/src/main/resources/rawfile/voice/20303.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20304.mp3 b/entry/src/main/resources/rawfile/voice/20304.mp3
index 05e89385..1c89f74d 100644
Binary files a/entry/src/main/resources/rawfile/voice/20304.mp3 and b/entry/src/main/resources/rawfile/voice/20304.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20305.mp3 b/entry/src/main/resources/rawfile/voice/20305.mp3
index 7d4f0a89..19e06081 100644
Binary files a/entry/src/main/resources/rawfile/voice/20305.mp3 and b/entry/src/main/resources/rawfile/voice/20305.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20306.mp3 b/entry/src/main/resources/rawfile/voice/20306.mp3
index dd46113a..1c88775f 100644
Binary files a/entry/src/main/resources/rawfile/voice/20306.mp3 and b/entry/src/main/resources/rawfile/voice/20306.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20400.mp3 b/entry/src/main/resources/rawfile/voice/20400.mp3
index 409abd1f..ada9358b 100644
Binary files a/entry/src/main/resources/rawfile/voice/20400.mp3 and b/entry/src/main/resources/rawfile/voice/20400.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20401.mp3 b/entry/src/main/resources/rawfile/voice/20401.mp3
index b1e055e2..5051234c 100644
Binary files a/entry/src/main/resources/rawfile/voice/20401.mp3 and b/entry/src/main/resources/rawfile/voice/20401.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20402.mp3 b/entry/src/main/resources/rawfile/voice/20402.mp3
index 84013400..d93aa224 100644
Binary files a/entry/src/main/resources/rawfile/voice/20402.mp3 and b/entry/src/main/resources/rawfile/voice/20402.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20403.mp3 b/entry/src/main/resources/rawfile/voice/20403.mp3
index 32b573b2..1f4f7f25 100644
Binary files a/entry/src/main/resources/rawfile/voice/20403.mp3 and b/entry/src/main/resources/rawfile/voice/20403.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20404.mp3 b/entry/src/main/resources/rawfile/voice/20404.mp3
index 140be8a6..dcf5558e 100644
Binary files a/entry/src/main/resources/rawfile/voice/20404.mp3 and b/entry/src/main/resources/rawfile/voice/20404.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20405.mp3 b/entry/src/main/resources/rawfile/voice/20405.mp3
index efc90b0d..0ff602bf 100644
Binary files a/entry/src/main/resources/rawfile/voice/20405.mp3 and b/entry/src/main/resources/rawfile/voice/20405.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20406.mp3 b/entry/src/main/resources/rawfile/voice/20406.mp3
index f02e484f..d2a82042 100644
Binary files a/entry/src/main/resources/rawfile/voice/20406.mp3 and b/entry/src/main/resources/rawfile/voice/20406.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20500.mp3 b/entry/src/main/resources/rawfile/voice/20500.mp3
index 1445c4b0..df0c0212 100644
Binary files a/entry/src/main/resources/rawfile/voice/20500.mp3 and b/entry/src/main/resources/rawfile/voice/20500.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20501.mp3 b/entry/src/main/resources/rawfile/voice/20501.mp3
index 675a317b..87f4d148 100644
Binary files a/entry/src/main/resources/rawfile/voice/20501.mp3 and b/entry/src/main/resources/rawfile/voice/20501.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20502.mp3 b/entry/src/main/resources/rawfile/voice/20502.mp3
index e263221f..8fd09636 100644
Binary files a/entry/src/main/resources/rawfile/voice/20502.mp3 and b/entry/src/main/resources/rawfile/voice/20502.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20503.mp3 b/entry/src/main/resources/rawfile/voice/20503.mp3
index 0ca5fb0a..aefbc05c 100644
Binary files a/entry/src/main/resources/rawfile/voice/20503.mp3 and b/entry/src/main/resources/rawfile/voice/20503.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20504.mp3 b/entry/src/main/resources/rawfile/voice/20504.mp3
index f02e484f..d2a82042 100644
Binary files a/entry/src/main/resources/rawfile/voice/20504.mp3 and b/entry/src/main/resources/rawfile/voice/20504.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20505.mp3 b/entry/src/main/resources/rawfile/voice/20505.mp3
index 6a157097..24369ea5 100644
Binary files a/entry/src/main/resources/rawfile/voice/20505.mp3 and b/entry/src/main/resources/rawfile/voice/20505.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20600.mp3 b/entry/src/main/resources/rawfile/voice/20600.mp3
index eee70e3e..282e6999 100644
Binary files a/entry/src/main/resources/rawfile/voice/20600.mp3 and b/entry/src/main/resources/rawfile/voice/20600.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20601.mp3 b/entry/src/main/resources/rawfile/voice/20601.mp3
index f17a01f1..612a0095 100644
Binary files a/entry/src/main/resources/rawfile/voice/20601.mp3 and b/entry/src/main/resources/rawfile/voice/20601.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20602.mp3 b/entry/src/main/resources/rawfile/voice/20602.mp3
index f02e484f..d2a82042 100644
Binary files a/entry/src/main/resources/rawfile/voice/20602.mp3 and b/entry/src/main/resources/rawfile/voice/20602.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20603.mp3 b/entry/src/main/resources/rawfile/voice/20603.mp3
index dacb3c75..77c5b6b1 100644
Binary files a/entry/src/main/resources/rawfile/voice/20603.mp3 and b/entry/src/main/resources/rawfile/voice/20603.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20700.mp3 b/entry/src/main/resources/rawfile/voice/20700.mp3
index 5d2b9e5e..caa2261a 100644
Binary files a/entry/src/main/resources/rawfile/voice/20700.mp3 and b/entry/src/main/resources/rawfile/voice/20700.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20701.mp3 b/entry/src/main/resources/rawfile/voice/20701.mp3
index aff1829b..9292f759 100644
Binary files a/entry/src/main/resources/rawfile/voice/20701.mp3 and b/entry/src/main/resources/rawfile/voice/20701.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20702.mp3 b/entry/src/main/resources/rawfile/voice/20702.mp3
index beba762f..f848724f 100644
Binary files a/entry/src/main/resources/rawfile/voice/20702.mp3 and b/entry/src/main/resources/rawfile/voice/20702.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20703.mp3 b/entry/src/main/resources/rawfile/voice/20703.mp3
index c955418b..b3d47dfb 100644
Binary files a/entry/src/main/resources/rawfile/voice/20703.mp3 and b/entry/src/main/resources/rawfile/voice/20703.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20704.mp3 b/entry/src/main/resources/rawfile/voice/20704.mp3
index 5191be30..c3673a06 100644
Binary files a/entry/src/main/resources/rawfile/voice/20704.mp3 and b/entry/src/main/resources/rawfile/voice/20704.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20800.mp3 b/entry/src/main/resources/rawfile/voice/20800.mp3
index 2e7bc56e..c9e83367 100644
Binary files a/entry/src/main/resources/rawfile/voice/20800.mp3 and b/entry/src/main/resources/rawfile/voice/20800.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20801.mp3 b/entry/src/main/resources/rawfile/voice/20801.mp3
index 32676663..4a0ac991 100644
Binary files a/entry/src/main/resources/rawfile/voice/20801.mp3 and b/entry/src/main/resources/rawfile/voice/20801.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20802.mp3 b/entry/src/main/resources/rawfile/voice/20802.mp3
index e46a0d8c..9db13124 100644
Binary files a/entry/src/main/resources/rawfile/voice/20802.mp3 and b/entry/src/main/resources/rawfile/voice/20802.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20803.mp3 b/entry/src/main/resources/rawfile/voice/20803.mp3
index 5d05b4b7..6c185092 100644
Binary files a/entry/src/main/resources/rawfile/voice/20803.mp3 and b/entry/src/main/resources/rawfile/voice/20803.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20900.mp3 b/entry/src/main/resources/rawfile/voice/20900.mp3
index e0abe6a1..eab23019 100644
Binary files a/entry/src/main/resources/rawfile/voice/20900.mp3 and b/entry/src/main/resources/rawfile/voice/20900.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20901.mp3 b/entry/src/main/resources/rawfile/voice/20901.mp3
index 35f074ea..eee97c31 100644
Binary files a/entry/src/main/resources/rawfile/voice/20901.mp3 and b/entry/src/main/resources/rawfile/voice/20901.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20902.mp3 b/entry/src/main/resources/rawfile/voice/20902.mp3
index 07e41ba9..5a5ac7ac 100644
Binary files a/entry/src/main/resources/rawfile/voice/20902.mp3 and b/entry/src/main/resources/rawfile/voice/20902.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20903.mp3 b/entry/src/main/resources/rawfile/voice/20903.mp3
index 63bf1688..743f6fb3 100644
Binary files a/entry/src/main/resources/rawfile/voice/20903.mp3 and b/entry/src/main/resources/rawfile/voice/20903.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_01.mp3 b/entry/src/main/resources/rawfile/voice/20_01.mp3
index 4a85dbb2..e948f851 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_01.mp3 and b/entry/src/main/resources/rawfile/voice/20_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_05.mp3 b/entry/src/main/resources/rawfile/voice/20_05.mp3
index ae0d0b94..5faf4e95 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_05.mp3 and b/entry/src/main/resources/rawfile/voice/20_05.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_06.mp3 b/entry/src/main/resources/rawfile/voice/20_06.mp3
index 0c0f6c98..887a2b3b 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_06.mp3 and b/entry/src/main/resources/rawfile/voice/20_06.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_101.mp3 b/entry/src/main/resources/rawfile/voice/20_101.mp3
index b7e3d83e..96228752 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_101.mp3 and b/entry/src/main/resources/rawfile/voice/20_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_102.mp3 b/entry/src/main/resources/rawfile/voice/20_102.mp3
index fe53c0f3..71938b65 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_102.mp3 and b/entry/src/main/resources/rawfile/voice/20_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_103.mp3 b/entry/src/main/resources/rawfile/voice/20_103.mp3
index 75c8593d..61d2d748 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_103.mp3 and b/entry/src/main/resources/rawfile/voice/20_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_104.mp3 b/entry/src/main/resources/rawfile/voice/20_104.mp3
index f17f75d1..d15b2887 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_104.mp3 and b/entry/src/main/resources/rawfile/voice/20_104.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_105.mp3 b/entry/src/main/resources/rawfile/voice/20_105.mp3
index 38d56734..f40b24c6 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_105.mp3 and b/entry/src/main/resources/rawfile/voice/20_105.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_106.mp3 b/entry/src/main/resources/rawfile/voice/20_106.mp3
index 7b4db1da..a9a342c7 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_106.mp3 and b/entry/src/main/resources/rawfile/voice/20_106.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_107.mp3 b/entry/src/main/resources/rawfile/voice/20_107.mp3
index 188eefe7..13d10a49 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_107.mp3 and b/entry/src/main/resources/rawfile/voice/20_107.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_108.mp3 b/entry/src/main/resources/rawfile/voice/20_108.mp3
index 8f9aae12..7bc91fe3 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_108.mp3 and b/entry/src/main/resources/rawfile/voice/20_108.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_109.mp3 b/entry/src/main/resources/rawfile/voice/20_109.mp3
index fc2587fb..dde37bf9 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_109.mp3 and b/entry/src/main/resources/rawfile/voice/20_109.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_11.mp3 b/entry/src/main/resources/rawfile/voice/20_11.mp3
index 59c86751..387489ea 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_11.mp3 and b/entry/src/main/resources/rawfile/voice/20_11.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_110.mp3 b/entry/src/main/resources/rawfile/voice/20_110.mp3
index 04721429..b1441e1d 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_110.mp3 and b/entry/src/main/resources/rawfile/voice/20_110.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_111.mp3 b/entry/src/main/resources/rawfile/voice/20_111.mp3
index 0a91fdfe..64a82b12 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_111.mp3 and b/entry/src/main/resources/rawfile/voice/20_111.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_112.mp3 b/entry/src/main/resources/rawfile/voice/20_112.mp3
index 7ecb97ad..ada49b7b 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_112.mp3 and b/entry/src/main/resources/rawfile/voice/20_112.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_113.mp3 b/entry/src/main/resources/rawfile/voice/20_113.mp3
index fb2bf14e..1def8043 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_113.mp3 and b/entry/src/main/resources/rawfile/voice/20_113.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_114.mp3 b/entry/src/main/resources/rawfile/voice/20_114.mp3
index e1a8f113..d0176203 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_114.mp3 and b/entry/src/main/resources/rawfile/voice/20_114.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_115.mp3 b/entry/src/main/resources/rawfile/voice/20_115.mp3
index 5f42d07e..fcfeacbd 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_115.mp3 and b/entry/src/main/resources/rawfile/voice/20_115.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_116.mp3 b/entry/src/main/resources/rawfile/voice/20_116.mp3
index a5c045cd..74c48163 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_116.mp3 and b/entry/src/main/resources/rawfile/voice/20_116.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_117.mp3 b/entry/src/main/resources/rawfile/voice/20_117.mp3
index f69a04d6..8c9eeea8 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_117.mp3 and b/entry/src/main/resources/rawfile/voice/20_117.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_118.mp3 b/entry/src/main/resources/rawfile/voice/20_118.mp3
index f310409d..34e4341d 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_118.mp3 and b/entry/src/main/resources/rawfile/voice/20_118.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_119.mp3 b/entry/src/main/resources/rawfile/voice/20_119.mp3
index e1e5dfde..50bbbe2d 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_119.mp3 and b/entry/src/main/resources/rawfile/voice/20_119.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_120.mp3 b/entry/src/main/resources/rawfile/voice/20_120.mp3
index 4a2b6836..75867c34 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_120.mp3 and b/entry/src/main/resources/rawfile/voice/20_120.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_121.mp3 b/entry/src/main/resources/rawfile/voice/20_121.mp3
index 08c47954..e10e69dc 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_121.mp3 and b/entry/src/main/resources/rawfile/voice/20_121.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_122.mp3 b/entry/src/main/resources/rawfile/voice/20_122.mp3
index c565f9d2..47b653fc 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_122.mp3 and b/entry/src/main/resources/rawfile/voice/20_122.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_123.mp3 b/entry/src/main/resources/rawfile/voice/20_123.mp3
index c4806d90..1f2445a9 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_123.mp3 and b/entry/src/main/resources/rawfile/voice/20_123.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_124.mp3 b/entry/src/main/resources/rawfile/voice/20_124.mp3
index ba78f1ac..896a46fe 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_124.mp3 and b/entry/src/main/resources/rawfile/voice/20_124.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_125.mp3 b/entry/src/main/resources/rawfile/voice/20_125.mp3
index 6d9e4d33..1238190b 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_125.mp3 and b/entry/src/main/resources/rawfile/voice/20_125.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_126.mp3 b/entry/src/main/resources/rawfile/voice/20_126.mp3
index 01b25af5..af5bf986 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_126.mp3 and b/entry/src/main/resources/rawfile/voice/20_126.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_127.mp3 b/entry/src/main/resources/rawfile/voice/20_127.mp3
index 55b0aad0..93979867 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_127.mp3 and b/entry/src/main/resources/rawfile/voice/20_127.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_128.mp3 b/entry/src/main/resources/rawfile/voice/20_128.mp3
index 009395fc..9fc9023c 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_128.mp3 and b/entry/src/main/resources/rawfile/voice/20_128.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_129.mp3 b/entry/src/main/resources/rawfile/voice/20_129.mp3
index 4a85dbb2..e948f851 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_129.mp3 and b/entry/src/main/resources/rawfile/voice/20_129.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_132.mp3 b/entry/src/main/resources/rawfile/voice/20_132.mp3
index 7aac15da..8fd3216a 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_132.mp3 and b/entry/src/main/resources/rawfile/voice/20_132.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_15.mp3 b/entry/src/main/resources/rawfile/voice/20_15.mp3
index 28248430..f90dec6c 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_15.mp3 and b/entry/src/main/resources/rawfile/voice/20_15.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_35.mp3 b/entry/src/main/resources/rawfile/voice/20_35.mp3
index 6d9e4d33..1238190b 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_35.mp3 and b/entry/src/main/resources/rawfile/voice/20_35.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_36.mp3 b/entry/src/main/resources/rawfile/voice/20_36.mp3
index 3e278f4f..fbdefb0a 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_36.mp3 and b/entry/src/main/resources/rawfile/voice/20_36.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_39.mp3 b/entry/src/main/resources/rawfile/voice/20_39.mp3
index c4806d90..1f2445a9 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_39.mp3 and b/entry/src/main/resources/rawfile/voice/20_39.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_40.mp3 b/entry/src/main/resources/rawfile/voice/20_40.mp3
index a10e8f2e..c3edf0ed 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_40.mp3 and b/entry/src/main/resources/rawfile/voice/20_40.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_41.mp3 b/entry/src/main/resources/rawfile/voice/20_41.mp3
index 315cea38..6543c733 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_41.mp3 and b/entry/src/main/resources/rawfile/voice/20_41.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_42.mp3 b/entry/src/main/resources/rawfile/voice/20_42.mp3
index 1d7f0855..0aa8e9dd 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_42.mp3 and b/entry/src/main/resources/rawfile/voice/20_42.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_43.mp3 b/entry/src/main/resources/rawfile/voice/20_43.mp3
index fb2bf14e..1def8043 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_43.mp3 and b/entry/src/main/resources/rawfile/voice/20_43.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_44.mp3 b/entry/src/main/resources/rawfile/voice/20_44.mp3
index 55b0aad0..93979867 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_44.mp3 and b/entry/src/main/resources/rawfile/voice/20_44.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_45.mp3 b/entry/src/main/resources/rawfile/voice/20_45.mp3
index ee101d38..59b5808e 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_45.mp3 and b/entry/src/main/resources/rawfile/voice/20_45.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_46.mp3 b/entry/src/main/resources/rawfile/voice/20_46.mp3
index ace20907..daf3216d 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_46.mp3 and b/entry/src/main/resources/rawfile/voice/20_46.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_51.mp3 b/entry/src/main/resources/rawfile/voice/20_51.mp3
index 364e65ff..0fb31a99 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_51.mp3 and b/entry/src/main/resources/rawfile/voice/20_51.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_52.mp3 b/entry/src/main/resources/rawfile/voice/20_52.mp3
index daa97813..c0455dca 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_52.mp3 and b/entry/src/main/resources/rawfile/voice/20_52.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_53.mp3 b/entry/src/main/resources/rawfile/voice/20_53.mp3
index 2723a7f2..db1a5b6c 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_53.mp3 and b/entry/src/main/resources/rawfile/voice/20_53.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_54.mp3 b/entry/src/main/resources/rawfile/voice/20_54.mp3
index c43291fd..88bf9da3 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_54.mp3 and b/entry/src/main/resources/rawfile/voice/20_54.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_55.mp3 b/entry/src/main/resources/rawfile/voice/20_55.mp3
index aeaf9c7c..cfcf5159 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_55.mp3 and b/entry/src/main/resources/rawfile/voice/20_55.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_56.mp3 b/entry/src/main/resources/rawfile/voice/20_56.mp3
index 8ffae796..a13ad044 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_56.mp3 and b/entry/src/main/resources/rawfile/voice/20_56.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_57.mp3 b/entry/src/main/resources/rawfile/voice/20_57.mp3
index 2e1a9bdb..a9a3a1d4 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_57.mp3 and b/entry/src/main/resources/rawfile/voice/20_57.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_58.mp3 b/entry/src/main/resources/rawfile/voice/20_58.mp3
index 84ab9692..f3fe6816 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_58.mp3 and b/entry/src/main/resources/rawfile/voice/20_58.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_59.mp3 b/entry/src/main/resources/rawfile/voice/20_59.mp3
index 884f5a3d..4a4c066b 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_59.mp3 and b/entry/src/main/resources/rawfile/voice/20_59.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_60.mp3 b/entry/src/main/resources/rawfile/voice/20_60.mp3
index 88ad3777..3cbc3330 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_60.mp3 and b/entry/src/main/resources/rawfile/voice/20_60.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_61.mp3 b/entry/src/main/resources/rawfile/voice/20_61.mp3
index fe53c0f3..71938b65 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_61.mp3 and b/entry/src/main/resources/rawfile/voice/20_61.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_62.mp3 b/entry/src/main/resources/rawfile/voice/20_62.mp3
index 5f42d07e..fcfeacbd 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_62.mp3 and b/entry/src/main/resources/rawfile/voice/20_62.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_63.mp3 b/entry/src/main/resources/rawfile/voice/20_63.mp3
index 75c8593d..61d2d748 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_63.mp3 and b/entry/src/main/resources/rawfile/voice/20_63.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_64.mp3 b/entry/src/main/resources/rawfile/voice/20_64.mp3
index a5c045cd..74c48163 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_64.mp3 and b/entry/src/main/resources/rawfile/voice/20_64.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_65.mp3 b/entry/src/main/resources/rawfile/voice/20_65.mp3
index be814edf..70fbd794 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_65.mp3 and b/entry/src/main/resources/rawfile/voice/20_65.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_66.mp3 b/entry/src/main/resources/rawfile/voice/20_66.mp3
index 09a16e14..9f9a9aec 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_66.mp3 and b/entry/src/main/resources/rawfile/voice/20_66.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_67.mp3 b/entry/src/main/resources/rawfile/voice/20_67.mp3
index f69a04d6..8c9eeea8 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_67.mp3 and b/entry/src/main/resources/rawfile/voice/20_67.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_70.mp3 b/entry/src/main/resources/rawfile/voice/20_70.mp3
index bde4ef51..d21876af 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_70.mp3 and b/entry/src/main/resources/rawfile/voice/20_70.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_73.mp3 b/entry/src/main/resources/rawfile/voice/20_73.mp3
index 9c7b2297..9a7f7322 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_73.mp3 and b/entry/src/main/resources/rawfile/voice/20_73.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_75.mp3 b/entry/src/main/resources/rawfile/voice/20_75.mp3
index a3982cb2..8a4f0f9e 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_75.mp3 and b/entry/src/main/resources/rawfile/voice/20_75.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_76.mp3 b/entry/src/main/resources/rawfile/voice/20_76.mp3
index 7ecb97ad..ada49b7b 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_76.mp3 and b/entry/src/main/resources/rawfile/voice/20_76.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_77.mp3 b/entry/src/main/resources/rawfile/voice/20_77.mp3
index 7aac15da..8fd3216a 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_77.mp3 and b/entry/src/main/resources/rawfile/voice/20_77.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_78.mp3 b/entry/src/main/resources/rawfile/voice/20_78.mp3
index e1e5dfde..50bbbe2d 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_78.mp3 and b/entry/src/main/resources/rawfile/voice/20_78.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_79.mp3 b/entry/src/main/resources/rawfile/voice/20_79.mp3
index 485bd926..7f2fb790 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_79.mp3 and b/entry/src/main/resources/rawfile/voice/20_79.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_80.mp3 b/entry/src/main/resources/rawfile/voice/20_80.mp3
index 2183a1c3..7e85f3e3 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_80.mp3 and b/entry/src/main/resources/rawfile/voice/20_80.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_81.mp3 b/entry/src/main/resources/rawfile/voice/20_81.mp3
index 1070f426..a17cf340 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_81.mp3 and b/entry/src/main/resources/rawfile/voice/20_81.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_83.mp3 b/entry/src/main/resources/rawfile/voice/20_83.mp3
index 623b730c..40e897a5 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_83.mp3 and b/entry/src/main/resources/rawfile/voice/20_83.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_84.mp3 b/entry/src/main/resources/rawfile/voice/20_84.mp3
index d9b2c757..0c83c3b5 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_84.mp3 and b/entry/src/main/resources/rawfile/voice/20_84.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_85.mp3 b/entry/src/main/resources/rawfile/voice/20_85.mp3
index c5454d21..6d54cc8b 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_85.mp3 and b/entry/src/main/resources/rawfile/voice/20_85.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_86.mp3 b/entry/src/main/resources/rawfile/voice/20_86.mp3
index fac21b2d..1f14e430 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_86.mp3 and b/entry/src/main/resources/rawfile/voice/20_86.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_87.mp3 b/entry/src/main/resources/rawfile/voice/20_87.mp3
index 2f1bac22..a1a55020 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_87.mp3 and b/entry/src/main/resources/rawfile/voice/20_87.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_88.mp3 b/entry/src/main/resources/rawfile/voice/20_88.mp3
index 4315b230..4e77d132 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_88.mp3 and b/entry/src/main/resources/rawfile/voice/20_88.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_89.mp3 b/entry/src/main/resources/rawfile/voice/20_89.mp3
index 3f9ef326..a02cca94 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_89.mp3 and b/entry/src/main/resources/rawfile/voice/20_89.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_90.mp3 b/entry/src/main/resources/rawfile/voice/20_90.mp3
index 9491fc21..415bb3f7 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_90.mp3 and b/entry/src/main/resources/rawfile/voice/20_90.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_91.mp3 b/entry/src/main/resources/rawfile/voice/20_91.mp3
index 1a9aa65b..73d30bc6 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_91.mp3 and b/entry/src/main/resources/rawfile/voice/20_91.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_92.mp3 b/entry/src/main/resources/rawfile/voice/20_92.mp3
index 4de08fbf..8d1afca2 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_92.mp3 and b/entry/src/main/resources/rawfile/voice/20_92.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_93.mp3 b/entry/src/main/resources/rawfile/voice/20_93.mp3
index b7e3d83e..96228752 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_93.mp3 and b/entry/src/main/resources/rawfile/voice/20_93.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_94.mp3 b/entry/src/main/resources/rawfile/voice/20_94.mp3
index ddca428d..cdfbf69a 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_94.mp3 and b/entry/src/main/resources/rawfile/voice/20_94.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_95.mp3 b/entry/src/main/resources/rawfile/voice/20_95.mp3
index 6cca8fc0..c4ed6fdb 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_95.mp3 and b/entry/src/main/resources/rawfile/voice/20_95.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/20_97.mp3 b/entry/src/main/resources/rawfile/voice/20_97.mp3
index 8c7ac335..de16eed7 100644
Binary files a/entry/src/main/resources/rawfile/voice/20_97.mp3 and b/entry/src/main/resources/rawfile/voice/20_97.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21000.mp3 b/entry/src/main/resources/rawfile/voice/21000.mp3
index 6b79f963..649f7744 100644
Binary files a/entry/src/main/resources/rawfile/voice/21000.mp3 and b/entry/src/main/resources/rawfile/voice/21000.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21001.mp3 b/entry/src/main/resources/rawfile/voice/21001.mp3
index 1978710e..4c803930 100644
Binary files a/entry/src/main/resources/rawfile/voice/21001.mp3 and b/entry/src/main/resources/rawfile/voice/21001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21100.mp3 b/entry/src/main/resources/rawfile/voice/21100.mp3
index e58441f0..6c97b0ed 100644
Binary files a/entry/src/main/resources/rawfile/voice/21100.mp3 and b/entry/src/main/resources/rawfile/voice/21100.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21101.mp3 b/entry/src/main/resources/rawfile/voice/21101.mp3
index 2fca9c44..c22031a3 100644
Binary files a/entry/src/main/resources/rawfile/voice/21101.mp3 and b/entry/src/main/resources/rawfile/voice/21101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21102.mp3 b/entry/src/main/resources/rawfile/voice/21102.mp3
index 61a41b46..19ad5c75 100644
Binary files a/entry/src/main/resources/rawfile/voice/21102.mp3 and b/entry/src/main/resources/rawfile/voice/21102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21103.mp3 b/entry/src/main/resources/rawfile/voice/21103.mp3
index 4e43a622..cc205026 100644
Binary files a/entry/src/main/resources/rawfile/voice/21103.mp3 and b/entry/src/main/resources/rawfile/voice/21103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21104.mp3 b/entry/src/main/resources/rawfile/voice/21104.mp3
index 22b10450..7bc19546 100644
Binary files a/entry/src/main/resources/rawfile/voice/21104.mp3 and b/entry/src/main/resources/rawfile/voice/21104.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21200.mp3 b/entry/src/main/resources/rawfile/voice/21200.mp3
index 92b990a8..76b275af 100644
Binary files a/entry/src/main/resources/rawfile/voice/21200.mp3 and b/entry/src/main/resources/rawfile/voice/21200.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21201.mp3 b/entry/src/main/resources/rawfile/voice/21201.mp3
index 5a40ba81..80ade923 100644
Binary files a/entry/src/main/resources/rawfile/voice/21201.mp3 and b/entry/src/main/resources/rawfile/voice/21201.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21202.mp3 b/entry/src/main/resources/rawfile/voice/21202.mp3
index db1bad57..e45cd82a 100644
Binary files a/entry/src/main/resources/rawfile/voice/21202.mp3 and b/entry/src/main/resources/rawfile/voice/21202.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21203.mp3 b/entry/src/main/resources/rawfile/voice/21203.mp3
index 1ebd5c32..1663ea8c 100644
Binary files a/entry/src/main/resources/rawfile/voice/21203.mp3 and b/entry/src/main/resources/rawfile/voice/21203.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21204.mp3 b/entry/src/main/resources/rawfile/voice/21204.mp3
index 80ac6ff6..5e30077b 100644
Binary files a/entry/src/main/resources/rawfile/voice/21204.mp3 and b/entry/src/main/resources/rawfile/voice/21204.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21300.mp3 b/entry/src/main/resources/rawfile/voice/21300.mp3
index 4a4899d1..2e093809 100644
Binary files a/entry/src/main/resources/rawfile/voice/21300.mp3 and b/entry/src/main/resources/rawfile/voice/21300.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21301.mp3 b/entry/src/main/resources/rawfile/voice/21301.mp3
index 704ced89..d04cc549 100644
Binary files a/entry/src/main/resources/rawfile/voice/21301.mp3 and b/entry/src/main/resources/rawfile/voice/21301.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21302.mp3 b/entry/src/main/resources/rawfile/voice/21302.mp3
index 29da2991..cc81cb51 100644
Binary files a/entry/src/main/resources/rawfile/voice/21302.mp3 and b/entry/src/main/resources/rawfile/voice/21302.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21400.mp3 b/entry/src/main/resources/rawfile/voice/21400.mp3
index 285a95ac..e4bc20db 100644
Binary files a/entry/src/main/resources/rawfile/voice/21400.mp3 and b/entry/src/main/resources/rawfile/voice/21400.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21401.mp3 b/entry/src/main/resources/rawfile/voice/21401.mp3
index 855389cd..0899aec9 100644
Binary files a/entry/src/main/resources/rawfile/voice/21401.mp3 and b/entry/src/main/resources/rawfile/voice/21401.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21402.mp3 b/entry/src/main/resources/rawfile/voice/21402.mp3
index 41e7975e..4b6789a1 100644
Binary files a/entry/src/main/resources/rawfile/voice/21402.mp3 and b/entry/src/main/resources/rawfile/voice/21402.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21403.mp3 b/entry/src/main/resources/rawfile/voice/21403.mp3
index c1cc3408..acb91370 100644
Binary files a/entry/src/main/resources/rawfile/voice/21403.mp3 and b/entry/src/main/resources/rawfile/voice/21403.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21500.mp3 b/entry/src/main/resources/rawfile/voice/21500.mp3
index 924598b0..c0025941 100644
Binary files a/entry/src/main/resources/rawfile/voice/21500.mp3 and b/entry/src/main/resources/rawfile/voice/21500.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21501.mp3 b/entry/src/main/resources/rawfile/voice/21501.mp3
index 04d64fa5..f3777d7e 100644
Binary files a/entry/src/main/resources/rawfile/voice/21501.mp3 and b/entry/src/main/resources/rawfile/voice/21501.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21502.mp3 b/entry/src/main/resources/rawfile/voice/21502.mp3
index a8f7287c..d378716b 100644
Binary files a/entry/src/main/resources/rawfile/voice/21502.mp3 and b/entry/src/main/resources/rawfile/voice/21502.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21600.mp3 b/entry/src/main/resources/rawfile/voice/21600.mp3
index bbc93dd3..edf8ab89 100644
Binary files a/entry/src/main/resources/rawfile/voice/21600.mp3 and b/entry/src/main/resources/rawfile/voice/21600.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21601.mp3 b/entry/src/main/resources/rawfile/voice/21601.mp3
index b90cdc51..d4291b96 100644
Binary files a/entry/src/main/resources/rawfile/voice/21601.mp3 and b/entry/src/main/resources/rawfile/voice/21601.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21602.mp3 b/entry/src/main/resources/rawfile/voice/21602.mp3
index f8cf70a2..de27bda4 100644
Binary files a/entry/src/main/resources/rawfile/voice/21602.mp3 and b/entry/src/main/resources/rawfile/voice/21602.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21603.mp3 b/entry/src/main/resources/rawfile/voice/21603.mp3
index 1ba20c03..ea02ade4 100644
Binary files a/entry/src/main/resources/rawfile/voice/21603.mp3 and b/entry/src/main/resources/rawfile/voice/21603.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21604.mp3 b/entry/src/main/resources/rawfile/voice/21604.mp3
index e9b55d85..2e151bc4 100644
Binary files a/entry/src/main/resources/rawfile/voice/21604.mp3 and b/entry/src/main/resources/rawfile/voice/21604.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21605.mp3 b/entry/src/main/resources/rawfile/voice/21605.mp3
index a0e25024..a6a5c133 100644
Binary files a/entry/src/main/resources/rawfile/voice/21605.mp3 and b/entry/src/main/resources/rawfile/voice/21605.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21700.mp3 b/entry/src/main/resources/rawfile/voice/21700.mp3
index a6df81f8..5616909c 100644
Binary files a/entry/src/main/resources/rawfile/voice/21700.mp3 and b/entry/src/main/resources/rawfile/voice/21700.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21701.mp3 b/entry/src/main/resources/rawfile/voice/21701.mp3
index ca86353d..0b10eade 100644
Binary files a/entry/src/main/resources/rawfile/voice/21701.mp3 and b/entry/src/main/resources/rawfile/voice/21701.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/21702.mp3 b/entry/src/main/resources/rawfile/voice/21702.mp3
index 4345da5f..2f225ef2 100644
Binary files a/entry/src/main/resources/rawfile/voice/21702.mp3 and b/entry/src/main/resources/rawfile/voice/21702.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/23001.mp3 b/entry/src/main/resources/rawfile/voice/23001.mp3
index fff19183..fa307f2d 100644
Binary files a/entry/src/main/resources/rawfile/voice/23001.mp3 and b/entry/src/main/resources/rawfile/voice/23001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/23002.mp3 b/entry/src/main/resources/rawfile/voice/23002.mp3
index ea216c63..d3d5204e 100644
Binary files a/entry/src/main/resources/rawfile/voice/23002.mp3 and b/entry/src/main/resources/rawfile/voice/23002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/23003.mp3 b/entry/src/main/resources/rawfile/voice/23003.mp3
index fb21d650..4c4fdbe0 100644
Binary files a/entry/src/main/resources/rawfile/voice/23003.mp3 and b/entry/src/main/resources/rawfile/voice/23003.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/23004.mp3 b/entry/src/main/resources/rawfile/voice/23004.mp3
index f3358bcd..98a65373 100644
Binary files a/entry/src/main/resources/rawfile/voice/23004.mp3 and b/entry/src/main/resources/rawfile/voice/23004.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/23005.mp3 b/entry/src/main/resources/rawfile/voice/23005.mp3
index 637338c3..1e9afb66 100644
Binary files a/entry/src/main/resources/rawfile/voice/23005.mp3 and b/entry/src/main/resources/rawfile/voice/23005.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/23106.mp3 b/entry/src/main/resources/rawfile/voice/23106.mp3
index d673aeba..9fc1f2b0 100644
Binary files a/entry/src/main/resources/rawfile/voice/23106.mp3 and b/entry/src/main/resources/rawfile/voice/23106.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_01.mp3 b/entry/src/main/resources/rawfile/voice/2_01.mp3
index 03c775f8..6a935f8f 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_01.mp3 and b/entry/src/main/resources/rawfile/voice/2_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_02.mp3 b/entry/src/main/resources/rawfile/voice/2_02.mp3
index a5104939..b6fa326a 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_02.mp3 and b/entry/src/main/resources/rawfile/voice/2_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_03.mp3 b/entry/src/main/resources/rawfile/voice/2_03.mp3
index ffe51d82..8f8a0d79 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_03.mp3 and b/entry/src/main/resources/rawfile/voice/2_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_04.mp3 b/entry/src/main/resources/rawfile/voice/2_04.mp3
index 7122c6c0..1c2ee152 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_04.mp3 and b/entry/src/main/resources/rawfile/voice/2_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_05.mp3 b/entry/src/main/resources/rawfile/voice/2_05.mp3
index fad28102..2167a83b 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_05.mp3 and b/entry/src/main/resources/rawfile/voice/2_05.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_06.mp3 b/entry/src/main/resources/rawfile/voice/2_06.mp3
index c62cdc0c..befd4423 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_06.mp3 and b/entry/src/main/resources/rawfile/voice/2_06.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_07.mp3 b/entry/src/main/resources/rawfile/voice/2_07.mp3
index fa91ebf8..4db88a98 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_07.mp3 and b/entry/src/main/resources/rawfile/voice/2_07.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_08.mp3 b/entry/src/main/resources/rawfile/voice/2_08.mp3
index 779c8dc7..d38f86f6 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_08.mp3 and b/entry/src/main/resources/rawfile/voice/2_08.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_09.mp3 b/entry/src/main/resources/rawfile/voice/2_09.mp3
index 1ec21423..136c859a 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_09.mp3 and b/entry/src/main/resources/rawfile/voice/2_09.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_10.mp3 b/entry/src/main/resources/rawfile/voice/2_10.mp3
index a932dada..9b0d99b6 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_10.mp3 and b/entry/src/main/resources/rawfile/voice/2_10.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_101.mp3 b/entry/src/main/resources/rawfile/voice/2_101.mp3
index 2a8b3086..20237055 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_101.mp3 and b/entry/src/main/resources/rawfile/voice/2_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_102.mp3 b/entry/src/main/resources/rawfile/voice/2_102.mp3
index fa91ebf8..4db88a98 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_102.mp3 and b/entry/src/main/resources/rawfile/voice/2_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_103.mp3 b/entry/src/main/resources/rawfile/voice/2_103.mp3
index 7e225279..8cd3a140 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_103.mp3 and b/entry/src/main/resources/rawfile/voice/2_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_105.mp3 b/entry/src/main/resources/rawfile/voice/2_105.mp3
index 5b7ade11..b1feba42 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_105.mp3 and b/entry/src/main/resources/rawfile/voice/2_105.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_115.mp3 b/entry/src/main/resources/rawfile/voice/2_115.mp3
index c62cdc0c..befd4423 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_115.mp3 and b/entry/src/main/resources/rawfile/voice/2_115.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_42.mp3 b/entry/src/main/resources/rawfile/voice/2_42.mp3
index 991b66cb..83ebd192 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_42.mp3 and b/entry/src/main/resources/rawfile/voice/2_42.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_43.mp3 b/entry/src/main/resources/rawfile/voice/2_43.mp3
index 8fe949f7..a76caab9 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_43.mp3 and b/entry/src/main/resources/rawfile/voice/2_43.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_44.mp3 b/entry/src/main/resources/rawfile/voice/2_44.mp3
index 9cb2328a..dcf36b7b 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_44.mp3 and b/entry/src/main/resources/rawfile/voice/2_44.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_46.mp3 b/entry/src/main/resources/rawfile/voice/2_46.mp3
index 4c064089..1c28e3d6 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_46.mp3 and b/entry/src/main/resources/rawfile/voice/2_46.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_47.mp3 b/entry/src/main/resources/rawfile/voice/2_47.mp3
index 16848ce2..7a09f8ed 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_47.mp3 and b/entry/src/main/resources/rawfile/voice/2_47.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_48.mp3 b/entry/src/main/resources/rawfile/voice/2_48.mp3
index 5b7ade11..b1feba42 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_48.mp3 and b/entry/src/main/resources/rawfile/voice/2_48.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2_50.mp3 b/entry/src/main/resources/rawfile/voice/2_50.mp3
index 7e225279..8cd3a140 100644
Binary files a/entry/src/main/resources/rawfile/voice/2_50.mp3 and b/entry/src/main/resources/rawfile/voice/2_50.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/2号线.mp3 b/entry/src/main/resources/rawfile/voice/2号线.mp3
index bda6f74d..95f4ec50 100644
Binary files a/entry/src/main/resources/rawfile/voice/2号线.mp3 and b/entry/src/main/resources/rawfile/voice/2号线.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/300001.mp3 b/entry/src/main/resources/rawfile/voice/300001.mp3
index ae204749..39544eeb 100644
Binary files a/entry/src/main/resources/rawfile/voice/300001.mp3 and b/entry/src/main/resources/rawfile/voice/300001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/300001_1.mp3 b/entry/src/main/resources/rawfile/voice/300001_1.mp3
index d342514f..8b2f8849 100644
Binary files a/entry/src/main/resources/rawfile/voice/300001_1.mp3 and b/entry/src/main/resources/rawfile/voice/300001_1.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/300002.mp3 b/entry/src/main/resources/rawfile/voice/300002.mp3
index ae204749..39544eeb 100644
Binary files a/entry/src/main/resources/rawfile/voice/300002.mp3 and b/entry/src/main/resources/rawfile/voice/300002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/300002_1.mp3 b/entry/src/main/resources/rawfile/voice/300002_1.mp3
index d342514f..8b2f8849 100644
Binary files a/entry/src/main/resources/rawfile/voice/300002_1.mp3 and b/entry/src/main/resources/rawfile/voice/300002_1.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/300003.mp3 b/entry/src/main/resources/rawfile/voice/300003.mp3
index ae204749..39544eeb 100644
Binary files a/entry/src/main/resources/rawfile/voice/300003.mp3 and b/entry/src/main/resources/rawfile/voice/300003.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/300003_1.mp3 b/entry/src/main/resources/rawfile/voice/300003_1.mp3
index d342514f..8b2f8849 100644
Binary files a/entry/src/main/resources/rawfile/voice/300003_1.mp3 and b/entry/src/main/resources/rawfile/voice/300003_1.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/300004.mp3 b/entry/src/main/resources/rawfile/voice/300004.mp3
index d342514f..8b2f8849 100644
Binary files a/entry/src/main/resources/rawfile/voice/300004.mp3 and b/entry/src/main/resources/rawfile/voice/300004.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30101.mp3 b/entry/src/main/resources/rawfile/voice/30101.mp3
index 4818ddc5..37020bc4 100644
Binary files a/entry/src/main/resources/rawfile/voice/30101.mp3 and b/entry/src/main/resources/rawfile/voice/30101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30102.mp3 b/entry/src/main/resources/rawfile/voice/30102.mp3
index d0448d42..4966db1b 100644
Binary files a/entry/src/main/resources/rawfile/voice/30102.mp3 and b/entry/src/main/resources/rawfile/voice/30102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30103.mp3 b/entry/src/main/resources/rawfile/voice/30103.mp3
index ace20907..daf3216d 100644
Binary files a/entry/src/main/resources/rawfile/voice/30103.mp3 and b/entry/src/main/resources/rawfile/voice/30103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30104.mp3 b/entry/src/main/resources/rawfile/voice/30104.mp3
index 927cecf2..a8b1a945 100644
Binary files a/entry/src/main/resources/rawfile/voice/30104.mp3 and b/entry/src/main/resources/rawfile/voice/30104.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30105.mp3 b/entry/src/main/resources/rawfile/voice/30105.mp3
index 667957b0..eb707a46 100644
Binary files a/entry/src/main/resources/rawfile/voice/30105.mp3 and b/entry/src/main/resources/rawfile/voice/30105.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30106.mp3 b/entry/src/main/resources/rawfile/voice/30106.mp3
index 558ad0c6..f0b641b2 100644
Binary files a/entry/src/main/resources/rawfile/voice/30106.mp3 and b/entry/src/main/resources/rawfile/voice/30106.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30107.mp3 b/entry/src/main/resources/rawfile/voice/30107.mp3
index 9950dc6a..e9619f61 100644
Binary files a/entry/src/main/resources/rawfile/voice/30107.mp3 and b/entry/src/main/resources/rawfile/voice/30107.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30108.mp3 b/entry/src/main/resources/rawfile/voice/30108.mp3
index ae9214f3..0b2e234e 100644
Binary files a/entry/src/main/resources/rawfile/voice/30108.mp3 and b/entry/src/main/resources/rawfile/voice/30108.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30109.mp3 b/entry/src/main/resources/rawfile/voice/30109.mp3
index 67661aa7..c87c29a6 100644
Binary files a/entry/src/main/resources/rawfile/voice/30109.mp3 and b/entry/src/main/resources/rawfile/voice/30109.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30110.mp3 b/entry/src/main/resources/rawfile/voice/30110.mp3
index 80444c95..a385c361 100644
Binary files a/entry/src/main/resources/rawfile/voice/30110.mp3 and b/entry/src/main/resources/rawfile/voice/30110.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30111.mp3 b/entry/src/main/resources/rawfile/voice/30111.mp3
index fe49fd12..f7cbdc03 100644
Binary files a/entry/src/main/resources/rawfile/voice/30111.mp3 and b/entry/src/main/resources/rawfile/voice/30111.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30112.mp3 b/entry/src/main/resources/rawfile/voice/30112.mp3
index 2092ac93..c39420f4 100644
Binary files a/entry/src/main/resources/rawfile/voice/30112.mp3 and b/entry/src/main/resources/rawfile/voice/30112.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30113.mp3 b/entry/src/main/resources/rawfile/voice/30113.mp3
index 7ed21c78..e1930270 100644
Binary files a/entry/src/main/resources/rawfile/voice/30113.mp3 and b/entry/src/main/resources/rawfile/voice/30113.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30114.mp3 b/entry/src/main/resources/rawfile/voice/30114.mp3
index e389297d..5aac6110 100644
Binary files a/entry/src/main/resources/rawfile/voice/30114.mp3 and b/entry/src/main/resources/rawfile/voice/30114.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30115.mp3 b/entry/src/main/resources/rawfile/voice/30115.mp3
index 0a2a0a1e..2d245d1d 100644
Binary files a/entry/src/main/resources/rawfile/voice/30115.mp3 and b/entry/src/main/resources/rawfile/voice/30115.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30116.mp3 b/entry/src/main/resources/rawfile/voice/30116.mp3
index 15c8c000..0eec6b03 100644
Binary files a/entry/src/main/resources/rawfile/voice/30116.mp3 and b/entry/src/main/resources/rawfile/voice/30116.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30117.mp3 b/entry/src/main/resources/rawfile/voice/30117.mp3
index 8a7d1060..dd7d11a3 100644
Binary files a/entry/src/main/resources/rawfile/voice/30117.mp3 and b/entry/src/main/resources/rawfile/voice/30117.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30118.mp3 b/entry/src/main/resources/rawfile/voice/30118.mp3
index 73d859ce..b052e77d 100644
Binary files a/entry/src/main/resources/rawfile/voice/30118.mp3 and b/entry/src/main/resources/rawfile/voice/30118.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30119.mp3 b/entry/src/main/resources/rawfile/voice/30119.mp3
index 18a5ab22..9fd3ce34 100644
Binary files a/entry/src/main/resources/rawfile/voice/30119.mp3 and b/entry/src/main/resources/rawfile/voice/30119.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30120.mp3 b/entry/src/main/resources/rawfile/voice/30120.mp3
index 5db355be..3e5147aa 100644
Binary files a/entry/src/main/resources/rawfile/voice/30120.mp3 and b/entry/src/main/resources/rawfile/voice/30120.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30121.mp3 b/entry/src/main/resources/rawfile/voice/30121.mp3
index 70efcb75..0b11490e 100644
Binary files a/entry/src/main/resources/rawfile/voice/30121.mp3 and b/entry/src/main/resources/rawfile/voice/30121.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30122.mp3 b/entry/src/main/resources/rawfile/voice/30122.mp3
index d4d31f7d..69676139 100644
Binary files a/entry/src/main/resources/rawfile/voice/30122.mp3 and b/entry/src/main/resources/rawfile/voice/30122.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30123.mp3 b/entry/src/main/resources/rawfile/voice/30123.mp3
index 20390dcf..7c19964a 100644
Binary files a/entry/src/main/resources/rawfile/voice/30123.mp3 and b/entry/src/main/resources/rawfile/voice/30123.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30124.mp3 b/entry/src/main/resources/rawfile/voice/30124.mp3
index ef08cc3f..d8a3e15f 100644
Binary files a/entry/src/main/resources/rawfile/voice/30124.mp3 and b/entry/src/main/resources/rawfile/voice/30124.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30125.mp3 b/entry/src/main/resources/rawfile/voice/30125.mp3
index 9389a5ba..f6dd2c9a 100644
Binary files a/entry/src/main/resources/rawfile/voice/30125.mp3 and b/entry/src/main/resources/rawfile/voice/30125.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30126.mp3 b/entry/src/main/resources/rawfile/voice/30126.mp3
index fbf3356a..e0da0ae3 100644
Binary files a/entry/src/main/resources/rawfile/voice/30126.mp3 and b/entry/src/main/resources/rawfile/voice/30126.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30127.mp3 b/entry/src/main/resources/rawfile/voice/30127.mp3
index b841ccd2..af0a8f62 100644
Binary files a/entry/src/main/resources/rawfile/voice/30127.mp3 and b/entry/src/main/resources/rawfile/voice/30127.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30128.mp3 b/entry/src/main/resources/rawfile/voice/30128.mp3
index e9eb866c..76266e0f 100644
Binary files a/entry/src/main/resources/rawfile/voice/30128.mp3 and b/entry/src/main/resources/rawfile/voice/30128.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30129.mp3 b/entry/src/main/resources/rawfile/voice/30129.mp3
index 81086d53..ce6e45bc 100644
Binary files a/entry/src/main/resources/rawfile/voice/30129.mp3 and b/entry/src/main/resources/rawfile/voice/30129.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30130.mp3 b/entry/src/main/resources/rawfile/voice/30130.mp3
index 61367c18..ce82f9e0 100644
Binary files a/entry/src/main/resources/rawfile/voice/30130.mp3 and b/entry/src/main/resources/rawfile/voice/30130.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30131.mp3 b/entry/src/main/resources/rawfile/voice/30131.mp3
index cce36898..b901e84f 100644
Binary files a/entry/src/main/resources/rawfile/voice/30131.mp3 and b/entry/src/main/resources/rawfile/voice/30131.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30132.mp3 b/entry/src/main/resources/rawfile/voice/30132.mp3
index d0505217..9fac860f 100644
Binary files a/entry/src/main/resources/rawfile/voice/30132.mp3 and b/entry/src/main/resources/rawfile/voice/30132.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30133.mp3 b/entry/src/main/resources/rawfile/voice/30133.mp3
index a5c40975..091b6d4e 100644
Binary files a/entry/src/main/resources/rawfile/voice/30133.mp3 and b/entry/src/main/resources/rawfile/voice/30133.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30201.mp3 b/entry/src/main/resources/rawfile/voice/30201.mp3
index 0ad721bc..56d79800 100644
Binary files a/entry/src/main/resources/rawfile/voice/30201.mp3 and b/entry/src/main/resources/rawfile/voice/30201.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30202.mp3 b/entry/src/main/resources/rawfile/voice/30202.mp3
index 580f9cb0..2744050a 100644
Binary files a/entry/src/main/resources/rawfile/voice/30202.mp3 and b/entry/src/main/resources/rawfile/voice/30202.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30203.mp3 b/entry/src/main/resources/rawfile/voice/30203.mp3
index 224f52f3..121ec161 100644
Binary files a/entry/src/main/resources/rawfile/voice/30203.mp3 and b/entry/src/main/resources/rawfile/voice/30203.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30204.mp3 b/entry/src/main/resources/rawfile/voice/30204.mp3
index 680a6799..8f973b75 100644
Binary files a/entry/src/main/resources/rawfile/voice/30204.mp3 and b/entry/src/main/resources/rawfile/voice/30204.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30205.mp3 b/entry/src/main/resources/rawfile/voice/30205.mp3
index 159a792d..66f4a4ac 100644
Binary files a/entry/src/main/resources/rawfile/voice/30205.mp3 and b/entry/src/main/resources/rawfile/voice/30205.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30206.mp3 b/entry/src/main/resources/rawfile/voice/30206.mp3
index eeba5fbb..6c878b49 100644
Binary files a/entry/src/main/resources/rawfile/voice/30206.mp3 and b/entry/src/main/resources/rawfile/voice/30206.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30207.mp3 b/entry/src/main/resources/rawfile/voice/30207.mp3
index 8de35f90..6c3208c5 100644
Binary files a/entry/src/main/resources/rawfile/voice/30207.mp3 and b/entry/src/main/resources/rawfile/voice/30207.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30208.mp3 b/entry/src/main/resources/rawfile/voice/30208.mp3
index c02b9974..0f032381 100644
Binary files a/entry/src/main/resources/rawfile/voice/30208.mp3 and b/entry/src/main/resources/rawfile/voice/30208.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30209.mp3 b/entry/src/main/resources/rawfile/voice/30209.mp3
index a9c5ab4e..457bf832 100644
Binary files a/entry/src/main/resources/rawfile/voice/30209.mp3 and b/entry/src/main/resources/rawfile/voice/30209.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30210.mp3 b/entry/src/main/resources/rawfile/voice/30210.mp3
index 94f2940d..b793c822 100644
Binary files a/entry/src/main/resources/rawfile/voice/30210.mp3 and b/entry/src/main/resources/rawfile/voice/30210.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30211.mp3 b/entry/src/main/resources/rawfile/voice/30211.mp3
index b5488f73..539618c0 100644
Binary files a/entry/src/main/resources/rawfile/voice/30211.mp3 and b/entry/src/main/resources/rawfile/voice/30211.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/30212.mp3 b/entry/src/main/resources/rawfile/voice/30212.mp3
index 7ab60097..2ec09144 100644
Binary files a/entry/src/main/resources/rawfile/voice/30212.mp3 and b/entry/src/main/resources/rawfile/voice/30212.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/3_01.mp3 b/entry/src/main/resources/rawfile/voice/3_01.mp3
index 9cbb272d..392c4c91 100644
Binary files a/entry/src/main/resources/rawfile/voice/3_01.mp3 and b/entry/src/main/resources/rawfile/voice/3_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/3_02.mp3 b/entry/src/main/resources/rawfile/voice/3_02.mp3
index 82a3f5ab..d605f96f 100644
Binary files a/entry/src/main/resources/rawfile/voice/3_02.mp3 and b/entry/src/main/resources/rawfile/voice/3_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/3_03.mp3 b/entry/src/main/resources/rawfile/voice/3_03.mp3
index c5aa86e1..6b7b1c9c 100644
Binary files a/entry/src/main/resources/rawfile/voice/3_03.mp3 and b/entry/src/main/resources/rawfile/voice/3_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/3_04.mp3 b/entry/src/main/resources/rawfile/voice/3_04.mp3
index 67b85bd8..7cc822c6 100644
Binary files a/entry/src/main/resources/rawfile/voice/3_04.mp3 and b/entry/src/main/resources/rawfile/voice/3_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/3_05.mp3 b/entry/src/main/resources/rawfile/voice/3_05.mp3
index d47744d4..23581c2f 100644
Binary files a/entry/src/main/resources/rawfile/voice/3_05.mp3 and b/entry/src/main/resources/rawfile/voice/3_05.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/3_101.mp3 b/entry/src/main/resources/rawfile/voice/3_101.mp3
index 82a3f5ab..d605f96f 100644
Binary files a/entry/src/main/resources/rawfile/voice/3_101.mp3 and b/entry/src/main/resources/rawfile/voice/3_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/3_102.mp3 b/entry/src/main/resources/rawfile/voice/3_102.mp3
index d277f661..1c20aee2 100644
Binary files a/entry/src/main/resources/rawfile/voice/3_102.mp3 and b/entry/src/main/resources/rawfile/voice/3_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/3_103.mp3 b/entry/src/main/resources/rawfile/voice/3_103.mp3
index c07d8ca5..e38d0a59 100644
Binary files a/entry/src/main/resources/rawfile/voice/3_103.mp3 and b/entry/src/main/resources/rawfile/voice/3_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/3号线.mp3 b/entry/src/main/resources/rawfile/voice/3号线.mp3
index 87c94f20..40298efa 100644
Binary files a/entry/src/main/resources/rawfile/voice/3号线.mp3 and b/entry/src/main/resources/rawfile/voice/3号线.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/401001.mp3 b/entry/src/main/resources/rawfile/voice/401001.mp3
index 1406c434..b183a35a 100644
Binary files a/entry/src/main/resources/rawfile/voice/401001.mp3 and b/entry/src/main/resources/rawfile/voice/401001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/401002.mp3 b/entry/src/main/resources/rawfile/voice/401002.mp3
index 93a329fd..ec92602d 100644
Binary files a/entry/src/main/resources/rawfile/voice/401002.mp3 and b/entry/src/main/resources/rawfile/voice/401002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/401003.mp3 b/entry/src/main/resources/rawfile/voice/401003.mp3
index 67a126a8..133e3f77 100644
Binary files a/entry/src/main/resources/rawfile/voice/401003.mp3 and b/entry/src/main/resources/rawfile/voice/401003.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/401004.mp3 b/entry/src/main/resources/rawfile/voice/401004.mp3
index b017c555..397d210c 100644
Binary files a/entry/src/main/resources/rawfile/voice/401004.mp3 and b/entry/src/main/resources/rawfile/voice/401004.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40101.mp3 b/entry/src/main/resources/rawfile/voice/40101.mp3
index ae9c31af..4418ff49 100644
Binary files a/entry/src/main/resources/rawfile/voice/40101.mp3 and b/entry/src/main/resources/rawfile/voice/40101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40102.mp3 b/entry/src/main/resources/rawfile/voice/40102.mp3
index eb89645e..270e59fc 100644
Binary files a/entry/src/main/resources/rawfile/voice/40102.mp3 and b/entry/src/main/resources/rawfile/voice/40102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/402001.mp3 b/entry/src/main/resources/rawfile/voice/402001.mp3
index b1736cf8..4f55cbf8 100644
Binary files a/entry/src/main/resources/rawfile/voice/402001.mp3 and b/entry/src/main/resources/rawfile/voice/402001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40201.mp3 b/entry/src/main/resources/rawfile/voice/40201.mp3
index 9ab64f2f..46423dbd 100644
Binary files a/entry/src/main/resources/rawfile/voice/40201.mp3 and b/entry/src/main/resources/rawfile/voice/40201.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40202.mp3 b/entry/src/main/resources/rawfile/voice/40202.mp3
index d9fbf544..4346e105 100644
Binary files a/entry/src/main/resources/rawfile/voice/40202.mp3 and b/entry/src/main/resources/rawfile/voice/40202.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40203.mp3 b/entry/src/main/resources/rawfile/voice/40203.mp3
index e77028da..4317437a 100644
Binary files a/entry/src/main/resources/rawfile/voice/40203.mp3 and b/entry/src/main/resources/rawfile/voice/40203.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40204.mp3 b/entry/src/main/resources/rawfile/voice/40204.mp3
index 2016662e..15981ef0 100644
Binary files a/entry/src/main/resources/rawfile/voice/40204.mp3 and b/entry/src/main/resources/rawfile/voice/40204.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40205.mp3 b/entry/src/main/resources/rawfile/voice/40205.mp3
index 605cca42..a28aaed0 100644
Binary files a/entry/src/main/resources/rawfile/voice/40205.mp3 and b/entry/src/main/resources/rawfile/voice/40205.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40206.mp3 b/entry/src/main/resources/rawfile/voice/40206.mp3
index 71b3eae9..c24e86bd 100644
Binary files a/entry/src/main/resources/rawfile/voice/40206.mp3 and b/entry/src/main/resources/rawfile/voice/40206.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40207.mp3 b/entry/src/main/resources/rawfile/voice/40207.mp3
index e4688c09..55b543c3 100644
Binary files a/entry/src/main/resources/rawfile/voice/40207.mp3 and b/entry/src/main/resources/rawfile/voice/40207.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40208.mp3 b/entry/src/main/resources/rawfile/voice/40208.mp3
index f914e0d6..86c1488a 100644
Binary files a/entry/src/main/resources/rawfile/voice/40208.mp3 and b/entry/src/main/resources/rawfile/voice/40208.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40209.mp3 b/entry/src/main/resources/rawfile/voice/40209.mp3
index 0c050af8..b08fe37f 100644
Binary files a/entry/src/main/resources/rawfile/voice/40209.mp3 and b/entry/src/main/resources/rawfile/voice/40209.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40210.mp3 b/entry/src/main/resources/rawfile/voice/40210.mp3
index e1b331e6..d8826a23 100644
Binary files a/entry/src/main/resources/rawfile/voice/40210.mp3 and b/entry/src/main/resources/rawfile/voice/40210.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40211.mp3 b/entry/src/main/resources/rawfile/voice/40211.mp3
index 9010e317..e6bff9d3 100644
Binary files a/entry/src/main/resources/rawfile/voice/40211.mp3 and b/entry/src/main/resources/rawfile/voice/40211.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40212.mp3 b/entry/src/main/resources/rawfile/voice/40212.mp3
index 6605689c..3e54938f 100644
Binary files a/entry/src/main/resources/rawfile/voice/40212.mp3 and b/entry/src/main/resources/rawfile/voice/40212.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40213.mp3 b/entry/src/main/resources/rawfile/voice/40213.mp3
index 25787b26..26402196 100644
Binary files a/entry/src/main/resources/rawfile/voice/40213.mp3 and b/entry/src/main/resources/rawfile/voice/40213.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/403001.mp3 b/entry/src/main/resources/rawfile/voice/403001.mp3
index 4e47633f..cb227a79 100644
Binary files a/entry/src/main/resources/rawfile/voice/403001.mp3 and b/entry/src/main/resources/rawfile/voice/403001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/403002.mp3 b/entry/src/main/resources/rawfile/voice/403002.mp3
index 35d219ed..ebbca421 100644
Binary files a/entry/src/main/resources/rawfile/voice/403002.mp3 and b/entry/src/main/resources/rawfile/voice/403002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40301.mp3 b/entry/src/main/resources/rawfile/voice/40301.mp3
index 086fab62..8c5952b5 100644
Binary files a/entry/src/main/resources/rawfile/voice/40301.mp3 and b/entry/src/main/resources/rawfile/voice/40301.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40302.mp3 b/entry/src/main/resources/rawfile/voice/40302.mp3
index 3c197e5d..ff446bbd 100644
Binary files a/entry/src/main/resources/rawfile/voice/40302.mp3 and b/entry/src/main/resources/rawfile/voice/40302.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40303.mp3 b/entry/src/main/resources/rawfile/voice/40303.mp3
index cee0fd92..f1e0df35 100644
Binary files a/entry/src/main/resources/rawfile/voice/40303.mp3 and b/entry/src/main/resources/rawfile/voice/40303.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40304.mp3 b/entry/src/main/resources/rawfile/voice/40304.mp3
index 9ce95801..dde63e8a 100644
Binary files a/entry/src/main/resources/rawfile/voice/40304.mp3 and b/entry/src/main/resources/rawfile/voice/40304.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/404001.mp3 b/entry/src/main/resources/rawfile/voice/404001.mp3
index 61fb71a4..8b3bf2bd 100644
Binary files a/entry/src/main/resources/rawfile/voice/404001.mp3 and b/entry/src/main/resources/rawfile/voice/404001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4040021.mp3 b/entry/src/main/resources/rawfile/voice/4040021.mp3
index 1e37a4fb..07e787b3 100644
Binary files a/entry/src/main/resources/rawfile/voice/4040021.mp3 and b/entry/src/main/resources/rawfile/voice/4040021.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4040022.mp3 b/entry/src/main/resources/rawfile/voice/4040022.mp3
index 08e9f482..9c63d8ba 100644
Binary files a/entry/src/main/resources/rawfile/voice/4040022.mp3 and b/entry/src/main/resources/rawfile/voice/4040022.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4040023.mp3 b/entry/src/main/resources/rawfile/voice/4040023.mp3
index e1236193..9c60e546 100644
Binary files a/entry/src/main/resources/rawfile/voice/4040023.mp3 and b/entry/src/main/resources/rawfile/voice/4040023.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4040024.mp3 b/entry/src/main/resources/rawfile/voice/4040024.mp3
index 2c00b03c..0234245f 100644
Binary files a/entry/src/main/resources/rawfile/voice/4040024.mp3 and b/entry/src/main/resources/rawfile/voice/4040024.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4040032.mp3 b/entry/src/main/resources/rawfile/voice/4040032.mp3
index 86819ca1..9374e9dd 100644
Binary files a/entry/src/main/resources/rawfile/voice/4040032.mp3 and b/entry/src/main/resources/rawfile/voice/4040032.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4040033.mp3 b/entry/src/main/resources/rawfile/voice/4040033.mp3
index 92ae0455..9ea11dd9 100644
Binary files a/entry/src/main/resources/rawfile/voice/4040033.mp3 and b/entry/src/main/resources/rawfile/voice/4040033.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4040034.mp3 b/entry/src/main/resources/rawfile/voice/4040034.mp3
index c9ad652a..3ebbda56 100644
Binary files a/entry/src/main/resources/rawfile/voice/4040034.mp3 and b/entry/src/main/resources/rawfile/voice/4040034.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4040035.mp3 b/entry/src/main/resources/rawfile/voice/4040035.mp3
index 3cadf501..e29e4c50 100644
Binary files a/entry/src/main/resources/rawfile/voice/4040035.mp3 and b/entry/src/main/resources/rawfile/voice/4040035.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/404004.mp3 b/entry/src/main/resources/rawfile/voice/404004.mp3
index d921ab59..782b1179 100644
Binary files a/entry/src/main/resources/rawfile/voice/404004.mp3 and b/entry/src/main/resources/rawfile/voice/404004.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40401.mp3 b/entry/src/main/resources/rawfile/voice/40401.mp3
index b467cc61..bdd1a868 100644
Binary files a/entry/src/main/resources/rawfile/voice/40401.mp3 and b/entry/src/main/resources/rawfile/voice/40401.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40402.mp3 b/entry/src/main/resources/rawfile/voice/40402.mp3
index 0d2e3cbe..6df7442f 100644
Binary files a/entry/src/main/resources/rawfile/voice/40402.mp3 and b/entry/src/main/resources/rawfile/voice/40402.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40403.mp3 b/entry/src/main/resources/rawfile/voice/40403.mp3
index de4d99c6..cba2b53b 100644
Binary files a/entry/src/main/resources/rawfile/voice/40403.mp3 and b/entry/src/main/resources/rawfile/voice/40403.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40404.mp3 b/entry/src/main/resources/rawfile/voice/40404.mp3
index ef2c2f38..1e6c73de 100644
Binary files a/entry/src/main/resources/rawfile/voice/40404.mp3 and b/entry/src/main/resources/rawfile/voice/40404.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/405001.mp3 b/entry/src/main/resources/rawfile/voice/405001.mp3
index 996ec6cf..30a3f65d 100644
Binary files a/entry/src/main/resources/rawfile/voice/405001.mp3 and b/entry/src/main/resources/rawfile/voice/405001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/405002.mp3 b/entry/src/main/resources/rawfile/voice/405002.mp3
index 5e2cafa6..4d23959b 100644
Binary files a/entry/src/main/resources/rawfile/voice/405002.mp3 and b/entry/src/main/resources/rawfile/voice/405002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/405004.mp3 b/entry/src/main/resources/rawfile/voice/405004.mp3
index 7fbbf473..7a1c53ac 100644
Binary files a/entry/src/main/resources/rawfile/voice/405004.mp3 and b/entry/src/main/resources/rawfile/voice/405004.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40501.mp3 b/entry/src/main/resources/rawfile/voice/40501.mp3
index a7c92772..7b94b791 100644
Binary files a/entry/src/main/resources/rawfile/voice/40501.mp3 and b/entry/src/main/resources/rawfile/voice/40501.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40502.mp3 b/entry/src/main/resources/rawfile/voice/40502.mp3
index 83e6ada9..bdd86f7d 100644
Binary files a/entry/src/main/resources/rawfile/voice/40502.mp3 and b/entry/src/main/resources/rawfile/voice/40502.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40503.mp3 b/entry/src/main/resources/rawfile/voice/40503.mp3
index 205bd8da..11ce4db2 100644
Binary files a/entry/src/main/resources/rawfile/voice/40503.mp3 and b/entry/src/main/resources/rawfile/voice/40503.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/406001.mp3 b/entry/src/main/resources/rawfile/voice/406001.mp3
index a5cb7189..df373154 100644
Binary files a/entry/src/main/resources/rawfile/voice/406001.mp3 and b/entry/src/main/resources/rawfile/voice/406001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/406002.mp3 b/entry/src/main/resources/rawfile/voice/406002.mp3
index abef4d15..4d523eb8 100644
Binary files a/entry/src/main/resources/rawfile/voice/406002.mp3 and b/entry/src/main/resources/rawfile/voice/406002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/406003.mp3 b/entry/src/main/resources/rawfile/voice/406003.mp3
index efd55be0..8136ba85 100644
Binary files a/entry/src/main/resources/rawfile/voice/406003.mp3 and b/entry/src/main/resources/rawfile/voice/406003.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/406004.mp3 b/entry/src/main/resources/rawfile/voice/406004.mp3
index 6cbf9f69..81e2a29d 100644
Binary files a/entry/src/main/resources/rawfile/voice/406004.mp3 and b/entry/src/main/resources/rawfile/voice/406004.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/406005.mp3 b/entry/src/main/resources/rawfile/voice/406005.mp3
index 9059aa8f..11a62080 100644
Binary files a/entry/src/main/resources/rawfile/voice/406005.mp3 and b/entry/src/main/resources/rawfile/voice/406005.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/406006.mp3 b/entry/src/main/resources/rawfile/voice/406006.mp3
index d342514f..8b2f8849 100644
Binary files a/entry/src/main/resources/rawfile/voice/406006.mp3 and b/entry/src/main/resources/rawfile/voice/406006.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40601.mp3 b/entry/src/main/resources/rawfile/voice/40601.mp3
index 51edd462..851ee3bf 100644
Binary files a/entry/src/main/resources/rawfile/voice/40601.mp3 and b/entry/src/main/resources/rawfile/voice/40601.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40602.mp3 b/entry/src/main/resources/rawfile/voice/40602.mp3
index 0c0c4dec..6e48009a 100644
Binary files a/entry/src/main/resources/rawfile/voice/40602.mp3 and b/entry/src/main/resources/rawfile/voice/40602.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40603.mp3 b/entry/src/main/resources/rawfile/voice/40603.mp3
index bbd037d5..c124edca 100644
Binary files a/entry/src/main/resources/rawfile/voice/40603.mp3 and b/entry/src/main/resources/rawfile/voice/40603.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40604.mp3 b/entry/src/main/resources/rawfile/voice/40604.mp3
index cb634407..4d7e29b2 100644
Binary files a/entry/src/main/resources/rawfile/voice/40604.mp3 and b/entry/src/main/resources/rawfile/voice/40604.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40605.mp3 b/entry/src/main/resources/rawfile/voice/40605.mp3
index 27ec5ce0..cc620396 100644
Binary files a/entry/src/main/resources/rawfile/voice/40605.mp3 and b/entry/src/main/resources/rawfile/voice/40605.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40606.mp3 b/entry/src/main/resources/rawfile/voice/40606.mp3
index 5ff67a7f..612f7520 100644
Binary files a/entry/src/main/resources/rawfile/voice/40606.mp3 and b/entry/src/main/resources/rawfile/voice/40606.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40607.mp3 b/entry/src/main/resources/rawfile/voice/40607.mp3
index db3c0c29..4634e76e 100644
Binary files a/entry/src/main/resources/rawfile/voice/40607.mp3 and b/entry/src/main/resources/rawfile/voice/40607.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40608.mp3 b/entry/src/main/resources/rawfile/voice/40608.mp3
index 322cb02c..ce223bc4 100644
Binary files a/entry/src/main/resources/rawfile/voice/40608.mp3 and b/entry/src/main/resources/rawfile/voice/40608.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40609.mp3 b/entry/src/main/resources/rawfile/voice/40609.mp3
index 03acb56a..25911637 100644
Binary files a/entry/src/main/resources/rawfile/voice/40609.mp3 and b/entry/src/main/resources/rawfile/voice/40609.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40610.mp3 b/entry/src/main/resources/rawfile/voice/40610.mp3
index 068021e8..1574d44f 100644
Binary files a/entry/src/main/resources/rawfile/voice/40610.mp3 and b/entry/src/main/resources/rawfile/voice/40610.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40611.mp3 b/entry/src/main/resources/rawfile/voice/40611.mp3
index 9acc6d2a..5b125038 100644
Binary files a/entry/src/main/resources/rawfile/voice/40611.mp3 and b/entry/src/main/resources/rawfile/voice/40611.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/407001.mp3 b/entry/src/main/resources/rawfile/voice/407001.mp3
index bacfb928..a43ed8cb 100644
Binary files a/entry/src/main/resources/rawfile/voice/407001.mp3 and b/entry/src/main/resources/rawfile/voice/407001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40701.mp3 b/entry/src/main/resources/rawfile/voice/40701.mp3
index e2b8e4d3..852156a7 100644
Binary files a/entry/src/main/resources/rawfile/voice/40701.mp3 and b/entry/src/main/resources/rawfile/voice/40701.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40702.mp3 b/entry/src/main/resources/rawfile/voice/40702.mp3
index 4b6f01d5..4ad13594 100644
Binary files a/entry/src/main/resources/rawfile/voice/40702.mp3 and b/entry/src/main/resources/rawfile/voice/40702.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40703.mp3 b/entry/src/main/resources/rawfile/voice/40703.mp3
index 649c8f1e..8336a154 100644
Binary files a/entry/src/main/resources/rawfile/voice/40703.mp3 and b/entry/src/main/resources/rawfile/voice/40703.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40704.mp3 b/entry/src/main/resources/rawfile/voice/40704.mp3
index 77d40b78..55571330 100644
Binary files a/entry/src/main/resources/rawfile/voice/40704.mp3 and b/entry/src/main/resources/rawfile/voice/40704.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40705.mp3 b/entry/src/main/resources/rawfile/voice/40705.mp3
index 1de66f9a..674342fa 100644
Binary files a/entry/src/main/resources/rawfile/voice/40705.mp3 and b/entry/src/main/resources/rawfile/voice/40705.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/408001.mp3 b/entry/src/main/resources/rawfile/voice/408001.mp3
index f0a93ed5..7d0e8b97 100644
Binary files a/entry/src/main/resources/rawfile/voice/408001.mp3 and b/entry/src/main/resources/rawfile/voice/408001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40801.mp3 b/entry/src/main/resources/rawfile/voice/40801.mp3
index e2b8e4d3..852156a7 100644
Binary files a/entry/src/main/resources/rawfile/voice/40801.mp3 and b/entry/src/main/resources/rawfile/voice/40801.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40802.mp3 b/entry/src/main/resources/rawfile/voice/40802.mp3
index 19219e79..7522e5db 100644
Binary files a/entry/src/main/resources/rawfile/voice/40802.mp3 and b/entry/src/main/resources/rawfile/voice/40802.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40803.mp3 b/entry/src/main/resources/rawfile/voice/40803.mp3
index a967ecd7..baa0291a 100644
Binary files a/entry/src/main/resources/rawfile/voice/40803.mp3 and b/entry/src/main/resources/rawfile/voice/40803.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40804.mp3 b/entry/src/main/resources/rawfile/voice/40804.mp3
index 904475ec..d6e38f0c 100644
Binary files a/entry/src/main/resources/rawfile/voice/40804.mp3 and b/entry/src/main/resources/rawfile/voice/40804.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40805.mp3 b/entry/src/main/resources/rawfile/voice/40805.mp3
index b72b8be4..25e40e3f 100644
Binary files a/entry/src/main/resources/rawfile/voice/40805.mp3 and b/entry/src/main/resources/rawfile/voice/40805.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40806.mp3 b/entry/src/main/resources/rawfile/voice/40806.mp3
index 63e5f4a5..2c530e71 100644
Binary files a/entry/src/main/resources/rawfile/voice/40806.mp3 and b/entry/src/main/resources/rawfile/voice/40806.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/409001.mp3 b/entry/src/main/resources/rawfile/voice/409001.mp3
index 53f14a87..03547d5b 100644
Binary files a/entry/src/main/resources/rawfile/voice/409001.mp3 and b/entry/src/main/resources/rawfile/voice/409001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40901.mp3 b/entry/src/main/resources/rawfile/voice/40901.mp3
index 57247795..4356c4b4 100644
Binary files a/entry/src/main/resources/rawfile/voice/40901.mp3 and b/entry/src/main/resources/rawfile/voice/40901.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40902.mp3 b/entry/src/main/resources/rawfile/voice/40902.mp3
index 9c9b3d75..ac019a1b 100644
Binary files a/entry/src/main/resources/rawfile/voice/40902.mp3 and b/entry/src/main/resources/rawfile/voice/40902.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40903.mp3 b/entry/src/main/resources/rawfile/voice/40903.mp3
index cd9affe2..bb456019 100644
Binary files a/entry/src/main/resources/rawfile/voice/40903.mp3 and b/entry/src/main/resources/rawfile/voice/40903.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40904.mp3 b/entry/src/main/resources/rawfile/voice/40904.mp3
index 26fd8465..07ff4ab5 100644
Binary files a/entry/src/main/resources/rawfile/voice/40904.mp3 and b/entry/src/main/resources/rawfile/voice/40904.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/40905.mp3 b/entry/src/main/resources/rawfile/voice/40905.mp3
index ba32000c..c66b5221 100644
Binary files a/entry/src/main/resources/rawfile/voice/40905.mp3 and b/entry/src/main/resources/rawfile/voice/40905.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/410001.mp3 b/entry/src/main/resources/rawfile/voice/410001.mp3
index 12a8c730..38f39a6a 100644
Binary files a/entry/src/main/resources/rawfile/voice/410001.mp3 and b/entry/src/main/resources/rawfile/voice/410001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/410002.mp3 b/entry/src/main/resources/rawfile/voice/410002.mp3
index 1f1030b1..6333f2ac 100644
Binary files a/entry/src/main/resources/rawfile/voice/410002.mp3 and b/entry/src/main/resources/rawfile/voice/410002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/410003.mp3 b/entry/src/main/resources/rawfile/voice/410003.mp3
index 77da35bf..0cd039fa 100644
Binary files a/entry/src/main/resources/rawfile/voice/410003.mp3 and b/entry/src/main/resources/rawfile/voice/410003.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41001.mp3 b/entry/src/main/resources/rawfile/voice/41001.mp3
index 255ad117..fbca135e 100644
Binary files a/entry/src/main/resources/rawfile/voice/41001.mp3 and b/entry/src/main/resources/rawfile/voice/41001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41002.mp3 b/entry/src/main/resources/rawfile/voice/41002.mp3
index 27cebaa5..a2261c61 100644
Binary files a/entry/src/main/resources/rawfile/voice/41002.mp3 and b/entry/src/main/resources/rawfile/voice/41002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41003.mp3 b/entry/src/main/resources/rawfile/voice/41003.mp3
index 0e7b9343..7ed2f4ff 100644
Binary files a/entry/src/main/resources/rawfile/voice/41003.mp3 and b/entry/src/main/resources/rawfile/voice/41003.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/411001.mp3 b/entry/src/main/resources/rawfile/voice/411001.mp3
index 12a8c730..38f39a6a 100644
Binary files a/entry/src/main/resources/rawfile/voice/411001.mp3 and b/entry/src/main/resources/rawfile/voice/411001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/411002.mp3 b/entry/src/main/resources/rawfile/voice/411002.mp3
index a9217791..1cdc844f 100644
Binary files a/entry/src/main/resources/rawfile/voice/411002.mp3 and b/entry/src/main/resources/rawfile/voice/411002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/411003.mp3 b/entry/src/main/resources/rawfile/voice/411003.mp3
index 77da35bf..0cd039fa 100644
Binary files a/entry/src/main/resources/rawfile/voice/411003.mp3 and b/entry/src/main/resources/rawfile/voice/411003.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/411004.mp3 b/entry/src/main/resources/rawfile/voice/411004.mp3
index 8b35aed1..ae5cd79e 100644
Binary files a/entry/src/main/resources/rawfile/voice/411004.mp3 and b/entry/src/main/resources/rawfile/voice/411004.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41101.mp3 b/entry/src/main/resources/rawfile/voice/41101.mp3
index 255ad117..fbca135e 100644
Binary files a/entry/src/main/resources/rawfile/voice/41101.mp3 and b/entry/src/main/resources/rawfile/voice/41101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41102.mp3 b/entry/src/main/resources/rawfile/voice/41102.mp3
index e77dcb01..0449ee7e 100644
Binary files a/entry/src/main/resources/rawfile/voice/41102.mp3 and b/entry/src/main/resources/rawfile/voice/41102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41103.mp3 b/entry/src/main/resources/rawfile/voice/41103.mp3
index bed31b9b..bae2375a 100644
Binary files a/entry/src/main/resources/rawfile/voice/41103.mp3 and b/entry/src/main/resources/rawfile/voice/41103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/412001.mp3 b/entry/src/main/resources/rawfile/voice/412001.mp3
index 12a8c730..38f39a6a 100644
Binary files a/entry/src/main/resources/rawfile/voice/412001.mp3 and b/entry/src/main/resources/rawfile/voice/412001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/412002.mp3 b/entry/src/main/resources/rawfile/voice/412002.mp3
index 2aaad47e..4463fdbd 100644
Binary files a/entry/src/main/resources/rawfile/voice/412002.mp3 and b/entry/src/main/resources/rawfile/voice/412002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/412003.mp3 b/entry/src/main/resources/rawfile/voice/412003.mp3
index 77da35bf..0cd039fa 100644
Binary files a/entry/src/main/resources/rawfile/voice/412003.mp3 and b/entry/src/main/resources/rawfile/voice/412003.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41201.mp3 b/entry/src/main/resources/rawfile/voice/41201.mp3
index 255ad117..fbca135e 100644
Binary files a/entry/src/main/resources/rawfile/voice/41201.mp3 and b/entry/src/main/resources/rawfile/voice/41201.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41202.mp3 b/entry/src/main/resources/rawfile/voice/41202.mp3
index 782565a8..ca88d4e7 100644
Binary files a/entry/src/main/resources/rawfile/voice/41202.mp3 and b/entry/src/main/resources/rawfile/voice/41202.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41203.mp3 b/entry/src/main/resources/rawfile/voice/41203.mp3
index 209bebee..f115edd8 100644
Binary files a/entry/src/main/resources/rawfile/voice/41203.mp3 and b/entry/src/main/resources/rawfile/voice/41203.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/413001.mp3 b/entry/src/main/resources/rawfile/voice/413001.mp3
index 18f64278..577f1903 100644
Binary files a/entry/src/main/resources/rawfile/voice/413001.mp3 and b/entry/src/main/resources/rawfile/voice/413001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/413002.mp3 b/entry/src/main/resources/rawfile/voice/413002.mp3
index 69edd0da..1293a1db 100644
Binary files a/entry/src/main/resources/rawfile/voice/413002.mp3 and b/entry/src/main/resources/rawfile/voice/413002.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41302.mp3 b/entry/src/main/resources/rawfile/voice/41302.mp3
index 132337a5..ff5d8a64 100644
Binary files a/entry/src/main/resources/rawfile/voice/41302.mp3 and b/entry/src/main/resources/rawfile/voice/41302.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41303.mp3 b/entry/src/main/resources/rawfile/voice/41303.mp3
index 22e4cde8..2ec055d8 100644
Binary files a/entry/src/main/resources/rawfile/voice/41303.mp3 and b/entry/src/main/resources/rawfile/voice/41303.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/414001.mp3 b/entry/src/main/resources/rawfile/voice/414001.mp3
index 78cf6751..9f88650b 100644
Binary files a/entry/src/main/resources/rawfile/voice/414001.mp3 and b/entry/src/main/resources/rawfile/voice/414001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/414003.mp3 b/entry/src/main/resources/rawfile/voice/414003.mp3
index caaba93c..eb31da12 100644
Binary files a/entry/src/main/resources/rawfile/voice/414003.mp3 and b/entry/src/main/resources/rawfile/voice/414003.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/414004.mp3 b/entry/src/main/resources/rawfile/voice/414004.mp3
index 8b1b3468..05e36a22 100644
Binary files a/entry/src/main/resources/rawfile/voice/414004.mp3 and b/entry/src/main/resources/rawfile/voice/414004.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/414005.mp3 b/entry/src/main/resources/rawfile/voice/414005.mp3
index cc39675a..c70e73dc 100644
Binary files a/entry/src/main/resources/rawfile/voice/414005.mp3 and b/entry/src/main/resources/rawfile/voice/414005.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41401.mp3 b/entry/src/main/resources/rawfile/voice/41401.mp3
index 3521b086..5294c430 100644
Binary files a/entry/src/main/resources/rawfile/voice/41401.mp3 and b/entry/src/main/resources/rawfile/voice/41401.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41402.mp3 b/entry/src/main/resources/rawfile/voice/41402.mp3
index ff88272e..243d16ea 100644
Binary files a/entry/src/main/resources/rawfile/voice/41402.mp3 and b/entry/src/main/resources/rawfile/voice/41402.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41403.mp3 b/entry/src/main/resources/rawfile/voice/41403.mp3
index 210e4291..08364bf6 100644
Binary files a/entry/src/main/resources/rawfile/voice/41403.mp3 and b/entry/src/main/resources/rawfile/voice/41403.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41404.mp3 b/entry/src/main/resources/rawfile/voice/41404.mp3
index 9d827493..fae36806 100644
Binary files a/entry/src/main/resources/rawfile/voice/41404.mp3 and b/entry/src/main/resources/rawfile/voice/41404.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41406.mp3 b/entry/src/main/resources/rawfile/voice/41406.mp3
index ae83cb71..0a016337 100644
Binary files a/entry/src/main/resources/rawfile/voice/41406.mp3 and b/entry/src/main/resources/rawfile/voice/41406.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41407.mp3 b/entry/src/main/resources/rawfile/voice/41407.mp3
index 765360d8..06cd3ea8 100644
Binary files a/entry/src/main/resources/rawfile/voice/41407.mp3 and b/entry/src/main/resources/rawfile/voice/41407.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41408.mp3 b/entry/src/main/resources/rawfile/voice/41408.mp3
index a5d331a1..74c7aef7 100644
Binary files a/entry/src/main/resources/rawfile/voice/41408.mp3 and b/entry/src/main/resources/rawfile/voice/41408.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/415001.mp3 b/entry/src/main/resources/rawfile/voice/415001.mp3
index 4a4f3412..3cec34bc 100644
Binary files a/entry/src/main/resources/rawfile/voice/415001.mp3 and b/entry/src/main/resources/rawfile/voice/415001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41501.mp3 b/entry/src/main/resources/rawfile/voice/41501.mp3
index 8253d62f..dbd6d25e 100644
Binary files a/entry/src/main/resources/rawfile/voice/41501.mp3 and b/entry/src/main/resources/rawfile/voice/41501.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41502.mp3 b/entry/src/main/resources/rawfile/voice/41502.mp3
index aafe6956..69b6dacc 100644
Binary files a/entry/src/main/resources/rawfile/voice/41502.mp3 and b/entry/src/main/resources/rawfile/voice/41502.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41503.mp3 b/entry/src/main/resources/rawfile/voice/41503.mp3
index 748dd508..9a0f23f8 100644
Binary files a/entry/src/main/resources/rawfile/voice/41503.mp3 and b/entry/src/main/resources/rawfile/voice/41503.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41504.mp3 b/entry/src/main/resources/rawfile/voice/41504.mp3
index 90445c47..8f8368b6 100644
Binary files a/entry/src/main/resources/rawfile/voice/41504.mp3 and b/entry/src/main/resources/rawfile/voice/41504.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41601.mp3 b/entry/src/main/resources/rawfile/voice/41601.mp3
index 6f01ed21..8533c5db 100644
Binary files a/entry/src/main/resources/rawfile/voice/41601.mp3 and b/entry/src/main/resources/rawfile/voice/41601.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41602.mp3 b/entry/src/main/resources/rawfile/voice/41602.mp3
index 8dce8b31..a2693b1f 100644
Binary files a/entry/src/main/resources/rawfile/voice/41602.mp3 and b/entry/src/main/resources/rawfile/voice/41602.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41604.mp3 b/entry/src/main/resources/rawfile/voice/41604.mp3
index 285f93f4..7fe96100 100644
Binary files a/entry/src/main/resources/rawfile/voice/41604.mp3 and b/entry/src/main/resources/rawfile/voice/41604.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41605.mp3 b/entry/src/main/resources/rawfile/voice/41605.mp3
index 85cbff93..78a52daf 100644
Binary files a/entry/src/main/resources/rawfile/voice/41605.mp3 and b/entry/src/main/resources/rawfile/voice/41605.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41606.mp3 b/entry/src/main/resources/rawfile/voice/41606.mp3
index dd0c3d01..b7aba78c 100644
Binary files a/entry/src/main/resources/rawfile/voice/41606.mp3 and b/entry/src/main/resources/rawfile/voice/41606.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41607.mp3 b/entry/src/main/resources/rawfile/voice/41607.mp3
index 8ac89110..2e9c0fa0 100644
Binary files a/entry/src/main/resources/rawfile/voice/41607.mp3 and b/entry/src/main/resources/rawfile/voice/41607.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41608.mp3 b/entry/src/main/resources/rawfile/voice/41608.mp3
index 1342f4f9..1f0447db 100644
Binary files a/entry/src/main/resources/rawfile/voice/41608.mp3 and b/entry/src/main/resources/rawfile/voice/41608.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41609.mp3 b/entry/src/main/resources/rawfile/voice/41609.mp3
index 32d0a90d..a0a3113b 100644
Binary files a/entry/src/main/resources/rawfile/voice/41609.mp3 and b/entry/src/main/resources/rawfile/voice/41609.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/417000.mp3 b/entry/src/main/resources/rawfile/voice/417000.mp3
index 93c54231..db2d41c5 100644
Binary files a/entry/src/main/resources/rawfile/voice/417000.mp3 and b/entry/src/main/resources/rawfile/voice/417000.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/417001.mp3 b/entry/src/main/resources/rawfile/voice/417001.mp3
index b2557572..e0884262 100644
Binary files a/entry/src/main/resources/rawfile/voice/417001.mp3 and b/entry/src/main/resources/rawfile/voice/417001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170010.mp3 b/entry/src/main/resources/rawfile/voice/4170010.mp3
index 69451a54..b2562bcc 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170010.mp3 and b/entry/src/main/resources/rawfile/voice/4170010.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170011.mp3 b/entry/src/main/resources/rawfile/voice/4170011.mp3
index 2e7b8a7b..39e34b36 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170011.mp3 and b/entry/src/main/resources/rawfile/voice/4170011.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170012.mp3 b/entry/src/main/resources/rawfile/voice/4170012.mp3
index f6fc0cd1..088b8770 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170012.mp3 and b/entry/src/main/resources/rawfile/voice/4170012.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170013.mp3 b/entry/src/main/resources/rawfile/voice/4170013.mp3
index fa205a28..7d6d093f 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170013.mp3 and b/entry/src/main/resources/rawfile/voice/4170013.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170014.mp3 b/entry/src/main/resources/rawfile/voice/4170014.mp3
index e1eba7b6..cdd4e5bc 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170014.mp3 and b/entry/src/main/resources/rawfile/voice/4170014.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170015.mp3 b/entry/src/main/resources/rawfile/voice/4170015.mp3
index 292831ce..e17541e7 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170015.mp3 and b/entry/src/main/resources/rawfile/voice/4170015.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170016.mp3 b/entry/src/main/resources/rawfile/voice/4170016.mp3
index 76d278ed..cac3079b 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170016.mp3 and b/entry/src/main/resources/rawfile/voice/4170016.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170017.mp3 b/entry/src/main/resources/rawfile/voice/4170017.mp3
index 3e30565f..329c3a5c 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170017.mp3 and b/entry/src/main/resources/rawfile/voice/4170017.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170018.mp3 b/entry/src/main/resources/rawfile/voice/4170018.mp3
index 339f2dcc..bd42bf4a 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170018.mp3 and b/entry/src/main/resources/rawfile/voice/4170018.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170019.mp3 b/entry/src/main/resources/rawfile/voice/4170019.mp3
index 88871d63..9988dc75 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170019.mp3 and b/entry/src/main/resources/rawfile/voice/4170019.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4170020.mp3 b/entry/src/main/resources/rawfile/voice/4170020.mp3
index 749a8df8..3a61847c 100644
Binary files a/entry/src/main/resources/rawfile/voice/4170020.mp3 and b/entry/src/main/resources/rawfile/voice/4170020.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/417003.mp3 b/entry/src/main/resources/rawfile/voice/417003.mp3
index e93ac814..7ecbd419 100644
Binary files a/entry/src/main/resources/rawfile/voice/417003.mp3 and b/entry/src/main/resources/rawfile/voice/417003.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/417004.mp3 b/entry/src/main/resources/rawfile/voice/417004.mp3
index b7652fb4..75b73e2d 100644
Binary files a/entry/src/main/resources/rawfile/voice/417004.mp3 and b/entry/src/main/resources/rawfile/voice/417004.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/417005.mp3 b/entry/src/main/resources/rawfile/voice/417005.mp3
index 69054fc3..34c9eb26 100644
Binary files a/entry/src/main/resources/rawfile/voice/417005.mp3 and b/entry/src/main/resources/rawfile/voice/417005.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/417006.mp3 b/entry/src/main/resources/rawfile/voice/417006.mp3
index c7825d1f..25bc70cb 100644
Binary files a/entry/src/main/resources/rawfile/voice/417006.mp3 and b/entry/src/main/resources/rawfile/voice/417006.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/417007.mp3 b/entry/src/main/resources/rawfile/voice/417007.mp3
index c4bd12a1..4e8b4f3c 100644
Binary files a/entry/src/main/resources/rawfile/voice/417007.mp3 and b/entry/src/main/resources/rawfile/voice/417007.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/417008.mp3 b/entry/src/main/resources/rawfile/voice/417008.mp3
index f823a426..bd169612 100644
Binary files a/entry/src/main/resources/rawfile/voice/417008.mp3 and b/entry/src/main/resources/rawfile/voice/417008.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/417009.mp3 b/entry/src/main/resources/rawfile/voice/417009.mp3
index 423565c7..733add7f 100644
Binary files a/entry/src/main/resources/rawfile/voice/417009.mp3 and b/entry/src/main/resources/rawfile/voice/417009.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41701.mp3 b/entry/src/main/resources/rawfile/voice/41701.mp3
index 6f01ed21..8533c5db 100644
Binary files a/entry/src/main/resources/rawfile/voice/41701.mp3 and b/entry/src/main/resources/rawfile/voice/41701.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41702.mp3 b/entry/src/main/resources/rawfile/voice/41702.mp3
index 192481a2..8024dd1b 100644
Binary files a/entry/src/main/resources/rawfile/voice/41702.mp3 and b/entry/src/main/resources/rawfile/voice/41702.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41704.mp3 b/entry/src/main/resources/rawfile/voice/41704.mp3
index 285f93f4..7fe96100 100644
Binary files a/entry/src/main/resources/rawfile/voice/41704.mp3 and b/entry/src/main/resources/rawfile/voice/41704.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41705.mp3 b/entry/src/main/resources/rawfile/voice/41705.mp3
index 85cbff93..78a52daf 100644
Binary files a/entry/src/main/resources/rawfile/voice/41705.mp3 and b/entry/src/main/resources/rawfile/voice/41705.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41706.mp3 b/entry/src/main/resources/rawfile/voice/41706.mp3
index 376a3c8d..4591be57 100644
Binary files a/entry/src/main/resources/rawfile/voice/41706.mp3 and b/entry/src/main/resources/rawfile/voice/41706.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41707.mp3 b/entry/src/main/resources/rawfile/voice/41707.mp3
index a136b599..ead2837b 100644
Binary files a/entry/src/main/resources/rawfile/voice/41707.mp3 and b/entry/src/main/resources/rawfile/voice/41707.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41708.mp3 b/entry/src/main/resources/rawfile/voice/41708.mp3
index 1342f4f9..1f0447db 100644
Binary files a/entry/src/main/resources/rawfile/voice/41708.mp3 and b/entry/src/main/resources/rawfile/voice/41708.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41709.mp3 b/entry/src/main/resources/rawfile/voice/41709.mp3
index 88e8b6d1..d1ce7bd6 100644
Binary files a/entry/src/main/resources/rawfile/voice/41709.mp3 and b/entry/src/main/resources/rawfile/voice/41709.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41_01.mp3 b/entry/src/main/resources/rawfile/voice/41_01.mp3
index 1bcacbff..979ae723 100644
Binary files a/entry/src/main/resources/rawfile/voice/41_01.mp3 and b/entry/src/main/resources/rawfile/voice/41_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41_02.mp3 b/entry/src/main/resources/rawfile/voice/41_02.mp3
index 727b4b83..d358ffad 100644
Binary files a/entry/src/main/resources/rawfile/voice/41_02.mp3 and b/entry/src/main/resources/rawfile/voice/41_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41_03.mp3 b/entry/src/main/resources/rawfile/voice/41_03.mp3
index f9bb1eb6..b9f0706e 100644
Binary files a/entry/src/main/resources/rawfile/voice/41_03.mp3 and b/entry/src/main/resources/rawfile/voice/41_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41_04.mp3 b/entry/src/main/resources/rawfile/voice/41_04.mp3
index 0ee8554d..844a5b0a 100644
Binary files a/entry/src/main/resources/rawfile/voice/41_04.mp3 and b/entry/src/main/resources/rawfile/voice/41_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41_05.mp3 b/entry/src/main/resources/rawfile/voice/41_05.mp3
index b2fcfd5c..768dfc69 100644
Binary files a/entry/src/main/resources/rawfile/voice/41_05.mp3 and b/entry/src/main/resources/rawfile/voice/41_05.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41_06.mp3 b/entry/src/main/resources/rawfile/voice/41_06.mp3
index a68479b4..30fe89a3 100644
Binary files a/entry/src/main/resources/rawfile/voice/41_06.mp3 and b/entry/src/main/resources/rawfile/voice/41_06.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41_07.mp3 b/entry/src/main/resources/rawfile/voice/41_07.mp3
index 54fb5e5e..f882b611 100644
Binary files a/entry/src/main/resources/rawfile/voice/41_07.mp3 and b/entry/src/main/resources/rawfile/voice/41_07.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41_08.mp3 b/entry/src/main/resources/rawfile/voice/41_08.mp3
index c6cbc717..013d406b 100644
Binary files a/entry/src/main/resources/rawfile/voice/41_08.mp3 and b/entry/src/main/resources/rawfile/voice/41_08.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41_09.mp3 b/entry/src/main/resources/rawfile/voice/41_09.mp3
index f8a7a013..2b177088 100644
Binary files a/entry/src/main/resources/rawfile/voice/41_09.mp3 and b/entry/src/main/resources/rawfile/voice/41_09.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/41_42.mp3 b/entry/src/main/resources/rawfile/voice/41_42.mp3
index 58271859..a9f1ad48 100644
Binary files a/entry/src/main/resources/rawfile/voice/41_42.mp3 and b/entry/src/main/resources/rawfile/voice/41_42.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/456001.mp3 b/entry/src/main/resources/rawfile/voice/456001.mp3
index 32e9b1fc..a943917a 100644
Binary files a/entry/src/main/resources/rawfile/voice/456001.mp3 and b/entry/src/main/resources/rawfile/voice/456001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/458001.mp3 b/entry/src/main/resources/rawfile/voice/458001.mp3
index 9c34a3fd..9fbe2008 100644
Binary files a/entry/src/main/resources/rawfile/voice/458001.mp3 and b/entry/src/main/resources/rawfile/voice/458001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/471001.mp3 b/entry/src/main/resources/rawfile/voice/471001.mp3
index 88c9fede..0300b05c 100644
Binary files a/entry/src/main/resources/rawfile/voice/471001.mp3 and b/entry/src/main/resources/rawfile/voice/471001.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4_01.mp3 b/entry/src/main/resources/rawfile/voice/4_01.mp3
index 23493378..fb7a4c8a 100644
Binary files a/entry/src/main/resources/rawfile/voice/4_01.mp3 and b/entry/src/main/resources/rawfile/voice/4_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4_02.mp3 b/entry/src/main/resources/rawfile/voice/4_02.mp3
index ee7ef56b..774a0784 100644
Binary files a/entry/src/main/resources/rawfile/voice/4_02.mp3 and b/entry/src/main/resources/rawfile/voice/4_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4_04.mp3 b/entry/src/main/resources/rawfile/voice/4_04.mp3
index 02c07310..67016fb8 100644
Binary files a/entry/src/main/resources/rawfile/voice/4_04.mp3 and b/entry/src/main/resources/rawfile/voice/4_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4_101.mp3 b/entry/src/main/resources/rawfile/voice/4_101.mp3
index c4b8e1d7..a8ff5cb3 100644
Binary files a/entry/src/main/resources/rawfile/voice/4_101.mp3 and b/entry/src/main/resources/rawfile/voice/4_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4_102.mp3 b/entry/src/main/resources/rawfile/voice/4_102.mp3
index 33e42a2c..3c295008 100644
Binary files a/entry/src/main/resources/rawfile/voice/4_102.mp3 and b/entry/src/main/resources/rawfile/voice/4_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4_103.mp3 b/entry/src/main/resources/rawfile/voice/4_103.mp3
index 03ee8bc5..ab5a7f21 100644
Binary files a/entry/src/main/resources/rawfile/voice/4_103.mp3 and b/entry/src/main/resources/rawfile/voice/4_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4_41.mp3 b/entry/src/main/resources/rawfile/voice/4_41.mp3
index 2ffcccfe..faa49c66 100644
Binary files a/entry/src/main/resources/rawfile/voice/4_41.mp3 and b/entry/src/main/resources/rawfile/voice/4_41.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4_42.mp3 b/entry/src/main/resources/rawfile/voice/4_42.mp3
index abb67c20..713eb491 100644
Binary files a/entry/src/main/resources/rawfile/voice/4_42.mp3 and b/entry/src/main/resources/rawfile/voice/4_42.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4_43.mp3 b/entry/src/main/resources/rawfile/voice/4_43.mp3
index ea6b9319..6e843761 100644
Binary files a/entry/src/main/resources/rawfile/voice/4_43.mp3 and b/entry/src/main/resources/rawfile/voice/4_43.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/4号线.mp3 b/entry/src/main/resources/rawfile/voice/4号线.mp3
index 6cb36676..66fc2150 100644
Binary files a/entry/src/main/resources/rawfile/voice/4号线.mp3 and b/entry/src/main/resources/rawfile/voice/4号线.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_01.mp3 b/entry/src/main/resources/rawfile/voice/5_01.mp3
index 0dced18c..769c0f75 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_01.mp3 and b/entry/src/main/resources/rawfile/voice/5_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_02.mp3 b/entry/src/main/resources/rawfile/voice/5_02.mp3
index 7f325c80..1cc773c4 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_02.mp3 and b/entry/src/main/resources/rawfile/voice/5_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_03.mp3 b/entry/src/main/resources/rawfile/voice/5_03.mp3
index 12dad783..8e0eab9e 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_03.mp3 and b/entry/src/main/resources/rawfile/voice/5_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_04.mp3 b/entry/src/main/resources/rawfile/voice/5_04.mp3
index 0ece33d6..449ccdb2 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_04.mp3 and b/entry/src/main/resources/rawfile/voice/5_04.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_06.mp3 b/entry/src/main/resources/rawfile/voice/5_06.mp3
index 2b757a56..1d6ae0f4 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_06.mp3 and b/entry/src/main/resources/rawfile/voice/5_06.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_101.mp3 b/entry/src/main/resources/rawfile/voice/5_101.mp3
index 506450aa..380517c8 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_101.mp3 and b/entry/src/main/resources/rawfile/voice/5_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_102.mp3 b/entry/src/main/resources/rawfile/voice/5_102.mp3
index b636ed19..4d70f6a1 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_102.mp3 and b/entry/src/main/resources/rawfile/voice/5_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_103.mp3 b/entry/src/main/resources/rawfile/voice/5_103.mp3
index 985d3a3c..43d78b9f 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_103.mp3 and b/entry/src/main/resources/rawfile/voice/5_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_104.mp3 b/entry/src/main/resources/rawfile/voice/5_104.mp3
index b9eb7d1b..0cf62d91 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_104.mp3 and b/entry/src/main/resources/rawfile/voice/5_104.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_41.mp3 b/entry/src/main/resources/rawfile/voice/5_41.mp3
index 8b8ada92..ac416863 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_41.mp3 and b/entry/src/main/resources/rawfile/voice/5_41.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_42.mp3 b/entry/src/main/resources/rawfile/voice/5_42.mp3
index d4e9059a..6a9f75a5 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_42.mp3 and b/entry/src/main/resources/rawfile/voice/5_42.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_43.mp3 b/entry/src/main/resources/rawfile/voice/5_43.mp3
index 88a463d8..7dc2cc1a 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_43.mp3 and b/entry/src/main/resources/rawfile/voice/5_43.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_44.mp3 b/entry/src/main/resources/rawfile/voice/5_44.mp3
index c99cc244..bd484dd6 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_44.mp3 and b/entry/src/main/resources/rawfile/voice/5_44.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5_45.mp3 b/entry/src/main/resources/rawfile/voice/5_45.mp3
index d78f825d..c99709b1 100644
Binary files a/entry/src/main/resources/rawfile/voice/5_45.mp3 and b/entry/src/main/resources/rawfile/voice/5_45.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/5号线.mp3 b/entry/src/main/resources/rawfile/voice/5号线.mp3
index 8ef43d65..c2d3cc9a 100644
Binary files a/entry/src/main/resources/rawfile/voice/5号线.mp3 and b/entry/src/main/resources/rawfile/voice/5号线.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/6_01.mp3 b/entry/src/main/resources/rawfile/voice/6_01.mp3
index 7f325c80..1cc773c4 100644
Binary files a/entry/src/main/resources/rawfile/voice/6_01.mp3 and b/entry/src/main/resources/rawfile/voice/6_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/6_02.mp3 b/entry/src/main/resources/rawfile/voice/6_02.mp3
index 7453609b..6571ba94 100644
Binary files a/entry/src/main/resources/rawfile/voice/6_02.mp3 and b/entry/src/main/resources/rawfile/voice/6_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/6_03.mp3 b/entry/src/main/resources/rawfile/voice/6_03.mp3
index 5ce6bee6..7e4bf200 100644
Binary files a/entry/src/main/resources/rawfile/voice/6_03.mp3 and b/entry/src/main/resources/rawfile/voice/6_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/6_101.mp3 b/entry/src/main/resources/rawfile/voice/6_101.mp3
index 7f325c80..1cc773c4 100644
Binary files a/entry/src/main/resources/rawfile/voice/6_101.mp3 and b/entry/src/main/resources/rawfile/voice/6_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/6_102.mp3 b/entry/src/main/resources/rawfile/voice/6_102.mp3
index a63018cc..323f4658 100644
Binary files a/entry/src/main/resources/rawfile/voice/6_102.mp3 and b/entry/src/main/resources/rawfile/voice/6_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/7_01.mp3 b/entry/src/main/resources/rawfile/voice/7_01.mp3
index 7f325c80..1cc773c4 100644
Binary files a/entry/src/main/resources/rawfile/voice/7_01.mp3 and b/entry/src/main/resources/rawfile/voice/7_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/7_02.mp3 b/entry/src/main/resources/rawfile/voice/7_02.mp3
index d686c1b8..3cb98991 100644
Binary files a/entry/src/main/resources/rawfile/voice/7_02.mp3 and b/entry/src/main/resources/rawfile/voice/7_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/7_03.mp3 b/entry/src/main/resources/rawfile/voice/7_03.mp3
index 5ce6bee6..7e4bf200 100644
Binary files a/entry/src/main/resources/rawfile/voice/7_03.mp3 and b/entry/src/main/resources/rawfile/voice/7_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/7_101.mp3 b/entry/src/main/resources/rawfile/voice/7_101.mp3
index 7f325c80..1cc773c4 100644
Binary files a/entry/src/main/resources/rawfile/voice/7_101.mp3 and b/entry/src/main/resources/rawfile/voice/7_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/7_102.mp3 b/entry/src/main/resources/rawfile/voice/7_102.mp3
index a63018cc..323f4658 100644
Binary files a/entry/src/main/resources/rawfile/voice/7_102.mp3 and b/entry/src/main/resources/rawfile/voice/7_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/88888.mp3 b/entry/src/main/resources/rawfile/voice/88888.mp3
index fff19183..fa307f2d 100644
Binary files a/entry/src/main/resources/rawfile/voice/88888.mp3 and b/entry/src/main/resources/rawfile/voice/88888.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/8_01.mp3 b/entry/src/main/resources/rawfile/voice/8_01.mp3
index 7f325c80..1cc773c4 100644
Binary files a/entry/src/main/resources/rawfile/voice/8_01.mp3 and b/entry/src/main/resources/rawfile/voice/8_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/8_02.mp3 b/entry/src/main/resources/rawfile/voice/8_02.mp3
index d686c1b8..3cb98991 100644
Binary files a/entry/src/main/resources/rawfile/voice/8_02.mp3 and b/entry/src/main/resources/rawfile/voice/8_02.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/8_03.mp3 b/entry/src/main/resources/rawfile/voice/8_03.mp3
index 5ce6bee6..7e4bf200 100644
Binary files a/entry/src/main/resources/rawfile/voice/8_03.mp3 and b/entry/src/main/resources/rawfile/voice/8_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/8_101.mp3 b/entry/src/main/resources/rawfile/voice/8_101.mp3
index 0706dced..95e15918 100644
Binary files a/entry/src/main/resources/rawfile/voice/8_101.mp3 and b/entry/src/main/resources/rawfile/voice/8_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/8_102.mp3 b/entry/src/main/resources/rawfile/voice/8_102.mp3
index 5ce6bee6..7e4bf200 100644
Binary files a/entry/src/main/resources/rawfile/voice/8_102.mp3 and b/entry/src/main/resources/rawfile/voice/8_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/9_01.mp3 b/entry/src/main/resources/rawfile/voice/9_01.mp3
index 20335c9e..967c848d 100644
Binary files a/entry/src/main/resources/rawfile/voice/9_01.mp3 and b/entry/src/main/resources/rawfile/voice/9_01.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/9_03.mp3 b/entry/src/main/resources/rawfile/voice/9_03.mp3
index bd009f1e..a5eb2a8a 100644
Binary files a/entry/src/main/resources/rawfile/voice/9_03.mp3 and b/entry/src/main/resources/rawfile/voice/9_03.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/9_101.mp3 b/entry/src/main/resources/rawfile/voice/9_101.mp3
index 53032dab..c86eac58 100644
Binary files a/entry/src/main/resources/rawfile/voice/9_101.mp3 and b/entry/src/main/resources/rawfile/voice/9_101.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/9_102.mp3 b/entry/src/main/resources/rawfile/voice/9_102.mp3
index 700a5843..4d29f833 100644
Binary files a/entry/src/main/resources/rawfile/voice/9_102.mp3 and b/entry/src/main/resources/rawfile/voice/9_102.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/9_103.mp3 b/entry/src/main/resources/rawfile/voice/9_103.mp3
index bd009f1e..a5eb2a8a 100644
Binary files a/entry/src/main/resources/rawfile/voice/9_103.mp3 and b/entry/src/main/resources/rawfile/voice/9_103.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/PLCError.mp3 b/entry/src/main/resources/rawfile/voice/PLCError.mp3
index 0da945b8..9ba68703 100644
Binary files a/entry/src/main/resources/rawfile/voice/PLCError.mp3 and b/entry/src/main/resources/rawfile/voice/PLCError.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/auth.mp3 b/entry/src/main/resources/rawfile/voice/auth.mp3
index 3f61be0e..bcee0f0b 100644
Binary files a/entry/src/main/resources/rawfile/voice/auth.mp3 and b/entry/src/main/resources/rawfile/voice/auth.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/auth_fail.mp3 b/entry/src/main/resources/rawfile/voice/auth_fail.mp3
index efed73f6..af7756f3 100644
Binary files a/entry/src/main/resources/rawfile/voice/auth_fail.mp3 and b/entry/src/main/resources/rawfile/voice/auth_fail.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/auth_no_pass.mp3 b/entry/src/main/resources/rawfile/voice/auth_no_pass.mp3
index b0283145..f6108a87 100644
Binary files a/entry/src/main/resources/rawfile/voice/auth_no_pass.mp3 and b/entry/src/main/resources/rawfile/voice/auth_no_pass.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/auth_pass.mp3 b/entry/src/main/resources/rawfile/voice/auth_pass.mp3
index 2e2024e7..d5cb33ba 100644
Binary files a/entry/src/main/resources/rawfile/voice/auth_pass.mp3 and b/entry/src/main/resources/rawfile/voice/auth_pass.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/auth_success.mp3 b/entry/src/main/resources/rawfile/voice/auth_success.mp3
index 194d9a63..9705fc1e 100644
Binary files a/entry/src/main/resources/rawfile/voice/auth_success.mp3 and b/entry/src/main/resources/rawfile/voice/auth_success.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/empty.mp3 b/entry/src/main/resources/rawfile/voice/empty.mp3
index 15989548..66de10a0 100644
Binary files a/entry/src/main/resources/rawfile/voice/empty.mp3 and b/entry/src/main/resources/rawfile/voice/empty.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/errorStart.mp3 b/entry/src/main/resources/rawfile/voice/errorStart.mp3
index 9cbe9ddf..10e467c8 100644
Binary files a/entry/src/main/resources/rawfile/voice/errorStart.mp3 and b/entry/src/main/resources/rawfile/voice/errorStart.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/exam_no_pass.mp3 b/entry/src/main/resources/rawfile/voice/exam_no_pass.mp3
index 3e72f1f7..1caf3c82 100644
Binary files a/entry/src/main/resources/rawfile/voice/exam_no_pass.mp3 and b/entry/src/main/resources/rawfile/voice/exam_no_pass.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/exam_no_pass_finish.mp3 b/entry/src/main/resources/rawfile/voice/exam_no_pass_finish.mp3
index 744c8c9f..7c3ba16c 100644
Binary files a/entry/src/main/resources/rawfile/voice/exam_no_pass_finish.mp3 and b/entry/src/main/resources/rawfile/voice/exam_no_pass_finish.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/exam_pass.mp3 b/entry/src/main/resources/rawfile/voice/exam_pass.mp3
index 075597ae..cafeec8e 100644
Binary files a/entry/src/main/resources/rawfile/voice/exam_pass.mp3 and b/entry/src/main/resources/rawfile/voice/exam_pass.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/exam_waiting.mp3 b/entry/src/main/resources/rawfile/voice/exam_waiting.mp3
index a47ffd04..2b155c51 100644
Binary files a/entry/src/main/resources/rawfile/voice/exam_waiting.mp3 and b/entry/src/main/resources/rawfile/voice/exam_waiting.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/face.mp3 b/entry/src/main/resources/rawfile/voice/face.mp3
index 6342c5fe..35ce3e7c 100644
Binary files a/entry/src/main/resources/rawfile/voice/face.mp3 and b/entry/src/main/resources/rawfile/voice/face.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/face_check.mp3 b/entry/src/main/resources/rawfile/voice/face_check.mp3
index 6342c5fe..35ce3e7c 100644
Binary files a/entry/src/main/resources/rawfile/voice/face_check.mp3 and b/entry/src/main/resources/rawfile/voice/face_check.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/face_fail.mp3 b/entry/src/main/resources/rawfile/voice/face_fail.mp3
index 64c8d828..6a5dd905 100644
Binary files a/entry/src/main/resources/rawfile/voice/face_fail.mp3 and b/entry/src/main/resources/rawfile/voice/face_fail.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/face_faile_wait.mp3 b/entry/src/main/resources/rawfile/voice/face_faile_wait.mp3
index 78a19189..8e8973e7 100644
Binary files a/entry/src/main/resources/rawfile/voice/face_faile_wait.mp3 and b/entry/src/main/resources/rawfile/voice/face_faile_wait.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/face_success.mp3 b/entry/src/main/resources/rawfile/voice/face_success.mp3
index 7bcf2cb8..8a18e5ff 100644
Binary files a/entry/src/main/resources/rawfile/voice/face_success.mp3 and b/entry/src/main/resources/rawfile/voice/face_success.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/failed1.mp3 b/entry/src/main/resources/rawfile/voice/failed1.mp3
index 6174dc11..7347ef9b 100644
Binary files a/entry/src/main/resources/rawfile/voice/failed1.mp3 and b/entry/src/main/resources/rawfile/voice/failed1.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/fscts.mp3 b/entry/src/main/resources/rawfile/voice/fscts.mp3
index 7e09708d..4d239c63 100644
Binary files a/entry/src/main/resources/rawfile/voice/fscts.mp3 and b/entry/src/main/resources/rawfile/voice/fscts.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/full_aqd_tips.mp3 b/entry/src/main/resources/rawfile/voice/full_aqd_tips.mp3
index f1e5b281..a7fa5564 100644
Binary files a/entry/src/main/resources/rawfile/voice/full_aqd_tips.mp3 and b/entry/src/main/resources/rawfile/voice/full_aqd_tips.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/full_cm_tips.mp3 b/entry/src/main/resources/rawfile/voice/full_cm_tips.mp3
index 54ab62bb..d42a3b52 100644
Binary files a/entry/src/main/resources/rawfile/voice/full_cm_tips.mp3 and b/entry/src/main/resources/rawfile/voice/full_cm_tips.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/full_dh_tips.mp3 b/entry/src/main/resources/rawfile/voice/full_dh_tips.mp3
index 473a52f3..901e215e 100644
Binary files a/entry/src/main/resources/rawfile/voice/full_dh_tips.mp3 and b/entry/src/main/resources/rawfile/voice/full_dh_tips.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/full_gd_tips.mp3 b/entry/src/main/resources/rawfile/voice/full_gd_tips.mp3
index 50f6ee16..e5b1f948 100644
Binary files a/entry/src/main/resources/rawfile/voice/full_gd_tips.mp3 and b/entry/src/main/resources/rawfile/voice/full_gd_tips.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/full_ss_tips.mp3 b/entry/src/main/resources/rawfile/voice/full_ss_tips.mp3
index cac45aec..e7857d47 100644
Binary files a/entry/src/main/resources/rawfile/voice/full_ss_tips.mp3 and b/entry/src/main/resources/rawfile/voice/full_ss_tips.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/kfdesc.mp3 b/entry/src/main/resources/rawfile/voice/kfdesc.mp3
index 72a898a1..48f674ab 100644
Binary files a/entry/src/main/resources/rawfile/voice/kfdesc.mp3 and b/entry/src/main/resources/rawfile/voice/kfdesc.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/ksjs.mp3 b/entry/src/main/resources/rawfile/voice/ksjs.mp3
index 2467544d..8ce852d1 100644
Binary files a/entry/src/main/resources/rawfile/voice/ksjs.mp3 and b/entry/src/main/resources/rawfile/voice/ksjs.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/ksks.WAV b/entry/src/main/resources/rawfile/voice/ksks.WAV
index da1df426..61bb0d98 100644
Binary files a/entry/src/main/resources/rawfile/voice/ksks.WAV and b/entry/src/main/resources/rawfile/voice/ksks.WAV differ
diff --git a/entry/src/main/resources/rawfile/voice/line1.mp3 b/entry/src/main/resources/rawfile/voice/line1.mp3
index 9701a4b4..42005a8f 100644
Binary files a/entry/src/main/resources/rawfile/voice/line1.mp3 and b/entry/src/main/resources/rawfile/voice/line1.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/line2.mp3 b/entry/src/main/resources/rawfile/voice/line2.mp3
index 48607a31..165ae7a0 100644
Binary files a/entry/src/main/resources/rawfile/voice/line2.mp3 and b/entry/src/main/resources/rawfile/voice/line2.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/line3.mp3 b/entry/src/main/resources/rawfile/voice/line3.mp3
index 5267ea2e..1884d066 100644
Binary files a/entry/src/main/resources/rawfile/voice/line3.mp3 and b/entry/src/main/resources/rawfile/voice/line3.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/line4.mp3 b/entry/src/main/resources/rawfile/voice/line4.mp3
index 295909e8..beaaa788 100644
Binary files a/entry/src/main/resources/rawfile/voice/line4.mp3 and b/entry/src/main/resources/rawfile/voice/line4.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/line5.mp3 b/entry/src/main/resources/rawfile/voice/line5.mp3
index fad66169..29292d6e 100644
Binary files a/entry/src/main/resources/rawfile/voice/line5.mp3 and b/entry/src/main/resources/rawfile/voice/line5.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/line6.mp3 b/entry/src/main/resources/rawfile/voice/line6.mp3
index 373fd077..92d9443e 100644
Binary files a/entry/src/main/resources/rawfile/voice/line6.mp3 and b/entry/src/main/resources/rawfile/voice/line6.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/mark_10.mp3 b/entry/src/main/resources/rawfile/voice/mark_10.mp3
index dddf086f..d7698c52 100644
Binary files a/entry/src/main/resources/rawfile/voice/mark_10.mp3 and b/entry/src/main/resources/rawfile/voice/mark_10.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/mark_100.mp3 b/entry/src/main/resources/rawfile/voice/mark_100.mp3
index f45c3c74..858f2dd3 100644
Binary files a/entry/src/main/resources/rawfile/voice/mark_100.mp3 and b/entry/src/main/resources/rawfile/voice/mark_100.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/mark_5.mp3 b/entry/src/main/resources/rawfile/voice/mark_5.mp3
index 8314d070..946777b4 100644
Binary files a/entry/src/main/resources/rawfile/voice/mark_5.mp3 and b/entry/src/main/resources/rawfile/voice/mark_5.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/mark_tips.mp3 b/entry/src/main/resources/rawfile/voice/mark_tips.mp3
index f91c0ba7..5523632e 100644
Binary files a/entry/src/main/resources/rawfile/voice/mark_tips.mp3 and b/entry/src/main/resources/rawfile/voice/mark_tips.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/mnyj.mp3 b/entry/src/main/resources/rawfile/voice/mnyj.mp3
index dcb39014..03dfe36b 100644
Binary files a/entry/src/main/resources/rawfile/voice/mnyj.mp3 and b/entry/src/main/resources/rawfile/voice/mnyj.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/no_pass.mp3 b/entry/src/main/resources/rawfile/voice/no_pass.mp3
index 0466cbe9..322ef85d 100644
Binary files a/entry/src/main/resources/rawfile/voice/no_pass.mp3 and b/entry/src/main/resources/rawfile/voice/no_pass.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/pass.mp3 b/entry/src/main/resources/rawfile/voice/pass.mp3
index 8574f33a..7f5395ab 100644
Binary files a/entry/src/main/resources/rawfile/voice/pass.mp3 and b/entry/src/main/resources/rawfile/voice/pass.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/pull_fs.mp3 b/entry/src/main/resources/rawfile/voice/pull_fs.mp3
index 8e81217c..90456c77 100644
Binary files a/entry/src/main/resources/rawfile/voice/pull_fs.mp3 and b/entry/src/main/resources/rawfile/voice/pull_fs.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/push_fs.mp3 b/entry/src/main/resources/rawfile/voice/push_fs.mp3
index cd5c7478..e7db54ea 100644
Binary files a/entry/src/main/resources/rawfile/voice/push_fs.mp3 and b/entry/src/main/resources/rawfile/voice/push_fs.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/pzcg.mp3 b/entry/src/main/resources/rawfile/voice/pzcg.mp3
index 075d3beb..5ea23635 100644
Binary files a/entry/src/main/resources/rawfile/voice/pzcg.mp3 and b/entry/src/main/resources/rawfile/voice/pzcg.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/qkgzhpp.mp3 b/entry/src/main/resources/rawfile/voice/qkgzhpp.mp3
index d1d740ad..5ad418b7 100644
Binary files a/entry/src/main/resources/rawfile/voice/qkgzhpp.mp3 and b/entry/src/main/resources/rawfile/voice/qkgzhpp.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/qualified.mp3 b/entry/src/main/resources/rawfile/voice/qualified.mp3
index 3aab8427..481d720c 100644
Binary files a/entry/src/main/resources/rawfile/voice/qualified.mp3 and b/entry/src/main/resources/rawfile/voice/qualified.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/start.mp3 b/entry/src/main/resources/rawfile/voice/start.mp3
index 4d55458f..f0c7fa1f 100644
Binary files a/entry/src/main/resources/rawfile/voice/start.mp3 and b/entry/src/main/resources/rawfile/voice/start.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/take_phone.mp3 b/entry/src/main/resources/rawfile/voice/take_phone.mp3
index 9a83cf4b..0633039a 100644
Binary files a/entry/src/main/resources/rawfile/voice/take_phone.mp3 and b/entry/src/main/resources/rawfile/voice/take_phone.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/take_photo_tips.mp3 b/entry/src/main/resources/rawfile/voice/take_photo_tips.mp3
index ff048471..bd5df508 100644
Binary files a/entry/src/main/resources/rawfile/voice/take_photo_tips.mp3 and b/entry/src/main/resources/rawfile/voice/take_photo_tips.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/ts_fdj.mp3 b/entry/src/main/resources/rawfile/voice/ts_fdj.mp3
index 6fa422b7..3f20fb62 100644
Binary files a/entry/src/main/resources/rawfile/voice/ts_fdj.mp3 and b/entry/src/main/resources/rawfile/voice/ts_fdj.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/ts_fdj2.mp3 b/entry/src/main/resources/rawfile/voice/ts_fdj2.mp3
index 60e6a465..e96bc6b0 100644
Binary files a/entry/src/main/resources/rawfile/voice/ts_fdj2.mp3 and b/entry/src/main/resources/rawfile/voice/ts_fdj2.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/ts_gbcm.mp3 b/entry/src/main/resources/rawfile/voice/ts_gbcm.mp3
index bded5676..4001ea78 100644
Binary files a/entry/src/main/resources/rawfile/voice/ts_gbcm.mp3 and b/entry/src/main/resources/rawfile/voice/ts_gbcm.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/unqualified.mp3 b/entry/src/main/resources/rawfile/voice/unqualified.mp3
index 3419a030..2ae95c16 100644
Binary files a/entry/src/main/resources/rawfile/voice/unqualified.mp3 and b/entry/src/main/resources/rawfile/voice/unqualified.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/unqualified_one.wav b/entry/src/main/resources/rawfile/voice/unqualified_one.wav
index c243b7da..75da7b74 100644
Binary files a/entry/src/main/resources/rawfile/voice/unqualified_one.wav and b/entry/src/main/resources/rawfile/voice/unqualified_one.wav differ
diff --git a/entry/src/main/resources/rawfile/voice/unqualified_two.wav b/entry/src/main/resources/rawfile/voice/unqualified_two.wav
index 5a245754..af88f959 100644
Binary files a/entry/src/main/resources/rawfile/voice/unqualified_two.wav and b/entry/src/main/resources/rawfile/voice/unqualified_two.wav differ
diff --git a/entry/src/main/resources/rawfile/voice/welcome.mp3 b/entry/src/main/resources/rawfile/voice/welcome.mp3
index e7d9c0c1..f12d1602 100644
Binary files a/entry/src/main/resources/rawfile/voice/welcome.mp3 and b/entry/src/main/resources/rawfile/voice/welcome.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/welcome.wav b/entry/src/main/resources/rawfile/voice/welcome.wav
index 1e4ec172..38f42721 100644
Binary files a/entry/src/main/resources/rawfile/voice/welcome.wav and b/entry/src/main/resources/rawfile/voice/welcome.wav differ
diff --git a/entry/src/main/resources/rawfile/voice/上车准备.mp3 b/entry/src/main/resources/rawfile/voice/上车准备.mp3
index 06ba6173..934efef5 100644
Binary files a/entry/src/main/resources/rawfile/voice/上车准备.mp3 and b/entry/src/main/resources/rawfile/voice/上车准备.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/关门.mp3 b/entry/src/main/resources/rawfile/voice/关门.mp3
index c3bb9872..c8f58f11 100644
Binary files a/entry/src/main/resources/rawfile/voice/关门.mp3 and b/entry/src/main/resources/rawfile/voice/关门.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/咚咚.mp3 b/entry/src/main/resources/rawfile/voice/咚咚.mp3
index 7d044aa8..0c55c2ba 100644
Binary files a/entry/src/main/resources/rawfile/voice/咚咚.mp3 and b/entry/src/main/resources/rawfile/voice/咚咚.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/喀嚓.mp3 b/entry/src/main/resources/rawfile/voice/喀嚓.mp3
index b7a5dc11..72842888 100644
Binary files a/entry/src/main/resources/rawfile/voice/喀嚓.mp3 and b/entry/src/main/resources/rawfile/voice/喀嚓.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/差分状态异常.mp3 b/entry/src/main/resources/rawfile/voice/差分状态异常.mp3
new file mode 100644
index 00000000..2703eca9
Binary files /dev/null and b/entry/src/main/resources/rawfile/voice/差分状态异常.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/差分状态异常.wav b/entry/src/main/resources/rawfile/voice/差分状态异常.wav
new file mode 100644
index 00000000..3a2b1ca5
Binary files /dev/null and b/entry/src/main/resources/rawfile/voice/差分状态异常.wav differ
diff --git a/entry/src/main/resources/rawfile/voice/开始自检.mp3 b/entry/src/main/resources/rawfile/voice/开始自检.mp3
index 9155b447..369dc027 100644
Binary files a/entry/src/main/resources/rawfile/voice/开始自检.mp3 and b/entry/src/main/resources/rawfile/voice/开始自检.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/点火.mp3 b/entry/src/main/resources/rawfile/voice/点火.mp3
index 3aabd10d..3d011308 100644
Binary files a/entry/src/main/resources/rawfile/voice/点火.mp3 and b/entry/src/main/resources/rawfile/voice/点火.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/熄火.mp3 b/entry/src/main/resources/rawfile/voice/熄火.mp3
index 8c431d88..4a98d76f 100644
Binary files a/entry/src/main/resources/rawfile/voice/熄火.mp3 and b/entry/src/main/resources/rawfile/voice/熄火.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/监管失败.mp3 b/entry/src/main/resources/rawfile/voice/监管失败.mp3
index 257d6dee..62b18903 100644
Binary files a/entry/src/main/resources/rawfile/voice/监管失败.mp3 and b/entry/src/main/resources/rawfile/voice/监管失败.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/监管审核未通过.mp3 b/entry/src/main/resources/rawfile/voice/监管审核未通过.mp3
index 0cfc41aa..bce280bd 100644
Binary files a/entry/src/main/resources/rawfile/voice/监管审核未通过.mp3 and b/entry/src/main/resources/rawfile/voice/监管审核未通过.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/监管成功.mp3 b/entry/src/main/resources/rawfile/voice/监管成功.mp3
index d9a252d4..0325a7a7 100644
Binary files a/entry/src/main/resources/rawfile/voice/监管成功.mp3 and b/entry/src/main/resources/rawfile/voice/监管成功.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/监管通信中.mp3 b/entry/src/main/resources/rawfile/voice/监管通信中.mp3
index 6e355d24..f74796f9 100644
Binary files a/entry/src/main/resources/rawfile/voice/监管通信中.mp3 and b/entry/src/main/resources/rawfile/voice/监管通信中.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/看镜头.mp3 b/entry/src/main/resources/rawfile/voice/看镜头.mp3
index ff048471..5d2a4aaf 100644
Binary files a/entry/src/main/resources/rawfile/voice/看镜头.mp3 and b/entry/src/main/resources/rawfile/voice/看镜头.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/等待监管认证.mp3 b/entry/src/main/resources/rawfile/voice/等待监管认证.mp3
index c7495a48..6bae0b84 100644
Binary files a/entry/src/main/resources/rawfile/voice/等待监管认证.mp3 and b/entry/src/main/resources/rawfile/voice/等待监管认证.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/综合评判.mp3 b/entry/src/main/resources/rawfile/voice/综合评判.mp3
index 391f84d8..f49a6c82 100644
Binary files a/entry/src/main/resources/rawfile/voice/综合评判.mp3 and b/entry/src/main/resources/rawfile/voice/综合评判.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/考试结束.mp3 b/entry/src/main/resources/rawfile/voice/考试结束.mp3
index 4a8417ba..37a9582d 100644
Binary files a/entry/src/main/resources/rawfile/voice/考试结束.mp3 and b/entry/src/main/resources/rawfile/voice/考试结束.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/自检未通过.mp3 b/entry/src/main/resources/rawfile/voice/自检未通过.mp3
index 90e39487..f435346d 100644
Binary files a/entry/src/main/resources/rawfile/voice/自检未通过.mp3 and b/entry/src/main/resources/rawfile/voice/自检未通过.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/自检通过.mp3 b/entry/src/main/resources/rawfile/voice/自检通过.mp3
index 734245e9..94f00e53 100644
Binary files a/entry/src/main/resources/rawfile/voice/自检通过.mp3 and b/entry/src/main/resources/rawfile/voice/自检通过.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/请关闭远近光灯.mp3 b/entry/src/main/resources/rawfile/voice/请关闭远近光灯.mp3
index e8908dcb..f0f4ebba 100644
Binary files a/entry/src/main/resources/rawfile/voice/请关闭远近光灯.mp3 and b/entry/src/main/resources/rawfile/voice/请关闭远近光灯.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/请拉手刹.mp3 b/entry/src/main/resources/rawfile/voice/请拉手刹.mp3
index 55b6ef25..b10d9b68 100644
Binary files a/entry/src/main/resources/rawfile/voice/请拉手刹.mp3 and b/entry/src/main/resources/rawfile/voice/请拉手刹.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/请置空档.mp3 b/entry/src/main/resources/rawfile/voice/请置空档.mp3
index f881f30d..b002763e 100644
Binary files a/entry/src/main/resources/rawfile/voice/请置空档.mp3 and b/entry/src/main/resources/rawfile/voice/请置空档.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/请解开安全带.mp3 b/entry/src/main/resources/rawfile/voice/请解开安全带.mp3
index 1e42f948..7ed312cd 100644
Binary files a/entry/src/main/resources/rawfile/voice/请解开安全带.mp3 and b/entry/src/main/resources/rawfile/voice/请解开安全带.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/验证失败.mp3 b/entry/src/main/resources/rawfile/voice/验证失败.mp3
index a8ec8f38..a392a739 100644
Binary files a/entry/src/main/resources/rawfile/voice/验证失败.mp3 and b/entry/src/main/resources/rawfile/voice/验证失败.mp3 differ
diff --git a/entry/src/main/resources/rawfile/voice/验证成功.mp3 b/entry/src/main/resources/rawfile/voice/验证成功.mp3
index 35ed95ac..1f8fa85a 100644
Binary files a/entry/src/main/resources/rawfile/voice/验证成功.mp3 and b/entry/src/main/resources/rawfile/voice/验证成功.mp3 differ