diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv index abdb097b..10535203 100644 --- a/animation01/Menu Description - Sheet1.tsv +++ b/animation01/Menu Description - Sheet1.tsv @@ -145,6 +145,12 @@ HOT AMERICANO BLUE DADDY 12-01-01-0019 1 2 42 3 4 5 16 24 88 1:28 32 ICED AMERICANO BLUE DADDY 12-01-02-0019 1 2 42 3 4 5 23 16 24 133 2:13 32 ESPRESSO BLUE DADDY 12-01-01-0020 1 2 42 3 4 5 24 66 1:06 32 +MOZART ALMOST DIRTY 12-01-02-0022 1 7 43 2 3 4 5 24 100 22:40 32 +อเมริกาโนร้อน 12-01-01-0021 1 2 43 3 4 5 16 24 88 1:28 32 +อเมริกาโนเย็น 12-01-02-0021 1 2 43 3 4 5 23 16 24 133 2:13 32 +เอสเพรสโซ่ช็อต 12-01-01-0022 1 2 43 3 4 5 24 66 1:06 32 + + diff --git a/image/topping2/bd_add_shot.png b/image/topping2/bd_add_shot.png index 457f7583..b307f146 100644 Binary files a/image/topping2/bd_add_shot.png and b/image/topping2/bd_add_shot.png differ diff --git a/image/topping2/bd_lid.png b/image/topping2/bd_lid.png index bccf8589..0d8e9ed8 100644 Binary files a/image/topping2/bd_lid.png and b/image/topping2/bd_lid.png differ diff --git a/image/topping2/bd_straw.png b/image/topping2/bd_straw.png index b89bde0e..c9c1393c 100644 Binary files a/image/topping2/bd_straw.png and b/image/topping2/bd_straw.png differ diff --git a/image/topping2/blender_icon.png b/image/topping2/blender_icon.png new file mode 100644 index 00000000..232074d7 Binary files /dev/null and b/image/topping2/blender_icon.png differ diff --git a/image/topping2/cb_checkdis.png b/image/topping2/cb_checkdis.png new file mode 100644 index 00000000..f5249c29 Binary files /dev/null and b/image/topping2/cb_checkdis.png differ diff --git a/image/topping2/cb_disable.png b/image/topping2/cb_disable.png new file mode 100644 index 00000000..3d6a0cfe Binary files /dev/null and b/image/topping2/cb_disable.png differ diff --git a/image/topping2/cb_disable_alway.png b/image/topping2/cb_disable_alway.png new file mode 100644 index 00000000..3d6a0cfe Binary files /dev/null and b/image/topping2/cb_disable_alway.png differ diff --git a/image/topping2/cb_force_checked.png b/image/topping2/cb_force_checked.png new file mode 100644 index 00000000..febd66c8 Binary files /dev/null and b/image/topping2/cb_force_checked.png differ diff --git a/image/topping2/text20.png b/image/topping2/text20.png new file mode 100644 index 00000000..51cae1df Binary files /dev/null and b/image/topping2/text20.png differ diff --git a/image/topping2/text21.png b/image/topping2/text21.png new file mode 100644 index 00000000..0360c597 Binary files /dev/null and b/image/topping2/text21.png differ diff --git a/image/topping2/text4.png b/image/topping2/text4.png new file mode 100644 index 00000000..b9f68c40 Binary files /dev/null and b/image/topping2/text4.png differ diff --git a/image/topping2/text5.png b/image/topping2/text5.png new file mode 100644 index 00000000..ae851650 Binary files /dev/null and b/image/topping2/text5.png differ diff --git a/image/topping2/text7.png b/image/topping2/text7.png new file mode 100644 index 00000000..0efc2cde Binary files /dev/null and b/image/topping2/text7.png differ diff --git a/image/topping2_en/bd_lid.png b/image/topping2_en/bd_lid.png index 3b83102b..0d8e9ed8 100644 Binary files a/image/topping2_en/bd_lid.png and b/image/topping2_en/bd_lid.png differ diff --git a/image/topping2_en/bd_straw.png b/image/topping2_en/bd_straw.png index 68c6f293..f230feaa 100644 Binary files a/image/topping2_en/bd_straw.png and b/image/topping2_en/bd_straw.png differ diff --git a/image/topping2_en/cb_checkdis.png b/image/topping2_en/cb_checkdis.png new file mode 100644 index 00000000..f5249c29 Binary files /dev/null and b/image/topping2_en/cb_checkdis.png differ diff --git a/image/topping2_en/cb_checked.png b/image/topping2_en/cb_checked.png index b862146d..f5d42843 100644 Binary files a/image/topping2_en/cb_checked.png and b/image/topping2_en/cb_checked.png differ diff --git a/image/topping2_en/cb_notcheck.png b/image/topping2_en/cb_notcheck.png index 116c2f7e..174df0da 100644 Binary files a/image/topping2_en/cb_notcheck.png and b/image/topping2_en/cb_notcheck.png differ diff --git a/image/topping2_en/text20.png b/image/topping2_en/text20.png new file mode 100644 index 00000000..475ce033 Binary files /dev/null and b/image/topping2_en/text20.png differ diff --git a/image/topping2_en/text21.png b/image/topping2_en/text21.png new file mode 100644 index 00000000..88d93b24 Binary files /dev/null and b/image/topping2_en/text21.png differ diff --git a/image/topping2_en/text4.png b/image/topping2_en/text4.png new file mode 100644 index 00000000..bf2f714a Binary files /dev/null and b/image/topping2_en/text4.png differ diff --git a/image/topping2_en/text5.png b/image/topping2_en/text5.png new file mode 100644 index 00000000..93eba60e Binary files /dev/null and b/image/topping2_en/text5.png differ diff --git a/image/topping2_en/text7.png b/image/topping2_en/text7.png new file mode 100644 index 00000000..258717ca Binary files /dev/null and b/image/topping2_en/text7.png differ diff --git a/xml/menu_gen.py b/xml/menu_gen.py index fc55808f..c3a46086 100644 --- a/xml/menu_gen.py +++ b/xml/menu_gen.py @@ -115,6 +115,13 @@ out_xml( '\t $' + product_code[i] + '.descriptionE \r\n') out_xml( '\t\r\n') + out_xml( '\t\r\n') + out_xml( '\t 2 \r\n') + out_xml( '\t 2 \r\n') + out_xml( '\t eval( STRCONTAIN "Smoothie" $' + product_code[i] + '.Button SmoRet \n If SmoRet = "true" Then\n Var return = "Enable"\n Else\n Var return = "Invisible"\n EndIf\n) \r\n') + out_xml( '\t "ROOT/taobin_project/image/topping2/blender_icon.png" \r\n') + out_xml( '\t\r\n') + out_xml( '\r\n') diff --git a/xml/page_board.xml b/xml/page_board.xml index cc1f015a..3036fe86 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -611,7 +611,7 @@ 50 SoundVolume - ;Var countClick = countClick + 1 + Var countClick = countClick + 1 If countClick = 3 Then ;Var TestLoopMakeDrink = 1 @@ -623,7 +623,7 @@ Var countClick = 0 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_tel_number_mask.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_free.xml" TopView "show" Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml index 55ce2469..7e12960a 100644 --- a/xml/page_catalog_choose_drink.xml +++ b/xml/page_catalog_choose_drink.xml @@ -353,6 +353,18 @@ showengText $best_seller_1.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_1.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-01-01-0003 @@ -446,6 +458,18 @@ showengText $12-01-01-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-01-01-0004 @@ -539,6 +563,18 @@ showengText $12-01-01-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-01-02-0003 @@ -632,6 +668,18 @@ showengText $12-01-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-03-02-0002 @@ -725,6 +773,18 @@ showengText $12-03-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-03-02-0004 @@ -818,6 +878,18 @@ showengText $12-03-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-02-02-0002 @@ -911,6 +983,18 @@ showengText $12-02-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-02-02-0004 @@ -1004,6 +1088,18 @@ showengText $12-02-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-02-02-0001 @@ -1097,6 +1193,18 @@ showengText $12-02-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-02-02-0007 @@ -1190,6 +1298,18 @@ showengText $12-02-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 12-02-02-0008 @@ -1283,6 +1403,18 @@ showengText $12-02-02-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=12 12-05-02-0007 @@ -1376,6 +1508,18 @@ showengText $12-05-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 12-05-02-0021 @@ -1469,6 +1613,18 @@ showengText $12-05-02-0021.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=14 12-05-02-0013 @@ -1562,6 +1718,18 @@ showengText $12-05-02-0013.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=15 12-05-02-0012 @@ -1655,6 +1823,18 @@ showengText $12-05-02-0012.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=16 12-05-02-0009 @@ -1748,6 +1928,18 @@ showengText $12-05-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index b4b534ff..51136105 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -353,6 +353,18 @@ showengText $best_seller_1.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_1.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 best_seller_2 @@ -446,6 +458,18 @@ showengText $best_seller_2.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_2.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 best_seller_3 @@ -539,6 +563,18 @@ showengText $best_seller_3.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_3.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 best_seller_4 @@ -632,6 +668,18 @@ showengText $best_seller_4.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_4.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 best_seller_5 @@ -725,6 +773,18 @@ showengText $best_seller_5.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_5.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 best_seller_6 @@ -818,6 +878,18 @@ showengText $best_seller_6.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_6.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 best_seller_7 @@ -911,6 +983,18 @@ showengText $best_seller_7.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_7.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 best_seller_8 @@ -1004,6 +1088,18 @@ showengText $best_seller_8.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_8.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 best_seller_9 @@ -1097,6 +1193,18 @@ showengText $best_seller_9.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_9.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 best_seller_10 @@ -1190,6 +1298,18 @@ showengText $best_seller_10.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_10.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 best_seller_11 @@ -1283,6 +1403,18 @@ showengText $best_seller_11.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_11.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=12 best_seller_12 @@ -1376,6 +1508,18 @@ showengText $best_seller_12.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_12.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 best_seller_13 @@ -1469,6 +1613,18 @@ showengText $best_seller_13.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_13.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=14 best_seller_14 @@ -1562,6 +1718,18 @@ showengText $best_seller_14.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_14.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=15 best_seller_15 @@ -1655,6 +1823,18 @@ showengText $best_seller_15.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_15.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=16 best_seller_16 @@ -1748,6 +1928,18 @@ showengText $best_seller_16.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $best_seller_16.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 19f4dbc0..251aaa5f 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -357,6 +357,18 @@ showengText $12-01-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-01-01-0013 @@ -450,6 +462,18 @@ showengText $12-01-01-0013.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-01-01-0020 @@ -543,6 +567,18 @@ showengText $12-01-01-0020.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-01-01-0022 @@ -636,6 +672,18 @@ showengText $12-01-01-0022.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-11-01-0001 @@ -729,6 +777,18 @@ showengText $12-11-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-11-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-01-01-0003 @@ -822,6 +882,18 @@ showengText $12-01-01-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-01-01-0014 @@ -915,6 +987,18 @@ showengText $12-01-01-0014.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0014.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-01-01-0019 @@ -1008,6 +1092,18 @@ showengText $12-01-01-0019.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-01-01-0021 @@ -1101,6 +1197,18 @@ showengText $12-01-01-0021.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-01-01-0004 @@ -1194,6 +1302,18 @@ showengText $12-01-01-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 12-01-01-0005 @@ -1287,6 +1407,18 @@ showengText $12-01-01-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=12 12-01-01-0006 @@ -1380,6 +1512,18 @@ showengText $12-01-01-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 12-01-01-0007 @@ -1473,6 +1617,18 @@ showengText $12-01-01-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=14 12-01-01-0009 @@ -1566,6 +1722,18 @@ showengText $12-01-01-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=15 12-01-01-0010 @@ -1659,6 +1827,18 @@ showengText $12-01-01-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=16 12-01-01-0011 @@ -1752,6 +1932,18 @@ showengText $12-01-01-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=17 12-01-01-0012 @@ -1845,6 +2037,18 @@ showengText $12-01-01-0012.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=18 12-01-01-0017 @@ -1938,6 +2142,18 @@ showengText $12-01-01-0017.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-01-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=19 12-01-02-0018 @@ -2031,6 +2247,18 @@ showengText $12-01-02-0018.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0018.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=20 12-01-02-0020 @@ -2124,6 +2352,18 @@ showengText $12-01-02-0020.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=21 12-01-02-0022 @@ -2217,6 +2457,18 @@ showengText $12-01-02-0022.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=22 12-11-02-0001 @@ -2310,6 +2562,18 @@ showengText $12-11-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-11-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=23 12-01-02-0001 @@ -2403,6 +2667,18 @@ showengText $12-01-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=24 12-01-02-0011 @@ -2496,6 +2772,18 @@ showengText $12-01-02-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=25 12-01-02-0019 @@ -2589,6 +2877,18 @@ showengText $12-01-02-0019.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=26 12-01-02-0021 @@ -2682,6 +2982,18 @@ showengText $12-01-02-0021.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=27 12-01-02-0002 @@ -2775,6 +3087,18 @@ showengText $12-01-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=28 12-11-02-0002 @@ -2868,6 +3192,18 @@ showengText $12-11-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-11-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=29 12-01-02-0003 @@ -2961,6 +3297,18 @@ showengText $12-01-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=30 12-01-02-0004 @@ -3054,6 +3402,18 @@ showengText $12-01-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=31 12-01-02-0005 @@ -3147,6 +3507,18 @@ showengText $12-01-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=32 12-01-02-0007 @@ -3240,6 +3612,18 @@ showengText $12-01-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=33 12-01-02-0008 @@ -3333,6 +3717,18 @@ showengText $12-01-02-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=34 12-01-02-0009 @@ -3426,6 +3822,18 @@ showengText $12-01-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=35 12-01-02-0017 @@ -3519,6 +3927,18 @@ showengText $12-01-02-0017.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-01-02-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=36 11-01-02-0009 @@ -3612,6 +4032,18 @@ showengText $11-01-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-01-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index ca10ae9e..02422cf0 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -353,6 +353,18 @@ showengText $12-02-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-02-01-0002 @@ -446,6 +458,18 @@ showengText $12-02-01-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-02-01-0020 @@ -539,6 +563,18 @@ showengText $12-02-01-0020.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-02-01-0003 @@ -632,6 +668,18 @@ showengText $12-02-01-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-02-01-0004 @@ -725,6 +773,18 @@ showengText $12-02-01-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-02-01-0006 @@ -818,6 +878,18 @@ showengText $12-02-01-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-02-01-0021 @@ -911,6 +983,18 @@ showengText $12-02-01-0021.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-02-01-0007 @@ -1004,6 +1088,18 @@ showengText $12-02-01-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-02-01-0008 @@ -1097,6 +1193,18 @@ showengText $12-02-01-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-02-01-0019 @@ -1190,6 +1298,18 @@ showengText $12-02-01-0019.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 12-02-01-0009 @@ -1283,6 +1403,18 @@ showengText $12-02-01-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=12 12-02-01-0022 @@ -1376,6 +1508,18 @@ showengText $12-02-01-0022.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 12-02-01-0010 @@ -1469,6 +1613,18 @@ showengText $12-02-01-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=14 12-02-01-0011 @@ -1562,6 +1718,18 @@ showengText $12-02-01-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=15 12-02-01-0012 @@ -1655,6 +1823,18 @@ showengText $12-02-01-0012.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=16 12-02-01-0017 @@ -1748,6 +1928,18 @@ showengText $12-02-01-0017.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-01-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=17 12-02-02-0020 @@ -1841,6 +2033,18 @@ showengText $12-02-02-0020.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=18 12-02-02-0001 @@ -1934,6 +2138,18 @@ showengText $12-02-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=19 12-02-02-0002 @@ -2027,6 +2243,18 @@ showengText $12-02-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=20 12-02-02-0003 @@ -2120,6 +2348,18 @@ showengText $12-02-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=21 12-02-02-0004 @@ -2213,6 +2453,18 @@ showengText $12-02-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=22 12-02-02-0005 @@ -2306,6 +2558,18 @@ showengText $12-02-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=23 12-02-02-0006 @@ -2399,6 +2663,18 @@ showengText $12-02-02-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=24 12-02-02-0007 @@ -2492,6 +2768,18 @@ showengText $12-02-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=25 12-02-02-0008 @@ -2585,6 +2873,18 @@ showengText $12-02-02-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=26 12-02-02-0019 @@ -2678,6 +2978,18 @@ showengText $12-02-02-0019.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=27 12-02-02-0009 @@ -2771,6 +3083,18 @@ showengText $12-02-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=28 12-02-02-0022 @@ -2864,6 +3188,18 @@ showengText $12-02-02-0022.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0022.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=29 12-02-02-0010 @@ -2957,6 +3293,18 @@ showengText $12-02-02-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=30 12-02-02-0011 @@ -3050,6 +3398,18 @@ showengText $12-02-02-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=31 12-02-02-0012 @@ -3143,6 +3503,18 @@ showengText $12-02-02-0012.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-02-02-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=32 12-05-02-0027 @@ -3236,6 +3608,18 @@ showengText $12-05-02-0027.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0027.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index da1a229e..6bb0cd2b 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -354,6 +354,18 @@ showengText $12-03-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-03-01-0002 @@ -447,6 +459,18 @@ showengText $12-03-01-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-01-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-03-01-0003 @@ -540,6 +564,18 @@ showengText $12-03-01-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-01-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-03-01-0004 @@ -633,6 +669,18 @@ showengText $12-03-01-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-01-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-03-01-0005 @@ -726,6 +774,18 @@ showengText $12-03-01-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-01-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-03-02-0001 @@ -819,6 +879,18 @@ showengText $12-03-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-03-02-0002 @@ -912,6 +984,18 @@ showengText $12-03-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-03-02-0003 @@ -1005,6 +1089,18 @@ showengText $12-03-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-03-02-0004 @@ -1098,6 +1194,18 @@ showengText $12-03-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-03-02-0006 @@ -1191,6 +1299,18 @@ showengText $12-03-02-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 12-03-02-0005 @@ -1284,6 +1404,18 @@ showengText $12-03-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=12 12-03-02-0007 @@ -1377,6 +1509,18 @@ showengText $12-03-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 12-03-03-0009 @@ -1470,6 +1614,18 @@ showengText $12-03-03-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-03-03-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index f645e540..586bbae3 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -354,6 +354,18 @@ showengText $12-05-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-05-02-0001 @@ -447,6 +459,18 @@ showengText $12-05-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-05-02-0002 @@ -540,6 +564,18 @@ showengText $12-05-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-05-02-0003 @@ -633,6 +669,18 @@ showengText $12-05-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-05-02-0004 @@ -726,6 +774,18 @@ showengText $12-05-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-05-02-0005 @@ -819,6 +879,18 @@ showengText $12-05-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-05-02-0040 @@ -912,6 +984,18 @@ showengText $12-05-02-0040.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0040.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-05-02-0006 @@ -1005,6 +1089,18 @@ showengText $12-05-02-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index 6008f394..c44df289 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -355,6 +355,18 @@ showengText $12-05-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-05-02-0019 @@ -448,6 +460,18 @@ showengText $12-05-02-0019.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0019.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-05-02-0020 @@ -541,6 +565,18 @@ showengText $12-05-02-0020.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0020.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-05-02-0021 @@ -634,6 +670,18 @@ showengText $12-05-02-0021.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0021.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-05-02-0035 @@ -727,6 +775,18 @@ showengText $12-05-02-0035.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0035.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-05-02-0010 @@ -820,6 +880,18 @@ showengText $12-05-02-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-05-02-0011 @@ -913,6 +985,18 @@ showengText $12-05-02-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-05-02-0033 @@ -1006,6 +1090,18 @@ showengText $12-05-02-0033.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0033.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-05-02-0028 @@ -1099,6 +1195,18 @@ showengText $12-05-02-0028.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0028.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-05-02-0012 @@ -1192,6 +1300,18 @@ showengText $12-05-02-0012.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0012.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 12-05-02-0041 @@ -1285,6 +1405,18 @@ showengText $12-05-02-0041.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0041.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=12 12-05-02-0013 @@ -1378,6 +1510,18 @@ showengText $12-05-02-0013.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=13 12-05-02-0031 @@ -1471,6 +1615,18 @@ showengText $12-05-02-0031.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0031.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=14 12-05-02-0008 @@ -1564,6 +1720,18 @@ showengText $12-05-02-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=15 12-05-02-0009 @@ -1657,6 +1825,18 @@ showengText $12-05-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=16 12-05-02-0024 @@ -1750,6 +1930,18 @@ showengText $12-05-02-0024.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0024.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=17 12-05-02-0038 @@ -1843,6 +2035,18 @@ showengText $12-05-02-0038.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0038.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=18 12-05-02-0029 @@ -1936,6 +2140,18 @@ showengText $12-05-02-0029.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0029.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=19 12-05-02-0025 @@ -2029,6 +2245,18 @@ showengText $12-05-02-0025.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0025.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=20 12-05-02-0039 @@ -2122,6 +2350,18 @@ showengText $12-05-02-0039.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0039.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=21 12-05-02-0014 @@ -2215,6 +2455,18 @@ showengText $12-05-02-0014.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0014.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=22 12-05-02-0015 @@ -2308,6 +2560,18 @@ showengText $12-05-02-0015.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0015.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=23 12-05-01-0001 @@ -2401,6 +2665,18 @@ showengText $12-05-01-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-01-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=24 12-05-02-0001 @@ -2494,6 +2770,18 @@ showengText $12-05-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=25 12-05-02-0034 @@ -2587,6 +2875,18 @@ showengText $12-05-02-0034.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0034.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=26 12-05-02-0004 @@ -2680,6 +2980,18 @@ showengText $12-05-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=27 12-05-02-0032 @@ -2773,6 +3085,18 @@ showengText $12-05-02-0032.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0032.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=28 12-05-02-0005 @@ -2866,6 +3190,18 @@ showengText $12-05-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=29 12-05-02-0040 @@ -2959,6 +3295,18 @@ showengText $12-05-02-0040.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0040.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=30 12-05-02-0006 @@ -3052,6 +3400,18 @@ showengText $12-05-02-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=31 12-05-02-0026 @@ -3145,6 +3505,18 @@ showengText $12-05-02-0026.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0026.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=32 12-05-02-0030 @@ -3238,6 +3610,18 @@ showengText $12-05-02-0030.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0030.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=33 12-05-02-0002 @@ -3331,6 +3715,18 @@ showengText $12-05-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=34 12-05-02-0003 @@ -3424,6 +3820,18 @@ showengText $12-05-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=35 12-05-02-0016 @@ -3517,6 +3925,18 @@ showengText $12-05-02-0016.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0016.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=36 12-05-02-0017 @@ -3610,6 +4030,18 @@ showengText $12-05-02-0017.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0017.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=37 12-05-02-0018 @@ -3703,6 +4135,18 @@ showengText $12-05-02-0018.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-02-0018.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=38 12-05-01-0002 @@ -3796,6 +4240,18 @@ showengText $12-05-01-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-05-01-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml index ba59c856..b4d025ee 100644 --- a/xml/page_catalog_choose_drink7.xml +++ b/xml/page_catalog_choose_drink7.xml @@ -354,6 +354,18 @@ showengText $12-04-02-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 12-04-02-0002 @@ -447,6 +459,18 @@ showengText $12-04-02-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 12-04-02-0003 @@ -540,6 +564,18 @@ showengText $12-04-02-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 12-04-02-0013 @@ -633,6 +669,18 @@ showengText $12-04-02-0013.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0013.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 12-04-02-0004 @@ -726,6 +774,18 @@ showengText $12-04-02-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 12-04-02-0005 @@ -819,6 +879,18 @@ showengText $12-04-02-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 12-04-02-0006 @@ -912,6 +984,18 @@ showengText $12-04-02-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 12-04-02-0007 @@ -1005,6 +1089,18 @@ showengText $12-04-02-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 12-04-02-0008 @@ -1098,6 +1194,18 @@ showengText $12-04-02-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 12-04-02-0009 @@ -1191,6 +1299,18 @@ showengText $12-04-02-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=11 12-04-02-0010 @@ -1284,6 +1404,18 @@ showengText $12-04-02-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=12 12-04-02-0011 @@ -1377,6 +1509,18 @@ showengText $12-04-02-0011.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $12-04-02-0011.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index 484f5cf3..7e5290b3 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -355,6 +355,18 @@ showengText $11-99-05-0001.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0001.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=2 11-99-05-0002 @@ -448,6 +460,18 @@ showengText $11-99-05-0002.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0002.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=3 11-99-05-0003 @@ -541,6 +565,18 @@ showengText $11-99-05-0003.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0003.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=4 11-99-05-0004 @@ -634,6 +670,18 @@ showengText $11-99-05-0004.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0004.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=5 11-99-05-0005 @@ -727,6 +775,18 @@ showengText $11-99-05-0005.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0005.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=6 11-99-05-0006 @@ -820,6 +880,18 @@ showengText $11-99-05-0006.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0006.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=7 11-99-05-0007 @@ -913,6 +985,18 @@ showengText $11-99-05-0007.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0007.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=8 11-99-05-0008 @@ -1006,6 +1090,18 @@ showengText $11-99-05-0008.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0008.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=9 11-99-05-0009 @@ -1099,6 +1195,18 @@ showengText $11-99-05-0009.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0009.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + ; button i=10 11-99-05-0010 @@ -1192,6 +1300,18 @@ showengText $11-99-05-0010.descriptionE + + 2 + 2 + eval( STRCONTAIN "Smoothie" $11-99-05-0010.Button SmoRet + If SmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + "ROOT/taobin_project/image/topping2/blender_icon.png" + diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 912dad79..651533e6 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -52,7 +52,7 @@ Var CountDownBrewing = CountDownBrewing - 1 - + ; run test; ;If CountDownBrewing = 40 Then ; Open "ROOT/taobin_project/xml/page_drinkok.xml" @@ -462,32 +462,34 @@ Var Timeout = 0 StrLen TelephoneNumber TelNumLen If TelNumLen < 10 Then - Var TelephoneNumber = TelephoneNumber + "0" - Trim TelephoneNumber 10 - StrLen TelephoneNumber TelNumLen - If TelNumLen >= 10 Then - Var Tel_Confirm_State = "Enable" - EndIf - Var ShowTextNumber = "Invisible" + Var TelephoneNumber = TelephoneNumber + "0" + Trim TelephoneNumber 10 + StrLen TelephoneNumber TelNumLen + + If TelNumLen >= 10 Then + Var Tel_Confirm_State = "Enable" + EndIf + + Var ShowTextNumber = "Invisible" - TimerReset - Refresh - - If TelNumLen = 7 Then - Var number7 = "0" - EndIf + TimerReset + Refresh + + If TelNumLen = 7 Then + Var number7 = "0" + EndIf - If TelNumLen = 8 Then - Var number8 = "0" - EndIf + If TelNumLen = 8 Then + Var number8 = "0" + EndIf - If TelNumLen = 9 Then - Var number9 = "0" - EndIf + If TelNumLen = 9 Then + Var number9 = "0" + EndIf - If TelNumLen = 10 Then - Var number10 = "0" - EndIf + If TelNumLen = 10 Then + Var number10 = "0" + EndIf EndIf diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml index 30c31261..02f70d99 100644 --- a/xml/page_topping_select.xml +++ b/xml/page_topping_select.xml @@ -7,8 +7,11 @@ Var y_topping_bg = 912 - If JXMLVersionInt > 355 Then - Open "ROOT/taobin_project/xml/page_topping_select3.xml" + + If JXMLVersionInt > 356 Then + If ConfigNumer >= 380 Then + Open "ROOT/taobin_project/xml/page_topping_select3.xml" + EndIf EndIf If ConfigNumer > 360 Then SAVELOG "Recipe have smoothies" diff --git a/xml/page_topping_select2.xml b/xml/page_topping_select2.xml index fd2e16d9..f8bf066a 100644 --- a/xml/page_topping_select2.xml +++ b/xml/page_topping_select2.xml @@ -561,6 +561,14 @@ Var ShotCoffeePremium = "Enable" Var showShotEnable = "Enable" + DEBUGVAR TOPPING2 + Refresh + EndIf + If TOPPING2 = "shot coffee 1008" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + DEBUGVAR TOPPING2 Refresh EndIf diff --git a/xml/page_topping_select3.xml b/xml/page_topping_select3.xml index 333dbf60..9de049b6 100644 --- a/xml/page_topping_select3.xml +++ b/xml/page_topping_select3.xml @@ -15,9 +15,11 @@ Var SaveProductCodeSelect = SelectDrink Var UserSelectProductCode = SelectDrink + Var showText4 = "Invisible" + DEBUGVAR UserSelectProductCode - Var blendedState = "Invisible" + Var blendedState = "Enable" Var DisableUsingCode = "false" Var ShowLidStraw = "Invisible" Var ShowLidOnly = "Invisible" @@ -42,7 +44,7 @@ Var BGSugar = "Invisible" Var ShotCoffeeBG = "Invisible" - Var showShotEnable = "Invisible" + Var showShotEnable = "Enable" Var ShotCoffeePremium = "Invisible" @@ -692,13 +694,24 @@ 72 blendedState "No" + + + "OnValueChange" + Var( DirImage + "/bn_blended.png" ) Var( DirImage + "/bp_blended.png" ) + Var( DirImage + "/bd_blended.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume SAVELOG "Press Smoothies" + + If blendedState = "Press" Then + Var blendedState = "Enable" + Else + Var blendedState = "Press" + EndIf Function 1 @@ -711,14 +724,25 @@ 79 blendedState "No" + + + "OnValueChange" + Var( DirImage + "/cb_notcheck.png" ) Var( DirImage + "/cb_checked.png" ) + Var( DirImage + "/cb_checkdis.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume SAVELOG "Press Smoothies" + If blendedState = "Press" Then + Var blendedState = "Enable" + Else + Var blendedState = "Press" + EndIf + Function 1 Refresh @@ -1034,6 +1058,7 @@ + ;-END ; @@ -1069,16 +1094,27 @@ "No" "ROOT/taobin_project/image/topping2/bn_add_shot.png" "ROOT/taobin_project/image/topping2/bp_add_shot.png" + "ROOT/taobin_project/image/topping2/bd_add_shot.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume SAVELOG "Press add normal shot" - Funtion 1 + If showShotEnable = "Press" Then + Var showShotEnable = "Enable" + Else + Var showShotEnable = "Press" + EndIf + + Function 1 Refresh + + + "OnValueChange" + ; @@ -1089,36 +1125,36 @@ "No" Var( DirImage + "/cb_notcheck.png" ) Var( DirImage + "/cb_checked.png" ) + Var( DirImage + "/cb_checkdis.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + SAVELOG "Press add normal shot" If showShotEnable = "Press" Then - Var showShotEnable = "Enable" - Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2 - Var topping2 = toppingID2index1 - Var DisableUsingCode = "false" - SAVELOG "Deselect add premium shot" + Var showShotEnable = "Enable" Else Var showShotEnable = "Press" - Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 - Var topping2 = toppingID2index2 - Var DisableUsingCode = "true" - SAVELOG "Select add premium shot" EndIf - Var PriceDrinkNoTop = PriceDrinkTmp + Function 1 - Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp - - - SAVELOG PriceDrinkTmp Refresh + + + "OnValueChange" + + + showText4 + 602 + 64 + Var( DirImage + "/text4.png" ) + ;-END ; @@ -1498,48 +1534,72 @@ - + SAVELOG "FUNCTION1" + Var TOPPING_PRICE = 0 DEBUGVAR PriceDrinkNoTop + DEBUGVAR PriceDiff + + DEBUGVAR showShotEnable + DEBUGVAR blendedState + If blendedState = "Press" Then - Var PriceDrinkTmp = PriceDrinkTmp - PriceDiff - Var blendedState = "Enable" - Var UserSelectProductCode = SaveProductCodeSelect - Else - Var blendedState = "Press" - Var PriceDrinkTmp = PriceDrinkTmp + PriceDiff + Var TOPPING_PRICE = PriceDiff Var UserSelectProductCode = SubMenuProductCode1 - + + Var showShotEnable = "Disable" + Var showText4 = "Enable" + Else + + Var UserSelectProductCode = SaveProductCodeSelect + If showShotEnable = "Disable" Then + Var showShotEnable = "Enable" + EndIf + + Var showText4 = "Invisible" EndIf DEBUGVAR UserSelectProductCode - Var PriceDrinkNoTop = PriceDrinkTmp - Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp + + If showShotEnable = "Press" Then + If blendedState = "Press" Then + Var PriceDrinkTmp = PriceDrinkNoTop + EndIf - SAVELOG PriceDrinkTmp + Var blendedState = "Disable" + Var TOPPING_PRICE = 0 - If showShotEnable = "Press" Then - Var showShotEnable = "Enable" - Var PriceDrinkTmp = PriceDrinkNoTop - toppingID2price2 - Var topping2 = toppingID2index1 - Var DisableUsingCode = "false" - SAVELOG "Deselect add normal shot" - Else - Var showShotEnable = "Press" - Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 + ;Var PriceDrinkTmp = PriceDrinkNoTop + toppingID2price2 + Var TOPPING_PRICE = TOPPING_PRICE + toppingID2price2 + Var topping2 = toppingID2index2 Var DisableUsingCode = "true" SAVELOG "Select add normal shot" + Else + If blendedState = "Disable" Then + Var blendedState = "Enable" + EndIf + + + Var PriceDrinkTmp = PriceDrinkNoTop + Var topping2 = toppingID2index1 + Var DisableUsingCode = "false" + SAVELOG "Deselect add normal shot" + EndIf - Var PriceDrinkNoTop = PriceDrinkTmp + DEBUGVAR showShotEnable + DEBUGVAR blendedState + Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp SAVELOG PriceDrinkTmp + Refresh + diff --git a/xml_main/startup.xml b/xml_main/startup.xml index ad085903..6eb8b40e 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -95,7 +95,7 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "5.65" + Var XMLPageVersion = "5.69"