张洋 1 day ago
parent
commit
dcc0c91616

+ 43 - 34
bin/Win32/Debug/zhipuzi_pos_windows/skin/aixuexi_page.xml

@@ -7,50 +7,59 @@
     <Font id="4" name="微软雅黑" size="12" />
 
 	<AIxuexiPage>
-		<HorizontalLayout>
-			<Control width="1" bkcolor="#FFD1D1D1"></Control>
+		<VerticalLayout name="page_layout">		
+			<HorizontalLayout height="60" bkcolor="#FFFFFFFF">
+				<Button name="aixuexi_page_return" tooltip="返回" width="38" height="38" padding="10,11,0,0" normalimage="file='zhengcan_back.png'" hotimage="" pushedimage=""/>
+				<Label name="aixuexi_page_name" text="AI学习" font="28" textcolor="#FF1087FF" width="300" height="30" padding="10,12,10,10"></Label>
+			</HorizontalLayout>
 			
-            <VerticalLayout name="aixuexi_page_paishe_layout" width="420" padding="0,0,0,0" bordercorner="10,10" bkcolor="#FFFFFFFF" autocalcwidth="true">
-                <Label name="aixuexi_page_xuanzhong_food_name" text="当前选中商品:无" height="22" padding="10,10,10,10" textcolor="#FFFF0000" font="aixuexi_1"></Label>
+			<Control height="1" bkcolor="#FFEBE8E8"></Control>
 
-                <Label name="aixuexi_page_xuanzhong_food_name" wordbreak="true" height="40" padding="10,0,10,10" font="3" text="智铺子AI识别无需学习默认就能识别几百种常见的水果蔬菜,只需要对未正常识别的冷门商品或非水果蔬菜类商品进行学习。"></Label>
+			<HorizontalLayout>
+				<Control width="1" bkcolor="#FFD1D1D1"></Control>
+				
+				<VerticalLayout name="aixuexi_page_paishe_layout" width="420" padding="0,0,0,0" bordercorner="10,10" bkcolor="#FFFFFFFF" autocalcwidth="true">
+					<Label name="aixuexi_page_xuanzhong_food_name" text="当前选中商品:无" height="22" padding="10,10,10,10" textcolor="#FFFF0000" font="aixuexi_1"></Label>
 
-                <Control name="image" width="400" height="300" padding="10,0,10,0"></Control>
+					<Label name="aixuexi_page_xuanzhong_food_name" wordbreak="true" height="40" padding="10,0,10,10" font="3" text="智铺子AI识别无需学习默认就能识别几百种常见的水果蔬菜,只需要对未正常识别的冷门商品或非水果蔬菜类商品进行学习。"></Label>
 
-                <HorizontalLayout height="50" padding="0,20,0,0">
-                    <Control></Control>
-                        <Button name="aixuexi_page_paishe_btn" width="150" height="50" text="拍摄并学习" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
-                    <Control></Control>
-                </HorizontalLayout>
+					<Control name="image" width="400" height="300" padding="10,0,10,0"></Control>
 
-                <TileLayout name="aixuexi_page_food_xuexi_image_layout" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
-					
-				</TileLayout>                
-            </VerticalLayout> 
+					<HorizontalLayout height="50" padding="0,20,0,0">
+						<Control></Control>
+							<Button name="aixuexi_page_paishe_btn" width="150" height="50" text="拍摄并学习" textcolor="#FFFFFFFF" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'" />
+						<Control></Control>
+					</HorizontalLayout>
 
-            <Control width="1" bkcolor="#FFEBE8E8"></Control>
-			
-			<VerticalLayout name="aixuexi_page_food_layout">
-				<VerticalLayout name="aixuexi_page_fenlei_layout_scrolllayout" vscrollbar="true">
-					<HorizontalLayout name="aixuexi_page_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+					<TileLayout name="aixuexi_page_food_xuexi_image_layout" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
+						
+					</TileLayout>                
+				</VerticalLayout> 
 
-					</HorizontalLayout>
-				</VerticalLayout>				
+				<Control width="1" bkcolor="#FFEBE8E8"></Control>
 				
-				<TileLayout name="aixuexi_page_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
-				
-				</TileLayout>
-				
-				<HorizontalLayout height="70" padding="0,0,0,0" bkcolor="#FFFFFFFF">
-					<Edit name="aixuexi_page_food_search_edit" tooltip="请输入商品名字搜索" width="400" height="50" padding="30,10,0,10" textpadding="50,0,50,0" borderround="45,45" bkcolor="#FFECEFED" nativebkcolor="#FFECEFED" />
+				<VerticalLayout name="aixuexi_page_food_layout">
+					<VerticalLayout name="aixuexi_page_fenlei_layout_scrolllayout" vscrollbar="true">
+						<HorizontalLayout name="aixuexi_page_fenlei_layout" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+
+						</HorizontalLayout>
+					</VerticalLayout>				
 					
-					<Label name="aixuexi_page_food_search_tishi" text="请输入商品名字搜索" width="120" height="35" font="16" float="true" pos="90,18,425,50" mouse="false"></Label>
+					<TileLayout name="aixuexi_page_foodlist" padding="0,0,0,0" inset="10,10,0,10" childpadding="10" vscrollbar="true" hscrollbar="false">
 					
-					<Control bkimage="search_icon.png" width="25" height="26" pos="45,23,70,49" float="true"></Control>
+					</TileLayout>
 					
-					<Button name="aixuexi_page_food_search_clear" visible="false" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png" bkimage="search_clear.png" width="23" height="23" pos="385,23,408,46" float="true"></Button>
-				</HorizontalLayout>
-			</VerticalLayout>
-		</HorizontalLayout>
+					<HorizontalLayout height="70" padding="0,0,0,0" bkcolor="#FFFFFFFF">
+						<Edit name="aixuexi_page_food_search_edit" tooltip="请输入商品名字搜索" width="400" height="50" padding="30,10,0,10" textpadding="50,0,50,0" borderround="45,45" bkcolor="#FFECEFED" nativebkcolor="#FFECEFED" />
+						
+						<Label name="aixuexi_page_food_search_tishi" text="请输入商品名字搜索" width="120" height="35" font="16" float="true" pos="90,18,425,50" mouse="false"></Label>
+						
+						<Control bkimage="search_icon.png" width="25" height="26" pos="45,23,70,49" float="true"></Control>
+						
+						<Button name="aixuexi_page_food_search_clear" visible="false" normalimage="search_clear.png" hotimage="search_clear.png" pushedimage="search_clear.png" bkimage="search_clear.png" width="23" height="23" pos="385,23,408,46" float="true"></Button>
+					</HorizontalLayout>
+				</VerticalLayout>
+			</HorizontalLayout>
+		</VerticalLayout>
 	</AIxuexiPage>
 </Window>

+ 4 - 0
zhipuzi_pos_windows/page/CAIxuexiPageUI.cpp

@@ -367,6 +367,10 @@ void CAIxuexiPageUI::HandleClickMsg(TNotifyUI& msg)
 
 		SQLiteVecManager::GetInstance()->DeleteFeatureVectorByImageName(imageName);
 	}
+	else if (name == L"aixuexi_page_return")
+	{
+		m_pMainWnd->SwitchPage(CMainWnd::DIANDAN);
+	}
 }
 
 void CAIxuexiPageUI::HandleSelectChangeMsg(TNotifyUI& msg)