完成更多页面的自定义位置

zhipuzi_pos_windows/page/CGengduoPageUI.cpp

@@ -147,11 +147,11 @@ void CGengduoPageUI::Refresh()
 			pImage->SetBkImage(L"main_jiaoban.png");
 			pItem->SetName(L"jiaoban");
 		}
-		else if (*it == "shezhi")
+		else if (*it == "setting")
 		{
 			pTitle->SetText(L"设置");
 			pImage->SetBkImage(L"main_setting.png");
-			pItem->SetName(L"shezhi");
+			pItem->SetName(L"setting");
 		}
 		else if (*it == "shangpin")
 		{
@@ -271,11 +271,11 @@ void CGengduoPageUI::Refresh()
 			pBack->SetName(L"gengduo_back");
 			pExchange->SetName(L"gengduo_exchange");
 		}
-		else if (*it == "shezhi")
+		else if (*it == "setting")
 		{
 			pTitle->SetText(L"设置");
 			pImage->SetBkImage(L"main_setting.png");
-			pItem->SetName(L"shezhi");
+			pItem->SetName(L"setting");
 
 			pExchange->SetText(L"上移");
 
@@ -801,6 +801,8 @@ void CGengduoPageUI::DianjiBtn(CControlUI* pSender)
 {
 	std::wstring name = pSender->GetParent()->GetParent()->GetName();
 
+	name = L"main_" + name;
+
 	//把name发到mainWnd去处理
 	m_pMainWnd->SwitchPageByName(name);
 }

zhipuzi_pos_windows/tool/CSetting.cpp

@@ -319,7 +319,7 @@ void CSetting::Init()
 	std::string setting_gongneng_changyong_string = "setting_gongneng_changyong_string";
 	if (m_paramsMap.find(setting_gongneng_changyong_string) == m_paramsMap.end())
 	{
-		m_paramsMap[setting_gongneng_changyong_string] = "diandan,dingdan,huiyuan,baobiao,jiaoban,shezhi";
+		m_paramsMap[setting_gongneng_changyong_string] = "diandan,dingdan,huiyuan,baobiao,jiaoban,setting";
 	}
 
 	std::string setting_gongneng_gengduo_string = "setting_gongneng_gengduo_string";

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -1035,7 +1035,7 @@ void CMainWnd::UpdateGongnengDaohang()
 			newOption->SetNormalImage(L"file='main_jiaoban.png' source='0,0,50,50' dest='25,13,75,63'");
 			newOption->SetSelectedImage(L"file='main_jiaoban_select.png' source='0,0,50,50' dest='25,13,75,63'");
 		}
-		else if (curName == "shezhi")
+		else if (curName == "setting")
 		{
 			newOption->SetName(L"main_setting");
 			newOption->SetText(L"设置");
@@ -1070,7 +1070,7 @@ void CMainWnd::UpdateGongnengDaohang()
 		else if (curName == "zhengcan")
 		{
 			newOption->SetName(L"main_zhengcan");
-			newOption->SetText(L"正餐");
+			newOption->SetText(L"桌台");
 
 			newOption->SetNormalImage(L"file='main_zhengcan.png' source='0,0,50,50' dest='25,13,75,63'");
 			newOption->SetSelectedImage(L"file='main_zhengcan_select.png' source='0,0,50,50' dest='25,13,75,63'");
@@ -1165,7 +1165,7 @@ void CMainWnd::SwitchPageByName(std::wstring name)
 	}
 	else if (name == _T("main_setting"))
 	{
-		this->SwitchPage(SHEZHI);
+		this->SwitchPage(SETTING);
 	}
 	else if (name == L"main_gengduo")
 	{
@@ -1211,20 +1211,26 @@ void CMainWnd::SwitchPageByName(std::wstring name)
 		}
 	}
 
+	if (m_curOption != NULL)
+	{
+		m_curOption->SetBkColor(0x00000000);
+		m_curOption->Selected(false, false);
+	}
+
 	if (is_found == true)
 	{
 		//新的跳转属于常用操作里面的
-		m_curOption->SetBkColor(0x00000000);
-		layout->GetItemAt(index)->SetBkColor(0xFF3CB371);
+		COptionUI* op = static_cast<COptionUI*>(layout->GetItemAt(index));
+
+		op->SetBkColor(0xFF3CB371);
+		op->Selected(true, false);
 
 		m_curOptionName = name;
-		m_curOption = static_cast<COptionUI*>(layout->GetItemAt(index));
+		m_curOption = op;
 	}
 	else
 	{
 		//新的跳转不属于常用操作里面的
-		m_curOption->SetBkColor(0x00000000);
-
 		m_curOptionName = L"";
 		m_curOption = NULL;
 	}
@@ -1268,7 +1274,7 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("setting_page.xml"), (UINT)0, &cb, &m_pm));
-		m_pages[SHEZHI] = pChildContainer;
+		m_pages[SETTING] = pChildContainer;
 	}	
 
 	{

zhipuzi_pos_windows/wnd/CMainWnd.h

@@ -20,7 +20,7 @@ public:
 		HUIYUAN, 
 		BAOBIAO,
 		JIAOBAN,
-		SHEZHI,
+		SETTING,
 		GENGDUO,
 		WAIMAIINFO, //外卖订单详情
 		DIANNEIDINGDAN, //店内订单列表