zhangyang 6 years ago
parent
commit
2edf68ca09

+ 19 - 0
bin/Win32/Debug/zhipuzi_pos_windows/skin/GameRes/main.xml

@@ -29,6 +29,25 @@
     				<Button name="closebtn" maxwidth="42" maxheight="18" normalimage="file='frame_btn_close_normal.bmp' mask='#FFFF00FF'" hotimage="file='frame_btn_close_hot.bmp' mask='#FFFF00FF'" pushedimage="file='frame_btn_close_down.bmp' mask='#FFFF00FF'"/>
     			</HorizontalLayout>
     		</HorizontalLayout>
+			
+			<TabLayout name="switch">	
+				<HorizontalLayout>
+					<HorizontalLayout width="300" bkcolor="#FFFFFFFF">
+						<VerticalLayout childpadding="20">
+							<Option name="waimai_open_switch" selected="true" showhtml="true" text="未处理" width="200" group="swithbar" align="center" normalimage="file='tab_normal.bmp' corner='2,2,2,2'" selectedimage="file='tab_select.bmp' corner='2,2,2,2'" hotimage="file='tab_hot.bmp' corner='2,2,2,2'" hottextcolor="#CC1010"/>
+							<Option name="waimai_confirmed_switch" showhtml="true" text="已确认" width="200" group="swithbar" align="center" normalimage="file='tab_normal.bmp' corner='2,2,2,2'" selectedimage="file='tab_select.bmp' corner='2,2,2,2'" hotimage="file='tab_hot.bmp' corner='2,2,2,2'" hottextcolor="#CC1010" />
+							<Option name="waimai_delivery_switch" showhtml="true" text="配送中" width="200" group="swithbar" align="center" normalimage="file='tab_normal.bmp' corner='2,2,2,2'" selectedimage="file='tab_select.bmp' corner='2,2,2,2'" hotimage="file='tab_hot.bmp' corner='2,2,2,2'" hottextcolor="#CC1010" />
+							<Option name="waimai_success_switch" showhtml="true" text="成功" width="200" group="swithbar" align="center" normalimage="file='tab_normal.bmp' corner='2,2,2,2'" selectedimage="file='tab_select.bmp' corner='2,2,2,2'" hotimage="file='tab_hot.bmp' corner='2,2,2,2'" hottextcolor="#CC1010" />
+							<Option name="waimai_fail_switch" showhtml="true" text="失败" width="200" group="swithbar" align="center" normalimage="file='tab_normal.bmp' corner='2,2,2,2'" selectedimage="file='tab_select.bmp' corner='2,2,2,2'" hotimage="file='tab_hot.bmp' corner='2,2,2,2'" hottextcolor="#CC1010" />
+							<Option name="waimai_refund_switch" showhtml="true" text="退款中" width="200" group="swithbar" align="center" normalimage="file='tab_normal.bmp' corner='2,2,2,2'" selectedimage="file='tab_select.bmp' corner='2,2,2,2'" hotimage="file='tab_hot.bmp' corner='2,2,2,2'" hottextcolor="#CC1010" />
+						</VerticalLayout>
+					</HorizontalLayout>
+					
+					<VerticalLayout bkcolor="#FF103668" vscrollbar="true">
+					
+					</VerticalLayout>
+				</HorizontalLayout>
+			</TabLayout>
         </VerticalLayout>
         
     	<VerticalLayout name="fadeEffect" visible="false" bkcolor="#20000000">

BIN
bin/Win32/Debug/zhipuzi_pos_windows/zhipuzi_pos_windows.exe


+ 15 - 2
lewaimai_dispatch/lewaimai_dispatch_windows.cpp

@@ -23,14 +23,27 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 #endif
 
 	HRESULT Hr = ::CoInitialize(NULL);
-	if (FAILED(Hr)) return 0;	
+	if (FAILED(Hr)) return 0;
 
+	CGameFrameWnd* pFrame = new CGameFrameWnd();
+	if (pFrame == NULL)
+	{
+		return 0;
+	}
+
+	pFrame->SetIcon(IDI_ICON_DUILIB);
+	pFrame->Create(NULL, _T("游戏中心"), UI_WNDSTYLE_FRAME, 0L, 0, 0, 1024, 738);
+	pFrame->CenterWindow();
+
+	::ShowWindow(*pFrame, SW_SHOWMAXIMIZED);
+
+/*
 	CLoginFrameWnd* pLoginFrame = new CLoginFrameWnd();
 	if (pLoginFrame == NULL) { return 0; }
 	pLoginFrame->Create(NULL, _T(""), UI_WNDSTYLE_DIALOG, 0, 0, 0, 0, 0, NULL);
 	pLoginFrame->SetIcon(IDI_ICON_DUILIB);
 	pLoginFrame->CenterWindow();
-	pLoginFrame->ShowModal();
+	pLoginFrame->ShowModal();*/
 
 	CPaintManagerUI::MessageLoop();
 

+ 1 - 0
lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj

@@ -210,6 +210,7 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClInclude Include="helper\CSystem.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="wnd\CGameFrameWnd.cpp" />
     <ClCompile Include="wnd\CLoginWnd.cpp" />
     <ClCompile Include="helper\MD5.cpp" />
     <ClCompile Include="network\CZhipuziHttpClient.cpp" />

+ 3 - 0
lewaimai_dispatch/lewaimai_dispatch_windows.vcxproj.filters

@@ -101,6 +101,9 @@
     <ClCompile Include="wnd\MiniDumper.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="wnd\CGameFrameWnd.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="conf\dispatch.conf" />

+ 1 - 18
lewaimai_dispatch/wnd/CGameFrameWnd.h

@@ -100,24 +100,7 @@ public:
 		}
 	}
 
-	LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-	{
-		LONG styleValue = ::GetWindowLong(*this, GWL_STYLE);
-		styleValue &= ~WS_CAPTION;
-		::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
-
-		m_pm.Init(m_hWnd);
-		CDialogBuilder builder;
-
-		CControlUI* pRoot = builder.Create(_T("main.xml"), (UINT)0, NULL, &m_pm);
-		ASSERT(pRoot && "Failed to parse XML");
-
-		m_pm.AttachDialog(pRoot);
-		m_pm.AddNotifier(this);
-
-		Init();
-		return 0;
-	}
+	LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
 
 	LRESULT OnClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
 	{