|
@@ -1011,32 +1011,26 @@ public:
|
|
|
}
|
|
|
|
|
|
virtual void SetDevInitFlag(bool val = true) {
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
|
|
|
m_bOpened = val;
|
|
|
-
|
|
|
}
|
|
|
+
|
|
|
bool GetDevInitFlag() const {
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
|
|
|
return m_bOpened;
|
|
|
}
|
|
|
|
|
|
virtual void SetDevInitingFlag(bool val = true) {
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
|
|
|
m_bOpening = val;
|
|
|
}
|
|
|
bool GetDevInitingFlag() const {
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
|
|
|
return m_bOpening;
|
|
|
}
|
|
|
|
|
|
virtual void SetInWhatPage(int iPageType) {
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
|
|
|
m_iInWhatPage = iPageType;
|
|
|
}
|
|
|
|
|
|
void OnUIState4SetWhatPage(const char* pcszValue) {
|
|
|
if (pcszValue != NULL && strlen(pcszValue) > 0) {
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
|
|
|
//增加页面位置判断
|
|
|
if (_strnicmp(pcszValue, "M", strlen("M")) == 0) {
|
|
|
SetInWhatPage(PageType_MainPage);
|
|
@@ -1051,11 +1045,9 @@ public:
|
|
|
}
|
|
|
|
|
|
virtual DevStateEnum GetDevState() const {
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
|
|
|
return m_eDevState;
|
|
|
}
|
|
|
void SetDevState(DevStateEnum val) {
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
|
|
|
m_eDevState = val;
|
|
|
}
|
|
|
|
|
@@ -1159,7 +1151,6 @@ protected:
|
|
|
|
|
|
|
|
|
virtual bool IsInBusiness() const {
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
|
|
|
return (m_iInWhatPage == PageType_Other);
|
|
|
}
|
|
|
|
|
@@ -1256,7 +1247,6 @@ int CCommDevFSM<TFSM, TDevClass>::CountDevError(CEntityBase* pEntityBase)
|
|
|
template<class TFSM, class TDevClass>
|
|
|
void CCommDevFSM<TFSM, TDevClass>::OnHardwareShakeHand(CSmartPointer<ITransactionContext> pTransactionContext)
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("gift4haichun %s", __FUNCTION__);
|
|
|
if (m_eDevState == DEVICE_STATUS_NORMAL)
|
|
|
pTransactionContext->SendAnswer(Error_Succeed);
|
|
|
else
|