Procházet zdrojové kódy

布局框架调整好了

张洋 před 4 roky
rodič
revize
4965e37f97

binární
bin/Win32/Debug/zhipuzi_pos_windows/db/pos.db


+ 6 - 0
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_fooditem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Window>
+	<DiandanFoodItem bkcolor="#FFFFFFFF" padding="0,0,0,0">
+
+	</DiandanFoodItem>
+</Window>

+ 8 - 0
bin/Win32/Debug/zhipuzi_pos_windows/skin/diandan_index.xml

@@ -69,6 +69,14 @@
 				
 				<Option name="option_diandan_1" group="diandan_fenlei_tab" text="商品分类1" width="120" height="38" padding="0,0,15,0" bkcolor="#FFFFFFFF" selectedtextcolor="FFFF0000"></Option>
 			</HorizontalLayout>
+			
+			<FoodList name="diandan_foodlist" padding="15,15,15,0" bkcolor="#FFDEB887" vscrollbar="true">
+			
+			</FoodList>
+			
+			<HorizontalLayout height="100" bkcolor="#FFFFFFFF" padding="15,15,15,15">
+			
+			</HorizontalLayout>
 		</VerticalLayout>
 	</HorizontalLayout>
 </Window>

+ 13 - 0
zhipuzi_pos_windows/control/CDiandanFoodItemUI.cpp

@@ -0,0 +1,13 @@
+#include "CDiandanFoodItemUI.h"
+
+#include "../pch/pch.h"
+
+CDiandanFoodItemUI::CDiandanFoodItemUI()
+{
+
+}
+
+
+CDiandanFoodItemUI::~CDiandanFoodItemUI()
+{
+}

+ 11 - 0
zhipuzi_pos_windows/control/CDiandanFoodItemUI.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include "../pch/pch.h"
+
+class CDiandanFoodItemUI : public CVerticalLayoutUI
+{
+public:
+	CDiandanFoodItemUI();
+	~CDiandanFoodItemUI();
+};
+

+ 58 - 0
zhipuzi_pos_windows/control/CFoodlistUI.cpp

@@ -0,0 +1,58 @@
+#include "CFoodlistUI.h"
+#include "CDiandanFoodItemUI.h"
+
+#include "ControlEx.h"
+
+inline double CalculateDelay(double state) {
+	return pow(state, 2);
+}
+
+CFoodlistUI::CFoodlistUI()
+{
+	this->Refresh(1);
+}
+
+
+CFoodlistUI::~CFoodlistUI()
+{
+}
+
+void CFoodlistUI::DoEvent(TEventUI& event)
+{
+	CTileLayoutUI::DoEvent(event);
+}
+
+void CFoodlistUI::Refresh(int nType)
+{
+	SIZE itemSize;
+	itemSize.cx = 150;
+	itemSize.cy = 200;
+
+	this->SetItemSize(itemSize);
+
+	this->SetChildPadding(20);
+	this->SetChildVPadding(20);
+
+	this->
+
+	for (int i = 0; i < 50; ++i)
+	{
+		//´´½¨Ò»¸ö¶ÔÏó
+		CDialogBuilder builder;
+		CDialogBuilderCallbackEx cb;
+
+		CDiandanFoodItemUI* pItem = static_cast<CDiandanFoodItemUI*>(builder.Create(_T("diandan_fooditem.xml"), (UINT)0, &cb, m_pManager));
+		if (pItem != NULL)
+		{
+			
+
+			this->Add(pItem);
+
+			pItem = NULL;
+		}
+		else
+		{
+			LOG_INFO("create waimai_order_item fail!");
+		}
+	}
+}

+ 24 - 0
zhipuzi_pos_windows/control/CFoodlistUI.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "../pch/pch.h"
+
+class CFoodlistUI : public CTileLayoutUI
+{
+public:
+	CFoodlistUI();
+	~CFoodlistUI();
+
+	enum { SCROLL_TIMERID = 10 };
+
+	void Refresh(int nType);
+
+	void DoEvent(TEventUI& event);
+
+private:
+	UINT m_uButtonState;
+	POINT m_ptLastMouse;
+	LONG m_dwDelayDeltaY;
+	DWORD m_dwDelayNum;
+	DWORD m_dwDelayLeft;
+};
+

+ 10 - 0
zhipuzi_pos_windows/control/ControlEx.h

@@ -6,6 +6,8 @@
 #include "OrderListUI.h"
 #include "CWaimaiOrderInfoUI.h"
 #include "CSettingUI.h"
+#include "CFoodlistUI.h"
+#include "CDiandanFoodItemUI.h"
 
 class CDialogBuilderCallbackEx : public IDialogBuilderCallback
 {
@@ -28,6 +30,14 @@ public:
 		{
 			return new CSettingUI;
 		}
+		else if (_tcscmp(pstrClass, _T("FoodList")) == 0)
+		{
+			return new CFoodlistUI;
+		}
+		else if (_tcscmp(pstrClass, _T("DiandanFoodItem")) == 0)
+		{
+			return new CDiandanFoodItemUI;
+		}
 
 		return NULL;
 	}

+ 5 - 0
zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj

@@ -225,7 +225,10 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="control\CDiandanFoodItemUI.h" />
+    <ClInclude Include="control\CFoodlistUI.h" />
     <ClInclude Include="helper\CBitmapHelper.h" />
+    <ClInclude Include="network\CZhipuziHttpProxy.h" />
     <ClInclude Include="tool\CComHelper.h" />
     <ClInclude Include="tool\CExceptionDmp.h" />
     <ClInclude Include="wnd\CMessageboxWnd.h" />
@@ -258,6 +261,8 @@ copy $(ProjectDir)conf\ $(SolutionDir)bin\$(Platform)\$(Configuration)\conf\</Co
     <ClInclude Include="control\OrderListUI.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="control\CDiandanFoodItemUI.cpp" />
+    <ClCompile Include="control\CFoodlistUI.cpp" />
     <ClCompile Include="helper\CBitmapHelper.cpp" />
     <ClCompile Include="tool\CComHelper.cpp" />
     <ClCompile Include="tool\CExceptionDmp.cpp" />

+ 15 - 0
zhipuzi_pos_windows/zhipuzi_pos_windows.vcxproj.filters

@@ -108,6 +108,15 @@
     <ClInclude Include="tool\CExceptionDmp.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="control\CFoodlistUI.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="network\CZhipuziHttpProxy.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="control\CDiandanFoodItemUI.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch\pch.cpp">
@@ -194,6 +203,12 @@
     <ClCompile Include="tool\CExceptionDmp.cpp">
       <Filter>源文件</Filter>
     </ClCompile>
+    <ClCompile Include="control\CFoodlistUI.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="control\CDiandanFoodItemUI.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="resource\zhipuzi.ico">