Z991239-5317 #comment 兼容旧运行时文件采用新方案进行优化

Signed-Off-By: commit-hook

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -1210,7 +1210,7 @@ ErrorCodeEnum CCardIssuerFSM::OnInit()
 				//先删再拷贝
 				if (RemoveFileA(runinfoNewFile.GetData())) {
 					if (CopyFileA(runinfoOldFile.GetData(), runinfoNewFile.GetData(), FALSE)) {
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Recopy old CardIssuer.ini succ");
+						LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_CopyRuncfg, "Recopy old CardIssuer.ini succ");
 						spConfig->WriteConfigValueInt("all", "enterMainPage", 1);//写入初值
 					}
 					else {
@@ -1246,7 +1246,7 @@ ErrorCodeEnum CCardIssuerFSM::OnInit()
 			//新不在，旧在，拷贝，附初值
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuerStand.ini is not Exist. CardIssuer.ini is Exist");
 			if (CopyFileA(runinfoOldFile.GetData(), runinfoNewFile.GetData(), FALSE)) {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("copy old CardIssuer.ini succ.");
+				LogWarn(Severity_Low, Error_Unexpect, CardIssuer_UserErrorCode_CopyRuncfg, "copy old CardIssuer.ini succ.");
 				spConfig->WriteConfigValueInt("all", "enterMainPage", 1);//写入初值
 			}
 			else {

Module/mod_CardIssuerStand/CardIssuer_UserErrorCode.h

@@ -210,4 +210,5 @@
 #define CardIssuer_UserErrorCode_KakuPanKu_MoveCardToSlot_Failed				(CardIssuer_UserErrorCode_Start + 202)	//卡库盘库失败，卡移回卡槽失败
 
 #define CardIssuer_UserErrorCode_EnterMainPage_SetFlag		0x20300300 //卡机进入首页设置运行时标志位
+#define CardIssuer_UserErrorCode_CopyRuncfg					0x20300301 //卡机拷贝旧运行时文件
 #endif //_CARDISSUERSTAND_USER_ERRORCODE_H

Module/mod_cardissuerstore/CardIssuerFSM.cpp

@@ -1207,7 +1207,7 @@ ErrorCodeEnum CCardIssuerFSM::OnInit()
 				//先删再拷贝
 				if (RemoveFileA(runinfoNewFile.GetData())) {
 					if (CopyFileA(runinfoOldFile.GetData(), runinfoNewFile.GetData(), FALSE)) {
-						DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("Recopy old CardIssuer.ini succ");
+						LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_CopyRuncfg, "Recopy old CardIssuer.ini succ");
 						spConfig->WriteConfigValueInt("all", "enterMainPage", 1);//写入初值
 					}
 					else {
@@ -1243,7 +1243,7 @@ ErrorCodeEnum CCardIssuerFSM::OnInit()
 			//新不在，旧在，拷贝，附初值
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("CardIssuerStore.ini is not Exist. CardIssuer.ini is Exist");
 			if (CopyFileA(runinfoOldFile.GetData(), runinfoNewFile.GetData(), FALSE)) {
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("copy old CardIssuer.ini succ.");
+				LogWarn(Severity_Low, Error_Unexpect, CardIssuerStore_UserErrorCode_CopyRuncfg, "copy old CardIssuer.ini succ.");
 				spConfig->WriteConfigValueInt("all", "enterMainPage", 1);//写入初值
 			}
 			else {

Module/mod_cardissuerstore/CardIssuerStore_UserErrorCode.h

@@ -209,5 +209,6 @@
 #define CardIssuerStore_UserErrorCode_KakuPanKu_ReadAccount_Failed					(CardIssuerStore_UserErrorCode_Start + 201)	//卡库盘库失败，读卡失败吞卡
 #define CardIssuerStore_UserErrorCode_KakuPanKu_MoveCardToSlot_Failed				(CardIssuerStore_UserErrorCode_Start + 202)	//卡库盘库失败，卡移回卡槽失败
 
-#define CardIssuerStore_UserErrorCode_EnterMainPage_SetFlag		0x22000300 //卡机进入首页设置运行时标志位
+#define CardIssuerStore_UserErrorCode_EnterMainPage_SetFlag		0x22000300 //卡库进入首页设置运行时标志位
+#define CardIssuerStore_UserErrorCode_CopyRuncfg				0x22000301 //卡库拷贝旧运行时文件
 #endif //_CARDISSUERSTORE_USER_ERRORCODE_H