Merge branch 'ST2' into feature_gpio_fsm

Module/mod_CardIssuerStand/mod_cardissuer.cpp

@@ -150,7 +150,11 @@ void CCardIssuerEntity::OnSysVarEvent(const char* pszKey, const char* pszValue,
 	if ((_strnicmp(pszKey, "UIState", strlen("UIState")) == 0))
 	{
 		m_fsm.OnUIState4SetWhatPage(pszValue);
+		if (_strnicmp(pszValue, "M", strlen("M")) == 0) {
+			m_fsm.SetEnterMainPage();//ÉèÖýøÈëÊ×Ò³
+		}
 	}
+
 }
 
 

Module/mod_cardissuerstore/mod_cardissuer.cpp

@@ -293,6 +293,9 @@ void CCardIssuerEntity::OnSysVarEvent(const char* pszKey, const char* pszValue,
 	if ((_strnicmp(pszKey, "UIState", strlen("UIState")) == 0))
 	{
 		m_fsm.OnUIState4SetWhatPage(pszValue);
+		if (_strnicmp(pszValue, "M", strlen("M")) == 0) {
+			m_fsm.SetEnterMainPage();//设置进入首页
+		}
 	}
 }
 

Module/mod_chromium/CWSCodec.cpp

@@ -482,13 +482,18 @@ namespace Chromium {
 		if (isSafe)
 		{
 			if (errorCode == 0)
+			{
 				cJSON_AddStringToObject(ret, "errorCode", SUC_RETURN_STR);
+				cJSON_AddStringToObject(ret, "errorMsg", "");
+			}
 			else
 			{
 				if(userCodeInfo.second.VTMCode.length() > 0)
 					cJSON_AddStringToObject(ret, "errorCode", userCodeInfo.second.VTMCode.c_str());
 				else
 					cJSON_AddStringToObject(ret, "errorCode", "RTA42F1");
+
+				cJSON_AddStringToObject(ret, "errorMsg", userCodeInfo.second.errMsg.c_str());
 			}
 				
 		}
@@ -499,9 +504,10 @@ namespace Chromium {
 				cJSON_AddNumberToObject(ret, "userCode", userCodeInfo.first);
 				cJSON_AddStringToObject(ret, "rtaCode", userCodeInfo.second.VTMCode.c_str());
 			}
+			cJSON_AddStringToObject(ret, "errorMsg", userCodeInfo.second.errMsg.c_str());
 		}
 
-		cJSON_AddStringToObject(ret, "errorMsg", userCodeInfo.second.errMsg.c_str());
+		
 
 		
 	}