Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece
BIN
image/page_drink_disable_n2/bn__hot_americano_light_opus_one.png
Normal file
|
After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 72 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 67 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 75 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 74 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 66 KiB |
BIN
image/page_drink_n/bn__hot_americano_light_opus_one.png
Normal file
|
After Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 38 KiB After Width: | Height: | Size: 38 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 30 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 23 KiB |
BIN
image/page_drink_press_n/bn__hot_americano_light_opus_one.png
Normal file
|
After Width: | Height: | Size: 77 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 78 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 73 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 81 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 80 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 73 KiB |
|
|
@ -78,13 +78,9 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml"
|
|
||||||
Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
|
Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
|
||||||
Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml"
|
|
||||||
|
|
||||||
|
|
||||||
Var InstanceTabOpenFile14 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml"
|
|
||||||
Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/start_up_inst_dummy.lxml
|
|
||||||
Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
|
Var InstanceTabOpenFile13 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
|
||||||
|
|
||||||
TabMenuVisibleInst 99
|
TabMenuVisibleInst 99
|
||||||
|
|
|
||||||
|
|
@ -66,14 +66,17 @@
|
||||||
If CupOnArm = "true" Then
|
If CupOnArm = "true" Then
|
||||||
If RecommendTimeOut > 9 Then
|
If RecommendTimeOut > 9 Then
|
||||||
SAVELOG "COA9"
|
SAVELOG "COA9"
|
||||||
|
Var NextPageAlternate = NextPage
|
||||||
Var NextPage = "-"
|
Var NextPage = "-"
|
||||||
Open NextPage
|
Open NextPageAlternate
|
||||||
EndIf
|
EndIf
|
||||||
Else
|
Else
|
||||||
If RecommendTimeOut > 30 Then
|
If RecommendTimeOut > 30 Then
|
||||||
SAVELOG "COA30"
|
SAVELOG "COA30"
|
||||||
|
Var NextPageAlternate = NextPage
|
||||||
Var NextPage = "-"
|
Var NextPage = "-"
|
||||||
Open NextPage
|
Open NextPageAlternate
|
||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
|
||||||
|
|
@ -66,14 +66,17 @@
|
||||||
If CupOnArm = "true" Then
|
If CupOnArm = "true" Then
|
||||||
If RecommendTimeOut > 9 Then
|
If RecommendTimeOut > 9 Then
|
||||||
SAVELOG "COA9"
|
SAVELOG "COA9"
|
||||||
|
Var NextPageAlternate = NextPage
|
||||||
Var NextPage = "-"
|
Var NextPage = "-"
|
||||||
Open NextPage
|
Open NextPageAlternate
|
||||||
EndIf
|
EndIf
|
||||||
Else
|
Else
|
||||||
If RecommendTimeOut > 30 Then
|
If RecommendTimeOut > 30 Then
|
||||||
SAVELOG "COA30"
|
SAVELOG "COA30"
|
||||||
|
Var NextPageAlternate = NextPage
|
||||||
Var NextPage = "-"
|
Var NextPage = "-"
|
||||||
Open NextPage
|
Open NextPageAlternate
|
||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
|
||||||
|
|
@ -68,14 +68,17 @@
|
||||||
If CupOnArm = "true" Then
|
If CupOnArm = "true" Then
|
||||||
If RecommendTimeOut > 9 Then
|
If RecommendTimeOut > 9 Then
|
||||||
SAVELOG "COA9"
|
SAVELOG "COA9"
|
||||||
|
Var NextPageAlternate = NextPage
|
||||||
Var NextPage = "-"
|
Var NextPage = "-"
|
||||||
Open NextPage
|
Open NextPageAlternate
|
||||||
EndIf
|
EndIf
|
||||||
Else
|
Else
|
||||||
If RecommendTimeOut > 30 Then
|
If RecommendTimeOut > 30 Then
|
||||||
SAVELOG "COA30"
|
SAVELOG "COA30"
|
||||||
|
Var NextPageAlternate = NextPage
|
||||||
Var NextPage = "-"
|
Var NextPage = "-"
|
||||||
Open NextPage
|
Open NextPageAlternate
|
||||||
|
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
|
||||||