Merge branch 'ST2' into T24KY641_ResPadOffline_CJL_0704

Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp

@@ -1606,7 +1606,7 @@ void ResourceWatcherFSM::DetectAutoStartupCover()
     ErrorCodeEnum rc = Error_InvalidState;
     const int setType = InitialAutoStartupSetType();
     bool toCheckAndDelteAutostartFile(false);
-    DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("current startup type:%d, aim start type:%d", nStartupType, setType);
+    DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("current startup type:%d, aim start type:%d", nStartupType, setType);
     switch (setType)
     {
     case 1://将VBS改成EXE，前提是VBS必须已在注册表
@@ -1614,7 +1614,7 @@ void ResourceWatcherFSM::DetectAutoStartupCover()
             rc = ChangeAutoStartupWithExe();
         }
         break;
-    case 2: //设置使用EXE自启动
+    case 2: //设置使用EXE注册表自启动
 		if (nStartupType == 1 || nStartupType == 0 || nStartupType == 3) {
 			rc = ChangeAutoStartupWithExe();
 			if (rc == Error_Succeed && nStartupType == 3) {
@@ -1622,6 +1622,14 @@ void ResourceWatcherFSM::DetectAutoStartupCover()
 			}
         }
         break;
+	case 5: //设置使用EXE注册表自启动（涵盖所有类型）
+		if (nStartupType == 1 || nStartupType == 0 || nStartupType == 3 || nStartupType == 4) {
+			rc = ChangeAutoStartupWithExe();
+			if (rc == Error_Succeed && (nStartupType == 3 || nStartupType == 4)) {
+				toCheckAndDelteAutostartFile = true;
+			}
+		}
+		break;
     case 3: //不设置开机自启动
 		if (nStartupType == 1 || nStartupType == 2) {
 			rc = ChangeAutoStartupWithExe(false, true);
@@ -1635,14 +1643,6 @@ void ResourceWatcherFSM::DetectAutoStartupCover()
 			rc = ChangeAutoStartupWithExe(true);
 		}
         break;
-	case 5: //设置使用EXE自启动（涵盖所有类型）
-		if (nStartupType == 1 || nStartupType == 0 || nStartupType == 3 || nStartupType == 4) {
-			rc = ChangeAutoStartupWithExe();
-			if (rc == Error_Succeed && (nStartupType == 3 || nStartupType == 4)) {
-				toCheckAndDelteAutostartFile = true;
-			}
-		}
-		break;
     default:
         break;
     }
@@ -1651,8 +1651,13 @@ void ResourceWatcherFSM::DetectAutoStartupCover()
 		CSimpleStringA strLnkPath(true);
         bool scriptTypeOrNot;
 		if (IsHasSetAutoStartupByFolder(strLnkPath, scriptTypeOrNot) && !strLnkPath.IsNullOrEmpty()) {
-			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("remove auto start lnk file: %s", strLnkPath.GetData());
-			RemoveFileA(strLnkPath);
+			BOOL rmRet = RemoveFileA(strLnkPath);
+            if (!rmRet && ExistsFileA(strLnkPath)) {
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("remove auto start lnk file failed: %s, GLE=%u", strLnkPath.GetData(), GetLastError());
+            }
+            else {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("remove auto start lnk file: %s", strLnkPath.GetData());
+            }
 		}
     }
 }

Module/mod_accessauth/mod_AccessAuth.cpp

@@ -1638,14 +1638,7 @@ void CAccessAuthEntity::EndInitMK(DWORD rc, const char *pszErrMsg)
 	if (m_ctx != NULL) {
 		m_ctx->Ans.Errcode = rc;
 		m_ctx->Ans.ErrMsg = m_strLastErrMsg;
-		if (rc != Error_Succeed)
-		{
-			m_ctx->Answer(Error_Unexpect, rc);
-		}
-		else
-		{
-			m_ctx->Answer(Error_Succeed);
-		}
+		m_ctx->Answer(Error_Succeed);
 	}
 
 }

Module/mod_vtmloader/VtmLoaderFSM.cpp

@@ -1888,7 +1888,7 @@ int CVtmLoaderFSM::HttpConnCheck(CSimpleStringA csHttAddr, HttpAddrType eType)
 					, httpcheckCount, csHttAddr.GetData(), (SP::Module::Comm::RVCGetTickCount() - beginTick)/1000).GetData());
 				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setResultCode("RTA1F07")("尝试连接总行服务成功,但是网络偏慢");
 			}
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040210F11")("尝试连接总行服务成功(%s)", csHttAddr.GetData());
+			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040210F11")("尝试连接总行服务成功(%s)", csHttAddr.GetData());
 			return 0;
 		}
 	} 

Tool/guardian/guardian.cpp

@@ -330,8 +330,7 @@ bool VersionRollback()
 	verFile.seekg(0,verFile.beg);
 	verFile.write(pVerBak,lenBak);
 
-	LOG4VTM(INFO, "version will rollback to ");
-	LOG4VTM(INFO, pVerBak);
+	LOG4VTM(INFO, "terminal app version will rollback from " << pCurrVer << " to " << pVerBak);
 	verFile.close();
 	verBak.close();
 

addin/hardwarecfg/WIN/root-中钞科堡.ini

@@ -67,8 +67,8 @@ OnlineOnly=1
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
-Version=1
+Vendor=keba
+Version=7
 Batch=1
 Port=0
 

addin/hardwarecfg/WIN/root-凯欣达.ini

@@ -62,7 +62,7 @@ Number=6
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=keba
 Version=1
 Batch=1
 Port=1

addin/hardwarecfg/WIN/root-大机-中钞科堡E1000.ini

@@ -67,7 +67,7 @@ OnlineOnly=1
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=keba
 Version=1
 Batch=1
 Port=0

addin/hardwarecfg/WIN/root-大机-凯欣达295.ini

@@ -62,7 +62,7 @@ Number=6
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=keba
 Version=1
 Batch=1
 Port=1

addin/hardwarecfg/WIN/root-大机-凯欣达KL286.ini

@@ -62,7 +62,7 @@ Number=6
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=keba
 Version=1
 Batch=1
 Port=1

addin/hardwarecfg/WIN/root-大机-凯欣达KL286D.ini

@@ -62,7 +62,7 @@ Number=6
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=keba
 Version=1
 Batch=1
 Port=1

addin/hardwarecfg/WIN/root-大机-晓星BS9000.ini

@@ -62,7 +62,7 @@ Number=6
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=Hyosung
 Version=1
 Batch=1
 Port=1

addin/hardwarecfg/WIN/root-大机-晓星MX9200CM.ini

@@ -62,7 +62,7 @@ Number=6
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=Hyosung
 Version=1
 Batch=1
 Port=1

addin/hardwarecfg/WIN/root-大机-科堡E1000.ini

@@ -67,7 +67,7 @@ OnlineOnly=1
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=keba
 Version=1
 Batch=1
 Port=0

addin/hardwarecfg/WIN/root-晓星一代.ini

@@ -65,7 +65,7 @@ Number=6
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=Hyosung
 Version=1
 Batch=1
 Port=1

addin/hardwarecfg/WIN/root-晓星二代.ini

@@ -66,7 +66,7 @@ OnlineOnly=1
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=Hyosung
 Version=1
 Batch=1
 Port=1

addin/hardwarecfg/WIN/root.RVC.Stand2S.ini

@@ -62,7 +62,7 @@ Number=6
 
 [Device.IDCertificate]
 # parameters such as port 
-Vendor=ChinaVision
+Vendor=keba
 Version=1
 Batch=1
 Port=1

addin/packaging/UOS/Readme.txt

@@ -1,4 +1,7 @@
 不要在桌面保留任何文件！安装过程中会进行清理
 不要在桌面保留任何文件！安装过程中会进行清理
 不要在桌面保留任何文件！安装过程中会进行清理
-请用命令行窗口执行‘bash ./install.sh’进行应用版本安装和拷贝
+
+请用命令行窗口执行‘bash ./install.sh’进行应用版本安装和拷贝
+
+该安装脚本会完成桌面壁纸设置、开机免密自动登录、开机自动运行可视柜台应用程序等功能

addin/packaging/WIN/Readme.txt

@@ -1,4 +1,7 @@
 不要在桌面保留任何文件！安装过程中会进行清理
 不要在桌面保留任何文件！安装过程中会进行清理
 不要在桌面保留任何文件！安装过程中会进行清理
-请直接双击执行 install.bat 进行应用版本安装和拷贝
+
+请直接双击执行 install.bat 进行应用版本安装和拷贝
+
+该安装脚本会完成桌面壁纸设置、开机自动运行可视柜台应用程序等功能（部分系统需要重新操作系统后才生效，请注意检查）