Z991239-6460 #comment 部分结构调整

Framework/RvcLogSdk/log_util.cpp

@@ -146,7 +146,7 @@ void GetUnitedTimeStr(time_t time, char* szTime)
 	);
 }
 
-//TODO: CrossPlaform  相对独立，不用框架库提供的函数进行IP 获取 [Gifur@2025729]
+//相对独立，不用框架库提供的函数进行IP 获取 [Gifur@2025729]
 int GetLocalIP(char* ip_str)
 {
 	

Framework/spbase/SpSecureClient.cpp

@@ -596,7 +596,7 @@ bool SpSecureClient::OnAuthRequestSM(CConnAuthSMReq* pReq)
 	strncpy(info.m_arrTerminalNo, (LPCSTR)si.strTerminalID, sizeof(info.m_arrTerminalNo) - 1);
 	strcpy(info.m_arrServiceType, "CMBRVC");
 	{
-		//TODO: CrossPlaform IP [Gifur@2025730]
+		//TODO: CrossPlaform 框架具备统一支持，但不清楚影响范围（继而无法评估测试范围），未敢轻易改动 [Gifur@2025730]
 #ifdef RVC_OS_LINUX
         char buf[512];
         toolkit_interface_address_t* addr;

Module/include/CommEntityUtil.hpp

@@ -37,6 +37,7 @@
 #include <iostream>
 #include <sstream>
 #include <map>
+#include <cmath>
 #include "SpBase.h"
 #include "publicFunExport.h"
 
@@ -289,6 +290,17 @@ static int Hex2Int(char* s)
 	}
 	return ret;
 }
+*/
+
+inline static int hex2int(const char c)
+{
+	if (c >= '0' && c <= '9') return (c - '0');
+	if (c >= 'A' && c <= 'F') return (c - 'A' + 10);
+	if (c >= 'a' && c <= 'f') return (c - 'a' + 10);
+	return 0xFF;
+}
+
+/*
 
 static void ConvAscii(unsigned char* Hex, char* Ascii, unsigned int len)
 {
@@ -330,15 +342,14 @@ static bool IsNoStr(const char* str)
 }*/
 
 
-inline static int hex2int(const char c)
-{
-	if (c >= '0' && c <= '9') return (c - '0');
-	if (c >= 'A' && c <= 'F') return (c - 'A' + 10);
-	if (c >= 'a' && c <= 'f') return (c - 'a' + 10);
-	return 0xFF;
+inline static int Char2Int(char* ch) {
+	int num = 0;
+	for (int i = 0; i < strlen(ch); i++) {
+		num += ((int)(ch[i] - '0')) * std::pow((float)10, (float)(strlen(ch) - i - 1));
+	}
+	return num;
 }
 
-
 static unsigned char Ch2Hex(char ch)
 {
 	static const char* hex = "0123456789ABCDEF";

Module/mod_ResourceWatcher/mod_ResourceWatcher.cpp

@@ -788,46 +788,6 @@ void ResourceWatcherEntity::ChcekDiskFileSpace()
     }
 }
 
-//TODO: CrossPlaform 采用 toolkit/osutil_terminate_related_process 接口  [Gifur@2025730]
-BOOL ResourceWatcherEntity::KillProcessFromName(const CSimpleStringA& strProcessName)
-{
-
-#if defined(RVC_OS_WIN)
-    //创建进程快照(TH32CS_SNAPPROCESS表示创建所有进程的快照)    
-    HANDLE hSnapShot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-    PROCESSENTRY32 pe;
-    pe.dwSize = sizeof(PROCESSENTRY32);
-    if (!Process32First(hSnapShot, &pe)) {
-        DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("获取进程快照失败。");
-        return FALSE;
-    }
-
-    while (Process32Next(hSnapShot, &pe)) {
-        //pe.szExeFile获取当前进程的可执行文件名称    
-        CSimpleStringA scTmp = pe.szExeFile;
-        if (!scTmp.Compare(strProcessName)) {
-            DWORD dwProcessID = pe.th32ProcessID;
-            HANDLE hProcess = ::OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessID);
-            BOOL killed = ::TerminateProcess(hProcess, 0);
-            CloseHandle(hProcess);
-
-            if (killed) {
-                DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("SUCCESS! Kill process [%s], pid [%d].", strProcessName.GetData(), dwProcessID);
-            }
-            else {
-                DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("FAILED! Kill process [%s], pid [%d].", strProcessName.GetData(), dwProcessID);
-            }
-            return killed;
-        }
-    }
-    return TRUE;
-#else 
-    DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("It's not supported %s", __FUNCTION__);
-    return FALSE;
-#endif //RVC_OS_WIN
-
-}
-
 #endif //RVC_OS_LINUX
 
 #if defined(RVC_OS_LINUX)

Module/mod_ResourceWatcher/mod_ResourceWatcher.h

@@ -281,7 +281,6 @@ private:
 	std::vector<std::string> GetUserNameList(bool bExcludeRoot = false);
 	ErrorCodeEnum RunShellScript(LPCTSTR cmdline);
 	ErrorCodeEnum DeleteUnzipDir();//清理临时解压包文件
-	BOOL KillProcessFromName(const CSimpleStringA& strProcessName);
 	bool is_str_utf8(const char* str);
 	/// <summary>
 	/// 通过集中配置检测指定进程是否存在

Module/mod_SalesRecorder/mod_SalesRecorder.cpp

@@ -107,9 +107,9 @@ static bool rvcMoveFile(const char* strSrcFile, const char* strDstFile)
 	if (NULL == strSrcFile || NULL == strDstFile) {
 		return bRet;
 	}
-	//TODO: CrossPlaform  [Gifur@2025730]
+	//TODO: CrossPlaform WINPR是支持直接跨平台使用 MoveFileA [Gifur@2025730]
 #ifdef RVC_OS_WIN
-	bRet = MoveFile(strSrcFile, strDstFile);
+	bRet = MoveFileA(strSrcFile, strDstFile);
 #else
 	if (0 == rename(strSrcFile, strDstFile)) {
 		bRet = true;

Module/mod_ScannerSet/ScannerSetFSM.cpp

@@ -72,7 +72,6 @@ const char* EvtTypeToString(int nEvtType)
 		return "Unknown EventType";
 		break;
 	}
-	return "Unknown EventType";
 }
 
 static bool MapErrorCode2Level(ErrorCodeEnum ec)

Module/mod_UpgradeMgr/UpgradeTaskFSM.h

@@ -14,12 +14,12 @@
 #define	QUERY_IS_WORK_WARN_LIMIT 10
 using namespace std;
 
-#define WARN_TASK_COPY_FILE_ZERO 0x50620022 //升级copy文件夹文件个数为0
-#define ERR_TASK_QUERY_PRE_NEW_TASK_FAIL 0x50620023 //查询新任务报错
-#define ERR_TASK_QUERY_CONTINUE_NEW_TASK_FAIL 0x50620024 //查询继续新任务报错
-#define ERR_TASK_QUERY_CONTINUE_NEW_TASK_ERR 0x50620025 //查询继续新任务异常
+#define WARN_TASK_COPY_FILE_ZERO 0x50620022 //鍗囩骇copy鏂囦欢澶规枃浠朵釜鏁颁负0
+#define ERR_TASK_QUERY_PRE_NEW_TASK_FAIL 0x50620023 //鏌ヨ�鏂颁换鍔℃姤閿�
+#define ERR_TASK_QUERY_CONTINUE_NEW_TASK_FAIL 0x50620024 //鏌ヨ�缁х画鏂颁换鍔℃姤閿�
+#define ERR_TASK_QUERY_CONTINUE_NEW_TASK_ERR 0x50620025 //鏌ヨ�缁х画鏂颁换鍔″紓甯�
 
-//#define WARN_BLACK_FILE_SUM 0x50600023 //黑名单文件数量
+//#define WARN_BLACK_FILE_SUM 0x50600023 //榛戝悕鍗曟枃浠舵暟閲�
 
 #define UpgradeMgr_VERSION_DOWNLOAD_ID "QLR0402506Z10101"
 #define UpgradeMgr_VERSION_INSTALL_ID "QLR0402506Z10201"
@@ -42,7 +42,7 @@ using namespace std;
 
 namespace HttpStruct
 {
-	//发送文件hash列表接口
+	//鍙戦€佹枃浠秇ash鍒楄〃鎺ュ彛
 	struct SendSM3TaskReq : CHTTPReq {
 		string m_reqStr;
 		string ToJson() {
@@ -57,7 +57,7 @@ namespace HttpStruct
 		}
 	};
 
-	//更新任务状态接口
+	//鏇存柊浠诲姟鐘舵€佹帴鍙�
 	struct UpdateTaskStatusReq : CHTTPReq {
 		string m_reqStr;
 		string ToJson() {
@@ -72,7 +72,7 @@ namespace HttpStruct
 		}
 	};
 
-	//查询当前任务
+	//鏌ヨ�褰撳墠浠诲姟
 	struct QueryCurrTaskReq : CHTTPReq {
 		string m_reqStr;
 		string ToJson() {
@@ -87,7 +87,7 @@ namespace HttpStruct
 		}
 	};
 
-	//查询新任务
+	//鏌ヨ�鏂颁换鍔�
 	struct QueryNewTaskReq : CHTTPReq {
 		string m_reqStr;
 		string ToJson() {
@@ -102,7 +102,7 @@ namespace HttpStruct
 		}
 	};
 
-	//断点下载升级包
+	//鏂�偣涓嬭浇鍗囩骇鍖�
 	struct DownloadPackTaskRet{
 		long content_length;
         long origin_file_length;
@@ -114,7 +114,7 @@ namespace HttpStruct
 
 
 
-// 升级任务状态机
+// 鍗囩骇浠诲姟鐘舵€佹満
 class CUpgradeTaskFSM : public FSMImpl<CUpgradeTaskFSM>, public IFSMStateHooker, public ISysVarListener
 {
 public:
@@ -153,7 +153,7 @@ public:
 
 	struct SendSM3TaskEvent:public FSMEvent
 	{
-		bool isSucc;//是否写入成功
+		bool isSucc;//鏄�惁鍐欏叆鎴愬姛
 		SendSM3TaskEvent(bool isSendSucc) 
 			: FSMEvent(Event_EndSendSM3Task), isSucc(isSendSucc)
 		{}
@@ -162,7 +162,7 @@ public:
 
 	struct UpdateTaskStatusEvent:public FSMEvent
 	{
-		bool isSucc;//是否更新成功
+		bool isSucc;//鏄�惁鏇存柊鎴愬姛
 		UpdateTaskStatusEvent(bool isSendSucc) 
 			: FSMEvent(Event_EndUpdateTask), isSucc(isSendSucc)
 		{}
@@ -170,8 +170,8 @@ public:
 
 	struct QueryCurrTaskEvent:public FSMEvent
 	{
-		bool isSucc;//是否查询成功
-		bool isTask_valid;//任务是否有效
+		bool isSucc;//鏄�惁鏌ヨ�鎴愬姛
+		bool isTask_valid;//浠诲姟鏄�惁鏈夋晥
 		QueryCurrTaskEvent(bool isSendSucc,bool isValid) 
 			: FSMEvent(Event_EndQueryCurrTask), isSucc(isSendSucc),isTask_valid(isValid)
 		{}
@@ -179,7 +179,7 @@ public:
 
 	struct QueryNewTaskEvent:public FSMEvent
 	{
-		bool isSucc;//是否查询成功
+		bool isSucc;//鏄�惁鏌ヨ�鎴愬姛
 		QueryNewTaskEvent(bool isSendSucc) 
 			: FSMEvent(Event_EndPoll), isSucc(isSendSucc)
 		{}
@@ -187,7 +187,7 @@ public:
 
 	struct QueryNewContinueTaskEvent:public FSMEvent
 	{
-		int retParam;//是否查询成功
+		int retParam;//鏄�惁鏌ヨ�鎴愬姛
 		QueryNewContinueTaskEvent(int ret) 
 			: FSMEvent(Event_EndContinuePoll)
 		{
@@ -197,7 +197,7 @@ public:
 
 	struct QueryNewPreTaskEvent:public FSMEvent
 	{
-		bool isSucc;//是否查询成功
+		bool isSucc;//鏄�惁鏌ヨ�鎴愬姛
 		QueryNewPreTaskEvent(bool isSendSucc) 
 			: FSMEvent(Event_EndPrePoll), isSucc(isSendSucc)
 		{}
@@ -205,8 +205,8 @@ public:
 
 	struct QueryTaskStatusEvent:public FSMEvent
 	{
-		bool isSucc;//是否查询成功
-		bool isTask_valid;//任务是否有效
+		bool isSucc;//鏄�惁鏌ヨ�鎴愬姛
+		bool isTask_valid;//浠诲姟鏄�惁鏈夋晥
 		QueryTaskStatusEvent(bool isSendSucc,bool isValid) 
 			: FSMEvent(Event_EndQueryTaskStatus), isSucc(isSendSucc),isTask_valid(isValid)
 		{}
@@ -222,7 +222,7 @@ public:
 
 	struct DownloadPackTaskFailEvent:public FSMEvent
 	{
-		string errMsg;//错误信息
+		string errMsg;//閿欒�淇℃伅
 		DownloadPackTaskFailEvent(string errorMsg) 
 			: FSMEvent(Event_Download_Fail), errMsg(errorMsg)
 		{}
@@ -266,123 +266,123 @@ public:
 
 	struct CInstallStep
 	{
-		//不存储到运行时
-		int stepSeq; //步骤序号
-		CSimpleStringA cmdType;		//升级安装需执行命令类型:Delete、Copy、Run
-		int cmdFail;		//0：执行失败认为升级失败 1：执行失败忽略继续升级
-		CSimpleStringA srcPathType; //0：相对路径 1：绝对路径 2：当前版本相对路径 3：升级包相对路径
+		//涓嶅瓨鍌ㄥ埌杩愯�鏃�
+		int stepSeq; //姝ラ�搴忓彿
+		CSimpleStringA cmdType;		//鍗囩骇瀹夎�闇€鎵ц�鍛戒护绫诲瀷:Delete銆丆opy銆丷un
+		int cmdFail;		//0锛氭墽琛屽け璐ヨ�涓哄崌绾уけ璐� 1锛氭墽琛屽け璐ュ拷鐣ョ户缁�崌绾�
+		CSimpleStringA srcPathType; //0锛氱浉瀵硅矾寰� 1锛氱粷瀵硅矾寰� 2锛氬綋鍓嶇増鏈�浉瀵硅矾寰� 3锛氬崌绾у寘鐩稿�璺�緞
 		CSimpleStringA srcPath;		
-		CSimpleStringA dstPathType;	//0：相对路径 1：绝对路径 2：当前版本相对路径 3：升级版本相对路径 4：升级包相对路径
+		CSimpleStringA dstPathType;	//0锛氱浉瀵硅矾寰� 1锛氱粷瀵硅矾寰� 2锛氬綋鍓嶇増鏈�浉瀵硅矾寰� 3锛氬崌绾х増鏈�浉瀵硅矾寰� 4锛氬崌绾у寘鐩稿�璺�緞
 		CSimpleStringA dstPath;
 	};
 
-	// 待安装任务信息（运行时保存的中间变量）
+	// 寰呭畨瑁呬换鍔′俊鎭�紙杩愯�鏃朵繚瀛樼殑涓�棿鍙橀噺锛�
 	struct CTaskInfo
-	{	//存储到运行时
-		CSimpleStringA upgradeTaskId;	//升级任务编号
-		CSimpleStringA createTaskVersion;//创建升级任务时的版本号
-		CSimpleStringA cPendingState;	// 已下载D、安装中I、等待切换S、任务结果确认T
-		CSimpleStringA NewVersion;		// 任务升级后的版本号
-		CSimpleStringA pack_name;		//升级包名
-		CSimpleStringA task_type;		//任务类型 U:升级任务 R:回退任务
-		CSimpleStringA depNewVersion;    //适配器新版本号
-		//CSimpleStringA task_class;      //任务类别 A:应用版本任务 D:适配器任务 T:体系外任务
-		//不存储到运行时
-		CSimpleStringA pack_version;	//升级包指定的版本号
-		bool stop_media_play;   //停止广告播放（0:不停止 1:停止）
-		int reboot_type;		//重启策略类型（0:不启动 1:重启框架 2:重启系统）
-		CSimpleStringA file_path;       //升级包路径
-		CSimpleStringA download_url;    //升级包下载地址
-		CSimpleStringA pack_hash;		//升级包hash值
-		long pack_length;		//升级包长度(服务端暂时不传)
-
-		queue<CInstallStep*> install_step;//安装步骤队列
+	{	//瀛樺偍鍒拌繍琛屾椂
+		CSimpleStringA upgradeTaskId;	//鍗囩骇浠诲姟缂栧彿
+		CSimpleStringA createTaskVersion;//鍒涘缓鍗囩骇浠诲姟鏃剁殑鐗堟湰鍙�
+		CSimpleStringA cPendingState;	// 宸蹭笅杞紻銆佸畨瑁呬腑I銆佺瓑寰呭垏鎹�銆佷换鍔＄粨鏋滅‘璁�
+		CSimpleStringA NewVersion;		// 浠诲姟鍗囩骇鍚庣殑鐗堟湰鍙�
+		CSimpleStringA pack_name;		//鍗囩骇鍖呭悕
+		CSimpleStringA task_type;		//浠诲姟绫诲瀷 U:鍗囩骇浠诲姟 R:鍥為€€浠诲姟
+		CSimpleStringA depNewVersion;    //閫傞厤鍣ㄦ柊鐗堟湰鍙�
+		//CSimpleStringA task_class;      //浠诲姟绫诲埆 A:搴旂敤鐗堟湰浠诲姟 D:閫傞厤鍣ㄤ换鍔� T:浣撶郴澶栦换鍔�
+		//涓嶅瓨鍌ㄥ埌杩愯�鏃�
+		CSimpleStringA pack_version;	//鍗囩骇鍖呮寚瀹氱殑鐗堟湰鍙�
+		bool stop_media_play;   //鍋滄�骞垮憡鎾�斁锛�0:涓嶅仠姝� 1:鍋滄�锛�
+		int reboot_type;		//閲嶅惎绛栫暐绫诲瀷锛�0:涓嶅惎鍔� 1:閲嶅惎妗嗘灦 2:閲嶅惎绯荤粺锛�
+		CSimpleStringA file_path;       //鍗囩骇鍖呰矾寰�
+		CSimpleStringA download_url;    //鍗囩骇鍖呬笅杞藉湴鍧€
+		CSimpleStringA pack_hash;		//鍗囩骇鍖卙ash鍊�
+		long pack_length;		//鍗囩骇鍖呴暱搴�(鏈嶅姟绔�殏鏃朵笉浼�)
+
+		queue<CInstallStep*> install_step;//瀹夎�姝ラ�闃熷垪
 
 	};
 
 	
 	struct CTaskProcess
 	{
-		CSimpleStringA strPackName;//包名
-		CSimpleStringA installVersion;//安装版本号
-		CSimpleStringA CurrentVersion;//当前版本号
-		CSimpleStringA cInstallState;//升级状态
-		CSimpleStringA strInstallComment;//升级状态备注
+		CSimpleStringA strPackName;//鍖呭悕
+		CSimpleStringA installVersion;//瀹夎�鐗堟湰鍙�
+		CSimpleStringA CurrentVersion;//褰撳墠鐗堟湰鍙�
+		CSimpleStringA cInstallState;//鍗囩骇鐘舵€�
+		CSimpleStringA strInstallComment;//鍗囩骇鐘舵€佸�娉�
 	};
 
 	struct CenterUrl
 	{
-		string updateTaskUrl;		//更新升级任务url
-		string queryCurrTaskUrl;	//查询当前任务url
-		string queryNewTaskUrl;		//查询新任务url（旧版本使用）
-		string queryPreTaskUrl;		//预查询新任务url
-		string queryContinueTaskUrl; //继续查询新任务url
-		string queryTaskStatus;		//查询当前任务是否有效url
-		string sendSM3TaskUrl;		//发送文件hashurl
+		string updateTaskUrl;		//鏇存柊鍗囩骇浠诲姟url
+		string queryCurrTaskUrl;	//鏌ヨ�褰撳墠浠诲姟url
+		string queryNewTaskUrl;		//鏌ヨ�鏂颁换鍔�rl锛堟棫鐗堟湰浣跨敤锛�
+		string queryPreTaskUrl;		//棰勬煡璇㈡柊浠诲姟url
+		string queryContinueTaskUrl; //缁х画鏌ヨ�鏂颁换鍔�rl
+		string queryTaskStatus;		//鏌ヨ�褰撳墠浠诲姟鏄�惁鏈夋晥url
+		string sendSM3TaskUrl;		//鍙戦€佹枃浠秇ashurl
 	};
 
 	struct HashScanSet
 	{
-		CSimpleStringA relativeDir;	//相对路径
-		CSimpleStringA absoluteDir;	//绝对路径 
-		CSimpleStringA currVerDir;	//当前版本相对路径
-		CSimpleStringA blackFile;	//不纳入扫描的文件名称
-		CSimpleStringA blackDir;	//不纳入扫描的文件夹
+		CSimpleStringA relativeDir;	//鐩稿�璺�緞
+		CSimpleStringA absoluteDir;	//缁濆�璺�緞 
+		CSimpleStringA currVerDir;	//褰撳墠鐗堟湰鐩稿�璺�緞
+		CSimpleStringA blackFile;	//涓嶇撼鍏ユ壂鎻忕殑鏂囦欢鍚嶇О
+		CSimpleStringA blackDir;	//涓嶇撼鍏ユ壂鎻忕殑鏂囦欢澶�
 	};
 
 public:
 	CUpgradeTaskFSM(){
-		isSendHash = false;//默认查询策略不发送hash
-		m_isSM3HashSucc = false;//默认hash计算失败
+		isSendHash = false;//榛樿�鏌ヨ�绛栫暐涓嶅彂閫乭ash
+		m_isSM3HashSucc = false;//榛樿�hash璁＄畻澶辫触
 		m_bDownloadIdle = false;
 		m_bTaskCancel=false;
-		m_fileSM3ListHash="";//终端hash列表64位hash值
-		m_fileSM3List = "";//终端hash列表值
-		m_strPreTaskId="";//预检查任务ID
-		m_bNeedHash=0;//预检查是否需要hash
+		m_fileSM3ListHash="";//缁堢�hash鍒楄〃64浣峢ash鍊�
+		m_fileSM3List = "";//缁堢�hash鍒楄〃鍊�
+		m_strPreTaskId="";//棰勬�鏌ヤ换鍔�D
+		m_bNeedHash=0;//棰勬�鏌ユ槸鍚﹂渶瑕乭ash
 		m_newEachDownloadLen=DOWNLOAD_CONTENT_EACH_LEN;
 		m_PrintHttpLog =false;
 		m_startFlag = false;
 		m_iBlackFileCount=0;
 		m_bSwitchFlag = false;
 		m_bRollbackTask = false;
-		m_TempDepUpgradeFlag = false;//默认非适配器升级
-		m_queryNewTaskInterval = 240;//默认查询任务时间间隔
-		m_installStopCopyDep = false;//默认拷贝
+		m_TempDepUpgradeFlag = false;//榛樿�闈為€傞厤鍣ㄥ崌绾�
+		m_queryNewTaskInterval = 240;//榛樿�鏌ヨ�浠诲姟鏃堕棿闂撮殧
+		m_installStopCopyDep = false;//榛樿�鎷疯礉
 		m_downloadBreakOffCount = 0; 
 		m_queryIsWorkCount = 0;
 	}
 	~CUpgradeTaskFSM(){}
-	//具体实现方法
-	ErrorCodeEnum CreateNewVersion(CVersion NewSoftwareVersion,CSimpleStringA &strErrInfo);//创建新版本
-	ErrorCodeEnum ClearUpgradeFailVersion(CVersion NewSoftwareVersion);//清理升级新版本临时文件
-	bool GetSysUpgradeResult(const char *pszResultLog, CSimpleStringA &eErrorCode, CSimpleStringA &strErrMsg);//从体系外生成的result.log文件中获取结果
+	//鍏蜂綋瀹炵幇鏂规硶
+	ErrorCodeEnum CreateNewVersion(CVersion NewSoftwareVersion,CSimpleStringA &strErrInfo);//鍒涘缓鏂扮増鏈�
+	ErrorCodeEnum ClearUpgradeFailVersion(CVersion NewSoftwareVersion);//娓呯悊鍗囩骇鏂扮増鏈�复鏃舵枃浠�
+	bool GetSysUpgradeResult(const char *pszResultLog, CSimpleStringA &eErrorCode, CSimpleStringA &strErrMsg);//浠庝綋绯诲�鐢熸垚鐨剅esult.log鏂囦欢涓�幏鍙栫粨鏋�
 	
-	//安装执行步骤方法
-	int ExecInstall(CSimpleStringA &strErrMsg);//升级安装 0：失败 1：成功 -1：未知
+	//瀹夎�鎵ц�姝ラ�鏂规硶
+	int ExecInstall(CSimpleStringA &strErrMsg);//鍗囩骇瀹夎� 0锛氬け璐� 1锛氭垚鍔� -1锛氭湭鐭�
 	int ExecRunCmd(CSimpleStringA &strErrMsg,CInstallStep* ins);
 	bool ExecDeleteCmd(CSimpleStringA &strErrMsg,CInstallStep* ins);
 	bool ExecCpoyCmd(CSimpleStringA &strErrMsg,CInstallStep* ins);
-	bool GetRootTypePath(int rootType,CSimpleStringA &rootPath);//1:相对路径 2：当前版本相对路径 3：升级版本相对路径 4：升级包相对路径
+	bool GetRootTypePath(int rootType,CSimpleStringA &rootPath);//1:鐩稿�璺�緞 2锛氬綋鍓嶇増鏈�浉瀵硅矾寰� 3锛氬崌绾х増鏈�浉瀵硅矾寰� 4锛氬崌绾у寘鐩稿�璺�緞
 	ErrorCodeEnum CopyFileOperate(const char* srcPath, const char* destPath, int nCopyMode, CSimpleStringA &strErrMsg);
 
 
 
-	ErrorCodeEnum SetRunSucceed(const char* pPackFile);//成功切换新版本
-	ErrorCodeEnum UpgradeToNewVersion();//设置新版本状态
-	ErrorCodeEnum RollBackToHistoryVersion(CVersion historyVersion);//回退到某个历史版本
+	ErrorCodeEnum SetRunSucceed(const char* pPackFile);//鎴愬姛鍒囨崲鏂扮増鏈�
+	ErrorCodeEnum UpgradeToNewVersion();//璁剧疆鏂扮増鏈�姸鎬�
+	ErrorCodeEnum RollBackToHistoryVersion(CVersion historyVersion);//鍥為€€鍒版煇涓�巻鍙茬増鏈�
 	
 	void RecursiveGetSubFiles(const char *pszDir, const char *pszTrimStart, list<CSimpleStringA>& retList);
 	bool IsFileMatch(const char *pszFilter, const char *pszFileName);
-	bool RecursiveCopyDir(const char *pszSourceDir, const char *pszDestDir,CSimpleStringA &strErrInfo);//可以合并
-	CSimpleStringA GetFileDirectory(const char *pszFullPath);//查找文件的父路径
-	int system_on(string cmdFilePath, bool isWait,CSimpleStringA &errMsg);//cmd窗口程序
-	int waitSystem(string cmd, const char * par, bool nShow,CSimpleStringA &errMsg);//起进程执行cmd
+	bool RecursiveCopyDir(const char *pszSourceDir, const char *pszDestDir,CSimpleStringA &strErrInfo);//鍙�互鍚堝苟
+	CSimpleStringA GetFileDirectory(const char *pszFullPath);//鏌ユ壘鏂囦欢鐨勭埗璺�緞
+	int system_on(string cmdFilePath, bool isWait,CSimpleStringA &errMsg);//cmd绐楀彛绋嬪簭
+	int waitSystem(string cmd, const char * par, bool nShow,CSimpleStringA &errMsg);//璧疯繘绋嬫墽琛宑md
 	
 
-	ErrorCodeEnum UnzipPack(const char* unZipPackName);//解压文件
-	ErrorCodeEnum DeleteUnzipDir();//清理临时解压包文件
-	ErrorCodeEnum RollBackVersionCheck(string &failReason, CSimpleStringA& strErrMsg);//回退版本检查 C：一般错误 X：终端找不到需要回退的版本文件夹 、回退版本比现在版本高
+	ErrorCodeEnum UnzipPack(const char* unZipPackName);//瑙ｅ帇鏂囦欢
+	ErrorCodeEnum DeleteUnzipDir();//娓呯悊涓存椂瑙ｅ帇鍖呮枃浠�
+	ErrorCodeEnum RollBackVersionCheck(string &failReason, CSimpleStringA& strErrMsg);//鍥為€€鐗堟湰妫€鏌� C锛氫竴鑸�敊璇� X锛氱粓绔�壘涓嶅埌闇€瑕佸洖閫€鐨勭増鏈�枃浠跺す 銆佸洖閫€鐗堟湰姣旂幇鍦ㄧ増鏈�珮
 	
 	
 
@@ -390,56 +390,56 @@ public:
 	ErrorCodeEnum GetRunConfigStrValue(const char *pszSection, const char *pszKey, CSimpleStringA &strValue);
 	ErrorCodeEnum SetRunConfigStrValue(const char *pszSection, const char *pszKey, const char *pszValue);
 
-	bool ClearCurrTaskInfo();//任务无效清除运行时记录和残留下载包
-	bool ClearInstallStep();//清理历史任务安装步骤
+	bool ClearCurrTaskInfo();//浠诲姟鏃犳晥娓呴櫎杩愯�鏃惰�褰曞拰娈嬬暀涓嬭浇鍖�
+	bool ClearInstallStep();//娓呯悊鍘嗗彶浠诲姟瀹夎�姝ラ�
 
-	ErrorCodeEnum LoadPersistTaskInfo();//启动开始加载运行时文件
-	ErrorCodeEnum loadCenterCfgInfo();//启动开始加载集中配置文件
+	ErrorCodeEnum LoadPersistTaskInfo();//鍚�姩寮€濮嬪姞杞借繍琛屾椂鏂囦欢
+	ErrorCodeEnum loadCenterCfgInfo();//鍚�姩寮€濮嬪姞杞介泦涓�厤缃�枃浠�
 
-	bool GetFileLength(const char* filePath,long &fileLen);//获取文件长度
-	ErrorCodeEnum GetSM3List(CSimpleStringA &strSM3List);//获取版本文件hash集合字符串
+	bool GetFileLength(const char* filePath,long &fileLen);//鑾峰彇鏂囦欢闀垮害
+	ErrorCodeEnum GetSM3List(CSimpleStringA &strSM3List);//鑾峰彇鐗堟湰鏂囦欢hash闆嗗悎瀛楃�涓�
 	ErrorCodeEnum ScanSM3ByType(int type,CSimpleStringA pathFilter);
-	ErrorCodeEnum NewSM3Folder(CSimpleStringA scanFilter,CSimpleStringA replaceDir);//新的hash扫描文件夹实现
+	ErrorCodeEnum NewSM3Folder(CSimpleStringA scanFilter,CSimpleStringA replaceDir);//鏂扮殑hash鎵�弿鏂囦欢澶瑰疄鐜�
 
-	//新国密SM3函数，isSub表示是否截取新国密中间一段密文
+	//鏂板浗瀵哠M3鍑芥暟锛宨sSub琛ㄧず鏄�惁鎴�彇鏂板浗瀵嗕腑闂翠竴娈靛瘑鏂�
 	ErrorCodeEnum SM3FileToStr(CSimpleStringA strFilePath, CSimpleStringA &strSM3,bool isSub);
 	ErrorCodeEnum SM3DataToStr(CSimpleStringA strData, CSimpleStringA &strSM3,bool isSub);
 	ErrorCodeEnum SM3_Str(CSimpleStringA &strSM3,BYTE * SM3Byte,bool isSub);
 
-	bool IsPackDownloaded(const char *pPackName,const char* packHash,long packLen);//判断安装包是否已下载成功
+	bool IsPackDownloaded(const char *pPackName,const char* packHash,long packLen);//鍒ゆ柇瀹夎�鍖呮槸鍚﹀凡涓嬭浇鎴愬姛
 	bool DownloadFileWrite(byte* content,long contentLen,const char* filePath);
 
-	bool CheckIfCanSwitchNow();//是否允许切换
-	ErrorCodeEnum SwitchUpgradeNow();//切换版本
+	bool CheckIfCanSwitchNow();//鏄�惁鍏佽�鍒囨崲
+	ErrorCodeEnum SwitchUpgradeNow();//鍒囨崲鐗堟湰
 
-	ErrorCodeEnum DownloadProgress(long tempFileLen,long fileSumLen);//返回下载进度
-	char GetInstallState(int nState);//根据状态机获取升级状态
+	ErrorCodeEnum DownloadProgress(long tempFileLen,long fileSumLen);//杩斿洖涓嬭浇杩涘害
+	char GetInstallState(int nState);//鏍规嵁鐘舵€佹満鑾峰彇鍗囩骇鐘舵€�
 	ErrorCodeEnum GetUpgradeState(bool &bInstalling, CSimpleStringA &strPackFile, CSimpleStringA &strExecID,
 		char &cInstallState, bool &bSysInstall, bool &bLightPack, CSimpleStringA &strNewVersion);
 	
 	static void HttpsLogCallBack(const char* logtxt);
 
-	void judgeTaskClass();//临时判定升级任务类别
-	ErrorCodeEnum judgeRollbackTaskClass(CSimpleStringA verDirName, string& failReason, CSimpleStringA& strErrMsg);//临时判定回退任务类别
+	void judgeTaskClass();//涓存椂鍒ゅ畾鍗囩骇浠诲姟绫诲埆
+	ErrorCodeEnum judgeRollbackTaskClass(CSimpleStringA verDirName, string& failReason, CSimpleStringA& strErrMsg);//涓存椂鍒ゅ畾鍥為€€浠诲姟绫诲埆
 	
-	ErrorCodeEnum CreateNewDepVersion(CSimpleStringA NewSoftwareVersion, CSimpleStringA& strErrInfo);//升级时创建新适配器版本
-	ErrorCodeEnum CreateInstallDepVersion(CSimpleStringA NewSoftwareVersion, CSimpleStringA& strErrInfo);//安装时创建新适配器版本
-	ErrorCodeEnum ClearUpgradeFailDepVersion(CSimpleStringA NewSoftwareVersion);//清理升级新版本临时文件
-	ErrorCodeEnum UpgradeDepToNewVersion();//更新depactive文件
-	ErrorCodeEnum SwitchUpgradeDepNow();//切换适配器版本
-	ErrorCodeEnum RollBackDepVersionCheck(string& failReason, CSimpleStringA& strErrMsg);//回退版本检查 C：一般错误 X：终端找不到需要回退的版本文件夹
-	ErrorCodeEnum RollBackToHistoryDepVersion(CSimpleStringA historyDepVersion);//适配器回退到某个历史版本
-
-	//适配器安装函数
-	int ExecDepInstall(CSimpleStringA& strErrMsg);//适配器升级 0：失败 1：成功 
+	ErrorCodeEnum CreateNewDepVersion(CSimpleStringA NewSoftwareVersion, CSimpleStringA& strErrInfo);//鍗囩骇鏃跺垱寤烘柊閫傞厤鍣ㄧ増鏈�
+	ErrorCodeEnum CreateInstallDepVersion(CSimpleStringA NewSoftwareVersion, CSimpleStringA& strErrInfo);//瀹夎�鏃跺垱寤烘柊閫傞厤鍣ㄧ増鏈�
+	ErrorCodeEnum ClearUpgradeFailDepVersion(CSimpleStringA NewSoftwareVersion);//娓呯悊鍗囩骇鏂扮増鏈�复鏃舵枃浠�
+	ErrorCodeEnum UpgradeDepToNewVersion();//鏇存柊depactive鏂囦欢
+	ErrorCodeEnum SwitchUpgradeDepNow();//鍒囨崲閫傞厤鍣ㄧ増鏈�
+	ErrorCodeEnum RollBackDepVersionCheck(string& failReason, CSimpleStringA& strErrMsg);//鍥為€€鐗堟湰妫€鏌� C锛氫竴鑸�敊璇� X锛氱粓绔�壘涓嶅埌闇€瑕佸洖閫€鐨勭増鏈�枃浠跺す
+	ErrorCodeEnum RollBackToHistoryDepVersion(CSimpleStringA historyDepVersion);//閫傞厤鍣ㄥ洖閫€鍒版煇涓�巻鍙茬増鏈�
+
+	//閫傞厤鍣ㄥ畨瑁呭嚱鏁�
+	int ExecDepInstall(CSimpleStringA& strErrMsg);//閫傞厤鍣ㄥ崌绾� 0锛氬け璐� 1锛氭垚鍔� 
 	int ExecDepRunCmd(CSimpleStringA& strErrMsg, CInstallStep* ins);
 	bool ExecDepDeleteCmd(CSimpleStringA& strErrMsg, CInstallStep* ins);
 	bool ExecDepCpoyCmd(CSimpleStringA& strErrMsg, CInstallStep* ins);
-	bool GetDepRootTypePath(int rootType, CSimpleStringA& rootPath);//1:相对路径 2：当前版本相对路径 3：升级版本相对路径 4：升级包相对路径
+	bool GetDepRootTypePath(int rootType, CSimpleStringA& rootPath);//1:鐩稿�璺�緞 2锛氬綋鍓嶇増鏈�浉瀵硅矾寰� 3锛氬崌绾х増鏈�浉瀵硅矾寰� 4锛氬崌绾у寘鐩稿�璺�緞
 
 	CSimpleStringA getAlarmCurrVersion();
 
-	//升级时添加防火墙策略
+	//鍗囩骇鏃舵坊鍔犻槻鐏��绛栫暐
 	ErrorCodeEnum SetNewVersionPathToFirewall();
 
 	bool isWork();
@@ -462,13 +462,13 @@ private:
 	enum{s1, s2, s3, s4, s5, s6, s7};
 
 	BEGIN_FSM_STATE(CUpgradeTaskFSM)
-		FSM_STATE_ENTRY(s1, "Start",s1_on_entry,s1_on_exit,s1_on_event)//计算hash值
-		FSM_STATE_ENTRY(s2, "DealTask",s2_on_entry,s2_on_exit,s2_on_event)//处理上个任务，反馈任务结果，并根据任务状态跳转到其他状态
-		FSM_STATE_ENTRY(s3, "Poll",s3_on_entry,s3_on_exit,s3_on_event)//查询任务
-		FSM_STATE_ENTRY(s4, "Download", s4_on_entry, s4_on_exit, s4_on_event)//下载安装包
-		FSM_STATE_ENTRY(s5, "Install", s5_on_entry, s5_on_exit, s5_on_event)//安装升级包
-		FSM_STATE_ENTRY(s6, "Switch", s6_on_entry, s6_on_exit, s6_on_event)//进行版本切换
-		FSM_STATE_ENTRY(s7, "Disable", s7_on_entry, s7_on_exit, s7_on_event)//静止状态
+		FSM_STATE_ENTRY(s1, "Start",s1_on_entry,s1_on_exit,s1_on_event)//璁＄畻hash鍊�
+		FSM_STATE_ENTRY(s2, "DealTask",s2_on_entry,s2_on_exit,s2_on_event)//澶勭悊涓婁釜浠诲姟锛屽弽棣堜换鍔＄粨鏋滐紝骞舵牴鎹�换鍔＄姸鎬佽烦杞�埌鍏朵粬鐘舵€�
+		FSM_STATE_ENTRY(s3, "Poll",s3_on_entry,s3_on_exit,s3_on_event)//鏌ヨ�浠诲姟
+		FSM_STATE_ENTRY(s4, "Download", s4_on_entry, s4_on_exit, s4_on_event)//涓嬭浇瀹夎�鍖�
+		FSM_STATE_ENTRY(s5, "Install", s5_on_entry, s5_on_exit, s5_on_event)//瀹夎�鍗囩骇鍖�
+		FSM_STATE_ENTRY(s6, "Switch", s6_on_entry, s6_on_exit, s6_on_event)//杩涜�鐗堟湰鍒囨崲
+		FSM_STATE_ENTRY(s7, "Disable", s7_on_entry, s7_on_exit, s7_on_event)//闈欐�鐘舵€�
 	END_FSM_STATE()
 
 	BEGIN_FSM_RULE(CUpgradeTaskFSM,s1)
@@ -478,39 +478,39 @@ private:
 		FSM_RULE_ENTRY(s2, s5, Event_EndQueryCurrTask, 5)	
 		FSM_RULE_ENTRY(s2, s6, Event_EndQueryCurrTask, 6)
 		FSM_RULE_ENTRY_ANY(s3, s4, Event_StartDownload)
-		FSM_RULE_ENTRY_ANY(s3, s5, Event_StartInstall)//回退
+		FSM_RULE_ENTRY_ANY(s3, s5, Event_StartInstall)//鍥為€€
 		FSM_RULE_ENTRY_ANY(s4, s5, Event_StartInstall)
-		FSM_RULE_ENTRY_ANY(s4, s3, Event_StartPoll)//任务取消进入S3
-		FSM_RULE_ENTRY_ANY(s4, s2, Event_StartDealTask)//下载失败进入S2
+		FSM_RULE_ENTRY_ANY(s4, s3, Event_StartPoll)//浠诲姟鍙栨秷杩涘叆S3
+		FSM_RULE_ENTRY_ANY(s4, s2, Event_StartDealTask)//涓嬭浇澶辫触杩涘叆S2
 		FSM_RULE_ENTRY_ANY(s5, s6, Event_StartSwitch)
-		FSM_RULE_ENTRY_ANY(s5, s2, Event_StartDealTask)//安装失败进入S2
-		FSM_RULE_ENTRY_ANY(s6, s2, Event_StartDealTask)//无需重启框架和系统切换成功进入S2
-		FSM_RULE_ENTRY_ANY(s6, s3, Event_StartPoll)//取消任务进入S3
-		FSM_RULE_ENTRY_ANY(s6, s7, Event_PreRestart)//重启服务
+		FSM_RULE_ENTRY_ANY(s5, s2, Event_StartDealTask)//瀹夎�澶辫触杩涘叆S2
+		FSM_RULE_ENTRY_ANY(s6, s2, Event_StartDealTask)//鏃犻渶閲嶅惎妗嗘灦鍜岀郴缁熷垏鎹㈡垚鍔熻繘鍏�2
+		FSM_RULE_ENTRY_ANY(s6, s3, Event_StartPoll)//鍙栨秷浠诲姟杩涘叆S3
+		FSM_RULE_ENTRY_ANY(s6, s7, Event_PreRestart)//閲嶅惎鏈嶅姟
 	END_FSM_RULE()
 
 private:
-	//完成
+	//瀹屾垚
 	void s1_on_entry();
 	void s1_on_exit();
 	unsigned int s1_on_event(FSMEvent* event);
-	//完成
+	//瀹屾垚
 	void s2_on_entry();
 	void s2_on_exit();
 	unsigned int s2_on_event(FSMEvent* event);
-	//完成
+	//瀹屾垚
 	void s3_on_entry();
 	void s3_on_exit();
 	unsigned int s3_on_event(FSMEvent* event);
-	//完成
+	//瀹屾垚
 	void s4_on_entry();
 	void s4_on_exit();
 	unsigned int s4_on_event(FSMEvent* event);
-	//完成
+	//瀹屾垚
 	void s5_on_entry();
 	void s5_on_exit();
 	unsigned int s5_on_event(FSMEvent* event);
-	//完成
+	//瀹屾垚
 	void s6_on_entry();
 	void s6_on_exit();
 	unsigned int s6_on_event(FSMEvent* event);
@@ -523,45 +523,45 @@ private:
 
 	
 	
-	list<CSimpleStringA> m_DepWhitelist; //dep文件夹白名单
-	list<CSimpleStringA> m_DirBlacklist; //整体文件夹黑名单
-	list<CSimpleStringA> m_FileBlacklist; //整体文件黑名单
+	list<CSimpleStringA> m_DepWhitelist; //dep鏂囦欢澶圭櫧鍚嶅崟
+	list<CSimpleStringA> m_DirBlacklist; //鏁翠綋鏂囦欢澶归粦鍚嶅崟
+	list<CSimpleStringA> m_FileBlacklist; //鏁翠綋鏂囦欢榛戝悕鍗�
 
 public:
-	map<CSimpleStringA, CSimpleStringA> m_fileSM3Map;	// 版本文件hash值集合
-
-	CTaskInfo m_currentTask;	//当前的任务缓存变量
-	CVersion m_currentVersion;  //当前终端版本
-	CSimpleStringA m_currentDepVersion; //当前适配器版本
-
-	CenterUrl m_centerUrl;//访问总行的url地址集合
-	int m_newEachDownloadLen;//新的每次下载数据长度阈值(k)
-	bool m_PrintHttpLog;  //是否打印通讯日志
-	bool m_startFlag; //升级实体启动标志位,默认是不开，
-	bool m_stopSetFirewall;//是否停止设置防火墙路径，默认是不停止
-	HashScanSet m_hashScanSet;//扫描文件hash设置
-
-	bool m_isSM3HashSucc;//hash是否计算成功
-	bool isSendHash;//hash是否发送
-	CSimpleStringA m_fileSM3ListHash;//SM3 64位hash
-	CSimpleStringA m_fileSM3List;//版本文件hash集合字符串
-	DWORD m_beginSendSM3Time;//开始发送sm3hahs时间
-	int m_queryNewTaskCount;//查询新任务时无任务次数
+	map<CSimpleStringA, CSimpleStringA> m_fileSM3Map;	// 鐗堟湰鏂囦欢hash鍊奸泦鍚�
+
+	CTaskInfo m_currentTask;	//褰撳墠鐨勪换鍔＄紦瀛樺彉閲�
+	CVersion m_currentVersion;  //褰撳墠缁堢�鐗堟湰
+	CSimpleStringA m_currentDepVersion; //褰撳墠閫傞厤鍣ㄧ増鏈�
+
+	CenterUrl m_centerUrl;//璁块棶鎬昏�鐨剈rl鍦板潃闆嗗悎
+	int m_newEachDownloadLen;//鏂扮殑姣忔�涓嬭浇鏁版嵁闀垮害闃堝€�(k)
+	bool m_PrintHttpLog;  //鏄�惁鎵撳嵃閫氳�鏃ュ織
+	bool m_startFlag; //鍗囩骇瀹炰綋鍚�姩鏍囧織浣�,榛樿�鏄�笉寮€锛�
+	bool m_stopSetFirewall;//鏄�惁鍋滄�璁剧疆闃茬伀澧欒矾寰勶紝榛樿�鏄�笉鍋滄�
+	HashScanSet m_hashScanSet;//鎵�弿鏂囦欢hash璁剧疆
+
+	bool m_isSM3HashSucc;//hash鏄�惁璁＄畻鎴愬姛
+	bool isSendHash;//hash鏄�惁鍙戦€�
+	CSimpleStringA m_fileSM3ListHash;//SM3 64浣峢ash
+	CSimpleStringA m_fileSM3List;//鐗堟湰鏂囦欢hash闆嗗悎瀛楃�涓�
+	DWORD m_beginSendSM3Time;//寮€濮嬪彂閫乻m3hahs鏃堕棿
+	int m_queryNewTaskCount;//鏌ヨ�鏂颁换鍔℃椂鏃犱换鍔℃�鏁�
 	int m_queryIsWorkCount;
 	int m_downloadBreakOffCount;
 
-	bool m_bDownloadIdle;	//是否下载空闲 true: 不能下载，false: 可下载
-	bool m_bTaskCancel;		//是否任务取消 true: 任务取消，false: 未取消
+	bool m_bDownloadIdle;	//鏄�惁涓嬭浇绌洪棽 true: 涓嶈兘涓嬭浇锛宖alse: 鍙�笅杞�
+	bool m_bTaskCancel;		//鏄�惁浠诲姟鍙栨秷 true: 浠诲姟鍙栨秷锛宖alse: 鏈�彇娑�
 
-	int m_iBlackFileCount;    //黑名单文件数量
+	int m_iBlackFileCount;    //榛戝悕鍗曟枃浠舵暟閲�
 
-	CSimpleStringA m_strPreTaskId; //预检查taskId
-	int m_bNeedHash;//是否需要hash对比查询任务
-	bool m_bSwitchFlag;//是否启动后切换流程直接进入标志
-	bool m_bRollbackTask;//是否已经处于回退流程。
+	CSimpleStringA m_strPreTaskId; //棰勬�鏌�askId
+	int m_bNeedHash;//鏄�惁闇€瑕乭ash瀵规瘮鏌ヨ�浠诲姟
+	bool m_bSwitchFlag;//鏄�惁鍚�姩鍚庡垏鎹㈡祦绋嬬洿鎺ヨ繘鍏ユ爣蹇�
+	bool m_bRollbackTask;//鏄�惁宸茬粡澶勪簬鍥為€€娴佺▼銆�
 
-	bool m_TempDepUpgradeFlag;//临时适配器升级安装的判定标志 true 适配器 false 非适配器
-	int m_queryNewTaskInterval;//查询任务时间间隔，默认是240s
-	bool m_installStopCopyDep;//安装时是否停止拷贝应用dep公共文件夹
+	bool m_TempDepUpgradeFlag;//涓存椂閫傞厤鍣ㄥ崌绾у畨瑁呯殑鍒ゅ畾鏍囧織 true 閫傞厤鍣� false 闈為€傞厤鍣�
+	int m_queryNewTaskInterval;//鏌ヨ�浠诲姟鏃堕棿闂撮殧锛岄粯璁ゆ槸240s
+	bool m_installStopCopyDep;//瀹夎�鏃舵槸鍚﹀仠姝㈡嫹璐濆簲鐢╠ep鍏�叡鏂囦欢澶�
 };
 #endif //RVC_MOD_UPGRADETASK_FSM_H_

Module/mod_UpgradeMgr/mod_UpgradeMgr.cpp

@@ -429,7 +429,6 @@ ErrorCodeEnum CUpgradeMgrEntity::testActive()
 	}
 
 	CSimpleStringA strActiveFile = CSimpleStringA::Format("%s" SPLIT_SLASH_STR "active.txt", rootVerPath.GetData());
-	//TODO: CrossPlaform  [Gifur@2025729]
 	FILE* fp = fopen(strActiveFile.GetData(),"rb+");
 	if(fp==NULL){
 		LogWarn(Severity_Middle, Error_Exception, ERR_WRAN_OPEN_ACTIVE_FAIL, CSimpleStringA::Format("open write active.txt fail,please edit active attribute, err=%d", (int)GetLastError()).GetData());
@@ -437,42 +436,13 @@ ErrorCodeEnum CUpgradeMgrEntity::testActive()
 	}
 	fclose(fp);
 	return Error_Succeed;
-
 }
 
 
 ErrorCodeEnum CUpgradeMgrEntity::NewStopMediaPlay()
 {
-//#ifdef RVC_OS_WIN
-//	// 通知媒体停止播放广告和声音
-//	LocalMediaPlay::PlayService_ClientBase *pClient = new LocalMediaPlay::PlayService_ClientBase(this);
-//	ErrorCodeEnum rc = pClient->Connect();
-//	if (rc == Error_Succeed)
-//	{
-//		DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("connect to entity [LocalMediaPlay] succeed, start StopMediaPlay now");
-//		//采用新接口停止所有音视频播放
-//		LocalMediaPlay::PlayService_StopPlayAllMedias_Req req1 = {};
-//		LocalMediaPlay::PlayService_StopPlayAllMedias_Ans ans1 = {};
-//		rc = (*pClient)(EntityResource::getLink().upgradeLink())->StopPlayAllMedias(req1, ans1, 30000);
-//		if (Error_Succeed == rc )
-//		{
-//			DbgWithLink(LOG_LEVEL_DEBUG,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayAllMedias success");
-//		}else{
-//			DbgWithLink(LOG_LEVEL_WARN,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("StopPlayAllMedias fail, err=%d",(int)rc);
-//			pClient->GetFunction()->CloseSession();
-//			pClient->SafeDelete();
-//			return rc;
-//		}
-//		pClient->GetFunction()->CloseSession();
-//	}
-//	else
-//	{
-//		LogWarn(Severity_Low, rc, ERR_TASK_STOP_MEDIA_FAIL, "connect to entity [LocalMediaPlay] fail");
-//	}
-//	pClient->SafeDelete();
-//	return rc;
-//#else
-		// 通知媒体停止播放广告和声音
+
+	// 通知媒体停止播放广告和声音
 	LocalMediaPlay::PlayService_ClientBase *pClient = new LocalMediaPlay::PlayService_ClientBase(this);
 	ErrorCodeEnum rc = pClient->Connect();
 	if (rc == Error_Succeed)
@@ -511,10 +481,8 @@ ErrorCodeEnum CUpgradeMgrEntity::NewStopMediaPlay()
 		pClient->SafeDelete();
 		return rc;
 	}
-	
-//#endif
-	
 }
+
 SP_BEGIN_ENTITY_MAP()
 	SP_ENTITY(CUpgradeMgrEntity)
 SP_END_ENTITY_MAP()

Module/mod_accessauth/mod_AccessAuth.cpp

@@ -447,13 +447,6 @@ void CAccessAuthEntity::printPasswdError(const string& strErrMsg){
 	DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA520C")(strErrMsg.c_str());
 }
 
-int Char2Int(char * ch) {
-	int num = 0;
-	for (int i = 0;i < strlen(ch);i++) {
-		num += ((int)(ch[i] - '0')) * pow((float)10, (float)(strlen(ch) - i - 1));
-	}
-	return num;
-}
 bool CAccessAuthEntity::SaveAuthKey(BYTE *pKey)
 {
 	memset(m_AuthSessionKey, 0, 140);
@@ -501,7 +494,7 @@ bool CAccessAuthEntity::SaveAuthKey(BYTE *pKey)
 	int plainKeyLen = KEY_SIZE;
 	char pKeyLen[4] = { 0 };
 	memcpy(pKeyLen, pKey, 4);
-	int kenLen = Char2Int(pKeyLen);
+	int kenLen = SP::Module::Util::Char2Int(pKeyLen);
 	char* pEncodeKey = SP::Module::Util::Str2Hex((char*)pKey, kenLen + 4);
 	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("kenLen=%d", kenLen);
 	delete [] pEncodeKey;
@@ -524,31 +517,6 @@ bool CAccessAuthEntity::SaveAuthKey(BYTE *pKey)
 	return true;
 }
 
-//TODO: CrossPlaform 采用 EntityUtil中的 StrBuf2HexBuf  [Gifur@2025821]
-static BYTE* ConvertHexStrToBytes(const char *pszStr)
-{
-	if (pszStr == NULL || strlen(pszStr) == 0)
-		return NULL;
-
-	int nLen = strlen(pszStr) / 2;
-	BYTE *pRet = (BYTE*)malloc(nLen);
-	memset(pRet, 0, nLen);
-
-	for (int i = 0; i < nLen; i++)
-	{
-		int nTmp(0);
-		if (sscanf(&pszStr[i * 2], "%2X", &nTmp) != 1)
-		{
-			free(pRet);
-			return NULL;
-		}
-
-		pRet[i] = (BYTE)nTmp;
-	}
-
-	return pRet;
-}
-
 // 使用密钥加密
 ErrorCodeEnum CAccessAuthEntity::EncryptDataWithKey(const CBlob &raw, CBlob &enc, BYTE* key)
 {
@@ -987,7 +955,8 @@ bool CAccessAuthEntity::SendInitMKReqACS(CInitlizerMKReq& initMKReq)
 	CBlob encInfo;
 	char* hexStr = "21009872C31CBC00D0C8F421D09CF707";
 	BYTE key[KEY_SIZE] = { 0 };
-	BYTE* btTmp = ConvertHexStrToBytes(hexStr);
+	PBYTE btTmp(NULL);
+	SP::Module::Util::StrBuf2HexBuf(hexStr, &btTmp);
 	memcpy(key, btTmp, KEY_SIZE);
 	if (btTmp != NULL) {
 		free(btTmp);

Module/mod_alarm/mod_alarm.cpp

@@ -15,7 +15,7 @@ void CAlarmEntity::OnLog(const CAutoArray<CUUID> &SubIDs, const CUUID nLogID,con
 		strMessage = pszMessage;
 
 #ifdef RVC_OS_LINUX
-		//TODO: CrossPlaform UOS现在是否还有区分新旧模式 如果是旧模式则转GBK码  [Gifur@2025820]
+		//TODO: CrossPlaform 由文涛确认并处理：UOS现在是否还有区分新旧模式 如果是旧模式则转GBK码  [Gifur@2025820]
 		if (m_fsm.m_CenterModel == 0) {
 			if (!strMessage.IsNullOrEmpty()) {
 				std::string tmpStr = SP::Utility::UTF8ToGBK(pszMessage);

Module/mod_chromium/CModTools.cpp

@@ -1150,7 +1150,7 @@ namespace Chromium {
 			CSimpleString runningVer = "";
 			m_pEntity->GetFunction()->GetRunningVersion(runningVer);
 			dstInstallUrl.append("?terminalVersion=").append(runningVer.GetData());
-			//TODO: CrossPlaform  考虑采用 SpUtility.h 中的 replaceInPlace 函数 [Gifur@2025730]
+			//TODO: CrossPlaform  由良瑜确认并处理：考虑采用 SpUtility.h 中的 replaceInPlace 函数 [Gifur@2025730]
 #if defined(RVC_OS_LINUX)
 			auto replaceAll = [](std::string& str, const std::string& search, const std::string& replace) {
 				size_t pos = 0;

Module/mod_counterconnector/ConnectorFSM.h

@@ -480,7 +480,7 @@ private:
 	int TranslateState(int innerState);
 	ErrorCodeEnum SetCallState(int state);
 
-	//TODO: CrossPlaform IP [Gifur@2025729]
+	//TODO: CrossPlaform IP 框架具备统一支持，但不清楚影响范围（继而无法评估测试范围），未敢轻易改动 [Gifur@2025729]
 	ErrorCodeEnum GetLocalIP(char *buff, size_t ulen)
 	{
 #if defined(RVC_OS_WIN)

Module/mod_guiconsole/mod_guiconsole.cpp

@@ -443,7 +443,7 @@ std::pair<DWORD, std::string> CGUIConsoleEntity::VTMSystemControl(SpReqAnsContex
 	msg.entityName = GetEntityName();
 	msg.LogType = 1;
 	
-	//TODO: CrossPlaform 采用框架指令去关机，形成完整链路  [Gifur@2025729]
+	
 	DWORD rc = Error_Succeed;
 	if (!ctx->Req.rebootFunction.Compare("RestartApp", true))
 	{
@@ -455,7 +455,7 @@ std::pair<DWORD, std::string> CGUIConsoleEntity::VTMSystemControl(SpReqAnsContex
 	{
 		msg.message = "正在重启系统";
 		SpSendBroadcast(GetFunction(), eMsg_LogInfo, eMsgSig_LogInfo, msg);
-
+		//TODO: CrossPlaform 采用框架指令去关机，形成完整链路  [Gifur@2025729]
 #ifdef RVC_OS_WIN
 		rc = pFuncPrivilege->Reboot(RebootTrigger_ManualLocal, RebootWayEnum::RebootWay_OS);
 #else
@@ -467,6 +467,7 @@ std::pair<DWORD, std::string> CGUIConsoleEntity::VTMSystemControl(SpReqAnsContex
 	{
 		msg.message = "正在关闭系统";
 		SpSendBroadcast(GetFunction(), eMsg_LogInfo, eMsgSig_LogInfo, msg);
+		//TODO: CrossPlaform 采用框架指令去关机，形成完整链路  [Gifur@2025729]
 #ifdef RVC_OS_WIN
 		std::string cmdline = "shutdown -f -s -t 00";
 		openProcess(cmdline);

Module/mod_localmediaplay/AdvertManage/resourceIniParse.cpp

@@ -18,7 +18,6 @@
 
 int ReadInterger(LPCTSTR szSection, LPCTSTR szKey, LPCTSTR szFileName, int iDefaultValue)
 {
-	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	return GetPrivateProfileInt(szSection, szKey, iDefaultValue, szFileName);
 #else
@@ -49,7 +48,6 @@ bool ReadBoolean(LPCTSTR szSection, LPCTSTR szKey, LPCTSTR szFileName, bool bDef
 string ReadString(LPCTSTR szSection, LPCTSTR szKey, LPCTSTR szFileName, LPCTSTR strDefaultValue)
 {
 	TCHAR  tempResult[MAX_PATH*2] = {0};
-	//TODO: CrossPlaform  [Gifur@2025730]
 #ifdef RVC_OS_WIN
 	GetPrivateProfileString(szSection, szKey, strDefaultValue, tempResult, MAX_PATH * 2, szFileName);
 #else

Module/mod_sipphone/mod_sipphone.cpp

@@ -1518,7 +1518,7 @@ void CSIPEntity::HandleSendBroadcastMsg(bool bHandfreeError)
 	}
 }
 
-//TODO: CrossPlaform  [Gifur@2025729]
+//TODO: CrossPlaform  框架具备统一支持，但不清楚影响范围（继而无法评估测试范围），未敢轻易改动 [Gifur@2025729]
 ErrorCodeEnum CSIPEntity::GetLocalIP()
 {
 #ifdef RVC_OS_WIN

Module/mod_upload/UploadFSM.cpp

@@ -637,7 +637,7 @@ namespace Task
 				//判断是否存在目标文件，如存在，则先删除
 				
 #ifdef RVC_OS_WIN
-				//TODO: CrossPlaform  需要梳理 [Gifur@2025730]
+				//TODO: CrossPlaform  由文涛确认和处理：需要梳理后优化，理论上不需要这个冗长的平台差异代码 [Gifur@2025730]
 				if(ExistsFileA(destPath.c_str())){
 					if(remove(destPath.c_str())==0){
 						DbgWithLink(LOG_LEVEL_INFO,LOG_TYPE_SYSTEM).setAPI(__FUNCTION__)("delete dest file is ok [%s]",destPath.c_str());

Tool/guardian/guardian.cpp

@@ -28,6 +28,7 @@
 #include "memutil.h"
 #include <winpr/library.h>
 #include <winpr/synch.h>
+#include <winpr/sysinfo.h>
 #include <winpr/environment.h>
 
 int epfd;
@@ -79,14 +80,6 @@ char* relate_processes[] = { spshell_execute_name };
 char* relate_processes_ex[] = { spshell_execute_name, sphost_execute_name, cefclient_execute_name };
 
 using namespace std;
-#define  NET_TYPE_WIRELESS  1
-#define  NET_TYPE_ETHERNET  2
-#define  NET_TYPE_3G   3
-#define  NET_TYPE_4G   4
-#define  NET_TYPE_BLUETOOTH  5 
-#define  DLL_PATH       "C:\\RVC\\SystemInit\\CmbPadDll.dll"
-typedef DWORD(*pWlanConnect)(BOOL bConnect, int nType); 
-typedef DWORD (*pDisableBluetooth)(BOOL bDisable);
 
 #ifdef linux
 	int g_sListen;
@@ -122,7 +115,6 @@ ULONGLONG g_dwUpgradeRestartTimeBegin = 0;
 int cnt = 0;
 char chDisk[2];
 char currDirBuf[256];
-void NetControl();
 const int MAX_WAIT_TIME_TO_RESTART = 600000;
 //oilyang@20211208 change value from 110000 to 180000
 const int MAX_WAIT_TIME_TO_RESTART_UPGRADE = 180000;
@@ -152,49 +144,6 @@ DWORD WINAPI DoWork(void* pData);
 #define	FUNCTION_STDCALL __stdcall
 #endif 
 
-//TODO: CrossPlaform 首先将其改造到WINPR的接口试点  [Gifur@2025820]
-unsigned long long GetTickCountRVC() {
-#ifdef linux
-	struct timespec ts;
-	clock_gettime(CLOCK_MONOTONIC, &ts);
-	return (ts.tv_sec * 1000 + ts.tv_nsec / 1000000);
-#else
-	return GetTickCount64();
-#endif //RVC_OS_WIN
-}
-void GetLocalTimeRVC(SYSTEMTIME& stTime)
-{
-#ifdef linux
-    time_t ct = 0;
-    struct tm* ltm = NULL;
-    WORD wMilliseconds = 0;
-	DWORD ticks = 0;
-    struct timespec ts;
-
-    ct = time(NULL);
-    ltm = localtime(&ct);
-	if (!clock_gettime(CLOCK_MONOTONIC_RAW, &ts)) {
-		ticks = (ts.tv_sec * 1000) + (ts.tv_nsec / 1000000);
-		wMilliseconds = (WORD)(ticks % 1000);
-	}
-	memset(&stTime, 0, sizeof(SYSTEMTIME));
-
-    if (ltm) {
-		stTime.wYear = (WORD)(ltm->tm_year + 1900);
-        stTime.wMonth = (WORD)(ltm->tm_mon + 1);
-        stTime.wDayOfWeek = (WORD)ltm->tm_wday;
-        stTime.wDay = (WORD)ltm->tm_mday;
-        stTime.wHour = (WORD)ltm->tm_hour;
-        stTime.wMinute = (WORD)ltm->tm_min;
-        stTime.wSecond = (WORD)ltm->tm_sec;
-        stTime.wMilliseconds = wMilliseconds;
-    }
-#else
-	GetLocalTime(&stTime);
-#endif
-}
-
-
 int BeginThreadRVC(void* (*pFuncLinux)(void*), LPTHREAD_START_ROUTINE pFuncWin)
 {
 #if defined(_MSC_VER)
@@ -515,9 +464,7 @@ int FrameworkShutdown(bool bUpgrade=false,bool bRestart = true)
 {
 	LOG4VTM(INFO, "in FrameworkShutdown,bUpgrade:" << bUpgrade << ",bRestart:" << bRestart);
 	if (!bUpgrade)
-		g_dwTimeBegin = GetTickCountRVC();
-	NetControl();
-
+		g_dwTimeBegin = GetTickCount64();
 #ifdef linux
 
 	//todo oiltestlinux
@@ -748,7 +695,7 @@ void CheckDoWork(int sig)
 			ULONGLONG dwTmpBegin = g_dwTimeBegin;
 			ULONGLONG dwUpgradeTmpBegin = g_dwUpgradeRestartTimeBegin;
 			LeaveCriticalSectionRVC(g_cs);
-			ULONGLONG dwTimeEnd = GetTickCountRVC();
+			ULONGLONG dwTimeEnd = GetTickCount64();
 			//oilyang@20190828 add
 			//升级重启后，在10分钟内，只要离最后一次交互时间大于2分钟，重启框架
 			if ((g_bInUpgrade && ((dwTimeEnd - dwUpgradeTmpBegin) < MAX_WAIT_TIME_TO_RESTART))
@@ -826,7 +773,7 @@ void DataProcessLinux(int socket,const char*data)
 		int rc, err;
 		EnterCriticalSectionRVC(g_cs);
 		g_bFrameQuit = false;
-		g_dwTimeBegin = GetTickCountRVC();
+		g_dwTimeBegin = GetTickCount64();
 		LeaveCriticalSectionRVC(g_cs);
 		char* pBuf = new char[8];
 		memset(pBuf, 0, 8);
@@ -913,7 +860,7 @@ void DataProcessLinux(int socket,const char*data)
 			StartDoNetControlRVC();
 		}
 		if (pInfo->dwParam1 == 1 || pInfo->dwParam1 == 3)
-			g_dwTimeBegin = GetTickCountRVC();
+			g_dwTimeBegin = GetTickCount64();
 
 		ServerReportEvent("upgrade restart");
 		LOG4VTM(INFO, "upgrade restart " << pInfo->dwParam1);
@@ -922,7 +869,7 @@ void DataProcessLinux(int socket,const char*data)
 		{
 			g_bInUpgrade = true;
 			WriteRunInfoContent("111");
-			g_dwUpgradeRestartTimeBegin = GetTickCountRVC();
+			g_dwUpgradeRestartTimeBegin = GetTickCount64();
 		}
 		else if (pInfo->dwParam1 == 2)//need rollback after upgrade
 		{
@@ -981,7 +928,7 @@ void DataProcess(LPPER_HANDLE_DATA pPerHandleData,LPPER_IO_OPERATION_DATA pPerIo
 			int rc,err;
 			EnterCriticalSectionRVC(g_cs);
 			g_bFrameQuit = false;
-			g_dwTimeBegin = GetTickCountRVC();
+			g_dwTimeBegin = GetTickCount64();
 			LeaveCriticalSectionRVC(g_cs);
 			char* pBuf = new char[8];
 			memset(pBuf,0,8);
@@ -1039,7 +986,7 @@ void DataProcess(LPPER_HANDLE_DATA pPerHandleData,LPPER_IO_OPERATION_DATA pPerIo
 				LOG4VTM(INFO, "framework is starting...");
 				//oilyang@20211208 add the following if receive framework is starting ,reset g_dwUpgradeRestartTimeBegin
 				//in order to skip the cost time of  "kill spshell"
-				g_dwUpgradeRestartTimeBegin = GetTickCountRVC();
+				g_dwUpgradeRestartTimeBegin = GetTickCount64();
 				g_bFrameOnline = true;
 				g_bAuthSuc = false;
 				StartDoNetControlRVC();
@@ -1057,14 +1004,14 @@ void DataProcess(LPPER_HANDLE_DATA pPerHandleData,LPPER_IO_OPERATION_DATA pPerIo
 				StartDoNetControlRVC();
 			}
 			if (pInfo->dwParam1 == 1 || pInfo->dwParam1 == 3)
-				g_dwTimeBegin = GetTickCountRVC();
+				g_dwTimeBegin = GetTickCount64();
 			ServerReportEvent("upgrade restart");
 			LOG4VTM(INFO, "upgrade restart " << pInfo->dwParam1);
 			if (pInfo->dwParam1 == 1)//framework to restart after upgrade
 			{
 				g_bInUpgrade = true;
 				WriteRunInfoContent("111");
-				g_dwUpgradeRestartTimeBegin = GetTickCountRVC();
+				g_dwUpgradeRestartTimeBegin = GetTickCount64();
 			}
 			else if (pInfo->dwParam1 == 2)//need rollback after upgrade
 			{
@@ -1176,7 +1123,7 @@ DWORD WINAPI DoWork(void* pData)
 			ULONGLONG dwTmpBegin = g_dwTimeBegin;
 			ULONGLONG dwUpgradeTmpBegin = g_dwUpgradeRestartTimeBegin;
 			LeaveCriticalSectionRVC(g_cs);
-			ULONGLONG dwTimeEnd = GetTickCountRVC();
+			ULONGLONG dwTimeEnd = GetTickCount64();
 			//oilyang@20190828 add
 			//升级重启后，在10分钟内，只要离最后一次交互时间大于MAX_WAIT_TIME_TO_RESTART_UPGRADE，重启框架
 			if (g_bInUpgrade && ((dwTimeEnd - dwTmpBegin) < MAX_WAIT_TIME_TO_RESTART)
@@ -1215,7 +1162,7 @@ DWORD WINAPI DoWork(void* pData)
 					if (!g_needUpgradeGuardianOnly)
 						FrameworkShutdown();
 					else
-						dwTmpBegin = GetTickCountRVC();
+						dwTmpBegin = GetTickCount64();
 				}
 			}
 		}
@@ -1256,8 +1203,6 @@ DWORD WINAPI DoNetControl(LPVOID pData)
 					HANDLE hP = OpenProcess( PROCESS_ALL_ACCESS, FALSE, pe.th32ProcessID );
 					WaitForSingleObject(hP, INFINITE );
 					LOG4VTM(INFO, "spshell.exe quit");
-					//ServerReportEvent("spshell.exe quit");
-					NetControl();
 					break;
 				}
 			} while (Process32Next(hSnapshot, &pe));
@@ -1624,7 +1569,7 @@ int main(int argc, char* argv[])
 #endif //_MSC_VER
 	std::string str;
 	cmb::log4rvcother::init(config, str);
-	g_dwTimeBegin = GetTickCountRVC();
+	g_dwTimeBegin = GetTickCount64();
 	int i=1000;
 
 	LOG4VTM(INFO, "guardian version: " << GUARDIAN_VERSION_STR);
@@ -1643,41 +1588,3 @@ int main(int argc, char* argv[])
 	InitListenSocketRVC();
 	AcceptReqRVC();
 }
-void NetControl()
-{
-	return;//oiltmp 20150724 for zl don't forbid net for now
-#ifdef linux
-	//todo oiltestlinux
-#else
-	HINSTANCE hmod = ::LoadLibrary(DLL_PATH);
-	if(hmod != NULL)
-	{
-		LOG4VTM(INFO, "NetControl start");
-		pWlanConnect WlanConnect = (pWlanConnect)GetProcAddress(hmod, "WlanConnect");
-		pDisableBluetooth BluetoothConnect = (pDisableBluetooth)GetProcAddress(hmod, "DisableBluetooth");
-		if (WlanConnect != NULL && BluetoothConnect != NULL)
-		{
-			DWORD dwRetWire,dwRetEther,dwRet3G,dwRet4G,dwRetBT;
-			dwRetWire = dwRetEther = dwRet3G = dwRet4G = dwRetBT = 0;
-			dwRetWire = WlanConnect(FALSE, NET_TYPE_WIRELESS);
-			LOG4VTM(DEBUG, "after wireless");
-			dwRetEther = WlanConnect(FALSE, NET_TYPE_ETHERNET);
-			LOG4VTM(DEBUG, "after ether");
-			dwRet3G = WlanConnect(FALSE, NET_TYPE_3G);
-			LOG4VTM(DEBUG, "after 3g");
-			dwRet4G = WlanConnect(FALSE, NET_TYPE_4G);
-			LOG4VTM(DEBUG, "after 4g");
-			dwRetBT = BluetoothConnect(TRUE);
-			LOG4VTM(DEBUG, "after bluetooth");
-			char buf[128];
-			ZeroMemory(buf,sizeof(buf));
-			sprintf(buf,"Wire Net open state:Wireless[%d],Ethernet[%d],3G[%d],4G[%d],Blue tooth[%d]",dwRetWire,dwRetEther,dwRet3G,dwRet4G,dwRetBT);
-			LOG4VTM(INFO, buf);
-		} 
-		else
-			LOG4VTM(WARN, "Get function from CmbPadDll failed!");
-	} 
-	else
-		LOG4VTM(WARN, "load CmbPadDll failed!");
-#endif //linux
-}