增加会员和餐牌号是否显示的展示

bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_page.xml

@@ -55,7 +55,7 @@
 	
 					<!-- 餐牌号 / 清空 药丸行 -->
 					<HorizontalLayout name="diandan_member_row" height="60" inset="14,8,14,0" childpadding="8" childvalign="vcenter">
-						<VerticalLayout width="104" height="32">
+						<VerticalLayout name="diandan_canpaihao_wrap" width="104" height="32">
 							<Button name="btn_diandan_canpaihao" text="" tooltip="输入餐牌号" width="104" height="32" font="13" textcolor="#FF5F6368" normalimage="file='dc_pill.png' corner='16,16,16,16'" hotimage="file='dc_pill_h.png' corner='16,16,16,16'" pushedimage="file='dc_pill_h.png' corner='16,16,16,16'"/>
 							<Control bkimage="dc_ico_paizi16.png" width="16" height="16" float="true" pos="13,8,29,24" mouse="false"/>
 							<Label name="diandan_canpaihao_text" text="餐牌号" font="13" textcolor="#FF5F6368" float="true" pos="35,0,102,32" valign="center" endellipsis="true" mouse="false"/>

bin/Win32/Debug/zhipuzi_pos_windows/skin/setting_xianshi.xml

@@ -29,4 +29,30 @@
 		<CheckBox name="xianshi_setting_buchumo" group="setting_xianshi_chumojianpan_type" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
 		<Label name="xianshi_setting_buchumo_name" text="不显示触摸键盘" width="105" padding="10,0,0,0" textcolor="#FF5F6368"/>
 	</HorizontalLayout>
+
+	<HorizontalLayout height="44">
+		<Label text="会员登录" width="275" font="115" textcolor="#FF1F2329"/>
+	</HorizontalLayout>
+	<Control height="1" bkcolor="#FFF0F1F3"></Control>
+
+	<HorizontalLayout height="50" childvalign="vcenter">
+		<Label text="会员登录" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="xianshi_setting_huiyuan_show" group="setting_xianshi_huiyuan_type" selected="true" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="xianshi_setting_huiyuan_show_name" text="显示会员登录" width="105" padding="10,0,16,0" textcolor="#FF5F6368"/>
+		<CheckBox name="xianshi_setting_huiyuan_hide" group="setting_xianshi_huiyuan_type" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="xianshi_setting_huiyuan_hide_name" text="不显示会员登录" width="105" padding="10,0,0,0" textcolor="#FF5F6368"/>
+	</HorizontalLayout>
+
+	<HorizontalLayout height="44">
+		<Label text="餐牌号" width="275" font="115" textcolor="#FF1F2329"/>
+	</HorizontalLayout>
+	<Control height="1" bkcolor="#FFF0F1F3"></Control>
+
+	<HorizontalLayout height="50" childvalign="vcenter">
+		<Label text="餐牌号" width="275" textcolor="#FF5F6368"/>
+		<CheckBox name="xianshi_setting_canpaihao_show" group="setting_xianshi_canpaihao_type" selected="true" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="xianshi_setting_canpaihao_show_name" text="显示餐牌号" width="105" padding="10,0,16,0" textcolor="#FF5F6368"/>
+		<CheckBox name="xianshi_setting_canpaihao_hide" group="setting_xianshi_canpaihao_type" width="14" height="14" maxheight="14" normalimage="file='gd_radio_off.png'" hotimage="file='gd_radio_off.png'" selectedimage="file='gd_radio_on.png'"/>
+		<Label name="xianshi_setting_canpaihao_hide_name" text="不显示餐牌号" width="105" padding="10,0,0,0" textcolor="#FF5F6368"/>
+	</HorizontalLayout>
 </Window>

zhipuzi_pos_windows/page/CDiandanPageUI.cpp

@@ -62,6 +62,10 @@ void CDiandanPageUI::InitShow()
 	//展示选购页面
 	this->ShowXuangouPage();
 
+	//按「显示设置」的开关，刷新会员登录入口 / 餐牌号的显示
+	this->UpdateHuiyuanLoginShow();
+	this->UpdateCanpaihaoShow();
+
 	if (m_is_zidingyizhifu_init == false)
 	{
 		//初始化结算页面的支付方式
@@ -2602,9 +2606,8 @@ void CDiandanPageUI::ClickMemberLogin()
 			CLabelUI* pMemberBalance = static_cast<CLabelUI*>(this->FindSubControl(_T("diandan_page_member_balance")));
 			pMemberBalance->SetText((L"¥" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(atof(m_balance.c_str()), 2))).c_str());
 
-			this->FindSubControl(_T("diandan_member_login_wrap"))->SetVisible(false);
-
-			this->FindSubControl(_T("diandan_page_member_info"))->SetVisible(true);
+			//按「显示设置 → 会员登录」开关刷新登录入口 / 会员卡的显示
+			this->UpdateHuiyuanLoginShow();
 
 			this->UpdateJiesuanInfo();
 
@@ -2629,13 +2632,46 @@ void CDiandanPageUI::ClickMemberLogout()
 {
 	m_is_member = false;
 
-	this->FindSubControl(_T("diandan_member_login_wrap"))->SetVisible(true);
-
-	this->FindSubControl(_T("diandan_page_member_info"))->SetVisible(false);
+	//按「显示设置 → 会员登录」开关刷新登录入口 / 会员卡的显示
+	this->UpdateHuiyuanLoginShow();
 
 	this->UpdateJiesuanInfo();
 }
 
+//按「显示设置 → 会员登录」开关，刷新会员登录入口的显示/隐藏（关闭设置时整块隐藏，已登录的会员卡一起隐藏）
+void CDiandanPageUI::UpdateHuiyuanLoginShow()
+{
+	bool is_show = (CSetting::GetInstance()->GetParam("setting_xianshi_is_huiyuan_login") != "0");
+
+	bool is_logined = (m_is_member == true);
+
+	CControlUI* p_login_wrap = this->FindSubControl(_T("diandan_member_login_wrap"));
+	if (p_login_wrap != NULL)
+	{
+		//未登录才显示登录入口
+		p_login_wrap->SetVisible(is_show && (is_logined == false));
+	}
+
+	CControlUI* p_member_info = this->FindSubControl(_T("diandan_page_member_info"));
+	if (p_member_info != NULL)
+	{
+		//已登录才显示会员信息卡
+		p_member_info->SetVisible(is_show && is_logined);
+	}
+}
+
+//按「显示设置 → 餐牌号」开关，刷新点单页餐牌号按钮的显示/隐藏
+void CDiandanPageUI::UpdateCanpaihaoShow()
+{
+	bool is_show = (CSetting::GetInstance()->GetParam("setting_xianshi_is_canpaihao") != "0");
+
+	CControlUI* p_canpaihao_wrap = this->FindSubControl(_T("diandan_canpaihao_wrap"));
+	if (p_canpaihao_wrap != NULL)
+	{
+		p_canpaihao_wrap->SetVisible(is_show);
+	}
+}
+
 //处理会员充值（点餐页内直接充值，成功后按 旧余额+充值+赠送 口径刷新余额显示）
 void CDiandanPageUI::ClickMemberChongzhi()
 {

zhipuzi_pos_windows/page/CDiandanPageUI.h

@@ -120,6 +120,12 @@ public:
 	//处理会员退出登陆
 	void ClickMemberLogout();
 
+	//按「显示设置 → 会员登录」开关，刷新会员登录入口的显示/隐藏
+	void UpdateHuiyuanLoginShow();
+
+	//按「显示设置 → 餐牌号」开关，刷新餐牌号按钮的显示/隐藏
+	void UpdateCanpaihaoShow();
+
 	//展示会员详情
 	void ClickMemberInfoShow();
 

zhipuzi_pos_windows/page/CSaomashouyinPageUI.cpp

@@ -60,6 +60,9 @@ void CSaomashouyinPageUI::InitShow()
 
 		m_is_zidingyizhifu_init = true;
 	}
+
+	//按「显示设置 → 会员登录」开关，刷新会员登录入口的显示/隐藏
+	this->UpdateHuiyuanLoginShow();
 }
 
 void CSaomashouyinPageUI::RefreshShow()
@@ -2183,13 +2186,8 @@ void CSaomashouyinPageUI::ClickMemberLogin()
 			CLabelUI* pMemberBalance = static_cast<CLabelUI*>(this->FindSubControl(_T("saomashouyin_page_member_balance")));
 			pMemberBalance->SetText((L"¥" + CLewaimaiString::UTF8ToUnicode(CLewaimaiString::DoubleToString(atof(m_balance.c_str()), 2))).c_str());
 
-			//整块隐藏登录卡（浮层说明文字随卡一起隐藏）
-			this->FindSubControl(_T("saomashouyin_member_login_wrap"))->SetVisible(false);
-
-			CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_saomashouyin_member_login")));
-			pMemberLoginBtn->SetVisible(false);
-
-			this->FindSubControl(_T("saomashouyin_page_member_info"))->SetVisible(true);
+			//按「显示设置 → 会员登录」开关刷新登录入口 / 会员卡的显示（浮层说明文字随卡一起隐藏）
+			this->UpdateHuiyuanLoginShow();
 
 			this->UpdateJiesuanInfo();
 
@@ -2214,17 +2212,41 @@ void CSaomashouyinPageUI::ClickMemberLogout()
 {
 	m_is_member = false;
 
-	CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_saomashouyin_member_login")));
-	pMemberLoginBtn->SetVisible(true);
-
-	this->FindSubControl(_T("saomashouyin_member_login_wrap"))->SetVisible(true);
-
-	this->FindSubControl(_T("saomashouyin_page_member_info"))->SetVisible(false);
+	//按「显示设置 → 会员登录」开关刷新登录入口 / 会员卡的显示
+	this->UpdateHuiyuanLoginShow();
 
 	this->UpdateJiesuanInfo();
 }
 
 
+//按「显示设置 → 会员登录」开关，刷新会员登录入口的显示/隐藏（关闭设置时整块隐藏，已登录的会员卡一起隐藏）
+void CSaomashouyinPageUI::UpdateHuiyuanLoginShow()
+{
+	bool is_show = (CSetting::GetInstance()->GetParam("setting_xianshi_is_huiyuan_login") != "0");
+
+	bool is_logined = (m_is_member == true);
+
+	CControlUI* p_login_wrap = this->FindSubControl(_T("saomashouyin_member_login_wrap"));
+	if (p_login_wrap != NULL)
+	{
+		//未登录才显示登录入口
+		p_login_wrap->SetVisible(is_show && (is_logined == false));
+	}
+
+	CControlUI* p_login_btn = this->FindSubControl(_T("btn_saomashouyin_member_login"));
+	if (p_login_btn != NULL)
+	{
+		p_login_btn->SetVisible(is_show && (is_logined == false));
+	}
+
+	CControlUI* p_member_info = this->FindSubControl(_T("saomashouyin_page_member_info"));
+	if (p_member_info != NULL)
+	{
+		//已登录才显示会员信息卡
+		p_member_info->SetVisible(is_show && is_logined);
+	}
+}
+
 //会员充值（照搬点单页实现，充值成功后刷新本页余额）
 void CSaomashouyinPageUI::ClickMemberChongzhi()
 {

zhipuzi_pos_windows/page/CSaomashouyinPageUI.h

@@ -107,6 +107,9 @@ public:
 	//处理会员退出登陆
 	void ClickMemberLogout();
 
+	//按「显示设置 → 会员登录」开关，刷新会员登录入口的显示/隐藏
+	void UpdateHuiyuanLoginShow();
+
 	//展示会员详情
 	void ClickMemberInfoShow();
 	void RefreshCartItemSelectedColor();

zhipuzi_pos_windows/page/CSettingPageUI.cpp

@@ -1081,6 +1081,34 @@ void CSettingPageUI::InitControl()
 		box_buchumo->Selected(true, false);
 	}
 	
+	//初始化会员登录显示设置
+	CCheckBoxUI* box_huiyuan_show = static_cast<CCheckBoxUI*>(this->FindSubControl(_T("xianshi_setting_huiyuan_show")));
+	CCheckBoxUI* box_huiyuan_hide = static_cast<CCheckBoxUI*>(this->FindSubControl(_T("xianshi_setting_huiyuan_hide")));
+	if (CSetting::GetInstance()->GetParam("setting_xianshi_is_huiyuan_login") == "0")
+	{
+		box_huiyuan_show->Selected(false, false);
+		box_huiyuan_hide->Selected(true, false);
+	}
+	else
+	{
+		box_huiyuan_show->Selected(true, false);
+		box_huiyuan_hide->Selected(false, false);
+	}
+
+	//初始化餐牌号显示设置
+	CCheckBoxUI* box_canpaihao_show = static_cast<CCheckBoxUI*>(this->FindSubControl(_T("xianshi_setting_canpaihao_show")));
+	CCheckBoxUI* box_canpaihao_hide = static_cast<CCheckBoxUI*>(this->FindSubControl(_T("xianshi_setting_canpaihao_hide")));
+	if (CSetting::GetInstance()->GetParam("setting_xianshi_is_canpaihao") == "0")
+	{
+		box_canpaihao_show->Selected(false, false);
+		box_canpaihao_hide->Selected(true, false);
+	}
+	else
+	{
+		box_canpaihao_show->Selected(true, false);
+		box_canpaihao_hide->Selected(false, false);
+	}
+
 	//初始化快捷键展示
 	this->InitKuaijiejianShow();
 }
@@ -1841,6 +1869,22 @@ void CSettingPageUI::HandleSelectChangeMsg(TNotifyUI& msg)
 	{
 		CSetting::GetInstance()->SetParam("setting_xianshi_is_chumojianpan", "0");
 	}
+	else if (name == _T("xianshi_setting_huiyuan_show"))
+	{
+		CSetting::GetInstance()->SetParam("setting_xianshi_is_huiyuan_login", "1");
+	}
+	else if (name == _T("xianshi_setting_huiyuan_hide"))
+	{
+		CSetting::GetInstance()->SetParam("setting_xianshi_is_huiyuan_login", "0");
+	}
+	else if (name == _T("xianshi_setting_canpaihao_show"))
+	{
+		CSetting::GetInstance()->SetParam("setting_xianshi_is_canpaihao", "1");
+	}
+	else if (name == _T("xianshi_setting_canpaihao_hide"))
+	{
+		CSetting::GetInstance()->SetParam("setting_xianshi_is_canpaihao", "0");
+	}
 	else if (name == _T("setting_dianzicheng_yilianjie"))
 	{
 		CSetting::GetInstance()->SetParam("setting_dianzicheng_is_lianjie", "1");

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.cpp

@@ -50,6 +50,9 @@ void CZhengcanDiandanPageUI::InitShow()
 	//先清空旧的订单信息，如果该桌子有订单关联后面会重新获取
 	m_cur_diandan_order.RefreshDiandanInfo();
 
+	//按「显示设置 → 会员登录」开关，刷新会员登录入口的显示/隐藏
+	this->UpdateHuiyuanLoginShow();
+
 	//初始化显示，先清空所有的购物车商品，然后清空活动，初始化价格展示，等后面获取到订单数据再重新刷新渲染
 	this->UpdateShopcartShow();
 
@@ -3090,10 +3093,8 @@ void CZhengcanDiandanPageUI::ClickMemberLogin()
 
 
 			CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_member_login")));
-			pMemberLoginBtn->SetVisible(false);
-
-			this->FindSubControl(_T("diandan_member_login_wrap"))->SetVisible(false);
-			this->FindSubControl(_T("diandan_page_member_info"))->SetVisible(true);
+			//按「显示设置 → 会员登录」开关刷新登录入口 / 会员卡的显示
+			this->UpdateHuiyuanLoginShow();
 
 			this->UpdateJiesuanInfo();
 
@@ -3160,15 +3161,40 @@ void CZhengcanDiandanPageUI::ClickMemberLogout()
 {
 	m_is_member = false;
 
-	CButtonUI* pMemberLoginBtn = static_cast<CButtonUI*>(this->FindSubControl(_T("btn_diandan_member_login")));
-	pMemberLoginBtn->SetVisible(true);
-
-	this->FindSubControl(_T("diandan_member_login_wrap"))->SetVisible(true);
-	this->FindSubControl(_T("diandan_page_member_info"))->SetVisible(false);
+	//按「显示设置 → 会员登录」开关刷新登录入口 / 会员卡的显示
+	this->UpdateHuiyuanLoginShow();
 
 	this->UpdateJiesuanInfo();
 }
 
+//按「显示设置 → 会员登录」开关，刷新会员登录入口的显示/隐藏（关闭设置时整块隐藏，已登录的会员卡一起隐藏）
+void CZhengcanDiandanPageUI::UpdateHuiyuanLoginShow()
+{
+	bool is_show = (CSetting::GetInstance()->GetParam("setting_xianshi_is_huiyuan_login") != "0");
+
+	bool is_logined = (m_is_member == true);
+
+	CControlUI* p_login_wrap = this->FindSubControl(_T("diandan_member_login_wrap"));
+	if (p_login_wrap != NULL)
+	{
+		//未登录才显示登录入口
+		p_login_wrap->SetVisible(is_show && (is_logined == false));
+	}
+
+	CControlUI* p_login_btn = this->FindSubControl(_T("btn_diandan_member_login"));
+	if (p_login_btn != NULL)
+	{
+		p_login_btn->SetVisible(is_show && (is_logined == false));
+	}
+
+	CControlUI* p_member_info = this->FindSubControl(_T("diandan_page_member_info"));
+	if (p_member_info != NULL)
+	{
+		//已登录才显示会员信息卡
+		p_member_info->SetVisible(is_show && is_logined);
+	}
+}
+
 void CZhengcanDiandanPageUI::ClickMemberInfoShow()
 {
 	if (m_is_show_modal_wnd == true)

zhipuzi_pos_windows/page/CZhengcanDiandanPageUI.h

@@ -132,6 +132,9 @@ public:
 	//处理会员退出登陆
 	void ClickMemberLogout();
 
+	//按「显示设置 → 会员登录」开关，刷新会员登录入口的显示/隐藏
+	void UpdateHuiyuanLoginShow();
+
 	//展示会员详情
 	void ClickMemberInfoShow();
 

zhipuzi_pos_windows/tool/CSetting.cpp

@@ -371,6 +371,20 @@ void CSetting::Init()
 		}
 	}
 
+	//会员登录入口显示相关的（默认显示）
+	std::string setting_xianshi_is_huiyuan_login = "setting_xianshi_is_huiyuan_login";
+	if (m_paramsMap.find(setting_xianshi_is_huiyuan_login) == m_paramsMap.end())
+	{
+		m_paramsMap[setting_xianshi_is_huiyuan_login] = "1";
+	}
+
+	//餐牌号显示相关的（默认显示）
+	std::string setting_xianshi_is_canpaihao = "setting_xianshi_is_canpaihao";
+	if (m_paramsMap.find(setting_xianshi_is_canpaihao) == m_paramsMap.end())
+	{
+		m_paramsMap[setting_xianshi_is_canpaihao] = "1";
+	}
+
 	//功能菜单的参数
 	std::string setting_gongneng_changyong_string = "setting_gongneng_changyong_string";
 	if (m_paramsMap.find(setting_gongneng_changyong_string) == m_paramsMap.end())